cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2022-05-17 00:02:18 +00:00 committed by GitHub
commit 9232271f66
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 78 additions and 2218 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nixos/modules/services/x11/display-managers/gdm.nix
View file

@ -140,8 +140,13 @@ in
environment = {
GDM_X_SERVER_EXTRA_ARGS = toString
(filter (arg: arg != "-terminate") cfg.xserverArgs);
# GDM is needed for gnome-login.session
XDG_DATA_DIRS = "${gdm}/share:${cfg.sessionData.desktops}/share:${pkgs.gnome.gnome-control-center}/share";
XDG_DATA_DIRS = lib.makeSearchPath "share" [
gdm # for gnome-login.session
cfg.sessionData.desktops
pkgs.gnome.gnome-control-center # for accessibility icon
pkgs.gnome.adwaita-icon-theme
pkgs.hicolor-icon-theme # empty icon theme as a base
];
} // optionalAttrs (xSessionWrapper != null) {
# Make GDM use this wrapper before running the session, which runs the
# configured setupCommands. This relies on a patched GDM which supports

10
pkgs/applications/networking/browsers/firefox/common.nix
View file

@ -171,8 +171,8 @@ buildStdenv.mkDerivation ({
outputs = [
"out"
"symbols"
];
]
++ lib.optionals crashreporterSupport [ "symbols" ];
# Add another configure-build-profiling run before the final configure phase if we build with pgo
preConfigurePhases = lib.optionals pgoSupport [
@ -202,7 +202,6 @@ buildStdenv.mkDerivation ({
nativeBuildInputs = [
autoconf
cargo
dump_syms
llvmPackages.llvm # llvm-objdump
makeWrapper
nodejs
@ -216,6 +215,7 @@ buildStdenv.mkDerivation ({
which
wrapGAppsHook
]
++ lib.optionals crashreporterSupport [ dump_syms ]
++ lib.optionals pgoSupport [ xvfb-run ]
++ extraNativeBuildInputs;
@ -421,11 +421,11 @@ buildStdenv.mkDerivation ({
# Generate build symbols once after the final build
# https://firefox-source-docs.mozilla.org/crash-reporting/uploading_symbol.html
preInstall = ''
preInstall = lib.optionalString crashreporterSupport ''
./mach buildsymbols
mkdir -p $symbols/
cp mozobj/dist/*.crashreporter-symbols.zip $symbols/
'' + ''
cd mozobj
'';

1
pkgs/applications/science/misc/root/5.nix
View file

@ -104,6 +104,7 @@ stdenv.mkDerivation rec {
"-Drpath=ON"
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DCMAKE_INSTALL_INCLUDEDIR=include"
"-DCMAKE_CXX_FLAGS=-std=c++11"
"-Dalien=OFF"
"-Dbonjour=OFF"
"-Dcastor=OFF"

4
pkgs/development/coq-modules/interval/default.nix
View file

@ -6,12 +6,12 @@ mkCoqDerivation rec {
domain = "gitlab.inria.fr";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = isGe "8.8"; out = "4.4.0"; }
{ case = isGe "8.8"; out = "4.5.1"; }
{ case = range "8.8" "8.12"; out = "4.0.0"; }
{ case = range "8.7" "8.11"; out = "3.4.2"; }
{ case = range "8.5" "8.6"; out = "3.3.0"; }
] null;
release."4.4.0".sha256 = "sha256-0+9AatTIEsjul0RXoOw6zWGEbGDVmuy7XuyrZNBZ8Kk=";
release."4.5.1".sha256 = "sha256-5OxbSPdw/1FFENubulKSk6fEIEYSPCxfvMMgtgN6j6s=";
release."4.3.0".sha256 = "sha256-k8DLC4HYYpHeEEgXUafS8jkaECqlM+/CoYaInmUTYko=";
release."4.2.0".sha256 = "sha256-SD5thgpirs3wmZBICjXGpoefg9AAXyExb5t8tz3iZhE=";
release."4.1.1".sha256 = "sha256-h2NJ6sZt1C/88v7W2xyuftEDoyRt3H6kqm5g2hc1aoU=";

4
pkgs/development/libraries/folly/default.nix
View file

@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
zstd
];
NIX_CFLAGS_COMPILE = [ "-DFOLLY_MOBILE=${if follyMobile then "1" else "0"}" ];
NIX_CFLAGS_COMPILE = [ "-DFOLLY_MOBILE=${if follyMobile then "1" else "0"}" "-fpermissive" ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
meta = with lib; {
@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/facebook/folly";
license = licenses.asl20;
# 32bit is not supported: https://github.com/facebook/folly/issues/103
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ];
maintainers = with maintainers; [ abbradar pierreis ];
};
}

1
pkgs/development/python-modules/cheroot/default.nix
View file

@ -72,6 +72,7 @@ buildPythonPackage rec {
] ++ lib.optionals stdenv.isDarwin [
"http_over_https_error"
"bind_addr_unix"
"test_ssl_env"
];
disabledTestPaths = [

6
pkgs/development/python-modules/django-anymail/default.nix
View file

@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "django-anymail";
version = "8.5";
version = "8.6";
src = fetchFromGitHub {
owner = "anymail";
repo = pname;
rev = "v${version}";
sha256 = "1p2c7hf9baxr8khk8h7y8d38imw4zm920dgd9nbda18vlh7gpbcf";
rev = "refs/tags/v${version}";
sha256 = "sha256-hLNILUV7qzqHfh7l3SJAoFveUIRSCHTjEQ3ZC3PhZUY=";
};
propagatedBuildInputs = [

6
pkgs/development/python-modules/dulwich/default.nix
View file

@ -12,11 +12,12 @@
, mock
, pkgs
, urllib3
, paramiko
, pythonOlder
}:
buildPythonPackage rec {
version = "0.20.35";
version = "0.20.36";
pname = "dulwich";
format = "setuptools";
@ -24,7 +25,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
hash = "sha256-lT9jAanfigkfqI1V7tOUqIv5mIzei+NBd1NUkQkYwZY=";
hash = "sha256-2s7xVJwSdffS1v7NLyz6O6ozB9AJpRTAwjIDP2uqXSE=";
};
LC_ALL = "en_US.UTF-8";
@ -43,6 +44,7 @@ buildPythonPackage rec {
gpgme
pkgs.gnupg
mock
paramiko
];
doCheck = !stdenv.isDarwin;

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "gcal-sync";
version = "0.7.1";
version = "0.8.0";
disabled = pythonOlder "3.9";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "allenporter";
repo = "gcal_sync";
rev = version;
hash = "sha256-NOB74P+5i63FEeHJsPXRdRgY6iyIUEn7BogbVKm8P5M=";
hash = "sha256-Qk4WlMVyzOK2uyrUlJw9Q8ENtNT3PZ7FKTlCtPsm2v0=";
};
propagatedBuildInputs = [

8
pkgs/development/python-modules/ijson/default.nix
View file

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi }:
{ lib, buildPythonPackage, fetchPypi, yajl, cffi, pytestCheckHook }:
buildPythonPackage rec {
pname = "ijson";
@ -9,7 +9,11 @@ buildPythonPackage rec {
sha256 = "1d1003ae3c6115ec9b587d29dd136860a81a23c7626b682e2b5b12c9fd30e4ea";
};
doCheck = false; # something about yajl
buildInputs = [ yajl ];
propagatedBuildInputs = [ cffi ];
checkInputs = [ pytestCheckHook ];
doCheck = true;
meta = with lib; {
description = "Iterative JSON parser with a standard Python iterator interface";

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

@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "manuel";
version = "1.10.1";
version = "1.11.2";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "1bdzay7j70fly5fy6wbdi8fbrxjrrlxnxnw226rwry1c8a351rpy";
sha256 = "sha256-nJt3WMQ66oa3VlW5InJCzOea96Wf7WwxSbBp9WIfzqc=";
};
propagatedBuildInputs = [ six ];

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

@ -27,7 +27,7 @@
buildPythonPackage rec {
pname = "ocrmypdf";
version = "13.4.3";
version = "13.4.4";
src = fetchFromGitHub {
owner = "jbarlow83";
@ -39,7 +39,7 @@ buildPythonPackage rec {
extraPostFetch = ''
rm "$out/.git_archival.txt"
'';
hash = "sha256-kriT3NV9Lj44WjOeK6+pILjfRMt9QMcKU57si394xxI=";
hash = "sha256-uFKnohUxh17h6u0vwVB7EaTEh5NRowP8a6za63Ehodk=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@ -25,7 +25,7 @@
buildPythonPackage rec {
pname = "pikepdf";
version = "5.1.2";
version = "5.1.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -40,7 +40,7 @@ buildPythonPackage rec {
extraPostFetch = ''
rm "$out/.git_archival.txt"
'';
hash = "sha256-VR2/+XCQb62FdkGZBxP2XTqatdFYZO1ngb8gvoJEvzs=";
hash = "sha256-jkAwc1bQ1jRDf/qY+xAjiLXXO98qKjyX+J7Lu4tYWoI=";
};
patches = [

6
pkgs/development/python-modules/pylsp-mypy/default.nix
View file

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "pylsp-mypy";
version = "0.5.7";
version = "0.5.8";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "Richardk2n";
repo = "pylsp-mypy";
rev = version;
sha256 = "0am16z9kmj57r5pi32jhzlbdngzmvzzaiqjm7cba1izh7w5m6dvc";
rev = "refs/tags/${version}";
sha256 = "sha256-Yu1e/8gYFYEZ/IoFo8WnyRNYkCZ9i7NgjEjYBbagWMA=";
};
disabledTests = [

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

@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "pywlroots";
version = "0.15.13";
version = "0.15.14";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "teZ8udox+4NefgA73gD5d6hPur/zjCapoMYPW36ax0s=";
sha256 = "z0PVjVzmAb5cgBdXWMxOdsy0VMMkmewHZaPNBYivXSA=";
};
nativeBuildInputs = [ pkg-config ];

6
pkgs/development/python-modules/torchmetrics/default.nix
View file

@ -15,7 +15,7 @@
let
pname = "torchmetrics";
version = "0.8.1";
version = "0.8.2";
in
buildPythonPackage {
inherit pname version;
@ -23,8 +23,8 @@ buildPythonPackage {
src = fetchFromGitHub {
owner = "PyTorchLightning";
repo = "metrics";
rev = "v${version}";
hash = "sha256-AryEhYAeC97dO2pgHoz0Y9F//DVdX6RfCa80gI56iz4=";
rev = "refs/tags/v${version}";
hash = "sha256-1TO2YgZzjVmrE5jhMwo0Y+bQUQ5jJj34k+kGpdqqPVQ=";
};
propagatedBuildInputs = [

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "twentemilieu";
version = "0.6.0";
version = "0.6.1";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "frenck";
repo = "python-twentemilieu";
rev = "v${version}";
sha256 = "sha256-UE7fhbSThXmMns1XfUUQqw0wn5/w/x+UncansIBiank=";
sha256 = "sha256-k2jdw2H/bNejNUjIEQlEA1KkHHpkyFlSDC1HKUoMIqQ=";
};
postPatch = ''

215
pkgs/development/tools/systemfd/Cargo.nix
View file

@ -1,215 +0,0 @@
# Generated by carnix 0.10.0: carnix generate-nix
{ lib, buildPlatform, buildRustCrate, buildRustCrateHelpers, cratesIO, fetchgit }:
with buildRustCrateHelpers;
let inherit (lib.lists) fold;
inherit (lib.attrsets) recursiveUpdate;
in
rec {
crates = cratesIO;
systemfd = crates.crates.systemfd."0.3.0" deps;
__all = [ (systemfd {}) ];
deps.aho_corasick."0.6.4" = {
memchr = "2.0.1";
};
deps.ansi_term."0.11.0" = {
winapi = "0.3.4";
};
deps.atty."0.2.10" = {
termion = "1.5.1";
libc = "0.2.40";
winapi = "0.3.4";
};
deps.backtrace."0.3.7" = {
cfg_if = "0.1.3";
rustc_demangle = "0.1.8";
backtrace_sys = "0.1.16";
libc = "0.2.40";
winapi = "0.3.4";
};
deps.backtrace_sys."0.1.16" = {
libc = "0.2.40";
cc = "1.0.15";
};
deps.bitflags."1.0.3" = {};
deps.byteorder."1.2.3" = {};
deps.bytes."0.4.7" = {
byteorder = "1.2.3";
iovec = "0.1.2";
};
deps.cc."1.0.15" = {};
deps.cfg_if."0.1.3" = {};
deps.clap."2.31.2" = {
atty = "0.2.10";
bitflags = "1.0.3";
strsim = "0.7.0";
textwrap = "0.9.0";
unicode_width = "0.1.4";
vec_map = "0.8.1";
ansi_term = "0.11.0";
};
deps.clicolors_control."0.2.0" = {
lazy_static = "0.2.11";
libc = "0.2.40";
kernel32_sys = "0.2.2";
winapi = "0.3.4";
};
deps.console."0.6.1" = {
clicolors_control = "0.2.0";
lazy_static = "0.2.11";
libc = "0.2.40";
parking_lot = "0.5.5";
regex = "0.2.11";
unicode_width = "0.1.4";
termios = "0.2.2";
winapi = "0.3.4";
};
deps.failure."0.1.1" = {
backtrace = "0.3.7";
failure_derive = "0.1.1";
};
deps.failure_derive."0.1.1" = {
quote = "0.3.15";
syn = "0.11.11";
synstructure = "0.6.1";
};
deps.fuchsia_zircon."0.3.3" = {
bitflags = "1.0.3";
fuchsia_zircon_sys = "0.3.3";
};
deps.fuchsia_zircon_sys."0.3.3" = {};
deps.gcc."0.3.54" = {};
deps.iovec."0.1.2" = {
libc = "0.2.40";
winapi = "0.2.8";
};
deps.kernel32_sys."0.2.2" = {
winapi = "0.2.8";
winapi_build = "0.1.1";
};
deps.lazy_static."0.2.11" = {};
deps.lazy_static."1.0.0" = {};
deps.libc."0.2.40" = {};
deps.memchr."2.0.1" = {
libc = "0.2.40";
};
deps.nix."0.10.0" = {
bitflags = "1.0.3";
bytes = "0.4.7";
cfg_if = "0.1.3";
libc = "0.2.40";
void = "1.0.2";
};
deps.owning_ref."0.3.3" = {
stable_deref_trait = "1.0.0";
};
deps.parking_lot."0.5.5" = {
owning_ref = "0.3.3";
parking_lot_core = "0.2.14";
};
deps.parking_lot_core."0.2.14" = {
rand = "0.4.2";
smallvec = "0.6.1";
libc = "0.2.40";
winapi = "0.3.4";
};
deps.quote."0.3.15" = {};
deps.rand."0.4.2" = {
fuchsia_zircon = "0.3.3";
libc = "0.2.40";
winapi = "0.3.4";
};
deps.redox_syscall."0.1.37" = {};
deps.redox_termios."0.1.1" = {
redox_syscall = "0.1.37";
};
deps.regex."0.2.11" = {
aho_corasick = "0.6.4";
memchr = "2.0.1";
regex_syntax = "0.5.6";
thread_local = "0.3.5";
utf8_ranges = "1.0.0";
};
deps.regex."1.0.0" = {
aho_corasick = "0.6.4";
memchr = "2.0.1";
regex_syntax = "0.6.0";
thread_local = "0.3.5";
utf8_ranges = "1.0.0";
};
deps.regex_syntax."0.5.6" = {
ucd_util = "0.1.1";
};
deps.regex_syntax."0.6.0" = {
ucd_util = "0.1.1";
};
deps.rustc_demangle."0.1.8" = {};
deps.smallvec."0.6.1" = {};
deps.socket2."0.3.5" = {
cfg_if = "0.1.3";
libc = "0.2.40";
winapi = "0.3.4";
};
deps.stable_deref_trait."1.0.0" = {};
deps.strsim."0.7.0" = {};
deps.syn."0.11.11" = {
quote = "0.3.15";
synom = "0.11.3";
unicode_xid = "0.0.4";
};
deps.synom."0.11.3" = {
unicode_xid = "0.0.4";
};
deps.synstructure."0.6.1" = {
quote = "0.3.15";
syn = "0.11.11";
};
deps.systemfd."0.3.0" = {
clap = "2.31.2";
console = "0.6.1";
failure = "0.1.1";
failure_derive = "0.1.1";
lazy_static = "1.0.0";
libc = "0.2.40";
regex = "1.0.0";
nix = "0.10.0";
socket2 = "0.3.5";
uuid = "0.6.3";
winapi = "0.3.4";
};
deps.termion."1.5.1" = {
libc = "0.2.40";
redox_syscall = "0.1.37";
redox_termios = "0.1.1";
};
deps.termios."0.2.2" = {
libc = "0.2.40";
};
deps.textwrap."0.9.0" = {
unicode_width = "0.1.4";
};
deps.thread_local."0.3.5" = {
lazy_static = "1.0.0";
unreachable = "1.0.0";
};
deps.ucd_util."0.1.1" = {};
deps.unicode_width."0.1.4" = {};
deps.unicode_xid."0.0.4" = {};
deps.unreachable."1.0.0" = {
void = "1.0.2";
};
deps.utf8_ranges."1.0.0" = {};
deps.uuid."0.6.3" = {
cfg_if = "0.1.3";
rand = "0.4.2";
};
deps.vec_map."0.8.1" = {};
deps.void."1.0.2" = {};
deps.winapi."0.2.8" = {};
deps.winapi."0.3.4" = {
winapi_i686_pc_windows_gnu = "0.4.0";
winapi_x86_64_pc_windows_gnu = "0.4.0";
};
deps.winapi_build."0.1.1" = {};
deps.winapi_i686_pc_windows_gnu."0.4.0" = {};
deps.winapi_x86_64_pc_windows_gnu."0.4.0" = {};
}

62
pkgs/development/tools/systemfd/crates-io.list
View file

@ -1,62 +0,0 @@
aho-corasick-0.6.4
ansi_term-0.11.0
atty-0.2.10
backtrace-0.3.7
backtrace-sys-0.1.16
bitflags-1.0.3
byteorder-1.2.3
bytes-0.4.7
cc-1.0.15
cfg-if-0.1.3
clap-2.31.2
clicolors-control-0.2.0
console-0.6.1
failure-0.1.1
failure_derive-0.1.1
fuchsia-zircon-0.3.3
fuchsia-zircon-sys-0.3.3
gcc-0.3.54
iovec-0.1.2
kernel32-sys-0.2.2
lazy_static-0.2.11
lazy_static-1.0.0
libc-0.2.40
memchr-2.0.1
nix-0.10.0
owning_ref-0.3.3
parking_lot-0.5.5
parking_lot_core-0.2.14
quote-0.3.15
rand-0.4.2
redox_syscall-0.1.37
redox_termios-0.1.1
regex-0.2.11
regex-1.0.0
regex-syntax-0.5.6
regex-syntax-0.6.0
rustc-demangle-0.1.8
smallvec-0.6.1
socket2-0.3.5
stable_deref_trait-1.0.0
strsim-0.7.0
syn-0.11.11
synom-0.11.3
synstructure-0.6.1
systemfd-0.3.0
termion-1.5.1
termios-0.2.2
textwrap-0.9.0
thread_local-0.3.5
ucd-util-0.1.1
unicode-width-0.1.4
unicode-xid-0.0.4
unreachable-1.0.0
utf8-ranges-1.0.0
uuid-0.6.3
vec_map-0.8.1
void-1.0.2
winapi-0.2.8
winapi-0.3.4
winapi-build-0.1.1
winapi-i686-pc-windows-gnu-0.4.0
winapi-x86_64-pc-windows-gnu-0.4.0

1890
pkgs/development/tools/systemfd/crates-io.nix
View file

File diff suppressed because it is too large Load diff

34
pkgs/development/tools/systemfd/default.nix
View file

@ -1,18 +1,32 @@
{ lib, fetchgit, darwin, buildPlatform
, buildRustCrate, buildRustCrateHelpers, defaultCrateOverrides }:
{ lib
, fetchFromGitHub
, rustPlatform
}:
let
version = "0.4.0";
in
rustPlatform.buildRustPackage {
pname = "systemfd";
inherit version;
src = fetchFromGitHub {
repo = "systemfd";
owner = "mitsuhiko";
rev = version;
sha256 = "sha256-HUJgYPD4C9fMUYKpzmIy9gDT6HAZDWw1JLMKLgzRQTY=";
};
cargoSha256 = "sha256-UhfE9Q5E79rN2mjkNB5IAN/J0fbpoy9CmM6ojHQcFP0=";
((import ./Cargo.nix {
inherit lib buildPlatform buildRustCrate buildRustCrateHelpers fetchgit;
cratesIO = import ./crates-io.nix { inherit lib buildRustCrate buildRustCrateHelpers; };
}).systemfd {}).override {
crateOverrides = defaultCrateOverrides // {
systemfd = attrs: {
meta = {
description = "A convenient helper for passing sockets into another process";
homepage = "https://github.com/mitsuhiko/systemfd";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.adisbladis ];
platforms = lib.platforms.unix;
};
};
};
}