nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-31 20:54:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,058,971 Commits 458 Branches 81 Tags
python-updates
Commit Graph

61 Commits

Author SHA1 Message Date
b-rodrigues
73c8af72fa jpmml-evaluator: fix build 2026-08-02 17:41:03 +02:00
Sandro
95b616e4e1 jpmml-evaluator: init at 1.7.7 (#507555) 2026-07-15 18:48:30 +00:00
Niklas Hambüchen
ed76de3e2a libjxl, jpegli: Fix file conflicts when installed together. Fixes #533459 
Done by moving the benchmarks and library files to separate outputs
so one can reference only `.bin` in `systemPackages`,
avoiding the overlapping names:

    bin/benchmark_xl
    lib/libjxl_cms.so
    lib/libjxl_threads.so
    lib/libjxl_extras_codec.a

For jpegli, a `dev` output also needed to be added to remove a cyclic
reference (from `out` to `bin`):
With a `bin` output newly present, the nixpkgs `multiple-outputs` hook
emits `nix-support/propagated-build-inputs` (which lists the `bin` output)
as development metadata. Without a `dev` output this lands in `out`,
creating an `out -> bin -> out` reference cycle (`bin` links the runtime
libs in `out`).
Example of what was in `bin`'s `nix-support/propagated-build-inputs`:

    /nix/store/99f61f783cd29k1gmr7hrxjnb4v584jn-jpegli-0-unstable-2026-04-30-bin /nix/store/320lmb4fnd2x5alv9hlpdlgz73aj8f26-jpegli-0-unstable-2026-04-30

Creating `dev` moves `nix-support` there, breaking the cycle
and matching the `libjxl` output layout.

Assisted-By: Claude Opus 4.8 in Zoo Code
 2026-06-20 17:58:25 +00:00
R. Ryantm
92613e4eca jpsxdec: 2.0 -> 2.1 2026-05-17 20:30:08 +00:00
R. Ryantm
e01211355f jpegli: 0-unstable-2026-04-13 -> 0-unstable-2026-04-30 2026-05-04 11:19:21 +00:00
R. Ryantm
3fbcd08bd2 jp-zip-codes: 0-unstable-2026-04-01 -> 0-unstable-2026-05-01 2026-05-01 14:57:15 +00:00
Bruno Rodrigues
5a78b0a092 jpmml-evaluator: init at 1.7.7 2026-04-27 11:40:26 +02:00
R. Ryantm
98ac9b1e52 jpegli: 0-unstable-2026-03-20 -> 0-unstable-2026-04-13 2026-04-17 09:32:01 +00:00
R. Ryantm
26fb0173b1 jp-zip-codes: 0-unstable-2026-03-01 -> 0-unstable-2026-04-01 2026-04-06 14:38:37 +00:00
R. Ryantm
919a9d4f10 jpegli: 0-unstable-2025-02-11 -> 0-unstable-2026-03-20 2026-03-23 07:00:53 +00:00
Atemu
ae0c0756cc jpegli: init at 0-unstable-2025-02-11 (#462987) 2026-03-17 14:46:18 +00:00
dish
be77d3fc9d jpsxdec: move icon to spec-compliant location (#498356) 2026-03-12 21:26:26 +00:00
pancaek
da246f2d97 jpsxdec: move icon to spec-compliant location 2026-03-09 14:15:27 -07:00
R. Ryantm
caf86668e8 jp-zip-codes: 0-unstable-2026-02-01 -> 0-unstable-2026-03-01 2026-03-03 17:19:09 +00:00
Fernando Rodrigues
693e12715a various: switch buildGoModule packages to use finalAttrs (#487704) 2026-02-07 09:35:52 +00:00
quantenzitrone
626f23ce26 various: switch 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 files (rg --files-with-matches -F 'stdenv.mkDerivation rec {' $scope | sort -u)

for file in $files
    echo $file
    sd -F 'stdenv.mkDerivation rec {' 'stdenv.mkDerivation (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 '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:59:05 +01: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
Gergő Gutyina
1b9d1caaff various: fix pname misuse in urls (#483962) 2026-02-05 10:12:27 +00:00
quantenzitrone
9c8e96055a various: fix pname misuse in urls 2026-02-05 01:51:59 +01:00
R. Ryantm
6af47fa89c jp-zip-codes: 0-unstable-2025-10-01 -> 0-unstable-2026-02-01 2026-02-01 19:43:57 +00:00
quantenzitrone
6b61249106 various: switch to finalAttrs pattern 
this shouldn't create any rebuilds
 2026-01-30 02:36:22 +01:00
R. Ryantm
77ff12d533 jp2a: 1.3.2 -> 1.3.3 2025-12-17 01:22:58 +00: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
Aleksana
ec7f61e53b jp2a: rename url (#458155) 2025-11-19 12:48:28 +00:00
Jordan Williams
bd03a82749 jpegli: init at 0-unstable-2025-02-11 2025-11-18 21:06:34 +01:00
Michael Daniels
2ef8ce7297 maintainers: drop aristid 
Inactive since 2022.
 2025-11-14 20:03:13 -05:00
Disyer
693e8a7781 jpexs: 22.0.2 -> 24.1.0 2025-11-06 00:00:49 +02:00
areon546
c36b0e74c1 jp2a: rename url 
previous url would redirect users to a variety of websites, seems domain no longer maintained
doesn't make sense to have a link to a broken website, at least the github page directs users to
more active developers

original page that would have been hosted: https://github.com/cslarsen/csl.name/blob/master/source/jp2a/index.html
 2025-11-03 16:36:59 +00:00
R. Ryantm
f11bf3c63e jp-zip-codes: 0-unstable-2025-09-01 -> 0-unstable-2025-10-01 2025-10-04 20:46:13 +00:00
Tomodachi94
a4dd7db0dc treewide(java-users): clean callPackage overrides, by-name some 
**This commit should cause no rebuilds.**

# Moving Java overrides out of all-packages

All usages of this pattern have been moved to
'let ... in' blocks.

Patterns I searched for:
* `jdk =`
* `jdk_headless =`
* `jre =`
* `jfx =`

The `jing` alias has been moved to aliases.nix, so
update the usage of `jing` in `xmloscopy` to
`jing-trang`.

cassandra was ignored because that derivation
involves code generation.

I ignored grails, because jdk is set to null by
default by an override in all-packages.nix. That
package would need a slightly larger refactor to
deal with.

Packages with a *-native variant were ignored because
those would need to be refactored.

jetbrains was ignored because that might be a special case?

I ignored virtualbox, because I did not want
to touch the usages of the pattern for other
dependencies.
 2025-09-25 03:46:35 +00:00
R. Ryantm
d8df9ed3a0 jpegoptim: 1.5.5 -> 1.5.6 2025-09-15 07:23:56 +00:00
nixpkgs-merge-bot[bot]
7cdf9a985d jp-zip-codes: 0-unstable-2025-08-01 -> 0-unstable-2025-09-01 (#439161) 2025-09-01 23:17:46 +00:00
R. Ryantm
95809ba5dd jp-zip-codes: 0-unstable-2025-08-01 -> 0-unstable-2025-09-01 2025-09-01 11:55:20 +00:00
Wolfgang Walther
6027a812f9 maintainers: drop srghma 
GitHub account doesn't exist anymore.
 2025-08-26 12:47:27 +02:00
R. Ryantm
a7d83a48fb jp-zip-codes: 0-unstable-2025-07-01 -> 0-unstable-2025-08-01 2025-08-04 12:09:54 +00:00
R. Ryantm
134a350b54 jp-zip-codes: 0-unstable-2025-06-01 -> 0-unstable-2025-07-01 2025-07-18 13:46:50 +00:00
R. Ryantm
6a6f08765b jp-zip-codes: 0-unstable-2025-05-01 -> 0-unstable-2025-06-01 2025-06-10 19:49:23 +00:00
Peder Bergebakken Sundt
c4f02ff31e treewide: substitute pname for strings 2025-05-29 17:04:28 +02:00
R. Ryantm
91df2cd7d6 jp-zip-codes: 0-unstable-2025-04-01 -> 0-unstable-2025-05-01 2025-05-10 09:12:52 +00:00
emaryn
29b4b7963e jp2a: 1.2.0 -> 1.3.2 
Diff: https://github.com/Talinx/jp2a/compare/v1.2.0...v1.3.2
 2025-05-03 06:34:22 +08:00
R. Ryantm
187836140e jp-zip-codes: 0-unstable-2025-03-01 -> 0-unstable-2025-04-01 2025-04-10 14:04:58 +00:00
Winter
a19cd4ffb1 Revert "treewide: replace rev with tag" 
This reverts commit 65a333600d.

This wasn't tested for correctness with something like fodwatch [0],
and should not have been (self-)merged so quickly, especially without
further review.

It also resulted in the breakage of at least one package [1] (and that's
the one we know of and was caught).

A few packages that were updated in between this commit and this revert
were not reverted back to using `rev`, but other than that, this is a
1:1 revert.

[0]: https://codeberg.org/raphaelr/fodwatch
[1]: https://github.com/NixOS/nixpkgs/pull/396904 / 758551e458
 2025-04-08 02:57:25 -04:00
Pol Dellaiera
65a333600d treewide: replace rev with tag 2025-04-07 16:57:22 +02:00
Sigmanificient
e6fe6f4b7c treewide: remove unused rec expressions 2025-03-13 21:34:05 +01:00
Peder Bergebakken Sundt
357d2530e5 treewide: substitute pname for strings 
Inspired by https://github.com/NixOS/nixpkgs/pull/387725#issuecomment-2704943777, script is based on https://github.com/NixOS/nixpkgs/pull/336172 using what i learned in https://github.com/NixOS/nixpkgs/pull/386865, part of https://github.com/NixOS/nixpkgs/issues/346453

Should be zero rebuilds.

All candidates were made using:

```shell

export NIXPKGS_ALLOW_UNFREE=1
export NIXPKGS_ALLOW_INSECURE=1
export NIXPKGS_ALLOW_BROKEN=1

git-wait restore .

test -s packages.json || ( set -x;
  time nix-env --extra-experimental-features no-url-literals --option system x86_64-linux -f ./. -qaP --json --meta --drv-path --out-path --show-trace --no-allow-import-from-derivation --arg config '{ allowAliases = false; }' > packages.json
)

list_attrpath_fname_col() {
    jq <packages.json 'to_entries[] | select(.value.meta.position==null|not) | "\(.key)\t\(.value.meta.position)"' -r |
        sed -e "s#\t$(realpath .)/#\t#" |
        sed -e 's#:\([0-9]*\)$#\t\1#' |
        grep . |
        grep -iv haskell |
        grep -iv /top-level/ |
        grep -iv chicken |
        grep pkgs/by-name/ |
        grep -iv build |
        grep -E '/(package|default)\.nix'
}

FLOCKDIR="$(mktemp -d)"
N_WORKERS=4
while read attrpath fname col; do
    grep -qE 'repo *= *("\$\{pname\}"|pname);' "$fname" || continue

    echo | (
        # mutex on fname
        flock --nonblock 200 || {
            >&2 echo "failed to aquire lock for $fname"
            exit 1
        }

        echo "$attrpath"
        data="$(nix eval --impure  --expr 'with import ./. {}; { inherit ('"$attrpath"') pname drvPath passthru meta; drvPath2='"$attrpath"'.src.drvPath; }' --json)" || exit
        test -n "$data" || exit
        pname="$(jq <<<"$data" .pname -r)"
        test -n "$pname" || exit

        (set -x
            sd -F '${pname}'  "$pname"         "$fname"
            sd -F ' = pname;' " = \"$pname\";" "$fname"
        )

        data2="$(nix eval --impure  --expr 'with import ./. {}; { inherit ('"$attrpath"') pname drvPath passthru meta; drvPath2='"$attrpath"'.src.drvPath; }' --json)"
        if [[ "$data" = "$data2" ]]; then
            (set -x; git-wait add "$fname")
        else
            (set -x; git-wait restore "$fname")
            exit
        fi

        (set -x
            sd -F ' rec {' ' {' "$fname"
        )

        data3="$(nix eval --impure  --expr 'with import ./. {}; { inherit ('"$attrpath"') pname drvPath passthru meta; drvPath2='"$attrpath"'.src.drvPath; }' --json 2>/dev/nul)"

        if [[ "$data" = "$data3" ]]; then
            (set -x; git-wait add "$fname")
        else
            (set -x; git-wait restore "$fname")
        fi

    ) 200>"$FLOCKDIR"/"$(sha256sum - <<<"$fname" | cut -d' ' -f1)".lock &

    while [[ $(jobs -p | wc -l) -ge $N_WORKERS ]]; do
        wait -n < <(jobs -p) || true
    done

done < <(list_attrpath_fname_col)

wait

git restore .

time nix-env --extra-experimental-features no-url-literals --option system x86_64-linux -f ./. -qaP --json --meta --drv-path --out-path --show-trace --no-allow-import-from-derivation --arg config '{ allowAliases = false; }' > packages2.json
```

`diff packages{,2}.json` is empty, indicating that no package nor src derivation has changed.
I checked and cherry-picked the changes using `GIT_DIFF_OPTS='-u15' git -c interactive.singleKey=true add --patch`
 2025-03-11 23:55:31 +01:00
R. Ryantm
d57ea7fe18 jp-zip-codes: 0-unstable-2025-02-01 -> 0-unstable-2025-03-01 2025-03-08 12:36:49 +00:00
xrtxn
04e134d53d jpexs: 20.1.0 -> 22.0.2 2025-02-24 14:47:05 +01:00
R. Ryantm
58c40e5a5b jp-zip-codes: 0-unstable-2025-01-01 -> 0-unstable-2025-02-01 2025-02-09 06:56:00 +00:00
R. Ryantm
619f8388e1 jp-zip-codes: 0-unstable-2024-12-01 -> 0-unstable-2025-01-01 2025-01-14 17:06:31 +00:00
Peder Bergebakken Sundt
0cd04d3036 treewide: migrate fetchgit rev = "refs/tags/..." to tag 2025-01-04 00:19:17 +01:00