diff options
| author | maralorn <mail@maralorn.de> | 2023-06-19 23:22:52 +0200 |
|---|---|---|
| committer | maralorn <mail@maralorn.de> | 2023-06-19 23:22:52 +0200 |
| commit | 0f1be08db82219ddbd11af225792a60e622416a6 (patch) | |
| tree | bf21b582849e7093aade98aae6ff4f198a2a14b7 /pkgs/data/misc | |
| parent | 404d419499bc42e5163618fcfadcf42262970733 (diff) | |
| parent | f982d017f6658674bf80f15cfc5d15c22252c5c8 (diff) | |
| download | nixpkgs-0f1be08db82219ddbd11af225792a60e622416a6.tar nixpkgs-0f1be08db82219ddbd11af225792a60e622416a6.tar.gz nixpkgs-0f1be08db82219ddbd11af225792a60e622416a6.tar.bz2 nixpkgs-0f1be08db82219ddbd11af225792a60e622416a6.tar.lz nixpkgs-0f1be08db82219ddbd11af225792a60e622416a6.tar.xz nixpkgs-0f1be08db82219ddbd11af225792a60e622416a6.tar.zst nixpkgs-0f1be08db82219ddbd11af225792a60e622416a6.zip | |
Merge branch 'master' into haskell-updates
Diffstat (limited to 'pkgs/data/misc')
| -rw-r--r-- | pkgs/data/misc/cacert/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/data/misc/v2ray-domain-list-community/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index baa714576b6..6fd4a6641ce 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -30,7 +30,7 @@ let ])); extraCertificatesBundle = writeText "cacert-extra-certificates-bundle.crt" (lib.concatStringsSep "\n\n" extraCertificateStrings); - srcVersion = "3.89.1"; + srcVersion = "3.90"; version = if nssOverride != null then nssOverride.version else srcVersion; meta = with lib; { homepage = "https://curl.haxx.se/docs/caextract.html"; @@ -45,7 +45,7 @@ let src = if nssOverride != null then nssOverride.src else fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings ["."] ["_"] version}_RTM/src/nss-${version}.tar.gz"; - hash = "sha256-OtrtuecMPF9AYDv2CgHjNhkKbb4Bkp05XxawH+hKAVY="; + hash = "sha256-ms1lNMQdjq0Z/Kb8s//+0vnwnEN8PXn+5qTuZoqqk7Y="; }; dontBuild = true; diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 0f89ee5cf3f..de94a1c3bf7 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20230601044045"; + version = "20230614081211"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-AVJinqMaVIxq6Tne1b5N6yuszLQ0sgmAtH+sd+sbInA="; + hash = "sha256-hNFp5vBnFD/vBL6+kYYUaquQanr53ZvvuFP2WYj+mDg="; }; vendorHash = "sha256-lPOn296ngMCYdXoGNDG9okkLC5ryjKIL+UP98lyaKcg="; meta = with lib; { |