diff options
| author | makefu <github@syntax-fehler.de> | 2016-02-04 11:16:17 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-02-04 11:16:17 +0100 |
| commit | e89f43de944af3751b7a70de87e3cc0c1860f2bd (patch) | |
| tree | 15401006a9cc87971f43d9c58e4e4ea5da522040 /nixpkgs | |
| parent | cc1a230fd2742b6ccadd0837d9cf569f246375aa (diff) | |
| parent | 307e0afe851654e07e0c3fca25adf60ada3d974d (diff) | |
Merge 'cd/master' - update krebs.build.source
Diffstat (limited to 'nixpkgs')
| l--------- | nixpkgs/default.nix | 1 | ||||
| -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 | ||||
| l--------- | nixpkgs/pkgs | 1 |
7 files changed, 6 insertions, 0 deletions
diff --git a/nixpkgs/default.nix b/nixpkgs/default.nix new file mode 120000 index 000000000..74e9d7633 --- /dev/null +++ b/nixpkgs/default.nix @@ -0,0 +1 @@ +../upstream-nixpkgs/default.nix
\ No newline at end of file diff --git a/nixpkgs/krebs b/nixpkgs/krebs new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/nixpkgs/krebs diff --git a/nixpkgs/lib b/nixpkgs/lib new file mode 120000 index 000000000..2284ef489 --- /dev/null +++ b/nixpkgs/lib @@ -0,0 +1 @@ +../upstream-nixpkgs/lib
\ No newline at end of file diff --git a/nixpkgs/nixos/default.nix b/nixpkgs/nixos/default.nix new file mode 100644 index 000000000..4fe08efd2 --- /dev/null +++ b/nixpkgs/nixos/default.nix @@ -0,0 +1 @@ +import <stockholm> diff --git a/nixpkgs/nixos/lib b/nixpkgs/nixos/lib new file mode 120000 index 000000000..9e69d1a67 --- /dev/null +++ b/nixpkgs/nixos/lib @@ -0,0 +1 @@ +../../../upstream-nixpkgs/nixos/lib
\ No newline at end of file diff --git a/nixpkgs/nixos/modules b/nixpkgs/nixos/modules new file mode 120000 index 000000000..8aa24885c --- /dev/null +++ b/nixpkgs/nixos/modules @@ -0,0 +1 @@ +../../../upstream-nixpkgs/nixos/modules
\ No newline at end of file diff --git a/nixpkgs/pkgs b/nixpkgs/pkgs new file mode 120000 index 000000000..ce5f5448b --- /dev/null +++ b/nixpkgs/pkgs @@ -0,0 +1 @@ +../upstream-nixpkgs/pkgs
\ No newline at end of file |