Unverified Commit 3cbf4fdc authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #293214 from SamLukeYes/pacman 

pacman: 6.0.2 -> 6.1.0
parents f8e35110 8195cd82

pkgs/tools/package-management/pacman/default.nix

+16 −17
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchpatch

, fetchurl

, fetchFromGitLab

, asciidoc

, binutils

, coreutils
@@ -39,19 +38,23 @@ 
, sysHookDir ? "/usr/share/libalpm/hooks/"

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (final: {

  pname = "pacman";

  version = "6.0.2";

  version = "6.1.0";



  src = fetchurl {

    url = "https://sources.archlinux.org/other/${pname}/${pname}-${version}.tar.xz";

    hash = "sha256-fY4+jFEhrsCWXfcfWb7fRgUsbPFPljZcRBHsPeCkwaU=";

  src = fetchFromGitLab {

    domain = "gitlab.archlinux.org";

    owner = "pacman";

    repo = "pacman";

    rev = "v${final.version}";

    hash = "sha256-uHBq1A//YSqFATlyqjC5ZgmvPkNKqp7sVew+nbmLH78=";

  };



  strictDeps = true;



  nativeBuildInputs = [

    asciidoc

    gettext

    installShellFiles

    libarchive

    makeWrapper
@@ -71,11 +74,6 @@ stdenv.mkDerivation rec { 


  patches = [

    ./dont-create-empty-dirs.patch

    # Add keyringdir meson option to configure the keyring directory

    (fetchpatch {

      url = "https://gitlab.archlinux.org/pacman/pacman/-/commit/79bd512181af12ec80fd8f79486fc9508fa4a1b3.patch";

      hash = "sha256-ivTPwWe06Q5shn++R6EY0x3GC0P4X0SuC+F5sndfAtM=";

    })

  ];



  postPatch = let compressionTools = [
@@ -93,16 +91,16 @@ stdenv.mkDerivation rec { 
    substituteInPlace meson.build \

      --replace "install_dir : SYSCONFDIR" "install_dir : '$out/etc'" \

      --replace "join_paths(DATAROOTDIR, 'libalpm/hooks/')" "'${sysHookDir}'" \

      --replace "join_paths(PREFIX, DATAROOTDIR, get_option('keyringdir'))" "'\$KEYRING_IMPORT_DIR'"

      --replace "join_paths(PREFIX, DATAROOTDIR, get_option('keyringdir'))" "'\$KEYRING_IMPORT_DIR'" \

      --replace "join_paths(SYSCONFDIR, 'makepkg.conf.d/')" "'$out/etc/makepkg.conf.d/'"

    substituteInPlace doc/meson.build \

      --replace "/bin/true" "${coreutils}/bin/true"

    substituteInPlace scripts/repo-add.sh.in \

      --replace bsdtar "${libarchive}/bin/bsdtar"

    substituteInPlace scripts/pacman-key.sh.in \

      --replace "local KEYRING_IMPORT_DIR='@keyringdir@'" "" \

      --subst-var-by keyringdir '\$KEYRING_IMPORT_DIR' \

      --replace "--batch --check-trustdb" "--batch --check-trustdb --allow-weak-key-signatures"

  ''; # the line above should be removed once Arch migrates to gnupg 2.3.x

      --subst-var-by keyringdir '\$KEYRING_IMPORT_DIR'

  '';



  mesonFlags = [

    "--sysconfdir=/etc"
@@ -132,6 +130,7 @@ stdenv.mkDerivation rec { 
    changelog = "https://gitlab.archlinux.org/pacman/pacman/-/raw/v${version}/NEWS";

    license = licenses.gpl2Plus;

    platforms = platforms.linux;

    mainProgram = "pacman";

    maintainers = with maintainers; [ samlukeyes123 ];

  };

}
 
})