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

Merge master into staging-next

parents 80625759 4a19e9f7

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 = [ "" ];

pkgs/applications/misc/hugo/default.nix

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


buildGoModule rec {

  pname = "hugo";

  version = "0.112.4";

  version = "0.112.5";



  src = fetchFromGitHub {

    owner = "gohugoio";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-Iug0Kk7D4Vr5oiq+A3H3ORPiIq+m9R8sj1r4Wp3JlmE=";

    hash = "sha256-phtiYh5+xSc4eeK2hM6bHFg4/Owm1EkInRE+NhuQAUA=";

  };



  vendorHash = "sha256-A4mWrTSkE1NcLj8ozGXQJIrFMvqeoBC7y7eOTeh3ktw=";

pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix

+1 −1
Original line number Diff line number Diff line 
{ lib, stdenv, darwin, fetchFromGitHub, openssl, sqlite }:



(if stdenv.isDarwin then darwin.apple_sdk_11_0.clang14Stdenv else stdenv).mkDerivation rec {

(if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec {

  pname = "signalbackup-tools";

  version = "20230523";

pkgs/development/lisp-modules/packages.nix

+18 −2
Original line number Diff line number Diff line
@@ -322,13 +322,27 @@ let 
    };

    buildScript = pkgs.writeText "build-stumpwm.lisp" ''

      (load "${super.stumpwm.asdfFasl}/asdf.${super.stumpwm.faslExt}")

      (asdf:load-system 'stumpwm/build)



      (asdf:load-system 'stumpwm)



      ;; Prevents package conflict error

      (when (uiop:version<= "3.1.5" (asdf:asdf-version))

        (uiop:symbol-call '#:asdf '#:register-immutable-system :stumpwm)

        (dolist (system-name (uiop:symbol-call '#:asdf

                                               '#:system-depends-on

                                               (asdf:find-system :stumpwm)))

          (uiop:symbol-call '#:asdf '#:register-immutable-system system-name)))



      ;; Prevents "cannot create /homeless-shelter" error

      (asdf:disable-output-translations)



      (sb-ext:save-lisp-and-die

        "stumpwm"

        :executable t

        :purify t

        #+sb-core-compression :compression

        #+sb-core-compression t

        :toplevel #'stumpwm:main)

        :toplevel #'stumpwm:stumpwm)

    '';

    installPhase = ''

      mkdir -p $out/bin
@@ -336,6 +350,8 @@ let 
    '';

  });



  stumpwm-unwrapped = super.stumpwm;



  ltk = super.ltk.overrideLispAttrs (o: {

    src = pkgs.fetchzip {

      url = "https://github.com/uthar/ltk/archive/f19162e76d6c7c2f51bd289b811d9ba20dd6555e.tar.gz";

pkgs/development/ocaml-modules/gapi-ocaml/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


buildDunePackage rec {

  pname = "gapi-ocaml";

  version = "0.4.3";

  version = "0.4.4";

  duneVersion = "3";



  minimalOCamlVersion = "4.08";
@@ -14,7 +14,7 @@ buildDunePackage rec { 
    owner = "astrada";

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-V0GB9Bd06IdcI5PDFHGVZ0Y/qi7tTs/4ITqPXUOxCLs=";

    hash = "sha256-+UNFW5tmIh5dVyTDEOfOmy1j+gV4P28jlnBTdpQNAjE=";

  };



  propagatedBuildInputs = [ cryptokit ocamlnet ocurl yojson ];
@@ -24,7 +24,7 @@ buildDunePackage rec { 


  meta = {

    description = "OCaml client for google services";

    inherit (src.meta) homepage;

    homepage = "https://github.com/astrada/gapi-ocaml";

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [ bennofs ];

  };