alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge master into staging-next

Browse source
This commit is contained in:
Frederik Rietdijk 2019-08-31 18:04:31 +02:00
parent 4b515cf6ef cbbe9f0f21
commit 96e5474329
33 changed files with 545 additions and 165 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View file

@ -1822,6 +1822,12 @@
githubId = 18535642;
name = "Emily";
};
endocrimes = {
email = "dani@builds.terrible.systems";
github = "endocrimes";
githubId = 1330683;
name = "Danielle Lancashire";
};
ederoyd46 = {
email = "matt@ederoyd.co.uk";
github = "ederoyd46";

2
nixos/modules/module-list.nix
View file

@ -152,12 +152,14 @@
./programs/tmux.nix
./programs/tsm-client.nix
./programs/udevil.nix
./programs/usbtop.nix
./programs/venus.nix
./programs/vim.nix
./programs/wavemon.nix
./programs/way-cooler.nix
./programs/waybar.nix
./programs/wireshark.nix
./programs/x2goserver.nix
./programs/xfs_quota.nix
./programs/xonsh.nix
./programs/xss-lock.nix

21
nixos/modules/programs/usbtop.nix Normal file
View file

@ -0,0 +1,21 @@
{ config, pkgs, lib, ... }:
with lib;
let
cfg = config.programs.usbtop;
in {
options = {
programs.usbtop.enable = mkEnableOption "usbtop and required kernel module";
};
config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [
usbtop
];
boot.kernelModules = [
"usbmon"
];
};
}

148
nixos/modules/programs/x2goserver.nix Normal file
View file

