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

Merge master into staging-next

parents 6607a943 fa6f493e

nixos/modules/services/display-managers/greetd.nix

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ in 
    security.pam.services.greetd = {

      allowNullPassword = true;

      startSession = true;

      enableGnomeKeyring = mkDefault config.services.gnome.gnome-keyring.enable;

    };



    # This prevents nixos-rebuild from killing greetd by activating getty again

pkgs/applications/file-managers/clifm/default.nix

+4 −4
Original line number Diff line number Diff line 
{ stdenv, lib, fetchFromGitHub, libcap, acl, file, readline }:

{ stdenv, lib, fetchFromGitHub, libcap, acl, file, readline, python3 }:



stdenv.mkDerivation rec {

  pname = "clifm";

  version = "1.14.6";

  version = "1.15";



  src = fetchFromGitHub {

    owner = "leo-arch";

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-0EOG7BAZL3OPP2/qePNkljAa0/Qb3zwuJWz2P4l8GZc=";

    sha256 = "sha256-4Z2u1APNfJ9Ai95MMWb5FCUgCA2Hrbp+5eBJZD3tN+U=";

  };



  buildInputs = [ libcap acl file readline ];

  buildInputs = [ libcap acl file readline python3];



  makeFlags = [

    "DESTDIR=${placeholder "out"}"

pkgs/applications/misc/gallery-dl/default.nix

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


buildPythonApplication rec {

  pname = "gallery-dl";

  version = "1.26.1";

  version = "1.26.2";

  format = "setuptools";



  src = fetchPypi {

    inherit version;

    pname = "gallery_dl";

    sha256 = "sha256-SJshEdvmPDQZ5mqiQfJpWcQ43WGXUxPvMMJiY/4Cxsc=";

    sha256 = "sha256-Agccsz0TlzCDnhR5Vy7Tt3jrqz9+hwaclQgXJBhGY9w=";

  };



  propagatedBuildInputs = [

pkgs/applications/networking/cluster/nerdctl/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -10,16 +10,16 @@ 


buildGoModule rec {

  pname = "nerdctl";

  version = "1.6.2";

  version = "1.7.0";



  src = fetchFromGitHub {

    owner = "containerd";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-izFDqaJFJrgeb3YPP/7rIf/IjvrtlwjbktNy702zVTU=";

    hash = "sha256-PR3vhNfY84vKQaAMKmPPmY7kK3BRxELAC34NfMYXQPk=";

  };



  vendorHash = "sha256-4I+qCh/A/Yj5kUZLFvXTUV85l/2LVGPUCivTdDlA1ao=";

  vendorHash = "sha256-qLxUAICm/SGy2iHAbg+12xmId+P335dFyjltYlB45iw=";



  nativeBuildInputs = [ makeWrapper installShellFiles ];

pkgs/applications/virtualization/docker-slim/default.nix

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


buildGoModule rec {

  pname = "docker-slim";

  version = "1.40.4";

  version = "1.40.6";



  src = fetchFromGitHub {

    owner = "slimtoolkit";

    repo = "slim";

    rev = version;

    hash = "sha256-A5qMg+mgcvK0YyJLbnFdZRS3s+OFWFaLKmnyvKj4r4g=";

    hash = "sha256-0rn+tqdPVjkIPxOwL9rDnolrpcsDOwOah0Y7924mjD4=";

  };



  vendorHash = null;