Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-02-21 18:00:56 +00:00 committed by GitHub
commit bd56ae568b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
72 changed files with 462 additions and 297 deletions

View File

@ -36,6 +36,14 @@ in
default = "sabnzbd"; default = "sabnzbd";
description = lib.mdDoc "Group to run the service as"; description = lib.mdDoc "Group to run the service as";
}; };
openFirewall = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc ''
Open ports in the firewall for the sabnzbd web interface
'';
};
}; };
}; };
@ -43,17 +51,16 @@ in
###### implementation ###### implementation
config = mkIf cfg.enable { config = mkIf cfg.enable {
users.users = mkIf (cfg.user == "sabnzbd") {
users.users.sabnzbd = { sabnzbd = {
uid = config.ids.uids.sabnzbd; uid = config.ids.uids.sabnzbd;
group = "sabnzbd"; group = cfg.group;
description = "sabnzbd user"; description = "sabnzbd user";
home = "/var/lib/sabnzbd/"; };
createHome = true;
}; };
users.groups.sabnzbd = { users.groups = mkIf (cfg.group == "sabnzbd") {
gid = config.ids.gids.sabnzbd; sabnzbd.gid = config.ids.gids.sabnzbd;
}; };
systemd.services.sabnzbd = { systemd.services.sabnzbd = {
@ -63,10 +70,15 @@ in
serviceConfig = { serviceConfig = {
Type = "forking"; Type = "forking";
GuessMainPID = "no"; GuessMainPID = "no";
User = "${cfg.user}"; User = cfg.user;
Group = "${cfg.group}"; Group = cfg.group;
StateDirectory = "sabnzbd";
ExecStart = "${lib.getBin cfg.package}/bin/sabnzbd -d -f ${cfg.configFile}"; ExecStart = "${lib.getBin cfg.package}/bin/sabnzbd -d -f ${cfg.configFile}";
}; };
}; };
networking.firewall = mkIf cfg.openFirewall {
allowedTCPPorts = [ 8080 ];
};
}; };
} }

View File

@ -39,7 +39,7 @@ in {
}; };
extraAppsEnable = true; extraAppsEnable = true;
extraApps = { extraApps = {
inherit (pkgs."nextcloud${lib.versions.major config.services.nextcloud.package.version}Packages".apps) notify_push; inherit (pkgs."nextcloud${lib.versions.major config.services.nextcloud.package.version}Packages".apps) notify_push notes;
}; };
settings.trusted_proxies = [ "::1" ]; settings.trusted_proxies = [ "::1" ];
}; };
@ -92,5 +92,7 @@ in {
# redis cache should not be empty # redis cache should not be empty
nextcloud.fail('test "[]" = "$(redis-cli --json KEYS "*")"') nextcloud.fail('test "[]" = "$(redis-cli --json KEYS "*")"')
nextcloud.fail("curl -f http://nextcloud/nix-apps/notes/lib/AppInfo/Application.php")
''; '';
})) args })) args

View File