@ -0,0 +1,148 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.programs.x2goserver;
defaults = {
superenicer = { "enable" = cfg.superenicer.enable; };
};
confText = generators.toINI {} (recursiveUpdate defaults cfg.settings);
x2goServerConf = pkgs.writeText "x2goserver.conf" confText;
x2goAgentOptions = pkgs.writeText "x2goagent.options" ''
X2GO_NXOPTIONS=""
X2GO_NXAGENT_DEFAULT_OPTIONS="${concatStringsSep " " cfg.nxagentDefaultOptions}"
'';
in {
options.programs.x2goserver = {
enable = mkEnableOption "x2goserver" // {
description = ''
Enables the x2goserver module.
NOTE: This will create a good amount of symlinks in `/usr/local/bin`
'';
};
superenicer = {
enable = mkEnableOption "superenicer" // {
description = ''
Enables the SupeReNicer code in x2gocleansessions, this will renice
suspended sessions to nice level 19 and renice them to level 0 if the
session becomes marked as running again
'';
};
};
nxagentDefaultOptions = mkOption {
type = types.listOf types.str;
default = [ "-extension GLX" "-nolisten tcp" ];
example = [ "-extension GLX" "-nolisten tcp" ];
description = ''
List of default nx agent options.
'';
};
settings = mkOption {
type = types.attrsOf types.attrs;
default = {};
description = ''
x2goserver.conf ini configuration as nix attributes. See
`x2goserver.conf(5)` for details
'';
example = literalExample ''
superenicer = {
"enable" = "yes";
"idle-nice-level" = 19;
};
telekinesis = { "enable" = "no"; };
'';
};
};
config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.x2goserver ];
users.groups.x2go = {};
users.users.x2go = {
home = "/var/lib/x2go/db";
group = "x2go";
};
security.wrappers.x2gosqliteWrapper = {
source = "${pkgs.x2goserver}/lib/x2go/libx2go-server-db-sqlite3-wrapper.pl";
owner = "x2go";
group = "x2go";
setgid = true;
};
security.wrappers.x2goprintWrapper = {
source = "${pkgs.x2goserver}/bin/x2goprint";
owner = "x2go";
group = "x2go";
setgid = true;
};
systemd.tmpfiles.rules = with pkgs; [
"d /var/lib/x2go/ - x2go x2go - -"
"d /var/lib/x2go/db - x2go x2go - -"
"d /var/lib/x2go/conf - x2go x2go - -"
"d /run/x2go 0755 x2go x2go - -"
] ++
# x2goclient sends SSH commands with preset PATH set to
# "/usr/local/bin;/usr/bin;/bin". Since we cannot filter arbitrary ssh
# commands, we have to make the following executables available.
map (f: "L+ /usr/local/bin/${f} - - - - ${x2goserver}/bin/${f}") [
"x2goagent" "x2gobasepath" "x2gocleansessions" "x2gocmdexitmessage"
"x2godbadmin" "x2gofeature" "x2gofeaturelist" "x2gofm" "x2gogetapps"
"x2gogetservers" "x2golistdesktops" "x2golistmounts" "x2golistsessions"
"x2golistsessions_root" "x2golistshadowsessions" "x2gomountdirs"
"x2gopath" "x2goprint" "x2goresume-desktopsharing" "x2goresume-session"
"x2goruncommand" "x2goserver-run-extensions" "x2gosessionlimit"
"x2gosetkeyboard" "x2goshowblocks" "x2gostartagent"
"x2gosuspend-desktopsharing" "x2gosuspend-session"
"x2goterminate-desktopsharing" "x2goterminate-session"
"x2goumount-session" "x2goversion"
] ++ [
"L+ /usr/local/bin/awk - - - - ${gawk}/bin/awk"
"L+ /usr/local/bin/chmod - - - - ${coreutils}/bin/chmod"
"L+ /usr/local/bin/cp - - - - ${coreutils}/bin/cp"
"L+ /usr/local/bin/sed - - - - ${gnused}/bin/sed"
"L+ /usr/local/bin/setsid - - - - ${utillinux}/bin/setsid"
"L+ /usr/local/bin/xrandr - - - - ${xorg.xrandr}/bin/xrandr"
"L+ /usr/local/bin/xmodmap - - - - ${xorg.xmodmap}/bin/xmodmap"
];
systemd.services.x2goserver = {
description = "X2Go Server Daemon";
wantedBy = [ "multi-user.target" ];
unitConfig.Documentation = "man:x2goserver.conf(5)";
serviceConfig = {
Type = "forking";
ExecStart = "${pkgs.x2goserver}/bin/x2gocleansessions";
PIDFile = "/run/x2go/x2goserver.pid";
User = "x2go";
Group = "x2go";
RuntimeDirectory = "x2go";
StateDirectory = "x2go";
};
preStart = ''
if [ ! -e /var/lib/x2go/setup_ran ]
then
mkdir -p /var/lib/x2go/conf
cp -r ${pkgs.x2goserver}/etc/x2go/* /var/lib/x2go/conf/
ln -sf ${x2goServerConf} /var/lib/x2go/conf/x2goserver.conf
ln -sf ${x2goAgentOptions} /var/lib/x2go/conf/x2goagent.options
${pkgs.x2goserver}/bin/x2godbadmin --createdb
touch /var/lib/x2go/setup_ran
fi
'';
};
# https://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=276
security.sudo.extraConfig = ''
Defaults env_keep+=QT_GRAPHICSSYSTEM
'';
};
}

1
pkgs/applications/misc/yubioath-desktop/default.nix
View file

@ -44,6 +44,7 @@ mkDerivation rec {
cp resources/icons/*.{icns,ico,png,xpm} $out/share/yubioath/icons
substituteInPlace $out/share/applications/yubioath-desktop.desktop \
--replace 'Exec=yubioath-desktop' "Exec=$out/bin/yubioath-desktop" \
--replace 'Icon=yubioath' "Icon=$out/share/yubioath/icons/yubioath.png"
'';
meta = with stdenv.lib; {

41
pkgs/applications/networking/flent/default.nix
View file

@ -1,30 +1,39 @@
{ stdenv, buildPythonApplication, fetchFromGitHub, matplotlib, procps, pyqt5
, sphinx
}:
{ stdenv, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5, python
, pythonPackages, qt5, sphinx, xvfb_run }:
buildPythonApplication rec {
pname = "flent";
version = "1.2.2";
src = fetchFromGitHub {
owner = "tohojo";
repo = "flent";
rev = "v${version}";
sha256 = "1llcdakk0nk9xlpjjz7mv4a80yq4sjnbqhaqvyj9m6lbcxgssh2r";
version = "1.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "099779i0ghjd9ikq77z6m6scnlmk946lw9issrgz8zm7babiw4d7";
};
buildInputs = [ sphinx ];
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
propagatedBuildInputs = [ matplotlib procps pyqt5 ];
checkInputs = [ procps pythonPackages.mock pyqt5 xvfb_run ];
checkInputs = [ procps ];
checkPhase = ''
cat >test-runner <<EOF
#!/bin/sh
propagatedBuildInputs = [
matplotlib
procps
pyqt5
];
${python.pythonForBuild.interpreter} nix_run_setup test
EOF
chmod +x test-runner
wrapQtApp test-runner --prefix PYTHONPATH : $PYTHONPATH
xvfb-run -s '-screen 0 800x600x24' ./test-runner
'';
postInstall = ''
for program in $out/bin/*; do
wrapQtApp $program --prefix PYTHONPATH : $PYTHONPATH
done
'';
meta = with stdenv.lib; {
description = "The FLExible Network Tester";
homepage = https://flent.org;
homepage = "https://flent.org";
license = licenses.gpl3;
maintainers = [ maintainers.mmlb ];

6
pkgs/applications/networking/instant-messengers/discord/default.nix
View file

@ -27,10 +27,10 @@ in {
pname = "discord-canary";
binaryName = "DiscordCanary";
desktopName = "Discord Canary";
version = "0.0.93";
version = "0.0.95";
src = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/0.0.93/discord-canary-0.0.93.tar.gz";
sha256 = "1jzm5fm7a1p68ims7bv5am0bpbvrhbynzblpj9qrzzrwakdaywbi";
url = "https://dl-canary.discordapp.net/apps/linux/0.0.95/discord-canary-0.0.95.tar.gz";
sha256 = "06qhm73kc88pq0lgbi7qjy4gx9ighkmx128fdm1dpzfv62fjdasw";
};
};
}.${branch}

93
pkgs/applications/networking/remote/x2goserver/default.nix Normal file
View file

@ -0,0 +1,93 @@
{ stdenv, lib, fetchurl, perlPackages, makeWrapper, perl, which, nx-libs
, utillinux, coreutils, glibc, gawk, gnused, gnugrep, findutils, xorg
, nettools, iproute, bc, procps, psmisc, lsof, pwgen, openssh, sshfs, bash
}:
let
pname = "x2goserver";
version = "4.1.0.3";
src = fetchurl {
url = "http://code.x2go.org/releases/source/x2goserver/${pname}-${version}.tar.gz";
sha256 = "1l6wd708kbipib4ldprfiihqmj4895nifg0bkws4x97majislxk7";
};
x2go-perl = perlPackages.buildPerlPackage rec {
pname = "X2Go";
inherit version src;
makeFlags = [ "-f" "Makefile.perl" ];
patchPhase = ''
substituteInPlace X2Go/Config.pm --replace '/etc/x2go' '/var/lib/x2go/conf'
substituteInPlace X2Go/Server/DB.pm \
--replace '$x2go_lib_path/libx2go-server-db-sqlite3-wrapper' \
'/run/wrappers/bin/x2gosqliteWrapper'
substituteInPlace X2Go/Server/DB/SQLite3.pm --replace "user='x2gouser'" "user='x2go'"
'';
};
perlEnv = perl.withPackages (p: with p; [
x2go-perl DBI DBDSQLite FileBaseDir TryTiny CaptureTiny ConfigSimple Switch
]);
binaryDeps = [
perlEnv which nx-libs utillinux coreutils glibc.bin gawk gnused gnugrep
findutils nettools iproute bc procps psmisc lsof pwgen openssh sshfs
xorg.xauth xorg.xinit xorg.xrandr xorg.xmodmap xorg.xwininfo xorg.fontutil
xorg.xkbcomp xorg.setxkbmap
];
in
stdenv.mkDerivation rec {
inherit pname version src;
buildInputs = [ perlEnv bash ];
nativeBuildInputs = [ makeWrapper ];
prePatch = ''
patchShebangs .
sed -i '/Makefile.PL\|Makefile.perl/d' Makefile
for i in */Makefile; do
substituteInPlace "$i" --replace "-o root -g root " ""
done
substituteInPlace libx2go-server-db-perl/Makefile --replace "chmod 2755" "chmod 755"
for i in x2goserver/sbin/x2godbadmin x2goserver/bin/x2go*
do
substituteInPlace $i --replace '/etc/x2go' '/var/lib/x2go/conf'
done
substituteInPlace x2goserver/sbin/x2gocleansessions \
--replace '/var/run/x2goserver.pid' '/var/run/x2go/x2goserver.pid'
substituteInPlace x2goserver/sbin/x2godbadmin --replace 'user="x2gouser"' 'user="x2go"'
substituteInPlace x2goserver-xsession/etc/Xsession \
--replace "SSH_AGENT /bin/bash -c" "SSH_AGENT ${bash}/bin/bash -c" \
--replace "[ -f /etc/redhat-release ]" "[ -d /etc/nix ] || [ -f /etc/redhat-release ]"
'';
makeFlags = [ "PREFIX=/" "NXLIBDIR=${nx-libs}/lib/nx" ];
installFlags = [ "DESTDIR=$(out)" ];
postInstall = ''
mv $out/etc/x2go/x2goserver.conf{,.example}
mv $out/etc/x2go/x2goagent.options{,.example}
ln -sf ${nx-libs}/bin/nxagent $out/bin/x2goagent
for i in $out/sbin/x2go* $(find $out/bin -type f) \
$(ls $out/lib/x2go/x2go* | grep -v x2gocheckport)
do
wrapProgram $i --prefix PATH : ${lib.makeBinPath binaryDeps}:$out
done
# We're patching @INC of the setgid wrapper, because we can't mix
# the perl wrapper (for PERL5LIB) with security.wrappers (for setgid)
sed -ie "s,.\+bin/perl,#!${perl}/bin/perl -I ${perlEnv}/lib/perl5/site_perl," \
$out/lib/x2go/libx2go-server-db-sqlite3-wrapper.pl
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Remote desktop application, server component";
homepage = "http://x2go.org/";
platforms = stdenv.lib.platforms.linux;
license = licenses.gpl2;
maintainers = [ maintainers.averelld ];
};
}

