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 | 014cbb7598c5d45cfc4cc7e1ec81c92e000eabfb (patch) | |
| tree | fab0e894948010cd73be18ad2c68cd4750bd2419 /nixpkgs | |
| parent | 8ecdb889dd3081ba29c6ea7eb35f60b30420d201 (diff) | |
| parent | 7b3b839cc7a2af73dee9858e6ebcc7be831eb481 (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 74e9d7633..6e5223c16 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 2284ef489..7b13c8069 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 ce5f5448b..983384943 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 |