Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot]
2026-05-28 13:15:31 +00:00
committed by GitHub
53 changed files with 493 additions and 1579 deletions
+6
View File
@@ -1150,6 +1150,12 @@ lib.mapAttrs mkLicense (
redistributable = true; # Only if used in Netdata products.
};
netboxLimitedUse = {
fullName = "NetBox Limited Use License 1.0";
free = false;
url = "https://github.com/netboxlabs/netbox-branching/blob/8465b9aee69ded23930cfe1a522695bfb8955a5a/LICENSE.md";
};
ngpl = {
spdxId = "NGPL";
fullName = "Nethack General Public License";
+11
View File
@@ -8313,6 +8313,11 @@
githubId = 5427394;
name = "Ersin Akinci";
};
es-sai-fi = {
name = "es-sai-fi";
github = "es-sai-fi";
githubId = 96452903;
};
esau79p = {
github = "EsAu79p";
githubId = 21313906;
@@ -18260,6 +18265,12 @@
githubId = 16974598;
name = "Mike Playle";
};
mkannwischer = {
email = "matthias@kannwischer.eu";
github = "mkannwischer";
githubId = 3984960;
name = "Matthias Kannwischer";
};
mkez = {
email = "matias+nix@zwinger.fi";
github = "mk3z";
+53 -55
View File
@@ -8,6 +8,21 @@
...
}:
let
inherit (lib)
attrNames
catAttrs
concatLines
concatMap
filter
unique
flip
elem
attrValues
concatMapStrings
hasPrefix
concatStringsSep
sort
;
moduleSettingsType =
with lib.types;
@@ -881,41 +896,30 @@ let
text =
let
ensureUniqueOrder =
type: rules:
let
checkPair =
a: b:
assert lib.assertMsg (a.order != b.order)
"security.pam.services.${name}.rules.${type}: rules '${a.name}' and '${b.name}' cannot have the same order value (${toString a.order})";
b;
checked = lib.zipListsWith checkPair rules (lib.drop 1 rules);
in
lib.take 1 rules ++ checked;
# Formats a string for use in `module-arguments`. See `man pam.conf`.
formatModuleArgument =
token: if lib.hasInfix " " token then "[${lib.replaceStrings [ "]" ] [ "\\]" ] token}]" else token;
formatRules =
type:
lib.pipe cfg.rules.${type} [
lib.attrValues
(lib.filter (rule: rule.enable))
(lib.sort (a: b: a.order < b.order))
(ensureUniqueOrder type)
(map (
rule:
lib.concatStringsSep " " (
[
type
rule.control
rule.modulePath
]
++ map formatModuleArgument rule.args
++ [ "# ${rule.name} (order ${toString rule.order})" ]
concatStringsSep "\n" (
map
(
rule:
"${type} ${rule.control} ${rule.modulePath}${
if rule.args == [ ] then "" else " " + concatStringsSep " " (map formatModuleArgument rule.args)
} # ${rule.name} (order ${toString rule.order})"
)
))
(lib.concatStringsSep "\n")
];
(
sort (
a: b:
if a.order != b.order then
a.order < b.order
else
throw "security.pam.services.${name}.rules.${type}: rules '${a.name}' and '${b.name}' cannot have the same order value (${toString a.order})"
) (filter (rule: rule.enable) (attrValues cfg.rules.${type}))
)
);
in
lib.mkDefault ''
# Account management.
@@ -2637,35 +2641,29 @@ in
};
security.apparmor.includes."abstractions/pam" =
lib.concatMapStrings (name: "r ${config.environment.etc."pam.d/${name}".source},\n") (
lib.attrNames enabledServices
concatMapStrings (name: "r ${config.environment.etc."pam.d/${name}".source},\n") (
attrNames enabledServices
)
+ (
with lib;
pipe enabledServices [
lib.attrValues
(catAttrs "rules")
(lib.concatMap lib.attrValues)
(lib.concatMap lib.attrValues)
(lib.filter (rule: rule.enable))
(lib.filter (
let
types = concatMap attrValues (catAttrs "rules" (attrValues enabledServices));
rules = concatMap attrValues types;
isDirect = flip elem [
"include"
"substack"
];
activeRules = filter (rule: rule.enable && !isDirect rule.control) rules;
modulePaths = concatMap (
rule:
!builtins.elem rule.control [
"include"
"substack"
]
))
(lib.catAttrs "modulePath")
(map (
modulePath:
lib.throwIfNot (lib.hasPrefix "/" modulePath)
''non-absolute PAM modulePath "${modulePath}" is unsupported by apparmor''
modulePath
))
lib.unique
(map (module: "mr ${module},"))
concatLines
]
if (!hasPrefix "/" rule.modulePath) then
throw ''non-absolute PAM modulePath "${rule.modulePath}" is unsupported by apparmor''
else
[ rule.modulePath ]
) activeRules;
in
concatLines (map (module: "mr ${module},") (unique modulePaths))
);
security.sudo.extraConfig = optionalSudoConfigForSSHAgentAuth;
@@ -21,26 +21,26 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
sources = {
"x86_64-linux" = {
arch = "linux-x64";
hash = "sha256-D9fCOrdx2lzkafxPJENKc8tZnO+03c7CR3w/3LAQOa8=";
hash = "sha256-BOZu4SL/OObI7TCD5bPW3y2hl8TeXSjx/uIDObe5o3w=";
};
"aarch64-linux" = {
arch = "linux-arm64";
hash = "sha256-E4VUFvsyp0sJ1I0dIRAgIfa09zyvZHzZvKCMq5H9sig=";
hash = "sha256-k2QeQA3gXhfKGaLgPLJZJU4B0AxnWLZ7o1TdsZ4L+GY=";
};
"x86_64-darwin" = {
arch = "darwin-x64";
hash = "sha256-4k71rBIHOjmC9iJvaZlD6t36jqM6fclqM/yTWSoYrvs=";
hash = "sha256-bgWoBk/NfRDVJjVBa98kE64OyWcnszQq43GS1kbyokU=";
};
"aarch64-darwin" = {
arch = "darwin-arm64";
hash = "sha256-08QK3qOhE6f+LaSL2qVZgecfO6/Lqw3WVCD1wABluho=";
hash = "sha256-m+UTIAPVi1ZsMPMhY/W2O4zRE0Hc97Xn/+XNy3bpk60=";
};
};
in
{
name = "claude-code";
publisher = "anthropic";
version = "2.1.152";
version = "2.1.153";
}
// sources.${stdenvNoCC.hostPlatform.system}
or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");
+1 -1
View File
@@ -9,7 +9,7 @@
pname ? null,
# The `dl` field of the registry's index configuration
# https://doc.rust-lang.org/cargo/reference/registry-index.html#index-configuration
registryDl ? "https://crates.io/api/v1/crates",
registryDl ? "https://static.crates.io/crates",
version,
unpack ? true,
...
+1 -2
View File
@@ -56,8 +56,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
runHook postInstall
'';
postPhases = lib.optionals stdenvNoCC.hostPlatform.isDarwin [ "postPatchelf" ];
postPatchelf = lib.optionalString stdenvNoCC.hostPlatform.isDarwin ''
postInstall = lib.optionalString stdenvNoCC.hostPlatform.isDarwin ''
'${lib.getExe' cctools "${cctools.targetPrefix}install_name_tool"}' $out/libexec/amp-cli/amp \
-change /usr/lib/libicucore.A.dylib '${lib.getLib darwin.ICU}/lib/libicucore.A.dylib'
'${lib.getExe rcodesign}' sign --code-signature-flags linker-signed $out/libexec/amp-cli/amp
+2 -2
View File
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "audiness";
version = "1.0.0";
version = "1.0.1";
pyproject = true;
src = fetchFromGitHub {
owner = "audiusGmbH";
repo = "audiness";
tag = finalAttrs.version;
hash = "sha256-row372NA8/DJbI6WJyGmKrlfuCsxUa5inhMljRzShT8=";
hash = "sha256-zru37eNQyY9AcbALge1qlINuxzVKq3RTNypm5Pyhkz8=";
};
pythonRelaxDeps = [
+3 -8
View File
@@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch2,
file,
python3Packages,
rsync,
@@ -12,23 +11,18 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "barman";
version = "3.14.1";
version = "3.19.0";
pyproject = true;
src = fetchFromGitHub {
owner = "EnterpriseDB";
repo = "barman";
tag = "release/${finalAttrs.version}";
hash = "sha256-Z3+PgUJcyG/M05hMmIhRr3HttzHUDx7BGIs44LA/qE4=";
hash = "sha256-qjde8NdI+/2BH4L3LoxoYqdVwsaBXw1IcxYBx6sYqG8=";
};
patches = [
./unwrap-subprocess.patch
# fix building with Python 3.13
(fetchpatch2 {
url = "https://github.com/EnterpriseDB/barman/commit/931f997f1d73bbe360abbca737bea9ae93172989.patch?full_index=1";
hash = "sha256-0aqyjsEabxLf4dpC4DeepmypAl7QfCedh7vy98iVifU=";
})
];
# https://github.com/EnterpriseDB/barman/blob/release/3.14.1/barman/encryption.py#L214
@@ -70,6 +64,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
# Assertion error
"test_help_output"
"test_exits_on_unsupported_target"
"test_resolve_mounted_volume_failure"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# FsOperationFailed
+5 -4
View File
@@ -7,13 +7,14 @@
glibcLocales,
}:
stdenvNoCC.mkDerivation rec {
stdenvNoCC.mkDerivation {
pname = "blesh";
version = "0.4.0-devel3";
version = "0.4.0-devel3-unstable-2026-03-10";
src = fetchzip {
url = "https://github.com/akinomyoga/ble.sh/releases/download/v${version}/ble-${version}.tar.xz";
sha256 = "sha256-kGLp8RaInYSrJEi3h5kWEOMAbZV/gEPFUjOLgBuMhCI=";
url = "https://github.com/akinomyoga/ble.sh/releases/download/nightly/ble-nightly-20260310%2Bb99cadb.tar.xz";
name = "ble-nightly-20260310+b99cadb.tar.xz";
sha256 = "sha256-rJnSEY7J4wfy8dnL9Bg59u0epPe0HL1J7piPbkNyes0=";
};
dontBuild = true;
+19 -19
View File
@@ -1,47 +1,47 @@
{
"version": "2.1.152",
"commit": "228d8c605defcb10a183db2dbf364a2d6c490c8b",
"buildDate": "2026-05-26T19:31:46Z",
"version": "2.1.153",
"commit": "6cfd211761f355dcebba152b66399d0416e445d2",
"buildDate": "2026-05-27T20:11:39Z",
"platforms": {
"darwin-arm64": {
"binary": "claude",
"checksum": "43cb9361f7bc48c39214d5f125003b8de0ebde5cd6a1173e6b74fcdd10966d46",
"size": 214210080
"checksum": "449d9c89d7a63b1d427d912a7bd6e6f23f9a7b363866697c9fa9a0012546b254",
"size": 214457760
},
"darwin-x64": {
"binary": "claude",
"checksum": "e9ecf8da70518a4ff852baf36c9eac369762a4568ba3cd5078fa894303e39735",
"size": 216724240
"checksum": "4b90521c64b728caabe221737ce8a83d362ef0852eee7d789f014f7ff73ce97b",
"size": 216971920
},
"linux-arm64": {
"binary": "claude",
"checksum": "35ef2685c4f679b5c4610ef56b30a680b6d595b958b4fa5ec0bfa2852195f345",
"size": 239515272
"checksum": "6277fbbea72228a069e4719fc3e5fa36f16749247a2321c520dae93e83e92d9c",
"size": 239777416
},
"linux-x64": {
"binary": "claude",
"checksum": "5155bdca27f754aba0d2fe2f80336f5fd4793224561c234a723f0ccef654a8e8",
"size": 239650512
"checksum": "214f603f31942162dac9a65f18d43b3ac646ae215240fad481c4aad6c60f2e38",
"size": 239896272
},
"linux-arm64-musl": {
"binary": "claude",
"checksum": "b374ef7f8c59d10a04071f6c50ccd83008188b7db26589f4fb359ee435d49929",
"size": 232370008
"checksum": "5071eceaedd2d4d6b085faa46e1a60befad432176a9ec39fd10c004564381308",
"size": 232632152
},
"linux-x64-musl": {
"binary": "claude",
"checksum": "d4cd1951ceb25ef2bed74cd9e0dc6dec4f1219f086a35a1433eb988443096e48",
"size": 234044464
"checksum": "fb2b406b244466db17b48e2864ec7c90b852ef3f404bbb1d9c9bf914efee39d1",
"size": 234290224
},
"win32-x64": {
"binary": "claude.exe",
"checksum": "bbea6d550bdd765c3b9e3b1fa19a49d04dd16c1687e5b21f9e0974a18b867a73",
"size": 235329184
"checksum": "8bda00dba0e8b44e67966a07ee32cf23032f7ebb90e77d4f82ab2e39b1118623",
"size": 235564192
},
"win32-arm64": {
"binary": "claude.exe",
"checksum": "fd4711d17e9576fec0998c85a3726e43c26e7735e1f4552064310897acf1781b",
"size": 231294112
"checksum": "240240e32f10bc7d4124c1c5603313e243cabaae80e174e2c6eb27f5b1e1ebe9",
"size": 231529120
}
}
}
+2 -1
View File
@@ -42,7 +42,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
installShellCompletion --cmd git-absorb \
--bash <($out/bin/git-absorb --gen-completions bash) \
--fish <($out/bin/git-absorb --gen-completions fish) \
--zsh <($out/bin/git-absorb --gen-completions zsh)
--zsh <($out/bin/git-absorb --gen-completions zsh) \
--nushell <($out/bin/git-absorb --gen-completions nushell)
'';
meta = {
@@ -1,23 +1,24 @@
{
lib,
buildPythonApplication,
fetchPypi,
dropbox,
annexremote,
humanfriendly,
python3Packages,
fetchFromGitHub,
}:
buildPythonApplication rec {
python3Packages.buildPythonApplication (finalAttrs: {
pname = "git-annex-remote-dbx";
version = "1.0.3";
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
sha256 = "5b6f8025ed1e9877f06882ddbd81f701a8e094647ab97595e2afc09016835a7c";
src = fetchFromGitHub {
owner = "montag451";
repo = "git-annex-remote-dbx";
tag = "v${finalAttrs.version}";
hash = "sha256-a1mCLFd9fykzX3BxQBsOe6oPUzQjAzyfxExFlXCOAvQ=";
};
propagatedBuildInputs = [
build-system = [ python3Packages.setuptools ];
dependencies = with python3Packages; [
dropbox
annexremote
humanfriendly
@@ -30,4 +31,4 @@ buildPythonApplication rec {
mainProgram = "git-annex-remote-dbx";
maintainers = with lib.maintainers; [ matthiasbeyer ];
};
}
})
+2 -2
View File
@@ -9,14 +9,14 @@
python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "git-machete";
version = "3.40.1";
version = "3.41.0";
pyproject = true;
src = fetchFromGitHub {
owner = "virtuslab";
repo = "git-machete";
tag = "v${finalAttrs.version}";
hash = "sha256-bKrLEXzGdvRKKwyEMsQFYgnKm2qIXj1HThCYmHjDNEM=";
hash = "sha256-3BofEBgHgtdpQeaMx1BaNtDQ/HmX3GYagKOVHGq1+os=";
};
build-system = with python3.pkgs; [ setuptools ];
+12
View File
@@ -10,6 +10,9 @@
lockedGrammars ? lib.importJSON ./grammars.json,
grammarsOverlay ? (
final: prev: {
tree-sitter-agda = prev.tree-sitter-agda.override {
excludeBrokenTreeSitterJson = false;
};
tree-sitter-beancount = prev.tree-sitter-beancount.override {
excludeBrokenTreeSitterJson = false;
};
@@ -28,6 +31,15 @@
tree-sitter-sql = prev.tree-sitter-sql.override {
generate = false;
};
tree-sitter-strace = prev.tree-sitter-strace.override {
excludeBrokenTreeSitterJson = false;
};
tree-sitter-tact = prev.tree-sitter-tact.override {
excludeBrokenTreeSitterJson = false;
};
tree-sitter-vue = prev.tree-sitter-vue.override {
excludeBrokenTreeSitterJson = false;
};
}
),
}:
+2 -2
View File
@@ -18,7 +18,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libvisio";
version = "0.1.10";
version = "0.1.11";
outputs = [
"out"
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://dev-www.libreoffice.org/src/libvisio/libvisio-${finalAttrs.version}.tar.xz";
hash = "sha256-np7/dREtTZLZImKtf8JZnCHib4/FulSQDv3IPAUB5HI=";
hash = "sha256-Km79QLbZ28tw+6O+UxEjZogrqXtXFR3zaY36R4yNjdM=";
};
strictDeps = true;
+2 -2
View File
@@ -26,11 +26,11 @@
stdenv.mkDerivation rec {
pname = "liferea";
version = "1.16.9";
version = "1.16.10";
src = fetchurl {
url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
hash = "sha256-c4ySTlAfL1Ebs1+pLZd5KidO3UcF9HKhV/RpGLRSlcY=";
hash = "sha256-4cprlrp/vCaoUN4HwZFa+H1DW1S5q/byQcd+g/g427g=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "mdbook-toc";
version = "0.15.3";
version = "0.15.4";
src = fetchFromGitHub {
owner = "badboy";
repo = "mdbook-toc";
tag = finalAttrs.version;
sha256 = "sha256-nQMVba6jwfatGpV1jhwzdNlMY7XUGpHU3TqZ1yMy6Q0=";
sha256 = "sha256-mmmAMZC/YEAMRd8Yu8dGwheHM5CvzS0TpVmGzM08vEY=";
};
cargoHash = "sha256-ksLapG9MDGDgKNZIg7Kx9CpzCTchkQdmMlWAEczdbRg=";
cargoHash = "sha256-AlYik588J013Ee6YMF0sWAf5DfK2OVcTR3SxHT/v8nI=";
meta = {
description = "Preprocessor for mdbook to add inline Table of Contents support";
+31 -22
View File
@@ -5,26 +5,29 @@
# nativeBuildInputs
cmake,
wrapGAppsHook3,
pkg-config,
ninja,
pkg-config,
wrapGAppsHook3,
# buildInputs
alsa-lib,
alsa-plugins,
flac,
freetype,
kdePackages,
lame,
libjack2,
libogg,
libopus,
libopusenc,
libpulseaudio,
libsndfile,
libvorbis,
mnxdom,
portaudio,
portmidi,
flac,
libopusenc,
libopus,
mnxdom,
kdePackages,
pugixml,
utf8cpp,
# passthru tests
nixosTests,
@@ -32,13 +35,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "musescore";
version = "4.7.0";
version = "4.7.2";
src = fetchFromGitHub {
owner = "musescore";
repo = "MuseScore";
tag = "v${finalAttrs.version}";
hash = "sha256-AEYZWkcjqB2pW+oBow2oMX1HQn4kRaTBBxhyxIbG0a4=";
hash = "sha256-7oA+cC5/nOEM2zpFgM13zlBIoc3AB//Ovc+dU1c1r6M=";
};
cmakeFlags = [
@@ -59,6 +62,9 @@ stdenv.mkDerivation (finalAttrs: {
# Implies also OPUS
"OPUSENC"
"FLAC"
"PUGIXML"
"LAME"
"UTF8CPP"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# https://github.com/musescore/MuseScore/issues/33467
@@ -87,11 +93,11 @@ stdenv.mkDerivation (finalAttrs: {
dontWrapGApps = true;
nativeBuildInputs = [
kdePackages.wrapQtAppsHook
cmake
kdePackages.qttools
pkg-config
kdePackages.wrapQtAppsHook
ninja
pkg-config
]
++ lib.optionals stdenv.hostPlatform.isLinux [
# Since https://github.com/musescore/MuseScore/pull/13847/commits/685ac998
@@ -100,24 +106,27 @@ stdenv.mkDerivation (finalAttrs: {
];
buildInputs = [
libjack2
flac
freetype
kdePackages.qt5compat
kdePackages.qtbase
kdePackages.qtdeclarative
kdePackages.qtnetworkauth
kdePackages.qtscxml
kdePackages.qtsvg
lame
libjack2
libogg
libopus
libopusenc
libpulseaudio
libsndfile
libvorbis
mnxdom
portaudio
portmidi
flac
libopusenc
libopus
mnxdom
kdePackages.qtbase
kdePackages.qtdeclarative
kdePackages.qt5compat
kdePackages.qtsvg
kdePackages.qtscxml
kdePackages.qtnetworkauth
pugixml
utf8cpp
]
++ lib.optionals stdenv.hostPlatform.isLinux [
alsa-lib
@@ -0,0 +1,42 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
netbox,
python,
}:
buildPythonPackage rec {
pname = "netbox-custom-objects";
version = "0.5.1";
pyproject = true;
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "netboxlabs";
repo = "netbox-custom-objects";
tag = "v${version}";
hash = "sha256-8PEqt6TpoQ8ncyZPesRos0BQHF3cKIzgoFr56v8UTTY=";
};
build-system = [ setuptools ];
nativeCheckInputs = [ netbox ];
preFixup = ''
export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH
'';
dontUsePythonImportsCheck = python.pythonVersion != netbox.python.pythonVersion;
pythonImportsCheck = [ "netbox_custom_objects" ];
meta = {
description = "NetBox plugin to create new object types";
homepage = "https://github.com/netboxlabs/netbox-custom-objects";
changelog = "https://github.com/netboxlabs/netbox-custom-objects/releases/tag/${src.tag}";
license = lib.licenses.netboxLimitedUse;
maintainers = with lib.maintainers; [ felbinger ];
};
}
+7 -10
View File
@@ -19,22 +19,16 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "npins";
version = "0.4.0";
version = "0.4.1";
src = fetchFromGitHub {
owner = "andir";
repo = "npins";
tag = finalAttrs.version;
sha256 = "sha256-ksOXi7u4bpHyWNHwkUR62fdwKowPW5GqBS7MA7Apwh4=";
sha256 = "sha256-XzJaDf5tlrYGTMJ+eS9hH9l79S4JA8h2KfbvKHF14xY=";
};
cargoHash = "sha256-A93cFkBt+gHCuLAE7Zk8DRmsGoMwJkqtgHZd4lbpFs0=";
buildNoDefaultFeatures = true;
buildFeatures = [
"clap"
"crossterm"
"env_logger"
];
cargoHash = "sha256-Fiku3UULsm6HL1skjJA/UiW9VRFRWbnXULQFBiVDCJ0=";
nativeBuildInputs = [ makeWrapper ];
@@ -50,6 +44,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
mainProgram = "npins";
homepage = "https://github.com/andir/npins";
license = lib.licenses.eupl12;
maintainers = with lib.maintainers; [ piegames ];
maintainers = with lib.maintainers; [
piegames
coca
];
};
})
+4
View File
@@ -148,6 +148,10 @@ effectiveStdenv.mkDerivation (finalAttrs: {
"return PathString{};" \
"return PathString(\"$out/lib/\");"
''
+ lib.optionalString effectiveStdenv.hostPlatform.isDarwin ''
substituteInPlace cmake/onnxruntime.cmake \
--replace-fail "INSTALL_NAME_DIR @rpath" "INSTALL_NAME_DIR $out/lib"
''
+ lib.optionalString rocmSupport ''
patchShebangs tools/ci_build/hipify-perl
''
+4
View File
@@ -130,6 +130,10 @@ stdenv.mkDerivation (finalAttrs: {
# can probably be re-added once https://github.com/cyrusimap/cyrus-sasl/pull/772
# has made it to a release
rm -f tests/scripts/test076-authid-rewrite
''
# FIXME: revert after this gets unconditional above (on staging* branch)
+ lib.optionalString stdenv.hostPlatform.isi686 ''
rm -f tests/scripts/test*-sync*
'';
doCheck = true;
+2
View File
@@ -137,6 +137,8 @@ stdenv.mkDerivation (finalAttrs: {
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
(lib.cmakeBool "CMAKE_MACOSX_RPATH" false)
(lib.cmakeFeature "CMAKE_INSTALL_NAME_DIR" "${placeholder "out"}/lib")
(lib.cmakeBool "CMAKE_BUILD_WITH_INSTALL_NAME_DIR" true)
];
strictDeps = true;
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "panache";
version = "2.47.0";
version = "2.49.0";
src = fetchFromGitHub {
owner = "jolars";
repo = "panache";
tag = "v${finalAttrs.version}";
hash = "sha256-ZwTUEjzSeHvzAkRjqO136UxPC/il2wRm+QxZiOQIoyY=";
hash = "sha256-7IrlArMcr1Ja7jQl4nMLtsPhfoCRTp9Vsap7aD/lyDs=";
};
cargoHash = "sha256-bWRQNmOIBhEE++Pc4/GW9+Ck4U7cQQvYkW2XxE93lwU=";
cargoHash = "sha256-/D1yiuTtxQ/NAjqXUAPHWkHsw/+cpiBlYy1UwJOyD+Q=";
nativeBuildInputs = [
installShellFiles
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule (finalAttrs: {
pname = "pdnsgrep";
version = "1.3.0";
version = "1.3.1";
src = fetchFromGitHub {
owner = "akquinet";
repo = "pdnsgrep";
tag = "v${finalAttrs.version}";
hash = "sha256-V5Im75vYQYZmAedx4TKGkuoXI0noOfH7wMDoJRWA1hs=";
hash = "sha256-mSvkfb8aMx9fvdVrKqtzhYBEULph0Hs/8nlldSuZiX8=";
};
vendorHash = "sha256-hTlweJAWWrcaYhTH8IuCxDmqNd1qWTYK5F8NQhBbKt0=";
vendorHash = "sha256-Rx2TmYubU+EqvfyWjX5A3EC+7Pt/k68I6PmQdCwYlfE=";
proxyVendor = true;
ldflags = [
+2 -2
View File
@@ -41,13 +41,13 @@ let
in
stdenv.mkDerivation rec {
pname = "peergos";
version = "1.26.0";
version = "1.29.0";
src = fetchFromGitHub {
owner = "Peergos";
repo = "web-ui";
rev = "v${version}";
hash = "sha256-lvgiVjNbXWKrEYe8kCgAi4hwdvawZysjGJiDSInKYsM=";
hash = "sha256-WaTWz55pEfE/ncJnyc8FjkxJhsBYBXt7cFjBz8v0hw8=";
fetchSubmodules = true;
};
@@ -84,5 +84,5 @@ Terminal=false
Type=Application
Categories=
NoDisplay=true
OnlyShowIn=GNOME;XFCE;Unity;
#OnlyShowIn=GNOME;XFCE;Unity;
AutostartCondition=GNOME3 unless-session gnome
+3 -3
View File
@@ -6,13 +6,13 @@
}:
php.buildComposerProject2 (finalAttrs: {
pname = "psysh";
version = "0.12.22";
version = "0.12.23";
src = fetchFromGitHub {
owner = "bobthecow";
repo = "psysh";
tag = "v${finalAttrs.version}";
hash = "sha256-mcK7s/CmXTvQMNXY4bAtwWudY1aOJdt0XkOKUVhIVHQ=";
hash = "sha256-9vc0gmALM/0npHVa2cxGbc/kuiyd691qX+4XVcSFepY=";
forceFetchGit = true;
postFetch = ''
cp $out/build/composer.json $out/
@@ -20,7 +20,7 @@ php.buildComposerProject2 (finalAttrs: {
'';
};
vendorHash = "sha256-qx3FihqRXFHFOTK2dTjRfF/IP4ItHZBI6J/JqlSMp+A=";
vendorHash = "sha256-vCPkyOHz/IwzKNWzCP/ceVJS3VGd/KJgVzcwfObhigI=";
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
@@ -14,13 +14,13 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "raspberrypi-eeprom";
version = "2026.05.11-2712";
version = "2026.05.17-2711-0138c0";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "rpi-eeprom";
tag = "v${finalAttrs.version}";
hash = "sha256-19aVPfMQOqAWNVYoBxowV5zWjshuE5LPKaLNLxZlmHw=";
hash = "sha256-duzftioXXrLizQVLwAS285n6ve4Y3rCt/ERjcGQG+Dc=";
};
buildInputs = [ python3 ];
+8
View File
@@ -0,0 +1,8 @@
{ python3Packages }:
(python3Packages.toPythonApplication python3Packages.slothy).overrideAttrs (old: {
__structuredAttrs = true;
meta = old.meta // {
mainProgram = "slothy-cli";
};
})
+7 -19
View File
@@ -3,11 +3,9 @@
stdenv,
fetchFromGitHub,
fetchYarnDeps,
nodejs,
nodejs-slim,
yarn,
fixup-yarn-lock,
python3,
npmHooks,
sqlite,
srcOnly,
@@ -18,13 +16,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "thelounge";
version = "4.4.3";
version = "4.5.0";
src = fetchFromGitHub {
owner = "thelounge";
repo = "thelounge";
rev = "v${finalAttrs.version}";
hash = "sha256-lDbyqVFjhF2etRx31ax7KiQ1QKgVhD8xkTog/E3pUlA=";
hash = "sha256-I+ITSEm/FCI4omeBM8BCowI6hXBYriJfZ0vP27771Ms=";
};
# Allow setting package path for the NixOS module.
@@ -37,19 +35,16 @@ stdenv.mkDerivation (finalAttrs: {
offlineCache = fetchYarnDeps {
yarnLock = "${finalAttrs.src}/yarn.lock";
hash = "sha256-csVrgsEy9HjSBXxtgNG0hcBrR9COlcadhMQrw6BWPc4=";
hash = "sha256-wgG5AGZvMzdw4QnTNOzAfQGB//VWlV403AgWv4TceGQ=";
};
nativeBuildInputs = [
nodejs
nodejs-slim
nodejs-slim.npm
yarn
fixup-yarn-lock
python3
python3.pkgs.distutils
npmHooks.npmInstallHook
]
++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
buildInputs = [ sqlite ];
];
configurePhase = ''
runHook preConfigure
@@ -76,13 +71,6 @@ stdenv.mkDerivation (finalAttrs: {
preInstall = ''
yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive --production
patchShebangs node_modules
# Build the sqlite3 package.
npm_config_nodedir="${srcOnly nodejs}" npm_config_node_gyp="${buildPackages.nodejs}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js" npm rebuild --verbose --sqlite=${sqlite.dev}
'';
postInstall = ''
rm -rf node_modules/sqlite3/build-tmp-napi-v6/{Release/obj.target,node_sqlite3.target.mk}
'';
disallowedReferences = [ nodejs-slim.src ];
@@ -103,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
raitobezarius
];
license = lib.licenses.mit;
inherit (nodejs.meta) platforms;
inherit (nodejs-slim.meta) platforms;
mainProgram = "thelounge";
};
})
@@ -30,6 +30,8 @@
aciceri
];
};
# Non-schema `queries` nesting in grammar entry
excludeBrokenTreeSitterJson = true;
};
alloy = {
@@ -740,6 +742,8 @@
sei40kr
];
};
# Non-schema `camelCase` and `external-scanner` fields
excludeBrokenTreeSitterJson = true;
};
gas = {
@@ -1022,6 +1026,8 @@
aciceri
];
};
# Slash in grammar name and non-schema top-level `tree-sitter` field
excludeBrokenTreeSitterJson = true;
};
groovy = {
@@ -1824,6 +1830,8 @@
meta = {
license = lib.licenses.mit;
};
# Missing required `metadata.links`
excludeBrokenTreeSitterJson = true;
};
opencl = {
@@ -2200,6 +2208,8 @@
aciceri
];
};
# Missing required `grammars[0].name` and `metadata`
excludeBrokenTreeSitterJson = true;
};
r = {
@@ -2528,6 +2538,8 @@
aciceri
];
};
# Empty `metadata.links.funding` fails URL parsing
excludeBrokenTreeSitterJson = true;
};
supercollider = {
@@ -2617,6 +2629,8 @@
aciceri
];
};
# Non-schema `metadata.links.homepage`
excludeBrokenTreeSitterJson = true;
};
talon = rec {
@@ -2971,6 +2985,8 @@
jeafleohj
];
};
# Relative repository URL, empty funding and author URLs
excludeBrokenTreeSitterJson = true;
};
wast = {
@@ -0,0 +1,23 @@
{
lib,
fetchFromGitHub,
mkYaziPlugin,
}:
mkYaziPlugin {
pname = "kanagawa.yazi";
version = "0-unstable-2026-01-02";
src = fetchFromGitHub {
owner = "dangooddd";
repo = "kanagawa.yazi";
rev = "04985d12842b06bdb3ad5f1b3d7abc631059b7f5";
hash = "sha256-Yz0zRVzmgbrk0m7OkItxIK6W0WkPze/t09pWFgziNrw=";
};
meta = {
description = "Kanagawa theme for Yazi";
homepage = "https://github.com/dangooddd/kanagawa.yazi";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.es-sai-fi ];
};
}
@@ -0,0 +1,23 @@
{
lib,
fetchFromGitHub,
mkYaziPlugin,
}:
mkYaziPlugin {
pname = "keep-preferences.yazi";
version = "0-unstable-2026-05-15";
src = fetchFromGitHub {
owner = "XYenon";
repo = "keep-preferences.yazi";
rev = "f6656322e059df2384b1e3b37461e362438879f9";
hash = "sha256-eRlF78sixUVHWuYFml65xY7W0rKGDholqpggUuatd1c=";
};
meta = {
description = "Keep Yazi manager preferences per tab and per directory";
homepage = "https://github.com/XYenon/keep-preferences.yazi";
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ xyenon ];
};
}
@@ -17,6 +17,7 @@
case = case: out: { inherit case out; };
in
lib.switch coq.coq-version [
(case "9.2" "1.3.2+9.2")
(case "9.1" "1.3.1+9.1")
(case "9.0" "1.3.1+9.0")
(case "8.20" "1.3.1+8.20")
@@ -83,6 +84,8 @@
release."1.3.1+9.0".sha256 = "sha256-186Z0/wCuGAjIvG1LoYBMPooaC6HmnKWowYXuR0y6bA=";
release."1.3.1+9.1".rev = "v1.3.1-9.1";
release."1.3.1+9.1".sha256 = "sha256-LtYbAR3jt+JbYcqP+m1n3AZhAWSMIeOZtmdSJwg7L1A=";
release."1.3.2+9.2".rev = "v1.3.2-9.2";
release."1.3.2+9.2".sha256 = "sha256-wpl6Uxy3M2xYuBZPLdsvkvBfXqzplHRrNjyePgLi2X4=";
mlPlugin = true;
@@ -358,13 +358,13 @@
buildPythonPackage (finalAttrs: {
pname = "boto3-stubs";
version = "1.43.15";
version = "1.43.16";
pyproject = true;
src = fetchPypi {
pname = "boto3_stubs";
inherit (finalAttrs) version;
hash = "sha256-H+qjjxPVNreUAqW8SoxszniTSDqjHGXJ21gXxMX6owo=";
hash = "sha256-M+jW4OKMRZbF6pr6SENw+LhM8CvPIRo8CC/a1+20qlQ=";
};
build-system = [ setuptools ];
@@ -14,7 +14,7 @@
buildPythonPackage (finalAttrs: {
pname = "fastapi-pagination";
version = "0.15.12";
version = "0.15.13";
pyproject = true;
__structuredAttrs = true;
@@ -22,7 +22,7 @@ buildPythonPackage (finalAttrs: {
owner = "uriyyo";
repo = "fastapi-pagination";
tag = finalAttrs.version;
hash = "sha256-AzpNyTzlzPHkrx8BghZFHer3w+GpNIUYRo15rRRO0UY=";
hash = "sha256-c+bXtc4MQdd+UlsBHtVL6F2lBu46yry9OTKsMbu1Mhw=";
};
build-system = [
@@ -8,19 +8,19 @@
requests-oauthlib,
click,
pytestCheckHook,
gitUpdater,
nix-update-script,
}:
buildPythonPackage (finalAttrs: {
pname = "google-auth-oauthlib";
version = "1.3.1";
version = "1.4.0";
pyproject = true;
src = fetchFromGitHub {
owner = "googleapis";
repo = "google-cloud-python";
tag = "google-auth-oauthlib-v${finalAttrs.version}";
hash = "sha256-lfB544cDaywiGTV0KlecU7oEl2Gbb4Ou8UCp+YjGtOA=";
hash = "sha256-KJviH4dofYSvZu9S7VMBSnGjH66xMUEvhcmZN7GJ4Iw=";
};
sourceRoot = "${finalAttrs.src.name}/packages/google-auth-oauthlib";
@@ -54,8 +54,14 @@ buildPythonPackage (finalAttrs: {
__darwinAllowLocalNetworking = true;
passthru.updateScript = {
rev-prefix = "google-auth-oauthlib-v";
# The ATOM feed loses this update most of the time due to a high update volume,
# so query github directly.
passthru.updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"google-auth-oauthlib-v([0-9.]+)"
"--use-github-releases"
];
};
meta = {
@@ -8,14 +8,14 @@
buildPythonPackage (finalAttrs: {
pname = "iamdata";
version = "0.1.202605271";
version = "0.1.202605281";
pyproject = true;
src = fetchFromGitHub {
owner = "cloud-copilot";
repo = "iam-data-python";
tag = "v${finalAttrs.version}";
hash = "sha256-9SAUm7HVKFVNTVVA5/FTtpTAM/4Hv+G5TIuCWDIHC48=";
hash = "sha256-QfnV30Pd6Wd0YD/Q8GPFX06z0trIRp2UP5wH7bEkHOc=";
};
__darwinAllowLocalNetworking = true;
@@ -459,8 +459,8 @@ in
"sha256-02BUkAFhr9sT8ohkJJFPYNni0O9/UI/G0GUee/Kx5Dw=";
mypy-boto3-ecs =
buildMypyBoto3Package "ecs" "1.43.10"
"sha256-/ROYkmhRUy4YCcdRJPyR+GZ5kl+2L3pz04Kc1ZZPfU4=";
buildMypyBoto3Package "ecs" "1.43.16"
"sha256-0YWDS6MW3UhdLKzLaaZfrOZjZTrO15t5SDJoHM3MtSo=";
mypy-boto3-efs =
buildMypyBoto3Package "efs" "1.43.0"
@@ -862,8 +862,8 @@ in
"sha256-jiYmf0SWN0WBh6kJRllwmPMgcZyCxPRuP2GD2DavqKM=";
mypy-boto3-medialive =
buildMypyBoto3Package "medialive" "1.43.3"
"sha256-4X8Pw52+dxX3FBDZpw4lu2Uj7VpOecMcufFsI7hYN8I=";
buildMypyBoto3Package "medialive" "1.43.16"
"sha256-sOlkQEJXmjeAGlK9tpML+ZLKoYdqmRfr/RjajsNjkaQ=";
mypy-boto3-mediapackage =
buildMypyBoto3Package "mediapackage" "1.43.0"
@@ -966,8 +966,8 @@ in
"sha256-by5t5x+vu84vjqe176tFcz1zhDUIsmUo6dH5f3OyWOw=";
mypy-boto3-opensearch =
buildMypyBoto3Package "opensearch" "1.43.7"
"sha256-1SO4Vhj8GLEK70etYMCBI/0ePrBZgCdpwTPaEcwl5zM=";
buildMypyBoto3Package "opensearch" "1.43.16"
"sha256-vo4FbTnm7vHPgBKlvGl7qZ/H/tuRkzrdzwBI82ewchQ=";
mypy-boto3-opensearchserverless =
buildMypyBoto3Package "opensearchserverless" "1.43.0"
@@ -982,8 +982,8 @@ in
"sha256-JEuEjo0htTuDCZx2nNJK2Zq59oSUqkMf4BrNamerfVk=";
mypy-boto3-organizations =
buildMypyBoto3Package "organizations" "1.43.0"
"sha256-v72X9KJETKK9ppx1It9+5ywwEdtHRRBmj8GcSJrOBCc=";
buildMypyBoto3Package "organizations" "1.43.16"
"sha256-lSQJoqaR7rT3Z3OSgFNDbbmfcDfNPmhqV4aAyC1R1+w=";
mypy-boto3-osis =
buildMypyBoto3Package "osis" "1.43.0"
@@ -1170,8 +1170,8 @@ in
"sha256-T+JIJpHxD7IzAwq8yxgq6zbVMj/btpbhKnylMyfFvvU=";
mypy-boto3-sagemaker =
buildMypyBoto3Package "sagemaker" "1.43.13"
"sha256-CJ76WLP0ZpfjCb7tjjpRE0G5b+Xi9bygNHOWjZtdBsE=";
buildMypyBoto3Package "sagemaker" "1.43.16"
"sha256-Jp+FHUC9ATqf7+Lz+j532i4NveXiATVUywXY3PZHTPw=";
mypy-boto3-sagemaker-a2i-runtime =
buildMypyBoto3Package "sagemaker-a2i-runtime" "1.43.0"
@@ -45,6 +45,7 @@ buildPythonPackage (finalAttrs: {
pname = "optuna";
version = "4.8.0";
pyproject = true;
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "optuna";
@@ -118,9 +119,19 @@ buildPythonPackage (finalAttrs: {
++ lib.optionals stdenv.hostPlatform.isDarwin [
# ValueError: Failed to start Kaleido subprocess. Error stream
# kaleido/executable/kaleido: line 5: 5956 Illegal instruction: 4 ./bin/kaleido $@
"test_edf_plot_no_trials"
"test_edf_plot_no_trials_studies"
"test_get_optimization_history_plot"
"test_get_timeline_plot"
"test_plot_contour"
"test_plot_edf_with_multiple_studies"
"test_plot_edf_with_target"
"test_plot_edf_with_target_name"
"test_plot_intermediate_values"
"test_plot_parallel_coordinate"
"test_plot_param_importances"
"test_plot_rank"
"test_plot_slice"
"test_plot_terminator_improvement"
];
@@ -0,0 +1,45 @@
{
lib,
buildPythonPackage,
lndir,
or-tools,
immutabledict,
numpy,
pandas,
protobuf,
}:
buildPythonPackage {
pname = "ortools";
inherit (or-tools) version;
format = "other";
src = or-tools.python;
dontBuild = true;
nativeBuildInputs = [ lndir ];
installPhase = ''
runHook preInstall
mkdir -p $out
lndir -silent $src $out
runHook postInstall
'';
propagatedBuildInputs = [
immutabledict
numpy
pandas
protobuf
];
pythonImportsCheck = [
"ortools"
"ortools.sat.python.cp_model"
];
meta = or-tools.meta // {
description = "Python bindings for Google's or-tools";
};
}
@@ -36,14 +36,14 @@
buildPythonPackage (finalAttrs: {
pname = "plopp";
version = "26.4.2";
version = "26.5.0";
pyproject = true;
src = fetchFromGitHub {
owner = "scipp";
repo = "plopp";
tag = finalAttrs.version;
hash = "sha256-nluNaOQKkXolGCgx3Pr0m5OQ6vZbWPfdN7kbNKaVU68=";
hash = "sha256-UYEbJtWSTwF4z8Ga+IsCk+yQVT5xMvEENqT+hrbxPEc=";
};
build-system = [
@@ -0,0 +1,66 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
gcc,
llvm,
ortools,
sympy,
unicorn,
}:
buildPythonPackage rec {
pname = "slothy";
version = "0.2.0";
pyproject = true;
src = fetchFromGitHub {
owner = "slothy-optimizer";
repo = "slothy";
tag = version;
hash = "sha256-1seD/wqAyEcv5HJFO8j53ARd64fddGropA6xk0dq2yk=";
};
build-system = [ setuptools ];
dependencies = [
ortools
sympy
unicorn
];
# slothy shells out to `gcc` and the llvm binutils at runtime; extend
# PATH at import time so the library works in a plain withPackages env.
postPatch = ''
substituteInPlace slothy/__init__.py \
--replace-fail 'from slothy.core.slothy import Slothy' \
'import os
os.environ["PATH"] = "${
lib.makeBinPath [
gcc
llvm
]
}" + os.pathsep + os.environ.get("PATH", "")
from slothy.core.slothy import Slothy'
'';
pythonRelaxDeps = true;
pythonImportsCheck = [ "slothy" ];
installCheckPhase = ''
runHook preInstallCheck
python3 test.py --silent --tests aarch64_simple0_a55
runHook postInstallCheck
'';
meta = {
description = "Assembly superoptimization via constraint solving";
homepage = "https://slothy-optimizer.github.io/slothy";
changelog = "https://github.com/slothy-optimizer/slothy/releases/tag/${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ mkannwischer ];
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
}
@@ -9,14 +9,14 @@
buildPythonPackage (finalAttrs: {
pname = "tencentcloud-sdk-python";
version = "3.1.103";
version = "3.1.104";
pyproject = true;
src = fetchFromGitHub {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
tag = finalAttrs.version;
hash = "sha256-xwimPyCZJrsBHJgRaojrI8peEnKWzflpX3OM2mPzmDw=";
hash = "sha256-xdvKnNu6TOSjG4ustupXlWk7GQvZolNzPvg/nSuuDaI=";
};
build-system = [ setuptools ];
@@ -33,6 +33,7 @@ let
# of overrides ensures the binding can find the correct symbol
langIdentOverrides = {
tree_sitter_org_nvim = "tree_sitter_org";
tree_sitter_go_template_helm = "tree_sitter_helm";
};
langIdent = langIdentOverrides.${snakeCaseName} or snakeCaseName;
in
@@ -28,11 +28,6 @@ buildPythonPackage (finalAttrs: {
setuptools-scm
];
postPatch = ''
substituteInPlace setup.cfg \
--replace-fail "get-mac" "getmac"
'';
dependencies = [
getmac
requests
@@ -604,5 +604,10 @@ buildPythonPackage.override { stdenv = torch.stdenv; } (finalAttrs: {
# find_isa
"x86_64-darwin"
];
knownVulnerabilities = [
"CVE-2026-27893"
"CVE-2026-44222"
"CVE-2026-44223"
];
};
})
@@ -61,7 +61,7 @@ let
];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
# https://www.electronjs.org/docs/latest/tutorial/electron-timelines
knownVulnerabilities = lib.optional (lib.versionOlder version "39.0.0") "Electron version ${version} is EOL";
knownVulnerabilities = lib.optional (lib.versionOlder version "40.0.0") "Electron version ${version} is EOL";
};
fetcher =
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -91,7 +91,7 @@ let
jq
];
ELECTRON_SKIP_BINARY_DOWNLOAD = true;
env.ELECTRON_SKIP_BINARY_DOWNLOAD = true;
postPatch = ''
sed -i '/\/\/ Update test runner./,/^\s*$/{d}' utils/build/build.js
+1 -13
View File
@@ -1191,15 +1191,6 @@ with pkgs;
github-cli = gh;
git-annex-remote-dbx = callPackage ../applications/version-management/git-annex-remote-dbx {
inherit (python3Packages)
buildPythonApplication
dropbox
annexremote
humanfriendly
;
};
git-credential-manager = callPackage ../applications/version-management/git-credential-manager { };
git-credential-aol = callPackage ../by-name/gi/git-credential-email/git-credential-aol { };
@@ -5274,10 +5265,7 @@ with pkgs;
in
{
electron_38 = electron_38-bin;
electron_39 = getElectronPkg {
src = electron-source.electron_39;
bin = electron_39-bin;
};
electron_39 = electron_39-bin;
electron_40 = getElectronPkg {
src = electron-source.electron_40;
bin = electron_40-bin;
+5 -1
View File
@@ -12044,7 +12044,9 @@ self: super: with self; {
ormsgpack = callPackage ../development/python-modules/ormsgpack { };
ortools = (toPythonModule (pkgs.or-tools.override { python3 = self.python; })).python;
ortools = callPackage ../development/python-modules/ortools {
or-tools = pkgs.or-tools.override { python3 = self.python; };
};
oru = callPackage ../development/python-modules/oru { };
@@ -18140,6 +18142,8 @@ self: super: with self; {
slob = callPackage ../development/python-modules/slob { };
slothy = callPackage ../development/python-modules/slothy { };
slovnet = callPackage ../development/python-modules/slovnet { };
slowapi = callPackage ../development/python-modules/slowapi { };