31
pkgs/applications/science/biology/trimal/default.nix Executable file
View file

@ -0,0 +1,31 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "trimal";
version = "1.4.1";
src = fetchFromGitHub {
repo = pname;
owner = "scapella";
rev = "v${version}";
sha256 = "0isc7s3514di4z953xq53ncjkbi650sh4q9yyw5aag1n9hqnh7k0";
};
postUnpack = ''
sourceRoot=''${sourceRoot}/source
echo Source root reset to ''${sourceRoot}
'';
installPhase = ''
mkdir -p $out/bin
cp -a trimal readal statal $out/bin
'';
meta = with stdenv.lib; {
description = "A tool for the automated removal of spurious sequences or poorly aligned regions from a multiple sequence alignment";
license = licenses.gpl3;
platforms = platforms.linux;
homepage = http://trimal.cgenomics.org;
maintainers = [ maintainers.bzizou ];
};
}

17
pkgs/applications/science/math/pari/default.nix
View file

@ -1,6 +1,5 @@
{ stdenv
, fetchurl
, fetchpatch
, gmp
, readline
, libX11
@ -13,25 +12,13 @@ assert withThread -> libpthreadstubs != null;
stdenv.mkDerivation rec {
pname = "pari";
version = "2.11.1";
version = "2.11.2";
src = fetchurl {
url = "https://pari.math.u-bordeaux.fr/pub/pari/unix/${pname}-${version}.tar.gz";
sha256 = "1jfax92jpydjd02fwl30r6b8kfzqqd6sm4yx94gidyz9lqjb7a94";
sha256 = "0fck8ssmirl8fy7s4mspgrxjs5sag76xbshqlqzkcl3kqyrk4raa";
};
patches = [
# Fix a off-by-one bug that can potentially lead to segfaults (accepted upstream)
# https://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?bug=2117
# https://trac.sagemath.org/ticket/27335
(fetchpatch {
name = "fix-off-by-one-error.patch";
# only relevant parts of https://pari.math.u-bordeaux.fr/cgi-bin/gitweb.cgi?p=pari.git;a=patch;h=aa1ee6e0898d177e6bcf49237d82c804bc410985
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pari/patches/red_montgomery.patch?id=bbea55c96e1f05302b3c7f593cf64492497047c5";
sha256 = "0vqkmhgv9splsdswp6zjnkj50z76rc1m6k9iy3cf9dxwqw3h3nr6";
})
];
buildInputs = [
gmp
readline

37
pkgs/applications/science/misc/colmap/default.nix Normal file
View file

@ -0,0 +1,37 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, boost, ceres-solver, eigen,
freeimage, glog, libGLU, glew, qtbase,
cudaSupport ? false, cudatoolkit ? null }:
assert !cudaSupport || cudatoolkit != null;
let boost_static = boost.override { enableStatic = true; };
in
mkDerivation rec {
version = "3.5";
pname = "colmap";
src = fetchFromGitHub {
owner = "colmap";
repo = "colmap";
rev = version;
sha256 = "1vnb62p0y2bnga173wmjs0lnyqdjikv0fkcxjzxm8187khk2lly8";
};
buildInputs = [
boost_static ceres-solver eigen
freeimage glog libGLU glew qtbase
] ++ lib.optional cudaSupport cudatoolkit;
nativeBuildInputs = [ cmake ];
meta = with lib; {
description = "COLMAP - Structure-From-Motion and Multi-View Stereo pipeline";
longDescription = ''
COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline
with a graphical and command-line interface.
'';
homepage = https://colmap.github.io/index.html;
license = licenses.bsd2;
platforms = platforms.linux;
maintainers = with maintainers; [ lebastr ];
};
}

24
pkgs/development/compilers/glslang/default.nix
View file

@ -1,16 +1,29 @@
{ stdenv, fetchFromGitHub, cmake, bison, jq, python, spirv-tools, spirv-headers }:
{ stdenv, fetchFromGitHub
, bison
, cmake
, jq
, python3
, spirv-headers
, spirv-tools
}:
stdenv.mkDerivation rec {
pname = "glslang";
version = "7.11.3113";
version = "7.11.3214";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "glslang";
rev = "${version}";
sha256 = "1kzv2b4q1fddxd7c0hc754nd6rw6y9vijb9fsi13xzzq9dficgb6";
rev = version;
sha256 = "0dqjga0lcza006fhac26zp2plbq4gx8a6nsmrwkqlzji6lw1jins";
};
nativeBuildInputs = [ cmake python bison jq ];
# These get set at all-packages, keep onto them for child drvs
passthru = {
inherit spirv-tools spirv-headers;
};
nativeBuildInputs = [ cmake python3 bison jq ];
enableParallelBuilding = true;
postPatch = ''
@ -18,6 +31,7 @@ stdenv.mkDerivation rec {
ln -s "${spirv-headers.src}" External/spirv-tools/external/spirv-headers
'';
# Ensure spirv-headers and spirv-tools match exactly to what is expected
preConfigure = ''
HEADERS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools/external/spirv-headers"))[0].commit')
TOOLS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools"))[0].commit')

3
pkgs/development/libraries/opencv/3.x.nix
View file

@ -14,7 +14,8 @@
, enableOpenblas ? true, openblas
, enableContrib ? true
, enableCuda ? config.cudaSupport or false, cudatoolkit
, enableCuda ? (config.cudaSupport or false) &&
stdenv.hostPlatform.isx86_64, cudatoolkit
, enableUnfree ? false
, enableIpp ? false

3
pkgs/development/libraries/opencv/4.x.nix
View file

@ -14,7 +14,8 @@
, enableOpenblas ? true, openblas
, enableContrib ? true
, enableCuda ? config.cudaSupport or false, cudatoolkit
, enableCuda ? (config.cudaSupport or false) &&
stdenv.hostPlatform.isx86_64, cudatoolkit
, enableUnfree ? false
, enableIpp ? false

7
pkgs/development/libraries/spirv-headers/default.nix
View file

@ -1,13 +1,14 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "spirv-headers";
version = "2019.1"; # spirv-tools version whose DEPS file calls for this commit
version = "1.4.1";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Headers";
rev = "79b6681aadcb53c27d1052e5f8a0e82a981dbf2f"; # from spirv-tools' DEPS
sha256 = "0flng2rdmc4ndq3j71h6wk1ibcjvhjrg2rzd6rv445vcsf0jh2pj";
rev = version;
sha256 = "1zfmvg3x0q9w652s8g5m5rcckzm6jiiw8rif2qck4vlsryl55akp";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/libraries/vulkan-headers/default.nix
View file

@ -3,13 +3,13 @@ stdenv.mkDerivation rec {
pname = "vulkan-headers";
version = "1.1.106";
buildInputs = [ cmake ];
nativeBuildInputs = [ cmake ];
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-Headers";
rev = "sdk-${version}";
sha256 = "0idw7q715ikj575qmspvgq2gzc6c1sj581b8z3xnv6wz9qbzrmsd";
sha256 = "0fdvh26nxibylh32lj8b62d9nf9j25xa0il9zg362wmr2zgm8gka";
};
meta = with stdenv.lib; {

8
pkgs/development/libraries/vulkan-loader/default.nix
View file

@ -2,7 +2,7 @@
, xlibsWrapper, libxcb, libXrandr, libXext, wayland, addOpenGLRunpath }:
let
version = "1.1.106";
version = "1.1.114.0";
in
assert version == vulkan-headers.version;
@ -14,17 +14,15 @@ stdenv.mkDerivation rec {
owner = "KhronosGroup";
repo = "Vulkan-Loader";
rev = "sdk-${version}";
sha256 = "0zhrwj1gi90x2w8gaaaw5h4b969a8gfy244kn0drrplhhb1nqz3b";
sha256 = "08nibkbjf3g32qyp5bpdvj7i0zdv5ds1n5y52z8pvyzkpiz7s6ww";
};
nativeBuildInputs = [ pkgconfig addOpenGLRunpath ];
buildInputs = [ cmake python3 xlibsWrapper libxcb libXrandr libXext wayland ];
enableParallelBuilding = true;
patches = [ ./system-search-path.patch ];
cmakeFlags = [
"-DSYSTEM_SEARCH_PATH=${addOpenGLRunpath.driverLink}/share"
"-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share"
"-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}"
];

45
pkgs/development/libraries/vulkan-loader/system-search-path.patch
View file

@ -1,45 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ac5ce835..cbdb0ff56 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,6 +88,12 @@ if(UNIX)
STRING
"Search path to use when XDG_DATA_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant."
)
+ set(
+ SYSTEM_SEARCH_PATH ""
+ CACHE
+ STRING
+ "Search path to always use, after all other search paths."
+ )
endif()
if(UNIX AND NOT APPLE) # i.e.: Linux
@@ -184,6 +190,7 @@ if(UNIX)
add_definitions(-DFALLBACK_CONFIG_DIRS="${FALLBACK_CONFIG_DIRS}")
add_definitions(-DFALLBACK_DATA_DIRS="${FALLBACK_DATA_DIRS}")
add_definitions(-DSYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}")
+ add_definitions(-DSYSTEM_SEARCH_PATH="${SYSTEM_SEARCH_PATH}")
# Make sure /etc is searched by the loader
if(NOT (CMAKE_INSTALL_FULL_SYSCONFDIR STREQUAL "/etc"))
diff --git a/loader/loader.c b/loader/loader.c
index 0d3b5a947..abe357004 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -3688,6 +3688,7 @@ static VkResult ReadDataFilesInSearchPaths(const struct loader_instance *inst, e
search_path_size += DetermineDataFilePathSize(xdgdatahome, rel_size);
search_path_size += DetermineDataFilePathSize(home_root, rel_size);
}
+ search_path_size += DetermineDataFilePathSize(SYSTEM_SEARCH_PATH, rel_size);
#endif
}
}
@@ -3737,6 +3738,7 @@ static VkResult ReadDataFilesInSearchPaths(const struct loader_instance *inst, e
CopyDataFilePath(xdgdatahome, relative_location, rel_size, &cur_path_ptr);
CopyDataFilePath(home_root, relative_location, rel_size, &cur_path_ptr);
}
+ CopyDataFilePath(SYSTEM_SEARCH_PATH, relative_location, rel_size, &cur_path_ptr);
}
// Remove the last path separator

