From b4580347a657de5be97c59e8f8edc6cebde04c26 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 26 Oct 2017 20:41:16 +0200
Subject: ma pkgs.internetarchive: init

---
 makefu/5pkgs/internetarchive/default.nix | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 makefu/5pkgs/internetarchive/default.nix

(limited to 'makefu/5pkgs')

diff --git a/makefu/5pkgs/internetarchive/default.nix b/makefu/5pkgs/internetarchive/default.nix
new file mode 100644
index 00000000..b661aeee
--- /dev/null
+++ b/makefu/5pkgs/internetarchive/default.nix
@@ -0,0 +1,32 @@
+{ pkgs, fetchFromGitHub, ... }:
+with pkgs.python3Packages;
+buildPythonPackage rec {
+    pname = "internetarchive";
+    version = "1.7.3";
+    name = "${pname}-${version}";
+    propagatedBuildInputs = [
+      requests
+      jsonpatch
+      docopt
+      clint
+      six
+      schema
+      backports_csv
+    ];
+
+    # check only works when cloned from git repo
+    doCheck = false;
+    checkInputs = [
+      pytest
+      responses
+    ];
+
+    prePatch = ''
+      sed -i "s/'schema.*'/'schema>=0.4.0'/" setup.py
+    '';
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "0x3saklabdx7qrr11h5bjfd75hfbih7pw5gvl2784zvvvrqrz45g";
+    };
+}
-- 
cgit v1.2.3


From 346ba71f9c7e170583e8f3aa10575d1b260b2b3d Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 27 Oct 2017 10:32:42 +0200
Subject: ma pkgs.slog: init

---
 makefu/5pkgs/slog/default.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 makefu/5pkgs/slog/default.nix

(limited to 'makefu/5pkgs')

diff --git a/makefu/5pkgs/slog/default.nix b/makefu/5pkgs/slog/default.nix
new file mode 100644
index 00000000..a4dc33d2
--- /dev/null
+++ b/makefu/5pkgs/slog/default.nix
@@ -0,0 +1,20 @@
+{ pkgs, stdenv, fetchFromGitHub }:
+
+## Posix shell logging, use with:
+# . $(command -v slog.sh)
+stdenv.mkDerivation rec {
+  name = "slog-${version}";
+  version = "2017-10-27";
+
+  src = fetchFromGitHub {
+    owner = "makefu";
+    repo = "slog";
+    rev = "50367c3";
+    sha256 = "16wlh8xz430101lrxmgl2wangbbhvyj4pg8k5aibnh76sgj6x77r";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    install -m755 slog.sh $out/bin
+  '';
+}
-- 
cgit v1.2.3


From 2e39f7b3d1805346e067bdc7236bd7dfe87381a2 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 27 Oct 2017 11:07:19 +0200
Subject: mv makefu/{slog,internetarchive} krebs/

---
 makefu/5pkgs/internetarchive/default.nix | 32 --------------------------------
 makefu/5pkgs/slog/default.nix            | 20 --------------------
 2 files changed, 52 deletions(-)
 delete mode 100644 makefu/5pkgs/internetarchive/default.nix
 delete mode 100644 makefu/5pkgs/slog/default.nix

(limited to 'makefu/5pkgs')

diff --git a/makefu/5pkgs/internetarchive/default.nix b/makefu/5pkgs/internetarchive/default.nix
deleted file mode 100644
index b661aeee..00000000
--- a/makefu/5pkgs/internetarchive/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ pkgs, fetchFromGitHub, ... }:
-with pkgs.python3Packages;
-buildPythonPackage rec {
-    pname = "internetarchive";
-    version = "1.7.3";
-    name = "${pname}-${version}";
-    propagatedBuildInputs = [
-      requests
-      jsonpatch
-      docopt
-      clint
-      six
-      schema
-      backports_csv
-    ];
-
-    # check only works when cloned from git repo
-    doCheck = false;
-    checkInputs = [
-      pytest
-      responses
-    ];
-
-    prePatch = ''
-      sed -i "s/'schema.*'/'schema>=0.4.0'/" setup.py
-    '';
-
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "0x3saklabdx7qrr11h5bjfd75hfbih7pw5gvl2784zvvvrqrz45g";
-    };
-}
diff --git a/makefu/5pkgs/slog/default.nix b/makefu/5pkgs/slog/default.nix
deleted file mode 100644
index a4dc33d2..00000000
--- a/makefu/5pkgs/slog/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ pkgs, stdenv, fetchFromGitHub }:
-
-## Posix shell logging, use with:
-# . $(command -v slog.sh)
-stdenv.mkDerivation rec {
-  name = "slog-${version}";
-  version = "2017-10-27";
-
-  src = fetchFromGitHub {
-    owner = "makefu";
-    repo = "slog";
-    rev = "50367c3";
-    sha256 = "16wlh8xz430101lrxmgl2wangbbhvyj4pg8k5aibnh76sgj6x77r";
-  };
-
-  installPhase = ''
-    mkdir -p $out/bin
-    install -m755 slog.sh $out/bin
-  '';
-}
-- 
cgit v1.2.3


From 0c4460731a457c03a1716a74c57cdcf54df5c99b Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 2 Nov 2017 14:29:11 +0100
Subject: ma pkgs.pwqgen-ger: add archive.org mirror

---
 makefu/5pkgs/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'makefu/5pkgs')

diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index e99aa696..80a453dd 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -31,7 +31,10 @@ in {
     });
     pwqgen-ger = callPackage <stockholm/krebs/5pkgs/simple/passwdqc-utils> {
       wordset-file = super.pkgs.fetchurl {
-        url = https://gist.githubusercontent.com/makefu/b56f5554c9ef03fe6e09878962e6fd8d/raw/1f147efec51325bc9f80c823bad8381d5b7252f6/wordset_4k.c ;
+        urls = [
+          https://gist.githubusercontent.com/makefu/b56f5554c9ef03fe6e09878962e6fd8d/raw/1f147efec51325bc9f80c823bad8381d5b7252f6/wordset_4k.c
+          https://archive.org/download/nixos-stockholm-tarballs/pviar5j1gxiqcf3l34b4n2pil06xc8zf-wordset_4k.c
+        ];
         sha256 = "18ddzyh11bywrhzdkzvrl7nvgp5gdb4k1s0zxbz2bkhd14vi72bb";
       };
     };
-- 
cgit v1.2.3