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

Merge master into staging-next

parents e7b611e5 9d0a9dca

maintainers/maintainer-list.nix

+4 −1
Original line number Diff line number Diff line
@@ -917,12 +917,15 @@ 
    name = "Alma Cemerlic";

  };

  Alper-Celik = {

    email = "dev.alpercelik@gmail.com";

    email = "alper@alper-celik.dev";

    name = "Alper Çelik";

    github = "Alper-Celik";

    githubId = 110625473;

    keys = [{

      fingerprint = "6B69 19DD CEE0 FAF3 5C9F  2984 FA90 C0AB 738A B873";

    }

    {

      fingerprint = "DF68 C500 4024 23CC F9C5  E6CA 3D17 C832 4696 FE70";

    }];

  };

  alternateved = {

pkgs/applications/graphics/emblem/Cargo.lock

+333 −845

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/graphics/emblem/default.nix

+2 −5
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


stdenv.mkDerivation rec {

  pname = "emblem";

  version = "1.2.0";

  version = "1.3.0";



  src = fetchFromGitLab {

    domain = "gitlab.gnome.org";
@@ -27,14 +27,11 @@ stdenv.mkDerivation rec { 
    owner = "design";

    repo = "emblem";

    rev = version;

    sha256 = "sha256-sgo6rGwmybouTTBTPFrPJv8Wo9I6dcoT7sUVQGFUqkQ=";

    sha256 = "sha256-VA4KZ8x/MMAA/g/x59h1CyHhlj0vbZqwAFdsfTPA2Ds=";

  };



  cargoDeps = rustPlatform.importCargoLock {

    lockFile = ./Cargo.lock;

    outputHashes = {

      "librsvg-2.56.0" = "sha256-PIrec3nfeMo94bkYUrp6B7lie9O1RtiBdPMFUKKLtTQ=";

    };

  };



  nativeBuildInputs = [

pkgs/applications/misc/authenticator/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -24,20 +24,20 @@ 


stdenv.mkDerivation rec {

  pname = "authenticator";

  version = "4.3.0";

  version = "4.4.0";



  src = fetchFromGitLab {

    domain = "gitlab.gnome.org";

    owner = "World";

    repo = "Authenticator";

    rev = version;

    hash = "sha256-WR5gXGry4wti2M4D/IQvwI7OSak1p+O+XAhr01hdv2Q=";

    hash = "sha256-LNYhUDV5nM46qx29xXE6aCEdBo7VnwT61YgAW0ZXW30=";

  };



  cargoDeps = rustPlatform.fetchCargoTarball {

    inherit src;

    name = "${pname}-${version}";

    hash = "sha256-ZVDKTJojblVCbbdtnqcL+UVW1vkmu99AXCbgyCGNHCM=";

    hash = "sha256-ntkKH4P3Ui2NZSVy87hGAsRA1GDRwoK9UnA/nFjyLnA=";

  };



  nativeBuildInputs = [

pkgs/applications/misc/scli/default.nix

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


python3.pkgs.buildPythonApplication rec {

  pname = "scli";

  version = "0.7.2";

  version = "0.7.3";



  src = fetchFromGitHub {

    owner = "isamert";

    repo = pname;

    rev = "refs/tags/v${version}";

    sha256 = "sha256-7yyORM77oByH1gxx/TNkjJQBsig6ZxsfeI3ijg71oBs=";

    sha256 = "sha256-x5NLYqA/sdQkT/8oG/ija/+4+KjRHa1q0T3mqymAuV8=";

  };



  propagatedBuildInputs = with python3.pkgs; [