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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-01-31 12:23:21 +00:00 committed by GitHub
commit 19d5413d37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 112 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/modules/tasks/filesystems.nix
View File

@ -7,8 +7,9 @@ let
addCheckDesc = desc: elemType: check: types.addCheck elemType check
// { description = "${elemType.description} (with check: ${desc})"; };
nonEmptyStr = addCheckDesc "non-empty" types.str
(x: x != "" && ! (all (c: c == " " || c == "\t") (stringToCharacters x)));
isNonEmpty = s: (builtins.match "[ \t\n]*" s) == null;
nonEmptyStr = addCheckDesc "non-empty" types.str isNonEmpty;
fileSystems' = toposort fsBefore (attrValues config.fileSystems);
@ -28,10 +29,10 @@ let
coreFileSystemOpts = { name, config, ... }: {
options = {
mountPoint = mkOption {
example = "/mnt/usb";
type = nonEmptyStr;
type = addCheckDesc "non-empty without trailing slash" types.str
(s: isNonEmpty s && (builtins.match ".+/" s) == null);
description = "Location of the mounted the file system.";
};

4
pkgs/applications/blockchains/bitcoin-classic.nix
View File

@ -7,13 +7,13 @@ with lib;
stdenv.mkDerivation rec {
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-classic-" + version;
version = "1.3.8";
version = "1.3.8uahf";
src = fetchFromGitHub {
owner = "bitcoinclassic";
repo = "bitcoinclassic";
rev = "v${version}";
sha256 = "06ij9v7zbdnhxq9429nnxiw655cp8idldj18l7fmj94gqx07n5vh";
sha256 = "sha256-V1cOB5FLotGS5jup/aVaiDiyr/v2KJ2SLcIu/Hrjuwk=";
};
nativeBuildInputs = [ pkg-config autoreconfHook ];

11
pkgs/applications/graphics/dia/CVE-2019-19451.patch Normal file
View File

@ -0,0 +1,11 @@
diff -ru a/app/app_procs.c b/app/app_procs.c
--- a/app/app_procs.c 2021-01-30 11:09:52.000000000 -0500
+++ b/app/app_procs.c 2021-01-30 11:11:05.000000000 -0500
@@ -785,6 +785,7 @@
if (!filename) {
g_print (_("Filename conversion failed: %s\n"), filenames[i]);
+ ++i;
continue;
}

4
pkgs/applications/graphics/dia/default.nix
View File

@ -13,6 +13,10 @@ stdenv.mkDerivation {
sha256 = "1fyxfrzdcs6blxhkw3bcgkksaf3byrsj4cbyrqgb4869k3ynap96";
};
patches = [
./CVE-2019-19451.patch
];
buildInputs =
[ gtk2 libxml2 gettext python libxml2Python docbook5
libxslt docbook_xsl libart_lgpl ]

4
pkgs/applications/misc/obsidian/default.nix
View File

@ -30,12 +30,12 @@ let
in stdenv.mkDerivation rec {
pname = "obsidian";
version = "0.10.8";
version = "0.10.11";
src = fetchurl {
url =
"https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz";
sha256 = "M+iIvnenfe+4JUKLvGDJXub8d5t2BLoPTo5MrF+5xy4=";
sha256 = "RQdNTzorFq3W8clNObyOisKWUM/s+bE/CbpJ/8ABbrk=";
};
nativeBuildInputs = [ makeWrapper graphicsmagick ];

5
pkgs/development/compilers/swift/default.nix
View File

@ -331,6 +331,9 @@ stdenv.mkDerivation {
# Swift doesn't support 32bit Linux, unknown on other platforms.
platforms = platforms.linux;
badPlatforms = platforms.i686;
broken = stdenv.isAarch64; # 2018-09-04, never built on Hydra
broken = true; # 2021-01-29
knownVulnerabilities = [
"CVE-2020-9861"
];
};
}

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

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "librelp";
version = "1.7.0";
version = "1.9.0";
src = fetchFromGitHub {
owner = "rsyslog";
repo = "librelp";
rev = "v${version}";
sha256 = "0miqjck9zh1hgsx1v395n0d4f1a1p5a8khybv2nsfjq04g9359c9";
sha256 = "sha256-nE7YavjZj+nHcTNkcl/xVAaP+9XfHlTEsW18aPO/ABY=";
};
nativeBuildInputs = [ pkg-config autoreconfHook ];

28
pkgs/development/ocaml-modules/progress/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ lib, buildDunePackage, fetchurl
, mtime, terminal_size, alcotest, astring, fmt
}:
buildDunePackage rec {
pname = "progress";
version = "0.1.1";
minimumOCamlVersion = "4.08";
useDune2 = true;
src = fetchurl {
url = "https://github.com/CraigFe/progress/releases/download/${version}/progress-${version}.tbz";
sha256 = "90c6bec19d014a4c6b0b67006f08bdfcf36981d2176769bebe0ccd75d6785a32";
};
propagatedBuildInputs = [ mtime terminal_size ];
doCheck = true;
checkInputs = [ alcotest astring fmt ];
meta = with lib; {
description = "Progress bar library for OCaml";
homepage = "https://github.com/CraigFe/progress";
license = licenses.mit;
maintainers = [ maintainers.sternenseemann ];
};
}

4
pkgs/development/python-modules/awesomeversion/default.nix
View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "awesomeversion";
version = "21.1.3";
version = "21.1.8";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "ludeeus";
repo = pname;
rev = version;
sha256 = "sha256-D31wmBrYFCArHddAINWjfTPow4K2TD+wGfmRUuIaBdA=";
sha256 = "sha256-hNsFkGSzqt5ujqk+AO1FW/yzwPxEN+AA7EVazvkwz2o=";
};
postPatch = ''

4
pkgs/development/python-modules/dj-email-url/default.nix
View File

@ -5,12 +5,12 @@
}:
buildPythonPackage rec {
version = "1.0.1";
version = "1.0.2";
pname = "dj-email-url";
src = fetchPypi {
inherit pname version;
sha256 = "32dc567c5cc3d4106710ec36dd645c8c1b20e2d8f588a17ab88bcc23e347d00a";
sha256 = "838fd4ded9deba53ae757debef431e25fa7fca31d3948b3c4808ccdc84fab2b7";
};
checkPhase = ''

4
pkgs/development/python-modules/dogpile.cache/default.nix
View File

@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "dogpile.cache";
version = "1.1.1";
version = "1.1.2";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "40147b19696f387415a7efaaa4cf8ea0b5d31bdd1b53e5187e75d48ddfee9f0e";
sha256 = "2134464672a3deb7ef1366a8691726686d8c62540e4208f1a40c9aaa1a0b6a45";
};
# Disable concurrency tests that often fail,

