summaryrefslogtreecommitdiffstats
path: root/nixpkgs
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-02-16 17:15:00 +0100
committerlassulus <lass@aidsballs.de>2016-02-16 17:15:00 +0100
commit0b0b0d65ee05583529df831985580e392713d29a (patch)
tree7eb6799a996924d8e895c54633a47ea3d7a92a4c /nixpkgs
parent3d30e9cc9014ec6189410944015d3cd7d5ca95a6 (diff)
parentb7a92f63884af00eb0243ec9328be689a6c9b845 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'nixpkgs')
l---------nixpkgs/default.nix1
-rw-r--r--nixpkgs/krebs0
l---------nixpkgs/lib1
-rw-r--r--nixpkgs/nixos/default.nix1
l---------nixpkgs/nixos/lib1
l---------nixpkgs/nixos/modules1
l---------nixpkgs/pkgs1
7 files changed, 0 insertions, 6 deletions
diff --git a/nixpkgs/default.nix b/nixpkgs/default.nix
deleted file mode 120000
index 74e9d7633..000000000
--- a/nixpkgs/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-../upstream-nixpkgs/default.nix \ No newline at end of file
diff --git a/nixpkgs/krebs b/nixpkgs/krebs
deleted file mode 100644
index e69de29bb..000000000
--- a/nixpkgs/krebs
+++ /dev/null
diff --git a/nixpkgs/lib b/nixpkgs/lib
deleted file mode 120000
index 2284ef489..000000000
--- a/nixpkgs/lib
+++ /dev/null
@@ -1 +0,0 @@
-../upstream-nixpkgs/lib \ No newline at end of file
diff --git a/nixpkgs/nixos/default.nix b/nixpkgs/nixos/default.nix
deleted file mode 100644
index 4fe08efd2..000000000
--- a/nixpkgs/nixos/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-import <stockholm>
diff --git a/nixpkgs/nixos/lib b/nixpkgs/nixos/lib
deleted file mode 120000
index 9e69d1a67..000000000
--- a/nixpkgs/nixos/lib
+++ /dev/null
@@ -1 +0,0 @@
-../../../upstream-nixpkgs/nixos/lib \ No newline at end of file
diff --git a/nixpkgs/nixos/modules b/nixpkgs/nixos/modules
deleted file mode 120000
index 8aa24885c..000000000
--- a/nixpkgs/nixos/modules
+++ /dev/null
@@ -1 +0,0 @@
-../../../upstream-nixpkgs/nixos/modules \ No newline at end of file
diff --git a/nixpkgs/pkgs b/nixpkgs/pkgs
deleted file mode 120000
index ce5f5448b..000000000
--- a/nixpkgs/pkgs
+++ /dev/null
@@ -1 +0,0 @@
-../upstream-nixpkgs/pkgs \ No newline at end of file