about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2014-07-04 21:22:58 +0400
committerMichael Raskin <7c6f434c@mail.ru>2014-07-04 21:23:09 +0400
commitca6dba33ad7cba7717b617c5f1ee31b3d8f44754 (patch)
treebcd68a1c41b3ae9fffddd48bca21cbd4e9f3d1ce
parent03a3246bc167922922c07b407eedfa030b47fecb (diff)
downloadnixlib-ca6dba33ad7cba7717b617c5f1ee31b3d8f44754.tar
nixlib-ca6dba33ad7cba7717b617c5f1ee31b3d8f44754.tar.gz
nixlib-ca6dba33ad7cba7717b617c5f1ee31b3d8f44754.tar.bz2
nixlib-ca6dba33ad7cba7717b617c5f1ee31b3d8f44754.tar.lz
nixlib-ca6dba33ad7cba7717b617c5f1ee31b3d8f44754.tar.xz
nixlib-ca6dba33ad7cba7717b617c5f1ee31b3d8f44754.tar.zst
nixlib-ca6dba33ad7cba7717b617c5f1ee31b3d8f44754.zip
Add Botan unstable branch - 1.11.9 release
-rw-r--r--pkgs/development/libraries/botan/default.upstream2
-rw-r--r--pkgs/development/libraries/botan/unstable.nix58
-rw-r--r--pkgs/development/libraries/botan/unstable.upstream9
-rw-r--r--pkgs/top-level/all-packages.nix1
4 files changed, 69 insertions, 1 deletions
diff --git a/pkgs/development/libraries/botan/default.upstream b/pkgs/development/libraries/botan/default.upstream
index becbf348b34e..8b51ede3bc91 100644
--- a/pkgs/development/libraries/botan/default.upstream
+++ b/pkgs/development/libraries/botan/default.upstream
@@ -1,8 +1,8 @@
 url http://botan.randombit.net/download.html
 version_link 'Botan-[0-9]+[.][0-9]*[02468]([.][0-9]+)?[.](tbz|tbz2|tar[.]bz2)$'
 ensure_version
-ensure_hash
 do_overwrite(){
+  ensure_hash
   set_var_value hash $CURRENT_HASH
   set_var_value baseVersion ${CURRENT_VERSION%.*}
   set_var_value revision ${CURRENT_VERSION##*.}
diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix
new file mode 100644
index 000000000000..677172dd3ac5
--- /dev/null
+++ b/pkgs/development/libraries/botan/unstable.nix
@@ -0,0 +1,58 @@
+x@{builderDefsPackage
+  , python
+  , bzip2, zlib, gmp, openssl
+  , boost
+  , ...}:
+builderDefsPackage
+(a :
+let
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    baseName="botan";
+    tarBaseName="Botan";
+    baseVersion = "1.11";
+    revision = "9";
+    version="${baseVersion}.${revision}";
+    name="${baseName}-${version}";
+    url="http://files.randombit.net/${baseName}/v${baseVersion}/${tarBaseName}-${version}.tbz";
+    hash = "0jgx5va042gmr6nc91p5dd59wnfxlz19mz2nnyv74pvwwmizs09m";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doConfigure" "doMakeInstall" "fixPkgConfig"];
+  configureCommand = "python configure.py --with-gnump --with-bzip2 --with-zlib --with-openssl";
+
+  fixPkgConfig = a.fullDepEntry ''
+    cd "$out"/lib/pkgconfig
+    ln -s botan-*.pc botan.pc || true
+  '' ["minInit" "doMakeInstall"];
+
+  meta = {
+    description = "Cryptographic algorithms library";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      unix;
+    inherit version;
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "http://files.randombit.net/botan/";
+    };
+  };
+}) x
diff --git a/pkgs/development/libraries/botan/unstable.upstream b/pkgs/development/libraries/botan/unstable.upstream
new file mode 100644
index 000000000000..9d539a2a6ea4
--- /dev/null
+++ b/pkgs/development/libraries/botan/unstable.upstream
@@ -0,0 +1,9 @@
+url http://botan.randombit.net/download.html
+version_link 'Botan-[0-9]+[.][0-9]+([.][0-9]+)?[.](tbz|tbz2|tar[.]bz2)$'
+ensure_version
+do_overwrite(){
+  ensure_hash
+  set_var_value hash $CURRENT_HASH
+  set_var_value baseVersion ${CURRENT_VERSION%.*}
+  set_var_value revision ${CURRENT_VERSION##*.}
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eef352fc1e84..d43a43a19f60 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4267,6 +4267,7 @@ let
   boostHeaders = callPackage ../development/libraries/boost/header-only-wrapper.nix { };
 
   botan = callPackage ../development/libraries/botan { };
+  botanUnstable = callPackage ../development/libraries/botan/unstable.nix { };
 
   box2d = callPackage ../development/libraries/box2d { };
   box2d_2_0_1 = callPackage ../development/libraries/box2d/2.0.1.nix { };