diff options
| author | makefu <github@syntax-fehler.de> | 2017-06-01 10:08:56 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-06-01 10:08:56 +0200 |
| commit | 772f84305d90380e0d221cf49ae3f1597d0d0510 (patch) | |
| tree | 8d2241648396dc34fa96c8c68e12f832fbc7c308 /makefu | |
| parent | 90822f64e0bf247c5cca2f035077553cac5ceb79 (diff) | |
| parent | 21d92086fe00c7369fde3951f92e9f73f4c05ee9 (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'makefu')
| -rw-r--r-- | makefu/1systems/iso.nix | 2 | ||||
| -rw-r--r-- | makefu/5pkgs/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/makefu/1systems/iso.nix b/makefu/1systems/iso.nix index ee1046f79..1e4f9c55f 100644 --- a/makefu/1systems/iso.nix +++ b/makefu/1systems/iso.nix @@ -31,7 +31,7 @@ with import <stockholm/lib>; systemd.services.sshd.wantedBy = lib.mkForce [ "multi-user.target" ]; # hack `tee` behavior nixpkgs.config.packageOverrides = super: { - irc-announce = super.callPackage <stockholm/krebs/5pkgs/irc-announce> { + irc-announce = super.callPackage <stockholm/krebs/5pkgs/simple/irc-announce> { pkgs = pkgs // { coreutils = pkgs.concat "coreutils-hack" [ pkgs.coreutils (pkgs.writeDashBin "tee" '' diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix index 25ae2fe4b..d1b8fcc42 100644 --- a/makefu/5pkgs/default.nix +++ b/makefu/5pkgs/default.nix @@ -25,7 +25,7 @@ with import <stockholm/lib>; alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";}; inherit (callPackage ./devpi {}) devpi-web devpi-server devpi-client; nodemcu-uploader = callPackage ./nodemcu-uploader {}; - pwqgen-ger = callPackage ../../krebs/5pkgs/passwdqc-utils { + pwqgen-ger = callPackage <stockholm/krebs/5pkgs/simple/passwdqc-utils> { wordset-file = pkgs.fetchurl { url = https://gist.githubusercontent.com/makefu/b56f5554c9ef03fe6e09878962e6fd8d/raw/1f147efec51325bc9f80c823bad8381d5b7252f6/wordset_4k.c ; sha256 = "18ddzyh11bywrhzdkzvrl7nvgp5gdb4k1s0zxbz2bkhd14vi72bb"; |