13
pkgs/development/mobile/cocoapods/Gemfile-beta.lock
View file

@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.0)
CFPropertyList (3.0.1)
activesupport (4.2.11.1)
i18n (~> 0.7)
minitest (~> 5.1)
@ -12,16 +12,16 @@ GEM
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.3)
cocoapods (1.8.0.beta.1)
cocoapods (1.8.0.beta.2)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.8.0.beta.1)
cocoapods-core (= 1.8.0.beta.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-stats (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.3.1, < 2.0)
cocoapods-trunk (>= 1.4.0, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
@ -31,9 +31,10 @@ GEM
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.11.1, < 2.0)
cocoapods-core (1.8.0.beta.1)
cocoapods-core (1.8.0.beta.2)
activesupport (>= 4.0.2, < 6)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.0)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
cocoapods-deintegrate (1.0.4)
@ -42,7 +43,7 @@ GEM
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.1.0)
cocoapods-trunk (1.3.1)
cocoapods-trunk (1.4.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.1.0)

18
pkgs/development/mobile/cocoapods/gemset-beta.nix
View file

@ -36,10 +36,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ykjag3k5msz3sf1j91rb55da2xh596y06m3a4yl79fiy2id0w9z";
sha256 = "0fr8sdzs2q1969zqh790w223hjidlwx4hfm4c91gj0va5j5pv3n8";
type = "gem";
};
version = "3.0.0";
version = "3.0.1";
};
claide = {
groups = ["default"];
@ -57,21 +57,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gs9ybf1zbajhsn591dwh2papj0bs1dzbnw8shbsm4mfqz976y54";
sha256 = "1qsj34czqsy93w2bnwhdhr0cyzjwl7vy3sknmak4syyni6m0rlli";
type = "gem";
};
version = "1.8.0.beta.1";
version = "1.8.0.beta.2";
};
cocoapods-core = {
dependencies = ["activesupport" "algoliasearch" "fuzzy_match" "nap"];
dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02c0415b7iridf0gypajm4i3vqpq8zs6vx8bw49rm70l554jp14j";
sha256 = "166pr9m3da9hsra9rviaxz3i4spm7kl003mkn7sn25r9smcvfdj4";
type = "gem";
};
version = "1.8.0.beta.1";
version = "1.8.0.beta.2";
};
cocoapods-deintegrate = {
groups = ["default"];
@ -130,10 +130,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1plssgabdv6hcaq1c3gf43kf1d2prx883q8lzdr6chi5byzzs3yl";
sha256 = "1m0p27aij7d0n0b8h7nvyv3q3prcpwisbj7sla0fp2hvn4lqarl5";
type = "gem";
};
version = "1.3.1";
version = "1.4.0";
};
cocoapods-try = {
groups = ["default"];

26
pkgs/development/python-modules/mailman-hyperkitty/default.nix Normal file
View file

@ -0,0 +1,26 @@
{ stdenv, buildPythonPackage, fetchPypi, mailman, mock }:
buildPythonPackage rec {
pname = "mailman-hyperkitty";
version = "1.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "1lfqa9admhvdv71f528jmz2wl0i5cv77v6l64px2pm4zqr9ckkjx";
};
propagatedBuildInputs = [ mailman ];
checkInputs = [ mock ];
checkPhase = ''
python -m nose2 -v
'';
doCheck = false;
meta = with stdenv.lib; {
description = "Mailman archiver plugin for HyperKitty";
homepage = https://gitlab.com/mailman/mailman-hyperkitty;
license = licenses.gpl3;
maintainers = with maintainers; [ globin peti ];
};
}

