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

Merge pull request #81167 from NixOS/staging-next

Browse Source 
Staging next
This commit is contained in:
Frederik Rietdijk 2020-03-01 13:45:30 +01:00 committed by GitHub
commit 33133b2667
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
47 changed files with 439 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/editors/ed/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation (rec {
name = "ed-${version}";
version = "1.15";
version = "1.16";
src = fetchurl {
url = "mirror://gnu/ed/${name}.tar.lz";
sha256 = "0x6ivy5k0d7dy5z9g8q8nipr89m4qbk2ink2898qq43smp08ji5d";
sha256 = "0b4b1lwizvng9bvpcjnmpj2i80xz9xw2w8nfff27b2h4mca7mh6g";
};
nativeBuildInputs = [ lzip ];
@ -30,7 +30,7 @@ stdenv.mkDerivation (rec {
license = stdenv.lib.licenses.gpl3Plus;
homepage = https://www.gnu.org/software/ed/;
homepage = "https://www.gnu.org/software/ed/";
maintainers = [ ];
platforms = stdenv.lib.platforms.unix;

2
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -139,8 +139,6 @@ stdenv.mkDerivation {
# Install contrib stuff.
mkdir -p $out/share/git
cp -a contrib $out/share/git/
mkdir -p $out/share/emacs/site-lisp
ln -s "$out/share/git/contrib/emacs/"*.el $out/share/emacs/site-lisp/
mkdir -p $out/share/bash-completion/completions
ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/git
mkdir -p $out/etc/bash_completion.d

4
pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "gnome-desktop";
version = "3.34.2";
version = "3.34.4";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1v983xirwp1y6ggz97bh742ak6gff0hxb359dgn37nikjxhvm0a0";
sha256 = "1g0cvsx0gk65kfa91knkqg7l2isrnlpvqwjbzpr3a5f2girp4gn5";
};
nativeBuildInputs = [

245
pkgs/development/compilers/go/1.14.nix Normal file
View File

@ -0,0 +1,245 @@
{ stdenv, fetchurl, tzdata, iana-etc, runCommand
, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation
, mailcap, runtimeShell
, buildPackages, pkgsTargetTarget
}:
let
inherit (stdenv.lib) optionals optionalString;
goBootstrap = runCommand "go-bootstrap" {} ''
mkdir $out
cp -rf ${buildPackages.go_bootstrap}/* $out/
chmod -R u+w $out
find $out -name "*.c" -delete
cp -rf $out/bin/* $out/share/go/bin/
'';
goarch = platform: {
"i686" = "386";
"x86_64" = "amd64";
"aarch64" = "arm64";
"arm" = "arm";
"armv5tel" = "arm";
"armv6l" = "arm";
"armv7l" = "arm";
}.${platform.parsed.cpu.name} or (throw "Unsupported system");
in
stdenv.mkDerivation rec {
pname = "go";
version = "1.14";
src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
sha256 = "12a3nzj4k4p5ica447sjfva9pvvj84a03b4xlg3mhl2nmm33wr3d";
};
# perl is used for testing go vet
nativeBuildInputs = [ perl which pkgconfig patch procps ];
buildInputs = [ cacert pcre ]
++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ];
hardeningDisable = [ "all" ];
prePatch = ''
patchShebangs ./ # replace /bin/bash
# This source produces shell script at run time,
# and thus it is not corrected by patchShebangs.
substituteInPlace misc/cgo/testcarchive/carchive_test.go \
--replace '#!/usr/bin/env bash' '#!${runtimeShell}'
# Patch the mimetype database location which is missing on NixOS.
# but also allow static binaries built with NixOS to run outside nix
sed -i 's,\"/etc/mime.types,"${mailcap}/etc/mime.types\"\,\n\t&,' src/mime/type_unix.go
# Disabling the 'os/http/net' tests (they want files not available in
# chroot builds)
rm src/net/{listen,parse}_test.go
rm src/syscall/exec_linux_test.go
# !!! substituteInPlace does not seems to be effective.
# The os test wants to read files in an existing path. Just don't let it be /usr/bin.
sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go
sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go
# Disable the unix socket test
sed -i '/TestShutdownUnix/aif true \{ return\; \}' src/net/net_test.go
# Disable the hostname test
sed -i '/TestHostname/aif true \{ return\; \}' src/os/os_test.go
# ParseInLocation fails the test
sed -i '/TestParseInSydney/aif true \{ return\; \}' src/time/format_test.go
# Remove the api check as it never worked
sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go
# Remove the coverage test as we have removed this utility
sed -i '/TestCoverageWithCgo/aif true \{ return\; \}' src/cmd/go/go_test.go
# Remove the timezone naming test
sed -i '/TestLoadFixed/aif true \{ return\; \}' src/time/time_test.go
# Remove disable setgid test
sed -i '/TestRespectSetgidDir/aif true \{ return\; \}' src/cmd/go/internal/work/build_test.go
# Remove cert tests that conflict with NixOS's cert resolution
sed -i '/TestEnvVars/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go
# TestWritevError hangs sometimes
sed -i '/TestWritevError/aif true \{ return\; \}' src/net/writev_test.go
# TestVariousDeadlines fails sometimes
sed -i '/TestVariousDeadlines/aif true \{ return\; \}' src/net/timeout_test.go
sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go
# Disable cgo lookup tests not works, they depend on resolver
rm src/net/cgo_unix_test.go
'' + optionalString stdenv.isLinux ''
# prepend the nix path to the zoneinfo files but also leave the original value for static binaries
# that run outside a nix server
sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go
'' + optionalString stdenv.isAarch32 ''
echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash
'' + optionalString stdenv.isDarwin ''
substituteInPlace src/race.bash --replace \
"sysctl machdep.cpu.extfeatures | grep -qv EM64T" true
sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go
sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go
sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go
sed -i '/TestChdirAndGetwd/aif true \{ return\; \}' src/os/os_test.go
sed -i '/TestCredentialNoSetGroups/aif true \{ return\; \}' src/os/exec/exec_posix_test.go
sed -i '/TestRead0/aif true \{ return\; \}' src/os/os_test.go
sed -i '/TestSystemRoots/aif true \{ return\; \}' src/crypto/x509/root_darwin_test.go
sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/aif true \{ return\; \}' src/cmd/go/go_test.go
sed -i '/TestBuildDashIInstallsDependencies/aif true \{ return\; \}' src/cmd/go/go_test.go
sed -i '/TestDisasmExtld/aif true \{ return\; \}' src/cmd/objdump/objdump_test.go
sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go
# TestCurrent fails because Current is not implemented on Darwin
sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go
sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go
touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd
'';
patches = [
./remove-tools-1.11.patch
./ssl-cert-file-1.13.patch
./remove-test-pie-1.14.patch
./creds-test.patch
./go-1.9-skip-flaky-19608.patch
./go-1.9-skip-flaky-20072.patch
./skip-external-network-tests.patch
./skip-nohup-tests.patch
] ++ [
# breaks under load: https://github.com/golang/go/issues/25628
(if stdenv.isAarch32
then ./skip-test-extra-files-on-aarch32-1.14.patch
else ./skip-test-extra-files-on-386-1.14.patch)
];
postPatch = ''
find . -name '*.orig' -exec rm {} ';'
'';
GOOS = stdenv.targetPlatform.parsed.kernel.name;
GOARCH = goarch stdenv.targetPlatform;
# GOHOSTOS/GOHOSTARCH must match the building system, not the host system.
# Go will nevertheless build a for host system that we will copy over in
# the install phase.
GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name;
GOHOSTARCH = goarch stdenv.buildPlatform;
# {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those
# to be different from CC/CXX
CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then
"${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc"
else
null;
CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then
"${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++"
else
null;
GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
GO386 = 387; # from Arch: don't assume sse2 on i686
CGO_ENABLED = 1;
# Hopefully avoids test timeouts on Hydra
GO_TEST_TIMEOUT_SCALE = 3;
# Indicate that we are running on build infrastructure
# Some tests assume things like home directories and users exists
GO_BUILDER_NAME = "nix";
GOROOT_BOOTSTRAP="${goBootstrap}/share/go";
postConfigure = ''
export GOCACHE=$TMPDIR/go-cache
# this is compiled into the binary
export GOROOT_FINAL=$out/share/go
export PATH=$(pwd)/bin:$PATH
# Independent from host/target, CC should produce code for the building system.
export CC=${buildPackages.stdenv.cc}/bin/cc
ulimit -a
'';
postBuild = ''
(cd src && ./make.bash)
'';
doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin;
checkPhase = ''
runHook preCheck
(cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild)
runHook postCheck
'';
preInstall = ''
rm -r pkg/obj
# Contains the wrong perl shebang when cross compiling,
# since it is not used for anything we can deleted as well.
rm src/regexp/syntax/make_perl_groups.pl
'' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then ''
mv bin/*_*/* bin
rmdir bin/*_*
${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH}
''}
'' else if (stdenv.hostPlatform != stdenv.targetPlatform) then ''
rm -rf bin/*_*
${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH}
''}
'' else "");
installPhase = ''
runHook preInstall
mkdir -p $GOROOT_FINAL
cp -a bin pkg src lib misc api doc $GOROOT_FINAL
ln -s $GOROOT_FINAL/bin $out/bin
runHook postInstall
'';
setupHook = ./setup-hook.sh;
disallowedReferences = [ goBootstrap ];
meta = with stdenv.lib; {
branch = "1.14";
homepage = http://golang.org/;
description = "The Go Programming language";
license = licenses.bsd3;
maintainers = with maintainers; [ cstrahan orivej mic92 rvolosatovs kalbasit Frostman ];
platforms = platforms.linux ++ platforms.darwin;
};
}

34
pkgs/development/compilers/go/remove-test-pie-1.14.patch Normal file
View File

@ -0,0 +1,34 @@
diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
index 56bdfcac19..d7d67ab94d 100644
--- a/src/cmd/dist/test.go
+++ b/src/cmd/dist/test.go
@@ -580,29 +580,6 @@ func (t *tester) registerTests() {
})
}
- // Test internal linking of PIE binaries where it is supported.
- if goos == "linux" && (goarch == "amd64" || goarch == "arm64") {
- t.tests = append(t.tests, distTest{
- name: "pie_internal",
- heading: "internal linking of -buildmode=pie",
- fn: func(dt *distTest) error {
- t.addCmd(dt, "src", t.goTest(), "reflect", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60))
- return nil
- },
- })
- // Also test a cgo package.
- if t.cgoEnabled && t.internalLink() {
- t.tests = append(t.tests, distTest{
- name: "pie_internal_cgo",
- heading: "internal linking of -buildmode=pie",
- fn: func(dt *distTest) error {
- t.addCmd(dt, "src", t.goTest(), "os/user", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60))
- return nil
- },
- })
- }
- }
-
// sync tests
if goos != "js" { // js doesn't support -cpu=10
t.tests = append(t.tests, distTest{

15
pkgs/development/compilers/go/skip-test-extra-files-on-386-1.14.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/src/os/exec/exec_test.go b/src/os/exec/exec_test.go
index dce66c5c2e..2532224376 100644
--- a/src/os/exec/exec_test.go
+++ b/src/os/exec/exec_test.go
@@ -627,6 +627,10 @@ func TestExtraFiles(t *testing.T) {
t.Skipf("skipping test on %q", runtime.GOOS)
}
+ if runtime.GOOS == "linux" && runtime.GOARCH == "386" {
+ t.Skipf("skipping test on %q %q", runtime.GOARCH, runtime.GOOS)
+ }
+
// Force network usage, to verify the epoll (or whatever) fd
// doesn't leak to the child,
ln, err := net.Listen("tcp", "127.0.0.1:0")

15
pkgs/development/compilers/go/skip-test-extra-files-on-aarch32-1.14.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/src/os/exec/exec_test.go b/src/os/exec/exec_test.go
index dce66c5c2e..2532224376 100644
--- a/src/os/exec/exec_test.go
+++ b/src/os/exec/exec_test.go
@@ -627,6 +627,10 @@ func TestExtraFiles(t *testing.T) {
t.Skipf("skipping test on %q", runtime.GOOS)
}
+ if runtime.GOOS == "linux" && runtime.GOARCH == "arm" {
+ t.Skipf("skipping test on %q %q", runtime.GOARCH, runtime.GOOS)
+ }
+
// Force network usage, to verify the epoll (or whatever) fd
// doesn't leak to the child,
ln, err := net.Listen("tcp", "127.0.0.1:0")

2
pkgs/development/haskell-modules/generic-builder.nix
View File

@ -384,7 +384,7 @@ stdenv.mkDerivation ({
done
for d in $(grep '^dynamic-library-dirs:' "$packageConfDir"/* | cut -d' ' -f2- | tr ' ' '\n' | sort -u); do
for lib in "$d/"*.dylib; do
for lib in "$d/"*.{dylib,so}; do
ln -s "$lib" "$dynamicLinksDir"
done
done

14
pkgs/development/interpreters/perl/default.nix
View File

@ -1,21 +1,9 @@
{ config, lib, stdenv, fetchurl, pkgs, buildPackages, callPackage
, enableThreading ? stdenv ? glibc, coreutils, makeWrapper
, enableThreading ? true, coreutils, makeWrapper
}:
with lib;
# We can only compile perl with threading on platforms where we have a
# real glibc in the stdenv.
#
# Instead of silently building an unthreaded perl if this is not the
# case, we force callers to disableThreading explicitly, therefore
# documenting the platforms where the perl is not threaded.
#
# In the case of stdenv linux boot stage1 it's not possible to use
# threading because of the simpleness of the bootstrap glibc, so we
# use enableThreading = false there.
assert enableThreading -> (stdenv ? glibc);
let
libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr";

2
pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh
View File

@ -6,7 +6,7 @@ pythonImportsCheckPhase () {
if [ -n "$pythonImportsCheck" ]; then
echo "Check whether the following modules can be imported: $pythonImportsCheck"
cd $out && eval "@pythonCheckInterpreter@ -c 'import os; import importlib; list(map(lambda mod: importlib.import_module(mod), os.environ[\"pythonImportsCheck\"].split()))'"
( cd $out && eval "@pythonCheckInterpreter@ -c 'import os; import importlib; list(map(lambda mod: importlib.import_module(mod), os.environ[\"pythonImportsCheck\"].split()))'" )
fi
}

4
pkgs/development/libraries/cppunit/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "cppunit";
version = "1.15.0";
version = "1.15.1";
src = fetchurl {
url = "https://dev-www.libreoffice.org/src/${pname}-${version}.tar.gz";
sha256 = "08j9hc11yl07ginsf282pshn6zpy96yhzf7426sfn10f8gdxyq8w";
sha256 = "19qpqzy66bq76wcyadmi3zahk5v1ll2kig1nvg96zx9padkcdic9";
};
meta = with stdenv.lib; {

4
pkgs/development/libraries/folks/default.nix
View File

@ -29,13 +29,13 @@
stdenv.mkDerivation rec {
pname = "folks";
version = "0.13.1";
version = "0.13.2";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0pda8sx4ap3lyri5fdrnakl29la1zkhwlc9bmnp13qigp1iwdw9x";
sha256 = "0wq14yjs7m3axziy679a854vc7r7fj1l38p9jnyapb21vswdcqq2";
};
mesonFlags = [

4
pkgs/development/libraries/gjs/default.nix
View File

@ -19,11 +19,11 @@
stdenv.mkDerivation rec {
pname = "gjs";
version = "1.58.4";
version = "1.58.5";
src = fetchurl {
url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0pxxgsb9gvymgr7qsglfdbaa7hy29y01prszjr27f7bpdik3y6i6";
sha256 = "0fm1szmhdawvgbf9fh6vvkv1fdvbn888fciyi2wkhx48kz09jvg7";
};
outputs = [ "out" "dev" "installedTests" ];

4
pkgs/development/libraries/glib/default.nix
View File

@ -48,11 +48,11 @@ in
stdenv.mkDerivation rec {
pname = "glib";
version = "2.62.4";
version = "2.62.5";
src = fetchurl {
url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1g2vj9lyh032kcwij7avx5d6a99rcsnkd07sbl9i55zsfw6h712c";
sha256 = "0bj5hagvfiqcjd20w543pvbnrlqvs8nbxvqjflyvcn36ljpwvldq";
};
patches = optionals stdenv.isDarwin [

22
pkgs/development/libraries/glib/split-dev-programs.patch
View File

@ -1,5 +1,5 @@
diff --git a/gio/gdbus-2.0/codegen/meson.build b/gio/gdbus-2.0/codegen/meson.build
index 121e9e6bb..b76fa0188 100644
index 5ea6bae2f..e0b584a86 100644
--- a/gio/gdbus-2.0/codegen/meson.build
+++ b/gio/gdbus-2.0/codegen/meson.build
@@ -16,7 +16,7 @@ gdbus_codegen_conf.set('DATADIR', glib_datadir)
@ -12,15 +12,15 @@ index 121e9e6bb..b76fa0188 100644
)
# Provide tools for others when we're a subproject and they use the Meson GNOME module
diff --git a/gio/meson.build b/gio/meson.build
index 9a9e621b3..12e1d146a 100644
index 3535788ab..99c3b48d6 100644
--- a/gio/meson.build
+++ b/gio/meson.build
@@ -830,14 +830,15 @@ pkg.generate(libgio,
@@ -831,14 +831,15 @@ pkg.generate(libgio,
variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')),
'schemasdir=' + join_paths('${datadir}', schemas_subdir),
'bindir=' + join_paths('${prefix}', get_option('bindir')),
+ 'devbindir=' + get_option('devbindir'),
'giomoduledir=' + giomodulesdir,
'giomoduledir=' + pkgconfig_giomodulesdir,
'gio=' + join_paths('${bindir}', 'gio'),
- 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'),
- 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'),
@ -36,7 +36,7 @@ index 9a9e621b3..12e1d146a 100644
'gsettings=' + join_paths('${bindir}', 'gsettings')],
version : glib_version,
install_dir : glib_pkgconfigreldir,
@@ -938,12 +939,14 @@ executable('gio', gio_tool_sources,
@@ -939,12 +940,14 @@ executable('gio', gio_tool_sources,
executable('gresource', 'gresource-tool.c',
install : true,
@ -51,7 +51,7 @@ index 9a9e621b3..12e1d146a 100644
c_args : gio_c_args,
# intl.lib is not compatible with SAFESEH
link_args : noseh_link_args,
@@ -952,6 +955,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu
@@ -953,6 +956,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu
glib_compile_schemas = executable('glib-compile-schemas',
[gconstructor_as_data_h, 'gvdb/gvdb-builder.c', 'glib-compile-schemas.c'],
install : true,
@ -59,7 +59,7 @@ index 9a9e621b3..12e1d146a 100644
# intl.lib is not compatible with SAFESEH
link_args : noseh_link_args,
dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
@@ -959,6 +963,7 @@ glib_compile_schemas = executable('glib-compile-schemas',
@@ -960,6 +964,7 @@ glib_compile_schemas = executable('glib-compile-schemas',
glib_compile_resources = executable('glib-compile-resources',
[gconstructor_as_data_h, 'gvdb/gvdb-builder.c', 'glib-compile-resources.c'],
install : true,
@ -68,7 +68,7 @@ index 9a9e621b3..12e1d146a 100644
# intl.lib is not compatible with SAFESEH
link_args : noseh_link_args,
diff --git a/glib/meson.build b/glib/meson.build
index 91a48f194..80472a06b 100644
index aaf5f00f5..09edd291a 100644
--- a/glib/meson.build
+++ b/glib/meson.build
@@ -375,9 +375,10 @@ pkg.generate(libglib,
@ -103,7 +103,7 @@ index 91a48f194..80472a06b 100644
install_mode: 'rwxr-xr-x'
)
diff --git a/gobject/meson.build b/gobject/meson.build
index c7805c556..22ec629a4 100644
index 85e283bab..386ad5e4e 100644
--- a/gobject/meson.build
+++ b/gobject/meson.build
@@ -75,7 +75,7 @@ foreach tool: python_tools
@ -124,10 +124,10 @@ index c7805c556..22ec629a4 100644
install_data('gobject_gdb.py', install_dir : join_paths(glib_pkgdatadir, 'gdb'))
diff --git a/meson.build b/meson.build
index 717d1bccb..fb0bee8a1 100644
index 484f4c750..c7f9327d9 100644
--- a/meson.build
+++ b/meson.build
@@ -2118,7 +2118,7 @@ if have_sh
@@ -2122,7 +2122,7 @@ if have_sh
gettextize_conf.set('datarootdir', glib_datadir)
gettextize_conf.set('datadir', glib_datadir)
configure_file(input : 'glib-gettextize.in',

4
pkgs/development/libraries/grilo-plugins/default.nix
View File

@ -31,11 +31,11 @@
stdenv.mkDerivation rec {
pname = "grilo-plugins";
version = "0.3.10";
version = "0.3.11";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0jldaixc4kzycn5v8ixkjld1n0z3dp0l1p3vchgdwpvdvc7kcfw0";
sha256 = "0wyd3n5mn7b77hxylkc3f62v01mlavh96901pz342hwrn42ydqnx";
};
patches = [

4
pkgs/development/libraries/grilo/default.nix
View File

@ -4,7 +4,7 @@
let
pname = "grilo";
version = "0.3.11"; # if you change minor, also change ./setup-hook.sh
version = "0.3.12"; # if you change minor, also change ./setup-hook.sh
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0s7b50nbyvi75x2l507q9pnpp4ynrx9qa0hm2bkw7wd2nl61r48g";
sha256 = "0w8sq5g6g1rg85h53vbll8va70fcp6082mlpmy98aa03444ddyyv";
};
setupHook = ./setup-hook.sh;

4
pkgs/development/libraries/gtk/3.x.nix
View File

@ -48,7 +48,7 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "gtk+3";
version = "3.24.13";
version = "3.24.14";
outputs = [ "out" "dev" ] ++ optional withGtkDoc "devdoc";
outputBin = "dev";
@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
sha256 = "1a9hi7k59q0kqx0n3xhsk1ly23w9g9ncllnay1756g0yrww5qxsc";
sha256 = "120yz5gxqbv7sgdbcy4i0b6ixm8jpjzialdrqs0gv15q7bwnjk8w";
};
patches = [

4
pkgs/development/libraries/kerberos/krb5.nix
View File

@ -14,12 +14,12 @@ in
with stdenv.lib;
stdenv.mkDerivation rec {
name = "${type}krb5-${version}";
majorVersion = "1.17";
majorVersion = "1.18";
version = majorVersion;
src = fetchurl {
url = "https://kerberos.org/dist/krb5/${majorVersion}/krb5-${version}.tar.gz";
sha256 = "1xc1ly09697b7g2vngvx76szjqy9769kpgn27lnp1r9xln224vjs";
sha256 = "121c5xsy3x0i4wdkrpw62yhvji6virbh6n30ypazkp0isws3k4bk";
};
outputs = [ "out" "dev" ];

4
pkgs/development/libraries/libbytesize/default.nix
View File

@ -4,7 +4,7 @@
}:
let
version = "2.1";
version = "2.2";
in stdenv.mkDerivation rec {
pname = "libbytesize";
inherit version;
@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
owner = "storaged-project";
repo = "libbytesize";
rev = version;
sha256 = "0qb6zx2fdghm21lishlcrhnwf4wwy5p69dsgp0504kn93ii7mw3m";
sha256 = "0n4gmn68ypsk3gcw6akcghlgk3aj3wskwg3mlg93cw5y3a33nbhm";
};
outputs = [ "out" "dev" "devdoc" ];

4
pkgs/development/libraries/libcdr/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, libwpg, libwpd, lcms, pkgconfig, librevenge, icu, boost, cppunit }:
stdenv.mkDerivation rec {
name = "libcdr-0.1.5";
name = "libcdr-0.1.6";
src = fetchurl {
url = "https://dev-www.libreoffice.org/src/${name}.tar.xz";
sha256 = "0j1skr11jwvafn0l6p37v3i4lqc8wcn489g8f7c4mqwbk94mrkka";
sha256 = "0qgqlw6i25zfq1gf7f6r5hrhawlrgh92sg238kjpf2839aq01k81";
};
buildInputs = [ libwpg libwpd lcms librevenge icu boost cppunit ];

4
pkgs/development/libraries/libinput/default.nix
View File

@ -27,11 +27,11 @@ in
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "libinput";
version = "1.15.1";
version = "1.15.2";
src = fetchurl {
url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz";
sha256 = "05hcjlsrc38yn1g1n7kia9m93nc703hx66gf977kw5vgbi4mfbvb";
sha256 = "0ivpb4sghl80cs7jg3xrs53kckif6wy81cny3a8mry94nszky74p";
};
outputs = [ "bin" "out" "dev" ];

8
pkgs/development/libraries/libpeas/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "libpeas";
version = "1.24.0";
version = "1.24.1";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1yg6r0srz3knhgvplprl3pikrq5c02dmdxgfwcynd6hjih9h16hb";
sha256 = "1162dr7smmfb02czmhshr0f93hqj7w0nw29bys5lzfvwarxcyflw";
};
nativeBuildInputs = [ pkgconfig meson ninja gettext gobject-introspection ];
@ -20,10 +20,6 @@ stdenv.mkDerivation rec {
gobject-introspection
];
patches = [
./fix-libpeas-gtk-pc.patch
];
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;

22
pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch
View File

@ -1,22 +0,0 @@
diff --git a/libpeas-gtk/meson.build b/libpeas-gtk/meson.build
index bf590de..00def42 100644
--- a/libpeas-gtk/meson.build
+++ b/libpeas-gtk/meson.build
@@ -111,10 +111,17 @@ libpeas_gtk_test_dep = declare_dependency(
sources: libpeas_gtk_dep_sources,
)
+libpeas_gtk_pc_reqs = [
+ glib_dep,
+ gtk_dep,
+ package_string + ' >= @0@'.format(version)
+]
+
libpeas_gtk_pc = pkg.generate(
libpeas_gtk_sha,
name: package_gtk_string,
description: 'GObject plugins library widgetery',
+ requires: libpeas_gtk_pc_reqs,
subdirs: package_string,
install_dir: pkgconfigdir,
)

6
pkgs/development/libraries/libqmi/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libqmi";
version = "1.24.2";
version = "1.24.4";
src = fetchurl {
url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz";
sha256 = "10mjfmiznaxvfk0f9wr18kyxz3mpdrvnh0qw9g8c1nv0z5vf9r2a";
sha256 = "12licfsszr6qxpg9b2b04qm2glk8d42fcy32zr8jzwrgr7gbl5h3";
};
outputs = [ "out" "dev" "devdoc" ];
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = with stdenv.lib; {
homepage = https://www.freedesktop.org/wiki/Software/libqmi/;
homepage = "https://www.freedesktop.org/wiki/Software/libqmi/";
description = "Modem protocol helper library";
platforms = platforms.linux;
license = licenses.gpl2;

12
pkgs/development/libraries/libsecret/default.nix
View File

@ -4,21 +4,13 @@
stdenv.mkDerivation rec {
pname = "libsecret";
version = "0.20.0";
version = "0.20.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0hxfpm8f4rlx685igd4bv89wb80v2952h373g3w6l42kniq7667i";
sha256 = "0ir4ynpf8b64xss1azvsi5x6697lik7hkf3z0xxa2qv2xja3xxsp";
};
patches = [
(fetchpatch {
name = "rename-internal-functions-to-avoid-conflicts-and-fix-build.patch";
url = "https://gitlab.gnome.org/GNOME/libsecret/commit/cf21ad50b62f7c8e4b22ef374f0a73290a99bdb8.patch";
sha256 = "1n9nyzq5qrvw7s6sj5gzj33ia3rrx719jpys1cfhfbayg2sxyd4n";
})
];
postPatch = ''
patchShebangs .
'';

2
pkgs/development/libraries/nettle/generic.nix
View File

@ -16,6 +16,8 @@ stdenv.mkDerivation ({
nativeBuildInputs = [ gnum4 ];
propagatedBuildInputs = [ gmp ];
configureFlags = [ "--enable-fat" ]; # runtime selection of HW-accelerated code
doCheck = (stdenv.hostPlatform.system != "i686-cygwin" && !stdenv.isDarwin);
enableParallelBuilding = true;

4
pkgs/development/libraries/p11-kit/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "p11-kit";
version = "0.23.19";
version = "0.23.20";
src = fetchFromGitHub {
owner = "p11-glue";
repo = pname;
rev = version;
sha256 = "0hsg06mqsd90a0nxj5484b40cbfq7vna4w0sv6y5ihbj5l2hz06b";
sha256 = "00xxhzgd7cpin9nzwrrzykvhjwqg5l45p0cq2gv68y3sxq2p9q6y";
};
outputs = [ "out" "dev"];

4
pkgs/development/libraries/pcre/default.nix
View File

@ -8,7 +8,7 @@ with stdenv.lib;
assert elem variant [ null "cpp" "pcre16" "pcre32" ];
let
version = "8.43";
version = "8.44";
pname = if (variant == null) then "pcre"
else if (variant == "cpp") then "pcre-cpp"
else variant;
@ -18,7 +18,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://ftp.pcre.org/pub/pcre/pcre-${version}.tar.bz2";
sha256 = "0sxg1wlknq05ryq63h21cchjmcjkin9lmnqsmhs3h08301965rwi";
sha256 = "0v9nk51wh55pcbnf2jr36yarz8ayajn6d7ywiq2wagivn9c8c40r";
};
outputs = [ "bin" "dev" "out" "doc" "man" ];

4
pkgs/development/libraries/poppler/default.nix
View File

@ -12,11 +12,11 @@ let
in
stdenv.mkDerivation rec {
name = "poppler-${suffix}-${version}";
version = "0.84.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
version = "0.85.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
src = fetchurl {
url = "${meta.homepage}/poppler-${version}.tar.xz";
sha256 = "0ccp2gx05cz5y04k5pgbyi4ikyq60nafa7x2yx4aaf1vfkd318f7";
sha256 = "0jyr036scdly13hx5dxmsqp2p3jifc29h2by51msw0ih6bmpbj1b";
};
outputs = [ "out" "dev" ];

7
pkgs/development/libraries/qt-5/5.12/default.nix
View File

@ -67,6 +67,13 @@ let
./qtbase.patch.d/0010-qtbase-qtpluginpath.patch
./qtbase.patch.d/0011-qtbase-assert.patch
./qtbase.patch.d/0012-fix-header_module.patch
# https://bugreports.qt.io/browse/QTBUG-81715
# remove after updating to qt > 5.12.7
(fetchpatch {
name = "fix-qt5_make_output_file-cmake-macro.patch";
url = "https://code.qt.io/cgit/qt/qtbase.git/patch/?id=8a3fde00bf53d99e9e4853e8ab97b0e1bcf74915";
sha256 = "1gpcbdpyazdxnmldvhsf3pfwr2gjvi08x3j6rxf543rq01bp6cpx";
})
];
qtdeclarative = [ ./qtdeclarative.patch ];
qtscript = [ ./qtscript.patch ];

4
pkgs/development/libraries/tracker-miners/default.nix
View File

@ -45,11 +45,11 @@
stdenv.mkDerivation rec {
pname = "tracker-miners";
version = "2.3.1";
version = "2.3.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1q4hlpl3nkr0y13rzkwryyajnpy5s661z8n82dw1rskrg9mf07bv";
sha256 = "1kizavw9gbdjkw4wykgv0fcl2y6fj788nycx9p4byn6ylb1277h6";
};
nativeBuildInputs = [

4
pkgs/development/libraries/tracker/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "tracker";
version = "2.3.1";
version = "2.3.2";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1888vyz2l5n46ywb70fryd0qipyh3x5n6q0mk56jzbb5whk8fx5n";
sha256 = "1nzbnvwwsk6kv6kqbxwlz8vk70l9ai6b4r9qypw51vp4qy72ny54";
};
nativeBuildInputs = [

4
pkgs/development/libraries/vte/default.nix
View File

@ -22,13 +22,13 @@
stdenv.mkDerivation rec {
pname = "vte";
version = "0.58.2";
version = "0.58.3";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1h1bljr090cgnzim00q4pnsmjqblzn1sig3d87wv1hzjn796dj9k";
sha256 = "0xa9ipwic4jnhhbzlnqbhssz10xkzv61cpkl1ammc6mdq95bbp12";
};
passthru = {

10
pkgs/development/python-modules/importlib-metadata/default.nix
View File

@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "importlib-metadata";
version = "1.3.0";
version = "1.5.0";
src = fetchPypi {
pname = "importlib_metadata";
inherit version;
sha256 = "0ibvvqajphwdclbr236gikvyja0ynvqjlix38kvsabgrf0jqafh7";
sha256 = "00ikdj4gjhankdljnz7g5ggak4k9lql2926x0x117ir9j2lv7x86";
};
nativeBuildInputs = [ setuptools_scm ];
@ -28,6 +28,12 @@ buildPythonPackage rec {
checkInputs = [ importlib-resources packaging ];
# removing test_main.py - it requires 'pyflakefs'
# and adding `pyflakefs` to `checkInputs` causes infinite recursion.
preCheck = ''
rm importlib_metadata/tests/test_main.py
'';
meta = with lib; {
description = "Read metadata from Python packages";
homepage = https://importlib-metadata.readthedocs.io/;

6
pkgs/development/tools/misc/gdb/debug-info-from-env.patch
View File

@ -3,11 +3,13 @@ of directories with separate debugging information files.
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -551,3 +551,6 @@ captured_main_1 (struct captured_main_args *context)
@@ -556,3 +556,8 @@ captured_main_1 (struct captured_main_args *context)
- debug_file_directory = relocate_gdb_directory (DEBUGDIR,
+ debug_file_directory = getenv("NIX_DEBUG_INFO_DIRS");
+
+ if (debug_file_directory == NULL)
+ if (debug_file_directory != NULL)
+ debug_file_directory = xstrdup(debug_file_directory);
+ else
+ debug_file_directory = relocate_gdb_directory (DEBUGDIR,
DEBUGDIR_RELOCATABLE);

6
pkgs/os-specific/linux/bluez/default.nix
View File

@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "bluez";
version = "5.52";
version = "5.53";
src = fetchurl {
url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz";
sha256 = "02jng21lp6fb3c2bh6vf9y7cj4gaxwk29dfc32ncy0lj0gi4q57p";
sha256 = "1g1qg6dz6hl3csrmz75ixr12lwv836hq3ckb259svvrg62l2vaiq";
};
pythonPath = with python3.pkgs; [
@ -116,7 +116,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Bluetooth support for Linux";
homepage = http://www.bluez.org/;
homepage = "http://www.bluez.org/";
license = with licenses; [ gpl2 lgpl21 ];
platforms = platforms.linux;
repositories.git = https://git.kernel.org/pub/scm/bluetooth/bluez.git;

4
pkgs/os-specific/linux/libcap-ng/default.nix
View File

@ -6,11 +6,11 @@ stdenv.mkDerivation rec {
pname = "libcap-ng";
# When updating make sure to test that the version with
# all of the python bindings still works
version = "0.7.9";
version = "0.7.10";
src = fetchurl {
url = "${meta.homepage}/${pname}-${version}.tar.gz";
sha256 = "0a0k484kwv0zilry2mbl9k56cnpdhsjxdxin17jas6kkyfy345aa";
sha256 = "1gzzy12agfa9ddipdf72h9y68zqqnvsjjylv4vnq6hj4w2safk58";
};
nativeBuildInputs = [ swig ];

6
pkgs/os-specific/linux/sysstat/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, gettext, bzip2 }:
stdenv.mkDerivation rec {
name = "sysstat-12.2.0";
name = "sysstat-12.3.1";
src = fetchurl {
url = "http://pagesperso-orange.fr/sebastien.godard/${name}.tar.xz";
sha256 = "0xc3983ccr0dwab1px2jhbgj86pfmmr29k7ggnwjwm1qigmriak1";
sha256 = "1hf1sy7akribmgavadqccxpy49yv0zfb3m81d2bj6jf8pyzwcrbq";
};
buildInputs = [ gettext ];
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
patches = [ ./install.patch ];
meta = {
homepage = http://sebastien.godard.pagesperso-orange.fr/;
homepage = "http://sebastien.godard.pagesperso-orange.fr/";
description = "A collection of performance monitoring tools for Linux (such as sar, iostat and pidstat)";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;

8
pkgs/os-specific/linux/systemd/default.nix
View File

@ -30,7 +30,7 @@ let gnupg-minimal = gnupg.override {
bzip2 = null;
};
in stdenv.mkDerivation {
version = "243.4";
version = "243.7";
pname = "systemd";
# When updating, use https://github.com/systemd/systemd-stable tree, not the development one!
@ -38,8 +38,8 @@ in stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "nixos";
repo = "systemd";
rev = "d8853d39a28b9884e0acd3ae5732a1e7caaf08af";
sha256 = "1wqm51i2czbbb3nara11mnxzqng4na1l8fvz7qnbxcrjsqm7hz18";
rev = "e7d881488292fc8bdf96acd12767eca1bd65adae";
sha256 = "0haj3iff3y13pm4w5dbqj1drp5wryqfad58jbbmnb6zdgis56h8f";
};
outputs = [ "out" "lib" "man" "dev" ];
@ -258,7 +258,7 @@ in stdenv.mkDerivation {
passthru.interfaceVersion = 2;
meta = with stdenv.lib; {
homepage = http://www.freedesktop.org/wiki/Software/systemd;
homepage = "https://www.freedesktop.org/wiki/Software/systemd/";
description = "A system and service manager for Linux";
license = licenses.lgpl21Plus;
platforms = platforms.linux;

4
pkgs/servers/sql/mariadb/connector-c/3_1.nix
View File

@ -1,6 +1,6 @@
{ callPackage, ... } @ args:
callPackage ./. (args // {
version = "3.1.5";
sha256 = "1mfrm595kfnpjladaq6m184npa3rxff9pr1vwa35r057s7nmzpm9";
version = "3.1.7";
sha256 = "16pmdms454jbralaw6rpx0rjlf2297p6h3q8wfk0n87kbn7vrxv4";
})

1
pkgs/servers/sql/mariadb/connector-c/default.nix
View File

@ -41,6 +41,7 @@ stdenv.mkDerivation {
ln -sv mariadb $out/lib/mysql
ln -sv mariadb $out/include/mysql
ln -sv mariadb_version.h $out/include/mariadb/mysql_version.h
ln -sv libmariadb.pc $out/lib/pkgconfig/mysqlclient.pc
'';
meta = {

5
pkgs/servers/sql/postgresql/default.nix
View File

@ -3,7 +3,7 @@ let
generic =
# dependencies
{ stdenv, lib, fetchurl, makeWrapper
, glibc, zlib, readline, openssl, openssl_1_0_2, icu, systemd, libossp_uuid
, glibc, zlib, readline, openssl, icu, systemd, libossp_uuid
, pkgconfig, libxml2, tzdata
# This is important to obtain a version of `libpq` that does not depend on systemd.
@ -32,10 +32,9 @@ let
setOutputFlags = false; # $out retains configureFlags :-/
buildInputs =
[ zlib readline libxml2 makeWrapper ]
[ zlib readline openssl libxml2 makeWrapper ]
++ lib.optionals icuEnabled [ icu ]
++ lib.optionals enableSystemd [ systemd ]
++ [ (if atLeast "9.5" then openssl else openssl_1_0_2) ]
++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ];
nativeBuildInputs = lib.optionals icuEnabled [ pkgconfig ];

4
pkgs/tools/networking/network-manager/default.nix
View File

@ -10,11 +10,11 @@ let
pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]);
in stdenv.mkDerivation rec {
pname = "network-manager";
version = "1.22.6";
version = "1.22.8";
src = fetchurl {
url = "mirror://gnome/sources/NetworkManager/${stdenv.lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";
sha256 = "0r65hk7nw44jq4k6h91wrprr0x9410ibd1n7mpmlh4f4kgy276dw";
sha256 = "0kxbgln78lb1cxhd79vbpdbncsb0cppr15fycgqb9df6f8nbj4cm";
};
outputs = [ "out" "dev" "devdoc" "man" "doc" ];

27
pkgs/tools/networking/openssh/default.nix
View File

@ -4,6 +4,8 @@
, withKerberos ? true
, withGssapiPatches ? false
, kerberos
, libfido2
, withFIDO ? stdenv.hostPlatform.isUnix
, linkOpenssl? true
}:
@ -12,25 +14,25 @@ let
# **please** update this patch when you update to a new openssh release.
gssapiPatch = fetchpatch {
name = "openssh-gssapi.patch";
url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%258.1p1-2/debian/patches/gssapi.patch";
sha256 = "0zfxx46a5lpjp317z354yyswa2wvmb1pp5p0nxsbhsrzw94jvxsj";
url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%258.2p1-1/debian/patches/gssapi.patch";
sha256 = "081gryqkfr5zr4f5m4v0piq1sxz06sb38z5lqxccgpivql7pa8d8";
};
in
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "openssh";
version = if hpnSupport then "7.8p1" else "8.1p1";
version = if hpnSupport then "8.1p1" else "8.2p1";
src = if hpnSupport then
fetchurl {
url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-7_8_P1.tar.gz";
sha256 = "05q5hxx7fzcgd8a5i0zk4fwvmnz4xqk04j489irnwm7cka7xdqxw";
url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-8_1_P1.tar.gz";
sha256 = "1xiv28df9c15h44fv1i93fq8rvkyapjj9vj985ndnw3xk1nvqjyd";
}
else
fetchurl {
url = "mirror://openbsd/OpenSSH/portable/${pname}-${version}.tar.gz";
sha256 = "1zwk3g57gb13br206k6jdhgnp6y1nibwswzraqspbl1m73pxpx82";
sha256 = "0wg6ckzvvklbzznijxkk28fb8dnwyjd0w30ra0afwv6gwr8m34j3";
};
patches =
@ -41,15 +43,7 @@ stdenv.mkDerivation rec {
./dont_create_privsep_path.patch
./ssh-keysign.patch
] ++ optional hpnSupport
# CVE-2018-20685, can probably be dropped with next version bump
# See https://sintonen.fi/advisories/scp-client-multiple-vulnerabilities.txt
# for details
(fetchpatch {
name = "CVE-2018-20685.patch";
url = https://github.com/openssh/openssh-portable/commit/6010c0303a422a9c5fa8860c061bf7105eb7f8b2.patch;
sha256 = "0q27i9ymr97yb628y44qi4m11hk5qikb1ji1vhvax8hp18lwskds";
})
]
++ optional withGssapiPatches (assert withKerberos; gssapiPatch);
postPatch =
@ -61,6 +55,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ] ++ optional (hpnSupport || withGssapiPatches) autoreconfHook;
buildInputs = [ zlib openssl libedit pam ]
++ optional withFIDO libfido2
++ optional withKerberos kerberos;
preConfigure = ''
@ -80,6 +75,7 @@ stdenv.mkDerivation rec {
"--disable-strip"
(if pam != null then "--with-pam" else "--without-pam")
] ++ optional (etcDir != null) "--sysconfdir=${etcDir}"
++ optional withFIDO "--with-security-key-builtin=yes"
++ optional withKerberos (assert kerberos != null; "--with-kerberos5=${kerberos}")
++ optional stdenv.isDarwin "--disable-libutil"
++ optional (!linkOpenssl) "--without-openssl";
@ -108,6 +104,5 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.bsd2;
platforms = platforms.unix ++ platforms.windows;
maintainers = with maintainers; [ eelco aneeshusa ];
broken = hpnSupport;
};
}

4
pkgs/tools/system/gptfdisk/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gptfdisk";
version = "1.0.4";
version = "1.0.5";
src = fetchurl {
# https://www.rodsbooks.com/gdisk/${name}.tar.gz also works, but the home
# page clearly implies a preference for using SourceForge's bandwidth:
url = "mirror://sourceforge/gptfdisk/${pname}-${version}.tar.gz";
sha256 = "13d7gff4prl1nsdknjigmb7bbqhn79165n01v4y9mwbnd0d3jqxn";
sha256 = "0bybgp30pqxb6x5krxazkq4drca0gz4inxj89fpyr204rn3kjz8f";
};
postPatch = ''

24
pkgs/top-level/all-packages.nix
View File

@ -8389,7 +8389,14 @@ in
buildPackages = buildPackages // { stdenv = gcc8Stdenv; };
});
go = go_1_13;
go_1_14 = callPackage ../development/compilers/go/1.14.nix ({
inherit (darwin.apple_sdk.frameworks) Security Foundation;
} // lib.optionalAttrs stdenv.isAarch64 {
stdenv = gcc8Stdenv;
buildPackages = buildPackages // { stdenv = gcc8Stdenv; };
});
go = go_1_14;
go-repo-root = callPackage ../development/tools/go-repo-root { };
@ -15020,18 +15027,23 @@ in
buildGo113Package = callPackage ../development/go-packages/generic {
go = buildPackages.go_1_13;
};
buildGo114Package = callPackage ../development/go-packages/generic {
go = buildPackages.go_1_14;
};
buildGoPackage = buildGo113Package;
buildGoPackage = buildGo114Package;
buildGo112Module = callPackage ../development/go-modules/generic {
go = buildPackages.go_1_12;
};
buildGo113Module = callPackage ../development/go-modules/generic {
go = buildPackages.go_1_13;
};
buildGo114Module = callPackage ../development/go-modules/generic {
go = buildPackages.go_1_14;
};
buildGoModule = buildGo113Module;
buildGoModule = buildGo114Module;
go2nix = callPackage ../development/tools/go2nix { };
@ -15340,9 +15352,7 @@ in
gofish = callPackage ../servers/gopher/gofish { };
grafana = callPackage ../servers/monitoring/grafana {
buildGoPackage = buildGo113Package;
};
grafana = callPackage ../servers/monitoring/grafana { };
grafana-loki = callPackage ../servers/monitoring/loki { };