summaryrefslogtreecommitdiffstats
path: root/nixpkgs
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-02-12 12:23:13 +0100
committertv <tv@krebsco.de>2016-02-12 12:28:32 +0100
commit17a80f2b4a525af58df31bd7743950336090635b (patch)
treeeda65c06d00417de93e4b2272a6442ed583b5482 /nixpkgs
parent2b6a54c31c47667495187f9ff8f9a6009a2652ab (diff)
nixpkgs: expose stockholm pkgs
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 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