From 4d1de57df5800879e7fcfcc38e5a10f0c1b993d7 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 24 May 2017 02:32:39 +0200 Subject: {lass,makefu}: fix path to simple pkgs --- makefu/1systems/iso.nix | 2 +- makefu/5pkgs/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'makefu') 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 ; systemd.services.sshd.wantedBy = lib.mkForce [ "multi-user.target" ]; # hack `tee` behavior nixpkgs.config.packageOverrides = super: { - irc-announce = super.callPackage { + irc-announce = super.callPackage { 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 ; 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 { wordset-file = pkgs.fetchurl { url = https://gist.githubusercontent.com/makefu/b56f5554c9ef03fe6e09878962e6fd8d/raw/1f147efec51325bc9f80c823bad8381d5b7252f6/wordset_4k.c ; sha256 = "18ddzyh11bywrhzdkzvrl7nvgp5gdb4k1s0zxbz2bkhd14vi72bb"; -- cgit v1.2.3