Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot] 2026-06-29 15:34:33 +00:00 committed by GitHub
commit 0d28c0688f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
67 changed files with 1839 additions and 1113 deletions

View file

@ -64,6 +64,7 @@ jobs:
'ci/github-script/supportedSystems.js',
'ci/pinned.json',
'ci/supportedBranches.js',
'pkgs/top-level/release-supported-systems.json',
].includes(file))) core.setOutput('merge-group', true)
if (files.some(file => [
@ -88,6 +89,7 @@ jobs:
'ci/github-script/withRateLimit.js',
'ci/pinned.json',
'ci/supportedBranches.js',
'pkgs/top-level/release-supported-systems.json',
].includes(file))) core.setOutput('pr', true)
merge-group:

View file

@ -4,22 +4,31 @@
# Tested in lib/tests/sources.sh
let
inherit (lib.strings)
match
split
storeDir
escapeRegex
hasPrefix
hasSuffix
match
removePrefix
removeSuffix
split
splitString
storeDir
stringLength
substring
;
inherit (lib)
boolToString
filter
isString
readFile
concatStrings
length
elemAt
isList
any
boolToString
concatStrings
elemAt
fileContents
filter
head
isList
isString
last
length
readFile
;
inherit (lib.filesystem)
pathIsRegularFile
@ -41,6 +50,12 @@ let
: 2\. Function argument
*/
cleanSourceFilter =
let
hasEmacsBackupFileSuffix = hasSuffix "~";
hasObjectSuffix = hasSuffix ".o";
hasSharedObjectSuffix = hasSuffix ".so";
hasResultPrefix = hasPrefix "result";
in
name: type:
let
baseName = baseNameOf name;
@ -62,17 +77,15 @@ let
)
||
# Filter out editor backup / swap files.
lib.hasSuffix "~" baseName
hasEmacsBackupFileSuffix baseName
|| match "^\\.sw[a-z]$" baseName != null
|| match "^\\..*\\.sw[a-z]$" baseName != null
||
# Filter out generates files.
lib.hasSuffix ".o" baseName
|| lib.hasSuffix ".so" baseName
# Filter out generated files.
|| hasObjectSuffix baseName
|| hasSharedObjectSuffix baseName
||
# Filter out nix-build result symlinks
(type == "symlink" && lib.hasPrefix "result" baseName)
(type == "symlink" && hasResultPrefix baseName)
||
# Filter out sockets and other types of files we can't have in the store.
(type == "unknown")
@ -133,13 +146,13 @@ let
{
# A path or cleanSourceWith result to filter and/or rename.
src,
# Optional with default value: constant true (include everything)
# Optional with default value of null (include everything)
# The function will be combined with the && operator such
# that src.filter is called lazily.
# For implementing a filter, see
# https://nixos.org/nix/manual/#builtin-filterSource
# Type: A function (Path -> Type -> Bool)
filter ? _path: _type: true,
filter ? null,
# Optional name to use as part of the store path.
# This defaults to `src.name` or otherwise `"source"`.
name ? null,
@ -149,7 +162,13 @@ let
in
fromSourceAttributes {
inherit (orig) origSrc;
filter = path: type: filter path type && orig.filter path type;
filter =
if orig.filter == null then
filter
else if filter == null then
orig.filter
else
path: type: filter path type && orig.filter path type;
name = if name != null then name else orig.name;
};
@ -178,11 +197,14 @@ let
attrs
// {
filter =
path: type:
let
r = attrs.filter path type;
in
builtins.trace "${attrs.name}.filter ${path} = ${boolToString r}" r;
if attrs.filter == null then
path: type: builtins.trace "${attrs.name}.filter ${path} = true" true
else
path: type:
let
r = attrs.filter path type;
in
builtins.trace "${attrs.name}.filter ${path} = ${boolToString r}" r;
}
)
// {
@ -218,13 +240,13 @@ let
isFiltered = src ? _isLibCleanSourceWith;
origSrc = if isFiltered then src.origSrc else src;
in
lib.cleanSourceWith {
cleanSourceWith {
filter = (
path: type:
let
relPath = lib.removePrefix (toString origSrc + "/") (toString path);
relPath = removePrefix (toString origSrc + "/") (toString path);
in
lib.any (re: match re relPath != null) regexes
any (re: match re relPath != null) regexes
);
inherit src;
};
@ -272,7 +294,7 @@ let
let
base = baseNameOf name;
in
type == "directory" || lib.any (ext: lib.hasSuffix ext base) exts;
type == "directory" || any (ext: hasSuffix ext base) exts;
in
cleanSourceWith { inherit filter src; };
@ -319,9 +341,9 @@ let
packedRefsName = path + "/packed-refs";
absolutePath =
base: path:
if lib.hasPrefix "/" path then
if hasPrefix "/" path then
path
else if lib.hasPrefix "/" base then
else if hasPrefix "/" base then
"${base}/${path}"
else
"/${base}/${path}";
@ -337,12 +359,12 @@ let
{ error = "File contains no gitdir reference: " + path; }
else
let
gitDir = absolutePath (dirOf path) (lib.head m);
gitDir = absolutePath (dirOf path) (head m);
commonDir'' =
if pathIsRegularFile "${gitDir}/commondir" then lib.fileContents "${gitDir}/commondir" else gitDir;
commonDir' = lib.removeSuffix "/" commonDir'';
if pathIsRegularFile "${gitDir}/commondir" then fileContents "${gitDir}/commondir" else gitDir;
commonDir' = removeSuffix "/" commonDir'';
commonDir = absolutePath gitDir commonDir';
refFile = lib.removePrefix "${commonDir}/" "${gitDir}/${file}";
refFile = removePrefix "${commonDir}/" "${gitDir}/${file}";
in
readCommitFromFile refFile commonDir
@ -352,10 +374,10 @@ let
# sometimes it stores something like: «ref: refs/heads/branch-name»
then
let
fileContent = lib.fileContents fileName;
fileContent = fileContents fileName;
matchRef = match "^ref: (.*)$" fileContent;
in
if matchRef == null then { value = fileContent; } else readCommitFromFile (lib.head matchRef) path
if matchRef == null then { value = fileContent; } else readCommitFromFile (head matchRef) path
else if
pathIsRegularFile packedRefsName
@ -373,14 +395,14 @@ let
if refs == [ ] then
{ error = "Could not find " + file + " in " + packedRefsName; }
else
{ value = lib.head (matchRef (lib.head refs)); }
{ value = head (matchRef (head refs)); }
else
{ error = "Not a .git directory: " + toString path; };
in
readCommitFromFile "HEAD";
pathHasContext = builtins.hasContext or (lib.hasPrefix storeDir);
pathHasContext = builtins.hasContext or (hasPrefix storeDir);
canCleanSource = src: src ? _isLibCleanSourceWith || !(pathHasContext (toString src));
@ -403,7 +425,7 @@ let
{
# The original path
origSrc = if isFiltered then src.origSrc else src;
filter = if isFiltered then src.filter else _: _: true;
filter = if isFiltered then src.filter else null; # make sure to handle this!
name = if isFiltered then src.name else "source";
};
@ -411,6 +433,9 @@ let
#
# Inverse of toSourceAttributes for Source objects.
fromSourceAttributes =
let
inherit (builtins) path;
in
{
origSrc,
filter,
@ -418,9 +443,13 @@ let
}:
{
_isLibCleanSourceWith = true;
inherit origSrc filter name;
outPath = builtins.path {
inherit filter name;
inherit origSrc name;
# preserve outside checks, since a filter of null looks odd for
# comparisons
filter = if filter == null then _: _: true else filter;
outPath = path {
inherit name;
${if filter != null then "filter" else null} = filter;
path = origSrc;
};
};
@ -431,15 +460,14 @@ let
urlToName =
url:
let
inherit (lib.strings) stringLength;
base = baseNameOf (lib.removeSuffix "/" (lib.last (lib.splitString ":" (toString url))));
base = baseNameOf (removeSuffix "/" (last (splitString ":" (toString url))));
# chop away one git or archive-related extension
removeExt =
name:
let
matchExt = match "(.*)\\.(git|tar|zip|gz|tgz|bz|tbz|bz2|tbz2|lzma|txz|xz|zstd)$" name;
in
if matchExt != null then lib.head matchExt else name;
if matchExt != null then head matchExt else name;
# apply function f to string x while the result shrinks
shrink =
f: x:
@ -461,9 +489,9 @@ let
matchVer = match "([A-Za-z]+[-_. ]?)*(v)?([0-9.]+.*)" baseRev;
in
if matchHash != null then
builtins.substring 0 7 baseRev
substring 0 7 baseRev
else if matchVer != null then
lib.last matchVer
last matchVer
else
baseRev;
@ -623,7 +651,7 @@ let
in
src: patterns:
lib.cleanSourceWith {
cleanSourceWith {
filter = mkSourceFilter src patterns;
inherit src;
};

View file

@ -9757,6 +9757,12 @@
githubId = 16470252;
name = "Gemini Lasswell";
};
gbhu753 = {
email = "me@gurjotbhullar.com";
github = "GBHU753";
githubId = 100983240;
name = "Gurjot Bhullar";
};
gbtb = {
email = "goodbetterthebeast3@gmail.com";
github = "gbtb";

View file

@ -21,26 +21,26 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
sources = {
"x86_64-linux" = {
arch = "linux-x64";
hash = "sha256-t5vsIeDjsChMxZVUjjn01J0YDxSzpSAafhZa1JssE70=";
hash = "sha256-2CLYzW2or4n3+7+7rEW5pSIj4b+CYRxsf+eOIGe1+bE=";
};
"aarch64-linux" = {
arch = "linux-arm64";
hash = "sha256-gEe6jf9EgLnN+L6dzu/g9TarOnYZL20CeuBcJjDtcpI=";
hash = "sha256-443PFzX3FNJnNBtlOrS9sqhFDYyyn9JMwD8IbgtxSl0=";
};
"x86_64-darwin" = {
arch = "darwin-x64";
hash = "sha256-Tq2RGqcziPwHV/kRyz+KSbMgKHyUNWky605QkbdwRn4=";
hash = "sha256-VASKef90bu3Q+s3bJfN7Uq3x8Bk9qYGuKWE4uz9x5Hs=";
};
"aarch64-darwin" = {
arch = "darwin-arm64";
hash = "sha256-NSbcgKiIhFxozKIDy/rWXLgCk35w52LdH96UDSdyzck=";
hash = "sha256-sZAJil10KuGowarQp+MzIyuN7cdwGs/lzTRBl6OWDm0=";
};
};
in
{
name = "claude-code";
publisher = "anthropic";
version = "2.1.193";
version = "2.1.195";
}
// sources.${stdenvNoCC.hostPlatform.system}
or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");

View file

@ -15,7 +15,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "aws-ofi-nccl";
version = "1.19.2";
version = "1.20.0";
__structuredAttrs = true;
strictDeps = true;
@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "aws";
repo = "aws-ofi-nccl";
tag = "v${finalAttrs.version}";
hash = "sha256-1gPIuZzS53cMRckiBkRRzMw3RzoAvu3v0xzt0rwyysk=";
hash = "sha256-QQlimX5sbdR+0PpQ3dLXcDqY5TthXF7Z5dtj6wIm+UQ=";
};
nativeBuildInputs = [

View file

@ -8,17 +8,17 @@
buildGoModule (finalAttrs: {
pname = "bento";
version = "1.18.0";
version = "1.18.1";
src = fetchFromGitHub {
owner = "warpstreamlabs";
repo = "bento";
tag = "v${finalAttrs.version}";
hash = "sha256-fCRy9iTK34nqEWnsl1amdxYaCgaVmvqaPDS6Z7MuFbk=";
hash = "sha256-KIlCHOAHShOwrxO9F414PQ07+SzCWhpo8auhyjkuNZA=";
};
proxyVendor = true;
vendorHash = "sha256-jJI2MGKqGkZjuyRcwUupajBq9Vf5a/Cf5V6A/pT4XDs=";
vendorHash = "sha256-uzB98AiJKw9TCbKSdQDiztfw7nIT0mVt80JALAPp2Aw=";
subPackages = [
"cmd/bento"

View file

@ -0,0 +1,73 @@
diff --git a/package-lock.json b/package-lock.json
index 044aa5b..45ebc08 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2390,16 +2390,6 @@
"ieee754": "^1.1.13"
}
},
- "node_modules/buffer-crc32": {
- "version": "0.2.13",
- "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
- "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "*"
- }
- },
"node_modules/buffer-equal-constant-time": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
@@ -4372,16 +4362,6 @@
"reusify": "^1.0.4"
}
},
- "node_modules/fd-slicer": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
- "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "pend": "~1.2.0"
- }
- },
"node_modules/filename-reserved-regex": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz",
@@ -8633,14 +8613,16 @@
}
},
"node_modules/yauzl": {
- "version": "2.10.0",
- "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
- "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.4.0.tgz",
+ "integrity": "sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==",
"dev": true,
"license": "MIT",
"dependencies": {
- "buffer-crc32": "~0.2.3",
- "fd-slicer": "~1.1.0"
+ "pend": "~1.2.0"
+ },
+ "engines": {
+ "node": ">=12"
}
},
"node_modules/yocto-queue": {
diff --git a/package.json b/package.json
index 369f312..51b8563 100644
--- a/package.json
+++ b/package.json
@@ -42,5 +42,8 @@
"@electron/fuses": "^1.8.0",
"@reforged/maker-appimage": "^5.0.0",
"electron": "^30.0.5"
+ },
+ "overrides": {
+ "yauzl": "^3.3.1"
}
}

