tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
0
fork
atom
lol
0
fork
atom
overview
issues
pulls
pipelines
xbps: init at 0.52
Will Dietz
7 years ago
0c30d659
641a6230
+65
3 changed files
expand all
collapse all
unified
split
pkgs
tools
package-management
xbps
cert-paths.patch
default.nix
top-level
all-packages.nix
+25
pkgs/tools/package-management/xbps/cert-paths.patch
···
1
1
+
From d13a550dbc8876c35b912fe3e0eadd45b278be27 Mon Sep 17 00:00:00 2001
2
2
+
From: Will Dietz <w@wdtz.org>
3
3
+
Date: Fri, 18 May 2018 09:51:48 -0500
4
4
+
Subject: [PATCH] add certificate path fallbacks
5
5
+
6
6
+
---
7
7
+
lib/fetch/common.c | 2 ++
8
8
+
1 file changed, 2 insertions(+)
9
9
+
10
10
+
diff --git a/lib/fetch/common.c b/lib/fetch/common.c
11
11
+
index 94fb2651..79b50115 100644
12
12
+
--- a/lib/fetch/common.c
13
13
+
+++ b/lib/fetch/common.c
14
14
+
@@ -1012,6 +1012,8 @@ fetch_ssl_setup_peer_verification(SSL_CTX *ctx, int verbose)
15
15
+
16
16
+
if (getenv("SSL_NO_VERIFY_PEER") == NULL) {
17
17
+
ca_cert_file = getenv("SSL_CA_CERT_FILE");
18
18
+
+ ca_cert_file = ca_cert_file ? ca_cert_file : getenv("NIX_SSL_CERT_FILE");
19
19
+
+ ca_cert_file = ca_cert_file ? ca_cert_file : "/etc/ssl/certs/ca-certificates.crt";
20
20
+
ca_cert_path = getenv("SSL_CA_CERT_PATH") != NULL ?
21
21
+
getenv("SSL_CA_CERT_PATH") : X509_get_default_cert_dir();
22
22
+
if (verbose) {
23
23
+
--
24
24
+
2.17.0
25
25
+
+38
pkgs/tools/package-management/xbps/default.nix
···
1
1
+
{ stdenv, fetchFromGitHub, pkgconfig, which, zlib, openssl, libarchive }:
2
2
+
3
3
+
stdenv.mkDerivation rec {
4
4
+
name = "xbps-${version}";
5
5
+
version = "0.52";
6
6
+
7
7
+
src = fetchFromGitHub {
8
8
+
owner = "voidlinux";
9
9
+
repo = "xbps";
10
10
+
rev = version;
11
11
+
sha256 = "1sf6iy9l3dijsczsngzbhksshfm1374g2rrdasc04l6gz35l2cdp";
12
12
+
};
13
13
+
14
14
+
nativeBuildInputs = [ pkgconfig which ];
15
15
+
16
16
+
buildInputs = [ zlib openssl libarchive ];
17
17
+
18
18
+
patches = [ ./cert-paths.patch ];
19
19
+
20
20
+
postPatch = ''
21
21
+
# fix unprefixed ranlib (needed on cross)
22
22
+
substituteInPlace lib/Makefile \
23
23
+
--replace 'SILENT}ranlib ' 'SILENT}$(RANLIB) '
24
24
+
25
25
+
# Don't try to install keys to /var/db/xbps, put in $out/share for now
26
26
+
substituteInPlace data/Makefile \
27
27
+
--replace '$(DESTDIR)/$(DBDIR)' '$(DESTDIR)/$(SHAREDIR)'
28
28
+
'';
29
29
+
30
30
+
enableParallelBuilding = true;
31
31
+
32
32
+
meta = with stdenv.lib; {
33
33
+
homepage = https://github.com/voidlinux/xbps;
34
34
+
description = "The X Binary Package System";
35
35
+
license = licenses.bsd2;
36
36
+
maintainers = with maintainers; [ dtzWill ];
37
37
+
};
38
38
+
}
+2
pkgs/top-level/all-packages.nix
···
21257
21257
21258
21258
xboxdrv = callPackage ../misc/drivers/xboxdrv { };
21259
21259
21260
21260
+
xbps = callPackage ../tools/package-management/xbps { };
21261
21261
+
21260
21262
xcftools = callPackage ../tools/graphics/xcftools { };
21261
21263
21262
21264
xhyve = callPackage ../applications/virtualization/xhyve {