Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-05-04 12:01:18 +00:00 committed by GitHub
commit bf19e21376
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
68 changed files with 403 additions and 308 deletions

View File

@ -90,10 +90,6 @@ rec {
config = "mipsel-unknown-linux-gnu"; config = "mipsel-unknown-linux-gnu";
} // platforms.fuloong2f_n32; } // platforms.fuloong2f_n32;
loongarch64-linux = {
config = "loongarch64-unknown-linux-gnu";
};
# can execute on 32bit chip # can execute on 32bit chip
mips-linux-gnu = { config = "mips-unknown-linux-gnu"; } // platforms.gcc_mips32r2_o32; mips-linux-gnu = { config = "mips-unknown-linux-gnu"; } // platforms.gcc_mips32r2_o32;
mipsel-linux-gnu = { config = "mipsel-unknown-linux-gnu"; } // platforms.gcc_mips32r2_o32; mipsel-linux-gnu = { config = "mipsel-unknown-linux-gnu"; } // platforms.gcc_mips32r2_o32;
@ -139,6 +135,10 @@ rec {
libc = "newlib"; libc = "newlib";
}; };
loongarch64-linux = {
config = "loongarch64-unknown-linux-gnu";
};
mmix = { mmix = {
config = "mmix-unknown-mmixware"; config = "mmix-unknown-mmixware";
libc = "newlib"; libc = "newlib";

View File

@ -5866,6 +5866,12 @@
fingerprint = "7FC7 98AB 390E 1646 ED4D 8F1F 797F 6238 68CD 00C2"; fingerprint = "7FC7 98AB 390E 1646 ED4D 8F1F 797F 6238 68CD 00C2";
}]; }];
}; };
greg = {
email = "greg.hellings@gmail.com";
github = "greg-hellings";
githubId = 273582;
name = "greg";
};
greizgh = { greizgh = {
email = "greizgh@ephax.org"; email = "greizgh@ephax.org";
github = "greizgh"; github = "greizgh";

View File

@ -34,23 +34,29 @@ sub getList {
} }
sub readFile { sub readFile {
my ($fn) = @_; local $/ = undef; my ($fn) = @_;
open FILE, "<$fn" or return undef; my $s = <FILE>; close FILE; # enable slurp mode: read entire file in one go
local $/ = "\n"; chomp $s; return $s; local $/ = undef;
open my $fh, "<$fn" or return undef;
my $s = <$fh>;
close $fh;
# disable slurp mode
local $/ = "\n";
chomp $s;
return $s;
} }
sub writeFile { sub writeFile {
my ($fn, $s) = @_; my ($fn, $s) = @_;
open FILE, ">$fn" or die "cannot create $fn: $!\n"; open my $fh, ">$fn" or die "cannot create $fn: $!\n";
print FILE $s or die; print $fh $s or die "cannot write to $fn: $!\n";
close FILE or die; close $fh or die "cannot close $fn: $!\n";
} }
sub runCommand { sub runCommand {
my ($cmd) = @_; open(my $fh, "-|", @_) or die "Failed to execute: $@_\n";
open FILE, "$cmd 2>/dev/null |" or die "Failed to execute: $cmd\n"; my @ret = $fh->getlines();
my @ret = <FILE>; close $fh;
close FILE;
return ($?, @ret); return ($?, @ret);
} }
@ -200,7 +206,7 @@ sub GrubFs {
$search = $types{$fsIdentifier} . ' '; $search = $types{$fsIdentifier} . ' ';
# Based on the type pull in the identifier from the system # Based on the type pull in the identifier from the system
my ($status, @devInfo) = runCommand("@utillinux@/bin/blkid -o export @{[$fs->device]}"); my ($status, @devInfo) = runCommand("@utillinux@/bin/blkid", "-o", "export", @{[$fs->device]});
if ($status != 0) { if ($status != 0) {
die "Failed to get blkid info (returned $status) for @{[$fs->mount]} on @{[$fs->device]}"; die "Failed to get blkid info (returned $status) for @{[$fs->mount]} on @{[$fs->device]}";
} }
@ -213,7 +219,7 @@ sub GrubFs {
# BTRFS is a special case in that we need to fix the referrenced path based on subvolumes # BTRFS is a special case in that we need to fix the referrenced path based on subvolumes
if ($fs->type eq 'btrfs') { if ($fs->type eq 'btrfs') {
my ($status, @id_info) = runCommand("@btrfsprogs@/bin/btrfs subvol show @{[$fs->mount]}"); my ($status, @id_info) = runCommand("@btrfsprogs@/bin/btrfs", "subvol", "show", @{[$fs->mount]});
if ($status != 0) { if ($status != 0) {
die "Failed to retrieve subvolume info for @{[$fs->mount]}\n"; die "Failed to retrieve subvolume info for @{[$fs->mount]}\n";
} }
@ -221,7 +227,7 @@ sub GrubFs {
if ($#ids > 0) { if ($#ids > 0) {
die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n" die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n"
} elsif ($#ids == 0) { } elsif ($#ids == 0) {
my ($status, @path_info) = runCommand("@btrfsprogs@/bin/btrfs subvol list @{[$fs->mount]}"); my ($status, @path_info) = runCommand("@btrfsprogs@/bin/btrfs", "subvol", "list", @{[$fs->mount]});
if ($status != 0) { if ($status != 0) {
die "Failed to find @{[$fs->mount]} subvolume id from btrfs\n"; die "Failed to find @{[$fs->mount]} subvolume id from btrfs\n";
} }

View File

@ -345,6 +345,7 @@ let
(docbook-xsl-ns.override { (docbook-xsl-ns.override {
withManOptDedupPatch = true; withManOptDedupPatch = true;
}) })
kbd.dev
kmod.dev kmod.dev
libarchive.dev libarchive.dev
libxml2.bin libxml2.bin

View File

@ -4,6 +4,7 @@
, pkg-config , pkg-config
, alsa-lib , alsa-lib
, flac , flac
, nix-update-script
}: }:
buildGoModule rec { buildGoModule rec {
@ -38,6 +39,8 @@ buildGoModule rec {
flac flac
]; ];
passthru.updateScript = nix-update-script { };
meta = with lib; { meta = with lib; {
description = "Terminal netease cloud music client written in Go"; description = "Terminal netease cloud music client written in Go";
homepage = "https://github.com/anhoder/go-musicfox"; homepage = "https://github.com/anhoder/go-musicfox";

View File

@ -9,16 +9,16 @@ let
in buildGoModule rec { in buildGoModule rec {
pname = "go-ethereum"; pname = "go-ethereum";
version = "1.11.5"; version = "1.11.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ethereum"; owner = "ethereum";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-QFqPAWW0L9cSBvnDwJKtwWT2jZFyr+zhYaS+GF/nQ9g="; sha256 = "sha256-mZ11xan3MGgaUORbiQczKrXSrxzjvQMhZbpHnEal11Y=";
}; };
vendorSha256 = "sha256-Y1srOcXZ4rQ0QIQx4LdYzYG6goGk6oO30C+OW+s81z4="; vendorHash = "sha256-rjSGR2ie5sFK2OOo4HUZ6+hrDlQuUDtyTKn0sh8jFBY=";
doCheck = false; doCheck = false;
@ -45,7 +45,7 @@ in buildGoModule rec {
"cmd/utils" "cmd/utils"
]; ];
# Following upstream: https://github.com/ethereum/go-ethereum/blob/v1.11.5/build/ci.go#L218 # Following upstream: https://github.com/ethereum/go-ethereum/blob/v1.11.6/build/ci.go#L218
tags = [ "urfave_cli_no_docs" ]; tags = [ "urfave_cli_no_docs" ];
# Fix for usb-related segmentation faults on darwin # Fix for usb-related segmentation faults on darwin

View File

@ -6,16 +6,16 @@
buildGoModule rec { buildGoModule rec {
pname = "lnd"; pname = "lnd";
version = "0.16.1-beta"; version = "0.16.2-beta";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lightningnetwork"; owner = "lightningnetwork";
repo = "lnd"; repo = "lnd";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-m592dRYAKKkeQa4SOP+8pTHuY07hSMICdyAcAOKn3+w="; sha256 = "sha256-s0m/aS99uB6LZb0+73SQ++mF0Ukg6IYIL+jbEi8ezW0=";
}; };
vendorSha256 = "sha256-yY6H2K9B9ko5bVdmsGPDJkxPXpfAs0O2fuaZryrcuc0="; vendorSha256 = "sha256-7Ydl56Z6aOMBQ1RamFzjD/yp3zgQLkF5WEoOQe1Urv0=";
subPackages = [ "cmd/lncli" "cmd/lnd" ]; subPackages = [ "cmd/lncli" "cmd/lnd" ];

View File

@ -19,18 +19,18 @@
"gateway": { "gateway": {
"update-channel": "Gateway RELEASE", "update-channel": "Gateway RELEASE",
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz",
"version": "2023.1", "version": "2023.1.1",
"sha256": "626314f6d2771e197214981fa2078da5affb4b7b55bcffd5c6960803270dcecd", "sha256": "217196806daebd14e604d13247862e44e6a0b0b9f115f1b9ceadbcfb064b3c3c",
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.tar.gz", "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.1.tar.gz",
"build_number": "231.8109.187" "build_number": "231.8770.69"
}, },
"goland": { "goland": {
"update-channel": "GoLand RELEASE", "update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz",
"version": "2023.1", "version": "2023.1.1",
"sha256": "f208e2471ef5c4e232ff49434e8c14ce614b7924963ebd28d4c863399dd42d2c", "sha256": "ed4334fbfde1c9416920ec1aa9ccdbaa6bdbbe6f211b15ca74239c44a0b7ed1c",
"url": "https://download.jetbrains.com/go/goland-2023.1.tar.gz", "url": "https://download.jetbrains.com/go/goland-2023.1.1.tar.gz",
"build_number": "231.8109.199" "build_number": "231.8770.71"
}, },
"idea-community": { "idea-community": {
"update-channel": "IntelliJ IDEA RELEASE", "update-channel": "IntelliJ IDEA RELEASE",
@ -51,35 +51,35 @@
"mps": { "mps": {
"update-channel": "MPS RELEASE", "update-channel": "MPS RELEASE",
"url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
"version": "2022.2", "version": "2022.3",
"sha256": "aaee4d2bb9bc34d0b4bc62c7ef08139cc6144b433ba1675ef306e6d3d95e37a1", "sha256": "6a8640ef9613fa562513788ae33d66c535ec230564d000cea61f7684a2f4042b",
"url": "https://download.jetbrains.com/mps/2022.2/MPS-2022.2.tar.gz", "url": "https://download.jetbrains.com/mps/2022.3/MPS-2022.3.tar.gz",
"build_number": "222.3345.1295" "build_number": "223.8836.1185"
}, },
"phpstorm": { "phpstorm": {
"update-channel": "PhpStorm RELEASE", "update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
"version": "2023.1", "version": "2023.1.1",
"sha256": "2e1feb9ae691ada21bd5ddc28a693f75a27aedc8f211729370ed03925e63400b", "sha256": "be824ba2f0a55b8d246becde235a3308106d2115cea814e4b0cc2f3b9a736253",
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.tar.gz", "url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.1.tar.gz",
"build_number": "231.8109.199", "build_number": "231.8770.68",
"version-major-minor": "2022.3" "version-major-minor": "2022.3"
}, },
"pycharm-community": { "pycharm-community": {
"update-channel": "PyCharm RELEASE", "update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz",
"version": "2023.1", "version": "2023.1.1",
"sha256": "e8e9ed964ef8a397ad920ccaad41b30c3f29a2e125e7a5c4be50db791099e068", "sha256": "4de47ea21ede9ed52fedf42513ab2d886683d7d66784c1ce9b4d3c8b84da7a29",
"url": "https://download.jetbrains.com/python/pycharm-community-2023.1.tar.gz", "url": "https://download.jetbrains.com/python/pycharm-community-2023.1.1.tar.gz",
"build_number": "231.8109.197" "build_number": "231.8770.66"
}, },
"pycharm-professional": { "pycharm-professional": {
"update-channel": "PyCharm RELEASE", "update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz",
"version": "2023.1", "version": "2023.1.1",
"sha256": "26c3f49ad899178105943eb63e1abae85c40f2f44362a2b20629a6263a4f8da6", "sha256": "aaa8d136e47077cfe970a5b42aa2058bb74038c5dab354c9f6ff22bfa3aa327d",
"url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.tar.gz", "url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.1.tar.gz",
"build_number": "231.8109.197" "build_number": "231.8770.66"
}, },
"rider": { "rider": {
"update-channel": "Rider RELEASE", "update-channel": "Rider RELEASE",
@ -126,18 +126,18 @@
"gateway": { "gateway": {
"update-channel": "Gateway RELEASE", "update-channel": "Gateway RELEASE",
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg",
"version": "2023.1", "version": "2023.1.1",
"sha256": "323066b6171ca2cb117b667d5b4e626a680bc6ac3f121ad3d6faf0a1b78692c3", "sha256": "e580bf5bd657b721677fec0250ce582adb1cf92daa1ac065b56fc2d8148fac97",
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.dmg", "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.1.dmg",
"build_number": "231.8109.187" "build_number": "231.8770.69"
}, },
"goland": { "goland": {
"update-channel": "GoLand RELEASE", "update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg",
"version": "2023.1", "version": "2023.1.1",
"sha256": "b1afadacb4c8d77fb8811abbfb5c4c447ec81ec27af2efef233c9f1164cab9c8", "sha256": "951d0940edebc9cba6a3e37eae3d3e146416d1951803e8a34706904e983bb6ee",
"url": "https://download.jetbrains.com/go/goland-2023.1.dmg", "url": "https://download.jetbrains.com/go/goland-2023.1.1.dmg",
"build_number": "231.8109.199" "build_number": "231.8770.71"
}, },
"idea-community": { "idea-community": {
"update-channel": "IntelliJ IDEA RELEASE", "update-channel": "IntelliJ IDEA RELEASE",
@ -158,35 +158,35 @@
"mps": { "mps": {
"update-channel": "MPS RELEASE", "update-channel": "MPS RELEASE",
"url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg",
"version": "2022.2", "version": "2022.3",
"sha256": "4e36c60d281596c220287ab2191165be37ef01c3c54ab5f5e4e535c8b81bc754", "sha256": "17cb973af11118c246d4144ba0071ce31fe3f276be7029f613cdb0fa60b752cc",
"url": "https://download.jetbrains.com/mps/2022.2/MPS-2022.2-macos.dmg", "url": "https://download.jetbrains.com/mps/2022.3/MPS-2022.3-macos.dmg",
"build_number": "222.3345.1295" "build_number": "223.8836.1185"
}, },
"phpstorm": { "phpstorm": {
"update-channel": "PhpStorm RELEASE", "update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg",
"version": "2023.1", "version": "2023.1.1",
"sha256": "825c4626f4f4359cb47f2e6f74d8fe23df0fb991f2ac4cbb86b99a6c8dbee5f6", "sha256": "da5809e47bb6adaa61ecdbcc16ca452e25269e7dbeb316bc6022784c3d6edd28",
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.dmg", "url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.1.dmg",
"build_number": "231.8109.199", "build_number": "231.8770.68",
"version-major-minor": "2022.3" "version-major-minor": "2022.3"
}, },
"pycharm-community": { "pycharm-community": {
"update-channel": "PyCharm RELEASE", "update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg",
"version": "2023.1", "version": "2023.1.1",
"sha256": "01ef3582e4b0617649e4c0784a9a5be952688796766c34e025bc0cad5ba18a0f", "sha256": "45f47c71f1621d054b4ceedb717bbb4c2f8e8ab2d3ef8acb7366088b866a4cf6",
"url": "https://download.jetbrains.com/python/pycharm-community-2023.1.dmg", "url": "https://download.jetbrains.com/python/pycharm-community-2023.1.1.dmg",
"build_number": "231.8109.197" "build_number": "231.8770.66"
}, },
"pycharm-professional": { "pycharm-professional": {
"update-channel": "PyCharm RELEASE", "update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg",
"version": "2023.1", "version": "2023.1.1",
"sha256": "1b4b171d48ba046679de94985f20f3574af53e6d5fad9aab7bed0d820e504c4a", "sha256": "601c427b292a76d7646fe81ed351447b79a5094b650f19c8acca6f8f42e6e609",
"url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.dmg", "url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.1.dmg",
"build_number": "231.8109.197" "build_number": "231.8770.66"
}, },
"rider": { "rider": {
"update-channel": "Rider RELEASE", "update-channel": "Rider RELEASE",
@ -233,18 +233,18 @@
"gateway": { "gateway": {
"update-channel": "Gateway RELEASE", "update-channel": "Gateway RELEASE",
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg",
"version": "2023.1", "version": "2023.1.1",
"sha256": "8b9c656cc4b5c6bd8822e888d0b7d93ef9184ace4afc80da55767be3cf3a01ac", "sha256": "ab0c773315a6d8abcaae75440f7fc122a7e80237eddaa3487c3222a52a95497f",
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1-aarch64.dmg", "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.1-aarch64.dmg",
"build_number": "231.8109.187" "build_number": "231.8770.69"
}, },
"goland": { "goland": {
"update-channel": "GoLand RELEASE", "update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg",
"version": "2023.1", "version": "2023.1.1",
"sha256": "1774ededcf8dbea93bcd35142bffef5d0fe121b5fb5d2f146ef4b98352375862", "sha256": "29963a09c83f193746f762a104e9c51fa5ff9f46a90376a0e518261f1990847e",
"url": "https://download.jetbrains.com/go/goland-2023.1-aarch64.dmg", "url": "https://download.jetbrains.com/go/goland-2023.1.1-aarch64.dmg",
"build_number": "231.8109.199" "build_number": "231.8770.71"
}, },
"idea-community": { "idea-community": {
"update-channel": "IntelliJ IDEA RELEASE", "update-channel": "IntelliJ IDEA RELEASE",
@ -265,35 +265,35 @@
"mps": { "mps": {
"update-channel": "MPS RELEASE", "update-channel": "MPS RELEASE",
"url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg",
"version": "2022.2", "version": "2022.3",
"url": "https://download.jetbrains.com/mps/2022.2/MPS-2022.2-macos-aarch64.dmg", "url": "https://download.jetbrains.com/mps/2022.3/MPS-2022.3-macos-aarch64.dmg",
"sha256": "bdc83d9c7a3430cc2b0b0361a9e4eab82e951bfe87f0e4754106d09850947077", "sha256": "40d8a928a1c1703544c9905a3f8e6a7d0ade3b17302782da2ed68fd1dcdafef9",
"build_number": "222.3345.1295" "build_number": "223.8836.1185"
}, },
"phpstorm": { "phpstorm": {
"update-channel": "PhpStorm RELEASE", "update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg",
"version": "2023.1", "version": "2023.1.1",
"sha256": "030d0b8f7ef486fa5dc757fcb2c5c5678d9f9dcc27769f79996c631c299657e7", "sha256": "7857f77b2d28fc7e3a4380f43fe0f923616d39f13cb47a9f37c6cf5f32fd40a3",
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.1-aarch64.dmg", "url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.1-aarch64.dmg",
"build_number": "231.8109.199", "build_number": "231.8770.68",
"version-major-minor": "2022.3" "version-major-minor": "2022.3"
}, },
"pycharm-community": { "pycharm-community": {
"update-channel": "PyCharm RELEASE", "update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg",
"version": "2023.1", "version": "2023.1.1",
"sha256": "59ed747fa81718bee0714da08ad9041c828fe7ca459ac3a004277eef71b463bd", "sha256": "d3c3e5d4896be54e54c20603e8124220ee32f29f24b5068d1b56d1685c9bc2cd",
"url": "https://download.jetbrains.com/python/pycharm-community-2023.1-aarch64.dmg", "url": "https://download.jetbrains.com/python/pycharm-community-2023.1.1-aarch64.dmg",
"build_number": "231.8109.197" "build_number": "231.8770.66"
}, },
"pycharm-professional": { "pycharm-professional": {
"update-channel": "PyCharm RELEASE", "update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg",
"version": "2023.1", "version": "2023.1.1",
"sha256": "8caa44cef3c83bf8d059b7582951d411a854083aa34b3c3e72bc47daa3bd65a8", "sha256": "3c1947ad4627fc4dfce9a01b8bf4b8d90627fa5e20e4c27f60d785430e99d25d",
"url": "https://download.jetbrains.com/python/pycharm-professional-2023.1-aarch64.dmg", "url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.1-aarch64.dmg",
"build_number": "231.8109.197" "build_number": "231.8770.66"
}, },
"rider": { "rider": {
"update-channel": "Rider RELEASE", "update-channel": "Rider RELEASE",

View File

@ -1,14 +0,0 @@
diff --git a/release/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py b/release/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py
index 41dd4d03..a97f9d38 100755
--- a/release/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py
+++ b/release/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py
@@ -572,7 +572,7 @@ def set_poly_smoothing(gltf, pymesh, mesh, vert_normals, loop_vidxs):
# Try to guess which polys should be flat based on the fact that all the
# loop normals for a flat poly are = the poly's normal.
- poly_smooths = np.empty(num_polys, dtype=np.bool)
+ poly_smooths = np.empty(num_polys, dtype=np.bool_)
poly_normals = np.empty(num_polys * 3, dtype=np.float32)
mesh.polygons.foreach_get('normal', poly_normals)

View File

@ -27,17 +27,14 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "blender"; pname = "blender";
version = "3.4.1"; version = "3.5.1";
src = fetchurl { src = fetchurl {
url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; url = "https://download.blender.org/source/${pname}-${version}.tar.xz";
hash = "sha256-JHxMEignDJAQ9HIcmFy1tiirUKvPnyZ4Ywc3FC7rkcM="; hash = "sha256-vXQox+bLpakAIWJpwyER3/qrrxvbVHLyMZZeYVF0qAk=";
}; };
patches = [ patches = lib.optional stdenv.isDarwin ./darwin.patch;
# remove with 3.5.X
./blender-numpy.patch
] ++ lib.optional stdenv.isDarwin ./darwin.patch;
nativeBuildInputs = [ cmake makeWrapper python310Packages.wrapPython llvmPackages.llvm.dev ] nativeBuildInputs = [ cmake makeWrapper python310Packages.wrapPython llvmPackages.llvm.dev ]
++ lib.optionals cudaSupport [ addOpenGLRunpath ]; ++ lib.optionals cudaSupport [ addOpenGLRunpath ];

View File

@ -3,15 +3,15 @@
}: }:
let let
pname = "josm"; pname = "josm";
version = "18700"; version = "18721";
srcs = { srcs = {
jar = fetchurl { jar = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
hash = "sha256-rJw38pOHi+OIjIKgglU0Y2Tlc/b8K9f04ru2IH0CUJ0="; hash = "sha256-nc6itoblAzP064xTTF8q990TiRX3+zf5uk+enS+C5Jo=";
}; };
macosx = fetchurl { macosx = fetchurl {
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip";
hash = "sha256-RTRe2GZz5B9QEYF04PiKtKJkWu0Em5WBqK4dVQVHK0g="; hash = "sha256-uaj32PupxAS5Pa7us9sIeeepGJ6BIljm41e6onB7zxQ=";
}; };
pkg = fetchsvn { pkg = fetchsvn {
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";

View File

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "klipper-estimator"; pname = "klipper-estimator";
version = "3.2.1"; version = "3.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Annex-Engineering"; owner = "Annex-Engineering";
repo = "klipper_estimator"; repo = "klipper_estimator";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-0QDEaRJpjiE7aH6PpessCGUe4TT31FhsxTFw7OglPUc="; hash = "sha256-bWKR7+eX7tcc9KywKIg6CY+3qALPqOSSiSSlK44iTDQ=";
}; };
cargoHash = "sha256-W0Vo4bA2QNfzBqcZiblf6eJnQ3cRgrnNELzS9O1O6bU="; cargoHash = "sha256-cPdFRBU8B4C2el9N069QooiJdpopns8RJEyavemYdUc=";
buildInputs = buildInputs =
[ openssl ] [ openssl ]

View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, buildFHSEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, at-spi2-atk, icu, openssl, zlib }: { stdenv, lib, fetchurl, buildFHSEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, libxkbcommon, libxshmfence, at-spi2-atk, icu, openssl, zlib }:
let let
pname = "sidequest"; pname = "sidequest";
version = "0.10.24"; version = "0.10.33";
desktopItem = makeDesktopItem rec { desktopItem = makeDesktopItem rec {
name = "SideQuest"; name = "SideQuest";
@ -16,7 +16,7 @@
src = fetchurl { src = fetchurl {
url = "https://github.com/SideQuestVR/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz"; url = "https://github.com/SideQuestVR/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz";
sha256 = "0bnd16f22sgy67z3d6rf4z20n56ljxczsql455p2j6kck5f75lh4"; sha256 = "8ac3d97400a8e3ce86902b5bea7b8d042a092acd888d20e5139490a38507f995";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
@ -59,6 +59,7 @@
sidequest sidequest
# Needed in the environment on runtime, to make QuestSaberPatch work # Needed in the environment on runtime, to make QuestSaberPatch work
icu openssl zlib icu openssl zlib
libxkbcommon libxshmfence
]; ];
extraInstallCommands = '' extraInstallCommands = ''

View File

@ -10,18 +10,18 @@
buildGoModule rec { buildGoModule rec {
pname = "usql"; pname = "usql";
version = "0.14.4"; version = "0.14.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xo"; owner = "xo";
repo = "usql"; repo = "usql";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-AUZFrASwROmcOhoObAdV/Dn9dA7HvxmEqqZOIJH+rI0="; hash = "sha256-WjQdRSucp9iwjUisaz4V/d4JVuFOmYwQA6f3DK5GskU=";
}; };
buildInputs = [ unixODBC icu ]; buildInputs = [ unixODBC icu ];
vendorHash = "sha256-oReSh0acGcjH+a7GRRV6cy6qgU4puN+iuXzLuRQmx3A="; vendorHash = "sha256-kGq+IrdhyFEoaqUeXTKRXziQnFfzG49GIMAsljnWQPA=";
proxyVendor = true; proxyVendor = true;
# Exclude broken impala & hive driver # Exclude broken impala & hive driver

View File

@ -13,13 +13,13 @@ assert enablePython -> python != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "elinks"; pname = "elinks";
version = "0.16.0"; version = "0.16.1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rkd77"; owner = "rkd77";
repo = "felinks"; repo = "felinks";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-4+V1j78sjs3/6SnVLO34jCcNuegpZan8Ykd8Gy0vc3k="; sha256 = "sha256-u6QGhfi+uWeIzSUFuYHAH3Xu0Fky0yw2h4NOKgYFLsM=";
}; };
buildInputs = [ buildInputs = [

View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "kubelogin"; pname = "kubelogin";
version = "0.0.28"; version = "0.0.29";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Azure"; owner = "Azure";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-uIWlOVZIqwOSvFWRIWKTFEp0aToIBo1htUXb3F+njyI="; sha256 = "sha256-B6p+quzFPx2KHVqUvJly2x+F9pHBWaUxuSdhG36V/5U=";
}; };
vendorHash = "sha256-CVBpBb8yYkc6/yLPsCPbVhBHecqZ03WE0NcKiH8SGYs="; vendorHash = "sha256-H8hfphAcz/Lc1JLxejodV4YQ9IPyPgVeDXdPT9AYpmk=";
ldflags = [ ldflags = [
"-X main.version=${version}" "-X main.version=${version}"

View File

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "terragrunt"; pname = "terragrunt";
version = "0.45.5"; version = "0.45.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gruntwork-io"; owner = "gruntwork-io";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-Azf9A/ZHb8wFRsd7iv9Y4jr9xs8R7vNUffz9ky07SVk="; hash = "sha256-YKlx3+cBBXpWlytPnoyEaZYUZODEwfzjEphG11sgS/M=";
}; };
vendorHash = "sha256-V7+N+vEOS4DXHglErD5YoUzu6EN4YRljV581kFnjK2M="; vendorHash = "sha256-5Umoqi2D6iUk2Ut7YB/nmkOyA6Rx2qFhy/ZbfqoX5qA=";
doCheck = false; doCheck = false;

View File

@ -5,13 +5,13 @@
buildGoModule rec { buildGoModule rec {
pname = "goeland"; pname = "goeland";
version = "0.14.0"; version = "0.15.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "slurdge"; owner = "slurdge";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-O4/dKTphgvcL5V66pMk2blXZ1cVsUgazMBaZCoAAwkY="; sha256 = "sha256-b/A76f9/pFDdG1ZiHQnJrxYmlvFIjhZZhTIGl09cMcg=";
}; };
vendorHash = "sha256-jOtIA7+rM/2qObhR61utvmXD+Rxi/+dEvzgYkGR76I8="; vendorHash = "sha256-jOtIA7+rM/2qObhR61utvmXD+Rxi/+dEvzgYkGR76I8=";

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "openasar"; pname = "openasar";
version = "unstable-2023-04-01"; version = "unstable-2023-05-01";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "GooseMod"; owner = "GooseMod";
repo = "OpenAsar"; repo = "OpenAsar";
rev = "ac0ad4d48a1a198c0a8a784da973b96684b336a7"; rev = "a8b07392808032f95ac3a7c5856e76d2619c91ae";
hash = "sha256-Ul2fXH4yjGe2oub1uVYY0mPJ4ou79TdokxvxvCAPXqs="; hash = "sha256-moHeSrWvVOb9+vNhC2YunjTC3Ojh10APt/tvG/AuNco=";
}; };
postPatch = '' postPatch = ''

View File

@ -11,13 +11,13 @@
buildGoModule rec { buildGoModule rec {
pname = "trayscale"; pname = "trayscale";
version = "0.9.6"; version = "0.9.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "DeedleFake"; owner = "DeedleFake";
repo = "trayscale"; repo = "trayscale";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-qMQ0WykBHXyXZ6GkDM5l5ki27X1h8rl3sUBooqF3234="; hash = "sha256-PMcpVBJVJNX+5vICubBUqlyHC0CEZC9EGUfw6O3pCeA=";
}; };
vendorHash = "sha256-K1Za2j4kUtsktFi9DjZYXrtfsWF1r6vIbyocLUrj5IU="; vendorHash = "sha256-K1Za2j4kUtsktFi9DjZYXrtfsWF1r6vIbyocLUrj5IU=";

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "minimap2"; pname = "minimap2";
version = "2.25"; version = "2.26";
src = fetchFromGitHub { src = fetchFromGitHub {
repo = pname; repo = pname;
owner = "lh3"; owner = "lh3";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-9X2wYoUH11Ys4uPArwyGsXuQLQaAwtNV/pnO9yd7Oiw="; sha256 = "sha256-vK8Z/j6Ndu1vMFYPPzViP4evtIhyVVFwsfTqNCYnXpQ=";
}; };
buildInputs = [ zlib ]; buildInputs = [ zlib ];

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sherpa"; pname = "sherpa";
version = "2.2.14"; version = "2.2.15";
src = fetchurl { src = fetchurl {
url = "https://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz"; url = "https://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz";
sha256 = "sha256-24nO2cFeHx/XTNsC/hxnQu+fRWJm5A5idRtFz6bTo2Q="; sha256 = "sha256-3zvLa1k/bm7uOWKUsTyQM39cPBXJJlF1OgPgznl1hks=";
}; };
postPatch = lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' postPatch = lib.optionalString (stdenv.hostPlatform.libc == "glibc") ''

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "kotlin"; pname = "kotlin";
version = "1.8.20"; version = "1.8.21";
src = fetchurl { src = fetchurl {
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
sha256 = "1r0ann14rjr3f1idwhkfk5s1gr6b6wnkawjmg96gvsp2qv1p9pqh"; sha256 = "1mwggqll6117sw5ldkl1kmlp6mh9z36jhb6r0hnljryhk9bcahvf";
}; };
propagatedBuildInputs = [ jre ] ; propagatedBuildInputs = [ jre ] ;

View File

@ -7,7 +7,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "kotlin-native"; pname = "kotlin-native";
version = "1.8.20"; version = "1.8.21";
src = let src = let
getArch = { getArch = {
@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
"https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-native-${arch}-${version}.tar.gz"; "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-native-${arch}-${version}.tar.gz";
getHash = arch: { getHash = arch: {
"macos-aarch64" = "1lin4yd4wy56m4spkkd0glicphkwfr0gzvs66prm925fcx1hzk5y"; "macos-aarch64" = "06sjlwsk1854c6qpxbfqccvcyk4i8dv13jbc7s7lamgd45wrb5qa";
"macos-x86_64" = "0ma0d0kvpbqw8cx8ixmnhk96y5xz6ljy6phbzsl8cbmfp0g817p3"; "macos-x86_64" = "1mkzcwya5mjn0hjxmx8givmx9y1v4hy0cqayya20rvk10jngsfz7";
"linux-x86_64" = "0f24ag9azzjgar3qg1fjh9q5haigj4k0yjpqxfrvjqj8khag5ls3"; "linux-x86_64" = "1kv81ilp2dzhxx0kbqkl0i43b44vr5dvni607k78vn6n3mj59j0g";
}.${arch}; }.${arch};
in in
fetchurl { fetchurl {

View File

@ -163,23 +163,21 @@ in
# This test tries to call `sw_vers` by absolute path (`/usr/bin/sw_vers`) # This test tries to call `sw_vers` by absolute path (`/usr/bin/sw_vers`)
# and thus fails under the sandbox: # and thus fails under the sandbox:
substituteInPlace unittests/Support/Host.cpp \ substituteInPlace unittests/TargetParser/Host.cpp \
--replace '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers" }" --replace '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers" }"
'' + optionalString (stdenv.isDarwin && stdenv.hostPlatform.isx86) ''
# This test tries to call the intrinsics `@llvm.roundeven.f32` and # This test tries to call the intrinsics `@llvm.roundeven.f32` and
# `@llvm.roundeven.f64` which seem to (incorrectly?) lower to `roundevenf` # `@llvm.roundeven.f64` which seem to (incorrectly?) lower to `roundevenf`
# and `roundeven` on x86_64 macOS. # and `roundeven` on macOS.
# #
# However these functions are glibc specific so the test fails: # However these functions are glibc specific so the test fails:
# - https://www.gnu.org/software/gnulib/manual/html_node/roundevenf.html # - https://www.gnu.org/software/gnulib/manual/html_node/roundevenf.html
# - https://www.gnu.org/software/gnulib/manual/html_node/roundeven.html # - https://www.gnu.org/software/gnulib/manual/html_node/roundeven.html
# #
# TODO(@rrbutani): this seems to run fine on `aarch64-darwin`, why does it
# pass there?
substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \ substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \
--replace "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \ --replace "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \
--replace "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" "" --replace "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" ""
'' + optionalString (stdenv.isDarwin && stdenv.hostPlatform.isx86) ''
# This test fails on darwin x86_64 because `sw_vers` reports a different # This test fails on darwin x86_64 because `sw_vers` reports a different
# macOS version than what LLVM finds by reading # macOS version than what LLVM finds by reading
# `/System/Library/CoreServices/SystemVersion.plist` (which is passed into # `/System/Library/CoreServices/SystemVersion.plist` (which is passed into
@ -208,7 +206,7 @@ in
# not clear to me when/where/for what this even gets used in LLVM. # not clear to me when/where/for what this even gets used in LLVM.
# #
# TODO(@rrbutani): fix/follow-up # TODO(@rrbutani): fix/follow-up
substituteInPlace unittests/Support/Host.cpp \ substituteInPlace unittests/TargetParser/Host.cpp \
--replace "getMacOSHostVersion" "DISABLED_getMacOSHostVersion" --replace "getMacOSHostVersion" "DISABLED_getMacOSHostVersion"
# This test fails with a `dysmutil` crash; have not yet dug into what's # This test fails with a `dysmutil` crash; have not yet dug into what's
@ -239,12 +237,6 @@ in
rm test/tools/gold/X86/split-dwarf.ll rm test/tools/gold/X86/split-dwarf.ll
rm test/tools/llvm-dwarfdump/X86/prettyprint_types.s rm test/tools/llvm-dwarfdump/X86/prettyprint_types.s
rm test/tools/llvm-dwarfdump/X86/simplified-template-names.s rm test/tools/llvm-dwarfdump/X86/simplified-template-names.s
# !!! Note: these tests are removed in LLVM 16.
#
# See here for context: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999790443
rm test/CodeGen/RISCV/rv32zbp.ll
rm test/CodeGen/RISCV/rv64zbp.ll
'' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") ''
# Seems to require certain floating point hardware (NEON?) # Seems to require certain floating point hardware (NEON?)
rm test/ExecutionEngine/frem.ll rm test/ExecutionEngine/frem.ll

View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libiodbc"; pname = "libiodbc";
version = "3.52.15"; version = "3.52.16";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/iodbc/${pname}-${version}.tar.gz"; url = "mirror://sourceforge/iodbc/${pname}-${version}.tar.gz";
sha256 = "sha256-x0VB4zJ/yaHHzPEDZFRxxnvAFFQtcPVyR26wfAst1Dw="; sha256 = "sha256-OJizLQeWE2D28s822zYDa3GaIw5HZGklioDzIkPoRfo=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libva-utils"; pname = "libva-utils";
version = "2.18.0"; version = "2.18.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "intel"; owner = "intel";
repo = "libva-utils"; repo = "libva-utils";
rev = version; rev = version;
sha256 = "sha256-Dg9OcDKqgJf+RYiTYuL2pviNsK4R5cDCAHCYonlp+d8="; sha256 = "sha256-t8N+MQ/HueQWtNzEzfAPZb4q7FjFNhpTmX4JbJ5ZGqM=";
}; };
nativeBuildInputs = [ meson ninja pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config ];

View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sentencepiece"; pname = "sentencepiece";
version = "0.1.98"; version = "0.1.99";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "google"; owner = "google";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "sha256-afODoC4G3ibVXMLEIxusmju4wkTcOtlEzS17+EuyIZw="; sha256 = "sha256-RxzysZsfTdhAtJCO3JOa/bSBNnHBRWkqBdwBa8sB74I=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "zimlib"; pname = "zimlib";
version = "7.2.2"; version = "8.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "openzim"; owner = "openzim";
repo = "libzim"; repo = "libzim";
rev = version; rev = version;
sha256 = "sha256-AEhhjinnnMA4NbYL7NVHYeRZX/zfNiidbY/VeFjZuQs="; sha256 = "sha256-ab7UUF+I0/xaGChvdjylEQRHLOjmtg/wk+/JEGehGLE=";
}; };
testData = fetchzip rec { testData = fetchzip rec {
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
description = "Library for reading and writing ZIM files"; description = "Library for reading and writing ZIM files";
homepage = "https://www.openzim.org/wiki/Zimlib"; homepage = "https://www.openzim.org/wiki/Zimlib";
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ ajs124 ]; maintainers = with maintainers; [ greg ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

View File

@ -3,11 +3,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "dkimpy"; pname = "dkimpy";
version = "1.1.2"; version = "1.1.3";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-DDpa953ooBkSP4Gqf1flEaTqcTonLqi2KkQahN3cSyw="; hash = "sha256-8zIhlR9jOBEXb9D1qGH0S8I721/cKn+jWXUxlUAbEwg=";
}; };
nativeCheckInputs = [ pytest ]; nativeCheckInputs = [ pytest ];

View File

@ -19,7 +19,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "emborg"; pname = "emborg";
version = "1.34"; version = "1.35";
format = "flit"; format = "flit";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -27,8 +27,8 @@ buildPythonPackage rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "KenKundert"; owner = "KenKundert";
repo = "emborg"; repo = "emborg";
rev = "v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-bnlELPZzTU9KyVsz5Q0aW9xWvVrgwpowQrjkQvX844g="; hash = "sha256-T6RfZNJ4k7ONYByy4J6Iuc7sVLKHlXti7p7x1QKgkNo=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -13,7 +13,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "galois"; pname = "galois";
version = "0.3.3"; version = "0.3.4";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "mhostetter"; owner = "mhostetter";
repo = "galois"; repo = "galois";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-nlNy4+GwStyuCD8f47w07NhNmepxBRtu6PXiL31vzwA="; hash = "sha256-yvF57ErcaknKcK6UgINt65uASNZpEtXk+LOizYDH1Bo=";
}; };
SETUPTOOLS_SCM_PRETEND_VERSION = version; SETUPTOOLS_SCM_PRETEND_VERSION = version;

View File

@ -11,14 +11,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-redis"; pname = "google-cloud-redis";
version = "2.12.0"; version = "2.12.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-0uhWndF50vKVUk71DwoInQORAiR5vQyNMMA+T2p69W4="; hash = "sha256-gQ3xG2QcnrSvl1hsvlcY9g77JW8fFk/Pci01tNqpAUs=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -10,14 +10,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "jc"; pname = "jc";
version = "1.23.1"; version = "1.23.2";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kellyjonbrazil"; owner = "kellyjonbrazil";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-3AH/NKYMACNuS0I2RsyU+L5Vksdv9H/q3aV1US64rk0="; hash = "sha256-nj7HyYjo5jDnA+H5/er/GPgC/bUR0UYBqu5zOSDA4p0=";
}; };
propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ]; propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ];

View File

@ -53,7 +53,7 @@ buildPythonPackage rec {
# but not mlflow has a 'skinny' install option which does not require `shap`. # but not mlflow has a 'skinny' install option which does not require `shap`.
nativeBuildInputs = [ pythonRelaxDepsHook ]; nativeBuildInputs = [ pythonRelaxDepsHook ];
pythonRemoveDeps = [ "shap" ]; pythonRemoveDeps = [ "shap" ];
pythonRelaxDeps = [ "pytz" ]; pythonRelaxDeps = [ "pytz" "pyarrow" ];
propagatedBuildInputs = [ propagatedBuildInputs = [
alembic alembic

View File

@ -2,13 +2,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pallets-sphinx-themes"; pname = "pallets-sphinx-themes";
version = "2.0.2"; version = "2.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pallets"; owner = "pallets";
repo = "pallets-sphinx-themes"; repo = "pallets-sphinx-themes";
rev = version; rev = "refs/tags/${version}";
sha256 = "0nvznv6abmkkda2fahydd4rykd94rmz74hx5aypv6j22zvf5pj8b"; sha256 = "sha256-u1sHeO0fk11+M5M0yqDcWsMJKBMeAGW+GPOgu1oniok=";
}; };
propagatedBuildInputs = [ packaging sphinx ]; propagatedBuildInputs = [ packaging sphinx ];

View File

@ -9,14 +9,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "plaid-python"; pname = "plaid-python";
version = "12.0.0"; version = "13.0.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-m/U7O859pWOB+qF4PVcXg3pI7M2Zpl2uWPjaubeV2dE="; hash = "sha256-xe0HK6S612q/DiNLGpBqhfTg1RVvzeeez5Y0ot/+Tqk=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -17,7 +17,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pontos"; pname = "pontos";
version = "23.4.9"; version = "23.5.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "greenbone"; owner = "greenbone";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-rShSVoDL5jY1xCZ6O9jUdGpErMMmq91Ypb0rBoTApIQ="; hash = "sha256-GboOp0lsJ5nsZ6PIUqqCVLmroppKFR/xBnd9DqNw030=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -8,11 +8,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pycoin"; pname = "pycoin";
version = "0.92.20220529"; version = "0.92.20230326";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-PQOWR1teLZ2npQV+q3K+DgiFBejkRoB4gQYjaHLFQqI="; hash = "sha256-DYXwATRHw1ay9swLuQOtB+5LcoBe4TtAKWzQgxESwN8=";
}; };
propagatedBuildInputs = [ setuptools ]; propagatedBuildInputs = [ setuptools ];

View File

@ -11,14 +11,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyvista"; pname = "pyvista";
version = "0.38.5"; version = "0.38.6";
format = "setuptools"; format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-2EH9S67xj3Z2wHWAvBt7alZPZj5/K5787cQnE53lzA0="; hash = "sha256-CK9KdIpi46QI1KxWkzo/rQ+Vp+NZfhnFEeSjdFCwgzI=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -13,7 +13,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "s3-credentials"; pname = "s3-credentials";
version = "0.14"; version = "0.15";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "simonw"; owner = "simonw";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-vKOcOSt9vscj5ixrHZGL6PRun/x38JLbni75nw2YAbg="; hash = "sha256-YSsm5SMfDRqJ53XnBjMgaWWHjA6IXnmEBvxme4uiOPw=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -1,49 +1,66 @@
{ lib { lib
, fetchPypi
, fetchpatch
, buildPythonPackage
, setuptools-scm
, attrs , attrs
, buildPythonPackage
, commoncode
, fetchPypi
, packaging , packaging
, pyparsing , pyparsing
, pytestCheckHook
, pythonOlder
, saneyaml
, semantic-version , semantic-version
, semver , semver
, commoncode , setuptools-scm
, pytestCheckHook
, saneyaml
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "univers"; pname = "univers";
version = "30.7.0"; version = "30.10.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-yM0SDBpkiZEbaZ0ugjiMwwUFKqZGbmh1JNlv5qvPAYo="; hash = "sha256-IJeM9Nzfqs1B0xP43i6u65XSEVPdiGhXWuORglbNARI=";
}; };
patches = [ nativeBuildInputs = [
# Make tests work when not using virtualenv, can be dropped with the next version setuptools-scm
# Upstream PR (already merged): https://github.com/nexB/univers/pull/77
(fetchpatch {
url = "https://github.com/nexB/univers/commit/b74229cc1c8790287633cd7220d6b2e97c508302.patch";
hash = "sha256-i6zWv9rAlwCMghd9g5FP6WIQLLDLYvp+6qJ1E7nfTSY=";
})
]; ];
nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [
propagatedBuildInputs = [ attrs packaging pyparsing semantic-version semver ]; attrs
nativeCheckInputs = [ commoncode pytestCheckHook saneyaml ]; packaging
pyparsing
semantic-version
semver
];
nativeCheckInputs = [
commoncode
pytestCheckHook
saneyaml
];
dontConfigure = true; # ./configure tries to setup virtualenv and downloads dependencies dontConfigure = true; # ./configure tries to setup virtualenv and downloads dependencies
disabledTests = [ "test_codestyle" ]; pythonImportsCheck = [
"univers"
];
pythonImportsCheck = [ "univers" ]; disabledTests = [
# No value for us
"test_codestyle"
# AssertionError starting with 30.10.0
"test_enhanced_semantic_version"
"test_semver_version"
];
meta = with lib; { meta = with lib; {
description = "Library for parsing version ranges and expressions"; description = "Library for parsing version ranges and expressions";
homepage = "https://github.com/nexB/univers"; homepage = "https://github.com/nexB/univers";
changelog = "https://github.com/nexB/univers/blob/v${version}/CHANGELOG.rst";
license = with licenses; [ asl20 bsd3 mit ]; license = with licenses; [ asl20 bsd3 mit ];
maintainers = with maintainers; [ armijnhemel sbruder ]; maintainers = with maintainers; [ armijnhemel sbruder ];
}; };

View File

@ -1,25 +1,44 @@
[ [
{ {
"version": "latest", "version": "latest",
"buildId": "1.0.022851", "buildId": "1.0.023121",
"publishDate": "2023-04-04T18:55:18.5999465Z", "publishDate": "2023-05-01T20:32:05.431065Z",
"files": { "files": {
"linux-x64": { "linux-x64": {
"url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022851/linux/StaticSitesClient", "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.023121/linux/StaticSitesClient",
"sha": "dbbf2785549d2e002f69057c54d4df378c1e52e5e564d484f6871440ef336689" "sha": "99c8b876922587ee0729d103ba5509ae88ec6b457c2d7d7bf69da26b1428ef6b"
}, },
"win-x64": { "win-x64": {
"url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022851/windows/StaticSitesClient.exe", "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.023121/windows/StaticSitesClient.exe",
"sha": "a3d37f5793ce433ba8cd7743285d9e6f9c0174c2d09c530483a6a50f8a448637" "sha": "7c24aa28e7e9758a08ee6a33fa085e46d4b92101b5396e78a1eba218853aff76"
}, },
"osx-x64": { "osx-x64": {
"url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022851/macOS/StaticSitesClient", "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.023121/macOS/StaticSitesClient",
"sha": "9de09ad2b000c6943a8103c323e95a0fb8fea1a3c2bd406859cc59b4b6cec548" "sha": "cf2d799edcd87aeb4e9cab83bf8906770c1d05277130131740b50a95e31786f7"
} }
} }
}, },
{ {
"version": "stable", "version": "stable",
"buildId": "1.0.023121",
"publishDate": "2023-05-01T20:32:05.431065Z",
"files": {
"linux-x64": {
"url": "https://swalocaldeploy.azureedge.net/downloads/1.0.023121/linux/StaticSitesClient",
"sha": "99c8b876922587ee0729d103ba5509ae88ec6b457c2d7d7bf69da26b1428ef6b"
},
"win-x64": {
"url": "https://swalocaldeploy.azureedge.net/downloads/1.0.023121/windows/StaticSitesClient.exe",
"sha": "7c24aa28e7e9758a08ee6a33fa085e46d4b92101b5396e78a1eba218853aff76"
},
"osx-x64": {
"url": "https://swalocaldeploy.azureedge.net/downloads/1.0.023121/macOS/StaticSitesClient",
"sha": "cf2d799edcd87aeb4e9cab83bf8906770c1d05277130131740b50a95e31786f7"
}
}
},
{
"version": "backup",
"buildId": "1.0.022851", "buildId": "1.0.022851",
"publishDate": "2023-04-04T18:55:18.5999465Z", "publishDate": "2023-04-04T18:55:18.5999465Z",
"files": { "files": {
@ -36,24 +55,5 @@
"sha": "9de09ad2b000c6943a8103c323e95a0fb8fea1a3c2bd406859cc59b4b6cec548" "sha": "9de09ad2b000c6943a8103c323e95a0fb8fea1a3c2bd406859cc59b4b6cec548"
} }
} }
},
{
"version": "backup",
"buildId": "1.0.022431",
"publishDate": "2023-02-21T18:46:09.9616432Z",
"files": {
"linux-x64": {
"url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022431/linux/StaticSitesClient",
"sha": "a0424f02b72b0e292e23fa1774a579f3a83cc2280af46a19682c11423e55a134"
},
"win-x64": {
"url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022431/windows/StaticSitesClient.exe",
"sha": "78476f93e8357ebd5b6676c66747c6f0432084615a5cecaa43e4afbda2533176"
},
"osx-x64": {
"url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022431/macOS/StaticSitesClient",
"sha": "0f2dc106903167d5900d9875321fd99a11349d21177b4794495b45e3df175755"
}
}
} }
] ]

View File

@ -7,10 +7,6 @@ buildGoModule rec {
pname = "gomplate"; pname = "gomplate";
version = "3.11.5"; version = "3.11.5";
# gomplate is currently built w/ go 1.19 (see pkgs/top-level/all-packages.nix), but
# it seems the reported "go 1.20 build failure" does no longer occurr.
# TODO remove indication to use go 1.19 in pkgs/top-level/all-packages.nix when next upgrading gomplate
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hairyhenderson"; owner = "hairyhenderson";
repo = pname; repo = pname;

View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, cmake, flex, bison }: { lib, stdenv, fetchFromGitHub, cmake, flex, bison }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "minizinc"; pname = "minizinc";
version = "2.7.2"; version = "2.7.3";
nativeBuildInputs = [ cmake flex bison ]; nativeBuildInputs = [ cmake flex bison ];
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
owner = "MiniZinc"; owner = "MiniZinc";
repo = "libminizinc"; repo = "libminizinc";
rev = version; rev = version;
sha256 = "sha256-XiaLD6tJDn8DTQwknlVd1+xf+DNCiOZ12yn1zugCVxY="; sha256 = "sha256-qDAFXyWEwdei1jBHb5ONgivlp2ftMNfBbq8a/Ibh2BM=";
}; };
meta = with lib; { meta = with lib; {

View File

@ -11,13 +11,13 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o
buildGoModule rec { buildGoModule rec {
pname = "open-policy-agent"; pname = "open-policy-agent";
version = "0.51.0"; version = "0.52.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "open-policy-agent"; owner = "open-policy-agent";
repo = "opa"; repo = "opa";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-vyz0mmbM9zD1NLmMFGb5rQJAokgS+Equljd3okoJ7WE="; hash = "sha256-6mMFu4jkH9k9K836p0007a9rwbe9tBZZoW+Bw9Rfwek=";
}; };
vendorHash = null; vendorHash = null;

View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "protoc-gen-entgrpc"; pname = "protoc-gen-entgrpc";
version = "0.4.3"; version = "0.4.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ent"; owner = "ent";
repo = "contrib"; repo = "contrib";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-5gFdfMSAb0DWCMCzG0nVGU+VWam6yC26QYUPF1YjekM="; sha256 = "sha256-bEJjVNWd4NsUdWPqMZQ86U9F32q5M1iBRcS9MYDp9GE=";
}; };
vendorHash = "sha256-DgqCGXqEnLBxyLZJrTRZIeBIrHYA7TNMV4WTk/3IS8Y="; vendorHash = "sha256-DgqCGXqEnLBxyLZJrTRZIeBIrHYA7TNMV4WTk/3IS8Y=";

View File

@ -0,0 +1,40 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec {
pname = "qc";
version = "0.4.0";
src = fetchFromGitHub {
owner = "qownnotes";
repo = "qc";
rev = "v${version}";
hash = "sha256-6dH7pmsd7kUgwHplvCfNqoq/ucDY/UZnyVxC3VvV+fQ=";
};
vendorHash = "sha256-7t5rQliLm6pMUHhtev/kNrQ7AOvmA/rR93SwNQhov6o=";
ldflags = [
"-s" "-w" "-X=github.com/qownnotes/qc/cmd.version=${version}"
];
doCheck = false;
subPackages = [ "." ];
nativeBuildInputs = [
installShellFiles
];
postInstall = ''
installShellCompletion --cmd qc \
--zsh ./misc/completions/zsh/_qc
'';
meta = with lib; {
description = "QOwnNotes command-line snippet manager";
homepage = "https://github.com/qownnotes/qc";
license = licenses.mit;
maintainers = with maintainers; [ pbek totoroot ];
platforms = platforms.unix;
};
}

View File

@ -9,13 +9,13 @@
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "sentry-cli"; pname = "sentry-cli";
version = "2.17.4"; version = "2.17.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "getsentry"; owner = "getsentry";
repo = "sentry-cli"; repo = "sentry-cli";
rev = version; rev = version;
sha256 = "sha256-k5Zw4M1mDo/AIMROvpGyak2UR9GryubgyLmXF5/0JoM="; sha256 = "sha256-7qBw0MT1FM1rAbOEtVuf/XEBY8yosRWsnGwVbqpc3QQ=";
}; };
doCheck = false; doCheck = false;
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
cargoHash = "sha256-uPlJTwm+DRY1t/jqkk0cuE7Gz327qJPnpsaTVnVWIlI="; cargoHash = "sha256-LAasV0rY4jgoC+soBshECUXvXYIe5zQZmnKtBONAD6g=";
meta = with lib; { meta = with lib; {
homepage = "https://docs.sentry.io/cli/"; homepage = "https://docs.sentry.io/cli/";

View File

@ -13,13 +13,30 @@
, libXdmcp , libXdmcp
, libXrandr , libXrandr
, spirv-headers , spirv-headers
, spirv-tools
, vulkan-headers , vulkan-headers
, wayland , wayland
}: }:
let let
robin-hood-hashing = callPackage ./robin-hood-hashing.nix {}; robin-hood-hashing = callPackage ./robin-hood-hashing.nix {};
# Current VVL version requires a newer spirv-headers than the latest release tag.
# This should hopefully not be too common and the override should be removed after
# the next SPIRV headers release.
# FIXME: if this ever becomes common, figure out a way to pull revisions directly
# from upstream known-good.json
spirv-headers' = spirv-headers.overrideAttrs(_: {
version = "unstable-2023-04-27";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Headers";
rev = "7f1d2f4158704337aff1f739c8e494afc5716e7e";
hash = "sha256-DHOYIZQqP5uWDYdb+vePpMBaQDOCB5Pcg8wPBMF8itk=";
};
postPatch = "";
});
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "vulkan-validation-layers"; pname = "vulkan-validation-layers";
@ -34,7 +51,7 @@ stdenv.mkDerivation rec {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "Vulkan-ValidationLayers"; repo = "Vulkan-ValidationLayers";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-viVceH8qFz6Cl/RlMMWZnMIdzULELlnIvtPZ87ySs2M="; hash = "sha256-+Vjy3hzzpC+bFNSEHLsfUaaHMSrMv2G+B8lGjui0fJs=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -50,14 +67,13 @@ stdenv.mkDerivation rec {
libXrandr libXrandr
libffi libffi
libxcb libxcb
spirv-tools
vulkan-headers vulkan-headers
wayland wayland
]; ];
cmakeFlags = [ cmakeFlags = [
"-DGLSLANG_INSTALL_DIR=${glslang}" "-DGLSLANG_INSTALL_DIR=${glslang}"
"-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}" "-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers'}"
"-DROBIN_HOOD_HASHING_INSTALL_DIR=${robin-hood-hashing}" "-DROBIN_HOOD_HASHING_INSTALL_DIR=${robin-hood-hashing}"
"-DBUILD_LAYER_SUPPORT_FILES=ON" "-DBUILD_LAYER_SUPPORT_FILES=ON"
"-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config" "-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config"
@ -84,6 +100,5 @@ stdenv.mkDerivation rec {
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.asl20; license = licenses.asl20;
maintainers = [ maintainers.ralith ]; maintainers = [ maintainers.ralith ];
broken = (lib.all (pkg: pkg.version != version) [vulkan-headers glslang spirv-tools spirv-headers]);
}; };
} }

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "function-runner"; pname = "function-runner";
version = "3.3.0"; version = "3.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Shopify"; owner = "Shopify";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-AnY9WIb3bHhC9o0ymdFM2MFro1Rx/yoVXMsbjCSNJaE="; sha256 = "sha256-bks73G9oZgZpkSbrRWD34+UcFOMkJJa4qkJIQxcx/Ao=";
}; };
cargoHash = "sha256-oM6DMtQhtHR47AEw5RubNCGNpUKbIx/jVZeeoK3utlY="; cargoHash = "sha256-V0lr1gqn8w4MrHQO5UVxUl+OdK/ODutAr+nMYHc+4hQ=";
meta = with lib; { meta = with lib; {
description = "A CLI tool which allows you to run Wasm Functions intended for the Shopify Functions infrastructure"; description = "A CLI tool which allows you to run Wasm Functions intended for the Shopify Functions infrastructure";

View File

@ -25,11 +25,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "unciv"; pname = "unciv";
version = "4.6.7"; version = "4.6.8";
src = fetchurl { src = fetchurl {
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
hash = "sha256-aaCGo/vogi5HV0hM0Lz4Gw/IRbLp5U7eqAhfL7ztDos="; hash = "sha256-ECj94r/0jEB9xzlX5A8q4jvOr92yRsTpD4IkxXMF2EM=";
}; };
dontUnpack = true; dontUnpack = true;

View File

@ -4,16 +4,16 @@ let
# comments with variant added for update script # comments with variant added for update script
# ./update-zen.py zen # ./update-zen.py zen
zenVariant = { zenVariant = {
version = "6.2.12"; #zen version = "6.3.1"; #zen
suffix = "zen1"; #zen suffix = "zen1"; #zen
sha256 = "0y1gs7yyijgwhdcxznj6l1frlqsnpjr0r5xk43dqnckz0f1ml3by"; #zen sha256 = "1m3jvgvqycig8ls4dgqglz8f0hphc0dmvi0v98xdcxqclkhz87nj"; #zen
isLqx = false; isLqx = false;
}; };
# ./update-zen.py lqx # ./update-zen.py lqx
lqxVariant = { lqxVariant = {
version = "6.2.12"; #lqx version = "6.2.14"; #lqx
suffix = "lqx1"; #lqx suffix = "lqx1"; #lqx
sha256 = "1gjg4ln42p6c5qk2067irjx4czwr8sl2klnzw68nk9cdppf3w4z5"; #lqx sha256 = "18c95lal9f2hak49rw888sc454pj7bmh1wnphlwb7sp8j944g8cf"; #lqx
isLqx = true; isLqx = true;
}; };
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {

View File

@ -1023,6 +1023,13 @@ let self = {
}; };
inputs = [ zstd ]; inputs = [ zstd ];
meta = with lib; {
description = "Nginx modules for the Zstandard compression";
homepage = "https://github.com/tokers/zstd-nginx-module";
license = with licenses; [ bsd2 ];
maintainers = with maintainers; [ ];
};
}; };
}; in self // lib.optionalAttrs config.allowAliases { }; in self // lib.optionalAttrs config.allowAliases {
# deprecated or renamed packages # deprecated or renamed packages

