diff options
| author | jeschli <jeschli@gmail.com> | 2018-02-27 20:41:20 +0100 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-02-27 20:41:20 +0100 |
| commit | 4c0d0f64ed21d3d7292bb5e8900d973e649375c1 (patch) | |
| tree | 3d0fb66d17085f1288037da1b4d9987fa402e40e /makefu/5pkgs | |
| parent | e5b89294d763a2ec2c289f08e4050f7776deacfd (diff) | |
| parent | 9e67031cb878c0bcdcde39a7b7b746111de6719a (diff) | |
Merge branch 'master' of prism.r:stockholm into staging/jeschli
Diffstat (limited to 'makefu/5pkgs')
| -rw-r--r-- | makefu/5pkgs/default.nix | 2 | ||||
| -rw-r--r-- | makefu/5pkgs/programs-db/default.nix | 12 |
2 files changed, 1 insertions, 13 deletions
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix index 80a0d33cd..b1d6df67e 100644 --- a/makefu/5pkgs/default.nix +++ b/makefu/5pkgs/default.nix @@ -3,7 +3,7 @@ self: super: let # This callPackage will try to detect obsolete overrides. callPackage = path: args: let - override = super.callPackage path args; + override = super.callPackage path args; upstream = optionalAttrs (override ? "name") (super.${(parseDrvName override.name).name} or {}); in if upstream ? "name" && diff --git a/makefu/5pkgs/programs-db/default.nix b/makefu/5pkgs/programs-db/default.nix deleted file mode 100644 index f40b1b96e..000000000 --- a/makefu/5pkgs/programs-db/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv }: - -stdenv.mkDerivation rec { - name = "programs-db"; - src = builtins.fetchTarball https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz ; - - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' - cp programs.sqlite $out - ''; - -} |