summaryrefslogtreecommitdiffstats
path: root/nixpkgs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-02-12 22:03:29 +0100
committermakefu <github@syntax-fehler.de>2016-02-12 22:03:29 +0100
commit1c850bb26f931224eceb1dd35e620e0f5aeb19ed (patch)
tree946654504280fe8a9a2a0b66df8116e7b583ae2b /nixpkgs
parent08b03ef2e7dc6eff237c213ee341d0da6b9a0d96 (diff)
parent1497ee718256ff48c65ebcb0ddea633c6628eb69 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'nixpkgs')
-rw-r--r--[l---------]nixpkgs/default.nix6
l---------nixpkgs/pkgs1
2 files changed, 5 insertions, 2 deletions
diff --git a/nixpkgs/default.nix b/nixpkgs/default.nix
index 6e5223c16..1fe99b0ab 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 983384943..000000000
--- a/nixpkgs/pkgs
+++ /dev/null
@@ -1 +0,0 @@
-../../upstream-nixpkgs/pkgs \ No newline at end of file