Commit Graph

97 Commits

Author SHA1 Message Date
Ethan Carter Edwards
5ee7e3914c bspwm: modernize
Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
2026-07-26 16:48:46 -04:00
Sigmanificient
3a7c15792f bsp-layout: fix version scheme 2026-07-16 02:25:59 +02: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
TomaSajt
7881b2b5bc bs-manager.depotdownloader: 2.7.4-unstable-2024-12-01 -> 3.4.0-unstable-2026-05-14 2026-07-11 02:20:23 +02:00
R. Ryantm
d8a9a3d5cb bsky-cli: 0.0.79 -> 0.0.81 2026-06-14 10:09:59 +00:00
Keenan Weaver
68bd5bab94 bstone: update homepage 2026-05-27 20:30:17 -05:00
Keenan Weaver
c03ff4d052 bstone: modernize 2026-05-27 20:29:47 -05:00
Keenan Weaver
e6241842dc bstone: fix dependencies 2026-05-27 20:24:54 -05:00
R. Ryantm
b8776ecc69 bstone: 1.3.3 -> 1.3.4 2026-05-28 00:12:30 +00:00
Ethan Carter Edwards
880753cad3 bspwm: fix hash, set strictDeps, structuredAttrs
Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
2026-05-16 04:32:28 -04:00
jopejoe1
90c1be3ee6 bsh: set license
source: https://github.com/beanshell/beanshell/blob/master/LICENSE
2026-05-04 11:32:25 +02:00
R. Ryantm
850df84f99 bsky-cli: 0.0.78 -> 0.0.79 2026-04-14 19:08:15 +00:00
R. Ryantm
677a164a20 bsky-cli: 0.0.77 -> 0.0.78 2026-04-07 01:02:31 +00:00
R. Ryantm
3798142145 bstring: 1.0.3 -> 1.1.0 2026-03-29 14:47:37 +00:00
Lisanna Dettwyler
ebde95a148 bsdbuild: use https for sources
Signed-off-by: Lisanna Dettwyler <lisanna.dettwyler@gmail.com>
2026-03-21 12:30:08 -04:00
R. Ryantm
6c8aebec6a bsky-cli: 0.0.76 -> 0.0.77 2026-03-20 03:54:10 +00:00
R. Ryantm
b74acadccf bsky-cli: 0.0.74 -> 0.0.76 2026-03-04 04:11:18 +00:00
Toma
ff8bd2462c bs-manager: 1.5.4 -> 1.5.6 (#488608) 2026-02-09 15:43:11 +00:00
Mistyttm
0f0fc43444 bs-manager: 1.5.4 -> 1.5.6 2026-02-09 22:22:41 +10: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
6ec7b30518 various: rename references from libXv to libxv
this shouldn't create any rebuilds
2026-02-06 00:29:26 +01:00
quantenzitrone
5e4a1bdd9c various: rename references from libXinerama to libxinerama
this shouldn't create any rebuilds
2026-02-06 00:25:42 +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
Jo
026a500d5c various: rename references and deprecate alias (#486994) 2026-02-05 20:31:22 +00:00
quantenzitrone
9c8e96055a various: fix pname misuse in urls 2026-02-05 01:51:59 +01:00
quantenzitrone
a024c30a8a xcbutil: rename references and deprecate alias
this shouldn't create any rebuilds
2026-02-04 22:58:58 +01:00
quantenzitrone
584757f348 xcbutilkeysyms: rename references and deprecate alias
this shouldn't create any rebuilds
2026-02-04 22:58:56 +01:00
quantenzitrone
866aa37ba3 xcbutilwm: rename references and deprecate alias
this shouldn't create any rebuilds
2026-02-04 22:58:46 +01: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
R. Ryantm
a91ec3905b bstone: 1.3.2 -> 1.3.3 2026-01-29 06:36:17 +00:00
7c6f434c
eccb8d4700 bsh: 2.0b5 -> 2.1.1 (#483720) 2026-01-27 18:55:37 +00: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
7c6f434c
cf7c226dfd bsh: 2.0b5 -> 2.1.1
Switch download location, homepage refers to the new one on GitHub
2026-01-25 19:38:20 +01:00
Peder Bergebakken Sundt
aaa90457d3 bstone: 1.2.16 -> 1.3.2 (#475437) 2026-01-24 19:26:49 +00:00
jopejoe1
634b10c1d1 bsh: add pname and version, also move to by-name 2026-01-23 09:42:10 +01:00
TomaSajt
9cecd88a47 bs-manager: pin nodejs to nodejs_22 2026-01-01 23:32:13 +01:00
Keenan Weaver
d0d2e89c6e bstone: 1.2.16 -> 1.3.2 2025-12-30 17:22:55 -06:00
nixpkgs-ci[bot]
cf47a4aa92 Merge staging-next into staging 2025-12-15 18:06:50 +00:00
Eric Helgeson
d882a66ecc bstring: init at 1.0.3 2025-12-15 10:00:38 -06: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
Robert Schütz
6252e8641c Merge branch 'staging-next' into staging 2025-11-29 16:29:41 -08:00
Marcin Serwin
eeb6dc0081 maintainers: drop orivej
Signed-off-by: Marcin Serwin <marcin@serwin.dev>
2025-11-21 17:56:40 +01: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
Sigmanificient
a418816bb7 bsc: 3.3.6 -> 3.3.12 2025-10-11 19:31:05 +02:00
Sigmanificient
ba9e09cc76 bsc: set updateScript 2025-10-11 19:17:40 +02:00
Naïm Camille Favier
af25a98136 bspwm: 0.9.11 -> 0.9.12 2025-10-08 20:31:02 +02:00
Guy Chronister
3b0bede32f various: migrate rev to tag 2025-10-06 20:08:01 -05:00
Wolfgang Walther
c283f32d29 treewide: remove unused with
Auto-fixed by nixf-diagnose.
2025-10-05 10:50:41 +02:00