Unverified Commit 67a1e656 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-nixos

parents 9f79aec5 47cbf58b

nixos/modules/services/x11/display-managers/account-service-util.nix

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
python3.pkgs.buildPythonApplication {

  name = "set-session";



  format = "other";

  pyproject = false;



  src = ./set-session.py;

pkgs/by-name/ar/archiver/package.nix

deleted100644 → 0
+0 −41
Original line number Diff line number Diff line 
{

  buildGoModule,

  fetchFromGitHub,

  lib,

}:



buildGoModule rec {

  pname = "archiver";

  version = "3.5.1";



  src = fetchFromGitHub {

    owner = "mholt";

    repo = "archiver";

    tag = "v${version}";

    hash = "sha256-l9exOq8QF3WSQ/+WQr0NfPeRQ/R6VQwfT+YS76BBwd8=";

  };



  vendorHash = "sha256-sTzjTKQ9m5BicDk6M1wR1EU+o9+87DbHCyGoF35Jm/g=";



  ldflags = [

    "-s"

    "-w"

    "-X main.version=${version}"

    "-X main.commit=${src.rev}"

    "-X main.date=unknown"

  ];



  doCheck = false;



  meta = {

    description = "Easily create & extract archives, and compress & decompress files of various formats";

    homepage = "https://github.com/mholt/archiver";

    mainProgram = "arc";

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [ kalbasit ];

    knownVulnerabilities = [

      "CVE-2024-0406"

      "Package is unmaintained upstream"

    ];

  };

}

pkgs/by-name/bl/blockbench/package.nix

+18 −8
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
  stdenv,

  buildNpmPackage,

  fetchFromGitHub,

  fetchpatch,

  makeWrapper,

  imagemagick,

  copyDesktopItems,
@@ -12,13 +13,13 @@ 


buildNpmPackage rec {

  pname = "blockbench";

  version = "5.0.6";

  version = "5.0.7";



  src = fetchFromGitHub {

    owner = "JannisX11";

    repo = "blockbench";

    tag = "v${version}";

    hash = "sha256-AQAyxNVt8PCDCU/jViYY3IlPdNiesgx5kT9W7yrNJ4I=";

    hash = "sha256-JXOO2+UPMOGSuvez8ektbD5waPKatMggKn+MuH9Qkrs=";

  };



  nativeBuildInputs = [
@@ -29,14 +30,22 @@ buildNpmPackage rec { 
    copyDesktopItems

  ];



  npmDepsHash = "sha256-OSrX/H1m89GLIznP8/Q1pVDgrlfp55ZUnYjyQIwlJi4=";

  patches = [

    (fetchpatch {

      # fixes https://github.com/JannisX11/blockbench/issues/3237

      name = "bump-electron-builder.patch";

      url = "https://github.com/JannisX11/blockbench/commit/dee9ae271f252d4bb3f98c13c4a1abaaeedd1feb.patch";

      hash = "sha256-XpdqeCKoWsUieOMWhxVsEQ2r0qR+iiXKnVRfNYERDQs=";

    })

  ];



  npmDepsHash = "sha256-T3yenZCkOrGOWJBxqe0RG39jWYfpsXStblf5Jx4dtF0=";

  makeCacheWritable = true;



  env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;



  # disable code signing on Darwin

  # disable notarization logic

  postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''

    export CSC_IDENTITY_AUTO_DISCOVERY=false

    sed -i "/afterSign/d" package.json

  '';
@@ -50,7 +59,8 @@ buildNpmPackage rec { 
    npm exec electron-builder -- \

      --dir \

      -c.electronDist=electron-dist \

        -c.electronVersion=${electron.version}

      -c.electronVersion=${electron.version} \

      -c.mac.identity=null

  '';



  installPhase = ''

pkgs/by-name/ci/cinnamon/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -74,13 +74,13 @@ let 
in

stdenv.mkDerivation rec {

  pname = "cinnamon";

  version = "6.6.4";

  version = "6.6.5";



  src = fetchFromGitHub {

    owner = "linuxmint";

    repo = "cinnamon";

    tag = version;

    hash = "sha256-K1Saz0WY5Qwb7YF8fcH0yWNK071dFwzxuPZP2MuSvrs=";

    hash = "sha256-i+eUSEz6Zgfm8HISSuxQ04lz86Rrp99NWaWAplJCLCs=";

  };



  patches = [

pkgs/by-name/mi/mint-l-theme/package.nix

+5 −6
Original line number Diff line number Diff line
@@ -6,16 +6,15 @@ 
  python3Packages,

}:



stdenvNoCC.mkDerivation {

stdenvNoCC.mkDerivation (finalAttrs: {

  pname = "mint-l-theme";

  version = "2.0.5";

  version = "2.0.6";



  src = fetchFromGitHub {

    owner = "linuxmint";

    repo = "mint-l-theme";

    # They don't really do tags, this is just a named commit.

    rev = "112daa4f76ccef08a9c4e3b107957ff862429516";

    hash = "sha256-Y6rPrEG+Gh2V+TbLDTqVgPSYQMBXWKacYrS1FMzmQVo=";

    tag = finalAttrs.version;

    hash = "sha256-Lss8P0L6gxbP88MiTfv3VfOFkvkEUDXIPBoFHPxLWqE=";

  };



  nativeBuildInputs = [
@@ -43,4 +42,4 @@ stdenvNoCC.mkDerivation { 
    platforms = lib.platforms.linux;

    teams = [ lib.teams.cinnamon ];

  };

}
 
})