4
pkgs/development/python-modules/thespian/default.nix
View file

@ -1,13 +1,13 @@
{ fetchPypi, buildPythonPackage, lib }:
buildPythonPackage rec {
version = "3.9.9";
version = "3.9.10";
pname = "thespian";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "c89e1973465feb88b694f3884d24723932a6b0e4df8d909f61e44ff371af7380";
sha256 = "bffb04b93afcbab0268332445f02757c326f95056eb7e1e2f0515c1dfb92ac7d";
};
# Do not run the test suite: it takes a long time and uses

23
pkgs/development/tools/gotestsum/default.nix Normal file
View file

@ -0,0 +1,23 @@
{ stdenv, fetchFromGitHub, buildGoModule }:
buildGoModule rec {
pname = "gotestsum";
version = "0.3.5";
src = fetchFromGitHub {
owner = "gotestyourself";
repo = "gotestsum";
rev = "v${version}";
sha256 = "1d4sbvk9wqzl3g3da8inqdkvd43rkwvmq969jlgl1k1agv5xjxqv";
};
modSha256 = "1dgs643pmcw68yc003zss52hbvsy6hxzwkrhr0qmsqkmzxryb3bn";
meta = with stdenv.lib; {
homepage = "https://github.com/gotestyourself/gotestsum";
description = "A human friendly `go test` runner";
platforms = platforms.linux ++ platforms.darwin;
license = licenses.asl20;
maintainers = with maintainers; [ endocrimes ];
};
}

