Merge remote-tracking branch 'upstream/staging-next' into staging

This commit is contained in:
Michael Daniels
2026-01-31 19:55:01 -05:00
112 changed files with 705 additions and 713 deletions
+3 -2
View File
@@ -423,8 +423,9 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
/pkgs/applications/networking/cluster/terraform-providers @zowoq
# Forgejo
nixos/modules/services/misc/forgejo.nix @adamcstephens @bendlas @emilylange
pkgs/by-name/fo/forgejo/ @adamcstephens @bendlas @emilylange
nixos/modules/services/misc/forgejo.* @adamcstephens @bendlas @christoph-heiss @emilylange @nycodeghg @pyrox0 @tebriel
pkgs/by-name/fo/forgejo/ @adamcstephens @bendlas @christoph-heiss @emilylange @nycodeghg @pyrox0 @tebriel
nixos/tests/forgejo.nix @adamcstephens @bendlas @christoph-heiss @emilylange @nycodeghg @pyrox0 @tebriel
# Dotnet
/pkgs/build-support/dotnet @corngood
@@ -29,7 +29,6 @@ gitsigns.nvim,,,,,5.1,
grug-far.nvim,,,,,5.1,teto
haskell-tools.nvim,,,,,5.1,mrcjkb
http,,,,0.4-0,,vcunat
image.nvim,,,,,5.1,teto
inspect,,,,,,
jsregexp,,,,0.0.7-2,,
ldbus,,,https://luarocks.org/dev,,,
1 name rockspec ref server version luaversion maintainers
29 grug-far.nvim 5.1 teto
30 haskell-tools.nvim 5.1 mrcjkb
31 http 0.4-0 vcunat
image.nvim 5.1 teto
32 inspect
33 jsregexp 0.0.7-2
34 ldbus https://luarocks.org/dev
@@ -49,10 +49,7 @@ let
cleanSettings = lib.filterAttrs (n: v: v != null) baseSettings;
# Generate configuration file from user settings
configFile = pkgs.writeTextFile {
name = "yggdrasil.conf";
text = builtins.toJSON cleanSettings;
};
configFile = pkgs.writers.writeJSON "yggdrasil.conf" cleanSettings;
in
{
imports = [
+92 -75
View File
@@ -1,8 +1,20 @@
let
privateKeys = {
alice = ''
-----BEGIN PRIVATE KEY-----
MC4CAQAwBQYDK2VwBCIEIKhn+eB45M5Y0xDPWs1GItdZ4qId8H4db8OAoqJkiUgN
-----END PRIVATE KEY-----
'';
bob = ''
-----BEGIN PRIVATE KEY-----
MC4CAQAwBQYDK2VwBCIEIAxKJKzTQCcizpJ37RefSgS4lbSVhkk8Jfuu1gZT2FfW
-----END PRIVATE KEY-----
'';
};
aliceIp6 = "202:b70:9b0b:cf34:f93c:8f18:bbfd:7034";
aliceKeys = {
PublicKey = "3e91ec9e861960d86e1ce88051f97c435bdf2859640ab681dfa906eb45ad5182";
PrivateKey = "a867f9e078e4ce58d310cf5acd4622d759e2a21df07e1d6fc380a2a26489480d3e91ec9e861960d86e1ce88051f97c435bdf2859640ab681dfa906eb45ad5182";
};
# Frank has a legacy keys.json that should be migrated
# This is the same key as Alice but in the old hex format
@@ -11,7 +23,7 @@ let
# The old format stored PrivateKey as 128 hex chars (64 bytes = seed + pubkey)
# This corresponds to Alice's key
PrivateKey =
"a867f9e078e4ce58d310cf5acd4622d759e2a21df07e1d6fc380a2a264894809" + aliceKeys.PublicKey;
"a867f9e078e4ce58d310cf5acd4622d759e2a21df07e1d6fc380a2a26489480d" + aliceKeys.PublicKey;
PublicKey = aliceKeys.PublicKey;
};
bobIp6 = "202:a483:73a4:9f2d:a559:4a19:bc9:8458";
@@ -30,7 +42,6 @@ let
}
];
PublicKey = "2b6f918b6c1a4b54d6bcde86cf74e074fb32ead4ee439b7930df2aa60c825186";
PrivateKey = "0c4a24acd3402722ce9277ed179f4a04b895b49586493c25fbaed60653d857d62b6f918b6c1a4b54d6bcde86cf74e074fb32ead4ee439b7930df2aa60c825186";
};
danIp6 = bobPrefix + "::2";
@@ -69,13 +80,9 @@ in
settings = {
Listen = [ "tcp://0.0.0.0:12345" ];
MulticastInterfaces = [ ];
};
configFile = toString (
pkgs.writeTextFile {
name = "yggdrasil-alice-conf";
text = builtins.toJSON aliceKeys;
}
);
PrivateKeyPath = "${pkgs.writeText "private" (privateKeys.alice)}";
}
// aliceKeys;
};
};
@@ -88,12 +95,9 @@ in
services.yggdrasil = {
enable = true;
openMulticastPort = true;
configFile = toString (
pkgs.writeTextFile {
name = "yggdrasil-bob-conf";
text = builtins.toJSON bobConfig;
}
);
settings = bobConfig // {
PrivateKeyPath = pkgs.writeText "private" (privateKeys.bob);
};
};
boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1;
@@ -158,8 +162,8 @@ in
Port = 43210;
}
];
openMulticastPort = true;
};
openMulticastPort = true;
persistentKeys = true;
};
};
@@ -194,13 +198,23 @@ in
networking.firewall.allowedTCPPorts = [ 43212 ];
# Pre-populate the legacy keys.json file before the service starts
system.activationScripts.yggdrasil-legacy-keys = ''
mkdir -p /var/lib/yggdrasil
cat > /var/lib/yggdrasil/keys.json << 'EOF'
${builtins.toJSON frankLegacyKeys}
EOF
chmod 600 /var/lib/yggdrasil/keys.json
'';
systemd.services.yggdrasil-legacy-keys = {
wantedBy = [ "yggdrasil-persistent-keys.service" ];
before = [ "yggdrasil-persistent-keys.service" ];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
};
script = ''
mkdir -p /var/lib/yggdrasil
cat > /var/lib/yggdrasil/keys.json << 'EOF'
${builtins.toJSON frankLegacyKeys}
EOF
chmod 600 /var/lib/yggdrasil/keys.json
'';
};
services.yggdrasil = {
enable = true;
@@ -221,68 +235,71 @@ in
};
};
testScript = ''
import re
testScript =
# python
''
import re
# Give Alice a head start so she is ready when Bob calls.
alice.start()
alice.wait_for_unit("yggdrasil.service")
# Give Alice a head start so she is ready when Bob calls.
alice.start()
alice.wait_for_unit("yggdrasil.service")
bob.start()
carol.start()
eve.start()
frank.start()
bob.wait_for_unit("default.target")
carol.wait_for_unit("yggdrasil.service")
bob.start()
carol.start()
eve.start()
bob.wait_for_unit("default.target")
carol.wait_for_unit("yggdrasil.service")
# Eve uses persistentKeys - verify the key generation service ran
eve.wait_for_unit("yggdrasil-persistent-keys.service")
eve.wait_for_unit("yggdrasil.service")
eve.succeed("test -f /var/lib/yggdrasil/private.pem")
eve.succeed("grep -q 'BEGIN PRIVATE KEY' /var/lib/yggdrasil/private.pem")
# Eve uses persistentKeys - verify the key generation service ran
eve.wait_for_unit("yggdrasil-persistent-keys.service")
eve.wait_for_unit("yggdrasil.service")
eve.succeed("test -f /var/lib/yggdrasil/private.pem")
eve.succeed("grep -q 'BEGIN PRIVATE KEY' /var/lib/yggdrasil/private.pem")
# Frank tests migration from legacy keys.json format
frank.wait_for_unit("yggdrasil-persistent-keys.service")
frank.wait_for_unit("yggdrasil.service")
# Verify migration happened: private.pem should exist
frank.succeed("test -f /var/lib/yggdrasil/private.pem")
frank.succeed("grep -q 'BEGIN PRIVATE KEY' /var/lib/yggdrasil/private.pem")
# Legacy file should still exist (not deleted, user should verify and remove)
frank.succeed("test -f /var/lib/yggdrasil/keys.json")
ip_addr_show = "ip -o -6 addr show dev ygg0 scope global"
carol.wait_until_succeeds(f"[ `{ip_addr_show} | grep -v tentative | wc -l` -ge 1 ]")
carol_ip6 = re.split(" +|/", carol.succeed(ip_addr_show))[3]
ip_addr_show = "ip -o -6 addr show dev ygg0 scope global"
carol.wait_until_succeeds(f"[ `{ip_addr_show} | grep -v tentative | wc -l` -ge 1 ]")
carol_ip6 = re.split(" +|/", carol.succeed(ip_addr_show))[3]
eve.wait_until_succeeds(f"[ `{ip_addr_show} | grep -v tentative | wc -l` -ge 1 ]")
eve_ip6 = re.split(" +|/", eve.succeed(ip_addr_show))[3]
eve.wait_until_succeeds(f"[ `{ip_addr_show} | grep -v tentative | wc -l` -ge 1 ]")
eve_ip6 = re.split(" +|/", eve.succeed(ip_addr_show))[3]
# If Alice can talk to Carol, then Bob's outbound peering and Carol's
# local peering have succeeded and everybody is connected.
alice.wait_until_succeeds(f"ping -c 1 {carol_ip6}")
alice.succeed("ping -c 1 ${bobIp6}")
# Verify Frank got the expected IP after migration (same key as Alice = same IP)
frank.wait_until_succeeds(f"[ `{ip_addr_show} | grep -v tentative | wc -l` -ge 1 ]")
frank_ip6 = re.split(" +|/", frank.succeed(ip_addr_show))[3]
assert frank_ip6 == "${frankIp6}", f"Frank's IP {frank_ip6} doesn't match expected ${frankIp6} after migration"
bob.succeed("ping -c 1 ${aliceIp6}")
bob.succeed(f"ping -c 1 {carol_ip6}")
# If Alice can talk to Carol, then Bob's outbound peering and Carol's
# local peering have succeeded and everybody is connected.
alice.wait_until_succeeds(f"ping -c 1 {carol_ip6}")
alice.succeed("ping -c 1 ${bobIp6}")
carol.succeed("ping -c 1 ${aliceIp6}")
carol.succeed("ping -c 1 ${bobIp6}")
carol.succeed("ping -c 1 ${bobPrefix}::1")
carol.succeed("ping -c 8 ${danIp6}")
bob.succeed("ping -c 1 ${aliceIp6}")
bob.succeed(f"ping -c 1 {carol_ip6}")
carol.fail("journalctl -u dhcpcd | grep ygg0")
carol.succeed("ping -c 1 ${aliceIp6}")
carol.succeed("ping -c 1 ${bobIp6}")
carol.succeed("ping -c 1 ${bobPrefix}::1")
carol.succeed("ping -c 8 ${danIp6}")
# Eve should be able to communicate with the network via multicast peering
eve.wait_until_succeeds(f"ping -c 1 {carol_ip6}")
carol.wait_until_succeeds(f"ping -c 1 {eve_ip6}")
carol.fail("journalctl -u dhcpcd | grep ygg0")
alice.wait_for_unit("httpd.service")
carol.succeed("curl --fail -g http://[${aliceIp6}]")
carol.succeed("curl --fail -g http://[${danIp6}]")
# Eve should be able to communicate with the network via multicast peering
eve.wait_until_succeeds(f"ping -c 1 {carol_ip6}")
carol.wait_until_succeeds(f"ping -c 1 {eve_ip6}")
with subtest("legacy key migration"):
frank.start()
# Frank tests migration from legacy keys.json format
frank.wait_for_unit("yggdrasil-persistent-keys.service")
frank.wait_for_unit("yggdrasil.service")
# Verify migration happened: private.pem should exist
frank.succeed("test -f /var/lib/yggdrasil/private.pem")
frank.succeed("grep -q 'BEGIN PRIVATE KEY' /var/lib/yggdrasil/private.pem")
# Legacy file should still exist (not deleted, user should verify and remove)
frank.succeed("test -f /var/lib/yggdrasil/keys.json")
alice.wait_for_unit("httpd.service")
carol.succeed("curl --fail -g http://[${aliceIp6}]")
carol.succeed("curl --fail -g http://[${danIp6}]")
'';
# Verify Frank got the expected IP after migration (same key as Alice = same IP)
frank.wait_until_succeeds(f"[ `{ip_addr_show} | grep -v tentative | wc -l` -ge 1 ]")
frank_ip6 = re.split(" +|/", frank.succeed(ip_addr_show))[3]
assert frank_ip6 == "${frankIp6}", f"Frank's IP {frank_ip6} doesn't match expected ${frankIp6} after migration"
'';
}
@@ -145,7 +145,7 @@ stdenv.mkDerivation (finalAttrs: {
install -Dm644 ${desktop} $out/share/applications/bitcoin-qt.desktop
substituteInPlace $out/share/applications/bitcoin-qt.desktop --replace "Icon=bitcoin128" "Icon=bitcoin"
install -Dm644 share/pixmaps/bitcoin256.png $out/share/pixmaps/bitcoin.png
install -Dm644 share/pixmaps/bitcoin256.png $out/share/icons/hicolor/256x256/apps/bitcoin.png
'';
cmakeFlags = [
@@ -12748,6 +12748,19 @@ final: prev: {
meta.hydraPlatforms = [ ];
};
org-notebook-nvim = buildVimPlugin {
pname = "org-notebook.nvim";
version = "0-unstable-2025-12-18";
src = fetchFromGitHub {
owner = "bitbloxhub";
repo = "org-notebook.nvim";
rev = "fd381c5381930c773ef99d1ff11d0f77dc409f65";
hash = "sha256-O1AwDqi2SdmycDHe1wWBeo5dEMPmYlFDjZJBSCCf3fM=";
};
meta.homepage = "https://github.com/bitbloxhub/org-notebook.nvim/";
meta.hydraPlatforms = [ ];
};
org-roam-nvim = buildVimPlugin {
pname = "org-roam.nvim";
version = "0.2.0-unstable-2025-12-15";
@@ -3003,6 +3003,17 @@ assertNoAdditions {
dependencies = [ self.orgmode ];
};
org-notebook-nvim = super.org-notebook-nvim.overrideAttrs {
dependencies = [
self.orgmode
self.jupyter-api-nvim
];
nvimSkipModules = [
# Requires mini.test, deno, and some deno dependencies, look into it once https://github.com/NixOS/nixpkgs/pull/453904 is merged
"org-notebook.test"
];
};
otter-nvim = super.otter-nvim.overrideAttrs {
dependencies = [ self.nvim-lspconfig ];
nvimSkipModules = [
@@ -979,6 +979,7 @@ https://github.com/tyru/open-browser.vim/,,
https://github.com/nickjvandyke/opencode.nvim/,HEAD,
https://github.com/Almo7aya/openingh.nvim/,,
https://github.com/salkin-mada/openscad.nvim/,HEAD,
https://github.com/bitbloxhub/org-notebook.nvim/,HEAD,
https://github.com/chipsenkbeil/org-roam.nvim/,HEAD,
https://github.com/rgroli/other.nvim/,HEAD,
https://github.com/jmbuhr/otter.nvim/,,
+21 -11
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
installShellFiles,
python3,
ruby,
wrapQtAppsHook,
@@ -16,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "klayout";
version = "0.30.4-1";
version = "0.30.5";
src = fetchFromGitHub {
owner = "KLayout";
repo = "klayout";
rev = "v${version}";
hash = "sha256-EhIGxiXqo09/p8mA00RRvKgXJncVr4qguYSPyEC0fqc=";
hash = "sha256-WigRictn6CxOPId2YitlEm43vEw+dSRWdoareD9HtMc=";
};
postPatch = ''
@@ -31,10 +32,11 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [
which
(python3.withPackages (ps: [ ps.tomli ]))
installShellFiles
perl
python3
ruby
which
wrapQtAppsHook
];
@@ -49,17 +51,25 @@ stdenv.mkDerivation rec {
buildPhase = ''
runHook preBuild
mkdir -p $out/lib
./build.sh -qt5 -prefix $out/lib -option -j$NIX_BUILD_CORES
# -qt5: Using Qt5 as per your previous configuration.
# -rpath: Ensures the klayout binary can find its internal libraries (tl, db, etc.)
# in the nix store without needing LD_LIBRARY_PATH.
./build.sh \
-qt5 \
-prefix $out/lib \
-option "-j$NIX_BUILD_CORES" \
-rpath $out/lib
runHook postBuild
'';
postBuild =
lib.optionalString stdenv.hostPlatform.isLinux ''
mkdir $out/bin
install -Dm444 etc/klayout.desktop -t $out/share/applications
install -Dm444 etc/logo.png $out/share/icons/hicolor/256x256/apps/klayout.png
mv $out/lib/klayout $out/bin/
installBin $out/lib/klayout
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p $out/Applications
@@ -79,10 +89,10 @@ stdenv.mkDerivation rec {
env.NIX_CFLAGS_COMPILE = toString [ "-Wno-parentheses" ];
dontInstall = true; # Installation already happens as part of "build.sh"
# Installation is handled manually in buildPhase/postBuild via build.sh -prefix
dontInstall = true;
# Fix: "gsiDeclQMessageLogger.cc:126:42: error: format not a string literal
# and no format arguments [-Werror=format-security]"
# Fix for: "gsiDeclQMessageLogger.cc: error: format not a string literal"
hardeningDisable = [ "format" ];
meta = {
@@ -14,16 +14,16 @@ builtins.mapAttrs
}:
buildGoModule rec {
inherit pname;
version = "3.31.2";
version = "3.31.3";
src = fetchFromGitHub {
owner = "projectcalico";
repo = "calico";
rev = "v${version}";
hash = "sha256-kbyKWvuK68ObFcOh9oYrY0oabRpzaS8lCuq80US9e3M=";
hash = "sha256-w+dStKYbytNekl3HxBAek8kS+FC5Aeu7OEU4SIFLURY=";
};
vendorHash = "sha256-vBFL9HOV93PLy0NkA6sIPDpwsRRpnhAQxRK1ggSqGAk=";
vendorHash = "sha256-J9X7W7UozsxNlXQwXYeDi++KkyjxwtnYvs4EkUq4Vec=";
inherit doCheck subPackages;
@@ -155,11 +155,11 @@
"vendorHash": "sha256-iEQdSvQOCwvxhqh+veQ59uDVoXjCxsysxzkF4DHAf1E="
},
"checkly_checkly": {
"hash": "sha256-EYZoQTALazHWOj0dL3cDbgs/sNGkuPToWPD3hQeOcQA=",
"hash": "sha256-EAYf/8mKsR18F4XSEaZCDoydq4VPH7xmDhEOHo26J70=",
"homepage": "https://registry.terraform.io/providers/checkly/checkly",
"owner": "checkly",
"repo": "terraform-provider-checkly",
"rev": "v1.17.1",
"rev": "v1.17.2",
"spdx": null,
"vendorHash": "sha256-QOBjpG2pv9ngzslBIac15aWh21o1ctkM6ODC36H8bXU="
},
@@ -616,13 +616,13 @@
"vendorHash": "sha256-IDsGPzNsVPIHWEyhfIkaNaPOrhnk/4XI1UsrIPwcq/M="
},
"hashicorp_local": {
"hash": "sha256-Mdy4g8i26JeYd7MDZth5WRvKVWM7xpgd5/JHG9+Yqs0=",
"hash": "sha256-TyMNKLfw40LVIifw9iJ1ZAIZ/Ba9NI1whi/uaEIoIt4=",
"homepage": "https://registry.terraform.io/providers/hashicorp/local",
"owner": "hashicorp",
"repo": "terraform-provider-local",
"rev": "v2.6.1",
"rev": "v2.6.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-MDhCYXJe8x7AEqQwVn+Ot3jI1i5l4AJB0KEoiHXplCc="
"vendorHash": "sha256-FHhdCM0bg61OW5+dIFLUlxC85HpPSfvHxkL2Qz/AYeY="
},
"hashicorp_nomad": {
"hash": "sha256-lTO1ZLB0N+WLdMDegIP1NcAC++/vsBV7EB5BDxj588I=",
@@ -1193,11 +1193,11 @@
"vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0="
},
"selectel_selectel": {
"hash": "sha256-BT8sDYfcEtsvMg1aLi2QRo4wu2V/hkWEk4PKQmN3vtg=",
"hash": "sha256-htB1/ptyo+rgAOAt9VZwULU1c3XU1QcKUxxtGFjD3ag=",
"homepage": "https://registry.terraform.io/providers/selectel/selectel",
"owner": "selectel",
"repo": "terraform-provider-selectel",
"rev": "v7.4.1",
"rev": "v7.5.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-OJlD1P+CUEsLk2xSsQ2QQBvGewYNly1dIJh8kMi+ChE="
},
@@ -8,13 +8,13 @@
let
pname = "mendeley";
version = "2.138.0";
version = "2.142.0";
executableName = "${pname}-reference-manager";
src = fetchurl {
url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage";
hash = "sha256-OS5VarPvWC3KUIAFEw2QndiNZ2ryj81MxTp1fkvuobE=";
hash = "sha256-Ic19MQRzRLmYL2nVFMBvCbloI0AoCm0MVlWJeV4i+Fs=";
};
appimageContents = appimageTools.extractType2 {
+2 -2
View File
@@ -16,12 +16,12 @@
stdenv.mkDerivation (finalAttrs: {
pname = "aide";
version = "0.19.2";
version = "0.19.3";
src = fetchurl {
# We specifically want the tar.gz, so fetchFromGitHub is not suitable here
url = "https://github.com/aide/aide/releases/download/v${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
hash = "sha256-I3YrBfRhEe3rPIoFAWyHMcAb24wfkb5IwVbDGrhedMQ=";
hash = "sha256-ZRMXC7W4wigC3Rty8C2KqfQyrvK0RwUi2wPnVSEqP0c=";
};
nativeBuildInputs = [ pkg-config ];
+2 -2
View File
@@ -31,11 +31,11 @@
stdenv.mkDerivation rec {
pname = "alfaview";
version = "9.23.2";
version = "9.24.1";
src = fetchurl {
url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb";
hash = "sha256-0EGjm/EYozGXDM/IvmopN04kzJfPM+6wjMpJesyW55U=";
hash = "sha256-vRo5ZD3yYTWhR6fbc/HFtBBbYuq3cGbxPuDlSt5D8XM=";
};
nativeBuildInputs = [
@@ -5,13 +5,8 @@
testers,
cmake,
pkg-config,
wrapQtAppsHook,
qt6,
pcsclite,
qtscxml,
qtsvg,
qttools,
qtwayland,
qtwebsockets,
gitUpdater,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -28,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmake
pkg-config
wrapQtAppsHook
qt6.wrapQtAppsHook
];
# The build scripts copy the entire translations directory from Qt
@@ -39,11 +34,11 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
pcsclite
qtscxml
qtsvg
qttools
qtwayland
qtwebsockets
qt6.qtscxml
qt6.qtsvg
qt6.qttools
qt6.qtwayland
qt6.qtwebsockets
];
passthru = {
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "badger";
version = "4.8.0";
version = "4.9.0";
src = fetchFromGitHub {
owner = "dgraph-io";
repo = "badger";
rev = "v${version}";
hash = "sha256-LkJp0ixEJcD0mGeafjFoxjekeyep2nbZPXgVcMEofAU=";
hash = "sha256-AmDfG4IOpptdH0/Un4V275UTTUXoV1LNKtbSj3O50rs=";
};
vendorHash = "sha256-I7N85gdf4Bm/0zTcdFfbpah9veSpOzZcTvd7Ku5Xqpg=";
vendorHash = "sha256-+rXXCVH2xuULPzdM0KVPwYht+tu0qyxPjLLaBMWVIuI=";
subPackages = [ "badger" ];
+3 -3
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "benthos";
version = "4.57.1";
version = "4.63.1";
src = fetchFromGitHub {
owner = "redpanda-data";
repo = "benthos";
tag = "v${version}";
hash = "sha256-OiXdeoxaik+ynoLSR/fWieLIhcx5Y/G1fY2aTL2yBFM=";
hash = "sha256-dcVPTLzRVhyWEkzXfzQKOv7bfjzsxV7odcdPzLP64bQ=";
};
proxyVendor = true;
@@ -22,7 +22,7 @@ buildGoModule rec {
"cmd/benthos"
];
vendorHash = "sha256-g1jqVJfpH2EsTYoXMGp0HiUEqKlprgMYqmzecGWKmoo=";
vendorHash = "sha256-WMnhjGgkIG+yz2SgKoibWSPdNbET7NxY87v5WtMDl8I=";
# doCheck = false;
+3 -3
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "c2FmZQ";
version = "0.4.32";
version = "0.5.3";
src = fetchFromGitHub {
owner = "c2FmZQ";
repo = "c2FmZQ";
rev = "v${version}";
hash = "sha256-1FIGA4pmMb4o6H6GmsiSt/UG2PaC6QR3+L9QKhT8sJQ=";
hash = "sha256-SBCUOQpV03kZu6nHuwTUd8gyKeK+XAthZ+H7IRYFjdM=";
};
ldflags = [
@@ -23,7 +23,7 @@ buildGoModule rec {
sourceRoot = "${src.name}/c2FmZQ";
vendorHash = "sha256-usMM9YU+xW+6X5W6rCOtXeggK/WCcik0s+4dFAfbozM=";
vendorHash = "sha256-jyos/CNQyuatq4KL2nqCPtRuMQLZMB35VECiKQhq4go=";
subPackages = [
"c2FmZQ-client"
+3 -3
View File
@@ -7,18 +7,18 @@
buildGoModule rec {
pname = "cadvisor";
version = "0.53.0";
version = "0.56.2";
src = fetchFromGitHub {
owner = "google";
repo = "cadvisor";
rev = "v${version}";
hash = "sha256-caGzjv7XhIst3JZA0ri97XqQOO3mI+hwS8WJmLk9f7g=";
hash = "sha256-UBQvFlO0pb5mDUrrUTaEsuQcKX7qKQrAMub2knUZWGA=";
};
modRoot = "./cmd";
vendorHash = "sha256-xUhHo/kDnjAQLuaeFG1EouC2FWBnFhj1RawlQX7ggVs=";
vendorHash = "sha256-JJulf+Wj/bf3l8l0rufcyLlfqefriOzhxCfGUru6+lA=";
ldflags = [
"-s"
@@ -3,32 +3,31 @@
stdenv,
fetchFromGitHub,
cmake,
wrapQtAppsHook,
qt6,
glm,
eigen,
qtbase,
stellarium,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "calcmysky";
version = "0.4.0";
src = fetchFromGitHub {
owner = "10110111";
repo = "CalcMySky";
tag = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-AuDHLgOS+Cu2xSJQVi8XfrINoh18STP1ox7JElafW3k=";
};
nativeBuildInputs = [
cmake
wrapQtAppsHook
qt6.wrapQtAppsHook
];
buildInputs = [
glm
eigen
qtbase
qt6.qtbase
];
cmakeFlags = [ "-DQT_VERSION=6" ];
@@ -45,4 +44,4 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ nickcao ];
};
}
})
+2 -2
View File
@@ -10,13 +10,13 @@
buildGoModule rec {
pname = "cilium-cli";
version = "0.18.8";
version = "0.19.0";
src = fetchFromGitHub {
owner = "cilium";
repo = "cilium-cli";
tag = "v${version}";
hash = "sha256-6/ECHhPV9rJHcHFVAvkwtlZi96rjhEe2PjEvXtv8OMY=";
hash = "sha256-pW+9UN+pWkKCYRTvZxslrPgczOezVnPpDF5XdRHCh+g=";
};
nativeBuildInputs = [ installShellFiles ];
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "circleci-cli";
version = "0.1.33721";
version = "0.1.34038";
src = fetchFromGitHub {
owner = "CircleCI-Public";
repo = "circleci-cli";
rev = "v${version}";
sha256 = "sha256-0ZJZ9xVnk/nUf4NnvFmXcM6FHKoh296hfIbMwnQ9CwA=";
sha256 = "sha256-kEhAiTcWY+xXX5jFgJZtle0CEwqRT2BHDEM8iSUFRh4=";
};
vendorHash = "sha256-QMSciB81khHhjd/4Km1YYyTiEFDF75AcNGsmZTLLO5Q=";
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "clusterctl";
version = "1.11.3";
version = "1.12.2";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = "cluster-api";
rev = "v${version}";
hash = "sha256-qORhusO2YrjrM4TP+WmAdhXdP9y5IWJcFQy69HhixNc=";
hash = "sha256-AaGJhdBTyCxUK+qm++McS6rFlgAdv/7SjQHvaNRn6YU=";
};
vendorHash = "sha256-vRY7/SrhsLzh6sM1zaOLVUUn4DxoatScyRlHjVOPJlY=";
vendorHash = "sha256-3dh9Y8R4OeUayyqNyrvUcrnSi/4s9x6oMrAADXR5rnw=";
subPackages = [ "cmd/clusterctl" ];
+30 -4
View File
@@ -4,6 +4,10 @@
rustPlatform,
fetchFromGitHub,
installShellFiles,
clang,
cmake,
gitMinimal,
libclang,
makeBinaryWrapper,
nix-update-script,
pkg-config,
@@ -14,26 +18,48 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "codex";
version = "0.89.0";
version = "0.92.0";
src = fetchFromGitHub {
owner = "openai";
repo = "codex";
tag = "rust-v${finalAttrs.version}";
hash = "sha256-VFbtxGOqX80qWqVo+BG+BnUr8DiLCfcJCrN9fwy7utY=";
hash = "sha256-m/g+5wdehyaHDw6i5vik4HXiisY/iWFtPX0gKjCFPNY=";
};
sourceRoot = "${finalAttrs.src.name}/codex-rs";
cargoHash = "sha256-gg7KPEMO2aiBcIN8TllaDQeTLyw+WLfmMrXBKV/L53M=";
cargoHash = "sha256-fuT8vPb9/7fZam129nR6y+r+3j46WBhlf73Htkcjpzc=";
nativeBuildInputs = [
clang
cmake
gitMinimal
installShellFiles
makeBinaryWrapper
pkg-config
];
buildInputs = [ openssl ];
buildInputs = [
libclang
openssl
];
# NOTE: set LIBCLANG_PATH so bindgen can locate libclang, and adjust
# warning-as-error flags to avoid known false positives (GCC's
# stringop-overflow in BoringSSL's a_bitstr.cc) while keeping Clang's
# character-conversion warning-as-error disabled.
env = {
LIBCLANG_PATH = "${lib.getLib libclang}/lib";
NIX_CFLAGS_COMPILE = toString (
lib.optionals stdenv.cc.isGNU [
"-Wno-error=stringop-overflow"
]
++ lib.optionals stdenv.cc.isClang [
"-Wno-error=character-conversion"
]
);
};
# NOTE: part of the test suite requires access to networking, local shells,
# apple system configuration, etc. since this is a very fast moving target
@@ -5,16 +5,11 @@
fetchpatch2,
cmake,
ninja,
qtbase,
qtsvg,
qttools,
qtdeclarative,
qt6,
libXfixes,
libXtst,
qtwayland,
wayland,
pkg-config,
wrapQtAppsHook,
kdePackages,
}:
@@ -33,18 +28,18 @@ stdenv.mkDerivation rec {
cmake
ninja
kdePackages.extra-cmake-modules
wrapQtAppsHook
qt6.wrapQtAppsHook
pkg-config
];
buildInputs = [
qtbase
qtsvg
qttools
qtdeclarative
qt6.qtbase
qt6.qtsvg
qt6.qttools
qt6.qtdeclarative
libXfixes
libXtst
qtwayland
qt6.qtwayland
wayland
kdePackages.kconfig
kdePackages.kstatusnotifieritem
+7 -8
View File
@@ -11,18 +11,18 @@
rustPlatform.buildRustPackage rec {
pname = "crate2nix";
version = "0.14.1";
version = "0.15.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = "crate2nix";
rev = version;
hash = "sha256-esWhRnt7FhiYq0CcIxw9pvH+ybOQmWBfHYMtleaMhBE=";
hash = "sha256-SUuruvw1/moNzCZosHaa60QMTL+L9huWdsCBN6XZIic=";
};
sourceRoot = "${src.name}/crate2nix";
cargoHash = "sha256-Du6RAe4Ax3KK90h6pQEtF75Wdniz+IqF2/TXHA9Ytbw=";
cargoHash = "sha256-q/nPKNXZ1eJijeTBXA6Uuz235p+Q1uilXY5a/s8btMM=";
nativeBuildInputs = [
makeWrapper
@@ -42,11 +42,10 @@ rustPlatform.buildRustPackage rec {
]
}
for shell in bash zsh fish
do
$out/bin/crate2nix completions -s $shell
installShellCompletion crate2nix.$shell || installShellCompletion --$shell _crate2nix
done
$out/bin/crate2nix completions -s bash
$out/bin/crate2nix completions -s zsh
$out/bin/crate2nix completions -s fish
installShellCompletion --bash crate2nix.bash --zsh _crate2nix --fish crate2nix.fish
'';
meta = {
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "dcrwallet";
version = "2.0.6";
version = "2.1.3";
src = fetchFromGitHub {
owner = "decred";
repo = "dcrwallet";
rev = "release-v${version}";
hash = "sha256-MrQrDip8vE0l5XHkx/zIegSZd/AkWq1aFZLUVPdMy50=";
hash = "sha256-oB+E2NVz4zlLUWBhdmyGq2jfsMLuF2OpPkBn7/daxDw=";
};
vendorHash = "sha256-Ulh6RxK+PvS70mJ7TYiGMzKFsR79+asWuQ5W1FAI23I=";
vendorHash = "sha256-P9u+Pxy/TtArhU/fu2nXg6PyyoCm9GPLVRX6twheERQ=";
subPackages = [ "." ];
+2 -2
View File
@@ -9,14 +9,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dita-ot";
version = "4.3.5";
version = "4.4";
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ openjdk17 ];
src = fetchzip {
url = "https://github.com/dita-ot/dita-ot/releases/download/${finalAttrs.version}/dita-ot-${finalAttrs.version}.zip";
hash = "sha256-odL9i48SICfXLxSDqwqIXBXG57dENRjdkZkRjt3xhMg=";
hash = "sha256-0P2E0c5HHOCk1w0/CHe3a6AH8FJIeKoQdTruuGkwo/c=";
};
installPhase = ''
@@ -6,6 +6,7 @@
python3,
flex,
bison,
withGui ? false,
qt6,
libiconv,
spdlog,
@@ -51,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
fmt
sqlite
]
++ lib.optionals (qt6 != null) [
++ lib.optionals withGui [
qt6.qtbase
qt6.wrapQtAppsHook
qt6.qtsvg
@@ -62,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
"-Duse_sys_fmt=ON"
"-Duse_sys_sqlite3=ON"
]
++ lib.optional (qt6 != null) "-Dbuild_wizard=YES";
++ lib.optional withGui "-Dbuild_wizard=YES";
# put examples in an output so people/tools can test against them
outputs = [
@@ -89,6 +90,6 @@ stdenv.mkDerivation (finalAttrs: {
off-line reference manual (in LaTeX) from a set of documented source
files.
'';
platforms = if qt6 != null then lib.platforms.linux else lib.platforms.unix;
platforms = if withGui then lib.platforms.linux else lib.platforms.unix;
};
})
+2 -2
View File
@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "emptty";
version = "0.14.0";
version = "0.15.0";
src = fetchFromGitHub {
owner = "tvrzna";
repo = "emptty";
rev = "v${version}";
hash = "sha256-AsIt7EI5RkSchhaMGKofOsfPNROhX8f5gDaqZ7Q2394=";
hash = "sha256-7RYzj+LcxK9i2RM8NFfKjz2DiD9CjCTNSJe7wVnYzdM=";
};
buildInputs = [
+2 -2
View File
@@ -24,13 +24,13 @@ let
in
buildGoModule rec {
pname = "faas-cli";
version = "0.17.8";
version = "0.18.0";
src = fetchFromGitHub {
owner = "openfaas";
repo = "faas-cli";
rev = version;
sha256 = "sha256-gyd9uX5i5nl7x476SGfBwWUL1hTLsPCCdsmwo783x5Q=";
sha256 = "sha256-ggDfHqGu17nSxRNZESBLn8MYrvSU+ItQubNdUCAFK1c=";
};
vendorHash = null;
@@ -2,41 +2,35 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
pkg-config,
cmake,
hunspell,
qtbase,
qtmultimedia,
qttools,
qt5compat,
qtwayland,
wrapQtAppsHook,
qt6,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "focuswriter";
version = "1.8.13";
src = fetchFromGitHub {
owner = "gottcode";
repo = "focuswriter";
rev = "v${version}";
rev = "v${finalAttrs.version}";
hash = "sha256-lKhgfFPEcipQcW1S2+ntglVacH6dEcGpnNHvwgeVIzI=";
};
nativeBuildInputs = [
pkg-config
cmake
qttools
wrapQtAppsHook
qt6.qttools
qt6.wrapQtAppsHook
];
buildInputs = [
hunspell
qtbase
qtmultimedia
qt5compat
qtwayland
qt6.qtbase
qt6.qtmultimedia
qt6.qt5compat
qt6.qtwayland
];
installFlags = [ "INSTALL_ROOT=$(out)" ];
@@ -52,4 +46,4 @@ stdenv.mkDerivation rec {
homepage = "https://gottcode.org/focuswriter/";
mainProgram = "focuswriter";
};
}
})
+3 -2
View File
@@ -27,6 +27,7 @@
}:
let
codec2' = codec2.override { freedvSupport = true; };
ebur128Src = fetchFromGitHub {
owner = "jiixyj";
repo = "libebur128";
@@ -125,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: {
];
buildInputs = [
codec2
codec2'
libsamplerate
libsndfile
lpcnet
@@ -157,7 +158,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "USE_NATIVE_AUDIO" (with stdenv.hostPlatform; isLinux || isDarwin))
];
env.NIX_CFLAGS_COMPILE = "-I${codec2.src}/src";
env.NIX_CFLAGS_COMPILE = "-I${codec2'.src}/src";
doCheck = false;
@@ -4,51 +4,41 @@
fetchFromGitHub,
cmake,
pkg-config,
qttools,
wrapQtAppsHook,
qtbase,
qtwayland,
qtsvg,
qt3d,
qtdeclarative,
qtconnectivity,
qtlocation,
qtscxml,
qtwebengine,
qt6,
kdePackages,
wayland,
elfutils,
libbfd,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "gammaray";
version = "3.3.1";
src = fetchFromGitHub {
owner = "KDAB";
repo = pname;
tag = "v${version}";
repo = finalAttrs.pname;
tag = "v${finalAttrs.version}";
hash = "sha256-CJKb7H77PjPwCGW4fqLSJw1mhSweuFYlDE/7RyVDcT0=";
};
nativeBuildInputs = [
cmake
pkg-config
qttools
wrapQtAppsHook
qt6.qttools
qt6.wrapQtAppsHook
];
buildInputs = [
qtbase
qtwayland
qtsvg
qt3d
qtdeclarative
qtconnectivity
qtlocation
qtscxml
qtwebengine
qt6.qtbase
qt6.qtwayland
qt6.qtsvg
qt6.qt3d
qt6.qtdeclarative
qt6.qtconnectivity
qt6.qtlocation
qt6.qtscxml
qt6.qtwebengine
kdePackages.kcoreaddons
wayland
elfutils
@@ -63,10 +53,10 @@ stdenv.mkDerivation rec {
meta = {
description = "Software introspection tool for Qt applications developed by KDAB";
homepage = "https://github.com/KDAB/GammaRay";
changelog = "https://github.com/KDAB/GammaRay/releases/tag/${src.tag}";
changelog = "https://github.com/KDAB/GammaRay/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ wineee ];
mainProgram = "gammaray";
};
}
})
+3 -3
View File
@@ -9,16 +9,16 @@
buildGo125Module rec {
pname = "go-camo";
version = "2.7.1";
version = "2.7.2";
src = fetchFromGitHub {
owner = "cactus";
repo = "go-camo";
tag = "v${version}";
hash = "sha256-gAlbSUYa3yxEfPzJQHDzM0XJ/ap93qgMnSTg3irtHMw=";
hash = "sha256-LP01sPTHDouUmp6iDxdPklunxYKak2vaL0gJZsO3QRM=";
};
vendorHash = "sha256-Qv5DFa4XDJw4e6sLbTUN59bRxMUCMXrPZJmCF7OhumY=";
vendorHash = "sha256-lFpVlK5/LSRTxVD5Ve6DSACeyLFTJxDM2bDTxcUU73E=";
nativeBuildInputs = [
installShellFiles
@@ -6,15 +6,15 @@
buildGoModule rec {
pname = "goimports-reviser";
version = "3.10.0";
version = "3.11.0";
src = fetchFromGitHub {
owner = "incu6us";
repo = "goimports-reviser";
rev = "v${version}";
hash = "sha256-cmWzpZv119RkD4mQ+uLVfcjzddgVrxxtkSm8xvymcDo=";
hash = "sha256-5v10DmJovyDyfAlgLuO4uCKRDZGIUxGLHFJRHsGmSm4=";
};
vendorHash = "sha256-BAV7vMWRgBZaL2Pya4QiVcY54VIiHT++Dz4ZZ92FGgM=";
vendorHash = "sha256-aTPzvqIwjZzEq9LHFdebIgbKMwsBOqLbpEWB7rN7cYY=";
env.CGO_ENABLED = 0;
@@ -4,35 +4,31 @@
cmake,
git,
fetchFromGitHub,
wrapQtAppsHook,
qtbase,
qtdeclarative,
qtsvg,
qtwebengine,
qt6,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "graphia";
version = "5.2";
src = fetchFromGitHub {
owner = "graphia-app";
repo = "graphia";
rev = version;
rev = finalAttrs.version;
sha256 = "sha256-tS5oqpwpqvWGu67s8OuA4uQR3Zb5VzHTY/GnfVQki6k=";
};
nativeBuildInputs = [
cmake
git # needs to define some hash as a version
wrapQtAppsHook
qt6.wrapQtAppsHook
];
buildInputs = [
qtbase
qtdeclarative
qtsvg
qtwebengine
qt6.qtbase
qt6.qtdeclarative
qt6.qtsvg
qt6.qtwebengine
];
meta = {
@@ -46,4 +42,4 @@ stdenv.mkDerivation rec {
maintainers = [ lib.maintainers.bgamari ];
platforms = lib.platforms.all;
};
}
})
@@ -3,10 +3,6 @@
stdenv,
fetchFromGitHub,
cmake,
withLibei ? !stdenv.hostPlatform.isDarwin,
avahi,
curl,
libICE,
libSM,
@@ -21,20 +17,20 @@
openssl,
pkgsStatic,
pkg-config,
qtbase,
qttools,
qt6,
wrapGAppsHook3,
wrapQtAppsHook,
avahi,
avahi' ? avahi.override { withLibdnssdCompat = true; },
withLibei ? !stdenv.hostPlatform.isDarwin,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "input-leap";
version = "3.0.3";
src = fetchFromGitHub {
owner = "input-leap";
repo = "input-leap";
rev = "v${version}";
rev = "v${finalAttrs.version}";
hash = "sha256-zSaeeMlhpWIX3y4OmZ7eHXCu1HPP7NU5HFkME/JZjuQ=";
fetchSubmodules = true;
};
@@ -45,14 +41,14 @@ stdenv.mkDerivation rec {
pkg-config
cmake
wrapGAppsHook3
wrapQtAppsHook
qttools
qt6.wrapQtAppsHook
qt6.qttools
];
buildInputs = [
curl
qtbase
avahi
qt6.qtbase
avahi'
libX11
libXext
libXtst
@@ -71,7 +67,7 @@ stdenv.mkDerivation rec {
];
cmakeFlags = [
"-DINPUTLEAP_REVISION=${builtins.substring 0 8 src.rev}"
"-DINPUTLEAP_REVISION=${builtins.substring 0 8 finalAttrs.src.rev}"
]
++ lib.optional withLibei "-DINPUTLEAP_BUILD_LIBEI=ON";
@@ -102,4 +98,4 @@ stdenv.mkDerivation rec {
];
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
}
})
+2 -2
View File
@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "kapp";
version = "0.64.2";
version = "0.65.0";
src = fetchFromGitHub {
owner = "carvel-dev";
repo = "kapp";
rev = "v${version}";
hash = "sha256-XIbKhJBGw+0TuRakZCBZ1d6MjNPpy252MgCDpPNEo3c=";
hash = "sha256-D46QgNzkCNg0GDsaN1GG0yuWbNeioIErYhbgjwMsTWA=";
};
vendorHash = null;
+3 -3
View File
@@ -11,16 +11,16 @@
buildGoModule rec {
pname = "kargo";
version = "1.8.3";
version = "1.8.6";
src = fetchFromGitHub {
owner = "akuity";
repo = "kargo";
tag = "v${version}";
hash = "sha256-82hXZO8NtAH7eGdIwmfqbxqphVEMVNeCyTrvEKJaCZE=";
hash = "sha256-sBUgoR3Eqv2OQRnXR9IaB4QcZ+awJb3ah7ySZ0XsaYA=";
};
vendorHash = "sha256-H9iRmQ3Xvy1H7ELl7SyJEidmklG74xAlxRPRoaR5PeI=";
vendorHash = "sha256-ZB1Eq8xQ/oF5sm750K9yJyBpwCIcCqmFL8FWpNsiXfo=";
subPackages = [ "cmd/cli" ];
@@ -2,8 +2,7 @@
lib,
stdenv,
fetchzip,
qtbase,
qtscxml,
qt6,
cmake,
json_c,
mesa_glu,
@@ -13,8 +12,6 @@
libtraceevent,
libtracefs,
freefont_ttf,
wrapQtAppsHook,
qtwayland,
fetchpatch,
}:
@@ -40,13 +37,13 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
pkg-config
cmake
wrapQtAppsHook
qt6.wrapQtAppsHook
];
buildInputs = [
qtbase
qtscxml
qtwayland
qt6.qtbase
qt6.qtscxml
qt6.qtwayland
json_c
mesa_glu
libglut
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "kics";
version = "2.1.17";
version = "2.1.19";
src = fetchFromGitHub {
owner = "Checkmarx";
repo = "kics";
tag = "v${version}";
hash = "sha256-GVzzQaf/UO+RyunTILoee7mgPOSbb2n28GY7FUB/BC0=";
hash = "sha256-cgB7qq53QMNm36UH5HZEE15iwcjhaB9A/a1gBGSFQ2M=";
};
vendorHash = "sha256-yXnVY3LtyaY8SMRXs+FJOTXa8SxBPJ92Znq/wLWZqzo=";
vendorHash = "sha256-TlIrCtnJxB9LI+VT9d+cUcGI1tsuDfWwLiNpa8seK+4=";
subPackages = [ "cmd/console" ];
+3 -3
View File
@@ -10,15 +10,15 @@
buildGoModule rec {
pname = "kubernetes-kcp";
version = "0.28.3";
version = "0.29.0";
src = fetchFromGitHub {
owner = "kcp-dev";
repo = "kcp";
tag = "v${version}";
hash = "sha256-gZMheiMvAUAV3YqWNA1WmOWpV5hEU7GtQzz57F4rX38=";
hash = "sha256-rZLav2JOKzG5vW/wyfk7EIkOawsYOmG32OHXxkyyb3Y=";
};
vendorHash = "sha256-w7mC3CJv/UKQe6jOqwzSZSYIu0K/Z4aNUnAcSg6MwG0=";
vendorHash = "sha256-IuQzGme+CZqqD1VMO+rumbbc+ziPQaVJCyJNhMdU3jE=";
subPackages = [ "cmd/kcp" ];
+3 -3
View File
@@ -10,13 +10,13 @@
buildGoModule rec {
pname = "kyverno";
version = "1.15.2";
version = "1.16.2";
src = fetchFromGitHub {
owner = "kyverno";
repo = "kyverno";
rev = "v${version}";
hash = "sha256-Mv01ILbWFLypXGl0zCUVa3kdSZGBQH8fAP3txyUArsE=";
hash = "sha256-wXoqE3AZ5PQ8nxkJhfGrNdyJBKW8BF0loqqCs6A2Etg=";
};
ldflags = [
@@ -27,7 +27,7 @@ buildGoModule rec {
"-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00"
];
vendorHash = "sha256-2qpZEHbBqGZsIizswJYmdJCjgIBhQsnYyHHIS4ZqZYQ=";
vendorHash = "sha256-7zonEXXrd5+QaQQcgHwGwj665YB9gBxtE8Yi09SGsPU=";
subPackages = [ "cmd/cli/kubectl-kyverno" ];
+3 -3
View File
@@ -78,7 +78,7 @@ let
in
effectiveStdenv.mkDerivation (finalAttrs: {
pname = "llama-cpp";
version = "7823";
version = "7898";
outputs = [
"out"
@@ -89,7 +89,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
owner = "ggml-org";
repo = "llama.cpp";
tag = "b${finalAttrs.version}";
hash = "sha256-3NLIX2bAxaxkpPRMzxWfcEhJDke2q4TWAyWjXIa/Wpk=";
hash = "sha256-ST7hhE5lWOm46WS+k9lkHJqVQpz8squwHZWE2/XG6MY=";
leaveDotGit = true;
postFetch = ''
git -C "$out" rev-parse --short HEAD > $out/COMMIT
@@ -125,7 +125,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
++ [ openssl ];
npmRoot = "tools/server/webui";
npmDepsHash = "sha256-m1boNqwMELdpHbV/jYK3hpf2vP1S/KSAf32wVKQGyFo=";
npmDepsHash = "sha256-bbv0e3HZmqpFwKELiEFBgoMr72jKbsX20eceH4XjfBA=";
npmDeps = fetchNpmDeps {
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
inherit (finalAttrs) src patches;
+3 -3
View File
@@ -5,14 +5,14 @@
}:
buildGoModule rec {
pname = "lsh";
version = "1.5.3";
version = "1.5.6";
src = fetchFromGitHub {
owner = "latitudesh";
repo = "lsh";
rev = "v${version}";
sha256 = "sha256-W+0yuBfDjHNMEaf+T0FSVMzRyZgkeXrFwsY47ksDD5U=";
sha256 = "sha256-FS0Bv645gmkt5J5mtHtQjee57Qj05NefGFYrRCaqDJw=";
};
vendorHash = "sha256-kOGHLrnpVQe8gy827CeP+1f2fy4WpUfWDfaNq/JmXpU=";
vendorHash = "sha256-SvbrrunOkJhIB5AlsCY7WrtE+Na/ExEJmVWqfjHNvx4=";
subPackages = [ "." ];
meta = {
changelog = "https://github.com/latitudesh/lsh/releases/tag/v${version}";
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "luau-lsp";
version = "1.60.1";
version = "1.61.0";
src = fetchFromGitHub {
owner = "JohnnyMorganz";
repo = "luau-lsp";
tag = finalAttrs.version;
hash = "sha256-UoitFmn+1bHhQ2oqt1z50iU0Hx7pS4nact+3C8V8WzE=";
hash = "sha256-v3ouLDsJkOc1WsgH39HsPTMxhIYjKfLDY78RWtF6Zrg=";
fetchSubmodules = true;
};
@@ -3,42 +3,38 @@
stdenv,
fetchFromGitHub,
cmake,
qtbase,
qt6,
wrapQtAppsHook,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "maskromtool";
version = "2024-08-18";
src = fetchFromGitHub {
owner = "travisgoodspeed";
repo = "maskromtool";
rev = "v${version}";
rev = "v${finalAttrs.version}";
hash = "sha256-iuCjAAVEKVwJuAgKITwkXGhKau2DVWhFQLPjp28tjIo=";
};
buildInputs = [
qtbase
qt6.qtbase
qt6.qtcharts
qt6.qttools
];
nativeBuildInputs = [
cmake
wrapQtAppsHook
qt6.wrapQtAppsHook
];
meta = {
description = "CAD tool for extracting bits from Mask ROM photographs";
homepage = "https://github.com/travisgoodspeed/maskromtool";
license = [
lib.licenses.beerware
lib.licenses.gpl1Plus
];
maintainers = [
lib.maintainers.evanrichter
license = with lib.licenses; [
beerware
gpl1Plus
];
maintainers = with lib.maintainers; [ evanrichter ];
};
}
})
+3 -3
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "melange";
version = "0.34.1";
version = "0.40.0";
src = fetchFromGitHub {
owner = "chainguard-dev";
repo = "melange";
rev = "v${version}";
hash = "sha256-nocfBhoe8iXs/fjKsYgXXdcc8U6vSQtb8wlhzZYRHLE=";
hash = "sha256-04e6ncAaMVRIfJ1wV6QpcsgHWeJJcZDvxSV4ceVK5bk=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -27,7 +27,7 @@ buildGoModule rec {
'';
};
vendorHash = "sha256-nZD4e5l6sB5l6P1eZosTaCJ8cFTTSdOtyDI3/NYrUuA=";
vendorHash = "sha256-nJyThLtyQSOFp37Wpqkpqiy8sIh2wRzuZPJ5PT7WT74=";
subPackages = [ "." ];
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "mieru";
version = "3.21.0";
version = "3.27.0";
src = fetchFromGitHub {
owner = "enfein";
repo = "mieru";
rev = "v${version}";
hash = "sha256-9e2V+WwcBp16DsMf31IzANdMlc/r3KFDYjSCKvKKGwM=";
hash = "sha256-rUX3zCnwCw34dujpctTaEH6tmUN2iMraO6awavldiUI=";
};
vendorHash = "sha256-pKcdvP38fZ2KFYNDx6I4TfmnnvWKzFDvz80xMkUojqM=";
@@ -2,9 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
qtbase,
qmake,
qtwebsockets,
qt6,
minizinc,
makeWrapper,
copyDesktopItems,
@@ -19,27 +17,28 @@ let
else
"$out/bin/MiniZincIDE";
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "minizinc-ide";
version = "2.9.5";
src = fetchFromGitHub {
owner = "MiniZinc";
repo = "MiniZincIDE";
rev = version;
rev = finalAttrs.version;
hash = "sha256-VqVcByPBS7UBU/h5NIUltIKA0POAX1dUVgMsn5b9C4w=";
fetchSubmodules = true;
};
nativeBuildInputs = [
qmake
qt6.qmake
makeWrapper
copyDesktopItems
imagemagick
];
buildInputs = [
qtbase
qtwebsockets
qt6.qtbase
qt6.qtwebsockets
];
desktopItems = [
@@ -47,7 +46,7 @@ stdenv.mkDerivation rec {
name = "MiniZincIDE";
desktopName = "MiniZincIDE";
icon = "minizinc";
comment = meta.description;
comment = finalAttrs.meta.description;
exec = "MiniZincIDE";
type = "Application";
terminal = false;
@@ -59,7 +58,7 @@ stdenv.mkDerivation rec {
})
];
sourceRoot = "${src.name}/MiniZincIDE";
sourceRoot = "${finalAttrs.src.name}/MiniZincIDE";
dontWrapQtApps = true;
@@ -71,11 +70,11 @@ stdenv.mkDerivation rec {
+ ''
wrapProgram ${executableLoc} \
--prefix PATH ":" ${lib.makeBinPath [ minizinc ]} \
--set QT_QPA_PLATFORM_PLUGIN_PATH "${qtbase}/lib/qt-6/plugins/platforms"
--set QT_QPA_PLATFORM_PLUGIN_PATH "${qt6.qtbase}/lib/qt-6/plugins/platforms"
for size in 16 24 32 48 64 128 256 512; do
mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
magick -background none ${src}/MiniZincIDE/images/mznicon.png -resize "$size"x"$size" $out/share/icons/hicolor/"$size"x"$size"/apps/minizinc.png
magick -background none ${finalAttrs.src}/MiniZincIDE/images/mznicon.png -resize "$size"x"$size" $out/share/icons/hicolor/"$size"x"$size"/apps/minizinc.png
done
'';
@@ -94,4 +93,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
maintainers = [ ];
};
}
})
+7 -1
View File
@@ -5,7 +5,8 @@
cmake,
gettext,
libuv,
lua,
lua5_1,
luajit,
pkg-config,
unibilium,
utf8proc,
@@ -25,6 +26,11 @@
fish ? null,
python3 ? null,
}:
let
lua = if lib.meta.availableOn stdenv.hostPlatform luajit then luajit else lua5_1;
in
stdenv.mkDerivation (
finalAttrs:
let
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "ogen";
version = "1.16.0";
version = "1.18.0";
src = fetchFromGitHub {
owner = "ogen-go";
repo = "ogen";
tag = "v${version}";
hash = "sha256-rZO6jdOzdayXnEEWxNE9gKkt0coi8pNfq+LT8JC8LiQ=";
hash = "sha256-JGGLh/1n9zG6p2/9BgfeUTKGbVuG2QnyVAdrbVvif4A=";
};
vendorHash = "sha256-mL3xw0huTyLz33ja59/mJ+R2+KRIFOfKRUPrk5txJtA=";
vendorHash = "sha256-j6WSBIPmSfbz+30wVPIbgzgghzLV0b5BYELJP6FuR/4=";
patches = [ ./modify-version-handling.patch ];
+2 -2
View File
@@ -6,7 +6,7 @@
buildGoModule rec {
pname = "okta-aws-cli";
version = "2.5.0";
version = "2.5.2";
subPackages = [ "cmd/okta-aws-cli" ];
@@ -14,7 +14,7 @@ buildGoModule rec {
owner = "okta";
repo = "okta-aws-cli";
rev = "v${version}";
sha256 = "sha256-IGecHT/JVKsaHG9OtPTOlu+ZCDbnqf1h3s4SI7+8oT8=";
sha256 = "sha256-z+bW/cTy63bGEhF7ug2GUXDB+kbTi4WhUEuHPOu5iw4=";
};
vendorHash = "sha256-MnK0zCwPOTzsPrkULEYwnmIBmVrPiwK2yDr3tqVHHRY=";
+7 -3
View File
@@ -14,12 +14,12 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "opencode";
version = "1.1.41";
version = "1.1.47";
src = fetchFromGitHub {
owner = "anomalyco";
repo = "opencode";
tag = "v${finalAttrs.version}";
hash = "sha256-p4mZRJ+BQs790hjCOJ9iXzg3JoCa4lqOdCqDRkoEfWw=";
hash = "sha256-f6TVxKV9q2yEQ9r9VCTttXLqpOrYdTEKDUJs+MuQJCQ=";
};
node_modules = stdenvNoCC.mkDerivation {
@@ -68,7 +68,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
# NOTE: Required else we get errors that our fixed-output derivation references store paths
dontFixup = true;
outputHash = "sha256-bjSPHxPTyzhMOztd7HjUl/lvMZYVk944xPj8ADDn5Y4=";
outputHash =
if stdenvNoCC.hostPlatform.isDarwin then
"sha256-BJmyALnZEiAnC8+bsri5Me1Z0Vtf6A/27e7Eve4IvDo="
else
"sha256-zkinMkPR1hCBbB5BIuqozQZDpjX4eiFXjM6lpwUx1fM=";
outputHashAlgo = "sha256";
outputHashMode = "recursive";
};
+3 -3
View File
@@ -12,16 +12,16 @@
buildGoModule rec {
pname = "ov";
version = "0.45.1";
version = "0.50.2";
src = fetchFromGitHub {
owner = "noborus";
repo = "ov";
tag = "v${version}";
hash = "sha256-Ptzlz+9mBKSPmogT4PVnimHw/wsQMQpfPo8MX1AocdM=";
hash = "sha256-tmGOyafVocbeEfHQcvysBuX/LJO62xRuclQ6Xy+Q1Gs=";
};
vendorHash = "sha256-iAwlD6G+80Ci9pGANqbcmVjoRto7FMBSSDKsI6lpv/k=";
vendorHash = "sha256-Y+rNTJoSbTccHVPA/TTQGkkYpYr72WB8gqwzWfqPRH0=";
ldflags = [
"-s"
+5 -5
View File
@@ -2,7 +2,7 @@
lib,
buildNpmPackage,
copyDesktopItems,
electron_37,
electron_39,
fetchFromGitHub,
jq,
makeDesktopItem,
@@ -15,17 +15,17 @@ let
description = "Unofficial desktop application for the open-source design tool, Penpot";
icon = "penpot";
nodejs = nodejs_24;
electron = electron_37;
electron = electron_39;
in
buildNpmPackage rec {
pname = "penpot-desktop";
version = "0.18.1";
version = "0.23.0";
src = fetchFromGitHub {
owner = "author-more";
repo = "penpot-desktop";
tag = "v${version}";
hash = "sha256-MxkdGifPaakhX/tLHiD7Y6xCe3cZ7ELiAhD7GSmdtvk=";
hash = "sha256-2thLD8ECfHZMD3Yw/lQgnCqqEGxCE1AXsHGP9JKof+Q=";
};
makeCacheWritable = true;
@@ -33,7 +33,7 @@ buildNpmPackage rec {
"--engine-strict"
"--legacy-peer-deps"
];
npmDepsHash = "sha256-zOoED2WKfiDgfWQDgRrr7Gf09GbSFK+8rOsNr8VQpgY=";
npmDepsHash = "sha256-uyt9gmmytDwSCnXk9HUBwJoPMcqMt2wLwHHmY2Kx0yk=";
# Do not run the default build script as it leads to errors caused by the electron-builder configuration
dontNpmBuild = true;
+3 -3
View File
@@ -9,18 +9,18 @@
buildGoModule (finalAttrs: {
pname = "pgroll";
version = "0.14.3";
version = "0.16.0";
src = fetchFromGitHub {
owner = "xataio";
repo = "pgroll";
tag = "v${finalAttrs.version}";
hash = "sha256-OqBgFeXpvoImoPMKHBCvsPQGhHSBZuNNMLh2/3DPPYo=";
hash = "sha256-xl6mJkJbZ+N/HjrUsknC1UFOM9GFtY4UYnabXvTwkAc=";
};
proxyVendor = true;
vendorHash = "sha256-rQPWL39AD/qCneuRyJHOQCANmDE7pqmwHx+AavJ/3cw=";
vendorHash = "sha256-j78c7pROEiJVsE0e0hxbr+0uqOmGcBsK1U0F1upgWIw=";
excludedPackages = [
"dev"
@@ -5,16 +5,16 @@
}:
buildGoModule rec {
pname = "elasticsearch_exporter";
version = "1.9.0";
version = "1.10.0";
src = fetchFromGitHub {
owner = "prometheus-community";
repo = "elasticsearch_exporter";
rev = "v${version}";
hash = "sha256-v6Fi5O/87jhFI1h6qWyWb61X+dTjcqS3Fi9/MPQSr8Y=";
hash = "sha256-xVDqyYYwzxfFxZ3K2SMFfPoJw47SXS6czsWLC++LOOk=";
};
vendorHash = "sha256-NAaVz5AqhfaEiWqBAeQZVWwjMIwX9jEw0oycXq7uLNw=";
vendorHash = "sha256-8y0M1b34eJpuHOuXPemhB5kKwBSgU7cMFxOaIZFS/bo=";
meta = {
description = "Elasticsearch stats exporter for Prometheus";
@@ -3,9 +3,7 @@
lib,
fetchFromGitHub,
cmake,
qtbase,
qt5compat,
wrapQtAppsHook,
qt6,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -21,12 +19,12 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmake
wrapQtAppsHook
qt6.wrapQtAppsHook
];
buildInputs = [
qtbase
qt5compat
qt6.qtbase
qt6.qt5compat
];
meta = {
@@ -37,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
peterhoeg
markuskowa
];
inherit (qtbase.meta) platforms;
inherit (qt6.qtbase.meta) platforms;
mainProgram = "qgit";
};
})
@@ -1,5 +1,4 @@
{
stdenv,
lib,
fetchurl,
cmake,
@@ -7,24 +6,13 @@
ninja,
go,
python3,
qtbase,
qt5compat,
qtdeclarative,
qtdoc,
qtquick3d,
qtquicktimeline,
qtserialport,
qtsvg,
qttools,
qtwebengine,
qtwayland,
qtshadertools,
wrapQtAppsHook,
qt6,
yaml-cpp,
litehtml,
libsecret,
gumbo,
llvmPackages,
llvmPackages_21,
stdenv' ? llvmPackages_21.stdenv,
rustc-demangle,
elfutils,
perf,
@@ -49,39 +37,37 @@ let
'';
}).goModules;
in
stdenv.mkDerivation {
inherit pname;
inherit version;
inherit src;
stdenv'.mkDerivation {
inherit pname version src;
nativeBuildInputs = [
cmake
pkg-config
(qttools.override { withClang = true; })
wrapQtAppsHook
(qt6.qttools.override { withClang = true; })
qt6.wrapQtAppsHook
python3
ninja
go
];
buildInputs = [
qtbase
qtdoc
qtsvg
qtquick3d
qtwebengine
qtwayland
qtserialport
qtshadertools
qt5compat
qtdeclarative
qtquicktimeline
qt6.qtbase
qt6.qtdoc
qt6.qtsvg
qt6.qtquick3d
qt6.qtwebengine
qt6.qtwayland
qt6.qtserialport
qt6.qtshadertools
qt6.qt5compat
qt6.qtdeclarative
qt6.qtquicktimeline
yaml-cpp
litehtml
libsecret
gumbo
llvmPackages.libclang
llvmPackages.llvm
llvmPackages_21.libclang
llvmPackages_21.llvm
rustc-demangle
elfutils
];
+3 -3
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "rancher";
version = "2.12.3";
version = "2.13.1";
src = fetchFromGitHub {
owner = "rancher";
repo = "cli";
tag = "v${version}";
hash = "sha256-i+l+vs+uD6h0GruvxhkQtb7DYCJ3uysa/rZ8hGmmu7Y=";
hash = "sha256-s7nt3A2VO23hN3EplB2Df3JvIqENwikexJXjOFr5BKo=";
};
env.CGO_ENABLED = 0;
@@ -25,7 +25,7 @@ buildGoModule rec {
"-static"
];
vendorHash = "sha256-mObfou6JXQ+ZWvxWMpdcC1ymngFJZ8k9I+rCYCFvDg4=";
vendorHash = "sha256-YeWy8JPd1YkLkE56ckvpg4Z35F5U9wcKQC1N+diNQsA=";
postInstall = ''
mv $out/bin/cli $out/bin/rancher
@@ -1,12 +1,9 @@
{
lib,
python3,
python3Packages,
fetchzip,
fetchFromGitHub,
wrapQtAppsHook,
qtbase,
qttools,
qtsvg,
qt6,
buildEnv,
aspellDicts,
# Use `lib.collect lib.isDerivation aspellDicts;` to make all dictionaries
@@ -17,7 +14,7 @@
],
}:
python3.pkgs.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "retext";
version = "8.1.0";
pyproject = true;
@@ -34,19 +31,19 @@ python3.pkgs.buildPythonApplication rec {
hash = "sha256-nqKAUg9nTzGPPxr80KTn6JX9JgCUJwpcwp8aOIlcxPY=";
};
build-system = with python3.pkgs; [ setuptools ];
build-system = with python3Packages; [ setuptools ];
nativeBuildInputs = [
wrapQtAppsHook
qttools.dev
qt6.wrapQtAppsHook
qt6.qttools.dev
];
buildInputs = [
qtbase
qtsvg
qt6.qtbase
qt6.qtsvg
];
dependencies = with python3.pkgs; [
dependencies = with python3Packages; [
chardet
docutils
markdown
@@ -81,7 +78,7 @@ python3.pkgs.buildPythonApplication rec {
}"
)
cp ${toolbarIcons}/* $out/${python3.pkgs.python.sitePackages}/ReText/icons
cp ${toolbarIcons}/* $out/${python3Packages.python.sitePackages}/ReText/icons
substituteInPlace $out/share/applications/me.mitya57.ReText.desktop \
--replace-fail "Exec=retext-${version}.data/scripts/retext %F" "Exec=retext %F" \
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "routedns";
version = "0.1.130";
version = "0.1.131";
src = fetchFromGitHub {
owner = "folbricht";
repo = "routedns";
rev = "v${version}";
hash = "sha256-eYtFfRi+w+0xnIZi/OXc+dt/HI/SQxoZphgduK6eETU=";
hash = "sha256-KrRazsjNBsHWdkmJYeNmHDNAorAV5NuneumevChEuDQ=";
};
vendorHash = "sha256-woInU618JPwVxGDJDZQ6+j9wY6qNSB5Xu8wXf7s2qvQ=";
+2 -2
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "seq66";
version = "0.99.21";
version = "0.99.22";
src = fetchFromGitHub {
owner = "ahlstromcj";
repo = "seq66";
tag = finalAttrs.version;
hash = "sha256-0joa69nSX3lcpoRq9YToNA75Sg9dlYMGRZEfcJm9Vjg=";
hash = "sha256-KtbMRRxKh+BuYujzh8kqKAbSN8xWUz/ktkCHBnTRaPw=";
};
nativeBuildInputs = [
+4 -4
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "stackql";
version = "0.8.175";
version = "0.9.339";
src = fetchFromGitHub {
owner = "stackql";
repo = "stackql";
rev = "v${version}";
hash = "sha256-JA9vTmjNIXhvcdH9BPmtSD3W3VkytG+dYOtOJ+hFnsQ=";
hash = "sha256-WuzY4Vje+Gwzf0Ep5nE5jkF1iJkFKX640ay+nqiF0Dg=";
};
vendorHash = "sha256-lACvTdzOZ5AnPqaw+uGMbO3HnjKU/dSVATgmrdYpWNE=";
vendorHash = "sha256-H8vp2yuP2/mh8GAWTsFOpNJEXfxjyLHZq4m65iyERmw=";
ldflags = [
"-s"
@@ -25,7 +25,7 @@ buildGoModule rec {
"-X github.com/stackql/stackql/internal/stackql/cmd.BuildMajorVersion=${builtins.elemAt (lib.splitVersion version) 0}"
"-X github.com/stackql/stackql/internal/stackql/cmd.BuildMinorVersion=${builtins.elemAt (lib.splitVersion version) 1}"
"-X github.com/stackql/stackql/internal/stackql/cmd.BuildPatchVersion=${builtins.elemAt (lib.splitVersion version) 2}"
"-X github.com/stackql/stackql/internal/stackql/cmd.BuildDate=2024-05-15T07:51:52Z" # date of commit hash
"-X github.com/stackql/stackql/internal/stackql/cmd.BuildDate=2026-01-14T07:36:20Z" # date of commit hash
"-X stackql/internal/stackql/planbuilder.PlanCacheEnabled=true"
];
+2 -2
View File
@@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "subtitleedit";
version = "4.0.13";
version = "4.0.14";
src = fetchzip {
url = "https://github.com/SubtitleEdit/subtitleedit/releases/download/${version}/SE${
lib.replaceStrings [ "." ] [ "" ] version
}.zip";
hash = "sha256-Oo/w+1cEQ3+Xoa9H9VrGCaLFWFI2ajdj9wn3Pk9WEUk=";
hash = "sha256-vaANk5xK8a3SQf5Qacxv3wj3HHtro5LLxZviaIKYkdI=";
stripRoot = false;
};
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "svu";
version = "3.2.4";
version = "3.3.0";
src = fetchFromGitHub {
owner = "caarlos0";
repo = "svu";
rev = "v${version}";
sha256 = "sha256-NzhVEChNsUkzGe1/M8gl1K0SD5nAQ/PrYUxGQKQUAtU=";
sha256 = "sha256-3Rj+2ROo9TuWc2aZ8kkGeXH+PHjKva6nD7wlXHY/LQg=";
};
vendorHash = "sha256-xhNJsARuZZx9nhmTNDMB51VC0QgjZgOYFKLhLf+3b3A=";
vendorHash = "sha256-2QznJ28lp/+f4MIbu4Wi5Kx46B7IIHGYGofY7B1OEjo=";
ldflags = [
"-s"
@@ -8,13 +8,13 @@
buildGoModule (finalAttrs: {
pname = "temporal-ui-server";
version = "2.43.3";
version = "2.44.1";
src = fetchFromGitHub {
owner = "temporalio";
repo = "ui-server";
tag = "v${finalAttrs.version}";
hash = "sha256-5JE5t8NHVNz1sO03yAw5eytsr55IACFgJRgbRxhx0Sg=";
hash = "sha256-iZmyz6E28TN7ooyWCBBwULUOg2ZF6KYziC4omqOc8jw=";
};
vendorHash = "sha256-yScJo+GEGO2LIAts5WPzS4YjPHZK9wZtPrfRg1b7H2Q=";
@@ -4,21 +4,17 @@
fetchurl,
cmake,
pkg-config,
wrapQtAppsHook,
poppler,
qtbase,
qttools,
qtwebengine,
qt5compat,
qt6,
qt6Packages,
zlib,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "texmaker";
version = "6.0.1";
src = fetchurl {
url = "http://www.xm1math.net/texmaker/texmaker-${version}.tar.bz2";
url = "http://www.xm1math.net/texmaker/texmaker-${finalAttrs.version}.tar.bz2";
hash = "sha256-uMI13wzY/XcUzXDTte42MWOwJUqd6pGAeBuPDi5GyvY=";
};
@@ -28,17 +24,17 @@ stdenv.mkDerivation rec {
];
buildInputs = [
poppler
qtbase
qtwebengine
qt5compat
qttools
qt6Packages.poppler
qt6.qtbase
qt6.qtwebengine
qt6.qt5compat
qt6.qttools
zlib
];
nativeBuildInputs = [
cmake
pkg-config
wrapQtAppsHook
qt6.wrapQtAppsHook
];
qmakeFlags = [
@@ -63,4 +59,4 @@ stdenv.mkDerivation rec {
];
mainProgram = "texmaker";
};
}
})
@@ -4,44 +4,41 @@
fetchFromGitHub,
cmake,
pkg-config,
wrapQtAppsHook,
qt6,
qt6Packages,
hunspell,
poppler,
qt5compat,
qttools,
qtwayland,
withLua ? true,
lua,
withPython ? true,
python3,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "texworks";
version = "0.6.10";
src = fetchFromGitHub {
owner = "TeXworks";
repo = "texworks";
rev = "release-${version}";
rev = "release-${finalAttrs.version}";
sha256 = "sha256-tC3ADD35yrmwBJQ8JaXdr8trVf6WLt1r2/euzt0mvN8=";
};
nativeBuildInputs = [
cmake
pkg-config
wrapQtAppsHook
qt6.wrapQtAppsHook
];
buildInputs = [
hunspell
poppler
qt5compat
qttools
qt6Packages.poppler
qt6.qt5compat
qt6.qttools
]
++ lib.optional withLua lua
++ lib.optional withPython python3
++ lib.optional stdenv.hostPlatform.isLinux qtwayland;
++ lib.optional stdenv.hostPlatform.isLinux qt6.qtwayland;
cmakeFlags = [
"-DQT_DEFAULT_MAJOR_VERSION=6"
@@ -50,12 +47,12 @@ stdenv.mkDerivation rec {
++ lib.optional withPython "-DWITH_PYTHON=ON";
meta = {
changelog = "https://github.com/TeXworks/texworks/blob/${src.rev}/NEWS";
changelog = "https://github.com/TeXworks/texworks/blob/${finalAttrs.src.rev}/NEWS";
description = "Simple TeX front-end program inspired by TeXShop";
homepage = "http://www.tug.org/texworks/";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ dotlambda ];
platforms = with lib.platforms; linux;
platforms = lib.platforms.linux;
mainProgram = "texworks";
};
}
})
+3 -3
View File
@@ -12,16 +12,16 @@
buildGoModule rec {
pname = "vault";
version = "1.21.1";
version = "1.21.2";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "vault";
rev = "v${version}";
hash = "sha256-Vkn3l4blbUhT2D1ParNacVwwt/aDQlm12peoHvPNbk4=";
hash = "sha256-G/6GroX9lBaUxB5mkd+hz53nNX/eF5DAtHryin3hzgU=";
};
vendorHash = "sha256-8IK8M328dXWk+NHjK7d+Zj8ltLQqJOofvLDfDieDFnk=";
vendorHash = "sha256-bJdEQkJnUiPI6MSVAsLCqDSsM4zuT5ORJ93jVC+EEAs=";
proxyVendor = true;
+3 -3
View File
@@ -13,20 +13,20 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "wasmtime";
version = "41.0.0";
version = "41.0.1";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = "wasmtime";
tag = "v${finalAttrs.version}";
hash = "sha256-/NQ1nmF5u/mNhS5orvohUWjSrp6YYtzJqpJV2iwn63Q=";
hash = "sha256-x3WA49sj+77uf9iy06IDPZfrRymVLlj9sRe7BF4bms0=";
fetchSubmodules = true;
};
# Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
auditable = false;
cargoHash = "sha256-OViDhQVAs11PzuS4OGL0dzn+K9+yqHwTzXynxl95y88=";
cargoHash = "sha256-ub6MWrVejxRJRCaeEOls1fgAegLG2GJpFEQYORJuWLk=";
cargoBuildFlags = [
"--package"
"wasmtime-cli"
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "weaviate";
version = "1.33.2";
version = "1.35.2";
src = fetchFromGitHub {
owner = "weaviate";
repo = "weaviate";
rev = "v${version}";
hash = "sha256-+QchAvIBJcbrwveeGHXFC+96oD5Uy/+lqMV/vxRPzbk=";
hash = "sha256-FDDwC9CnnMhwI9iqEEGwklE7lr9vOOCYCJ8X389gw7U=";
};
vendorHash = "sha256-KiDU9fw/4vIhI0XbEzUfw+HhopJniVeGhFVJBbLkixU=";
vendorHash = "sha256-xcsVJ1H1S/cszR/t6cHUrW0Wtn/c/PV2RQ04qGdMmD0=";
subPackages = [ "cmd/weaviate-server" ];
@@ -5,11 +5,7 @@
fetchpatch,
cmake,
pkg-config,
wrapQtAppsHook,
qtbase,
qtcharts,
qtmultimedia,
qt5compat,
qt6,
faad2,
rtl-sdr,
soapysdr-with-plugins,
@@ -45,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmake
pkg-config
wrapQtAppsHook
qt6.wrapQtAppsHook
unixtools.xxd
];
@@ -55,10 +51,10 @@ stdenv.mkDerivation (finalAttrs: {
lame
libusb-compat-0_1
mpg123
qtbase
qtcharts
qtmultimedia
qt5compat
qt6.qtbase
qt6.qtcharts
qt6.qtmultimedia
qt6.qt5compat
rtl-sdr
soapysdr-with-plugins
]
+5 -5
View File
@@ -29,16 +29,16 @@ let
."${system}" or (throw "Unsupported system: ${system}");
hash =
{
arm64-linux-hash = "sha256-AGERhD8EiTkaXw7GWVaWPFVuQkclSarNOGMgs+6zxfI=";
arm64-osx-hash = "sha256-AUZoAAEmgrb1A7OKLc7QOliGTgctD9MuM9rqNWQ3ySM=";
x64-linux-hash = "sha256-ZRbV1nxAIiHUL8DzmlAJRcFOnl5t8+ur3zXhw29mUfk=";
x64-osx-hash = "sha256-WfR0x89wQNAiLYX1Dg5AsEuiqHSX9IhhxEOoVuPjRH8=";
arm64-linux-hash = "sha256-hFZ27VAIBDW8c7oP+Nl0rj6T2CRbee8Qxf4CzZJmCL8=";
arm64-osx-hash = "sha256-oFqnQnbBGAD4x97FANbY091nJrzHRMewalASwgOul8s=";
x64-linux-hash = "sha256-ZRgCJf2GGV1B+QgmYh4OfX7nMfRBdN6pIg5pU6Q/KCQ=";
x64-osx-hash = "sha256-H5qLdiL4hEkg5g50zzrv1HdZMc6ji69O5GUrpHWkrdo=";
}
."${arch}-${os}-hash";
in
stdenv.mkDerivation rec {
pname = "whisparr";
version = "2.0.0.1282";
version = "2.0.0.2151";
src = fetchurl {
name = "${pname}-${arch}-${os}-${version}.tar.gz";
@@ -50,14 +50,14 @@
brotli,
withQt ? true,
qt6 ? null,
qt6,
libpcap' ? libpcap.override { withBluez = stdenv.hostPlatform.isLinux; },
}:
let
isAppBundle = withQt && stdenv.hostPlatform.isDarwin;
in
assert withQt -> qt6 != null;
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "wireshark-${if withQt then "qt" else "cli"}";
version = "4.6.3";
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitLab {
repo = "wireshark";
owner = "wireshark";
rev = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-DthYkAW6UYnsDLQf2h3jgJB8RZoasjREWV1NTtZv7PQ=";
};
@@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
libkrb5
libmaxminddb
libopus
libpcap
libpcap'
libsmi
libssh
libxml2
@@ -226,7 +226,7 @@ stdenv.mkDerivation rec {
experts. It runs on UNIX, macOS and Windows.
'';
homepage = "https://www.wireshark.org";
changelog = "https://www.wireshark.org/docs/relnotes/wireshark-${version}.html";
changelog = "https://www.wireshark.org/docs/relnotes/wireshark-${finalAttrs.src.tag}.html";
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux ++ lib.platforms.darwin;
maintainers = with lib.maintainers; [
@@ -235,4 +235,4 @@ stdenv.mkDerivation rec {
];
mainProgram = if withQt then "wireshark" else "tshark";
};
}
})
+3 -3
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation {
pname = "xcursor-viewer";
version = "0-unstable-2026-01-23";
version = "0-unstable-2026-01-27";
src = fetchFromGitHub {
owner = "drizt";
repo = "xcursor-viewer";
rev = "c7aad6c662eab1a0907489d44afbc84ea3aa8de6";
hash = "sha256-iHnWRcM6UYuhNykH4uiXFmVKnFUiyrLNKtjaAh6ilnw=";
rev = "f53e1d261458e84b0f76fb587af560841c413087";
hash = "sha256-fWkjcXmtU51AQOTK1nLx7Kw9kQtQhUz9EVtAAVX0WEg=";
};
nativeBuildInputs = [
+6 -2
View File
@@ -35,9 +35,13 @@ let
plugins:
let
paths = lib.closePropagation plugins;
libExt = stdenv.hostPlatform.extensions.sharedLibrary;
pluginPath = "$out/share/yosys/plugins";
module_flags =
with builtins;
concatStringsSep " " (map (n: "--add-flags -m --add-flags ${n.plugin}") plugins);
concatStringsSep " " (
map (n: "--add-flags -m --add-flags ${pluginPath}/${n.plugin}${libExt}") plugins
);
in
lib.appendToName "with-plugins" (symlinkJoin {
inherit (yosys) name;
@@ -45,7 +49,7 @@ let
nativeBuildInputs = [ makeWrapper ];
postBuild = ''
wrapProgram $out/bin/yosys \
--set NIX_YOSYS_PLUGIN_DIRS $out/share/yosys/plugins \
--set YOSYS_PATH $out/share/yosys \
${module_flags}
'';
meta.mainProgram = "yosys";
@@ -6,11 +6,11 @@
buildGoModule rec {
pname = "zabbix-agent2-plugin-postgresql";
version = "7.4.1";
version = "7.4.5";
src = fetchurl {
url = "https://cdn.zabbix.com/zabbix-agent2-plugins/sources/postgresql/zabbix-agent2-plugin-postgresql-${version}.tar.gz";
hash = "sha256-8Rlg1A6l6I89YoRHMo3s9MRip0LXe2hqiYBliGqEScg=";
hash = "sha256-AeQfPA1o5XmRcY9L6p4ZwOTEaq2h+35QuIHBZhxV/2M=";
};
vendorHash = null;
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "zarf";
version = "0.66.0";
version = "0.70.1";
src = fetchFromGitHub {
owner = "zarf-dev";
repo = "zarf";
tag = "v${version}";
hash = "sha256-IveiGWOLEyxt8Dh/gGRv6eENRIQbroy5jkZk9cj6USE=";
hash = "sha256-3ucUB6KAIm4dPf/8CysZVwKbWp9QZIeP435Aclyzhfs=";
};
vendorHash = "sha256-rW3CDHGYHmrxOdBNKFvWUvrpRJYaxi5XMzOZqiTxhY0=";
vendorHash = "sha256-WjnM9G5Dcn0dawghw6NLGUebIGQ7zJ97nMPL3JgqRKM=";
proxyVendor = true;
nativeBuildInputs = [
+3 -3
View File
@@ -10,18 +10,18 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "zerofs";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "Barre";
repo = "ZeroFS";
tag = "v${finalAttrs.version}";
hash = "sha256-yCniPXw5CgB1SzkoYMpfgO2H/+l5UzUSgerrgFL1vfk=";
hash = "sha256-qfn4Js4/D+/X4nbO08DAxU1tqfTKERUMxU6q3L9RfkY=";
};
sourceRoot = "${finalAttrs.src.name}/zerofs";
cargoHash = "sha256-/o4WcOJ9kNfh9xzEMhZywUDhGyjv8JKkW8aXqYVpCqE=";
cargoHash = "sha256-0sOb+QQRJ1QNs0CofnCZTAPxQ+UsA0R3J02qtJ4pD7w=";
nativeBuildInputs = [ cmake ];
+3 -3
View File
@@ -11,13 +11,13 @@
rustPlatform.buildRustPackage rec {
pname = "zoxide";
version = "0.9.8";
version = "0.9.9";
src = fetchFromGitHub {
owner = "ajeetdsouza";
repo = "zoxide";
tag = "v${version}";
hash = "sha256-8hXoC3vyR08hN8MMojnAO7yIskg4FsEm28GtFfh5liI=";
hash = "sha256-2scJ5/+A3ZSpIdce5GLYqxjc0so9sVsYiXNULmjMzLY=";
};
nativeBuildInputs = [ installShellFiles ];
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
--replace '"fzf"' '"${fzf}/bin/fzf"'
'';
cargoHash = "sha256-Nonid/5Jh0WIQV0G3fpmkW0bql6bvlcNJBMZ+6MTTPQ=";
cargoHash = "sha256-4BXZ5NnwY2izzJFkPkECKvpuyFWfZ2CguybDDk0GDU0=";
postInstall = ''
installManPage man/man*/*
@@ -1010,39 +1010,6 @@ final: prev: {
}
) { };
image-nvim = callPackage (
{
buildLuarocksPackage,
fetchurl,
fetchzip,
luaOlder,
magick,
}:
buildLuarocksPackage {
pname = "image.nvim";
version = "1.3.0-1";
knownRockspec =
(fetchurl {
url = "mirror://luarocks/image.nvim-1.3.0-1.rockspec";
sha256 = "1ls3v5xcgmqmscqk5prpj0q9sy0946rfb2dfva5f1axb5x4jbvj9";
}).outPath;
src = fetchzip {
url = "https://github.com/3rd/image.nvim/archive/v1.3.0.zip";
sha256 = "0fbc3wvzsck8bbz8jz5piy68w1xmq5cnhaj1lw91d8hkyjryrznr";
};
disabled = luaOlder "5.1";
propagatedBuildInputs = [ magick ];
meta = {
homepage = "https://github.com/3rd/image.nvim";
description = "🖼 Bringing images to Neovim.";
maintainers = with lib.maintainers; [ teto ];
license.fullName = "MIT";
};
}
) { };
inspect = callPackage (
{
buildLuarocksPackage,
@@ -0,0 +1,35 @@
{
buildLuarocksPackage,
fetchFromGitHub,
lib,
lua,
luaOlder,
luajitPackages,
}:
buildLuarocksPackage rec {
pname = "image.nvim";
version = "1.4.0";
disabled = luaOlder "5.1";
knownRockspec = "image.nvim-scm-1.rockspec";
rockspecVersion = "scm-1";
src = fetchFromGitHub {
owner = "3rd";
repo = "image.nvim";
tag = "v${version}";
hash = "sha256-EaDeY8aP41xHTw5epqYjaBqPYs6Z2DABzSaVOnG6D6I=";
};
propagatedBuildInputs = [
lua
luajitPackages.magick
];
meta = {
homepage = "https://github.com/3rd/image.nvim";
description = "🖼 Bringing images to Neovim.";
maintainers = with lib.maintainers; [ SuperSandro2000 ];
license.fullName = "MIT";
};
}
@@ -35,7 +35,6 @@
libxcrypt,
libyaml,
lua-language-server,
luajitPackages,
mariadb,
mpfr,
neovim-unwrapped,
@@ -238,13 +237,6 @@ in
];
};
image-nvim = prev.image-nvim.overrideAttrs {
propagatedBuildInputs = [
lua
luajitPackages.magick
];
};
ldbus = prev.ldbus.overrideAttrs (old: {
luarocksConfig = old.luarocksConfig // {
variables = {
@@ -934,53 +926,6 @@ in
'';
};
readline = final.callPackage (
{
buildLuarocksPackage,
fetchurl,
luaAtLeast,
luaOlder,
luaposix,
}:
# upstream broken, can't be generated, so moved out from the generated set
buildLuarocksPackage {
pname = "readline";
version = "3.2-0";
knownRockspec =
(fetchurl {
url = "mirror://luarocks/readline-3.2-0.rockspec";
sha256 = "1r0sgisxm4xd1r6i053iibxh30j7j3rcj4wwkd8rzkj8nln20z24";
}).outPath;
src = fetchurl {
# the rockspec url doesn't work because 'www.' is not covered by the certificate so
# I manually removed the 'www' prefix here
url = "http://pjb.com.au/comp/lua/readline-3.2.tar.gz";
sha256 = "1mk9algpsvyqwhnq7jlw4cgmfzj30l7n2r6ak4qxgdxgc39f48k4";
};
luarocksConfig.variables = rec {
READLINE_INCDIR = "${readline.dev}/include";
HISTORY_INCDIR = READLINE_INCDIR;
};
unpackCmd = ''
unzip "$curSrc"
tar xf *.tar.gz
'';
propagatedBuildInputs = [
luaposix
readline.out
];
meta = {
homepage = "https://pjb.com.au/comp/lua/readline.html";
description = "Interface to the readline library";
license.fullName = "MIT/X11";
broken = (luaOlder "5.1") || (luaAtLeast "5.5");
};
}
) { };
rest-nvim = prev.rest-nvim.overrideAttrs {
strictDeps = false;
};
@@ -0,0 +1,45 @@
{
buildLuarocksPackage,
fetchurl,
luaAtLeast,
luaOlder,
luaposix,
readline,
}:
# upstream broken, can't be generated, so moved out from the generated set
buildLuarocksPackage {
pname = "readline";
version = "3.2-0";
knownRockspec =
(fetchurl {
url = "mirror://luarocks/readline-3.2-0.rockspec";
sha256 = "1r0sgisxm4xd1r6i053iibxh30j7j3rcj4wwkd8rzkj8nln20z24";
}).outPath;
src = fetchurl {
# the rockspec url doesn't work because 'www.' is not covered by the certificate so
# I manually removed the 'www' prefix here
url = "http://pjb.com.au/comp/lua/readline-3.2.tar.gz";
sha256 = "1mk9algpsvyqwhnq7jlw4cgmfzj30l7n2r6ak4qxgdxgc39f48k4";
};
luarocksConfig.variables = rec {
READLINE_INCDIR = "${readline.dev}/include";
HISTORY_INCDIR = READLINE_INCDIR;
};
unpackCmd = ''
unzip "$curSrc"
tar xf *.tar.gz
'';
propagatedBuildInputs = [
luaposix
readline.out
];
meta = {
homepage = "https://pjb.com.au/comp/lua/readline.html";
description = "Interface to the readline library";
license.fullName = "MIT/X11";
broken = (luaOlder "5.1") || (luaAtLeast "5.5");
};
}
@@ -1,8 +0,0 @@
[flake8]
# E111 => 4 spaces tabs
# don't let spaces else it is not recognized
# E123 buggy
ignore =
E501,E265,E402
max-line-length = 120
@@ -8,14 +8,14 @@
buildPythonPackage (finalAttrs: {
pname = "disposable-email-domains";
version = "0.0.156";
version = "0.0.157";
pyproject = true;
# No tags on GitHub
src = fetchPypi {
pname = "disposable_email_domains";
inherit (finalAttrs) version;
hash = "sha256-YoZI3nN8BeR/+zPnuJuHeWcoWeHX1mEDGrhhFvpj2/s=";
hash = "sha256-TxB+NK9z21vqoyBRdTEHOZaxpg4w6LEtO6rJOkwwyiA=";
};
build-system = [
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
pythonAtLeast,
# build system
setuptools,
@@ -23,7 +24,7 @@
pytestCheckHook,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "fastmri";
version = "0.3.0";
pyproject = true;
@@ -31,7 +32,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "facebookresearch";
repo = "fastMRI";
tag = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-0IJV8OhY5kPWQwUYPKfmdI67TyYzDAPlwohdc0jWcV4=";
};
@@ -66,6 +67,12 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
disabledTests = lib.optionals (pythonAtLeast "3.14") [
# AttributeError: '...' object has no attribute '__annotations__'.
"test_unet_scripting"
"test_varnet_scripting"
];
disabledTestPaths = [
# much older version of pytorch-lightning is used
"tests/test_modules.py"
@@ -76,8 +83,8 @@ buildPythonPackage rec {
meta = {
description = "Pytorch-based MRI reconstruction tooling";
homepage = "https://github.com/facebookresearch/fastMRI";
changelog = "https://github.com/facebookresearch/fastMRI/releases/tag/v${version}";
changelog = "https://github.com/facebookresearch/fastMRI/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ osbm ];
};
}
})
@@ -1,9 +1,10 @@
{
stdenv,
lib,
stdenv,
buildPythonPackage,
fetchFromGitHub,
fetchpatch,
pythonAtLeast,
# build-system
setuptools,
@@ -20,7 +21,7 @@
lightning,
scipy,
# test
# tests
pytestCheckHook,
distutils,
matplotlib,
@@ -30,7 +31,7 @@
which,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "gluonts";
version = "0.16.2";
pyproject = true;
@@ -38,10 +39,13 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "awslabs";
repo = "gluonts";
tag = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-h0+RYgGMz0gPchiKGIu0/NGcWBky5AWNTJKzoupn/iQ=";
};
# pydantic.v1.errors.ConfigError: unable to infer type for attribute "target"
disabled = pythonAtLeast "3.14";
patches = [
# Fixes _pickle.UnpicklingError: Weights only load failed.
# https://github.com/awslabs/gluonts/pull/3269
@@ -100,7 +104,7 @@ buildPythonPackage rec {
writableTmpDirAsHomeHook
which
]
++ optional-dependencies.torch;
++ finalAttrs.passthru.optional-dependencies.torch;
disabledTestPaths = [
# requires `cpflows`, not in Nixpkgs
@@ -119,8 +123,8 @@ buildPythonPackage rec {
meta = {
description = "Probabilistic time series modeling in Python";
homepage = "https://ts.gluon.ai";
changelog = "https://github.com/awslabs/gluonts/releases/tag/${src.tag}";
changelog = "https://github.com/awslabs/gluonts/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ bcdarwin ];
};
}
})
@@ -37,14 +37,14 @@
buildPythonPackage (finalAttrs: {
pname = "keras";
version = "3.13.1";
version = "3.13.2";
pyproject = true;
src = fetchFromGitHub {
owner = "keras-team";
repo = "keras";
tag = "v${finalAttrs.version}";
hash = "sha256-oFlEgic6M6ZRqDl6RvAbQccW8RIHC4fEGWJyNPidDHM=";
hash = "sha256-7s3bJdkS/G/Ydj9txbtGrqGCE3PjjS1ZiuoGOzk+UIg=";
};
build-system = [
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchPypi,
fetchpatch,
swig,
cmake,
ninja,
@@ -19,6 +20,15 @@ buildPythonPackage rec {
hash = "sha256-U6T/aXy0JTC1ptL5oBmch0ytSPmIkRA8XOi31NpArnI=";
};
patches = [
# https://github.com/realthunder/slvs_py/pull/11
(fetchpatch {
name = "cmake-4.patch";
url = "https://github.com/realthunder/slvs_py/compare/ab95814...ad0e1f7.patch";
hash = "sha256-LqDDx7uWq5VOkbE/aRu1JAau/DVfr40KK+L8PbBeGoU=";
})
];
pyproject = true;
nativeBuildInputs = [
@@ -22,16 +22,16 @@
scikit-image,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "rawpy";
version = "0.25.1";
version = "0.26.0";
pyproject = true;
src = fetchFromGitHub {
owner = "letmaik";
repo = "rawpy";
tag = "v${version}";
hash = "sha256-d3TxPW3GdCQT8bBbnveSxtWHkf5zinM8nSy4m/P7m7Q=";
tag = "v${finalAttrs.version}";
hash = "sha256-dFY1JNZxcV+FIj4qQgP1M1BP4x2ByV/K0J5kPZm/fjw=";
};
build-system = [
@@ -88,4 +88,4 @@ buildPythonPackage rec {
];
maintainers = with lib.maintainers; [ GaetanLepage ];
};
}
})

Some files were not shown because too many files have changed in this diff Show More