Commit Graph

114 Commits

Author SHA1 Message Date
R. Ryantm
6cc5988077 kddockwidgets: 2.4.0 -> 2.4.1 2026-07-20 21:25:13 +00:00
Emily
fdb820602b treewide: drop simple x86_64-darwin mentions
To reproduce:

    $ nix run nixpkgs/3b32825de172d0bc85664f495edb096b10862524#ast-grep \
        -- scan --update-all --inline-rules '
          id: nix-x86_64-darwin
          language: nix
          rule:
            any:
              - pattern: "\"x86_64-darwin\""
                kind: list_expression > string_expression
              - pattern:
                  context: "{ \"x86_64-darwin\" = $EXPR; }"
                  selector: binding
              - pattern:
                  context: "{ x86_64-darwin = $EXPR; }"
                  selector: binding
          fix:
            template: ""
        ' pkgs
    $ nix run nixpkgs/3b32825de172d0bc85664f495edb096b10862524#ast-grep \
        -- scan --update-all --inline-rules '
          id: json-first-x86_64-darwin
          language: json
          rule:
            kind: object > pair:nth-child(1)
            has:
              pattern: "\"x86_64-darwin\""
              field: key
          fix:
            template: ""
            expandEnd: { regex: "," }
        ' pkgs
    $ nix run nixpkgs/3b32825de172d0bc85664f495edb096b10862524#ast-grep \
        -- scan --update-all --inline-rules '
          id: json-x86_64-darwin
          language: json
          rule:
            kind: object > pair
            has:
              pattern: "\"x86_64-darwin\""
              field: key
          fix:
            template: ""
            expandStart: { regex: "," }
        ' pkgs
    $ git restore pkgs/by-name/om/omnix/package.nix
    $ git diff --name-only -z \
        | nix shell nixpkgs/3b32825de172d0bc85664f495edb096b10862524#gnused \
            -c xargs -0 sed -i '/^$/N; /^\n\? \+$/d'
    $ treefmt
