diff options
| author | makefu <github@syntax-fehler.de> | 2016-02-15 17:07:48 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-02-15 17:07:48 +0100 |
| commit | 3ceff0ec29a36119ea83f02c8943752d91b250e9 (patch) | |
| tree | 7b179bc972ea01c9305ea64697e14237346885d8 /nixpkgs | |
| parent | 9a4071b66ff45e99a30e9a314eb43c6efc7e921f (diff) | |
| parent | 372f2d77f301719e396a6f943657325e2f8b2cf4 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'nixpkgs')
| -rw-r--r-- | nixpkgs/default.nix | 5 | ||||
| -rw-r--r-- | nixpkgs/krebs | 0 | ||||
| l--------- | nixpkgs/lib | 1 | ||||
| -rw-r--r-- | nixpkgs/nixos/default.nix | 1 | ||||
| l--------- | nixpkgs/nixos/lib | 1 | ||||
| l--------- | nixpkgs/nixos/modules | 1 |
6 files changed, 0 insertions, 9 deletions
diff --git a/nixpkgs/default.nix b/nixpkgs/default.nix deleted file mode 100644 index 1fe99b0ab..000000000 --- a/nixpkgs/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -_: - -(import <stockholm> { - configuration = {}; -}).pkgs 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 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 <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 |