6
pkgs/development/tools/rust/maturin/default.nix
View file

@ -5,16 +5,16 @@ let
inherit (darwin.apple_sdk.frameworks) Security;
in rustPlatform.buildRustPackage rec {
name = "maturin-${version}";
version = "0.7.0";
version = "0.7.1";
src = fetchFromGitHub {
owner = "PyO3";
repo = "maturin";
rev = "v${version}";
sha256 = "1qscn8ycyg9ldkp1v5178mlw8r5ak2p12x52c0w4hgij7y1q5s39";
sha256 = "0srsb305gld6zmz7qm5zk4gawqqlywdpray04z8xcij146mccci2";
};
cargoSha256 = "0fk9dgwkgkkmxxd8ydl0vp14jhzi65pkz36v5h3nkp4cb4n4cvdj";
cargoSha256 = "0bscwbrzjaps4yqcrqhan56kdmh0n014w4ldsbv3sbhpw5izz335";
nativeBuildInputs = [ pkgconfig ];

9
pkgs/development/tools/spirv-tools/default.nix
View file

@ -1,10 +1,9 @@
{ stdenv, fetchFromGitHub, cmake, python, spirv-headers }:
{ stdenv, fetchFromGitHub, cmake, python3, spirv-headers }:
let
# Update spirv-headers rev in lockstep according to DEPs file
version = "2019.1";
version = "2019.3";
in
assert version == spirv-headers.version;
stdenv.mkDerivation rec {
pname = "spirv-tools";
inherit version;
@ -13,11 +12,11 @@ stdenv.mkDerivation rec {
owner = "KhronosGroup";
repo = "SPIRV-Tools";
rev = "v${version}";
sha256 = "0vddjzhkrhrm3l3i57nxmq2smv3r1s0ka5ff2kziaahr4hqb479r";
sha256 = "1wvipjcjsi815ls08s3dz9hwlbb59dbl4syxkskg1k9d5jjph1a8";
};
enableParallelBuilding = true;
buildInputs = [ cmake python ];
buildInputs = [ cmake python3 ];
cmakeFlags = [ "-DSPIRV-Headers_SOURCE_DIR=${spirv-headers.src}" ];

7
pkgs/development/tools/vulkan-validation-layers/default.nix
View file

@ -1,15 +1,16 @@
{ stdenv, fetchFromGitHub, cmake, writeText, python3
, vulkan-headers, vulkan-loader, glslang
, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }:
, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland, spirv-headers }:
stdenv.mkDerivation rec {
pname = "vulkan-validation-layers";
version = "1.1.106.0"; # WARNING: glslang overrides in all-packages.nix must be updated to match known-good.json!
version = "1.1.114.0";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-ValidationLayers";
rev = "sdk-${version}";
sha256 = "1sq42j8ikll2dyi9ygaz80lx89mvq9d21pkaf49gzhg4xjcd97dp";
sha256 = "0f8dlrjw1nz2adhzi4sbvljys4h0dyiwafdihsdyrg3xncgffks4";
};
nativeBuildInputs = [ pkgconfig cmake python3 ];

18
pkgs/os-specific/linux/kernel/linux-5.1.nix
View file

@ -1,18 +0,0 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
with stdenv.lib;
buildLinux (args // rec {
version = "5.1.21";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
# branchVersion needs to be x.y
extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1xj1wfhjz2s5a8j6zx3fsd7rrrkvw5waszzylf2gn3ag6615yjan";
};
} // (args.argsOverride or {}))