2026-07-15 03:58:16 +01:00
Kevin Tran
16718513b5 maintainers: rename 1000teslas to sledgehammervampire 2026-07-07 21:53:30 +10:00
nixpkgs-ci[bot]
68424099aa kde-rounded-corners: 0.8.7 -> 0.9.0 (#528996) 2026-06-23 12:27:56 +00:00
R. Ryantm
1e63e85a18 kdiskmark: 3.2.0 -> 3.3.0 2026-06-12 20:12:07 +00:00
Matthias Beyer
62b2e44091 kdash: Remove
Upstream re-tagged their 1.1.2 release:

    https://github.com/kdash-rs/kdash/activity?ref=refs/tags/v1.1.2

which I was notified about in

    https://github.com/NixOS/nixpkgs/pull/530639

After analyzing what upstream did from the old v1.1.2 tag to the new one
- github allowed me to fetch the old commit which apparently is

    ca579f42ff9ae6e1506637f7d5ed69bbcc24ce69

as I found by using the "..." button and then "compare changes" on the
page of the former link: The diff itself does not look fishy to me:

    1d03bb1915...ca137f9513

Still, I see no reason why a project would ever re-tag their stuff!
And this did not happen within a few minutes - so it was not a 'oh shit
I tagged the wrong thing' - which I wouldn't tolerate either btw - it
happened after at least a week!

TL;DR: I lost trust in upstream. Lets remove this.

Co-authored-by: Tom <github@thunze.de>
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
2026-06-11 11:31:29 +02:00
Tom Hunze
d2784e8ba7 kdash: add meta.changelog 2026-06-11 10:24:41 +02:00
Tom Hunze
c517dbed55 kdash: fix source hash
Diff: 1d03bb1915...ca137f9513
2026-06-11 10:24:22 +02:00
R. Ryantm
35fd55e84d kde-rounded-corners: 0.8.7 -> 0.9.0 2026-06-07 01:36:23 +00:00
R. Ryantm
dd5e5a35e8 kdlfmt: 0.1.6 -> 0.1.7 2026-05-26 20:59:54 +00:00
R. Ryantm
0dbb5a470d kdash: 1.1.1 -> 1.1.2 2026-05-17 01:51:40 +00:00
K900
52edaba901 kdesvn: drop 2026-05-08 09:30:31 +03:00
K900
b55208305d treewide: switch to KF6 version of extra-cmake-modules 2026-05-08 09:29:04 +03:00
Michael Daniels
ed52331935 kdash: 1.0.0 -> 1.1.1 (#513250) 2026-04-26 21:49:25 +00:00
Grimmauld
7c9f14e288 kdeltachat: drop 2026-04-26 19:25:48 +02:00
R. Ryantm
40f7fe91bc kdash: 1.0.0 -> 1.1.1 2026-04-25 02:17:43 +00:00
R. Ryantm
0f8fa65370 kdsingleapplication: 1.2.0 -> 1.2.1 2026-04-22 13:43:34 +00:00
Marcin Serwin
794c5d14be maintainers: drop ymarkus
Signed-off-by: Marcin Serwin <marcin@serwin.dev>
2026-04-10 20:19:57 +02:00
R. Ryantm
8c3f3ecded kdash: 0.6.2 -> 1.0.0 2026-04-09 01:33:21 +00:00
R. Ryantm
85da3737ae kdotool: 0.2.2 -> 0.2.3 2026-04-06 22:30:54 +00:00
2kybe3
dbc39efae5 kdotool: 0.2.2-pre -> 0.2.2 2026-03-31 16:34:20 +02:00
Yohann Boniface
d20f37c952 kdesvn: fix minimum cmake version policy (#499315) 2026-03-19 16:14:13 +00:00
Harinn
a318b27cd0 kdesvn: fix minimum cmake version policy 2026-03-19 16:22:38 +01:00
Alexander Nabokikh
b860b69d4d kde-rounded-corners: 0.8.6 -> 0.8.7 2026-03-18 16:20:03 +01:00
Nick Cao
6aa7c759f3 kdiff3: 1.12.3 -> 1.12.4 (#496556) 2026-03-06 17:37:39 +00:00
R. Ryantm
c664cabf67 kdiff3: 1.12.3 -> 1.12.4 2026-03-04 12:44:50 +00:00
R. Ryantm
34e09ba22a kdlfmt: 0.1.5 -> 0.1.6 2026-03-04 03:26:10 +00:00
Stefan Frijters
a30b79e1aa kdeltachat: move env variable(s) into env for structuredAttrs 2026-02-11 10:43:48 +01:00
Michael Daniels
20ed2c3ff1 kdotool: fix build using upstream patch (#485686) 2026-02-07 22:24:19 +00:00
Fernando Rodrigues
693e12715a various: switch buildGoModule packages to use finalAttrs (#487704) 2026-02-07 09:35:52 +00:00
quantenzitrone
d26a1a9e5e various: switch buildRustPackage 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 buildRustPackage

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:53:17 +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
quantenzitrone
55280fa564 various: rename references from libX11 to libx11
this shouldn't create any rebuilds
2026-02-06 00:24:34 +01:00
Kylie McClain
475ed21c86 kdotool: fix build using upstream patches 2026-02-01 23:17:07 -05:00
Fernando Rodrigues
6308c3b213 various: switch to finalAttrs pattern (#483882) 2026-01-30 02:32:49 +00:00
quantenzitrone
6b61249106 various: switch to finalAttrs pattern
this shouldn't create any rebuilds
2026-01-30 02:36:22 +01:00
quantenzitrone
7d8132a92c treewide: remove references to the xorg namespace in pkgs (automated)
this creates some eval errors that will be fixed in the next commit

done with the following script:

```fish
\#!/usr/bin/env fish

set packagesjson (nix eval --impure --json --expr '
let
  lib = import ./lib;
in
import pkgs/servers/x11/xorg/default.nix (lib.mapAttrs (
  name: _:
  if name == "lib" then
    lib
  else if name == "config" then
    { allowAliases = false; }
  else
    name
) (__functionArgs (import pkgs/servers/x11/xorg/default.nix))) { }
' | jq)

set one (grep '^    [A-Za-z0-9_-]*$' pkgs/servers/x11/xorg/default.nix | string trim | string replace -r '$' Z | sort | string sub -e -1)
set two (grep '^  [A-Za-z0-9_-]* = [A-Za-z0-9_-]*;$' pkgs/servers/x11/xorg/default.nix | cut -d= -f1 | string trim | string replace -r '$' Z | sort | string sub -e -1)

for arg in $one $two
    set oname $arg
    set nname (echo $packagesjson | jq -r .$oname)

    if test $nname = null
        echo (set_color red)warn:(set_color normal) unknown package xorg.$oname >&2
        continue
    end

    echo $oname "->" $nname

    # replace basic xorg.$name references
    for file in (rg -F "xorg.$oname" --files-with-matches pkgs)
        # special cases
        sd -F "$oname = xorg.$oname;" "$nname = $nname;" $file

        # replace
        sd -F "xorg.$oname" "$nname" $file

        # fixup function arguments

        # prevent duplicate function args
        if grep -E " ($oname|$nname),\$" $file >/dev/null
            continue
        end

        if grep 'xorg\..' $file >/dev/null # case1: there is more so we can't just remove the function arg

            if grep ' xorg,$' $file >/dev/null
                sd ' xorg,$' " xorg,
                $nname," $file

            else if grep ' xorg ? .*,$' $file >/dev/null
                sd 'xorg( ? .*),$' "xorg\$1,
                $nname," $file

            else
                sd -F 'xorg,' "$nname,
                xorg," $file
            end

        else # case there is no more xorg..* so we can just replace the function arg
            sd 'xorg(| ? .*),.*$' "$nname," $file
        end
    end
end

nix fmt
```
2026-01-25 22:28:09 +01:00
Akihiro Saiki
9a32887b0e kdash: fix build with gcc15 2026-01-07 22:40:53 +09:00
nixpkgs-ci[bot]
98c1d429c8 Merge master into staging-next 2025-12-20 10:00:00 +00:00
Gergő Gutyina
6bcbf61584 kde-rounded-corners: 0.8.5 -> 0.8.6 (#469225) 2025-12-20 09:49:09 +00:00
nixpkgs-ci[bot]
ff78aa9993 Merge master into staging-next 2025-12-20 00:17:48 +00:00
R. Ryantm
db976b481e kdlfmt: 0.1.4 -> 0.1.5 2025-12-18 22:10:57 +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
Alexander Nabokikh
73fabe0b60 kde-rounded-corners: 0.8.5 -> 0.8.6 2025-12-09 09:01:54 +01:00
nixpkgs-ci[bot]
06f61d8b32 Merge staging-next into staging 2025-12-07 00:20:08 +00:00
pancaek
699aef5fea kde-rounded-corners: move to by-name/ 2025-12-05 17:48:18 -08:00
nixpkgs-ci[bot]
d26a1e3656 Merge staging-next into staging 2025-12-02 18:07:17 +00:00
Wolfgang Walther
3f48c44736 maintainers: drop catern
Does not react to maintainer pings; not a member of the
nixpkgs-maintainers team.

Did not respond to
https://github.com/NixOS/nixpkgs/pull/452507#issuecomment-3415956989.
2025-12-02 16:34:16 +01:00
K900
72daea0cc7 Merge remote-tracking branch 'origin/staging-next' into staging 2025-11-28 07:15:07 +03:00