From 4a810fd9b7bea82ecf6cb3ba2ef0debc2d942560 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 24 May 2017 02:32:39 +0200
Subject: [PATCH] {lass,makefu}: fix path to simple pkgs
---
1systems/iso.nix | 2 +-
5pkgs/default.nix | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/1systems/iso.nix b/1systems/iso.nix
index ee1046f..1e4f9c5 100644
--- a/1systems/iso.nix
+++ b/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/5pkgs/default.nix b/5pkgs/default.nix
index 25ae2fe..d1b8fcc 100644
--- a/5pkgs/default.nix
+++ b/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";