4
pkgs/development/python-modules/duecredit/default.nix
View File

@ -14,12 +14,12 @@
buildPythonPackage rec {
pname = "duecredit";
version = "0.8.0";
version = "0.8.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "1yxd8579pakrfhq0hls0iy37nxllsm8y33na220g08znibrp7ix0";
sha256 = "43b3f01ab5fb2bf2ecc27d3fcf92b873c6b288f44becef3e2e87c96cb89d7b01";
};
# bin/duecredit requires setuptools at runtime

4
pkgs/development/python-modules/elementpath/default.nix
View File

@ -1,7 +1,7 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy27 }:
buildPythonPackage rec {
version = "2.1.1";
version = "2.1.3";
pname = "elementpath";
disabled = isPy27; # uses incompatible class syntax
@ -9,7 +9,7 @@ buildPythonPackage rec {
owner = "sissaschool";
repo = "elementpath";
rev = "v${version}";
sha256 = "1h910v8f0648nqnk40bxgdim3623m07yg4xdfwcips2h55d19rk2";
sha256 = "062l1dqbaz1pab3qz6x5zmja8m8gw1bxgfl4kx91gdh0zsiakg8j";
};
# avoid circular dependency with xmlschema which directly depends on this

4
pkgs/development/python-modules/fire/default.nix
View File

@ -3,13 +3,13 @@
buildPythonPackage rec {
pname = "fire";
version = "0.3.1";
version = "0.4.0";
src = fetchFromGitHub {
owner = "google";
repo = "python-fire";
rev = "v${version}";
sha256 = "0s5r6l39ck2scks54hmwwdf4lcihqqnqzjfx9lz2b67vxkajpwmc";
sha256 = "1caz6j2kdhj0kccrnqri6b4g2d6wzkkx8y9vxyvm7axvrwkv2vyn";
};
propagatedBuildInputs = [ six termcolor ] ++ lib.optional isPy27 enum34;

4
pkgs/development/python-modules/flask-migrate/default.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "Flask-Migrate";
version = "2.5.3";
version = "2.6.0";
src = fetchPypi {
inherit pname version;
sha256 = "a69d508c2e09d289f6e55a417b3b8c7bfe70e640f53d2d9deb0d056a384f37ee";
sha256 = "8626af845e6071ef80c70b0dc16d373f761c981f0ad61bb143a529cab649e725";
};
checkInputs = [ flask_script ] ++ lib.optional isPy3k glibcLocales;

4
pkgs/development/python-modules/flask-paginate/default.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "flask-paginate";
version = "0.7.1";
version = "0.8.0";
src = fetchPypi {
inherit pname version;
sha256 = "949b93d0535d1223b91ac0048586bd878aaebf4044c54c1dc3068acc9bdf441f";
sha256 = "60b2a696bf63d2bc1c90a5b1a861c280461732b88f079c267dc98021911a007b";
};
propagatedBuildInputs = [ flask ];

4
pkgs/development/python-modules/google-cloud-vision/default.nix
View File

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-vision";
version = "2.0.0";
version = "2.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "0qbwhapmn5ia853c4nfnz1qiksngvr8j0xxjasrykwhxcsd7s1ka";
sha256 = "2bae8b4aca9aa38ad7459102cc5743c506adf9060ad2b3b15cff1e8021085017";
};
propagatedBuildInputs = [ libcst google-api-core proto-plus];

4
pkgs/development/python-modules/icecream/default.nix
View File

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "icecream";
version = "2.0.0";
version = "2.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "16kpixl43nrn093cvkmxiq2dzd9xc73zwzkmwp0rs7x01nji8kj3";
sha256 = "c2e7b74c1c12caa2cfde050f2e636493ee77a9fb4a494b5593418ab359924a24";
};
propagatedBuildInputs = [ asttokens colorama executing pygments ];

