From 17a80f2b4a525af58df31bd7743950336090635b Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 12 Feb 2016 12:23:13 +0100
Subject: nixpkgs: expose stockholm pkgs

---
 nixpkgs/default.nix | 6 +++++-
 nixpkgs/pkgs        | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)
 mode change 120000 => 100644 nixpkgs/default.nix
 delete mode 120000 nixpkgs/pkgs

(limited to 'nixpkgs')

diff --git a/nixpkgs/default.nix b/nixpkgs/default.nix
deleted file mode 120000
index 6e5223c1..00000000
--- a/nixpkgs/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-../../upstream-nixpkgs/default.nix
\ No newline at end of file
diff --git a/nixpkgs/default.nix b/nixpkgs/default.nix
new file mode 100644
index 00000000..1fe99b0a
--- /dev/null
+++ b/nixpkgs/default.nix
@@ -0,0 +1,5 @@
+_:
+
+(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
-- 
cgit v1.2.3