From 221510db0cd2d9cb7c38d33a148086d9187be804 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 7 Feb 2016 02:04:12 +0100 Subject: nixpkgs: relink --- nixpkgs/default.nix | 2 +- nixpkgs/lib | 2 +- nixpkgs/pkgs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'nixpkgs') diff --git a/nixpkgs/default.nix b/nixpkgs/default.nix index 74e9d7633..6e5223c16 120000 --- a/nixpkgs/default.nix +++ b/nixpkgs/default.nix @@ -1 +1 @@ -../upstream-nixpkgs/default.nix \ No newline at end of file +../../upstream-nixpkgs/default.nix \ No newline at end of file diff --git a/nixpkgs/lib b/nixpkgs/lib index 2284ef489..7b13c8069 120000 --- a/nixpkgs/lib +++ b/nixpkgs/lib @@ -1 +1 @@ -../upstream-nixpkgs/lib \ No newline at end of file +../../upstream-nixpkgs/lib \ No newline at end of file diff --git a/nixpkgs/pkgs b/nixpkgs/pkgs index ce5f5448b..983384943 120000 --- a/nixpkgs/pkgs +++ b/nixpkgs/pkgs @@ -1 +1 @@ -../upstream-nixpkgs/pkgs \ No newline at end of file +../../upstream-nixpkgs/pkgs \ No newline at end of file -- cgit v1.2.3 From 17a80f2b4a525af58df31bd7743950336090635b Mon Sep 17 00:00:00 2001 From: tv 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 6e5223c16..000000000 --- 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 000000000..1fe99b0ab --- /dev/null +++ b/nixpkgs/default.nix @@ -0,0 +1,5 @@ +_: + +(import { + 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 -- cgit v1.2.3 From 05bca39544b248d209e371a8406b97e47d63516c Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 13 Feb 2016 18:17:55 +0100 Subject: nixpkgs: enable nix-* autocall --- nixpkgs/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nixpkgs') diff --git a/nixpkgs/default.nix b/nixpkgs/default.nix index 1fe99b0ab..8514fa499 100644 --- a/nixpkgs/default.nix +++ b/nixpkgs/default.nix @@ -1,5 +1,6 @@ -_: +{ system ? builtins.currentSystem }: (import { + inherit system; configuration = {}; }).pkgs -- cgit v1.2.3 From 8f520b19b623919fa6319029a955d43fd051773c Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 15 Feb 2016 16:27:11 +0100 Subject: don't try to mimic nixpkgs --- nixpkgs/default.nix | 6 ------ nixpkgs/krebs | 0 nixpkgs/lib | 1 - nixpkgs/nixos/default.nix | 1 - nixpkgs/nixos/lib | 1 - nixpkgs/nixos/modules | 1 - 6 files changed, 10 deletions(-) delete mode 100644 nixpkgs/default.nix delete mode 100644 nixpkgs/krebs delete mode 120000 nixpkgs/lib delete mode 100644 nixpkgs/nixos/default.nix delete mode 120000 nixpkgs/nixos/lib delete mode 120000 nixpkgs/nixos/modules (limited to 'nixpkgs') diff --git a/nixpkgs/default.nix b/nixpkgs/default.nix deleted file mode 100644 index 8514fa499..000000000 --- a/nixpkgs/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ system ? builtins.currentSystem }: - -(import { - inherit system; - configuration = {}; -}).pkgs diff --git a/nixpkgs/krebs b/nixpkgs/krebs deleted file mode 100644 index e69de29bb..000000000 diff --git a/nixpkgs/lib b/nixpkgs/lib deleted file mode 120000 index 7b13c8069..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 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 -- cgit v1.2.3