Caleb Maclennan pushed to branch main at Arch Linux / Packaging / Packages / nix
Commits:
88717b74 by Caleb Maclennan at 2024-03-05T16:26:02+03:00
upgpkg: 2.20.4-3: Replace build flags hack with backported patch, closes #1
- - - - -
2 changed files:
- .SRCINFO
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = nix
pkgdesc = A purely functional package manager
pkgver = 2.20.4
- pkgrel = 2
+ pkgrel = 3
url = https://nixos.org/nix
arch = x86_64
license = LGPL
@@ -37,18 +37,21 @@ pkgbase = nix
source = tmpfiles.conf
source = user.tmpfiles.conf
source =
https://github.com/NixOS/nix/commit/ec5cc1026db61d4c43c89ffdd8a71ed62cfb842d.patch
+ source =
https://github.com/NixOS/nix/pull/10154/commits/651e62781fd8987c09a965829546a52937bd3461.patch
sha512sums = SKIP
sha512sums =
46fdd1134626da81f0ec3ada47b69bb803277e8dd379052db5d8606475f5ff7ece63c8ae41b5f8ba6d2174465e1e977212c648a11c853b199e11b2014789a661
sha512sums =
6511badd6e4c71d9b7f6e6a87ea521a9727a5569ecf48dca11ee0d04151adf083453dcf7e05eadd5c28278fd8aee9fe44bbb90067f5fc8067c99c5e9665affd9
sha512sums =
879bc28faf877a560ac67500388d9774ec890391ef08d367a18f98ef17faeef8c7d208e747fed1fd501b07c3a3b2286af436eb1bd137de2d8ea9a9c32b48088a
sha512sums =
da5b6d449f8e69c9211e6bd97b1ce4c6e398da5a34fea9a8a89a28084489a1549188e52f66ce7536903afeb75e690e764188daac20a16227b66cc14a72b7311a
sha512sums =
cf0e328e42741fce867e94d3a9f1bd81320da50ea387eb1629ec0a1a1d0eb35163c57d72a9704c5f68903831be6f2b823f072a29f887d31bd59a3a0491ff3a38
+ sha512sums =
249362aba8e444e9218692ecd9467c6c65c67a543bf56b788cad60f73dcefe701bfb48f314768bafbc40325a0f2f85e31c6ad75fe85d4b18a4a6eda8e923f157
b2sums = SKIP
b2sums =
e79ceeb12faf7c38a167857ded355a74511c1d98e7fcb1efb589072c16b35f017239e6723bad04e13ed5b16cbebc91923363e36c130bf51d06a66a4d4ef54f6b
b2sums =
e92b8192bae89f0bc8c62371fbe63b4bfd68352699e5ea6900bf4313fd573322a06cb85074b292a005cbf644a50abbb67694f9458f071b0fd223d220494f6b6c
b2sums =
bffaabbe8c9efee79c7761e72a189796f35c0a40805b53fe954c10590ab9bfd0a321b45c7050ddf30810e36fa4431768f36f19fdc55085c0396ac5338b88f839
b2sums =
57610fc5fa370f9c3df50ab411dfe154b273349b3b321ad01768cacdf371e27603e8446a4e4269ccf4ca6cdb59b4a70fdcac59cda29c47eb7e7224555ec7e2e2
b2sums =
7114f9c78bcc0fd40c245897886439ecbf2f16269e364c788fa323493de47863cdb9c19bece2911be573af433e579f8f1076ca70b7c2df333185f39577882ba8
+ b2sums =
81b2730c1d81c4396f53908f0fc0c5eb77f133f7305ea097a95857e137f36b72a7ae7adc64f92e1ddc072eaeda81bed7cea3ad3f452739e05324afa84113c8e5
pkgname = nix
install = nix.install
=====================================
PKGBUILD
=====================================
@@ -11,7 +11,7 @@ pkgbase=nix
pkgname=('nix' 'nix-docs')
pkgver=2.20.4
_commit='d61e687f7285a2a3c9efa2e8bb132e01e5c8913d'
-pkgrel=2
+pkgrel=3
pkgdesc='A purely functional package manager'
arch=('x86_64')
url='https://nixos.org/nix'
@@ -50,19 +50,22 @@ source=(
'tmpfiles.conf'
'user.tmpfiles.conf'
'https://github.com/NixOS/nix/commit/ec5cc1026db61d4c43c89ffdd8a71ed62cfb842d.patch'
+
'https://github.com/NixOS/nix/pull/10154/commits/651e62781fd8987c09a965829546a52937bd3461.patch'
)
sha512sums=('SKIP'
'46fdd1134626da81f0ec3ada47b69bb803277e8dd379052db5d8606475f5ff7ece63c8ae41b5f8ba6d2174465e1e977212c648a11c853b199e11b2014789a661'
'6511badd6e4c71d9b7f6e6a87ea521a9727a5569ecf48dca11ee0d04151adf083453dcf7e05eadd5c28278fd8aee9fe44bbb90067f5fc8067c99c5e9665affd9'
'879bc28faf877a560ac67500388d9774ec890391ef08d367a18f98ef17faeef8c7d208e747fed1fd501b07c3a3b2286af436eb1bd137de2d8ea9a9c32b48088a'
'da5b6d449f8e69c9211e6bd97b1ce4c6e398da5a34fea9a8a89a28084489a1549188e52f66ce7536903afeb75e690e764188daac20a16227b66cc14a72b7311a'
-
'cf0e328e42741fce867e94d3a9f1bd81320da50ea387eb1629ec0a1a1d0eb35163c57d72a9704c5f68903831be6f2b823f072a29f887d31bd59a3a0491ff3a38')
+
'cf0e328e42741fce867e94d3a9f1bd81320da50ea387eb1629ec0a1a1d0eb35163c57d72a9704c5f68903831be6f2b823f072a29f887d31bd59a3a0491ff3a38'
+
'249362aba8e444e9218692ecd9467c6c65c67a543bf56b788cad60f73dcefe701bfb48f314768bafbc40325a0f2f85e31c6ad75fe85d4b18a4a6eda8e923f157')
b2sums=('SKIP'
'e79ceeb12faf7c38a167857ded355a74511c1d98e7fcb1efb589072c16b35f017239e6723bad04e13ed5b16cbebc91923363e36c130bf51d06a66a4d4ef54f6b'
'e92b8192bae89f0bc8c62371fbe63b4bfd68352699e5ea6900bf4313fd573322a06cb85074b292a005cbf644a50abbb67694f9458f071b0fd223d220494f6b6c'
'bffaabbe8c9efee79c7761e72a189796f35c0a40805b53fe954c10590ab9bfd0a321b45c7050ddf30810e36fa4431768f36f19fdc55085c0396ac5338b88f839'
'57610fc5fa370f9c3df50ab411dfe154b273349b3b321ad01768cacdf371e27603e8446a4e4269ccf4ca6cdb59b4a70fdcac59cda29c47eb7e7224555ec7e2e2'
-
'7114f9c78bcc0fd40c245897886439ecbf2f16269e364c788fa323493de47863cdb9c19bece2911be573af433e579f8f1076ca70b7c2df333185f39577882ba8')
+
'7114f9c78bcc0fd40c245897886439ecbf2f16269e364c788fa323493de47863cdb9c19bece2911be573af433e579f8f1076ca70b7c2df333185f39577882ba8'
+
'81b2730c1d81c4396f53908f0fc0c5eb77f133f7305ea097a95857e137f36b72a7ae7adc64f92e1ddc072eaeda81bed7cea3ad3f452739e05324afa84113c8e5')
pkgver() {
cd "$pkgbase"
@@ -74,6 +77,7 @@ prepare() {
cd "$pkgbase"
patch -p1 -i ../ec5cc1026db61d4c43c89ffdd8a71ed62cfb842d.patch
+ patch -p1 -i ../651e62781fd8987c09a965829546a52937bd3461.patch
sed -i "s:\$(bindir):src/nix:g" doc/manual/local.mk
}
@@ -82,10 +86,6 @@ build() {
autoreconf -vfi
- # https://gitlab.archlinux.org/archlinux/packaging/packages/nix/-/issues/1
- # https://github.com/NixOS/nix/issues/10123
- export CXXFLAGS=$(sed 's/-Wp,-D_GLIBCXX_ASSERTIONS//' <<< $CXXFLAGS)
-
./configure \
--prefix=/usr \
--libexecdir="/usr/lib/$pkgname" \
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/nix/-/commit/88717b7487c7e89c33596916807165e87694d9e5
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/nix/-/commit/88717b7487c7e89c33596916807165e87694d9e5
You're receiving this email because of your account on gitlab.archlinux.org.