4
pkgs/development/python-modules/lazr/config.nix
View File

@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "lazr.config";
version = "2.2.2";
version = "2.2.3";
propagatedBuildInputs = [ lazr_delegates ];
src = fetchPypi {
inherit pname version;
sha256 = "cdb9a70dac4a76ca1ff3528d9eafe5414c6c69c1b92e7e84d3477ae85f6bb787";
sha256 = "b74a73f8b63e6dc6732fc1f3d88e2f236596ddf089ef6e1794ece060e8cfabe1";
};
}

4
pkgs/development/tools/delve/default.nix
View File

@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "delve";
version = "1.5.1";
version = "1.6.0";
goPackagePath = "github.com/go-delve/delve";
excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)";
@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "go-delve";
repo = "delve";
rev = "v${version}";
sha256 = "10zvla2jqxqibxdk3zbnsxg63i0zcwcn9npvw3bbicwd2z4vvskk";
sha256 = "sha256-krNCS5GaEMuwQ9XS8w0myL+xZX6goNNNBgUiRVoZPIU=";
};
meta = with lib; {

4
pkgs/servers/dns/nsd/default.nix
View File

@ -16,11 +16,11 @@
stdenv.mkDerivation rec {
pname = "nsd";
version = "4.3.4";
version = "4.3.5";
src = fetchurl {
url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz";
sha256 = "0l4ba80ihwg3s2ifhnkmk7rjabrcy5zw6sz4hn0vm9sif6lk9s1v";
sha256 = "sha256-faK0PjCz1/MHcixgj3Gb+xafDZhcdko0+gZp3DNIRHI=";
};
prePatch = ''

6
pkgs/servers/h2/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "h2";
version = "1.4.193";
version = "1.4.199";
src = fetchzip {
url = "https://www.h2database.com/h2-2016-10-31.zip";
sha256 = "1da1qcfwi5gvh68i6w6y0qpcqp3rbgakizagkajmjxk2ryc4b3z9";
url = "https://h2database.com/h2-2019-03-13.zip";
sha256 = "0pdvbnx7nqfqs7x1zkwz2q34331l55jknpk6arf6dksvnd71hinj";
};
buildInputs = [ makeWrapper ];

6
pkgs/shells/elvish/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "elvish";
version = "0.14.1";
version = "0.15.0";
excludedPackages = [ "website" ];
@ -12,10 +12,10 @@ buildGoModule rec {
owner = "elves";
repo = pname;
rev = "v${version}";
sha256 = "05wp3cx4s2cjf60yncdpmycs5h4z1dlin56dmljmfwz4z099079b";
sha256 = "1jksdpf86miz1dv3vrmvpvz4k1c2m23dway6a7b1cypg03c68a75";
};
vendorSha256 = "1f971n17h9bc0qcgs9ipiaw0x9807mz761fqm605br4ch1kp0897";
vendorSha256 = "124m9680pl7wrh7ld7v39dfl86r6vih1pjk3bmbihy0fjgxnnq0b";
doCheck = false;

22
pkgs/tools/inputmethods/skk/skk-dicts/default.nix
View File

@ -3,33 +3,33 @@
let
# kana to kanji
small = fetchurl {
url = "https://raw.githubusercontent.com/skk-dev/dict/f61be71246602a49e9f05ded6ac4f9f82031a521/SKK-JISYO.S";
sha256 = "15kp4iwz58fp1zg0i13x7w9wwm15v8n2hhm0nf2zsl7az5mn5yi4";
url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.S";
sha256 = "11cjrc8m99hj4xpl2nvzxanlswpapi92vmgk9d6yimdz0jidb6cq";
};
medium = fetchurl {
url = "https://raw.githubusercontent.com/skk-dev/dict/f61be71246602a49e9f05ded6ac4f9f82031a521/SKK-JISYO.M";
sha256 = "1vhagixhrp9lq5x7dldxcanhznawazp00xivpp1z52kx10lnkmv0";
url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.M";
sha256 = "0pwjp9qjmn9sq6zc0k6632l7dc2dbjn45585ibckvvl9iwfqqxdp";
};
large = fetchurl {
url = "https://raw.githubusercontent.com/skk-dev/dict/f61be71246602a49e9f05ded6ac4f9f82031a521/SKK-JISYO.L";
sha256 = "07cv0j95iajkr48j4ln411vnhl3z93yx96zjc03bgs10dbpagaaz";
url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.L";
sha256 = "0ps0a7sbkryd6hxvphq14i7g5wci4gvr0vraac8ia2ww67a2xbyc";
};
# english to japanese
edict = fetchurl {
url = "https://raw.githubusercontent.com/skk-dev/dict/f61be71246602a49e9f05ded6ac4f9f82031a521/SKK-JISYO.edict";
sha256 = "18k8z1wkgwgfwbs6sylf39h1nc1p5l2b00h7mfjlb8p91plkb45w";
url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.edict";
sha256 = "1vrwnq0vvjn61nijbln6wfinqg93802d2a8d4ad82n692v83b1li";
};
# misc
assoc = fetchurl {
url = "https://raw.githubusercontent.com/skk-dev/dict/f61be71246602a49e9f05ded6ac4f9f82031a521/SKK-JISYO.assoc";
sha256 = "12d6xpp1bfin9nwl35ydl5yc6vx0qpwhxss0khi19n1nsbyqnixm";
url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.assoc";
sha256 = "1smcbyv6srrhnpl7ic9nqds9nz3g2dgqngmhzkrdlwmvcpvakp1v";
};
in
stdenv.mkDerivation {
pname = "skk-dicts-unstable";
version = "2017-10-26";
version = "2020-03-24";
srcs = [ small medium large edict assoc ];
nativeBuildInputs = [ skktools ] ++ lib.optional stdenv.isDarwin libiconv;

4
pkgs/tools/misc/gparted/default.nix
View File

@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
name = "gparted-1.1.0";
name = "gparted-1.2.0";
src = fetchurl {
url = "mirror://sourceforge/gparted/${name}.tar.gz";
sha256 = "092rgwjh1825fal6v3yafq2wr0i61hh0a2n0j4296zn0zdx7pzp2";
sha256 = "sha256-bJBxXSVNen7AIIspAHtkFg3Z+330xKp/jsLJ0jEUxxk=";
};
# Tries to run `pkexec --version` to get version.

4
pkgs/tools/misc/os-prober/default.nix
View File

@ -11,14 +11,14 @@ lvm2 # lvs
}:
stdenv.mkDerivation rec {
version = "1.77";
version = "1.78";
pname = "os-prober";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "installer-team";
repo = pname;
rev = version;
sha256 = "05sji756xdl67pp2sf7rk0ih9h6f6kgk9nvxlyv1bzbmcizlh2d2";
sha256 = "sha256-mfv1b40n/opXdyj6IXWVf/32sWlS+/DbXIRwE1zX4KM=";
};
buildInputs = [ makeWrapper ];

4
pkgs/tools/networking/privoxy/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "privoxy";
version = "3.0.29";
version = "3.0.30";
src = fetchurl {
url = "mirror://sourceforge/ijbswa/Sources/${version}%20%28stable%29/${pname}-${version}-stable-src.tar.gz";
sha256 = "17a8fbdyb0ixc0wwq68fg7xn7l6n7jq67njpq93psmxgzng0dii5";
sha256 = "sha256-pP4kHF2nAQsoS/ienp4xoyHx8+scx5ZVnT+6ublBXuE=";
};
hardeningEnable = [ "pie" ];

6
pkgs/tools/system/bottom/default.nix
View File

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "bottom";
version = "0.5.6";
version = "0.5.7";
src = fetchFromGitHub {
owner = "ClementTsang";
repo = pname;
rev = version;
sha256 = "sha256-88uEEsb+coX8PTKrem+0t5AkamCmqJsFYsENFTZSsys=";
sha256 = "sha256-9L7FtYIaWSOwNQ8zOLvxjt51o8A5MqqfF/iIyJs2TJA=";
};
prePatch = ''
@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit;
cargoSha256 = "sha256-qnh4Tl6JRgxBJbu+t9IJX/XChIR15rTRLvsl+/ZvPxY=";
cargoSha256 = "sha256-4oH1A88Qn0c6hkE/1b6mTrEIph8xT98j+DkP9/5JALs=";
doCheck = false;

2
pkgs/top-level/ocaml-packages.nix
View File

@ -1014,6 +1014,8 @@ let
prof_spacetime = callPackage ../development/ocaml-modules/prof_spacetime { };
progress = callPackage ../development/ocaml-modules/progress { };
ptmap = callPackage ../development/ocaml-modules/ptmap { };
ptset = callPackage ../development/ocaml-modules/ptset { };