diff options
author | lassulus <lassulus@lassul.us> | 2017-10-09 13:25:46 +0200 |
---|---|---|
committer | lassulus <lassulus@lassul.us> | 2017-10-09 13:25:46 +0200 |
commit | a357a82f9e10c8b35465d1d3458d51e49e8e5676 (patch) | |
tree | 0a8da6542296e9743c81226c3b8fdb9b239fbb8b /makefu/5pkgs/default.nix | |
parent | 71e25af663f7b620a2adffa4ac5e0eeaef548a81 (diff) | |
parent | 903a1182b5c27cf0c07d267f136a0f2e5be3d89b (diff) |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/5pkgs/default.nix')
-rw-r--r-- | makefu/5pkgs/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix index 96975e54f..e99aa696b 100644 --- a/makefu/5pkgs/default.nix +++ b/makefu/5pkgs/default.nix @@ -24,7 +24,7 @@ in { alsa-hdspmixer = callPackage ./custom/alsa-tools { alsaToolTarget="hdspmixer";}; alsa-hdsploader = callPackage ./custom/alsa-tools { alsaToolTarget="hdsploader";}; qcma = super.pkgs.libsForQt5.callPackage ./custom/qcma { }; - inherit (callPackage ./devpi {}) devpi-web devpi-server devpi-client; + inherit (callPackage ./devpi {}) devpi-web devpi-server; nodemcu-uploader = super.pkgs.callPackage ./nodemcu-uploader {}; inkscape = super.pkgs.stdenv.lib.overrideDerivation super.inkscape (old: { patches = [ ./custom/inkscape/dxf_fix.patch ]; |