mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 13:41:26 +00:00
f1a63ee0a7
to succeed. The error is: $ svn merge --reintegrate ^/nixpkgs/branches/stdenv-updates svn: E195016: Reintegrate can only be used if revisions 33530 through 34045 were previously merged from https://nixos.org/repos/nix/nixpkgs/trunk to the reintegrate source, but this is not the case: nixpkgs/branches/stdenv-updates/pkgs/misc/screensavers/xscreensaver/default.nix Missing ranges: /nixpkgs/trunk/pkgs/misc/screensavers/xscreensaver/default.nix:33655-33656 svn path=/nixpkgs/branches/stdenv-updates/; revision=34046 |
||
---|---|---|
doc | ||
maintainers | ||
pkgs | ||
COPYING | ||
default.nix | ||
VERSION |