View file

@ -22,7 +22,12 @@ buildNpmPackage (finalAttrs: {
hash = "sha256-/xH3tBnZAnDr/EbewtJc0WpBirW1Obn6tka7NP0ovAc=";
};
npmDepsHash = "sha256-xoZ/qz7fGw858GsITkx/ag0FeeL4zcXh32qwb+OTLbg=";
patches = [
# zip extraction fails on newer nodejs versions without this fix
./bump-yauzl.patch
];
npmDepsHash = "sha256-p26yEuIiK7baeAxf06E+cmuzl45NS2WOmWNeFfTplQA=";
nativeBuildInputs = [
copyDesktopItems

View file

@ -1,10 +1,8 @@
{
lib,
less,
ncurses,
buildGoModule,
fetchFromGitHub,
makeWrapper,
installShellFiles,
}:
buildGoModule (finalAttrs: {
@ -20,16 +18,20 @@ buildGoModule (finalAttrs: {
vendorHash = "sha256-4YL0N8wA8igveYfeL4uZDY5YD1InW0iD3WWq1E/vIJs=";
nativeBuildInputs = [ makeWrapper ];
nativeBuildInputs = [
installShellFiles
];
excludedPackages = [
"gen-completions"
];
postInstall = ''
wrapProgram $out/bin/clx \
--prefix PATH : ${
lib.makeBinPath [
less
ncurses
]
}
installManPage share/man/clx.1
installShellCompletion --bash share/completions/clx.bash
installShellCompletion --fish share/completions/clx.fish
installShellCompletion --zsh share/completions/_clx
'';
meta = {

View file

@ -1,47 +1,47 @@
{
"version": "2.1.193",
"commit": "a1938d2a07a2e4fecbef4eeac813221929e97d22",
"buildDate": "2026-06-25T18:25:46Z",
"version": "2.1.195",
"commit": "4603aa3f2ea164bd0974f82eb413ae7acc99a7ee",
"buildDate": "2026-06-26T01:56:37Z",
"platforms": {
"darwin-arm64": {
"binary": "claude",
"checksum": "f7513a30385ad9019c237226fd6ec46508b3062ebefca8aedbe397d111a818ff",
"size": 222248240
"checksum": "8b45adad93f336ab95f33e714494b19fd3377a494eb05c122c8677bc895876ad",
"size": 224682640
},
"darwin-x64": {
"binary": "claude",
"checksum": "cba5c3bdca8ab5f8e7590406702d418f6114d9b39f48f16876680e881abf1ee8",
"size": 230317808
"checksum": "7eb8716e6d6e6a278d13158793529336290837fca457facfec656f1b1a287c60",
"size": 234066032
},
"linux-arm64": {
"binary": "claude",
"checksum": "39454ce62e795eeb4871a81f6453cda96e926e2db9a4dd41d0ec1b60b0153448",
"size": 237419248
"checksum": "b02279999058dc80a0e1c5d39463d1545a178615492f84139aac8d61214a7e9a",
"size": 241154800
},
"linux-x64": {
"binary": "claude",
"checksum": "c9f04d929f18bd9a101f3897f27de4e1e0f15ebe8400d4aaf02983d73dd66b1d",
"size": 240556856
"checksum": "8323e70125063147a4478b957745d835a87e5e72ffd25b838ea9a841c03e6a37",
"size": 244276024
},
"linux-arm64-musl": {
"binary": "claude",
"checksum": "658bbae05441c2d3792f9870a5001a1dfa7a62956abffc151aed7cae0adf9f7d",
"size": 230667448
"checksum": "52713b5f7690764b3b4742807b1a6fab24ce5e01dabf82964b97f519e8f9e7fe",
"size": 234403000
},
"linux-x64-musl": {
"binary": "claude",
"checksum": "b37861314ace243d8425ebce503c657c5d9f76af361f9bd8ca3bd34b2e71474a",
"size": 235258240
"checksum": "63a2b3291369ff85e970c0cfd3767bb48065071ec12fb2d0055387ccde511541",
"size": 238977408
},
"win32-x64": {
"binary": "claude.exe",
"checksum": "ffea22269bf66ce778ce845ea0c15cb5b21d39be82601a065c3eca6f7368da3e",
"size": 231359136
"checksum": "3ef7fb7b16e169739640fe2903ee7011cff8b43d2dbb15f9badc9b11cfad18a3",
"size": 234930336
},
"win32-arm64": {
"binary": "claude.exe",
"checksum": "0bea15edaf5791220c646f9066bda84397a73053d88f225c7622c7a2ab45ff59",
"size": 225839264
"checksum": "038fb49213c0ac828b5a8a1f31cf510753d7e7891e9ae4596673a602cff251f5",
"size": 229410464
}
}
}

View file

@ -7,16 +7,16 @@
buildGoModule (finalAttrs: {
pname = "dblab";
version = "0.41.0";
version = "0.42.0";
src = fetchFromGitHub {
owner = "danvergara";
repo = "dblab";
tag = "v${finalAttrs.version}";
hash = "sha256-o2wXVsPYW3E3LV+zij40aHooinm/2YrLDyC3jr6flEc=";
hash = "sha256-zp3bF8mzhB2CPiUCNYDWTJVYrwZvZdV3xaM2Mil9sTo=";
};
vendorHash = "sha256-T1y0ALF4s3T8ZaTqj2jUdnezVRmpegKnabahiQ3CgzA=";
vendorHash = "sha256-widzVKA85qslxuuO/ledG+IUvr+vw2HUiD3kVbe2D2A=";
# Fix case-insensitive conflicts producing platform-dependent checksums
# https://github.com/microsoft/go-mssqldb/issues/234
proxyVendor = true;

View file

@ -0,0 +1,61 @@
diff --git a/package.json b/package.json
index 7e49e7a..ab5c306 100644
--- a/package.json
+++ b/package.json
@@ -166,6 +166,7 @@
]
},
"resolutions": {
+ "yauzl": "^3.3.1",
"@electron-forge/maker-base": "7.8.1",
"@electron-forge/shared-types": "7.8.1"
}
diff --git a/yarn.lock b/yarn.lock
index a4d91bb..8ae6ff9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3653,11 +3653,6 @@ browserslist@^4.21.10:
node-releases "^2.0.18"
update-browserslist-db "^1.1.0"
-buffer-crc32@~0.2.3:
- version "0.2.13"
- resolved "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz"
- integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
-
buffer-from@^1.0.0:
version "1.1.2"
resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"
@@ -5746,13 +5741,6 @@ faye-websocket@^0.11.3:
dependencies:
websocket-driver ">=0.5.1"
-fd-slicer@~1.1.0:
- version "1.1.0"
- resolved "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz"
- integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==
- dependencies:
- pend "~1.2.0"
-
fdir@^6.4.4, fdir@^6.4.6:
version "6.4.6"
resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.4.6.tgz#2b268c0232697063111bbf3f64810a2a741ba281"
@@ -12352,13 +12340,12 @@ yargs@^17.0.1:
y18n "^5.0.5"
yargs-parser "^21.1.1"
-yauzl@^2.10.0:
- version "2.10.0"
- resolved "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz"
- integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==
+yauzl@^2.10.0, yauzl@^3.3.1:
+ version "3.4.0"
+ resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-3.4.0.tgz#88b2a21455f37ca7dccf2eeb33bacb4392322719"
+ integrity sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==
dependencies:
- buffer-crc32 "~0.2.3"
- fd-slicer "~1.1.0"
+ pend "~1.2.0"
yocto-queue@^0.1.0:
version "0.1.0"

View file

@ -25,15 +25,20 @@ let
hash = "sha256-e9PLgkqWBNLBw7uuNpPluOQ6+aGLYQLyTzcLa+LMOzs=";
};
patches = [
./dont-use-initial-releases-json.patch
# zip extraction fails on newer nodejs versions without this fix
./bump-yauzl.patch
];
unwrapped = stdenvNoCC.mkDerivation {
pname = "${pname}-unwrapped";
inherit version src;
patches = [ ./dont-use-initial-releases-json.patch ];
inherit version src patches;
offlineCache = fetchYarnDeps {
inherit src;
hash = "sha256-mB8WG6tX204u6AJ8qLbWrA+pSN3oDihHqj0t3bWcuAI=";
inherit src patches;
hash = "sha256-5yUsjXQ3OHwEGFgMTUJAXAuTdAl4zkb8zxTs5OT6sw4=";
};
nativeBuildInputs = [

File diff suppressed because it is too large Load diff

View file

@ -7,13 +7,13 @@
}:
buildNpmPackage (finalAttrs: {
pname = "eslint";
version = "10.5.0";
version = "10.6.0";
src = fetchFromGitHub {
owner = "eslint";
repo = "eslint";
tag = "v${finalAttrs.version}";
hash = "sha256-mhDOWOp9l42wwMFOFGZwI0Voc1+e5slcXVGh82Nebwg=";
hash = "sha256-lMdm5pKTPIhQqJjRnhvgCTLi5JxkQu5UqGtUSRHnnN8=";
};
# NOTE: Generating lock-file
@ -22,7 +22,7 @@ buildNpmPackage (finalAttrs: {
cp ${./package-lock.json} package-lock.json
'';
npmDepsHash = "sha256-0quy/i4PeyDwNqQsbeebFxz616c/a+1f0XT7tbHgVXM=";
npmDepsHash = "sha256-tGeXepnZbD316nN/eGDLTcZ4hllFJiTPH2QMt/AWmZg=";
npmInstallFlags = [ "--omit=dev" ];
dontNpmBuild = true;

View file

@ -7,11 +7,11 @@
}:
stdenv.mkDerivation rec {
pname = "jreleaser-cli";
version = "1.24.0";
version = "1.25.0";
src = fetchurl {
url = "https://github.com/jreleaser/jreleaser/releases/download/v${version}/jreleaser-tool-provider-${version}.jar";
hash = "sha256-WA2lH4SCjNDqkUE5OJe2hF7/HaEIyB+dynHT4yDqzMc=";
hash = "sha256-ixcHrzCX+b1iEkmk2rWZidFBtT2Ar58pRSGLzwaDYSM=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -7,12 +7,12 @@
let
pname = "lmstudio";
version_aarch64-linux = "0.4.16-2";
hash_aarch64-linux = "sha256-shn3W+il66OX8VDj7+hYFgL/N8GZ1APB2MH84uoCHOM=";
version_aarch64-darwin = "0.4.16-2";
hash_aarch64-darwin = "sha256-Gj8mMrNNDXNDyFj2p3emic2xms4tWSoVS2XXLsEeEC4=";
version_x86_64-linux = "0.4.16-2";
hash_x86_64-linux = "sha256-faLtj/9M59KRdEMHHgTCPLG4Gl5C7hkdAgmaS/O5rOk=";
version_aarch64-linux = "0.4.18-1";
hash_aarch64-linux = "sha256-dSRgbf2Xo7JxqTP+2VqtNFbHHFINdaucPMCMnwUIYPM=";
version_aarch64-darwin = "0.4.18-1";
hash_aarch64-darwin = "sha256-H82Pj00m8sC+E56zQIZ0M4wdYCX/3xOfoYxYTILYW9I=";
version_x86_64-linux = "0.4.18-1";
hash_x86_64-linux = "sha256-KpznZu1tiXhtW9XDvbMCgH9xyGyaO37/F1sWqK1RCUk=";
meta = {
description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";

View file

@ -0,0 +1,61 @@
diff --git a/resources/package.json b/resources/package.json
index d42b7fb..6e66826 100644
--- a/resources/package.json
+++ b/resources/package.json
@@ -60,6 +60,7 @@
"electron-forge-maker-appimage": "https://github.com/logseq/electron-forge-maker-appimage.git"
},
"resolutions": {
+ "yauzl": "^3.3.1",
"**/electron": "38.4.0",
"**/node-abi": "4.14.0",
"**/node-gyp": "12.0.0",
diff --git a/static/yarn.lock b/static/yarn.lock
index 4738ef9..413dcd9 100644
--- a/static/yarn.lock
+++ b/static/yarn.lock
@@ -1729,11 +1729,6 @@ browserslist@^4.26.3:
node-releases "^2.0.27"
update-browserslist-db "^1.1.4"
-buffer-crc32@~0.2.3:
- version "0.2.13"
- resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
- integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
-
buffer-equal@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.1.tgz#2f7651be5b1b3f057fcd6e7ee16cf34767077d90"
@@ -2839,13 +2834,6 @@ fastq@^1.17.1, fastq@^1.6.0:
dependencies:
reusify "^1.0.4"
-fd-slicer@~1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
- integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==
- dependencies:
- pend "~1.2.0"
-
fdir@^6.5.0:
version "6.5.0"
resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.5.0.tgz#ed2ab967a331ade62f18d077dae192684d50d350"
@@ -5771,13 +5759,12 @@ yargs@^17.0.1, yargs@^17.6.2:
y18n "^5.0.5"
yargs-parser "^21.1.1"
-yauzl@^2.10.0:
- version "2.10.0"
- resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
- integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==
+yauzl@^2.10.0, yauzl@^3.3.1:
+ version "3.4.0"
+ resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-3.4.0.tgz#88b2a21455f37ca7dccf2eeb33bacb4392322719"
+ integrity sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==
dependencies:
- buffer-crc32 "~0.2.3"
- fd-slicer "~1.1.0"
+ pend "~1.2.0"
yocto-queue@^0.1.0:
version "0.1.0"

View file

@ -61,6 +61,9 @@ stdenv.mkDerivation (finalAttrs: {
# bumps better-sqlite3 to work with electron 39+
# also fixes outdated yarn.lock
./bump-better-sqlite3.patch
# zip extraction fails on newer nodejs versions without this fix
./bump-yauzl.patch
];
mavenRepo = stdenv.mkDerivation {
@ -115,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: {
name = "logseq-${finalAttrs.version}-yarn-deps-static-resources";
inherit (finalAttrs) src patches;
postPatch = "cd ./static";
hash = "sha256-5DBVlCWlUXYvo0bJWQwvSNMW4P9E8kjE9RQe9/ViJM0=";
hash = "sha256-TFisR5GwcKmuddGhe0i6rAmr2wDWzed/mXnxVGARYK0=";
};
yarnOfflineCacheAmplify = fetchYarnDeps {

View file

@ -0,0 +1,217 @@
diff --git a/app/package-lock.json b/app/package-lock.json
index 9b5b874..bc446b7 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -570,16 +570,6 @@
"ieee754": "^1.1.13"
}
},
- "node_modules/buffer-crc32": {
- "version": "0.2.13",
- "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
- "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
- "license": "MIT",
- "peer": true,
- "engines": {
- "node": "*"
- }
- },
"node_modules/buffer-from": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
@@ -1581,16 +1571,6 @@
"license": "MIT",
"peer": true
},
- "node_modules/fd-slicer": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
- "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
- "license": "MIT",
- "peer": true,
- "dependencies": {
- "pend": "~1.2.0"
- }
- },
"node_modules/file-uri-to-path": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
@@ -4575,14 +4555,16 @@
}
},
"node_modules/yauzl": {
- "version": "2.10.0",
- "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
- "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.4.0.tgz",
+ "integrity": "sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==",
"license": "MIT",
"peer": true,
"dependencies": {
- "buffer-crc32": "~0.2.3",
- "fd-slicer": "~1.1.0"
+ "pend": "~1.2.0"
+ },
+ "engines": {
+ "node": ">=12"
}
}
}
diff --git a/app/package.json b/app/package.json
index 115cf61..436527d 100644
--- a/app/package.json
+++ b/app/package.json
@@ -77,7 +77,9 @@
"@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0"
},
- "overrides": {},
+ "overrides": {
+ "yauzl": "^3.3.1"
+ },
"optionalDependencies": {
"windows-focus-assist": "^1.4.0"
}
diff --git a/package-lock.json b/package-lock.json
index fdc0d9d..31a4b5f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1893,14 +1893,6 @@
"integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
"license": "MIT"
},
- "node_modules/buffer-crc32": {
- "version": "0.2.13",
- "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
- "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
- "engines": {
- "node": "*"
- }
- },
"node_modules/buffer-fill": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
@@ -3446,14 +3438,6 @@
"reusify": "^1.0.4"
}
},
- "node_modules/fd-slicer": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
- "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
- "dependencies": {
- "pend": "~1.2.0"
- }
- },
"node_modules/file-entry-cache": {
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
@@ -5582,7 +5566,8 @@
"node_modules/pend": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
- "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
+ "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
+ "license": "MIT"
},
"node_modules/picomatch": {
"version": "2.3.2",
@@ -7403,12 +7388,15 @@
}
},
"node_modules/yauzl": {
- "version": "2.10.0",
- "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
- "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.4.0.tgz",
+ "integrity": "sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==",
+ "license": "MIT",
"dependencies": {
- "buffer-crc32": "~0.2.3",
- "fd-slicer": "~1.1.0"
+ "pend": "~1.2.0"
+ },
+ "engines": {
+ "node": ">=12"
}
},
"node_modules/yocto-queue": {
@@ -8663,11 +8651,6 @@
"resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
"integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="
},
- "buffer-crc32": {
- "version": "0.2.13",
- "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
- "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI="
- },
"buffer-fill": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
@@ -9692,7 +9675,7 @@
"@types/yauzl": "^2.9.1",
"debug": "^4.1.1",
"get-stream": "^5.1.0",
- "yauzl": "^2.10.0"
+ "yauzl": "^3.3.1"
},
"dependencies": {
"get-stream": {
@@ -9745,14 +9728,6 @@
"reusify": "^1.0.4"
}
},
- "fd-slicer": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
- "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
- "requires": {
- "pend": "~1.2.0"
- }
- },
"file-entry-cache": {
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
@@ -11158,7 +11133,7 @@
"pend": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
- "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
+ "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="
},
"picomatch": {
"version": "2.3.2",
@@ -12389,12 +12364,11 @@
"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="
},
"yauzl": {
- "version": "2.10.0",
- "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
- "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.4.0.tgz",
+ "integrity": "sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==",
"requires": {
- "buffer-crc32": "~0.2.3",
- "fd-slicer": "~1.1.0"
+ "pend": "~1.2.0"
}
},
"yocto-queue": {
diff --git a/package.json b/package.json
index 58a4e93..f065078 100644
--- a/package.json
+++ b/package.json
@@ -82,5 +82,8 @@
"test:e2e": "npx playwright test --config playwright/playwright.config.ts",
"tsc-watch": "tsc -w -p ./app --noEmit",
"build": "node app/build/build.js"
+ },
+ "overrides": {
+ "yauzl": "^3.3.1"
}
-}
\ No newline at end of file
+}

