Merge remote-tracking branch 'gum/master'

2 files changed, 46 insertions, 8 deletions

diff --git a/krebs/3modules/repo-sync.nix b/krebs/3modules/repo-sync.nix
index 0317d1eca..bcd9da5ea 100644
--- a/krebs/3modules/repo-sync.nix
+++ b/krebs/3modules/repo-sync.nix
@@ -17,29 +17,57 @@ let
         # see `repo-sync --help`
         #   `ref` provides sane defaults and can be omitted
 
+        # you can have multiple repo-sync groups and therefore multiple @latest
+        # configuration entries.
         # attrset will be converted to json and be used as config
-        { repo = {
+        # each attrset defines a group of repos for syncing
+
+        { nxpkgs = {
             makefu = {
               origin = {
-                url = http://github.com/makefu/repo ;
+                url = http://github.com/makefu/nixpkgs;
                 ref = "heads/dev" ;
               };
               mirror = {
-                url = "git@internal:mirror" ;
+                url = "git@internal:nixpkgs-mirror" ;
                 ref = "heads/github-mirror-dev" ;
               };
             };
             lass = {
               origin = {
-                url = http://github.com/lass/repo ;
+                url = http://github.com/lass/nixpkgs;
+              };
+              mirror = {
+                url = "git@internal:nixpkgs-mirror" ;
+              };
+            };
+            "@latest" = {
+              mirror = {
+                url = "git@internal:nixpkgs-mirror";
+                ref = "heads/master";
+              };
+            };
+          };
+          stockholm = {
+            lass = {
+              origin = {
+                url = http://cgit.prism.r/stockholm;
+              };
+              mirror = {
+                url = "git@internal:stockholm-mirror" ;
+              };
+            };
+            makefu = {
+              origin = {
+                url = http://gum.krebsco.de/stockholm;
               };
               mirror = {
-                url = "git@internal:mirror" ;
+                url = "git@internal:stockholm-mirror" ;
               };
             };
             "@latest" = {
               mirror = {
-                url = "git@internal:mirror";
+                url = "git@internal:stockholm-mirror";
                 ref = "heads/master";
               };
             };
diff --git a/krebs/5pkgs/passwdqc-utils/default.nix b/krebs/5pkgs/passwdqc-utils/default.nix
index 0299715ba..53e7f5482 100644
--- a/krebs/5pkgs/passwdqc-utils/default.nix
+++ b/krebs/5pkgs/passwdqc-utils/default.nix
@@ -1,13 +1,18 @@
-{stdenv,pam,fetchurl,...}:
+{ stdenv, pam,
+  fetchurl, lib,
+  wordset-file ? null, # set your own wordset-file
+  ... }:
 
 stdenv.mkDerivation rec {
   name = "passwdqc-utils-${version}";
   version = "1.3.0";
   buildInputs = [ pam ];
+
   src = fetchurl {
     url = "http://www.openwall.com/passwdqc/passwdqc-${version}.tar.gz";
     sha256 = "0l3zbrp4pvah0dz33m48aqlz9nx663cc1fqhnlwr0p853b10la93";
   };
+
   buildTargets = "utils";
   installFlags= [ "BINDIR=$(out)/bin"
                   "CONFDIR=$(out)/etc"
@@ -15,7 +20,12 @@ stdenv.mkDerivation rec {
                   "DEVEL_LIBDIR=$(out)/lib"
                   "SECUREDIR=$(out)/lib/security"
                   "INCLUDEDIR=$(out)/include"
-                  "MANDIR=$(out)/man"];
+                  "MANDIR=$(out)/man" ];
+
+  patchPhase = lib.optionalString (wordset-file != null) ''
+    cp -f ${wordset-file} wordset_4k.c
+  '';
+
   installTargets = "install_lib install_utils";
 
   meta = {