Commit 232a372e authored by sternenseemann's avatar sternenseemann
Browse files

Merge remote-tracking branch 'origin/master' into haskell-updates

parents 703e7bd4 3a4013b3

.github/labeler.yml

+4 −0
Original line number Diff line number Diff line
@@ -188,6 +188,10 @@ 
  - nixos/tests/xfce.nix

  - pkgs/desktops/xfce/**/*



"6.topic: zig":

  - pkgs/development/compilers/zig/**/*

  - doc/hooks/zig.section.md



"8.has: changelog":

  - nixos/doc/manual/release-notes/**/*

nixos/modules/programs/environment.nix

+0 −7
Original line number Diff line number Diff line
@@ -51,13 +51,6 @@ in 


    environment.extraInit =

      ''

         unset ASPELL_CONF

         for i in ${concatStringsSep " " (reverseList cfg.profiles)} ; do

           if [ -d "$i/lib/aspell" ]; then

             export ASPELL_CONF="dict-dir $i/lib/aspell"

           fi

         done



         export NIX_USER_PROFILE_DIR="/nix/var/nix/profiles/per-user/$USER"

         export NIX_PROFILES="${concatStringsSep " " (reverseList cfg.profiles)}"

      '';

nixos/modules/services/security/oauth2_proxy.nix

+1 −1
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ in 
      description = "OAuth2 Proxy";

      path = [ cfg.package ];

      wantedBy = [ "multi-user.target" ];

      after = [ "network.target" ];

      after = [ "network-online.target" ];



      serviceConfig = {

        User = "oauth2_proxy";

pkgs/applications/blockchains/dcrd/default.nix

+15 −1
Original line number Diff line number Diff line 
{ lib, buildGoModule, fetchFromGitHub }:

{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:



buildGoModule rec {

  pname = "dcrd";
@@ -11,10 +11,24 @@ buildGoModule rec { 
    hash = "sha256-ZNBSIzx07zJrBxas7bHpZ8ZPDWJ4d7jumpKYj5Qmzlo=";

  };



  patches = [

    (fetchpatch {

      name = "dcrd-appdata-env-variable.patch";

      url = "https://github.com/decred/dcrd/pull/3152/commits/216132d7d852f3f2e2a6bf7f739f47ed62ac9387.patch";

      hash = "sha256-R1GzP0qVP5XW1GnSJqFOpJVnwrVi/62tL1L2mc33+Dw=";

    })

  ];



  vendorHash = "sha256-++IPB2IadXd1LC5r6f1a0UqsTG/McAf7KQAw8WKKoaE=";



  subPackages = [ "." "cmd/promptsecret" ];



  __darwinAllowLocalNetworking = true;



  preCheck = ''

    export DCRD_APPDATA="$TMPDIR"

  '';



  meta = {

    homepage = "https://decred.org";

    description = "Decred daemon in Go (golang)";

pkgs/applications/display-managers/greetd/regreet.nix

+4 −2
Original line number Diff line number Diff line
@@ -2,9 +2,11 @@ 
, rustPlatform

, fetchFromGitHub

, pkg-config

, wrapGAppsHook

, glib

, gtk4

, pango

, librsvg

}:



rustPlatform.buildRustPackage rec {
@@ -22,8 +24,8 @@ rustPlatform.buildRustPackage rec { 


  buildFeatures = [ "gtk4_8" ];



  nativeBuildInputs = [ pkg-config ];

  buildInputs = [ glib gtk4 pango ];

  nativeBuildInputs = [ pkg-config wrapGAppsHook];

  buildInputs = [ glib gtk4 pango librsvg ];



  meta = with lib; {

    description = "Clean and customizable greeter for greetd";