26
pkgs/os-specific/linux/usbtop/default.nix Normal file
View file

@ -0,0 +1,26 @@
{ stdenv, fetchFromGitHub
, cmake
, libpcap, boost }:
stdenv.mkDerivation rec {
pname = "usbtop";
version = "1.0";
src = fetchFromGitHub {
owner = "aguinet";
repo = pname;
rev = "release-${version}";
sha256 = "0qbad0aq6j4jrh90l6a0akk71wdzhyzmy6q8wl138axyj2bp9kss";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ libpcap boost ];
meta = with stdenv.lib; {
homepage = "https://github.com/aguinet/usbtop";
description = "A top utility that shows an estimated instantaneous bandwidth on USB buses and devices";
maintainers = with maintainers; [ etu ];
license = licenses.bsd3;
platforms = platforms.linux;
};
}

2
pkgs/tools/graphics/vulkan-tools/default.nix
View file

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
owner = "KhronosGroup";
repo = "Vulkan-Tools";
rev = "sdk-${version}";
sha256 = "0swqyk16mbkivyk79dpqbhpw05a7yrakqynywznr5zgqbc0z4gj8";
sha256 = "1d4fcy11gk21x7r7vywdcc1dy9j1d2j78hvd5vfh3vy9fnahx107";
};
nativeBuildInputs = [ cmake pkgconfig ];

3
pkgs/tools/text/patchutils/generic.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl
{ stdenv, fetchurl, perl
, version, sha256, patches ? []
, ...
}:
@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
inherit sha256;
};
buildInputs = [ perl ];
hardeningDisable = [ "format" ];
doCheck = false; # fails

44
pkgs/top-level/all-packages.nix
View file