View File

@ -3,12 +3,12 @@
buildGoModule rec { buildGoModule rec {
pname = "imgproxy"; pname = "imgproxy";
version = "3.16.0"; version = "3.16.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
sha256 = "sha256-TdJRoburmJl2Ez0wzJnqm2jpJpFOSOmaBx0O9Z/8DXQ="; sha256 = "sha256-l5THMK6YUfScTeralhEl5SDBDoeV3Olt1xzdzeJ8BEQ=";
rev = "v${version}"; rev = "v${version}";
}; };

View File

@ -9,13 +9,13 @@
buildDotnetModule rec { buildDotnetModule rec {
pname = "jackett"; pname = "jackett";
version = "0.20.4029"; version = "0.20.4078";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha512-ldciP2TAq8qN754NGcwkZ+NnjrvfhiVLFW8WyAgL77agfpwgps1BxlPM5s9rCXKJoOaFQdmLoYMBsImApU9i4A=="; hash = "sha512-RZAp4eHCZfZmFUjIgiKvTIBAt5PH14ZIYz4ptGkKbVnoPaorWqCudVlNbKmTbx8cRv+I+hOI2Rcxb/S0dh0rhg==";
}; };
projectFile = "src/Jackett.Server/Jackett.Server.csproj"; projectFile = "src/Jackett.Server/Jackett.Server.csproj";

