diff options
| author | tv <tv@krebsco.de> | 2017-12-14 10:17:40 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2017-12-14 10:17:40 +0100 |
| commit | b5f1febe68529f7b6ebf5e1db524ba7b6ea161f9 (patch) | |
| tree | 9f05e213af4917b608cd850bdd0cfabf06d157ae /makefu/5pkgs/default.nix | |
| parent | bd63530db16dd3f90af51750d25d07cca1526aaa (diff) | |
| parent | 04f7ae22d6d0720d06f78c712eb9cd245cefce82 (diff) | |
Merge remote-tracking branch 'prism/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 80a453ddc..80a0d33cd 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; + inherit (callPackage ./devpi {}) devpi-web ; nodemcu-uploader = super.pkgs.callPackage ./nodemcu-uploader {}; inkscape = super.pkgs.stdenv.lib.overrideDerivation super.inkscape (old: { patches = [ ./custom/inkscape/dxf_fix.patch ]; |