@ -7377,6 +7377,9 @@ in
colm = callPackage ../development/compilers/colm { };
colmap = libsForQt5.callPackage ../applications/science/misc/colmap { };
colmapWithCuda = colmap.override { cudaSupport = true; };
chickenPackages_4 = callPackage ../development/compilers/chicken/4 { };
chickenPackages_5 = callPackage ../development/compilers/chicken/5 { };
chickenPackages = chickenPackages_5;
@ -7853,16 +7856,16 @@ in
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Tools";
rev = "117a1fd11f11e9bef9faa563c3d5156cc6ab529c";
sha256 = "1w5hb6sgy71g279wsghixxc75r7rsm7wki011mpz039q66827sym";
rev = "26c1b8878315a7a5c188df45e0bc236bb222b698";
sha256 = "1q76vaqwxf4q2l4rd7j2p2jqgcqpys0m235drzx0drkn2qd50n1b";
};
});
spirv-headers = spirv-tools.overrideAttrs (_: {
spirv-headers = spirv-headers.overrideAttrs (_: {
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Tools";
rev = "79b6681aadcb53c27d1052e5f8a0e82a981dbf2f";
sha256 = "0flng2rdmc4ndq3j71h6wk1ibcjvhjrg2rzd6rv445vcsf0jh2pj";
repo = "SPIRV-Headers";
rev = "2434b89345a50c018c84f42a310b0fad4f3fd94f";
sha256 = "1m902q1alm0rbh69zlskkx4n453xijijp9mf3wzwphi2j36gygwm";
};
});
};
@ -13986,24 +13989,24 @@ in
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Tools";
rev = "26c1b8878315a7a5c188df45e0bc236bb222b698";
sha256 = "1q76vaqwxf4q2l4rd7j2p2jqgcqpys0m235drzx0drkn2qd50n1b";
rev = "aa9e8f538041db3055ea443080e0ccc315fa114f";
sha256 = "1nbii0xa5zgs36dmpvzpli1jbzb9ijr7bkgvzmlpcjrjsl02cnbk";
};
});
spirv-headers = spirv-tools.overrideAttrs (_: {
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Headers";
rev = "2434b89345a50c018c84f42a310b0fad4f3fd94f";
sha256 = "1m902q1alm0rbh69zlskkx4n453xijijp9mf3wzwphi2j36gygwm";
rev = "45c2cc37276d69e5b257507d97fd90d2a5684ccc";
sha256 = "1jrzazv5j8nsn8hz5vc43vz4msps05d65wdy9spfg2hg36r1s2pm";
};
});
}).overrideAttrs (_: {
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "glslang";
rev = "e06c7e9a515b716c731bda13f507546f107775d1";
sha256 = "04y4dd1cqdkd4qffmhgmg3agf9j07ii2w38vpp4jw53ir818bqdq";
rev = "333d1c95792692205472c457d7bec915a94c8000";
sha256 = "04srq1zcilhs7p1xz7wcnrncjxqskhfnqggisvxw5f774gk01ks6";
};
});
};
@ -15740,14 +15743,6 @@ in
];
};
linux_5_1 = callPackage ../os-specific/linux/kernel/linux-5.1.nix {
kernelPatches =
[ kernelPatches.bridge_stp_helper
kernelPatches.modinst_arg_list_too_long
kernelPatches.export_kernel_fpu_functions
];
};
linux_5_2 = callPackage ../os-specific/linux/kernel/linux-5.2.nix {
kernelPatches =
[ kernelPatches.bridge_stp_helper
@ -15958,7 +15953,6 @@ in
linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14);
linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19);
linuxPackages_5_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_1);
linuxPackages_5_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_2);
# When adding to this list:
@ -16206,6 +16200,8 @@ in
gotests = callPackage ../development/tools/gotests { };
gotestsum = callPackage ../development/tools/gotestsum { };
impl = callPackage ../development/tools/impl { };
quicktemplate = callPackage ../development/tools/quicktemplate { };
@ -16506,6 +16502,8 @@ in
withGui = false;
};
usbtop = callPackage ../os-specific/linux/usbtop { };
usbutils = callPackage ../os-specific/linux/usbutils { };
usermount = callPackage ../os-specific/linux/usermount { };
@ -21333,6 +21331,8 @@ in
x2goclient = libsForQt5.callPackage ../applications/networking/remote/x2goclient { };
x2goserver = callPackage ../applications/networking/remote/x2goserver { };
x2vnc = callPackage ../tools/X11/x2vnc { };
x32edit = callPackage ../applications/audio/midas/x32edit.nix {};
@ -22930,6 +22930,8 @@ in
seaview = callPackage ../applications/science/biology/seaview { };
trimal = callPackage ../applications/science/biology/trimal { };
varscan = callPackage ../applications/science/biology/varscan { };
hmmer = callPackage ../applications/science/biology/hmmer { };

12
pkgs/top-level/perl-packages.nix
View file

@ -2879,6 +2879,18 @@ let
};
};
ConfigSimple = buildPerlPackage {
pname = "Config-Simple";
version = "4.59";
src = fetchurl {
url = mirror://cpan/authors/id/S/SH/SHERZODR/Config-Simple-4.59.tar.gz;
sha256 = "0m0hg29baarw5ds768q9r4rxb27im8kj4fazyf9gjqw4mmssjy6b";
};
meta = {
description = "Simple configuration file class";
};
};
ConfigStd = buildPerlModule {
pname = "Config-Std";
version = "0.903";

2
pkgs/top-level/python-packages.nix
View file

@ -717,6 +717,8 @@ in {
mailmanclient = callPackage ../development/python-modules/mailmanclient { };
mailman-hyperkitty = callPackage ../development/python-modules/mailman-hyperkitty { };
manhole = callPackage ../development/python-modules/manhole { };
markerlib = callPackage ../development/python-modules/markerlib { };