View File

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "gobgpd"; pname = "gobgpd";
version = "3.13.0"; version = "3.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "osrg"; owner = "osrg";
repo = "gobgp"; repo = "gobgp";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-qXLg/EZF2eU7BhILHO7Uu4juz0tVZLq37foQcSKv0P8="; hash = "sha256-R64Mm8fWZ8VZgsKcnc+ZqAk0V3L+TkpxTmSkx6+KVs0=";
}; };
vendorHash = "sha256-ofPz9IX+4ylch6Qe0ksGZqrP5x6AktqF0JAs/hLBQo0="; vendorHash = "sha256-Z7vYpDQIKc4elVBLiGtxF3D9pec4QNvWFLpux/29t1Y=";
postConfigure = '' postConfigure = ''
export CGO_ENABLED=0 export CGO_ENABLED=0

View File

@ -5,7 +5,6 @@ let
in in
py.toPythonApplication py.toPythonApplication
(py.mlflow.overridePythonAttrs(old: rec { (py.mlflow.overridePythonAttrs(old: rec {
pname = "mlflow-server";
propagatedBuildInputs = old.propagatedBuildInputs ++ [ propagatedBuildInputs = old.propagatedBuildInputs ++ [
py.boto3 py.boto3

View File

@ -6,14 +6,14 @@
buildGoModule rec { buildGoModule rec {
pname = "artifactory_exporter"; pname = "artifactory_exporter";
version = "1.13.0"; version = "1.13.1";
rev = "v${version}"; rev = "v${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "peimanja"; owner = "peimanja";
repo = pname; repo = pname;
rev = rev; rev = rev;
hash = "sha256-URavjOb0OEFul4jM3VR0buIMXmNU7nLJ0R3e8vRUWQ8="; hash = "sha256-TXLIuTY5COHlhyp8xL9X02DbK2ku9AKnW5a4FYdzMic=";
}; };
vendorHash = "sha256-Gin134G4NPK8M2E2RrgH62ieiuCw15jwm9SJg03w9ts="; vendorHash = "sha256-Gin134G4NPK8M2E2RrgH62ieiuCw15jwm9SJg03w9ts=";

View File

@ -21,6 +21,7 @@ in lib.mapAttrs (n: make) (with lib.systems.examples; {
armv6l-musl = muslpi; armv6l-musl = muslpi;
aarch64-musl = aarch64-multiplatform-musl; aarch64-musl = aarch64-multiplatform-musl;
riscv64 = riscv64; riscv64 = riscv64;
loongarch64-linux = loongarch64-linux;
mips64el-linux-gnuabin32 = mips64el-linux-gnuabin32; mips64el-linux-gnuabin32 = mips64el-linux-gnuabin32;
mips64el-linux-gnuabi64 = mips64el-linux-gnuabi64; mips64el-linux-gnuabi64 = mips64el-linux-gnuabi64;
mipsel-linux-gnu = mipsel-linux-gnu; mipsel-linux-gnu = mipsel-linux-gnu;

View File

@ -5,17 +5,17 @@
buildGoModule rec { buildGoModule rec {
pname = "trivy"; pname = "trivy";
version = "0.40.0"; version = "0.41.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aquasecurity"; owner = "aquasecurity";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-vhzhYFmU4aIMDbqF33bQSl50DTLs8NQd0SSYsU1wnO0="; sha256 = "sha256-GDApctrRWRJ9svPBWGt86slnCtmZyciQ03rhYW1958s=";
}; };
# hash missmatch on across linux and darwin # hash missmatch on across linux and darwin
proxyVendor = true; proxyVendor = true;
vendorHash = "sha256-3h4S97wygLH957+PyeaQyc8qnQHie77gJ1kjsTKVFtQ="; vendorHash = "sha256-JlLQpBiviVXcX1xK0pi2igErCzvOXBc28m4fzDuIQ1U=";
excludedPackages = [ "magefiles" "misc" ]; excludedPackages = [ "magefiles" "misc" ];

View File

@ -24,14 +24,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "vulkan-tools-lunarg"; pname = "vulkan-tools-lunarg";
# The version must match that in vulkan-headers version = "1.3.249";
version = "1.3.243.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "LunarG"; owner = "LunarG";
repo = "VulkanTools"; repo = "VulkanTools";
rev = "sdk-${version}"; rev = "v${version}";
hash = "sha256-mvBP6wD1Z0VNLZ0mC4bA3i2IaBDtDr7K6XjHz4S3UA4="; hash = "sha256-yQE6tjUxIZEMspxDaO9AoSjoEHQl2eDAc0E/aVQZnxQ=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -102,6 +101,5 @@ stdenv.mkDerivation rec {
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.asl20; license = licenses.asl20;
maintainers = [ maintainers.expipiplus1 ]; maintainers = [ maintainers.expipiplus1 ];
broken = (version != vulkan-headers.version);
}; };
} }

View File

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "interactsh"; pname = "interactsh";
version = "1.1.2"; version = "1.1.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "projectdiscovery"; owner = "projectdiscovery";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-a/rJbBYRERujvy7HBRavLdv7NdG7ofCQec4Ia1WPflc="; hash = "sha256-hoh7Nug0XLu/8SPb+YY/TeaRqBIaq3dUAC+8iJ1wvpI=";
}; };
vendorHash = "sha256-YfqprpftCFH+tuEhcK4xWwenjv8BjFhzlTRsy1rz5Ec="; vendorHash = "sha256-B7DE2OEP0VikLfS6btILpdJ6rqwuoD2w7SqNnWD4Bdk=";
modRoot = "."; modRoot = ".";
subPackages = [ subPackages = [

View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "portal"; pname = "portal";
version = "1.2.2"; version = "1.2.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SpatiumPortae"; owner = "SpatiumPortae";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-80ZWMYGH5D5C5Lw97Sic3duw+oXBzIxQjJ+6uQLBwJQ="; sha256 = "sha256-hGB82a2WirUL1Tph6EuoITOQGYA0Lo4zOeKPC46B5Qk=";
}; };
vendorSha256 = "sha256-SbNFi5DE3zhTUw0rsX6n+dpYcdDsaDh+zVUrfxgo/4g="; vendorHash = "sha256-SbNFi5DE3zhTUw0rsX6n+dpYcdDsaDh+zVUrfxgo/4g=";
subPackages = [ "cmd/portal/" ]; subPackages = [ "cmd/portal/" ];
ldflags = [ "-s -X main.version=${version}" ]; # from: https://github.com/SpatiumPortae/portal/blob/master/Makefile#L3 ldflags = [ "-s -X main.version=${version}" ]; # from: https://github.com/SpatiumPortae/portal/blob/master/Makefile#L3

View File

@ -1,4 +1,16 @@
{ lib, rustPlatform, fetchFromGitHub, libdrm }: { lib
, rustPlatform
, fetchFromGitHub
, libdrm
, libX11
, libGL
, wayland
, wayland-protocols
, libxkbcommon
, libXrandr
, libXi
, libXcursor
}:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "amdgpu_top"; pname = "amdgpu_top";
@ -13,7 +25,25 @@ rustPlatform.buildRustPackage rec {
cargoLock.lockFile = ./Cargo.lock; cargoLock.lockFile = ./Cargo.lock;
buildInputs = [ libdrm ]; buildInputs = [
libdrm
libX11
libGL
wayland
wayland-protocols
libxkbcommon
libXrandr
libXi
libXcursor
];
postInstall = ''
install -D ./assets/${pname}.desktop -t $out/share/applications/
'';
postFixup = ''
patchelf --set-rpath "${lib.makeLibraryPath buildInputs}" $out/bin/${pname}
'';
meta = with lib; { meta = with lib; {
description = "Tool to display AMDGPU usage"; description = "Tool to display AMDGPU usage";

View File

@ -14,11 +14,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "crowdin-cli"; pname = "crowdin-cli";
version = "3.10.1"; version = "3.11.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip"; url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip";
sha256 = "sha256-kHi8rLtIHrAfu/r2vvhzIrscqNaDW1Q1F+kTEn4AicQ="; sha256 = "sha256-qT0vEqUISprR1pOPaO3r/HHA/Zt07Af/0WyY950MEgI=";
}; };
nativeBuildInputs = [ installShellFiles makeWrapper unzip ]; nativeBuildInputs = [ installShellFiles makeWrapper unzip ];

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "html-xml-utils"; pname = "html-xml-utils";
version = "8.5"; version = "8.6";
src = fetchurl { src = fetchurl {
url = "https://www.w3.org/Tools/HTML-XML-utils/${pname}-${version}.tar.gz"; url = "https://www.w3.org/Tools/HTML-XML-utils/${pname}-${version}.tar.gz";
sha256 = "sha256-8gpGrE7TDQKM14R25fIPXikXqVy3vOfffxfY+z5Peec="; sha256 = "sha256-XoRynvNszTkk0ocu1O5pVMYzMtylQAuo606u8fLbT7I=";
}; };
buildInputs = [curl libiconv]; buildInputs = [curl libiconv];

View File

@ -18824,6 +18824,8 @@ with pkgs;
pylint-exit = callPackage ../development/tools/pylint-exit { }; pylint-exit = callPackage ../development/tools/pylint-exit { };
qc = callPackage ../development/tools/qc { };
qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { qtcreator = libsForQt5.callPackage ../development/tools/qtcreator {
inherit (linuxPackages) perf; inherit (linuxPackages) perf;
}; };
@ -26540,9 +26542,7 @@ with pkgs;
gomp = callPackage ../applications/version-management/gomp { }; gomp = callPackage ../applications/version-management/gomp { };
gomplate = callPackage ../development/tools/gomplate { gomplate = callPackage ../development/tools/gomplate { };
buildGoModule = buildGo119Module; # go 1.20 build failure
};
gpm = callPackage ../servers/gpm { gpm = callPackage ../servers/gpm {
withNcurses = false; # Keep curses disabled for lack of value withNcurses = false; # Keep curses disabled for lack of value