@ -107,7 +107,6 @@ stdenv.mkDerivation (finalAttrs: {
"--with-proj-share=${proj}/share/proj" "--with-proj-share=${proj}/share/proj"
"--with-pthread" "--with-pthread"
"--with-readline" "--with-readline"
"--with-wxwidgets"
"--with-zstd" "--with-zstd"
"--without-opengl" "--without-opengl"
] ++ lib.optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [

View File

@ -1,23 +1,23 @@
{ {
stable = { stable = {
chromedriver = { chromedriver = {
hash_darwin = "sha256-IDPdjq3FpLy6Y9xkR15mzbIal8wjeQzzWtWuZ4uKmzA="; hash_darwin = "sha256-Mdm+aOd8czNX7oJcNCSdu5TFwIlh5Y37OLdiPpOD+mk=";
hash_darwin_aarch64 = hash_darwin_aarch64 =
"sha256-3Mol45MrvrSqrpkKy2Trt0JFNfV4ekXTxEveUUGmJm4="; "sha256-ZF8nfAXX99I4x6RUEvQkiXZ/SMugXYYyzgC1SzcE1OE=";
hash_linux = "sha256-O8U4pZ76/N7q9bV7d0A+wlIqqaoz6WyfZQO4cIV2CIM="; hash_linux = "sha256-DIC7Ew7aCvtYMVXVXsnMItdeLPDdkNZXZH35I0ZdWEs=";
version = "121.0.6167.85"; version = "122.0.6261.57";
}; };
deps = { deps = {
gn = { gn = {
hash = "sha256-eD3KORYYuIH+94+BgL+yFD5lTQFvj/MqPU9DPiHc98s="; hash = "sha256-UhdDsq9JyP0efGpAaJ/nLp723BbjM6pkFPcAnQbgMKY=";
rev = "7367b0df0a0aa25440303998d54045bda73935a5"; rev = "f99e015ac35f689cfdbf46e4eb174e5d2da78d8e";
url = "https://gn.googlesource.com/gn"; url = "https://gn.googlesource.com/gn";
version = "2023-11-28"; version = "2024-01-22";
}; };
}; };
hash = "sha256-mLXBaW4KBieOiz2gRXfgA/KPdmUnNlpUIOqdj7CywcY="; hash = "sha256-VvurD1r89dI0ahaVDQ3yinGlHOfzzm7TkL09tF4nebE=";
hash_deb_amd64 = "sha256-UDgO1sJ7bggFTe7C36CnHYXjG9rM+ZqFCOzNyIDpQ0Y="; hash_deb_amd64 = "sha256-Q3AUKzUsRzW00+WLhuri86QzBGk/rlq5Hk+NdoRbbM4=";
version = "121.0.6167.184"; version = "122.0.6261.57";
}; };
ungoogled-chromium = { ungoogled-chromium = {
deps = { deps = {

View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "kube-capacity"; pname = "kube-capacity";
version = "0.7.4"; version = "0.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
owner = "robscott"; owner = "robscott";
repo = pname; repo = pname;
sha256 = "sha256-zf6e8+jkgJns1c71QLL1gd0zK34X7gJo1gS38A1DPJo="; sha256 = "sha256-zAwCz4Qs1OF/CdSmy9p4X9hL9iNkAH/EeSU2GgekzV8=";
}; };
vendorHash = "sha256-qfSya42wZEmJCC7o8zJQEv0BWrxTuBT2Jzcq/AfI+OE="; vendorHash = "sha256-YME4AXpHvr1bNuc/HoHxam+7ZkwLzjhIvFSfD4hga1A=";
meta = with lib; { meta = with lib; {
description = description =

View File

@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "cloudlog"; pname = "cloudlog";
version = "2.6.4"; version = "2.6.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "magicbug"; owner = "magicbug";
repo = "Cloudlog"; repo = "Cloudlog";
rev = version; rev = version;
hash = "sha256-5QY3llgI2wUp7xQssLMgU5CDx42rNLm77/vNnPv15r4="; hash = "sha256-RxA0joF+hqIL+eElVVwG0kxvzxkt3YsFaomf9GIHtCw=";
}; };
postPatch = '' postPatch = ''

View File

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "gitui"; pname = "gitui";
version = "0.24.3"; version = "0.25.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "extrawurst"; owner = "extrawurst";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-mT5toF4mKRP0dlwlfKHjmFFQJ/cWSb2vwg1uZbhZRhI="; hash = "sha256-1sr/7Um+qp3HZ5jUKlSnjqkDJGVtnztCsyFplWEs/Wg=";
}; };
cargoHash = "sha256-8j0NtJB2ErrpljPHSMRD/4IGZuqA8wLuzPnuQqxaXRg="; cargoHash = "sha256-EATj4UQUEZxkGY7sKKxUuWi5cA+IOjHnICUi3Fk3v9M=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

View File

@ -6,12 +6,12 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "streamlink"; pname = "streamlink";
version = "6.6.1"; version = "6.6.2";
format = "pyproject"; format = "pyproject";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-MfHiBgUHjTEUGfYVMOZ9R/7bWg8HOLt8/QQw2vGRA7E="; hash = "sha256-0UF8fFmG3BQ7xxHIqZ97iEsQ0lg/RLHD2t6n3wp15NU=";
}; };
nativeCheckInputs = with python3Packages; [ nativeCheckInputs = with python3Packages; [

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "nixpacks"; pname = "nixpacks";
version = "1.21.1"; version = "1.21.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "railwayapp"; owner = "railwayapp";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-7mW/75Bkss7mtYXfnwKH0YHASv6YAxuM8Ww4ur7VwpU="; sha256 = "sha256-GY5fwmwr2FAJB9SjTaghlC4GD6ECnect21VInTXseRE=";
}; };
cargoHash = "sha256-uo9cMVBRv9HEgICIpJomRKRInDXqnDaGCqnKIsBImBM="; cargoHash = "sha256-kXfNWAloMwpykv6zJS5g6ng8RGn+NBNgYJmUg/I7dBg=";
# skip test due FHS dependency # skip test due FHS dependency
doCheck = false; doCheck = false;

View File

@ -33,11 +33,11 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "apt"; pname = "apt";
version = "2.7.11"; version = "2.7.12";
src = fetchurl { src = fetchurl {
url = "mirror://debian/pool/main/a/apt/apt_${finalAttrs.version}.tar.xz"; url = "mirror://debian/pool/main/a/apt/apt_${finalAttrs.version}.tar.xz";
hash = "sha256-ZD5skWsyQSmGc5yStEwijMmQv0c/ikHWm5m1RdEMMqc="; hash = "sha256-5G0Wa1/Ih8LZvKet1+DM2lR7lit2LhJyoIwEJrqpnK8=";
}; };
# cycle detection; lib can't be split # cycle detection; lib can't be split

View File

@ -10,13 +10,13 @@
buildGoModule rec { buildGoModule rec {
pname = "hugo"; pname = "hugo";
version = "0.123.0"; version = "0.123.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gohugoio"; owner = "gohugoio";
repo = "hugo"; repo = "hugo";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-VGp+B+a4nX5oIc+YjslQHzXgC76MvMObKS6EXll1C3E="; hash = "sha256-hT4yFyf6j3KW9e8rYEbd2h9HtflGmPv0C44YDUkuHZw=";
}; };
vendorHash = "sha256-1cd0w9eIPSlhznOQaIiaPoIBnQ4DycVUbZwLOlJ+t8o="; vendorHash = "sha256-1cd0w9eIPSlhznOQaIiaPoIBnQ4DycVUbZwLOlJ+t8o=";

View File

@ -22,9 +22,9 @@
}: }:
stdenv.mkDerivation (self: { stdenv.mkDerivation (self: {
pname = "louvre"; pname = "louvre";
version = "1.2.0-2"; version = "1.2.1-2";
rev = "v${self.version}"; rev = "v${self.version}";
hash = "sha256-0l465kcGzfxnoTkfMCDFyU0Z4mFTjUHtKCN23ONQNoA="; hash = "sha256-jHMgn6EwWt9GMT8JvIUtUPbn9o1DZCzxiYC7RnoGZv0=";
src = fetchFromGitHub { src = fetchFromGitHub {
inherit (self) rev hash; inherit (self) rev hash;

View File

@ -4,13 +4,13 @@
}: }:
buildGoModule rec { buildGoModule rec {
pname = "nom"; pname = "nom";
version = "2.1.1"; version = "2.1.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "guyfedwards"; owner = "guyfedwards";
repo = "nom"; repo = "nom";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-yemEq61oUzoOrBZ7e6djNxbw/QqR5Fuhi1Y12n/AdrU="; hash = "sha256-PBhwIyGzWbXRTmp+IvFPqae4cbb6l6nIYcFheYkHlFI=";
}; };
vendorHash = "sha256-fP6yxfIQoVaBC9hYcrCyo3YP3ntEVDbDTwKMO9TdyDI="; vendorHash = "sha256-fP6yxfIQoVaBC9hYcrCyo3YP3ntEVDbDTwKMO9TdyDI=";

View File

@ -6,13 +6,13 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "oelint-adv"; pname = "oelint-adv";
version = "4.3.0"; version = "4.3.1";
format = "setuptools"; format = "setuptools";
src = fetchPypi { src = fetchPypi {
inherit version; inherit version;
pname = "oelint_adv"; pname = "oelint_adv";
hash = "sha256-G2wBy1nx05WiAtnNXp7Kvio4dA3rYJRVfdKm3a2ZF/g="; hash = "sha256-N8QNX6JuHVDKBLwGNwBROH8f+tcLrc1Mk21CiiOVHkI=";
}; };
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [

View File

@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication { python3.pkgs.buildPythonApplication {
pname = "renode-dts2repl"; pname = "renode-dts2repl";
version = "unstable-2024-02-16"; version = "unstable-2024-02-19";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "antmicro"; owner = "antmicro";
repo = "dts2repl"; repo = "dts2repl";
rev = "83c35ebd87c000f37a0b873e7c82134da7daa7a2"; rev = "d0bf509a04327bfe5a8542fdbcc71cf368bb9ac7";
hash = "sha256-ga9D/5MkAso9NVK7cv2JryOoDF+a2ORN4MVQ3uns/zk="; hash = "sha256-era8iyKOk5JzemSWk20ojjtoRsjSA43uzQC1ZFXUkZc=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -1055,7 +1055,7 @@ checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
[[package]] [[package]]
name = "spade" name = "spade"
version = "0.4.0" version = "0.6.0"
dependencies = [ dependencies = [
"atty", "atty",
"clap", "clap",
@ -1090,7 +1090,7 @@ dependencies = [
[[package]] [[package]]
name = "spade-ast" name = "spade-ast"
version = "0.4.0" version = "0.6.0"
dependencies = [ dependencies = [
"num", "num",
"spade-common", "spade-common",
@ -1098,7 +1098,7 @@ dependencies = [
[[package]] [[package]]
name = "spade-ast-lowering" name = "spade-ast-lowering"
version = "0.4.0" version = "0.6.0"
dependencies = [ dependencies = [
"itertools", "itertools",
"local-impl", "local-impl",
@ -1116,7 +1116,7 @@ dependencies = [
[[package]] [[package]]
name = "spade-common" name = "spade-common"
version = "0.4.0" version = "0.6.0"
dependencies = [ dependencies = [
"codespan", "codespan",
"codespan-reporting 0.12.0", "codespan-reporting 0.12.0",
@ -1142,7 +1142,7 @@ dependencies = [
[[package]] [[package]]
name = "spade-diagnostics" name = "spade-diagnostics"
version = "0.4.0" version = "0.6.0"
dependencies = [ dependencies = [
"codespan", "codespan",
"codespan-reporting 0.12.0", "codespan-reporting 0.12.0",
@ -1159,7 +1159,7 @@ dependencies = [
[[package]] [[package]]
name = "spade-hir" name = "spade-hir"
version = "0.4.0" version = "0.6.0"
dependencies = [ dependencies = [
"codespan-reporting 0.12.0", "codespan-reporting 0.12.0",
"colored", "colored",
@ -1177,7 +1177,7 @@ dependencies = [
[[package]] [[package]]
name = "spade-hir-lowering" name = "spade-hir-lowering"
version = "0.4.0" version = "0.6.0"
dependencies = [ dependencies = [
"codespan", "codespan",
"codespan-reporting 0.12.0", "codespan-reporting 0.12.0",
@ -1202,7 +1202,7 @@ dependencies = [
[[package]] [[package]]
name = "spade-macros" name = "spade-macros"
version = "0.4.0" version = "0.6.0"
dependencies = [ dependencies = [
"proc-macro-error", "proc-macro-error",
"proc-macro2", "proc-macro2",
@ -1213,7 +1213,7 @@ dependencies = [
[[package]] [[package]]
name = "spade-mir" name = "spade-mir"
version = "0.4.0" version = "0.6.0"
dependencies = [ dependencies = [
"codespan", "codespan",
"codespan-reporting 0.12.0", "codespan-reporting 0.12.0",
@ -1234,7 +1234,7 @@ dependencies = [
[[package]] [[package]]
name = "spade-parser" name = "spade-parser"
version = "0.4.0" version = "0.6.0"
dependencies = [ dependencies = [
"codespan", "codespan",
"codespan-reporting 0.12.0", "codespan-reporting 0.12.0",
@ -1253,7 +1253,7 @@ dependencies = [
[[package]] [[package]]
name = "spade-python" name = "spade-python"
version = "0.4.0" version = "0.6.0"
dependencies = [ dependencies = [
"codespan-reporting 0.12.0", "codespan-reporting 0.12.0",
"color-eyre", "color-eyre",
@ -1282,7 +1282,7 @@ dependencies = [
[[package]] [[package]]
name = "spade-simulation-ext" name = "spade-simulation-ext"
version = "0.4.0" version = "0.6.0"
dependencies = [ dependencies = [
"codespan-reporting 0.12.0", "codespan-reporting 0.12.0",
"color-eyre", "color-eyre",
@ -1310,7 +1310,7 @@ dependencies = [
[[package]] [[package]]
name = "spade-tests" name = "spade-tests"
version = "0.4.0" version = "0.6.0"
dependencies = [ dependencies = [
"codespan-reporting 0.12.0", "codespan-reporting 0.12.0",
"colored", "colored",
@ -1338,7 +1338,7 @@ dependencies = [
[[package]] [[package]]
name = "spade-typeinference" name = "spade-typeinference"
version = "0.4.0" version = "0.6.0"
dependencies = [ dependencies = [
"assert_matches", "assert_matches",
"codespan", "codespan",
@ -1361,7 +1361,7 @@ dependencies = [
[[package]] [[package]]
name = "spade-types" name = "spade-types"
version = "0.4.0" version = "0.6.0"
dependencies = [ dependencies = [
"num", "num",
"serde", "serde",
@ -1370,7 +1370,7 @@ dependencies = [
[[package]] [[package]]
name = "spade-wordlength-inference" name = "spade-wordlength-inference"
version = "0.4.0" version = "0.6.0"
dependencies = [ dependencies = [
"codespan", "codespan",
"codespan-reporting 0.12.0", "codespan-reporting 0.12.0",

View File

@ -6,13 +6,13 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "spade"; pname = "spade";
version = "0.5.0"; version = "0.6.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "spade-lang"; owner = "spade-lang";
repo = "spade"; repo = "spade";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-PvheMYpsDWAXPf8K3K8yloCH0UTjzzVPuMBlcGC1xKU="; hash = "sha256-MNMKUhXVBhSn91uTVCuxozJ2BVFQAX/YdnCPOztGQyM=";
# only needed for vatch, which contains test data # only needed for vatch, which contains test data
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -26,11 +26,6 @@ rustPlatform.buildRustPackage rec {
}; };
}; };
# Cargo.lock is outdated
postConfigure = ''
cargo metadata --offline
'';
meta = with lib; { meta = with lib; {
description = "A better hardware description language"; description = "A better hardware description language";
homepage = "https://gitlab.com/spade-lang/spade"; homepage = "https://gitlab.com/spade-lang/spade";

View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "spicetify-cli"; pname = "spicetify-cli";
version = "2.31.3"; version = "2.32.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "spicetify"; owner = "spicetify";
repo = "spicetify-cli"; repo = "spicetify-cli";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-NCyt0fwcLhCy4XreYUoOKC6zHejffRmBTOBJLA0Q/yI="; hash = "sha256-GUtQwSiC/2wzJmPE0uqJHvLyrIM+5B2YARK9WAQex8k=";
}; };
vendorHash = "sha256-9rYShpUVI3KSY6UgGmoXo899NkUezkAAkTgFPdq094E="; vendorHash = "sha256-9rYShpUVI3KSY6UgGmoXo899NkUezkAAkTgFPdq094E=";

View File

@ -1,14 +0,0 @@
fetchurl:
let
keywordFix = fetchurl {
url = "http://bugs.icu-project.org/trac/changeset/39484?format=diff";
name = "icu-changeset-39484.diff";
sha256 = "0hxhpgydalyxacaaxlmaddc1sjwh65rsnpmg0j414mnblq74vmm8";
};
in
import ./base.nix {
version = "58.2";
sha256 = "036shcb3f8bm1lynhlsb4kpjm9s9c2vdiir01vg216rs2l8482ib";
patches = [ keywordFix ];
patchFlags = [ "-p4" ];
}

View File

@ -1,4 +0,0 @@
import ./base.nix {
version = "60.2";
sha256 = "065l3n0q9wqaw8dz20x82srshhm6i987fr9ync5xf9mr6n7ylwzh";
}

View File

@ -1,16 +0,0 @@
{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, nativeBuildRoot, testers
, buildRootOnly ? false
}:
import ./base.nix {
version = "63.1";
sha256 = "17fbk0lm2clsxbmjzvyp245ayx0n4chji3ky1f3fbz2ljjv91i05";
patches = [
# https://bugzilla.mozilla.org/show_bug.cgi?id=1499398
(fetchpatch {
url = "https://github.com/unicode-org/icu/commit/8baff8f03e07d8e02304d0c888d0bb21ad2eeb01.patch";
sha256 = "1awfa98ljcf95a85cssahw6bvdnpbq5brf1kgspy14w4mlmhd0jb";
})
];
patchFlags = [ "-p3" ];
} { inherit stdenv lib fetchurl fixDarwinDylibNames nativeBuildRoot testers buildRootOnly; }

View File

@ -1,4 +0,0 @@
import ./base.nix {
version = "64.2";
sha256 = "0v0xsf14xwlj125y9fd8lrhsaych4d8liv8gr746zng6g225szb2";
}

View File

@ -1,4 +0,0 @@
import ./base.nix {
version = "66.1";
sha256 = "0bharwzc9nzkbrcf405z2nb3h7q0711z450arz0mjmdrk8hg58sj";
}

View File

@ -1,4 +0,0 @@
import ./base.nix {
version = "67.1";
sha256 = "1p6mhvxl0xr2n0g6xdps3mwzwlv6mjsz3xlpm793p9aiybb0ra4l";
}

View File

@ -1,4 +0,0 @@
import ./base.nix {
version = "68.2";
sha256 = "09fng7a80xj8d5r1cgbgq8r47dsw5jsr6si9p2cj2ylhwgg974f7";
}

View File

@ -1,4 +0,0 @@
import ./base.nix {
version = "69.1";
sha256 = "0icps0avkwy5df3wwc5kybxcg63hcgk4phdh9g244g0xrmx7pfjc";
}

View File

@ -1,4 +0,0 @@
import ./base.nix {
version = "70.1";
sha256 = "1m9zgkaf5lyh65nyc6n0n5bs2f5k53nnj1ih6nskpwbvq4l5884d";
}

View File

@ -1,4 +0,0 @@
import ./base.nix {
version = "71.1";
sha256 = "sha256-Z6fm5R9h+vEwa2k1Mz4TssSKvY2m0vRs5q3KJLHiHr8=";
}

View File

@ -1,4 +0,0 @@
import ./base.nix {
version = "72.1";
sha256 = "sha256-otLTghcJKn7VZjXjRGf5L5drNw4gGCrTJe3qZoGnHWg=";
}

View File

@ -1,4 +0,0 @@
import ./base.nix {
version = "73.2";
sha256 = "sha256-gYqAcS7TyqzZtlIwXgGvx/oWfm8ulJltpEuQwqtgTOE=";
}

View File

@ -0,0 +1,90 @@
{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, testers, buildPackages }:
let
make-icu = (import ./make-icu.nix) {
inherit stdenv lib fetchurl fixDarwinDylibNames testers;
};
in
{
icu74 = make-icu {
version = "74.2";
hash = "sha256-aNsIIhKpbW9T411g9H04uWLp+dIHp0z6x4Apro/14Iw=";
nativeBuildRoot = buildPackages.icu74.override { buildRootOnly = true; };
};
icu73 = make-icu {
version = "73.2";
hash = "sha256-gYqAcS7TyqzZtlIwXgGvx/oWfm8ulJltpEuQwqtgTOE=";
nativeBuildRoot = buildPackages.icu73.override { buildRootOnly = true; };
};
icu72 = make-icu {
version = "72.1";
hash = "sha256-otLTghcJKn7VZjXjRGf5L5drNw4gGCrTJe3qZoGnHWg=";
nativeBuildRoot = buildPackages.icu72.override { buildRootOnly = true; };
};
icu71 = make-icu {
version = "71.1";
hash = "sha256-Z6fm5R9h+vEwa2k1Mz4TssSKvY2m0vRs5q3KJLHiHr8=";
nativeBuildRoot = buildPackages.icu71.override { buildRootOnly = true; };
};
icu70 = make-icu {
version = "70.1";
hash = "sha256-jSBUKMF78Tu1NTAGae0oszihV7HAGuZtMdDT4tR8P9U=";
nativeBuildRoot = buildPackages.icu70.override { buildRootOnly = true; };
};
icu69 = make-icu {
version = "69.1";
hash = "sha256-TLp7es0dPELES7DBS+ZjcJjH+vKzMM6Ha8XzuRXQl0U=";
nativeBuildRoot = buildPackages.icu69.override { buildRootOnly = true; };
};
icu68 = make-icu {
version = "68.2";
hash = "sha256-x5GT3uOQeiGZuClqk7UsXLdDMsJvPRZyaUh2gNR51iU=";
nativeBuildRoot = buildPackages.icu68.override { buildRootOnly = true; };
};
icu67 = make-icu {
version = "67.1";
hash = "sha256-lKgM1vJRpTvSqZf28bWsZlP+eR36tm4esCJ3QPuG1dw=";
nativeBuildRoot = buildPackages.icu67.override { buildRootOnly = true; };
};
icu66 = make-icu {
version = "66.1";
hash = "sha256-UqPyIJq5VVnBzwoU8kM4AB84lhW/AOJYXvPbxD7PCi4=";
nativeBuildRoot = buildPackages.icu66.override { buildRootOnly = true; };
};
icu64 = make-icu {
version = "64.2";
hash = "sha256-Yn1dhHjm2W/IyQ/tSFEjkHmlYaaoueSLCJLyToLTHWw=";
nativeBuildRoot = buildPackages.icu64.override { buildRootOnly = true; };
};
icu63 = make-icu {
version = "63.1";
hash = "sha256-BcSQtpRU/OWGC36OKCEjFnSvChHX7y/r6poyUSmYy50=";
nativeBuildRoot = buildPackages.icu63.override { buildRootOnly = true; };
patches = [
# https://bugzilla.mozilla.org/show_bug.cgi?id=1499398
(fetchpatch {
url = "https://github.com/unicode-org/icu/commit/8baff8f03e07d8e02304d0c888d0bb21ad2eeb01.patch";
sha256 = "1awfa98ljcf95a85cssahw6bvdnpbq5brf1kgspy14w4mlmhd0jb";
})
];
patchFlags = [ "-p3" ];
};
icu60 = make-icu {
version = "60.2";
hash = "sha256-8HPqjzW5JtcLsz5ld1CKpkKosxaoA/Eb4grzhIEdtBg=";
nativeBuildRoot = buildPackages.icu60.override { buildRootOnly = true; };
};
icu58 = make-icu {
version = "58.2";
hash = "sha256-KwpEEBU6myDeDiDH2LZgSacq7yRLU2g9DXUhNxaD2gw=";
nativeBuildRoot = buildPackages.icu58.override { buildRootOnly = true; };
patches = [
(fetchurl {
url = "http://bugs.icu-project.org/trac/changeset/39484?format=diff";
name = "icu-changeset-39484.diff";
sha256 = "0hxhpgydalyxacaaxlmaddc1sjwh65rsnpmg0j414mnblq74vmm8";
})
];
patchFlags = [ "-p4" ];
};
}

View File

@ -1,8 +1,8 @@
{ version, sha256, patches ? [], patchFlags ? [] }: { stdenv, lib, fetchurl, fixDarwinDylibNames, testers }:
{ stdenv, lib, fetchurl, fixDarwinDylibNames
# Cross-compiled icu4c requires a build-root of a native compile { version, hash, patches ? [], patchFlags ? []
# Cross-compiled icu4c requires a build-root of a native compile
, buildRootOnly ? false, nativeBuildRoot , buildRootOnly ? false, nativeBuildRoot
, testers
}: }:
let let
@ -11,7 +11,7 @@ let
baseAttrs = { baseAttrs = {
src = fetchurl { src = fetchurl {
url = "https://github.com/unicode-org/icu/releases/download/release-${lib.replaceStrings [ "." ] [ "-" ] version}/icu4c-${lib.replaceStrings [ "." ] [ "_" ] version}-src.tgz"; url = "https://github.com/unicode-org/icu/releases/download/release-${lib.replaceStrings [ "." ] [ "-" ] version}/icu4c-${lib.replaceStrings [ "." ] [ "_" ] version}-src.tgz";
inherit sha256; inherit hash;
}; };
postUnpack = '' postUnpack = ''

View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl }: { lib, stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.25.0"; version = "1.26.0";
pname = "commons-compress"; pname = "commons-compress";
src = fetchurl { src = fetchurl {
url = "mirror://apache/commons/compress/binaries/${pname}-${version}-bin.tar.gz"; url = "mirror://apache/commons/compress/binaries/${pname}-${version}-bin.tar.gz";
sha256 = "sha256-isxV/gTOjVQW3716cr8ZrlLnOn8YWWr6p1SHYlwhdvA="; sha256 = "sha256-AXdkqMrzTtURpPXKOmXxo0RnfFtflcDf6mmVmqVFz5k=";
}; };
installPhase = '' installPhase = ''

View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libks"; pname = "libks";
version = "2.0.3"; version = "2.0.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "signalwire"; owner = "signalwire";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-iAgiGo/PMG0L4S/ZqSPL7Hl8akCNyva4JhaOkcHit8w="; sha256 = "sha256-G2ZsTm7qyEhkys+3lcuq1VsKTz3RpfodDekecRRk++w=";
}; };
patches = [ patches = [

View File

@ -362,7 +362,7 @@ let
nyxt-gtk = build-asdf-system { nyxt-gtk = build-asdf-system {
pname = "nyxt"; pname = "nyxt";
version = "3.11.2"; version = "3.11.3";
lispLibs = (with super; [ lispLibs = (with super; [
alexandria alexandria
@ -470,8 +470,8 @@ let
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "atlas-engineer"; owner = "atlas-engineer";
repo = "nyxt"; repo = "nyxt";
rev = "3.11.2"; rev = "3.11.3";
hash = "sha256-D89bPsiMj0SNlt1IlC19hk90mmXAvmZgyjzXw2g7570="; hash = "sha256-KkVn2sTvEYD9OYPezlckMdhMvQ2LKETwmsn+P1Ti424=";
}; };
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.makeWrapper ];

View File

@ -3,29 +3,34 @@
, fetchPypi , fetchPypi
, pefile , pefile
, pythonOlder , pythonOlder
, setuptools
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "autoit-ripper"; pname = "autoit-ripper";
version = "1.1.1"; version = "1.1.2";
format = "setuptools"; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-a30SDJdKoljWjV0O1sZ35NnQPFcJ0XOPcmTanozWpHY="; hash = "sha256-+BHWDkeVewoRUgaHln5TyoajpCvJiowCiC2dFYyp1MA=";
}; };
postPatch = ''
substituteInPlace requirements.txt \
--replace-fail "pefile==2019.4.18" "pefile>=2019.4.18"
'';
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [ propagatedBuildInputs = [
pefile pefile
]; ];
postPatch = ''
substituteInPlace requirements.txt \
--replace "pefile==2019.4.18" "pefile>=2019.4.18"
'';
# Project has no tests # Project has no tests
doCheck = false; doCheck = false;
@ -36,6 +41,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Python module to extract AutoIt scripts embedded in PE binaries"; description = "Python module to extract AutoIt scripts embedded in PE binaries";
homepage = "https://github.com/nazywam/AutoIt-Ripper"; homepage = "https://github.com/nazywam/AutoIt-Ripper";
changelog = "https://github.com/nazywam/AutoIt-Ripper/releases/tag/v${version}";
license = with licenses; [ mit ]; license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ]; maintainers = with maintainers; [ fab ];
}; };

View File

@ -15,7 +15,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "blackjax"; pname = "blackjax";
version = "1.1.0"; version = "1.1.1";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "blackjax-devs"; owner = "blackjax-devs";
repo = "blackjax"; repo = "blackjax";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-VAsCDI0rEqx0UJlD82wbZ8KuMi6LOjUlO6YzqnOfAGk="; hash = "sha256-6+ElY1F8oRCtWT4a/LIG6hYMthlq5mDx2baKAc6zIns=";
}; };
nativeBuildInputs = [ setuptools-scm ]; nativeBuildInputs = [ setuptools-scm ];

View File

@ -14,14 +14,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "bqplot"; pname = "bqplot";
version = "0.12.42"; version = "0.12.43";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-mUhvdMq8/f+EHf7kG6bStHeC2Fo0/zajSiI9Q//Apyk="; hash = "sha256-8rRp0fA99PUYc8sEBqJLVs30qDX8WqlWB3b8Y2uLNEk=";
}; };
# upstream seems in flux for 0.13 release. they seem to want to migrate from # upstream seems in flux for 0.13 release. they seem to want to migrate from

View File

@ -0,0 +1,74 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch
, poetry-core
, aiohttp
, googleapis-common-protos
, grpcio
, protobuf
, requests
, semver
, toposort
#, async_exit_stack
#, dataclasses
, google-auth
, oauthlib
, prometheus-client
, pygments
, pyopenssl
, typing-extensions
}:
buildPythonPackage rec {
pname = "dazl";
version = "7.11.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-IErym/Fd8G75NOa+xOyV87UNmEaB31XPvg8GWCSP7k8=";
};
patches = [
# Merged, remove this next release
(fetchpatch {
url = "https://github.com/digital-asset/dazl-client/pull/428.patch";
sha256 = "sha256-Gx9W1XkvMPg8FAOAXijDF5QnMbntk5mR0q5+o5i2KAE=";
})
];
format = "pyproject";
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiohttp
googleapis-common-protos
grpcio
protobuf
requests
semver
toposort
# optional
#async-exit-stack
#dataclasses
google-auth
oauthlib
prometheus-client
pygments
pyopenssl
typing-extensions
];
meta = with lib; {
description = "High-level Ledger API client for Daml ledgers";
license = licenses.apsl20;
};
}

View File

@ -39,7 +39,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "diffusers"; pname = "diffusers";
version = "0.26.2"; version = "0.26.3";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -48,7 +48,7 @@ buildPythonPackage rec {
owner = "huggingface"; owner = "huggingface";
repo = "diffusers"; repo = "diffusers";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-mIwB4Fk5m6GUbiOXaZqY18eLLXkocL/GqCfHQbLgrJk="; hash = "sha256-1pIe1OU+vIrHM6KIZtHRMXklBZrugDV+I/OBNQYqvXI=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -10,12 +10,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "dvc-ssh"; pname = "dvc-ssh";
version = "4.0.0"; version = "4.1.1";
pyproject = true; pyproject = true;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-WaWcoWKXauNHZRFDt+MnqpFWjxzya+yAo0TRNQURViA="; hash = "sha256-lvC6oAXQR4u7s+11n6NgQExPc9yrq3JAmmXtuOw22tI=";
}; };
pythonRemoveDeps = [ pythonRemoveDeps = [

View File

@ -1,4 +1,5 @@
{ lib { lib
, bleak
, bleak-retry-connector , bleak-retry-connector
, bluetooth-data-tools , bluetooth-data-tools
, bluetooth-sensor-state-data , bluetooth-sensor-state-data
@ -6,29 +7,36 @@
, fetchFromGitHub , fetchFromGitHub
, home-assistant-bluetooth , home-assistant-bluetooth
, poetry-core , poetry-core
, pytest-asyncio
, pytestCheckHook , pytestCheckHook
, pythonOlder , pythonOlder
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "oralb-ble"; pname = "oralb-ble";
version = "0.17.6"; version = "0.18.0";
format = "pyproject"; pyproject = true;
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Bluetooth-Devices"; owner = "Bluetooth-Devices";
repo = pname; repo = "oralb-ble";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-6LnZ+Y68sl0uA5i764n4fFJnPeo+bAi/xgEvTK6LkXY="; hash = "sha256-e6L8HXpqOAHnEktIJ1N1atC5QXno669W3c/S7cISa48=";
}; };
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail " --cov=oralb_ble --cov-report=term-missing:skip-covered" ""
'';
nativeBuildInputs = [ nativeBuildInputs = [
poetry-core poetry-core
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
bleak
bleak-retry-connector bleak-retry-connector
bluetooth-data-tools bluetooth-data-tools
bluetooth-sensor-state-data bluetooth-sensor-state-data
@ -36,18 +44,19 @@ buildPythonPackage rec {
]; ];
nativeCheckInputs = [ nativeCheckInputs = [
pytest-asyncio
pytestCheckHook pytestCheckHook
]; ];
postPatch = ''
substituteInPlace pyproject.toml \
--replace " --cov=oralb_ble --cov-report=term-missing:skip-covered" ""
'';
pythonImportsCheck = [ pythonImportsCheck = [
"oralb_ble" "oralb_ble"
]; ];
disabledTests = [
# Test is outdated, TypeError: BLEDevice.__init__() missing 2 required...
"test_async_poll"
];
meta = with lib; { meta = with lib; {
description = "Library for Oral B BLE devices"; description = "Library for Oral B BLE devices";
homepage = "https://github.com/Bluetooth-Devices/oralb-ble"; homepage = "https://github.com/Bluetooth-Devices/oralb-ble";

View File

@ -9,20 +9,25 @@
, spglib , spglib
, pytestCheckHook , pytestCheckHook
, pythonOlder , pythonOlder
, setuptools
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "phonopy"; pname = "phonopy";
version = "2.21.1"; version = "2.21.2";
format = "setuptools"; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-k9DyPb0IUYHuB99wpNUIt76D66M9/wz/CdXq8Kapv2E="; hash = "sha256-3DCfMI41J/H9RjKj0376NnADp2VzHKnGcvgYoLnluTY=";
}; };
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [ propagatedBuildInputs = [
h5py h5py
matplotlib matplotlib

View File

@ -8,14 +8,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "sphinxcontrib-plantuml"; pname = "sphinxcontrib-plantuml";
version = "0.27"; version = "0.28";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-iXV3ju2cFCpC7NxOzYMTLewGkMA1yueIwSN1Dq1SZwM="; hash = "sha256-zpNirT1LvMTDDf38MIqsrSwHs0RjUxZoGnESabjgC+o=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -13,7 +13,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "sqlmodel"; pname = "sqlmodel";
version = "0.0.14"; version = "0.0.16";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "tiangolo"; owner = "tiangolo";
repo = "sqlmodel"; repo = "sqlmodel";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-EEOS7c0ospo7qjqPQkKwYXeVmBR5DueONzmjspV6w7w="; hash = "sha256-hDJcekn0ExYUCs8kBZkJzsWqXsB/cI6RbW3EhRCCioM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -26,20 +26,25 @@
, oslotest , oslotest
, bash , bash
, python , python
, setuptools
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "tempest"; pname = "tempest";
version = "36.0.0"; version = "37.0.0";
format = "setuptools"; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-97Z5C7IluOXSkkUamFuljzzvD3QxdHZ/p8mXE9jW/2I="; hash = "sha256-z9DCHlBetJ4wWcwfzIWf+TLKKNcCTKzpVs+2zgmuAyc=";
}; };
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [ propagatedBuildInputs = [
pbr pbr
cliff cliff

View File

@ -8,7 +8,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "tesla-fleet-api"; pname = "tesla-fleet-api";
version = "0.4.3"; version = "0.4.4";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.10"; disabled = pythonOlder "3.10";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "Teslemetry"; owner = "Teslemetry";
repo = "python-tesla-fleet-api"; repo = "python-tesla-fleet-api";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-HsD7Q12Pa2gzEaRvZ2WEMiJDilgxgBHcHuptecJAZTI="; hash = "sha256-80VjSg94gCXzqy6Z/yuDblYgo4TlJdxR+jsOiY/Zhng=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -0,0 +1,64 @@
{ lib
, fetchFromGitHub
, pythonOlder
, buildPythonPackage
, poetry-core
, backports-zoneinfo
, tzdata
, pytestCheckHook
, pytest-mypy-plugins
, hypothesis
, freezegun
}:
buildPythonPackage rec {
pname = "whenever";
version = "0.3.4";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "ariebovenberg";
repo = "whenever";
rev = version;
hash = "sha256-pVbR9KYothEPJUhvFA3hDnLcKp7hvU8ntxvkYrKxQfQ=";
};
postPatch = ''
# unrecognized arguments since we don't use pytest-benchmark in nixpkgs
substituteInPlace pytest.ini \
--replace-fail '--benchmark-disable' '#--benchmark-disable'
'';
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
tzdata
] ++ lib.optionals (pythonOlder "3.9") [
backports-zoneinfo
];
pythonImportsCheck = [ "whenever" ];
nativeCheckInputs = [
pytestCheckHook
pytest-mypy-plugins
hypothesis
freezegun
];
# early TDD, many tests are failing
# TODO: try enabling on bump
doCheck = false;
meta = with lib; {
description = "Strict, predictable, and typed datetimes";
homepage = "https://github.com/ariebovenberg/whenever";
changelog = "https://github.com/ariebovenberg/whenever/blob/${src.rev}/CHANGELOG.rst";
license = licenses.mit;
maintainers = with maintainers; [ pbsds ];
};
}

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mill"; pname = "mill";
version = "0.11.6"; version = "0.11.7";
src = fetchurl { src = fetchurl {
url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly"; url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly";
hash = "sha256-vGhjnOKvR2RdgFx3WsM217SO9gcKZknPaf7LKo3SJPU="; hash = "sha256-iijKZlQoiIWos+Kdq9hIgiM5yM7xCf11abrJ71LO9jA=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

View File

@ -2,34 +2,36 @@
, rustPlatform , rustPlatform
, fetchCrate , fetchCrate
, pkg-config , pkg-config
, libgit2_1_5 , libgit2
, openssl , openssl
, zlib , zlib
, stdenv , stdenv
, Security , Security
, SystemConfiguration
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-audit"; pname = "cargo-audit";
version = "0.18.3"; version = "0.19.0";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
hash = "sha256-8KLH6aPZhHtxC4hbMaebv1JiVkZH8p5QqnUXkJrmr4w="; hash = "sha256-NPRtSoITOS9i/v9hgdULVSmLaFbXZZeoO4SdqqANDxk=";
}; };
cargoHash = "sha256-8MOZvhREm4ch2flstx7J25j8mvwV3uGez5f1xkZ+S7I="; cargoHash = "sha256-cQ2ZEZJ7PgNUxzZXR9Of1R5v2wu1b3xOlENu1DZU/rQ=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
]; ];
buildInputs = [ buildInputs = [
libgit2_1_5 libgit2
openssl openssl
zlib zlib
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
Security Security
SystemConfiguration
]; ];
buildFeatures = [ "fix" ]; buildFeatures = [ "fix" ];

View File

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-hack"; pname = "cargo-hack";
version = "0.6.19"; version = "0.6.20";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
hash = "sha256-dsuf3+GYsIL6B64Belj6SF9NLsZCd62VkpcDUrnr14U="; hash = "sha256-hkw7I9JFTRspYzXtKbpbOVN9sPzUxrRiTL2WjJukY/c=";
}; };
cargoHash = "sha256-FGZ1Gc7LT1wee2vHMCIo2xvKvz8oj0R6oINAl/y7mKA="; cargoHash = "sha256-DKqcwzAyR0drodDVlccXRSRjjAapJ6nP4aS0CtKtGX4=";
# some necessary files are absent in the crate version # some necessary files are absent in the crate version
doCheck = false; doCheck = false;

View File

@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
version = upstream-info.version; version = upstream-info.version;
src = fetchurl { src = fetchurl {
url = "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/${version}/${spec.system}/chromedriver-${spec.system}.zip"; url = "https://storage.googleapis.com/chrome-for-testing-public/${version}/${spec.system}/chromedriver-${spec.system}.zip";
hash = spec.hash; hash = spec.hash;
}; };

View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "android-udev-rules"; pname = "android-udev-rules";
version = "20240114"; version = "20240221";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "M0Rf30"; owner = "M0Rf30";
repo = "android-udev-rules"; repo = "android-udev-rules";
rev = version; rev = version;
hash = "sha256-qf+KcEcWOsgLMifUOqNbi5t4s62p1gUfna45MyD01U0="; hash = "sha256-Zbztl8ZFLS2UME8LtbahINKk6OUG5jo0O07awMXCPWY=";
}; };
installPhase = '' installPhase = ''

View File

@ -7,13 +7,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rtl8821ce"; pname = "rtl8821ce";
version = "${kernel.version}-unstable-2023-05-04"; version = "${kernel.version}-unstable-2024-01-20";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tomaspinho"; owner = "tomaspinho";
repo = "rtl8821ce"; repo = "rtl8821ce";
rev = "a478095a45d8aa957b45be4f9173c414efcacc6f"; rev = "66983b69120a13699acf40a12979317f29012111";
hash = "sha256-xqVxylKhL7vbC7m5Av6ven5i7OBkS2RHxrKzLOVBlgE="; hash = "sha256-Zxb9cOgP67QdCeTNEme0tAsBqd9j/2k+gcE1QKkUQU4=";
}; };
hardeningDisable = [ "pic" ]; hardeningDisable = [ "pic" ];

View File

@ -1,6 +1,6 @@
{ {
"name": "matrix-hookshot", "name": "matrix-hookshot",
"version": "5.1.2", "version": "5.2.0",
"description": "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA.", "description": "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA.",
"main": "lib/app.js", "main": "lib/app.js",
"repository": "https://github.com/matrix-org/matrix-hookshot", "repository": "https://github.com/matrix-org/matrix-hookshot",
@ -114,6 +114,6 @@
"ts-jest": "^29.1.1", "ts-jest": "^29.1.1",
"ts-node": "^10.9.1", "ts-node": "^10.9.1",
"typescript": "^5.3.3", "typescript": "^5.3.3",
"vite": "^5.0.10" "vite": "^5.0.12"
} }
} }

View File

@ -1,6 +1,6 @@
{ {
"version": "5.1.2", "version": "5.2.0",
"srcHash": "sha256-dBuk/kpU5/GnwoTDh8FdnetK2hEBBTwrUA3fP/L9mWU=", "srcHash": "sha256-YRc883pk9ibsg2osSyggfHGBjQiXCFqacrPswi8kTuA=",
"yarnHash": "100lfm0pr0l33j1bl9zmw1s7fm4ihrwppyvq6x8ahx1sjrr1m0lp", "yarnHash": "0nps2wbpkaivi9wb9zcqsrg77w9mm7inls9jqsx7xmyn4ashbs1p",
"cargoHash": "sha256-4cFhV5y7tqUZ4pQWQKIbOZ0qXo0ya5gnMizCNcxYZS0=" "cargoHash": "sha256-GmfrdPZLUK4fg2HDadnu+zWuS+fWwDxaVVydp9eOge4="
} }

View File

@ -10,16 +10,16 @@
buildGoModule rec { buildGoModule rec {
pname = "thanos"; pname = "thanos";
version = "0.34.0"; version = "0.34.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "thanos-io"; owner = "thanos-io";
repo = "thanos"; repo = "thanos";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-mbDjp8GAkFMkQnLd64A/nbYA/EIA4HpY6EshdDV+b1U="; hash = "sha256-AynKxORgO8fY8KAhzyIeHCw2MI2se5eHSPn0kt1RJq4=";
}; };
vendorHash = "sha256-ZAPaGDt+TnBUEng5EYIBNHN/o+gpaLzAO4kuSjx9S8U="; vendorHash = "sha256-4IT3YeGXSEzC0z+rC2yQCY9QQZeXxpMtJM/4/kINn3s=";
doCheck = true; doCheck = true;

View File

@ -19,13 +19,13 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "drawterm"; pname = "drawterm";
version = "unstable-2023-12-23"; version = "unstable-2024-02-18";
src = fetchFrom9Front { src = fetchFrom9Front {
owner = "plan9front"; owner = "plan9front";
repo = "drawterm"; repo = "drawterm";
rev = "f9ae0c837bf8351037689f1985c1a52c1570ba30"; rev = "bcf1eb425dd4c90a3bfcd004f6aee3854259da78";
hash = "sha256-wJWMdD9OmGybIwgBNJ8LxxV21L4SaV22OxAILsDWG3U="; hash = "sha256-aUQ6ay2ky9NzVUZvWyHc/GqPlCdhGpXTY8GGytJSC6g=";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mergerfs"; pname = "mergerfs";
version = "2.39.0"; version = "2.40.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "trapexit"; owner = "trapexit";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-48ArTS1Gd1z7WUX1RjiHMuyp3K3p9FJPU2XO4bj292I="; sha256 = "sha256-3iMFobefP0vF8Ywt0KpS6ZhH+T1GSQu0GzV4A78FmaY=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "tagref"; pname = "tagref";
version = "1.8.5"; version = "1.9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stepchowfun"; owner = "stepchowfun";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-IeGWaPoq4AJAQjsIHa7dWNuIBB3JZr6WBzh63+xRYco="; sha256 = "sha256-SPmpQR4RMimU6RnljmqV9z0WvDRZkc+Y+C32BnNmK/E=";
}; };
cargoHash = "sha256-9Xkbj1PS+mlcB/f9rvcMBGUCCngkcfom6M6Zvp7Dgrg="; cargoHash = "sha256-VufTLK1LDQlIiNNsV9q24sHTmcT1Y7bCnhIXPRvuRAU=";
meta = with lib; { meta = with lib; {
description = "Manage cross-references in your code"; description = "Manage cross-references in your code";

View File

@ -10,13 +10,13 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "zoxide"; pname = "zoxide";
version = "0.9.3"; version = "0.9.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ajeetdsouza"; owner = "ajeetdsouza";
repo = "zoxide"; repo = "zoxide";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-dxdBXoV9X2oA5ig6PK/GuNLRRzO1E0zHJwVFQp7GY2g="; hash = "sha256-Yp7uLoFEDkb0TztcDCeAkt+EHQRt56ncPqkBtd/zzzI=";
}; };
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];
@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
--replace '"fzf"' '"${fzf}/bin/fzf"' --replace '"fzf"' '"${fzf}/bin/fzf"'
''; '';
cargoHash = "sha256-fNAS2pCt3Oxz8qyn6GnJpx3Tq/EyPzbwns28tKeMqf0="; cargoHash = "sha256-t6GVoMBCD0s36GhtqJu9Z2bwwq5P+beEObG+gSC+QUw=";
postInstall = '' postInstall = ''
installManPage man/man*/* installManPage man/man*/*

View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "grpc_cli"; pname = "grpc_cli";
version = "1.61.1"; version = "1.62.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "grpc"; owner = "grpc";
repo = "grpc"; repo = "grpc";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-vrLkiNnsW6IpZNGhs6iZgEhdlV9Qpg8PLMDG2BKY2wo="; hash = "sha256-iqoxgo/oocO9gBq0o5bmZvre/EwRguMrWnmwvyLGLr8=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ automake cmake autoconf ]; nativeBuildInputs = [ automake cmake autoconf ];

View File

@ -11,13 +11,6 @@ stdenv.mkDerivation rec {
hash = "sha256-/eivtsxNzW6IlX08Zfnj06C1kdaaRs4yvqLlbBuo8ec="; hash = "sha256-/eivtsxNzW6IlX08Zfnj06C1kdaaRs4yvqLlbBuo8ec=";
}; };
# The version number was forgotten to be updated for the release,
# so do it manually in the meantime.
# See https://github.com/curl/trurl/discussions/244#discussioncomment-7436369
postPatch = ''
substituteInPlace version.h --replace 0.8 0.10
'';
outputs = [ "out" "dev" "man" ]; outputs = [ "out" "dev" "man" ];
separateDebugInfo = stdenv.isLinux; separateDebugInfo = stdenv.isLinux;

View File

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "cloudlist"; pname = "cloudlist";
version = "1.0.6"; version = "1.0.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "projectdiscovery"; owner = "projectdiscovery";
repo = "cloudlist"; repo = "cloudlist";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-oq+JmcENFcB4AoVEhxoYIKZArgzVm6QFsPF8ybtNMak="; hash = "sha256-F1oiatNP4tSRWI25r1uoiLT9Et+PyqU0p2HVICMBUNA=";
}; };
vendorHash = "sha256-4eGmfPXqohdRHT0xExF1Z5jE8GscQGlVEmS3cHMX4x8="; vendorHash = "sha256-3QS9YYypqEJhibfBFxFq1gxTVpTWBy35tXcO9+DBehY=";
ldflags = [ ldflags = [
"-w" "-w"

View File

@ -1,4 +1,4 @@
# frozen_string_literal: true # frozen_string_literal: true
source "https://rubygems.org" source "https://rubygems.org"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.55" gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.56"

View File

@ -1,9 +1,9 @@
GIT GIT
remote: https://github.com/rapid7/metasploit-framework remote: https://github.com/rapid7/metasploit-framework
revision: 59122f9afd18c1e41a2a66870f1d986896f05216 revision: ff8298ede09a5e825d5d53775f36d60cd4110f17
ref: refs/tags/6.3.55 ref: refs/tags/6.3.56
specs: specs:
metasploit-framework (6.3.55) metasploit-framework (6.3.56)
actionpack (~> 7.0.0) actionpack (~> 7.0.0)
activerecord (~> 7.0.0) activerecord (~> 7.0.0)
activesupport (~> 7.0.0) activesupport (~> 7.0.0)

View File

@ -15,13 +15,13 @@ let
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "metasploit-framework"; pname = "metasploit-framework";
version = "6.3.55"; version = "6.3.56";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rapid7"; owner = "rapid7";
repo = "metasploit-framework"; repo = "metasploit-framework";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-443sNaqGizvrJh7aEtarK+jix9+KYzkEZJg8k0QGskM="; hash = "sha256-BF/8+Quu8heS+VKn5ciHfZLTAmoliO25O4BccQBj4bE=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -664,12 +664,12 @@
platforms = []; platforms = [];
source = { source = {
fetchSubmodules = false; fetchSubmodules = false;
rev = "59122f9afd18c1e41a2a66870f1d986896f05216"; rev = "ff8298ede09a5e825d5d53775f36d60cd4110f17";
sha256 = "0hxj0r296g4qch23jqwavz3y5s1bmgb15nhy4vmkp2w6m8syr3g3"; sha256 = "1cg1cc072p407fwyv215d81d74kxhz4fb9sjz691gwmf1gwzqpq4";
type = "git"; type = "git";
url = "https://github.com/rapid7/metasploit-framework"; url = "https://github.com/rapid7/metasploit-framework";
}; };
version = "6.3.55"; version = "6.3.56";
}; };
metasploit-model = { metasploit-model = {
groups = ["default"]; groups = ["default"];

View File

@ -70,14 +70,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
# disable tests on aarch64-darwin, the following tests fail there: # disable tests on linux aarch32
# oom/circbuf: [forking] # https://gitlab.torproject.org/tpo/core/tor/-/issues/40912
# FAIL src/test/test_oom.c:187: assert(c1->marked_for_close) doCheck = !(stdenv.isLinux && stdenv.isAarch32);
# [circbuf FAILED]
# oom/streambuf: [forking]
# FAIL src/test/test_oom.c:287: assert(x_ OP_GE 500 - 5): 0 vs 495
# [streambuf FAILED]
doCheck = !(stdenv.isDarwin && stdenv.isAarch64);
postInstall = '' postInstall = ''
mkdir -p $geoip/share/tor mkdir -p $geoip/share/tor

View File

@ -7,13 +7,13 @@
buildGoModule rec { buildGoModule rec {
pname = "lux"; pname = "lux";
version = "0.22.0"; version = "0.23.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "iawia002"; owner = "iawia002";
repo = "lux"; repo = "lux";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-v74+Ykz9aro1x+9psg2LnuodKE2/pCw9knZop0etQOg="; hash = "sha256-lZrsrBO3sAn4wAMMgxrVwky7HmKxnQQcLe1POYTAmoE=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

View File

@ -16875,7 +16875,7 @@ with pkgs;
cargo-all-features = callPackage ../development/tools/rust/cargo-all-features { }; cargo-all-features = callPackage ../development/tools/rust/cargo-all-features { };
cargo-apk = callPackage ../development/tools/rust/cargo-apk { }; cargo-apk = callPackage ../development/tools/rust/cargo-apk { };
cargo-audit = callPackage ../development/tools/rust/cargo-audit { cargo-audit = callPackage ../development/tools/rust/cargo-audit {
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
}; };
cargo-benchcmp = callPackage ../development/tools/rust/cargo-benchcmp { }; cargo-benchcmp = callPackage ../development/tools/rust/cargo-benchcmp { };
cargo-binstall = callPackage ../development/tools/rust/cargo-binstall { }; cargo-binstall = callPackage ../development/tools/rust/cargo-binstall { };
@ -21967,42 +21967,22 @@ with pkgs;
hyperscan = callPackage ../development/libraries/hyperscan { }; hyperscan = callPackage ../development/libraries/hyperscan { };
icu58 = callPackage (import ../development/libraries/icu/58.nix fetchurl) ({ icu-versions = callPackages ../development/libraries/icu { };
nativeBuildRoot = buildPackages.icu58.override { buildRootOnly = true; }; inherit (icu-versions)
}); icu58
icu60 = callPackage ../development/libraries/icu/60.nix ({ icu60
nativeBuildRoot = buildPackages.icu60.override { buildRootOnly = true; }; icu63
}); icu64
icu63 = callPackage ../development/libraries/icu/63.nix ({ icu66
nativeBuildRoot = buildPackages.icu63.override { buildRootOnly = true; }; icu67
}); icu68
icu64 = callPackage ../development/libraries/icu/64.nix ({ icu69
nativeBuildRoot = buildPackages.icu64.override { buildRootOnly = true; }; icu70
}); icu71
icu66 = callPackage ../development/libraries/icu/66.nix ({ icu72
nativeBuildRoot = buildPackages.icu66.override { buildRootOnly = true; }; icu73
}); icu74
icu67 = callPackage ../development/libraries/icu/67.nix ({ ;
nativeBuildRoot = buildPackages.icu67.override { buildRootOnly = true; };
});
icu68 = callPackage ../development/libraries/icu/68.nix ({
nativeBuildRoot = buildPackages.icu68.override { buildRootOnly = true; };
});
icu69 = callPackage ../development/libraries/icu/69.nix ({
nativeBuildRoot = buildPackages.icu69.override { buildRootOnly = true; };
});
icu70 = callPackage ../development/libraries/icu/70.nix ({
nativeBuildRoot = buildPackages.icu70.override { buildRootOnly = true; };
});
icu71 = callPackage ../development/libraries/icu/71.nix ({
nativeBuildRoot = buildPackages.icu71.override { buildRootOnly = true; };
});
icu72 = callPackage ../development/libraries/icu/72.nix ({
nativeBuildRoot = buildPackages.icu72.override { buildRootOnly = true; };
});
icu73 = callPackage ../development/libraries/icu/73.nix ({
nativeBuildRoot = buildPackages.icu72.override { buildRootOnly = true; };
});
icu = icu73; icu = icu73;

View File

@ -2708,6 +2708,8 @@ self: super: with self; {
dawg-python = callPackage ../development/python-modules/dawg-python { }; dawg-python = callPackage ../development/python-modules/dawg-python { };
dazl = callPackage ../development/python-modules/dazl { };
dbf = callPackage ../development/python-modules/dbf { }; dbf = callPackage ../development/python-modules/dbf { };
dbfread = callPackage ../development/python-modules/dbfread { }; dbfread = callPackage ../development/python-modules/dbfread { };
@ -16300,6 +16302,8 @@ self: super: with self; {
wheezy-template = callPackage ../development/python-modules/wheezy-template { }; wheezy-template = callPackage ../development/python-modules/wheezy-template { };
whenever = callPackage ../development/python-modules/whenever { };
whichcraft = callPackage ../development/python-modules/whichcraft { }; whichcraft = callPackage ../development/python-modules/whichcraft { };
whirlpool-sixth-sense = callPackage ../development/python-modules/whirlpool-sixth-sense { }; whirlpool-sixth-sense = callPackage ../development/python-modules/whirlpool-sixth-sense { };