From 05d85719fc4d3f1f01104fecf8ab7c1af5359588 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 12 Dec 2017 16:29:24 +0100
Subject: [PATCH 1/3] pkgs.apt-cacher-ng: rip
---
krebs/5pkgs/simple/apt-cacher-ng/default.nix | 21 --------------------
1 file changed, 21 deletions(-)
delete mode 100644 krebs/5pkgs/simple/apt-cacher-ng/default.nix
diff --git a/krebs/5pkgs/simple/apt-cacher-ng/default.nix b/krebs/5pkgs/simple/apt-cacher-ng/default.nix
deleted file mode 100644
index e3986713b..000000000
--- a/krebs/5pkgs/simple/apt-cacher-ng/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, cmake, doxygen, zlib, openssl, bzip2, pkgconfig, libpthreadstubs }:
-
-stdenv.mkDerivation rec {
- name = "apt-cacher-ng-${version}";
- version = "2";
-
- src = fetchurl {
- url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz";
- sha256 = "0bkc3012vinridl5ch46pwnxjalymx4wf6nxax64nm7bdkcj9azf";
- };
-
- NIX_LDFLAGS = "-lpthread";
- buildInputs = [ doxygen cmake zlib openssl bzip2 pkgconfig libpthreadstubs ];
-
- meta = {
- description = "A caching proxy specialized for linux distribution files";
- homepage = http://www.unix-ag.uni-kl.de/~bloch/acng/;
- license = stdenv.lib.licenses.gpl2;
- maintainers = [ stdenv.lib.maintainers.makefu ];
- };
-}
From 42cdfa733ca9e0432ba6096206ff34fb40b539db Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 12 Dec 2017 16:32:21 +0100
Subject: [PATCH 2/3] pkgs.passwdqc-utils: rip
---
krebs/5pkgs/simple/passwdqc-utils/default.nix | 37 -------------------
1 file changed, 37 deletions(-)
delete mode 100644 krebs/5pkgs/simple/passwdqc-utils/default.nix
diff --git a/krebs/5pkgs/simple/passwdqc-utils/default.nix b/krebs/5pkgs/simple/passwdqc-utils/default.nix
deleted file mode 100644
index 53e7f5482..000000000
--- a/krebs/5pkgs/simple/passwdqc-utils/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ 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"
- "SHARED_LIBDIR=$(out)/lib"
- "DEVEL_LIBDIR=$(out)/lib"
- "SECUREDIR=$(out)/lib/security"
- "INCLUDEDIR=$(out)/include"
- "MANDIR=$(out)/man" ];
-
- patchPhase = lib.optionalString (wordset-file != null) ''
- cp -f ${wordset-file} wordset_4k.c
- '';
-
- installTargets = "install_lib install_utils";
-
- meta = {
- description = "passwdqc utils (pwqgen,pwqcheck) and library";
- license = stdenv.lib.licenses.bsd3;
- maintainers = [ stdenv.lib.maintainers.makefu ];
- patforms = stdenv.lib.platforms.linux; # more installFlags must be set for Darwin,Solaris
- };
-}
From 4df164ff1a132146bd53f2183cbe8a0bfa7f92c6 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 12 Dec 2017 20:18:04 +0100
Subject: [PATCH 3/3] Revert "pkgs.passwdqc-utils: rip"
This reverts commit 42cdfa733ca9e0432ba6096206ff34fb40b539db.
---
krebs/5pkgs/simple/passwdqc-utils/default.nix | 37 +++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 krebs/5pkgs/simple/passwdqc-utils/default.nix
diff --git a/krebs/5pkgs/simple/passwdqc-utils/default.nix b/krebs/5pkgs/simple/passwdqc-utils/default.nix
new file mode 100644
index 000000000..53e7f5482
--- /dev/null
+++ b/krebs/5pkgs/simple/passwdqc-utils/default.nix
@@ -0,0 +1,37 @@
+{ 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"
+ "SHARED_LIBDIR=$(out)/lib"
+ "DEVEL_LIBDIR=$(out)/lib"
+ "SECUREDIR=$(out)/lib/security"
+ "INCLUDEDIR=$(out)/include"
+ "MANDIR=$(out)/man" ];
+
+ patchPhase = lib.optionalString (wordset-file != null) ''
+ cp -f ${wordset-file} wordset_4k.c
+ '';
+
+ installTargets = "install_lib install_utils";
+
+ meta = {
+ description = "passwdqc utils (pwqgen,pwqcheck) and library";
+ license = stdenv.lib.licenses.bsd3;
+ maintainers = [ stdenv.lib.maintainers.makefu ];
+ patforms = stdenv.lib.platforms.linux; # more installFlags must be set for Darwin,Solaris
+ };
+}