View file

@ -26,15 +26,20 @@ let
fetchSubmodules = true;
};
patches = [
# zip extraction fails on newer nodejs versions without this fix
./bump-yauzl.patch
];
electron = electron_41;
mailspring-sync = callPackage ./mailsync.nix { inherit src version; };
mailspring-app = buildNpmPackage {
pname = "mailspring-app";
inherit version src;
sourceRoot = "${src.name}/app";
npmDepsHash = "sha256-b8CscOVVIbjkdf977LVVzFkWxOwn8XOemYpud5yK6vU=";
inherit version src patches;
postPatch = "cd app"; # we don't use sourceRoot so that we don't have to make the patch relative to it
npmDepsHash = "sha256-/caWmbN4Sl3DVPLXSaXrCHEyRsk/p3FwDqSZ7lfNgUk=";
dontNpmBuild = true;
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
@ -59,9 +64,9 @@ let
in
buildNpmPackage (finalAttrs: {
pname = "mailspring";
inherit version src;
inherit version src patches;
npmDepsHash = "sha256-3uidHfxgGONdtwAnoVytIbRqRjwtz3Yu8tNQ0qT8mJQ=";
npmDepsHash = "sha256-nHKFuTdk3qbAiSHksSo++mc8TMasspuym7MYxjuTTHI=";
nativeBuildInputs = [
makeBinaryWrapper

View file

@ -75,9 +75,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
checkFlags = [
# last_modified will always be different in nix
"--skip=tera::tests::test_last_modified"
]
++ lib.optionals (stdenv.hostPlatform.isLinux) [
# Nix's Linux sandbox rejects setting setuid bits.
# Nix's build sandbox strips setuid bits, so this round-trip assertion
# fails on both Linux and Darwin (cf. apko's TestSpecialModeBits).
"--skip=oci::layer::tests::preserve_metadata_dir_layer_keeps_special_permission_bits"
]
++ lib.optionals (stdenv.hostPlatform.isDarwin) [

View file

@ -0,0 +1,56 @@
{
lib,
buildGoModule,
fetchFromGitHub,
versionCheckHook,
}:
buildGoModule (finalAttrs: {
__structuredAttrs = true;
pname = "modctl";
version = "0.2.2";
src = fetchFromGitHub {
owner = "modelpack";
repo = "modctl";
tag = "v${finalAttrs.version}";
hash = "sha256-A7s2jM+hR5WgeiWzPjjfS/AJy35x6kzewIucz713zLc=";
};
vendorHash = "sha256-S1ygAZO3bTFi/3pwmNYE7P/Vqg7AVHpH5YRJ3yzzvyo=";
ldflags = [
"-s"
"-X github.com/modelpack/modctl/pkg/version.GitVersion=v${finalAttrs.version}"
];
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "version";
# modctl's cobra commands invoke config.NewRoot(), which uses
# os/user.Current() to find the home directory. On darwin os/user
# bypasses $HOME and resolves it via getpwuid (returning /var/empty,
# not writable), so the install check fails. versionCheckHook only
# accepts a single argument, so wrap the binary and point
# --log-dir/--storage-dir at TMPDIR to keep the check working on all
# platforms.
preVersionCheck = ''
wrapper="$NIX_BUILD_TOP/modctl-version-check"
cat > "$wrapper" <<EOF
#!/bin/sh
exec "$out/bin/modctl" "\$@" --log-dir="$TMPDIR" --storage-dir="$TMPDIR"
EOF
chmod +x "$wrapper"
versionCheckProgram="$wrapper"
'';
meta = {
description = "CLI tool for managing OCI model artifacts based on Model Spec";
homepage = "https://github.com/modelpack/modctl";
changelog = "https://github.com/modelpack/modctl/releases/tag/v${finalAttrs.version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ gbhu753 ];
mainProgram = "modctl";
};
})

View file

@ -9,16 +9,16 @@
buildGoModule (finalAttrs: {
pname = "nfpm";
version = "2.46.3";
version = "2.47.0";
src = fetchFromGitHub {
owner = "goreleaser";
repo = "nfpm";
rev = "v${finalAttrs.version}";
hash = "sha256-BdiBEYCO8+YDFI4jKjRBaXtR/XutgBIzJA1xERRtE0U=";
hash = "sha256-khdD5wrTP7YSqnV5qhyvIIbOtx//eE+wgDu5y7pQ+NY=";
};
vendorHash = "sha256-cDl/vdnklQJQpSrDHDrC2+K7YiBqPOY3Mv5ApOc63Cw=";
vendorHash = "sha256-BXbT/WpLsythZc3JsMIjXlB+SbWv0HBS7tPRS1/tk4w=";
ldflags = [
"-s"

View file

@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "nixbit";
version = "0.9.0";
version = "0.10.0";
src = fetchFromGitHub {
owner = "pbek";
repo = "nixbit";
tag = "v${finalAttrs.version}";
hash = "sha256-7SM6GvNqg7vdoYjE7bpWrIQwyBrpOaez8IQeDDGw/qA=";
hash = "sha256-ft+R5+j2QXo9rYMDGMKGXbA7aBRTLnRCuDh8vFswKSI=";
};
nativeBuildInputs = [

View file

@ -14,12 +14,12 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ocenaudio";
version = "3.17.1";
version = "3.19.5";
src = fetchurl {
name = "ocenaudio.deb";
url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian12.deb?version=v${finalAttrs.version}";
hash = "sha256-PkIMw8h0LenAM+zmOM30YpOlpaAMbpsH6djMLHgkZOA=";
hash = "sha256-xXyzxdvfGnqUzDk7Tf3HFWnJnOFnfV1gBdbElB5ixak=";
};
autoPatchelfIgnoreMissingDeps = [

View file

@ -7,19 +7,19 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "opam2json";
version = "0.4";
version = "0.5";
src = fetchFromGitHub {
owner = "tweag";
repo = "opam2json";
rev = "v${finalAttrs.version}";
sha256 = "sha256-5pXfbUfpVABtKbii6aaI2EdAZTjHJ2QntEf0QD2O5AM=";
sha256 = "sha256-rBGN9TERADPXiehNe1/9emO6QqYPrTwSoMdB+BVEWpM=";
};
buildInputs = with ocamlPackages; [
yojson
opam-file-format
cmdliner_1
cmdliner
];
nativeBuildInputs = with ocamlPackages; [
ocaml

View file

@ -7,16 +7,16 @@
buildGoModule (finalAttrs: {
pname = "openfga-cli";
version = "0.7.16";
version = "0.7.17";
src = fetchFromGitHub {
owner = "openfga";
repo = "cli";
rev = "v${finalAttrs.version}";
hash = "sha256-Ebkw7srZKwIXznSTq9BSAWNiWGD0hjMLBC2yeFV8zbA=";
hash = "sha256-cx1lKyEeXpQS3NePd5JSylAU7qqfGidx9gGQh/WPeCY=";
};
vendorHash = "sha256-BS+S9ATamYnTl5DEpcvIVlN1oWYI7gIAG3wTW0jhEak=";
vendorHash = "sha256-f/gJr7cBO2G7USqujuBPmlbcCDrLw495RLG0pncQ97I=";
nativeBuildInputs = [ installShellFiles ];

View file

@ -35,19 +35,14 @@ stdenv.mkDerivation (finalAttrs: {
installPhase = ''
runHook preInstall
install -d $out/bin
install -d $out/share/OSCAR/Help
install -d $out/share/OSCAR/Html
install -d $out/share/OSCAR/Translations
install -d $out/share/icons/OSCAR
install -d $out/share/applications
install -T oscar/OSCAR $out/bin/OSCAR
install -D oscar/OSCAR -t $out/bin
# help browser was removed 'temporarily' in https://gitlab.com/pholy/OSCAR-code/-/commit/57c3e4c33ccdd2d0eddedbc24c0e4f2969da3841
# install oscar/Help/* $out/share/OSCAR/Help
install oscar/Html/* $out/share/OSCAR/Html
install oscar/Translations/* $out/share/OSCAR/Translations
install -T Building/Linux/OSCAR.png $out/share/icons/OSCAR/OSCAR.png
install -T Building/Linux/OSCAR.desktop $out/share/applications/OSCAR.desktop
# install -D oscar/Help/* -t $out/share/OSCAR/Help
install -D oscar/Html/* -t $out/share/OSCAR/Html
install -D oscar/Translations/* -t $out/share/OSCAR/Translations
install -D Building/Linux/OSCAR.png -t $out/share/icons/hicolor/48x48/apps
install -D Building/Linux/OSCAR.svg -t $out/share/icons/hicolor/scalable/apps
install -D Building/Linux/OSCAR.desktop -t $out/share/applications
runHook postInstall
'';

View file

@ -1,5 +1,6 @@
{
autoPatchelfHook,
copyDesktopItems,
fetchurl,
glib,
glib-networking,
@ -9,6 +10,7 @@
lib,
libsecret,
makeDesktopItem,
makeWrapper,
stdenvNoCC,
webkitgtk_4_1,
wrapGAppsHook3,
@ -36,17 +38,7 @@ let
];
};
desktopItem = makeDesktopItem {
name = "Portfolio";
exec = "portfolio";
icon = "portfolio";
comment = "Calculate Investment Portfolio Performance";
desktopName = "Portfolio Performance";
categories = [ "Office" ];
startupWMClass = "Portfolio Performance";
};
runtimeLibs = lib.makeLibraryPath [
runtimeDeps = [
glib
glib-networking
gtk3
@ -65,10 +57,14 @@ stdenvNoCC.mkDerivation (finalAttrs: {
nativeBuildInputs = [
autoPatchelfHook
wrapGAppsHook3
copyDesktopItems
imagemagick
makeWrapper
wrapGAppsHook3
];
buildInputs = runtimeDeps;
dontWrapGApps = true;
dontConfigure = true;
@ -116,21 +112,33 @@ stdenvNoCC.mkDerivation (finalAttrs: {
rm -f $out/portfolio/plugins/*.source_*.jar
rm -rf $out/portfolio/configuration/org.eclipse.equinox.source
makeWrapper $out/portfolio/PortfolioPerformance $out/bin/portfolio \
"''${gappsWrapperArgs[@]}" \
--prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
--prefix PATH : ${lib.makeBinPath [ jre ]} \
--set JAVA_HOME "${jre}"
# Create desktop item
mkdir -p $out/share/applications
cp ${desktopItem}/share/applications/* $out/share/applications
mkdir -p $out/share/icons/hicolor/256x256/apps
magick $out/portfolio/icon.xpm $out/share/icons/hicolor/256x256/apps/portfolio.png
runHook postInstall
'';
postFixup = ''
mkdir -p $out/bin
makeWrapper $out/portfolio/PortfolioPerformance $out/bin/portfolio \
"''${gappsWrapperArgs[@]}" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" \
--prefix PATH : ${lib.makeBinPath [ jre ]} \
--set JAVA_HOME "${jre}"
'';
desktopItems = [
(makeDesktopItem {
name = "Portfolio";
exec = "portfolio";
icon = "portfolio";
comment = "Calculate Investment Portfolio Performance";
desktopName = "Portfolio Performance";
categories = [ "Office" ];
startupWMClass = "Portfolio Performance";
})
];
passthru.updateScript = gitUpdater { url = "https://github.com/buchen/portfolio.git"; };
meta = {

View file

@ -24,6 +24,7 @@
vulkan-headers,
vulkan-tools,
rubberband,
deno,
# Configurable options
qtVersion ? "6", # Can be 5 or 6
}:
@ -74,6 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
taglib
vulkan-headers-qmplay2
vulkan-tools
deno
]
++ lib.optionals (qtVersion == "6") [
rubberband
@ -93,6 +95,9 @@ stdenv.mkDerivation (finalAttrs: {
# But sometimes we come across case-insensitive filesystems...
postInstall = ''
[ -e $out/bin/qmplay2 ] || ln -s $out/bin/QMPlay2 $out/bin/qmplay2
wrapQtApp $out/bin/qmplay2 \
--prefix PATH : ${lib.makeBinPath [ deno ]}
'';
passthru = {

View file

@ -19,11 +19,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "qownnotes";
appname = "QOwnNotes";
version = "26.6.7";
version = "26.6.9";
src = fetchurl {
url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
hash = "sha256-rfLen9yUVrDM/1brnDjLORX3VV3uE8GU4zM/q2h3jdM=";
hash = "sha256-9mWyWzIPufiyRyDlif4aW+llyAIiD0Do2MV24P2Z/E0=";
};
nativeBuildInputs = [

View file

@ -15,14 +15,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "ramalama";
version = "0.19.0";
version = "0.22.0";
pyproject = true;
src = fetchFromGitHub {
owner = "containers";
repo = "ramalama";
tag = "v${finalAttrs.version}";
hash = "sha256-9y7H1Iq/Dn89NIJDegY8lbII4ehx3jhulyOEkBIm4Nk=";
hash = "sha256-k3VfZ9+ATu2Cwx531D0WVagjn1ZMIKR1i3yyq+3IGJ4=";
};
build-system = with python3Packages; [
@ -34,7 +34,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
argcomplete
bcrypt
pyyaml
jsonschema
jinja2
];
@ -44,6 +43,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
postPatch = ''
substituteInPlace ramalama/config.py --replace-fail "{sys.prefix}" "$out"
patchShebangs hack/markdown-preprocess
'';
preBuild = ''

View file

@ -0,0 +1,131 @@
diff --git a/package-lock.json b/package-lock.json
index cc8b8bd..cb5b207 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2354,6 +2354,7 @@
"version": "0.2.13",
"resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
"integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+ "dev": true,
"engines": {
"node": "*"
}
@@ -5014,14 +5015,6 @@
"node": ">=0.4.0"
}
},
- "node_modules/fd-slicer": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
- "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
- "dependencies": {
- "pend": "~1.2.0"
- }
- },
"node_modules/figures": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/figures/-/figures-5.0.0.tgz",
@@ -9118,7 +9111,8 @@
"node_modules/pend": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
- "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
+ "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
+ "license": "MIT"
},
"node_modules/picomatch": {
"version": "2.3.1",
@@ -12371,12 +12365,15 @@
}
},
"node_modules/yauzl": {
- "version": "2.10.0",
- "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
- "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.4.0.tgz",
+ "integrity": "sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==",
+ "license": "MIT",
"dependencies": {
- "buffer-crc32": "~0.2.3",
- "fd-slicer": "~1.1.0"
+ "pend": "~1.2.0"
+ },
+ "engines": {
+ "node": ">=12"
}
},
"node_modules/yocto-queue": {
@@ -14109,7 +14106,8 @@
"buffer-crc32": {
"version": "0.2.13",
"resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
- "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI="
+ "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+ "dev": true
},
"buildcheck": {
"version": "0.0.6",
@@ -16094,7 +16092,7 @@
"@types/yauzl": "^2.9.1",
"debug": "^4.1.1",
"get-stream": "^5.1.0",
- "yauzl": "^2.10.0"
+ "yauzl": "^3.3.1"
}
},
"fast-deep-equal": {
@@ -16152,14 +16150,6 @@
"websocket-driver": ">=0.5.1"
}
},
- "fd-slicer": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
- "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
- "requires": {
- "pend": "~1.2.0"
- }
- },
"figures": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/figures/-/figures-5.0.0.tgz",
@@ -19260,7 +19250,7 @@
"pend": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
- "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
+ "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="
},
"picomatch": {
"version": "2.3.1",
@@ -21718,12 +21708,11 @@
"integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="
},
"yauzl": {
- "version": "2.10.0",
- "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
- "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.4.0.tgz",
+ "integrity": "sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==",
"requires": {
- "buffer-crc32": "~0.2.3",
- "fd-slicer": "~1.1.0"
+ "pend": "~1.2.0"
}
},
"yocto-queue": {
diff --git a/package.json b/package.json
index 4a9025f..76f4407 100644
--- a/package.json
+++ b/package.json
@@ -48,5 +48,8 @@
"spectron": "^19.0.0",
"temp": "^0.9.4",
"ws": "^8.13.0"
+ },
+ "overrides": {
+ "yauzl": "^3.3.1"
}
}

View file

@ -24,7 +24,7 @@ buildNpmPackage rec {
hash = "sha256-11wlKK0z3/KRKMKNrDvZLvK7vV0UzrMTaG0ei9n6VEk=";
};
npmDepsHash = "sha256-o8pwjx5P/1eFV3HTWlHGV1/ad9YUSOI0zUWvqkqIf3I=";
npmDepsHash = "sha256-6Os6aWkgbA6m4JCp3b6UeZ4NC8N+7pwCWkPBc4xXAHY=";
patches = [
# Fix info in the "about" page, enable asar, add option to build for the detected system
@ -34,6 +34,9 @@ buildNpmPackage rec {
# would not build with nodejs_24 and above without this
./update-nan.patch
# zip extraction fails on newer nodejs versions without this fix
./bump-yauzl.patch
];
postPatch = ''

View file

@ -16,14 +16,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "rofimoji";
version = "6.7.0";
version = "6.8.0";
pyproject = true;
src = fetchFromGitHub {
owner = "fdw";
repo = "rofimoji";
tag = finalAttrs.version;
hash = "sha256-8Y28jlmlKFyqT/OGn/jKjvivMc2U7TQvYmaTX1vCvXQ=";
hash = "sha256-KOWj/u5JxgHiUf/hPBu+PfPgSRd/HVivU3F8oWqzIv4=";
};
nativeBuildInputs = [

View file

@ -117,7 +117,9 @@ stdenv.mkDerivation (finalAttrs: {
qtbase
qtmultimedia
openal
glew
# RPCS3's X11 swap-interval path uses GLEW's GLXEW symbols, which
# are not provided in the default EGL-enabled GLEW build.
(glew.override { enableEGL = false; })
vulkan-headers
vulkan-loader
libpng

View file

@ -0,0 +1,73 @@
diff --git a/src/node/desktop/package-lock.json b/src/node/desktop/package-lock.json
index c78746a..93d15e5 100644
--- a/src/node/desktop/package-lock.json
+++ b/src/node/desktop/package-lock.json
@@ -4372,16 +4372,6 @@
"ieee754": "^1.2.1"
}
},
- "node_modules/buffer-crc32": {
- "version": "0.2.13",
- "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
- "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "*"
- }
- },
"node_modules/buffer-from": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
@@ -6777,16 +6767,6 @@
"node": ">=0.8.0"
}
},
- "node_modules/fd-slicer": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
- "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "pend": "~1.2.0"
- }
- },
"node_modules/fecha": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz",
@@ -14054,14 +14034,16 @@
}
},
"node_modules/yauzl": {
- "version": "2.10.0",
- "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
- "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.4.0.tgz",
+ "integrity": "sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==",
"dev": true,
"license": "MIT",
"dependencies": {
- "buffer-crc32": "~0.2.3",
- "fd-slicer": "~1.1.0"
+ "pend": "~1.2.0"
+ },
+ "engines": {
+ "node": ">=12"
}
},
"node_modules/yn": {
diff --git a/src/node/desktop/package.json b/src/node/desktop/package.json
index 613361f..c18514f 100644
--- a/src/node/desktop/package.json
+++ b/src/node/desktop/package.json
@@ -85,5 +85,8 @@
"vue": "3.5.29",
"winston": "3.19.0",
"winston-syslog": "2.7.1"
+ },
+ "overrides": {
+ "yauzl": "^3.3.1"
}
}

View file

@ -204,6 +204,9 @@ stdenv.mkDerivation (finalAttrs: {
# Partly taken from https://github.com/rstudio/rstudio/pull/17470
./electron-41.patch
# zip extraction fails on newer nodejs versions without this fix
./bump-yauzl.patch
# Hack RStudio to only use the input R and provided libclang.
(replaceVars ./r-location.patch {
R = lib.getBin R;
@ -254,7 +257,7 @@ stdenv.mkDerivation (finalAttrs: {
name = "rstudio-${finalAttrs.version}-npm-deps";
inherit (finalAttrs) src patches;
postPatch = "cd ${finalAttrs.npmRoot}";
hash = "sha256-MuTY+vjtbgbk73dm6bsCUmi34z/HCDnB5/RLkZ/rrVo=";
hash = "sha256-rdtnQKaOUp9jfWRA4BuEOyJn8emimiy+Kvxu1939H30=";
};
preConfigure = ''

View file

@ -7,16 +7,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "samloader-rs";
version = "1.2.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "topjohnwu";
repo = "samloader-rs";
tag = finalAttrs.version;
hash = "sha256-0EsSs7GI4D4N3w33NBHKIEDmGk29aRceOwzDA7cy924=";
hash = "sha256-vUoRO//RSPv0Z69nyeiwtFIN+5lkOjguR96KjsLpc5U=";
};
cargoHash = "sha256-3i2232Rq9AEqPK8teVmu5kPX10ZopXTm7djUalfPFng=";
cargoHash = "sha256-rqJ0/h/HDBlXQ7MGQspKXMSUEGaddkxRqdQmwSlfttc=";
nativeBuildInputs = [ perl ];

View file

@ -9,11 +9,11 @@
# SHA of ${finalAttrs.version} for the tool's help output. Unfortunately this is needed in build flags.
# The update script can update this automatically, the comment is used to find the line.
let
rev = "a988242e8bbded3ef4602eda48addcfac24a1a91"; # update-commit-sha
rev = "09b10f4ef2c32b3ee04ec59821ccae492e1e140d"; # update-commit-sha
in
buildGoModule (finalAttrs: {
pname = "sonobuoy";
version = "0.57.3"; # Do not forget to update `rev` above
version = "0.57.4"; # Do not forget to update `rev` above
ldflags =
let
@ -30,10 +30,10 @@ buildGoModule (finalAttrs: {
owner = "vmware-tanzu";
repo = "sonobuoy";
rev = "v${finalAttrs.version}";
hash = "sha256-YFItnwU08g4pVo4OOHscRmPRVXyr+R9YWYTxhSzd7iI=";
hash = "sha256-LFYn7Ym1RS8/Uysm6I2HbVD48fu542TsHdqybzvLgrw=";
};
vendorHash = "sha256-QjVnC6CZXuw6qLNyX9ut2g1Ws1cYO1JuT043aqqeF0Q=";
vendorHash = "sha256-0PELYc2CK8FCDUvQomY6AkYd7VmhmTai64ITbpudMc4=";
subPackages = [ "." ];

View file

@ -47,4 +47,4 @@ echo "updating commit hash of ${owner}/${repo} @ ${tag} to ${sha}" >&2
cd "$(dirname "$(readlink -f "$0")")"
sed -i "s|\".*\"; # update-commit-sha|${sha}; # update-commit-sha|" default.nix
sed -i "s|\".*\"; # update-commit-sha|${sha}; # update-commit-sha|" package.nix

View file

@ -9,16 +9,16 @@
buildGoModule rec {
pname = "src-cli";
version = "7.3.0";
version = "7.4.0";
src = fetchFromGitHub {
owner = "sourcegraph";
repo = "src-cli";
rev = version;
hash = "sha256-xf6vG0qMqjjTguN0T+t45XnJksF1ZeclOBsis6siAI0=";
hash = "sha256-AJe/Xmc5HQ47voMBVjGLuxuugm5Y+yWDP9NwlzMg51s=";
};
vendorHash = "sha256-5b3WDsPthoEhNDgNJ6YX3uS5kmQwGZoQFdDTXps2XyU=";
vendorHash = "sha256-cr5KUYuEDlahkz2DwTD2yw+Tl/QrTP2O6b1HzQqXnzE=";
subPackages = [
"cmd/src"

View file

@ -0,0 +1,123 @@
diff --git a/package.json b/package.json
index d0f7837..fbdcb92 100644
--- a/package.json
+++ b/package.json
@@ -55,5 +55,10 @@
"update-electron-app": "^3.1.1",
"utf-8-validate": "^6.0.5"
},
+ "pnpm": {
+ "overrides": {
+ "yauzl": "^3.3.1"
+ }
+ },
"packageManager": "pnpm@10.18.1+sha512.77a884a165cbba2d8d1c19e3b4880eee6d2fcabd0d879121e282196b80042351d5eb3ca0935fa599da1dc51265cc68816ad2bddd2a2de5ea9fdf92adbec7cd34"
-}
\ No newline at end of file
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9c7ff44..7e9007d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4,6 +4,9 @@ settings:
autoInstallPeers: true
excludeLinksFromLockfile: false
+overrides:
+ yauzl: ^3.3.1
+
importers:
.:
@@ -1086,9 +1089,6 @@ packages:
resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
engines: {node: '>=8'}
- buffer-crc32@0.2.13:
- resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}
-
buffer-from@1.1.2:
resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
@@ -1575,9 +1575,6 @@ packages:
fastq@1.19.1:
resolution: {integrity: sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==}
- fd-slicer@1.1.0:
- resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==}
-
figures@2.0.0:
resolution: {integrity: sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==}
engines: {node: '>=4'}
@@ -1722,7 +1719,7 @@ packages:
glob@7.2.3:
resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
- deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
+ deprecated: Glob versions prior to v9 are no longer supported
glob@8.1.0:
resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==}
@@ -2883,7 +2880,7 @@ packages:
tar@6.2.1:
resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==}
engines: {node: '>=10'}
- deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
+ deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exhorbitant rates) by contacting i@izs.me
temp@0.9.4:
resolution: {integrity: sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==}
@@ -3174,8 +3171,9 @@ packages:
resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
engines: {node: '>=12'}
- yauzl@2.10.0:
- resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==}
+ yauzl@3.4.0:
+ resolution: {integrity: sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==}
+ engines: {node: '>=12'}
yocto-queue@0.1.0:
resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
@@ -4439,8 +4437,6 @@ snapshots:
dependencies:
fill-range: 7.1.1
- buffer-crc32@0.2.13: {}
-
buffer-from@1.1.2: {}
buffer@5.7.1:
@@ -5110,7 +5106,7 @@ snapshots:
dependencies:
debug: 4.4.3
get-stream: 5.2.0
- yauzl: 2.10.0
+ yauzl: 3.4.0
optionalDependencies:
'@types/yauzl': 2.10.3
transitivePeerDependencies:
@@ -5136,10 +5132,6 @@ snapshots:
dependencies:
reusify: 1.1.0
- fd-slicer@1.1.0:
- dependencies:
- pend: 1.2.0
-
figures@2.0.0:
dependencies:
escape-string-regexp: 1.0.5
@@ -6839,10 +6831,9 @@ snapshots:
y18n: 5.0.8
yargs-parser: 21.1.1
- yauzl@2.10.0:
+ yauzl@3.4.0:
dependencies:
- buffer-crc32: 0.2.13
- fd-slicer: 1.1.0
+ pend: 1.2.0
yocto-queue@0.1.0: {}

View file

@ -31,6 +31,11 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-l4kxlPwohaxserVyNAb3Dp4f5XhnPUKeuRJwrOl9EWc=";
};
patches = [
# zip extraction fails on newer nodejs versions without this fix
./bump-yauzl.patch
];
postPatch = ''
# Disable auto-updates
sed -i '/updateElectronApp([^)]*)/d' src/main.ts
@ -54,10 +59,15 @@ stdenv.mkDerivation (finalAttrs: {
];
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
inherit (finalAttrs)
pname
version
src
patches
;
fetcherVersion = 3;
pnpm = pnpm_10;
hash = "sha256-bIDwEmt/8URBMx7XIQ1EP4SucwMuyGZE1hlQM0rxDnw=";
hash = "sha256-0v+MHYFgnIN4FvzFkv5D3Bqc7538763yCIWu05XR+fA=";
};
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";

View file

@ -1,21 +1,21 @@
{
"version": "0.63.3",
"version": "0.65.0",
"platforms": {
"aarch64-linux": {
"filename": "swiftlint_linux_arm64.zip",
"hash": "sha256-1e/L7V7Byp63+DPf3Z+A9WKJdQtyWCx8Foa0Uo4YJFQ="
"hash": "sha256-EtO4S8W2muE6maWlx5kE+c4lhn8Jn2No0AN4VPnubCY="
},
"x86_64-linux": {
"filename": "swiftlint_linux_amd64.zip",
"hash": "sha256-Jtt0HUPy8twmwM8WkREAo+GGw9HbtZ5VrTrIew3kU48="
"hash": "sha256-eTBqNOXHzFWiIM0QjLuGHcrV8QE43N8mHiYkrosKSGs="
},
"x86_64-darwin": {
"filename": "portable_swiftlint.zip",
"hash": "sha256-+wRehefLM3T0KkhAtrhaAQYwKvppA1wMbymvSkTIELY="
"hash": "sha256-1ssKp6L18e8wb8nje8tU3Jom+syPd4SsDD3T7M9ca6Y="
},
"aarch64-darwin": {
"filename": "portable_swiftlint.zip",
"hash": "sha256-+wRehefLM3T0KkhAtrhaAQYwKvppA1wMbymvSkTIELY="
"hash": "sha256-1ssKp6L18e8wb8nje8tU3Jom+syPd4SsDD3T7M9ca6Y="
}
}
}

View file

@ -19,16 +19,16 @@ let
in
buildNpmPackage rec {
pname = "teams-for-linux";
version = "2.12.0";
version = "2.13.0";
src = fetchFromGitHub {
owner = "IsmaelMartinez";
repo = "teams-for-linux";
tag = "v${version}";
hash = "sha256-n9Ibno6NqiZ9W5KpPPZKD5/MTO8CKYdf/fXDf0cGsi4=";
hash = "sha256-30jt23bsJ1XE2gclRg06AM+mk1IrerNnkbWVDRfjqHo=";
};
npmDepsHash = "sha256-euf/6RtAO84ZtbdhglBd6gRCcg2m6a+fhthNvFzMlho=";
npmDepsHash = "sha256-pz2htdFmczmZJtcrpI/X0nUUF++x2vtcYZiTWjEYglo=";
nativeBuildInputs = [
makeWrapper

View file

@ -6,13 +6,13 @@
}:
python3.pkgs.buildPythonApplication {
pname = "yaookctl";
version = "0-unstable-2026-06-18";
version = "0-unstable-2026-06-23";
src = fetchFromGitLab {
owner = "yaook";
repo = "yaookctl";
rev = "697cf46425794c49fe9bb2b42550a58ddcac67a1";
hash = "sha256-6pLDWPWKxVCGFZr/GhE7BegG86Zbgkw92S5lVMsvtHs=";
rev = "f525f4c11422e8d556f8ff5564c5ce7180570f20";
hash = "sha256-QPr1ryiT/OfBOEcIghGOgqKlu2iNLglWmZoWs6BLyvU=";
};
pyproject = true;

View file

@ -9,14 +9,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "ytdl-sub";
version = "2026.05.10.post1";
version = "2026.06.23";
pyproject = true;
src = fetchFromGitHub {
owner = "jmbannon";
repo = "ytdl-sub";
tag = finalAttrs.version;
hash = "sha256-lv82BqZHzAiQV8wAwZQ/BB/ohq+Sn2UlSNV6jFGE3Uk=";
hash = "sha256-VakqR66V90MIx6Bh5MS69iX1nZsFuTJ6YOJG90kf5s0=";
};
postPatch = ''

View file

@ -0,0 +1,51 @@
diff --git a/yarn.lock b/yarn.lock
index baa6475..4ff4481 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2952,13 +2952,6 @@ __metadata:
languageName: node
linkType: hard
-"buffer-crc32@npm:~0.2.3":
- version: 0.2.13
- resolution: "buffer-crc32@npm:0.2.13"
- checksum: 10c0/cb0a8ddf5cf4f766466db63279e47761eb825693eeba6a5a95ee4ec8cb8f81ede70aa7f9d8aeec083e781d47154290eb5d4d26b3f7a465ec57fb9e7d59c47150
- languageName: node
- linkType: hard
-
"buffer-from@npm:^1.0.0":
version: 1.1.2
resolution: "buffer-from@npm:1.1.2"
@@ -4750,15 +4743,6 @@ __metadata:
languageName: node
linkType: hard
-"fd-slicer@npm:~1.1.0":
- version: 1.1.0
- resolution: "fd-slicer@npm:1.1.0"
- dependencies:
- pend: "npm:~1.2.0"
- checksum: 10c0/304dd70270298e3ffe3bcc05e6f7ade2511acc278bc52d025f8918b48b6aa3b77f10361bddfadfe2a28163f7af7adbdce96f4d22c31b2f648ba2901f0c5fc20e
- languageName: node
- linkType: hard
-
"fdir@npm:^6.4.4":
version: 6.4.5
resolution: "fdir@npm:6.4.5"
@@ -9915,12 +9899,11 @@ __metadata:
linkType: hard
"yauzl@npm:^2.10.0":
- version: 2.10.0
- resolution: "yauzl@npm:2.10.0"
+ version: 3.4.0
+ resolution: "yauzl@npm:3.4.0"
dependencies:
- buffer-crc32: "npm:~0.2.3"
- fd-slicer: "npm:~1.1.0"
- checksum: 10c0/f265002af7541b9ec3589a27f5fb8f11cf348b53cc15e2751272e3c062cd73f3e715bc72d43257de71bbaecae446c3f1b14af7559e8ab0261625375541816422
+ pend: "npm:~1.2.0"
+ checksum: 10c0/17a98c42c0065e8af429eb8a61f7a0e4562181ed54080366b838f34f741b6829f167f804787c86b7646bb042707f35871739f053de0548285e405a2eae4da025
languageName: node
linkType: hard

View file

@ -47,6 +47,10 @@ stdenv.mkDerivation (finalAttrs: {
# Remove after upstream updates to Yarn 4.14
# https://github.com/ytmdesktop/ytmdesktop/blob/v2.0.11/package.json#L77
./yarn-4.14-support.patch
# zip extraction fails on newer nodejs versions without this fix
# generated by running `yarn set resolution yauzl@npm:^2.10.0 npm:^3.3.1`
./bump-yauzl.patch
];
postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
@ -61,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
yarnOfflineCache = yarn-berry.fetchYarnBerryDeps {
inherit (finalAttrs) src missingHashes patches;
hash = "sha256-Vvvhi1db/ld2rNz+XhtNzlgI/4z3ym6QENG0GMlZAd0=";
hash = "sha256-VpNK+44/FwHxZ+Hyx0QShpZ9fdP06VhhpoXxMFeLUzE=";
};
nativeBuildInputs = [

View file

@ -17,24 +17,20 @@
}:
let
withQt6 = lib.strings.versionAtLeast qtbase.version "6";
withQt6 = lib.versions.major qtbase.version == "6";
in
stdenv.mkDerivation (finalAttrs: {
pname = "libqtdbustest";
version = "0.4.0";
version = "0.4.1";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/libqtdbustest";
rev = finalAttrs.version;
hash = "sha256-49YIkaQ2ceJxaPLkzOg+L3bwiPzoB36xU7skRh4vYQg=";
hash = "sha256-bTLGL/3iy8Wu4HnPRJj2Vn3xOlPhXFbaxgyQol8Y1JY=";
};
patches = [
# Tests are overly pedantic when looking for launched process names in `ps`, break on python wrapper vs real python
# Just check if basename + arguments match, like libqtdbusmock does
./less-pedantic-process-finding.patch
# Disable QProcess start timeout
(fetchpatch {
url = "https://salsa.debian.org/ubports-team/libqtdbustest/-/raw/debian/0.3.2-3/debian/patches/1003_no-QProcess-waitForstarted-timeout.patch";

View file

@ -1,72 +0,0 @@
diff '--color=auto' -ur '--color=never' a/tests/libqtdbustest/TestDBusTestRunner.cpp b/tests/libqtdbustest/TestDBusTestRunner.cpp
--- a/tests/libqtdbustest/TestDBusTestRunner.cpp 2023-01-20 21:36:16.948292559 +0100
+++ b/tests/libqtdbustest/TestDBusTestRunner.cpp 2023-01-20 21:55:40.554530221 +0100
@@ -44,7 +44,7 @@
TEST_F(TestDBusTestRunner, StartsSessionService) {
QSharedPointer<QProcessDBusService> process(
new QProcessDBusService("test.session.name",
- QDBusConnection::SessionBus, "/usr/bin/python3",
+ QDBusConnection::SessionBus, "python3",
QStringList() << "-m" << "dbusmock" << "test.session.name"
<< "/test/object" << "test.Interface"));
@@ -58,15 +58,14 @@
pgrep.waitForFinished();
pgrep.waitForReadyRead();
- EXPECT_EQ(
- "/usr/bin/python3 -m dbusmock test.session.name /test/object test.Interface",
- QString::fromUtf8(pgrep.readAll().trimmed()).toStdString());
+ EXPECT_TRUE(
+ pgrep.readAll().contains("python3 -m dbusmock test.session.name /test/object test.Interface"));
}
TEST_F(TestDBusTestRunner, StartsSystemService) {
QSharedPointer<QProcessDBusService> process(
new QProcessDBusService("test.system.name",
- QDBusConnection::SystemBus, "/usr/bin/python3",
+ QDBusConnection::SystemBus, "python3",
QStringList() << "-m" << "dbusmock" << "-s"
<< "test.system.name" << "/test/object"
<< "test.Interface"));
@@ -81,9 +80,8 @@
pgrep.waitForFinished();
pgrep.waitForReadyRead();
- EXPECT_EQ(
- "/usr/bin/python3 -m dbusmock -s test.system.name /test/object test.Interface",
- QString::fromUtf8(pgrep.readAll().trimmed()).toStdString());
+ EXPECT_TRUE(
+ pgrep.readAll().contains("python3 -m dbusmock -s test.system.name /test/object test.Interface"));
}
TEST_F(TestDBusTestRunner, SetsEnvironmentVariables) {
diff '--color=auto' -ur '--color=never' a/tests/libqtdbustest/TestQProcessDBusService.cpp b/tests/libqtdbustest/TestQProcessDBusService.cpp
--- a/tests/libqtdbustest/TestQProcessDBusService.cpp 2023-01-20 21:36:16.948292559 +0100
+++ b/tests/libqtdbustest/TestQProcessDBusService.cpp 2023-01-20 21:54:34.633384937 +0100
@@ -45,7 +45,7 @@
TEST_F(TestQProcessDBusService, WaitsForServiceAppeared) {
QProcessDBusService process("test.name", QDBusConnection::SessionBus,
- "/usr/bin/python3",
+ "python3",
QStringList() << "-m" << "dbusmock" << "test.name" << "/test/object"
<< "test.Interface");
@@ -58,14 +58,13 @@
pgrep.waitForFinished();
pgrep.waitForReadyRead();
- EXPECT_EQ(
- "/usr/bin/python3 -m dbusmock test.name /test/object test.Interface",
- QString::fromUtf8(pgrep.readAll().trimmed()).toStdString());
+ EXPECT_TRUE(
+ pgrep.readAll().contains("python3 -m dbusmock test.name /test/object test.Interface"));
}
TEST_F(TestQProcessDBusService, ThrowsErrorForFailToStart) {
QProcessDBusService process("test.name", QDBusConnection::SessionBus,
- "/usr/bin/python3",
+ "python3",
QStringList() << "-m" << "dbusmock" << "not.test.name"
<< "/test/object" << "test.Interface");

View file

@ -1322,15 +1322,15 @@ final: prev: {
}:
buildLuarocksPackage {
pname = "kulala.nvim";
version = "6.17.0-1";
version = "6.20.1-1";
knownRockspec =
(fetchurl {
url = "mirror://luarocks/kulala.nvim-6.17.0-1.rockspec";
sha256 = "1m2i088p9gdkvh2s1pgzwq7j2wi2n97k2qdwggi5g22c20ph9370";
url = "mirror://luarocks/kulala.nvim-6.20.1-1.rockspec";
sha256 = "1mpqdsc6r77wahq6brifl81bcj8gjmhh5wnc81az4nrw2d8ngrfn";
}).outPath;
src = fetchzip {
url = "https://github.com/mistweaverco/kulala.nvim/archive/v6.17.0.zip";
sha256 = "03iilwmi10v6d849nxi47rgfg65qzir4h7h28iw2ga3l3f33h2gy";
url = "https://github.com/mistweaverco/kulala.nvim/archive/v6.20.1.zip";
sha256 = "0nadhlk8ba47z6ic8q89r6fi7q0h6z70984in1rhx2a38h5rkz27";
};
disabled = luaOlder "5.1";

View file

@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "edk2-pytool-library";
version = "0.23.14";
version = "0.23.15";
pyproject = true;
src = fetchFromGitHub {
owner = "tianocore";
repo = "edk2-pytool-library";
tag = "v${version}";
hash = "sha256-/bQfz7W/OYTG5/ABuN7kiynva4DvSO53Cf0JyxwsiHI=";
hash = "sha256-ZWQvqhQb9mjvShWVER7iS5vTI8KUn7RefqyGhjpO9NI=";
};
build-system = [

View file

@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "emborg";
version = "1.42";
version = "1.43";
pyproject = true;
src = fetchFromGitHub {
owner = "KenKundert";
repo = "emborg";
tag = "v${version}";
hash = "sha256-/xinm/Jz4JVmm0jioLAhkbBueZCM0ehgt4gsgE7hX6I=";
hash = "sha256-b/nzAkWFOGPqr/cMX38WIQaOz7n+9d6gtMIgtFAd+yY=";
};
nativeBuildInputs = [ flit-core ];

View file

@ -8,14 +8,14 @@
buildPythonPackage (finalAttrs: {
pname = "fastcore";
version = "1.13.6";
version = "1.13.8";
pyproject = true;
src = fetchFromGitHub {
owner = "fastai";
repo = "fastcore";
tag = finalAttrs.version;
hash = "sha256-mc83cOGVVRYa3ed8/8i31Ipbxr8stOnwSdnlOtJ5TGM=";
hash = "sha256-NhEevAvDMSdQJCJZkbjBpD44IlEy3gV+97vZa4583rQ=";
};
build-system = [ setuptools ];

View file

@ -9,20 +9,16 @@
buildPythonPackage (finalAttrs: {
pname = "inject";
version = "5.3.0-unstable-2026-01-05";
version = "5.4.0";
pyproject = true;
src = fetchFromGitHub {
owner = "ivankorobkov";
repo = "python-inject";
rev = "2ca60abc5370cd91d87e5a21ac373d0ca710f76d";
hash = "sha256-FumossBUGwp1XxWthx3gpIietvZsmPpkd52y9jjVKjQ=";
tag = "v${finalAttrs.version}";
hash = "sha256-ITnqTGCOPLzATisAcPi52cpxsm9/Adj/Xb53jd18IWo=";
};
env.SETUPTOOLS_SCM_PRETEND_VERSION =
assert lib.hasInfix "unstable" finalAttrs.version;
builtins.head (lib.splitString "-" finalAttrs.version);
build-system = [
hatchling
hatch-vcs
@ -37,7 +33,7 @@ buildPythonPackage (finalAttrs: {
meta = {
description = "Python dependency injection framework";
homepage = "https://github.com/ivankorobkov/python-inject";
changelog = "https://github.com/ivankorobkov/python-inject/blob/${finalAttrs.src.rev}/CHANGES.md";
changelog = "https://github.com/ivankorobkov/python-inject/blob/${finalAttrs.src.tag}/CHANGES.md";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ PerchunPak ];
};

View file

@ -23,14 +23,14 @@ buildPythonPackage (finalAttrs: {
__structuredAttrs = true;
pname = "kaggle";
version = "2.2.2";
version = "2.2.3";
pyproject = true;
src = fetchFromGitHub {
owner = "Kaggle";
repo = "kaggle-cli";
tag = "v${finalAttrs.version}";
hash = "sha256-LPeJxjxyeRHElU4y1JiG0zTX5NFlrrnwP6ZYdYkR8mo=";
hash = "sha256-NvSR3kSncBtjj2zuwESGXRMbZofYcnRnXIglRJ3dsrQ=";
};
build-system = [ hatchling ];

View file

@ -1,84 +0,0 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
wheel,
importlib-resources,
pygments,
tqdm,
flask,
multiprocess,
docutils,
sphinx,
sphinx-autodoc-typehints,
sphinx-rtd-theme,
sphinx-versions,
sphinxcontrib-images,
ipywidgets,
numpy,
rich,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "mpire";
version = "2.10.2";
pyproject = true;
src = fetchFromGitHub {
owner = "sybrenjansen";
repo = "mpire";
tag = "v${version}";
hash = "sha256-6O+k8gSMCu4zhj7KzbsC5UUCU/TG/g3dYsGVuvcy25E=";
};
build-system = [
setuptools
wheel
];
dependencies = [
importlib-resources
pygments
tqdm
];
optional-dependencies = {
dashboard = [
flask
];
dill = [
multiprocess
];
docs = [
docutils
sphinx
sphinx-autodoc-typehints
sphinx-rtd-theme
sphinx-versions
sphinxcontrib-images
];
testing = [
ipywidgets
multiprocess
numpy
rich
];
};
pythonImportsCheck = [
"mpire"
];
nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.testing;
enabledTestPaths = [ "tests" ];
meta = {
description = "Python package for easy multiprocessing, but faster than multiprocessing";
homepage = "https://pypi.org/project/mpire/";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ booxter ];
};
}

View file

@ -3,20 +3,19 @@
buildPythonPackage,
fetchFromGitHub,
hatchling,
mpire,
tqdm,
}:
buildPythonPackage rec {
pname = "semchunk";
version = "4.0.0";
version = "4.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "isaacus-dev";
repo = "semchunk";
tag = "v${version}";
hash = "sha256-8bceOMMnQ4JsbX7zU5zAoyP8esTm83m/a3VwwnUzCAA=";
hash = "sha256-jQQNb5E/EarsN9OwlF6l8huX06kM2EChfUYW+MM5uxA=";
};
build-system = [
@ -24,7 +23,6 @@ buildPythonPackage rec {
];
dependencies = [
mpire
tqdm
];

View file

@ -1,43 +0,0 @@
{
lib,
buildPythonPackage,
fetchPypi,
setuptools,
wheel,
click,
colorclass,
sphinx,
}:
buildPythonPackage rec {
pname = "sphinx-versions";
version = "1.1.3";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-9ROFEjET+d2Dfg4DHx0IqUN34oGwY4AGbi7teK4YmR8=";
};
build-system = [
setuptools
wheel
];
dependencies = [
click
colorclass
sphinx
];
pythonImportsCheck = [
"sphinxcontrib.versioning"
];
meta = {
description = "Sphinx extension that allows building versioned docs for self-hosting";
homepage = "https://pypi.org/project/sphinx-versions/";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ booxter ];
};
}

View file

@ -1,41 +0,0 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
requests,
sphinx,
}:
buildPythonPackage rec {
pname = "sphinxcontrib-images";
version = "1.0.1";
pyproject = true;
src = fetchFromGitHub {
owner = "sphinx-contrib";
repo = "images";
tag = version;
hash = "sha256-olkczYxvdUgLZXmvA0SUXL2q+NL4tvUfRWBG7S05dQU=";
};
build-system = [
setuptools
];
dependencies = [
requests
sphinx
];
pythonImportsCheck = [
"sphinxcontrib.images"
];
meta = {
description = "Sphinx extension for thumbnails";
homepage = "https://pypi.org/project/sphinxcontrib-images/";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ booxter ];
};
}

View file

@ -11,14 +11,14 @@
buildPythonPackage (finalAttrs: {
pname = "steamloop";
version = "1.2.1";
version = "1.2.3";
pyproject = true;
src = fetchFromGitHub {
owner = "hvaclibs";
repo = "steamloop";
tag = "v${finalAttrs.version}";
hash = "sha256-0uzx1lW34sBWq06dR+ajPZ5VfUSTQHGSB/hoy1fLKLo=";
hash = "sha256-7AxUEe57OpDi2ofbKWvdcFCoq7ARXtlKpiJQyQX891c=";
};
build-system = [ setuptools ];

View file

@ -16,6 +16,11 @@ buildNpmPackage (finalAttrs: {
hash = "sha256-ZEd27lt5S7pnGGzTnxLV6voEpzXjvRjubjmusLuISZg=";
};
postPatch = ''
substituteInPlace src/radar-toolbar.ts \
--replace-fail "/local/community/weather-radar-card/" "/local/nixos-lovelace-modules/"
'';
npmDepsFetcherVersion = 2;
npmFlags = [ "--legacy-peer-deps" ];
npmDepsHash = "sha256-S3PZOcKBseohCKOUSRFCQj6fAJTrZLRD5916iB35rrc=";

View file

@ -371,6 +371,7 @@ mapAliases {
monarchmoney = throw "'monarchmoney' has been renamed to/replaced by 'monarchmoneycommunity'"; # Added 2026-03-05
monkeytype = throw "'monkeytype' has been removed as it was unmaintained upstream"; # Added 2026-04-19
moretools = "'moretools' has been removed because it is unmaintained"; # Added 2026-01-19
mpire = throw "'mpire' has been removed because it is unused in Nixpkgs"; # Added 2026-06-22
msldap-bad = throw "'msldap-bad' has been renamed to/replaced by 'badldap'"; # added 2025-11-06
mullvad-closest = throw "'mullvad-closest' has been removed as it was unmaintained. Consider using 'mullvad-compass' instead."; # Added 2026-01-13
multi_key_dict = throw "'multi_key_dict' has been renamed to/replaced by 'multi-key-dict'"; # Converted to throw 2025-10-29
@ -595,8 +596,10 @@ mapAliases {
sphinx-hoverxref = throw "'sphinx-hoverxref' has been deprecated upstream. It's functionality was merged into the readthedocs.org admin panel."; # Added 2026-01-18"
sphinx-jquery = throw "'sphinx-jquery' has been renamed to/replaced by 'sphinxcontrib-jquery'"; # Converted to throw 2025-10-29
sphinx-version-warning = throw "'sphinx-version-warning' has been abandoned upstream in 2019"; # Added 2026-01-18
sphinx-versions = throw "'sphinx-versions' has been removed because it is unused in Nixpkgs"; # Added 2026-06-22
sphinx_rtd_theme = throw "'sphinx_rtd_theme' has been renamed to/replaced by 'sphinx-rtd-theme'"; # Converted to throw 2025-10-29
sphinxcontrib-autoapi = throw "'sphinxcontrib-autoapi' has been renamed to/replaced by 'sphinx-autoapi'"; # Converted to throw 2025-10-29
sphinxcontrib-images = throw "'sphinxcontrib-images' has been removed because it is unused in Nixpkgs"; # Added 2026-06-22
sphinxcontrib-newsfeed = throw "'sphinxcontrib-newsfeed has been removed due to abandonment upstream"; # Added 2026-03-24
sphinxcontrib_httpdomain = throw "'sphinxcontrib_httpdomain' has been renamed to/replaced by 'sphinxcontrib-httpdomain'"; # Converted to throw 2025-10-29
sphinxcontrib_newsfeed = throw "'sphinxcontrib_newsfeed' has been renamed to/replaced by 'sphinxcontrib-newsfeed'"; # Converted to throw 2025-10-29

View file

@ -10558,8 +10558,6 @@ self: super: with self; {
mpi4py = callPackage ../development/python-modules/mpi4py { };
mpire = callPackage ../development/python-modules/mpire { };
mpl-scatter-density = callPackage ../development/python-modules/mpl-scatter-density { };
mpl-typst = callPackage ../development/python-modules/mpl-typst {
@ -18828,8 +18826,6 @@ self: super: with self; {
sphinx-toolbox = callPackage ../development/python-modules/sphinx-toolbox { };
sphinx-versions = callPackage ../development/python-modules/sphinx-versions { };
sphinxawesome-theme = callPackage ../development/python-modules/sphinxawesome-theme { };
sphinxcontrib-actdiag = callPackage ../development/python-modules/sphinxcontrib-actdiag { };
@ -18862,8 +18858,6 @@ self: super: with self; {
sphinxcontrib-httpdomain = callPackage ../development/python-modules/sphinxcontrib-httpdomain { };
sphinxcontrib-images = callPackage ../development/python-modules/sphinxcontrib-images { };
sphinxcontrib-jinjadomain = callPackage ../development/python-modules/sphinxcontrib-jinjadomain { };
sphinxcontrib-jquery = callPackage ../development/python-modules/sphinxcontrib-jquery { };