Commit 79542ad7 authored by K900's avatar K900
Browse files

Merge remote-tracking branch 'origin/master' into staging-next

parents 43f93315 f3cfb1c5

.github/workflows/eval.yml

+3 −0
Original line number Diff line number Diff line
@@ -75,6 +75,9 @@ jobs: 
        with:

          extra_nix_config: sandbox = true



      - name: Ensure flake outputs on all systems still evaluate

        run: nix --experimental-features 'nix-command flakes' flake check --all-systems --no-build ./nixpkgs



      - name: Query nixpkgs with aliases enabled to check for basic syntax errors

        run: |

          time nix-env -I ./nixpkgs -f ./nixpkgs -qa '*' --option restrict-eval true --option allow-import-from-derivation false >/dev/null

flake.nix

+25 −6
Original line number Diff line number Diff line
@@ -98,6 +98,13 @@ 


      checks = forAllSystems (

        system:

        { }

        //

          lib.optionalAttrs

            (

              # Exclude x86_64-freebsd because "Failed to evaluate rustc-wrapper-1.85.0: «broken»: is marked as broken"

              system != "x86_64-freebsd"

            )

            {

              tarball = jobs.${system}.tarball;

            }
@@ -107,6 +114,10 @@ 
              self.legacyPackages.${system}.stdenv.hostPlatform.isLinux

              # Exclude power64 due to "libressl is not available on the requested hostPlatform" with hostPlatform being power64

              && !self.legacyPackages.${system}.targetPlatform.isPower64

              # Exclude armv6l-linux because "cannot bootstrap GHC on this platform ('armv6l-linux' with libc 'defaultLibc')"

              && system != "armv6l-linux"

              # Exclude riscv64-linux because "cannot bootstrap GHC on this platform ('riscv64-linux' with libc 'defaultLibc')"

              && system != "riscv64-linux"

            )

            {

              # Test that ensures that the nixosSystem function can accept a lib argument
@@ -156,8 +167,8 @@ 
              system != "armv6l-linux"

              # Exclude riscv64-linux because "Package ‘ghc-9.6.6’ in .../pkgs/development/compilers/ghc/common-hadrian.nix:579 is not available on the requested hostPlatform"

              && system != "riscv64-linux"

              # Exclude FreeBSD because "Package ‘ghc-9.6.6’ in .../pkgs/development/compilers/ghc/common-hadrian.nix:579 is not available on the requested hostPlatform"

              && !self.legacyPackages.${system}.stdenv.hostPlatform.isFreeBSD

              # Exclude x86_64-freebsd because "Package ‘ghc-9.6.6’ in .../pkgs/development/compilers/ghc/common-hadrian.nix:579 is not available on the requested hostPlatform"

              && system != "x86_64-freebsd"

            )

            {

              /**
@@ -167,7 +178,15 @@ 
            }

      );



      formatter = forAllSystems (system: (import ./ci { inherit system; }).fmt.pkg);

      formatter = lib.filterAttrs (

        system: _:

        # Exclude armv6l-linux because "cannot bootstrap GHC on this platform ('armv6l-linux' with libc 'defaultLibc')"

        system != "armv6l-linux"

        # Exclude riscv64-linux because "cannot bootstrap GHC on this platform ('riscv64-linux' with libc 'defaultLibc')"

        && system != "riscv64-linux"

        # Exclude x86_64-freebsd because "Package ‘go-1.22.12-freebsd-amd64-bootstrap’ in /nix/store/0yw40qnrar3lvc5hax5n49abl57apjbn-source/pkgs/development/compilers/go/binary.nix:50 is not available on the requested hostPlatform"

        && system != "x86_64-freebsd"

      ) (forAllSystems (system: (import ./ci { inherit system; }).fmt.pkg));



      /**

        A nested structure of [packages](https://nix.dev/manual/nix/latest/glossary#package-attribute-set) and other values.

nixos/doc/manual/release-notes/rl-2505.section.md

+2 −0
Original line number Diff line number Diff line
@@ -166,6 +166,8 @@ 


- [mqtt-exporter](https://github.com/kpetremann/mqtt-exporter/), a Prometheus exporter for exposing messages from MQTT. Available as [services.prometheus.exporters.mqtt](#opt-services.prometheus.exporters.mqtt.enable).



- [pocket-id](https://pocket-id.org/), an OIDC provider with passkeys support. Available as [services.pocket-id](#opt-services.pocket-id.enable).



- [nvidia-gpu](https://github.com/utkuozdemir/nvidia_gpu_exporter), a Prometheus exporter that scrapes `nvidia-smi` for GPU metrics. Available as [services.prometheus.exporters.nvidia-gpu](#opt-services.prometheus.exporters.nvidia-gpu.enable).



- [OpenGamepadUI](https://github.com/ShadowBlip/OpenGamepadUI/), an open source gamepad-native game launcher and overlay for Linux. Available as [programs.opengamepadui](#opt-programs.opengamepadui.enable).

nixos/modules/module-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -1419,6 +1419,7 @@ 
  ./services/security/paretosecurity.nix

  ./services/security/pass-secret-service.nix

  ./services/security/physlock.nix

  ./services/security/pocket-id.nix

  ./services/security/shibboleth-sp.nix

  ./services/security/sks.nix

  ./services/security/sshguard.nix

nixos/modules/services/misc/paperless.nix

+11 −9
Original line number Diff line number Diff line
@@ -421,8 +421,7 @@ in 
          };

          environment = env;



          preStart =

            ''

          preStart = ''

              # remove old papaerless-manage symlink

              # TODO: drop with NixOS 25.11

              [[ -L '${cfg.dataDir}/paperless-manage' ]] && rm '${cfg.dataDir}/paperless-manage'
@@ -450,11 +449,13 @@ in 


              echo ${cfg.package.version} > "$versionFile"

            fi

            ''

            + lib.optionalString (cfg.passwordFile != null) ''



            if ${lib.boolToString (cfg.passwordFile != null)} || [[ -n $PAPERLESS_ADMIN_PASSWORD ]]; then

              export PAPERLESS_ADMIN_USER="''${PAPERLESS_ADMIN_USER:-admin}"

              if [[ -e $CREDENTIALS_DIRECTORY/PAPERLESS_ADMIN_PASSWORD ]]; then

                PAPERLESS_ADMIN_PASSWORD=$(cat "$CREDENTIALS_DIRECTORY/PAPERLESS_ADMIN_PASSWORD")

                export PAPERLESS_ADMIN_PASSWORD

              fi

              superuserState="$PAPERLESS_ADMIN_USER:$PAPERLESS_ADMIN_PASSWORD"

              superuserStateFile="${cfg.dataDir}/superuser-state"
@@ -462,6 +463,7 @@ in 
                ${cfg.package}/bin/paperless-ngx manage_superuser

                echo "$superuserState" > "$superuserStateFile"

              fi

            fi

          '';

          requires = lib.optional cfg.database.createLocally "postgresql.service";

          after =