diff options
| author | makefu <github@syntax-fehler.de> | 2016-02-12 22:03:29 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-02-12 22:03:29 +0100 |
| commit | 1c850bb26f931224eceb1dd35e620e0f5aeb19ed (patch) | |
| tree | 946654504280fe8a9a2a0b66df8116e7b583ae2b /nixpkgs | |
| parent | 08b03ef2e7dc6eff237c213ee341d0da6b9a0d96 (diff) | |
| parent | 1497ee718256ff48c65ebcb0ddea633c6628eb69 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'nixpkgs')
| -rw-r--r--[l---------] | nixpkgs/default.nix | 6 | ||||
| l--------- | nixpkgs/pkgs | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/nixpkgs/default.nix b/nixpkgs/default.nix index 6e5223c1..1fe99b0a 120000..100644 --- a/nixpkgs/default.nix +++ b/nixpkgs/default.nix @@ -1 +1,5 @@ -../../upstream-nixpkgs/default.nix
\ No newline at end of file +_: + +(import <stockholm> { + configuration = {}; +}).pkgs diff --git a/nixpkgs/pkgs b/nixpkgs/pkgs deleted file mode 120000 index 98338494..00000000 --- a/nixpkgs/pkgs +++ /dev/null @@ -1 +0,0 @@ -../../upstream-nixpkgs/pkgs
\ No newline at end of file |