Unverified Commit 4e4cf85c authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into haskell-updates

parents dd9e4575 58c85835

maintainers/maintainer-list.nix

+9 −0
Original line number Diff line number Diff line
@@ -6403,6 +6403,15 @@ 
    githubId = 6074754;

    name = "Hlodver Sigurdsson";

  };

  hmajid2301 = {

    name = "Haseeb Majid";

    email = "hello@haseebmajid.dev";

    github = "hmajid2301";

    githubId = 998807;

    keys = [{

      fingerprint = "A236 785D 59F1 9076 1E9C E8EC 7828 3DB3 D233 E1F9";

    }];

  };

  hmenke = {

    name = "Henri Menke";

    email = "henri@henrimenke.de";

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

+2 −0
Original line number Diff line number Diff line
@@ -194,6 +194,8 @@ In addition to numerous new and upgraded packages, this release has the followin 


- `graylog` has been updated to version 5, which can not be upgraded directly from the previously packaged version 3.3. If you had installed the previously packaged version 3.3, please follow the [upgrade path](https://go2docs.graylog.org/5-0/upgrading_graylog/upgrade_path.htm) from 3.3 to 4.0 to 4.3 to 5.0.



- `buildFHSUserEnv` is now called `buildFHSEnv` and uses FlatPak's Bubblewrap sandboxing tool rather than Nixpkgs' own chrootenv. The old chrootenv-based implemenation is still available via `buildFHSEnvChrootenv` but is considered deprecated and will be removed when the remaining uses inside Nixpkgs have been migrated. If your FHSEnv-wrapped application misbehaves when using the new bubblewrap implementation, please create an issue in Nixpkgs.



- `nushell` has been updated to at least version 0.77.0, which includes potential breaking changes in aliases. The old aliases are now available as `old-alias` but it is recommended you migrate to the new format. See [Reworked aliases](https://www.nushell.sh/blog/2023-03-14-nushell_0_77.html#reworked-aliases-breaking-changes-kubouch).



- `gajim` has been updated to version 1.7.3 which has disabled legacy ciphers. See [changelog for version 1.7.0](https://dev.gajim.org/gajim/gajim/-/releases/1.7.0).

nixos/modules/services/misc/pufferpanel.nix

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ in 
          services.pufferpanel = {

            enable = true;

            extraPackages = with pkgs; [ bash curl gawk gnutar gzip ];

            package = pkgs.buildFHSUserEnv {

            package = pkgs.buildFHSEnv {

              name = "pufferpanel-fhs";

              runScript = lib.getExe pkgs.pufferpanel;

              targetPkgs = pkgs': with pkgs'; [ icu openssl zlib ];
@@ -162,7 +162,7 @@ in 
        PrivateUsers = true;

        PrivateDevices = true;

        RestrictRealtime = true;

        RestrictNamespaces = [ "user" "mnt" ]; # allow buildFHSUserEnv

        RestrictNamespaces = [ "user" "mnt" ]; # allow buildFHSEnv

        RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ];

        LockPersonality = true;

        DeviceAllow = [ "" ];

nixos/modules/services/x11/window-managers/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ in 
    ./bspwm.nix

    ./cwm.nix

    ./clfswm.nix

    ./dk.nix

    ./dwm.nix

    ./e16.nix

    ./evilwm.nix

nixos/modules/services/x11/window-managers/dk.nix

0 → 100644
+27 −0
Original line number Diff line number Diff line 
{ config, lib, pkgs, ... }:



let

  cfg = config.services.xserver.windowManager.dk;

in



{

  options = {

    services.xserver.windowManager.dk = {

      enable = lib.mkEnableOption (lib.mdDoc "dk");



      package = lib.mkPackageOptionMD pkgs "dk" { };

    };

  };



  config = lib.mkIf cfg.enable {

    services.xserver.windowManager.session = lib.singleton {

      name = "dk";

      start = ''

        export _JAVA_AWT_WM_NONREPARENTING=1

        ${cfg.package}/bin/dk &

        waitPID=$!

      '';

    };

    environment.systemPackages = [ cfg.package ];

  };

}