diff options
| author | lassulus <lassulus@lassul.us> | 2017-08-16 12:33:54 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2017-08-16 12:33:54 +0200 |
| commit | 3b24a8306d0bb57924fcc64ec28c5b1aa3a4ac74 (patch) | |
| tree | cbb9a36c1aa94eec48b6ce13c14e5c994df0f546 /makefu/5pkgs/default.nix | |
| parent | f8c0bcf1e9e4d4dd660e6fe82017e28dbbfd6024 (diff) | |
| parent | a795766f3a881d43f92dcafcf26eeb765e993ed7 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/5pkgs/default.nix')
| -rw-r--r-- | makefu/5pkgs/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix index bb776ef25..6070fc096 100644 --- a/makefu/5pkgs/default.nix +++ b/makefu/5pkgs/default.nix @@ -20,13 +20,14 @@ self: super: let (filterAttrs (_: eq "directory") (readDir path)); in { - alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";}; - alsa-hdspmixer = callPackage ./alsa-tools { alsaToolTarget="hdspmixer";}; - alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";}; + alsa-hdspconf = callPackage ./custom/alsa-tools { alsaToolTarget="hdspconf";}; + 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; - nodemcu-uploader = callPackage ./nodemcu-uploader {}; + nodemcu-uploader = super.pkgs.callPackage ./nodemcu-uploader {}; pwqgen-ger = callPackage <stockholm/krebs/5pkgs/simple/passwdqc-utils> { - wordset-file = pkgs.fetchurl { + wordset-file = super.pkgs.fetchurl { url = https://gist.githubusercontent.com/makefu/b56f5554c9ef03fe6e09878962e6fd8d/raw/1f147efec51325bc9f80c823bad8381d5b7252f6/wordset_4k.c ; sha256 = "18ddzyh11bywrhzdkzvrl7nvgp5gdb4k1s0zxbz2bkhd14vi72bb"; }; |