diff options
| author | lassulus <lassulus@lassul.us> | 2017-12-09 15:25:12 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2017-12-09 15:25:12 +0100 |
| commit | f5e123992ea6781d29ef2ac64d52f71a97d13010 (patch) | |
| tree | 3f147f2bb1aa0821bb07601c4f463de0eac56812 /makefu/5pkgs/default.nix | |
| parent | 994d822543ecc0d49cfa9319ba21d0cbf1f78b8a (diff) | |
| parent | a64144db01d2a97f1480bdbb0908d493c3f208a2 (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 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 ]; |