dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

pacman: 6.0.2 -> 6.1.0

Browse Source
This commit is contained in:
SamLukeYes 2024-03-06 00:39:26 +08:00
parent 1536926ef5
commit 8195cd8227
No known key found for this signature in database
GPG Key ID: 5574FF7A0C9AC292
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkgs/tools/package-management/pacman/default.nix
View File

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, fetchpatch , fetchFromGitLab
, fetchurl
, asciidoc , asciidoc
, binutils , binutils
, coreutils , coreutils
@ -39,19 +38,23 @@
, sysHookDir ? "/usr/share/libalpm/hooks/" , sysHookDir ? "/usr/share/libalpm/hooks/"
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (final: {
pname = "pacman"; pname = "pacman";
version = "6.0.2"; version = "6.1.0";
src = fetchurl { src = fetchFromGitLab {
url = "https://sources.archlinux.org/other/${pname}/${pname}-${version}.tar.xz"; domain = "gitlab.archlinux.org";
hash = "sha256-fY4+jFEhrsCWXfcfWb7fRgUsbPFPljZcRBHsPeCkwaU="; owner = "pacman";
repo = "pacman";
rev = "v${final.version}";
hash = "sha256-uHBq1A//YSqFATlyqjC5ZgmvPkNKqp7sVew+nbmLH78=";
}; };
strictDeps = true; strictDeps = true;
nativeBuildInputs = [ nativeBuildInputs = [
asciidoc asciidoc
gettext
installShellFiles installShellFiles
libarchive libarchive
makeWrapper makeWrapper
@ -71,11 +74,6 @@ stdenv.mkDerivation rec {
patches = [ patches = [
./dont-create-empty-dirs.patch ./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 = [ postPatch = let compressionTools = [
@ -93,16 +91,16 @@ stdenv.mkDerivation rec {
substituteInPlace meson.build \ substituteInPlace meson.build \
--replace "install_dir : SYSCONFDIR" "install_dir : '$out/etc'" \ --replace "install_dir : SYSCONFDIR" "install_dir : '$out/etc'" \
--replace "join_paths(DATAROOTDIR, 'libalpm/hooks/')" "'${sysHookDir}'" \ --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 \ substituteInPlace doc/meson.build \
--replace "/bin/true" "${coreutils}/bin/true" --replace "/bin/true" "${coreutils}/bin/true"
substituteInPlace scripts/repo-add.sh.in \ substituteInPlace scripts/repo-add.sh.in \
--replace bsdtar "${libarchive}/bin/bsdtar" --replace bsdtar "${libarchive}/bin/bsdtar"
substituteInPlace scripts/pacman-key.sh.in \ substituteInPlace scripts/pacman-key.sh.in \
--replace "local KEYRING_IMPORT_DIR='@keyringdir@'" "" \ --replace "local KEYRING_IMPORT_DIR='@keyringdir@'" "" \
--subst-var-by keyringdir '\$KEYRING_IMPORT_DIR' \ --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
mesonFlags = [ mesonFlags = [
"--sysconfdir=/etc" "--sysconfdir=/etc"
@ -132,6 +130,7 @@ stdenv.mkDerivation rec {
changelog = "https://gitlab.archlinux.org/pacman/pacman/-/raw/v${version}/NEWS"; changelog = "https://gitlab.archlinux.org/pacman/pacman/-/raw/v${version}/NEWS";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
platforms = platforms.linux; platforms = platforms.linux;
mainProgram = "pacman";
maintainers = with maintainers; [ samlukeyes123 ]; maintainers = with maintainers; [ samlukeyes123 ];
}; };
} })