nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-28 10:50:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,058,993 Commits 273 Branches 81 Tags
python-updates
Commit Graph

73 Commits

Author SHA1 Message Date
nixpkgs-ci[bot]
52f51ae1e3 Merge staging-next into staging 2026-08-17 00:11:20 +00:00
Weijia Wang
cc5ad9df58 jql: 8.0.10 -> 8.1.2 (#518227) 2026-08-16 19:15:43 +00:00
Stefan Frijters
1716f79646 jq: enable structuredAttrs 2026-08-14 14:55:56 +02:00
Ben Siraphob
5506449838 pkgs/by-name: fix typos 
Assisted-by: Claude Code (claude-opus-5)
 2026-08-05 09:56:33 -07:00
R. Ryantm
a99c2a1388 jq-lsp: 0.1.17 -> 0.1.18 2026-07-20 14:24:50 +00:00
Bart Oostveen
ecae36f172 jq: 1.8.1 -> 1.8.2 
Changelogs: https://github.com/jqlang/jq/releases/tag/jq-1.8.2
Should be backported (22 CVEs)
 2026-06-21 00:51:27 +02:00
Hans Joachim Kliemeck
8478c2384b stdenv: Package URL (PURL) metadata fields 2026-05-26 21:47:54 +02:00
nixpkgs-ci[bot]
32f7670d28 Merge master into staging-next 2026-05-16 00:37:14 +00:00
Marcin Serwin
5e75181628 maintainers: drop dit7ya 
Signed-off-by: Marcin Serwin <marcin@serwin.dev>
 2026-05-15 20:24:01 +02:00
R. Ryantm
d39da1f41b jql: 8.0.10 -> 8.1.2 2026-05-09 00:21:58 +00:00
Naïm Camille Favier
be36545b30 jq: apply CVE patches 
Apply upstream patches for CVE-2026-32316, CVE-2026-33947, CVE-2026-33948,
CVE-2026-39979, and CVE-2026-40164.
 2026-04-14 17:38:12 +02:00
R. Ryantm
9367b82c87 jq-lsp: 0.1.16 -> 0.1.17 2026-02-12 23:22:20 +00:00
quantenzitrone
9380e05c3c various: switch buildGoModule packages to use finalAttrs 
this shouldn't create any rebuilds

the following script was used to generate this:
```fish
#!/usr/bin/env fish

# nix shell .#nixfmt nixpkgs#{nixf-diagnose,ripgrep,sd}

set base (git rev-parse HEAD)

set scope pkgs/by-name
set builder buildGoModule

set files (rg --files-with-matches -F "$builder rec {" $scope | sort -u)

for file in $files
    echo $file
    sd -F "$builder rec {" "$builder (finalAttrs: {" $file
    # version
    sd -F 'version}' 'finalAttrs.version}' $file
    sd -F '${version' '${finalAttrs.version' $file
    sd -F '= version' '= finalAttrs.version' $file
    sd -F 'inherit version;' 'inherit (finalAttrs) version;' $file
    sd -F ' + version;' ' + finalAttrs.version;' $file
    sd 'replaceStrings (.*) version' 'replaceStrings $1 finalAttrs.version' $file
    sd -F 'splitVersion version' 'splitVersion finalAttrs.version' $file
    sd -F 'versionAtLeast version' 'versionAtLeast finalAttrs.version' $file
    sd 'versions\.([a-z]+) version' 'versions.$1 finalAttrs.version' $file
    # src
    sd -F 'src}' 'finalAttrs.src}' $file
    sd -F '${src' '${finalAttrs.src' $file
    sd -F '= src' '= finalAttrs.src' $file
    sd -F 'inherit src;' 'inherit (finalAttrs) src;' $file
    sd -F 'inherit (src' 'inherit (finalAttrs.src' $file
    # meta
    sd -F '${meta' '${finalAttrs.meta' $file
    sd -F '= meta' '= finalAttrs.meta' $file
    sd -F 'inherit (meta' 'inherit (finalAttrs.meta' $file
    # other
    sd -F 'inherit version src;' 'inherit (finalAttrs) version src;' $file
    sd -F 'inherit src version;' 'inherit (finalAttrs) src version;' $file
    sd -F 'makeLibraryPath buildInputs' 'makeLibraryPath finalAttrs.buildInputs' $file
    sd -F 'buildInputs}' 'finalAttrs.buildInputs}' $file
    sd -F 'desktopItem}' 'finalAttrs.desktopItem}' $file
    sd -F 'runtimeLibs}' 'finalAttrs.runtimeLibs}' $file
    sd -F 'libPath}' 'finalAttrs.libPath}' $file
    sd -F 'runtimeDependencies}' 'finalAttrs.runtimeDependencies}' $file
    sd -F 'nativeRuntimeInputs}' 'finalAttrs.nativeRuntimeInputs}' $file
    sd -F '(!doCheck)' '(!finalAttrs.doCheck)' $file
    sd -F 'optional doCheck' 'optional finalAttrs.doCheck' $file
    sd -F 'optionals doCheck' 'optionals finalAttrs.doCheck' $file
    sd -F '++ runtimeDependencies' '++ finalAttrs.runtimeDependencies' $file
    # pname (restored afterwards)
    sd -F 'pname}' 'finalAttrs.pname}' $file
    sd -F '${pname' '${finalAttrs.pname' $file
    sd -F '= pname' '= finalAttrs.pname' $file
    # close finalAttrs lambda
    echo ')' >>$file
    # catch some errors early
    if ! nixfmt $file
        git restore $file
        continue
    end
    if ! nixf-diagnose -i sema-primop-overridden $file
        git restore $file
        continue
    end
end

set torestore (rg -F .finalAttrs --files-with-matches $scope)
if test (count $torestore) -gt 0
    git restore $torestore
end
set torestore (rg -F finalAttrs.pname --files-with-matches $scope)
if test (count $torestore) -gt 0
    git restore $torestore
end

# commit for faster eval times
git add pkgs
git commit --no-gpg-sign -m temp
set torestore

for file in $files
    # file hasn't changed
    if git diff --quiet $base $file
        continue
    end
    # try to eval the package to definitely catch all errors
    echo $file
    set pname (string split / $file -f 4)
    if ! nix eval .#$pname
        set torestore $torestore $file
    end
end

# restore files that don't eval
git reset --soft $base
git restore --staged .
if test (count $torestore) -gt 0
    git restore $torestore
end
```

after that some manual cleanup was done:
- restoring files that cause changes in the number of lines
- restoring files that cause rebuilds
- restoring files that cause merge conflicts with staging
 2026-02-07 09:28:59 +01:00
quantenzitrone
6b61249106 various: switch to finalAttrs pattern 
this shouldn't create any rebuilds
 2026-01-30 02:36:22 +01:00
Muhammad Falak R Wani
fb10eab196 jql: 8.0.9 -> 8.0.10 
Diff: https://github.com/yamafaktory/jql/compare/jql-v8.0.9...jql-v8.0.10
Changelog: https://github.com/yamafaktory/jql/releases/tag/jql-v8.0.10

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
 2026-01-22 09:19:13 +00:00
heisfer
071d89c8fb jqfmt: 0-unstable-2025-07-28 -> 0.1.0 2026-01-12 18:40:18 +02:00
R. Ryantm
b8a1f6a780 jq-lsp: 0.1.15 -> 0.1.16 2026-01-01 19:46:07 +00:00
Wolfgang Walther
46c0c0eae7 Merge branch 'staging-next' into staging 2025-12-10 18:42:31 +01:00
Ihar Hrachyshka
567e8dfd8e treewide: clean up 'meta = with' pattern 
This commit was created by a combination of scripts and tools:
- an ast-grep script to prefix things in meta with `lib.`,
- a modified nixf-diagnose / nixf combination to remove unused `with
lib;`, and
- regular nixfmt.

Co-authored-by: Wolfgang Walther <walther@technowledgy.de>
 2025-12-10 18:09:49 +01:00
nixpkgs-ci[bot]
1524bd6859 Merge staging-next into staging 2025-11-29 06:06:22 +00:00
R. Ryantm
02d14adc20 jq-lsp: 0.1.14 -> 0.1.15 2025-11-27 13:48:28 +00:00
Jonathan Davies
116036d574 treewide: Remove redundant versionCheckProgramArg = "--version"; with: 
```shell
git grep -l -e 'versionCheckProgramArg = "--version";' -e 'versionCheckProgramArg = \[ "--version" \];' | while read f; do
  sed -i '/versionCheckProgramArg/d' "$f"
  sed -i '/^$/N;/\n$/D' "$f"
done
```
 2025-11-20 10:39:02 +00:00
R. Ryantm
516b8c64ea jq-lsp: 0.1.13 -> 0.1.14 2025-11-18 14:41:14 +00:00
liberodark
5a3298f644 jql: cleanup 2025-11-07 15:48:42 +01:00
Michael Daniels
1d0bb7b61b treewide: drop figsoda as maintainer (part 3) 
s/^\s*figsoda\s*$//
 2025-11-02 20:16:11 -05:00
d068328
e47455f51d Revert "stdenv: pURL implementation (#421125)" 
This reverts commit 5427115670, reversing
changes made to 88ee2ac331.
 2025-10-18 20:41:01 +00:00
Arian van Putten
5427115670 stdenv: pURL implementation (#421125) 2025-10-17 09:30:32 +00:00
R. Ryantm
080fe90697 jql: 8.0.8 -> 8.0.9 2025-10-10 14:36:28 +00:00
Hans Joachim Kliemeck
22dbee8010 stdenv: pURL non-default adjustment examples 2025-10-03 21:19:10 +00:00
R. Ryantm
256fe6ced6 jqp: 0.7.0 -> 0.8.0 2025-09-28 01:31:02 +00:00
R. Ryantm
baa69645d8 jql: 8.0.7 -> 8.0.8 2025-09-03 13:58:02 +00:00
R. Ryantm
f0bf50c976 jqfmt: 0-unstable-2024-08-15 -> 0-unstable-2025-07-28 2025-07-29 14:33:37 +00:00
TomaSajt
398b16e16c treewide: remove useFetchCargoVendor usages 2025-07-26 11:39:35 +02:00
Wolfgang Walther
5a0711127c treewide: run nixfmt 1.0.0 2025-07-24 13:55:40 +02:00
K900
01e61b76c5 jq: refresh i686 patch 2025-07-06 14:14:00 +03:00
Alyssa Ross
4f6cd96536 jq: fix build for musl 2025-07-03 11:11:15 +02:00
06kellyjac
0ad0253c09 jq: 1.8.0 -> 1.8.1 
Changelog: https://github.com/jqlang/jq/releases/tag/jq-1.8.1
 2025-07-01 15:12:46 +01:00
R. Ryantm
a0522c0c9d jql: 8.0.6 -> 8.0.7 2025-06-24 13:43:21 +00:00
R. Ryantm
2efec44c61 jq-lsp: 0.1.12 -> 0.1.13 2025-06-21 01:34:19 +00:00
Grimmauld
c6c2299d94 jq: disable failing time conversion test on 32 bit 
jq upstream has a test right on 32 bit epoch end [1].
On i686-linux, this test is executed because it is a native build.
However, the test will fail on 32 bit.
The *good* solution is to build jq with 64 bit time representation.
That might break with dynamic linking though, so instead we just disable this test.
Note: this is a bit of a hack!

[1] 859a8073ee/tests/optional.test (L17)
 2025-06-09 16:00:28 +02:00
Philip Taron
c3ffb48991 jq: use testers.testVersion instead of versionCheckHook 
The version of `env` that's in the bootstrap -- and used here -- doesn't support `--argv0=`.
 2025-06-04 21:57:12 -07:00
nixpkgs-ci[bot]
7e5390675b Merge staging-next into staging 2025-06-04 00:17:54 +00:00
nixpkgs-ci[bot]
2c9e477cff Merge master into staging-next 2025-06-04 00:17:12 +00:00
R. Ryantm
2db2fed53b jq-lsp: 0.1.11 -> 0.1.12 2025-06-03 00:32:30 +00:00
Grimmauld
c5c96d02b1 jq: 1.7.1 -> 1.8.0, modernize 
Upstream release notes: https://github.com/jqlang/jq/releases/tag/jq-1.8.0

The security fixes were backported, so this is not immediately security-relevant.

Breaking changes are included in 1.8.0, so this should not be backported to 25.05/24.11.

Modernisation done:
- update script
- removed `with lib;`
- removed patches that were merged upstream
- enabled parallel building
- enabled strict deps
- replaced `--help > /dev/null` with `versionCheckHook`
- replaced `rev` with `finalAttrs`
- added changelog url
 2025-06-01 22:30:50 +02:00
Grimmauld
c9c1e1abb2 jq: *actually* fix CVE-2025-48060 
see https://github.com/jqlang/jq/issues/3327#issuecomment-2924552289
 2025-05-31 09:35:36 +02:00
Grimmauld
31338fd80b jq: backport patches to various CVEs 
Fixes the following security issues:
https://nvd.nist.gov/vuln/detail/CVE-2025-48060
https://github.com/advisories/GHSA-8mxc-vqrq-gcm8
https://nvd.nist.gov/vuln/detail/CVE-2024-23337

Fixes needed backporting to apply.
Commits can't be fetched using `fetchpatch`,
because `jq` is part of bootstrap on darwin.

Upstream commits included:
a09a4dfd55 (CVE-2024-53427)
de21386681 (CVE-2024-23337)
dc849e9bb7 (CVE-2025-48060)
b86ff49f46 (needed for the NaN patches to apply)
 2025-05-30 17:03:08 +02:00
Peder Bergebakken Sundt
c4f02ff31e treewide: substitute pname for strings 2025-05-29 17:04:28 +02:00
R. Ryantm
4afcca6723 jql: 8.0.5 -> 8.0.6 2025-05-02 16:13:26 +00:00
Felix Bargfeldt
a455b91c48 jqfmt: init at 0-unstable-2024-08-15 (#391798) 2025-04-25 23:56:04 +02:00