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 | 34471904f61dfe59fb36e2a686b07a9436b601bf (patch) | |
| tree | ce2f7a874350e94f060101519d063c779e6a3293 /nixpkgs | |
| parent | 0f49d7fa7202d9854b382ada864c8e9506c71ba0 (diff) | |
| parent | 6e6c783a148293acdbfbfeb36c4bd0ef69b9d8ee (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 1fe99b0..0000000 --- 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 e69de29..0000000 --- a/nixpkgs/krebs +++ /dev/null diff --git a/nixpkgs/lib b/nixpkgs/lib deleted file mode 120000 index 7b13c80..0000000 --- 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 4fe08ef..0000000 --- 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 9e69d1a..0000000 --- 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 8aa2488..0000000 --- a/nixpkgs/nixos/modules +++ /dev/null @@ -1 +0,0 @@ -../../../upstream-nixpkgs/nixos/modules
\ No newline at end of file |