diff options
| author | makefu <github@syntax-fehler.de> | 2016-02-11 21:31:15 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-02-11 21:31:15 +0100 |
| commit | 107115dd1a126558c7befccf1dbe31b970324bed (patch) | |
| tree | 75449913737104b382b3e71ef0340a7af4eba402 /nixpkgs | |
| parent | 02efcd83eac9907b8d29145b53840868615d1543 (diff) | |
| parent | 75302b57df117828664a591ca672820deb216e41 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'nixpkgs')
| l--------- | nixpkgs/default.nix | 2 | ||||
| l--------- | nixpkgs/lib | 2 | ||||
| l--------- | nixpkgs/pkgs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/nixpkgs/default.nix b/nixpkgs/default.nix index 74e9d76..6e5223c 120000 --- a/nixpkgs/default.nix +++ b/nixpkgs/default.nix @@ -1 +1 @@ -../upstream-nixpkgs/default.nix
\ No newline at end of file +../../upstream-nixpkgs/default.nix
\ No newline at end of file diff --git a/nixpkgs/lib b/nixpkgs/lib index 2284ef4..7b13c80 120000 --- a/nixpkgs/lib +++ b/nixpkgs/lib @@ -1 +1 @@ -../upstream-nixpkgs/lib
\ No newline at end of file +../../upstream-nixpkgs/lib
\ No newline at end of file diff --git a/nixpkgs/pkgs b/nixpkgs/pkgs index ce5f544..9833849 120000 --- a/nixpkgs/pkgs +++ b/nixpkgs/pkgs @@ -1 +1 @@ -../upstream-nixpkgs/pkgs
\ No newline at end of file +../../upstream-nixpkgs/pkgs
\ No newline at end of file |