diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-12-15 19:32:38 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-12-15 19:32:38 +0100 |
| commit | 6b8e2555ef013b579cda57025b17d662e0f1fe1f (patch) | |
| tree | 5a83c673af26c9976acd5a5dfa20e09e06898047 /nixpkgs/pkgs/development/libraries/botan | |
| parent | 66ca7a150b5c051f0728f13134e6265cc46f370c (diff) | |
| parent | 02357adddd0889782362d999628de9d309d202dc (diff) | |
| download | nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar.gz nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar.bz2 nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar.lz nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar.xz nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar.zst nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/botan')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/botan/2.0.nix | 4 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/botan/3.0.nix | 6 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/botan/generic.nix | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/libraries/botan/2.0.nix b/nixpkgs/pkgs/development/libraries/botan/2.0.nix index e2b4aa880415..53b4e167a7d9 100644 --- a/nixpkgs/pkgs/development/libraries/botan/2.0.nix +++ b/nixpkgs/pkgs/development/libraries/botan/2.0.nix @@ -1,7 +1,7 @@ -{ callPackage, fetchpatch, ... } @ args: +{ callPackage, ... } @ args: callPackage ./generic.nix (args // { baseVersion = "2.19"; revision = "3"; - sha256 = "sha256-2uBH85nFpH8IfbXT2dno8RrkmF0UySjXHaGv+AGALVU="; + hash = "sha256-2uBH85nFpH8IfbXT2dno8RrkmF0UySjXHaGv+AGALVU="; }) diff --git a/nixpkgs/pkgs/development/libraries/botan/3.0.nix b/nixpkgs/pkgs/development/libraries/botan/3.0.nix index a9b6a7aa27d3..4c0eae63493a 100644 --- a/nixpkgs/pkgs/development/libraries/botan/3.0.nix +++ b/nixpkgs/pkgs/development/libraries/botan/3.0.nix @@ -1,9 +1,7 @@ -{ callPackage, fetchpatch, lib, ... } @ args: +{ callPackage, ... } @ args: callPackage ./generic.nix (args // { baseVersion = "3.2"; revision = "0"; - sha256 = "BJyEeDX89u86niBrM94F3TiZnDJeJHSCdypVmNnl7OM="; - # reconsider removing this platform marking, when MacOS uses Clang 14.0+ by default. - badPlatforms = lib.platforms.darwin; + hash = "sha256-BJyEeDX89u86niBrM94F3TiZnDJeJHSCdypVmNnl7OM="; }) diff --git a/nixpkgs/pkgs/development/libraries/botan/generic.nix b/nixpkgs/pkgs/development/libraries/botan/generic.nix index 795cd5189efe..8e053581e88b 100644 --- a/nixpkgs/pkgs/development/libraries/botan/generic.nix +++ b/nixpkgs/pkgs/development/libraries/botan/generic.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, python3, bzip2, zlib, gmp, boost # Passed by version specific builders -, baseVersion, revision, sha256 +, baseVersion, revision, hash , sourceExtension ? "tar.xz" , extraConfigureFlags ? "" , extraPatches ? [ ] @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "http://files.randombit.net/botan/v${baseVersion}/Botan-${version}.${sourceExtension}" "http://botan.randombit.net/releases/Botan-${version}.${sourceExtension}" ]; - inherit sha256; + inherit hash; }; patches = extraPatches; inherit postPatch; |