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
commit885528124bcbd2ee94d1ba7b0fc3c85b20a8869f (patch)
tree184397cda0d797ae8a065f923ab74f9c6b479292 /nixpkgs
parenta89eb941240ed5fb7979dec507fd42405b464817 (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 6e5223c..1fe99b0 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 9833849..0000000
--- a/nixpkgs/pkgs
+++ /dev/null
@@ -1 +0,0 @@
-../../upstream-nixpkgs/pkgs \ No newline at end of file