Commit 2250d4bb authored by K900's avatar K900
Browse files

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

parents 85087a1a e33f85a9

nixos/modules/services/web-apps/drupal.nix

+4 −2
Original line number Diff line number Diff line
@@ -168,8 +168,10 @@ let 
          cp "$default_settings_file" "$settings_file"

        fi



        if ! grep -qF "require dirname(__FILE__) . '/settings.nixos-${hostName}.php';" ${cfg.stateDir}/sites/default/settings.php; then

          echo "Appending NixOS generated settings..."

          cat < ${appendSettings hostName} >> "$settings_file"

        chmod 644 "$settings_file"

        fi



        # Link the NixOS-managed settings file to the state directory.

        ln -sf ${drupalSettings hostName cfg} ${cfg.stateDir}/sites/default/settings.nixos-${hostName}.php

pkgs/by-name/fl/flatpak/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "flatpak";

  version = "1.16.3";

  version = "1.16.4";



  # TODO: split out lib once we figure out what to do with triggerdir

  outputs = [
@@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { 


  src = fetchurl {

    url = "https://github.com/flatpak/flatpak/releases/download/${finalAttrs.version}/flatpak-${finalAttrs.version}.tar.xz";

    hash = "sha256-PWvT9fiUDoDAhyhso+QhgvxjDXgIlFNlEfzSz/wSz1s=";

    hash = "sha256-dh/zugDJmib5FMaZnpCxKlTKsZzqWIhBPxfkbuYY2P4=";

  };



  patches = [

pkgs/by-name/ge/gephgui-wry/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -52,13 +52,13 @@ let 
in

rustPlatform.buildRustPackage (finalAttrs: {

  pname = "gephgui-wry";

  version = "5.4.1";

  version = "5.5.0";



  src = fetchFromGitHub {

    owner = "geph-official";

    repo = "gephgui-pkg";

    tag = "v${finalAttrs.version}";

    hash = "sha256-nlWFiEFraI4sUBTs/ZxiHpaeYHert78oPiyFc6LKV30=";

    hash = "sha256-NxtE26GPG2EvgtMa6eEOZmOcqu4yYr3zioF1CmrxLRk=";

    fetchSubmodules = true;

  };
@@ -83,7 +83,7 @@ rustPlatform.buildRustPackage (finalAttrs: { 
  };



  sourceRoot = "${finalAttrs.src.name}/gephgui-wry";

  cargoHash = "sha256-7EJvcnltKlq94jahnMpvzdFJ8P12HjUGC6AOXirpcg4=";

  cargoHash = "sha256-Dh1WuxU1rRDNu2cF9GCo1CIiph1sLc5j0GSPb7b7kJA=";



  nativeBuildInputs = [

    pkg-config

pkgs/by-name/pa/parallel/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -12,11 +12,11 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "parallel";

  version = "20260122";

  version = "20260322";



  src = fetchurl {

    url = "mirror://gnu/parallel/parallel-${finalAttrs.version}.tar.bz2";

    hash = "sha256-gx944B8/KKwkQeZrEBcVYscaAwA1OJOqBbvCd/E8xZY=";

    hash = "sha256-dkaA6TL00NIc8DKb2fnu1lmJXeFoNgAfZJFTO4Ir7+A=";

  };



  outputs = [

pkgs/by-name/ux/uxplay/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -15,13 +15,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "uxplay";

  version = "1.73.5";

  version = "1.73.6";



  src = fetchFromGitHub {

    owner = "FDH2";

    repo = "UxPlay";

    rev = "v${finalAttrs.version}";

    hash = "sha256-c/2WRQcNCFdCd9NZuNpbz8iPWXC9FDdMmtoLr6+rQAI=";

    hash = "sha256-NQqrrTQiWcOhWFrdqniK6FnmOSIVGS4/cRDg5gd3bOE=";

  };



  postPatch = ''