diff options
| author | lassulus <lass@aidsballs.de> | 2016-02-06 18:45:38 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-02-06 18:45:38 +0100 |
| commit | fe586d704eed42421ad3fe0d140c0caa64764a68 (patch) | |
| tree | a07d0c4d09ef780f703ae03435d51ac60019c956 /nixpkgs/default.nix | |
| parent | 138bdc6bf6a18a59cf47d2d2db7c4e7640f50641 (diff) | |
| parent | c784d271c5dc8783e5e6308baf4f6dd26430bfca (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'nixpkgs/default.nix')
| l---------[-rw-r--r--] | nixpkgs/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixpkgs/default.nix b/nixpkgs/default.nix index 92da82c35..74e9d7633 100644..120000 --- a/nixpkgs/default.nix +++ b/nixpkgs/default.nix @@ -1 +1 @@ -import <upstream-nixpkgs> +../upstream-nixpkgs/default.nix
\ No newline at end of file |