Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

{lass,makefu}: fix path to simple pkgs

Browse Source
This commit is contained in:
tv 2017-05-24 02:32:39 +02:00
parent e733b7e07d
commit 4d1de57df5
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lass/1systems/iso.nix
View File

@ -16,7 +16,7 @@ with import <stockholm/lib>;
# /dev/pts is empty except for 1 file # /dev/pts is empty except for 1 file
# my life sucks # my life sucks
nixpkgs.config.packageOverrides = super: { 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 = pkgs // { coreutils = pkgs.concat "coreutils-hack" [
pkgs.coreutils pkgs.coreutils
(pkgs.writeDashBin "tee" '' (pkgs.writeDashBin "tee" ''

2
makefu/1systems/iso.nix
View File

@ -31,7 +31,7 @@ with import <stockholm/lib>;
systemd.services.sshd.wantedBy = lib.mkForce [ "multi-user.target" ]; systemd.services.sshd.wantedBy = lib.mkForce [ "multi-user.target" ];
# hack `tee` behavior # hack `tee` behavior
nixpkgs.config.packageOverrides = super: { 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 = pkgs // { coreutils = pkgs.concat "coreutils-hack" [
pkgs.coreutils pkgs.coreutils
(pkgs.writeDashBin "tee" '' (pkgs.writeDashBin "tee" ''

2
makefu/5pkgs/default.nix
View File

@ -25,7 +25,7 @@ with import <stockholm/lib>;
alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";}; alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};
inherit (callPackage ./devpi {}) devpi-web devpi-server devpi-client; inherit (callPackage ./devpi {}) devpi-web devpi-server devpi-client;
nodemcu-uploader = callPackage ./nodemcu-uploader {}; 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 { wordset-file = pkgs.fetchurl {
url = https://gist.githubusercontent.com/makefu/b56f5554c9ef03fe6e09878962e6fd8d/raw/1f147efec51325bc9f80c823bad8381d5b7252f6/wordset_4k.c ; url = https://gist.githubusercontent.com/makefu/b56f5554c9ef03fe6e09878962e6fd8d/raw/1f147efec51325bc9f80c823bad8381d5b7252f6/wordset_4k.c ;
sha256 = "18ddzyh11bywrhzdkzvrl7nvgp5gdb4k1s0zxbz2bkhd14vi72bb"; sha256 = "18ddzyh11bywrhzdkzvrl7nvgp5gdb4k1s0zxbz2bkhd14vi72bb";