diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-02-22 10:43:06 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-03-11 16:17:56 +0000 |
commit | ca1aada113c0ebda1ab8667199f6453f8e01c4fc (patch) | |
tree | 55e402280096f62eb0bc8bcad5ce6050c5a0aec7 /nixpkgs/pkgs/development/libraries/botan | |
parent | e4df5a52a6a6531f32626f57205356a773ac2975 (diff) | |
parent | 93883402a445ad467320925a0a5dbe43a949f25b (diff) | |
download | nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.gz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.bz2 nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.lz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.xz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.zst nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.zip |
Merge commit '93883402a445ad467320925a0a5dbe43a949f25b'
Conflicts: nixpkgs/nixos/modules/programs/ssh.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/data/fonts/noto-fonts/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/botan')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/botan/2.0.upstream | 10 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/botan/default.upstream | 9 |
2 files changed, 0 insertions, 19 deletions
diff --git a/nixpkgs/pkgs/development/libraries/botan/2.0.upstream b/nixpkgs/pkgs/development/libraries/botan/2.0.upstream deleted file mode 100644 index 74eb1a2ca83f..000000000000 --- a/nixpkgs/pkgs/development/libraries/botan/2.0.upstream +++ /dev/null @@ -1,10 +0,0 @@ -url https://botan.randombit.net/ -version_link 'Botan-[0-9]+([.][0-9]+)*[.](tgz|tbz|tbz2|tar[.]bz2)$' -ensure_version -attribute_name botan2 -do_overwrite(){ - ensure_hash - set_var_value sha256 $CURRENT_HASH - set_var_value baseVersion ${CURRENT_VERSION%.*} - set_var_value revision ${CURRENT_VERSION##*.} -} diff --git a/nixpkgs/pkgs/development/libraries/botan/default.upstream b/nixpkgs/pkgs/development/libraries/botan/default.upstream deleted file mode 100644 index 43f6a3b268ee..000000000000 --- a/nixpkgs/pkgs/development/libraries/botan/default.upstream +++ /dev/null @@ -1,9 +0,0 @@ -url http://botan.randombit.net/download.html -version_link 'Botan-[0-9]+[.][0-9]*[02468]([.][0-9]+)?[.](tgz|tbz|tbz2|tar[.]bz2)$' -ensure_version -do_overwrite(){ - ensure_hash - set_var_value sha256 $CURRENT_HASH - set_var_value baseVersion ${CURRENT_VERSION%.*} - set_var_value revision ${CURRENT_VERSION##*.} -} |