b12f/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:
Frederik Rietdijk 2021-01-04 20:51:32 +01:00
parent 507efdb11f 59ede499ae
commit b20838eb4a
43 changed files with 385 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nixos/doc/manual/configuration/profiles/hardened.xml
View file

@ -7,7 +7,7 @@
<para>
A profile with most (vanilla) hardening options enabled by default,
potentially at the cost of features and performance.
potentially at the cost of stability, features and performance.
</para>
<para>
@ -21,4 +21,12 @@
xlink:href="https://github.com/nixos/nixpkgs/tree/master/nixos/modules/profiles/hardened.nix">
profile source</literal> for further detail on which settings are altered.
</para>
<warning>
<para>
This profile enables options that are known to affect system
stability. If you experience any stability issues when using the
profile, try disabling it. If you report an issue and use this
profile, always mention that you do.
</para>
</warning>
</section>

7
nixos/modules/profiles/hardened.nix
View file

@ -1,5 +1,10 @@
# A profile with most (vanilla) hardening options enabled by default,
# potentially at the cost of features and performance.
# potentially at the cost of stability, features and performance.
#
# This profile enables options that are known to affect system
# stability. If you experience any stability issues when using the
# profile, try disabling it. If you report an issue and use this
# profile, always mention that you do.
{ config, lib, pkgs, ... }:

7
nixos/tests/dovecot.nix
View file

@ -4,8 +4,11 @@ import ./make-test-python.nix {
machine = { pkgs, ... }: {
imports = [ common/user-account.nix ];
services.postfix.enable = true;
services.dovecot2.enable = true;
services.dovecot2.protocols = [ "imap" "pop3" ];
services.dovecot2 = {
enable = true;
protocols = [ "imap" "pop3" ];
modules = [ pkgs.dovecot_pigeonhole ];
};
environment.systemPackages = let
sendTestMail = pkgs.writeScriptBin "send-testmail" ''
#!${pkgs.runtimeShell}

44
pkgs/applications/editors/jetbrains/default.nix
View file

@ -269,12 +269,12 @@ in
clion = buildClion rec {
name = "clion-${version}";
version = "2020.3"; /* updated by script */
version = "2020.3.1"; /* updated by script */
description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
sha256 = "0kqja2c5pz0f9idc52mv7iy2pqq2kfcx4q4x1ywfn3gq3d8n5j7z"; /* updated by script */
sha256 = "1jfvwir79s0kcqmlx6bbkmc42bplgl7814mnqfcsdzni1qv62pws"; /* updated by script */
};
wmClass = "jetbrains-clion";
update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
@ -282,12 +282,12 @@ in
datagrip = buildDataGrip rec {
name = "datagrip-${version}";
version = "2020.3"; /* updated by script */
version = "2020.3.1"; /* updated by script */
description = "Your Swiss Army Knife for Databases and SQL";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
sha256 = "1j0mlsiqh80mspi2x9mi0h5hxhg5gw6395hyl9w33q8dxm95mx2d"; /* updated by script */
sha256 = "0jk7ywxk983ld5x71a59dh1hvlnli3sbvg7fbicahas5ml8clxfv"; /* updated by script */
};
wmClass = "jetbrains-datagrip";
update-channel = "DataGrip RELEASE";
@ -295,12 +295,12 @@ in
goland = buildGoland rec {
name = "goland-${version}";
version = "2020.3"; /* updated by script */
version = "2020.3.1"; /* updated by script */
description = "Up and Coming Go IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/go/${name}.tar.gz";
sha256 = "0hj1xm3c71y2z1jyv7j3xf2lcj2y0kyvsxd3jjyyhs31w1f3394j"; /* updated by script */
sha256 = "12gi1a2bmafmy7qgqwv3a7b5b46dlhw4ahmkm5pkq6pmxl4y6dmk"; /* updated by script */
};
wmClass = "jetbrains-goland";
update-channel = "GoLand RELEASE";
@ -308,12 +308,12 @@ in
idea-community = buildIdea rec {
name = "idea-community-${version}";
version = "2020.3"; /* updated by script */
version = "2020.3.1"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
sha256 = "0x1nsjw1m03iq7sd9i2qqlyribrzgi8yh6k5hnb630kvrxr8pxy6"; /* updated by script */
sha256 = "0am4h8w1dmjl08iphqy78ivb91vkrvskg95dgm24zcj0n8rwmaq6"; /* updated by script */
};
wmClass = "jetbrains-idea-ce";
update-channel = "IntelliJ IDEA RELEASE";
@ -321,12 +321,12 @@ in
idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
version = "2020.3"; /* updated by script */
version = "2020.3.1"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz";
sha256 = "1l6bvfgzp27113rjy1y3jvp09cqx8gpnbgpwp83vsph7x0dhx8a3"; /* updated by script */
sha256 = "1kwz0aq4b664awppakj4syppk218nynwxv4ngc7pa3k9v4g2sdah"; /* updated by script */
};
wmClass = "jetbrains-idea";
update-channel = "IntelliJ IDEA RELEASE";
@ -347,12 +347,12 @@ in
phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}";
version = "2020.3"; /* updated by script */
version = "2020.3.1"; /* updated by script */
description = "Professional IDE for Web and PHP developers";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
sha256 = "1d5rx7p7lvjzgp57n980f2bfrj14p1f4hxmyvx5pzzd86q7hrcbq"; /* updated by script */
sha256 = "1c5j3mbg8scsl4c90cjahdk5gs5q72y5a8fhkqa9zmy6di42k99x"; /* updated by script */
};
wmClass = "jetbrains-phpstorm";
update-channel = "PhpStorm RELEASE";
@ -360,12 +360,12 @@ in
pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
version = "2020.3"; /* updated by script */
version = "2020.3.2"; /* updated by script */
description = "PyCharm Community Edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "1c2izsqx27g4jy46iskx5zg00pd8jaf9x1p0vya4l2v5r49dk4jb"; /* updated by script */
sha256 = "1z3w6aah635fdrhrzp5af6sgj269jk7mv8vgdd83gxillkx9vq9k"; /* updated by script */
};
wmClass = "jetbrains-pycharm-ce";
update-channel = "PyCharm RELEASE";
@ -373,12 +373,12 @@ in
pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
version = "2020.3"; /* updated by script */
version = "2020.3.2"; /* updated by script */
description = "PyCharm Professional Edition";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "1kzgy90zcligwa9r6r11kx99z0zm93mrzy700y2jwslyzapd16d0"; /* updated by script */
sha256 = "1fbb8v40q7vgn5v5dyxb211abr8swnxa3gw18kh3vlk6yc2crzfw"; /* updated by script */
};
wmClass = "jetbrains-pycharm";
update-channel = "PyCharm RELEASE";
@ -386,12 +386,12 @@ in
rider = buildRider rec {
name = "rider-${version}";
version = "2020.2.4"; /* updated by script */
version = "2020.3.2"; /* updated by script */
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
sha256 = "1anl48ifv5ayqn876dqckxc1b5fw1271pvamzf1vvk501wv6dpaf"; /* updated by script */
sha256 = "1dkgbd2nqkjcswf7j3pnrsaq9n5wk42abz2c4wgkrh1zrpgihd0j"; /* updated by script */
};
wmClass = "jetbrains-rider";
update-channel = "Rider RELEASE";
@ -399,12 +399,12 @@ in
ruby-mine = buildRubyMine rec {
name = "ruby-mine-${version}";
version = "2020.3"; /* updated by script */
version = "2020.3.1"; /* updated by script */
description = "The Most Intelligent Ruby and Rails IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
sha256 = "0ij6j9bxfqzj8gnrhhdgai22s1n5swd4waxd5zjvmv7q9j9cb2l5"; /* updated by script */
sha256 = "0drxzz6k0cmhir4szg8nwmsi9qh380vrryghmpvx9w83yrcain4c"; /* updated by script */
};
wmClass = "jetbrains-rubymine";
update-channel = "RubyMine RELEASE";
@ -412,12 +412,12 @@ in
webstorm = buildWebStorm rec {
name = "webstorm-${version}";
version = "2020.3"; /* updated by script */
version = "2020.3.1"; /* updated by script */
description = "Professional IDE for Web and JavaScript development";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
sha256 = "0sk7slwfr9jasid09hxw81sik5srn35vif3pbzpybig3yszbv6ld"; /* updated by script */
sha256 = "1bfq3xwnfz6f04d0lq584q7pg775a8y35b1b62w81dbfh43l4fj0"; /* updated by script */
};
wmClass = "jetbrains-webstorm";
update-channel = "WebStorm RELEASE";

4
pkgs/applications/misc/dbeaver/default.nix
View file

@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
pname = "dbeaver-ce";
version = "7.3.1";
version = "7.3.2";
desktopItem = makeDesktopItem {
name = "dbeaver";
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
sha256 = "sha256-4UVC5lBoGsW99L6AgM+1Rs07LCrvp2qVevBrooTbee4=";
sha256 = "sha256-4BVXcR8/E4uIrPQJe9KU9577j4XLTxJWTO8g0vCHWts=";
};
installPhase = ''

15
pkgs/applications/office/paperwork/paperwork-gtk.nix
View file

@ -2,8 +2,6 @@
, python3Packages
, gtk3
, cairo
, aspellDicts
, buildEnv
, gnome3
, librsvg
, xvfb_run
@ -40,16 +38,19 @@ python3Packages.buildPythonApplication rec {
make l10n_compile
'';
ASPELL_CONF = "dict-dir ${buildEnv {
name = "aspell-all-dicts";
paths = lib.collect lib.isDerivation aspellDicts;
}}/lib/aspell";
postInstall = ''
# paperwork-shell needs to be re-wrapped with access to paperwork
cp ${python3Packages.paperwork-shell}/bin/.paperwork-cli-wrapped $out/bin/paperwork-cli
# install desktop files and icons
XDG_DATA_HOME=$out/share $out/bin/paperwork-gtk install --user
# fixes [WARNING] [openpaperwork_core.resources.setuptools] Failed to find
# resource file paperwork_gtk.icon.out/paperwork_128.png, tried at path
# /nix/store/3n5lz6y8k9yks76f0nar3smc8djan3xr-paperwork-2.0.2/lib/python3.8/site-packages/paperwork_gtk/icon/out/paperwork_128.png.
site=$out/lib/${python3Packages.python.libPrefix}/site-packages/paperwork_gtk
for i in $site/data/paperwork_*.png; do
ln -s $i $site/icon/out;
done
'';
checkInputs = [ xvfb_run dbus.daemon ];

2
pkgs/applications/office/paperwork/paperwork-shell.nix
View file

@ -10,6 +10,7 @@
, paperwork-backend
, fabulous
, getkey
, psutil
, pkgs
}:
@ -34,6 +35,7 @@ buildPythonPackage rec {
paperwork-backend
fabulous
getkey
psutil
];
checkInputs = [

4
pkgs/applications/office/paperwork/src.nix
View file

@ -1,12 +1,12 @@
{fetchFromGitLab}:
rec {
version = "2.0.1";
version = "2.0.2";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
repo = "paperwork";
group = "World";
owner = "OpenPaperwork";
rev = version;
sha256 = "16pc4drwpjl4937wdavs6wk0j1qs474b072wplhs8ywxfgqip1h4";
sha256 = "1di7nnl8ywyiwfpl5m1kvip1m0hvijbmqmkdpviwqw7ajizrr1ly";
};
}

4
pkgs/applications/science/chemistry/quantum-espresso/default.nix
View file

@ -4,12 +4,12 @@
}:
stdenv.mkDerivation rec {
version = "6.5";
version = "6.6";
pname = "quantum-espresso";
src = fetchurl {
url = "https://gitlab.com/QEF/q-e/-/archive/qe-${version}/q-e-qe-${version}.tar.gz";
sha256 = "00nnsq1vq579xsmkvwrgs6bdqdcbdlsmcp4yfynnvs40ca52m2r5";
sha256 = "0b3718bwdqfyssyz25jknijar79qh5cf1bbizv9faliz135mcilj";
};
passthru = {

13
pkgs/applications/science/misc/colmap/default.nix
View file

@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchpatch, fetchFromGitHub, cmake, boost17x, ceres-solver, eigen,
{ mkDerivation, lib, fetchFromGitHub, cmake, boost17x, ceres-solver, eigen,
freeimage, glog, libGLU, glew, qtbase,
cudaSupport ? false, cudatoolkit ? null }:
@ -7,22 +7,15 @@ assert !cudaSupport || cudatoolkit != null;
let boost_static = boost17x.override { enableStatic = true; };
in
mkDerivation rec {
version = "3.5";
version = "3.6";
pname = "colmap";
src = fetchFromGitHub {
owner = "colmap";
repo = "colmap";
rev = version;
sha256 = "1vnb62p0y2bnga173wmjs0lnyqdjikv0fkcxjzxm8187khk2lly8";
sha256 = "1kfivdmhpmdxjjf30rr57y2iy7xmdpg4h8aw3qgacv8ckfpgda3n";
};
patches = [
(fetchpatch {
url = "https://github.com/colmap/colmap/commit/6af3d8b0048cecc3b9fc6f4e78c3214dd038180b.patch";
sha256 = "1zv5girmv4hv78w1xn131v8njwhpbyylc1m15731lnhrs8bri0jq";
})
];
buildInputs = [
boost_static ceres-solver eigen
freeimage glog libGLU glew qtbase

37
pkgs/applications/science/molecular-dynamics/viennarna/default.nix Normal file
View file

@ -0,0 +1,37 @@
{ stdenv
, fetchurl
, gsl
, mpfr
, perl
, python3
}:
stdenv.mkDerivation rec {
pname = "ViennaRNA";
version = "2.4.17";
src = fetchurl {
url = "https://www.tbi.univie.ac.at/RNA/download/sourcecode/2_4_x/${pname}-${version}.tar.gz";
sha256 = "08f1h2a8fn1s2zwf1244smiydhgwxgcnzy6irpdlmpvwygv0irmi";
};
buildInputs = [
gsl
mpfr
perl
python3
];
configureFlags = [
"--with-cluster"
"--with-kinwalker"
];
meta = with stdenv.lib; {
description = "Prediction and comparison of RNA secondary structures";
homepage = "https://www.tbi.univie.ac.at/RNA/";
license = licenses.unfree;
maintainers = with maintainers; [ prusnak ];
platforms = platforms.unix;
};
}

3
pkgs/applications/video/subtitleeditor/default.nix
View file

@ -35,6 +35,9 @@ stdenv.mkDerivation {
gst_all_1.gstreamermm
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-ugly
gst_all_1.gst-libav
hicolor-icon-theme
libsigcxx
libxmlxx

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

@ -17,7 +17,7 @@
stdenv.mkDerivation rec {
pname = "libinsane";
version = "1.0.8";
version = "1.0.9";
outputs = [ "out" "dev" "devdoc" ];
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
group = "World";
owner = "OpenPaperwork";
rev = version;
sha256 = "0mcvqpixilzs4d4afkbxa1nqm6ddmhpaz5j56pfvc5wpv6s99h44";
sha256 = "1a1lszhq3j11i1jybc5kmn7hhhji44xhjqsxsldsy9l3344rkzv4";
};
nativeBuildInputs = [ meson pkg-config ninja doxygen gtk-doc docbook_xsl gobject-introspection vala ];

63
pkgs/development/python-modules/adblock/default.nix Normal file
View file

@ -0,0 +1,63 @@
{ stdenv
, lib
, rustPlatform
, fetchFromGitHub
, pipInstallHook
, pythonImportsCheckHook
, maturin
, pkg-config
, openssl
, publicsuffix-list
, isPy27
, CoreFoundation
, Security
}:
rustPlatform.buildRustPackage rec {
pname = "adblock";
version = "0.4.0";
disabled = isPy27;
# Pypi only has binary releases
src = fetchFromGitHub {
owner = "ArniDagur";
repo = "python-adblock";
rev = version;
sha256 = "10d6ks2fyzbizq3kb69q478idj0h86k6ygjb6wl3zq3mf65ma4zg";
};
format = "pyproject";
cargoSha256 = "0di05j942rrm2crpdpp9czhh65fmidyrvdp2n3pipgnagy7nchc0";
nativeBuildInputs = [ pipInstallHook maturin pkg-config pythonImportsCheckHook ];
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ CoreFoundation Security ];
PSL_PATH = "${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat";
buildPhase = ''
runHook preBuild
maturin build --release --manylinux off --strip
runHook postBuild
'';
# There are no rust tests
doCheck = false;
pythonImportsCheck = [ "adblock" ];
installPhase = ''
runHook preInstall
install -Dm644 -t dist target/wheels/*.whl
pipInstallPhase
runHook postInstall
'';
passthru.meta = with lib; {
description = "Python wrapper for Brave's adblocking library, which is written in Rust";
homepage = "https://github.com/ArniDagur/python-adblock/";
maintainers = with maintainers; [ petabyteboy ];
license = with licenses; [ asl20 mit ];
platforms = with platforms; [ all ];
};
}

36
pkgs/development/python-modules/asyncwhois/default.nix Normal file
View file

@ -0,0 +1,36 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, aiodns
, tldextract
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "asyncwhois";
version = "0.2.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "0rdmg59jzzfz59b3ckg5187lc0wk9r0pzp9x09nq3xs21mcwqjxz";
};
propagatedBuildInputs = [
aiodns
tldextract
];
# tests are only present at GitHub but not the released source tarballs
# https://github.com/pogzyb/asyncwhois/issues/10
doCheck = false;
pythonImportsCheck = [ "asyncwhois" ];
meta = with lib; {
description = "Python module for retrieving WHOIS information";
homepage = "https://github.com/pogzyb/asyncwhois";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

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

@ -4,11 +4,11 @@
}:
buildPythonPackage rec {
pname = "autobahn";
version = "20.7.1";
version = "20.12.3";
src = fetchPypi {
inherit pname version;
sha256 = "86bbce30cdd407137c57670993a8f9bfdfe3f8e994b889181d85e844d5aa8dfb";
sha256 = "15b8zm7jalwisfwc08szxy3bh2bnn0hd41dbsnswi0lqwbh962j1";
};
propagatedBuildInputs = [ six txaio twisted zope_interface cffi cryptography pynacl ] ++

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

@ -25,11 +25,11 @@ let
package = buildPythonPackage rec {
pname = "buildbot";
version = "2.9.2";
version = "2.10.0";
src = fetchPypi {
inherit pname version;
sha256 = "019xfxjnyfi69d5sm3alvib24g8giqlvc102p8hqg8mfm7hc9z2v";
sha256 = "06fgp5gpacyx1sqh1f6590r792d5lhzspwmjli592ajx69ckzzwf";
};
propagatedBuildInputs = [

2
pkgs/development/python-modules/buildbot/pkg.nix
View file

@ -6,7 +6,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "01s58zi72drv4lwn6jg6i5mrpf3mpq74761z6iwx5hsdnqg1hxai";
sha256 = "1wr8fxa80c6vq55zv7k9rf61r805flrhd2v28qfl05jz1inghysb";
};
postPatch = ''

10
pkgs/development/python-modules/buildbot/plugins.nix
View file

@ -7,7 +7,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "1z5sca2ksbr1j6p0kr8i9a61c46mdmbbd6hvc6407c3z5393mp30";
sha256 = "0bzn00qqx0xd9r4rrz01y9zmiwjlhcanrs13r1yzp2mycn9q5865";
};
# Remove unneccessary circular dependency on buildbot
@ -34,7 +34,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "1kz54zlc2yr9cjvw7rihcx7hfk245r6yh4mfyala38jby3hd68p0";
sha256 = "0yh0dpg27gl3pk3nimj1yb6rw7kxvsv1bvzc6hbcfx3a9qdajicj";
};
buildInputs = [ buildbot-pkg ];
@ -56,7 +56,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "0ac0dzldxl4j9cb4kpmhjwf5m1zjjvcg0hx9kghallab0sk1198p";
sha256 = "0b9fffr53wfq328csrqgdinafbs1v5s7yn4ky8faw6sqyd8l197v";
};
buildInputs = [ buildbot-pkg ];
@ -78,7 +78,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "1m41l2d6yb4mbg1ybn7q6wmkfvwssmfb4inmpwyvy55bcvgyixcm";
sha256 = "0pz1kmq731ap79l05l13f10r81lzgif5aydpsfz3k5fa9flvxjxs";
};
buildInputs = [ buildbot-pkg ];
@ -100,7 +100,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "1g58kr2zc7k94k0avly0vyyryg18gpsbick8mj5cz81s2pfmmyfq";
sha256 = "1jf72dzmgwrkqbr2f8s2dvf0zpvl3vbdq0qsf0g8xal272l7cmca";
};
buildInputs = [ buildbot-pkg ];

2
pkgs/development/python-modules/buildbot/worker.nix
View file

@ -7,7 +7,7 @@ buildPythonPackage (rec {
src = fetchPypi {
inherit pname version;
sha256 = "1salrdirny1jpm53shb9dhzs1w7rbp5q7z2qpzrg1nmsh2kcd6ap";
sha256 = "1s51ycgnvjbxc2y358vw6rnw8xsx9grj6pxzfxjrph784igy22r0";
};
propagatedBuildInputs = [ twisted future ];

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

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "mautrix";
version = "0.8.5";
version = "0.8.6";
src = fetchPypi {
inherit pname version;
sha256 = "564ffe240fd9a29978959c7d7827610cf4d8ff02ed612c3fd8067e2fba2cba59";
sha256 = "e28d89cb8297ec36d78ef79507613c45ab3ab0bc709f1944ca5be349797f8f6b";
};
propagatedBuildInputs = [

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

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "mwparserfromhell";
version = "0.5.4";
version = "0.6";
src = fetchPypi {
inherit pname version;
sha256 = "aaf5416ab9b75e99e286f8a4216f77a2f7d834afd4c8f81731e701e59bf99305";
sha256 = "75787b6ab140ab267b313d37d045f3276f5dc6a9741074eddfbabc1635cb2efc";
};
meta = with stdenv.lib; {

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

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "nocaselist";
version = "1.0.3";
version = "1.0.4";
src = fetchPypi {
inherit pname version;
sha256 = "fm3st9hVY7kESRPJCH70tpG8PaTXrR2IlozepAlVMyY=";
sha256 = "73a9c0659e7135c66e46a6ab06e2cb637ce9248d73c690ebd31afb72a4e03ac0";
};
checkInputs = [

4
pkgs/development/python-modules/openwrt-luci-rpc/default.nix
View file

@ -10,11 +10,11 @@ with lib;
buildPythonPackage rec {
pname = "openwrt-luci-rpc";
version = "1.1.6";
version = "1.1.7";
src = fetchPypi {
inherit pname version;
sha256 = "841c7fc956ad42825a2f2cd0cb2aa02005c3482b200ff7aaccd390345c9f3e18";
sha256 = "8074c1ed24cdd1fadc5a99bd63d9313a0a44703714473ed781ed11e7fb45c96f";
};
postPatch = ''

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

@ -1,11 +1,11 @@
{ lib, buildPythonPackage, fetchPypi, dateutil, requests, pytz, pyproj , pytest, pyyaml } :
buildPythonPackage rec {
pname = "OWSLib";
version = "0.20.0";
version = "0.21.0";
src = fetchPypi {
inherit pname version;
sha256 = "334988857b260c8cdf1f6698d07eab61839c51acb52ee10eed1275439200a40e";
sha256 = "408d40b3a6a210bcb3f3609b607960eeedaa63ffd574dde7896906691c354814";
};
buildInputs = [ pytest ];

41
pkgs/development/python-modules/python-whois/default.nix Normal file
View file

@ -0,0 +1,41 @@
{ lib
, buildPythonPackage
, fetchPypi
, future
, nose
, pytestCheckHook
, simplejson
}:
buildPythonPackage rec {
pname = "python-whois";
version = "0.7.3";
src = fetchPypi {
inherit pname version;
sha256 = "05jaxbnlw5wck0hl124py364jqrx7a4mmv0hy3d2jzvmp0012sk5";
};
propagatedBuildInputs = [ future ];
checkInputs = [
nose
pytestCheckHook
simplejson
];
# Exclude tests that require network access
disabledTests = [
"test_dk_parse"
"test_ipv4"
"test_ipv6"
];
pythonImportsCheck = [ "whois" ];
meta = with lib; {
description = "Python module to produce parsed WHOIS data";
homepage = "https://github.com/richardpenman/whois";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

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

@ -5,15 +5,16 @@
buildPythonPackage rec {
pname = "pytun";
version = "2.2.1";
version = "2.3.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "montag451";
repo = "pytun";
sha256 = "1bxk0z0v8m0b01xg94f039j3bsclkshb7girvjqfzk5whbd2nryh";
sha256 = "1cqq8aci38058fjh4a0xf21wac177fw576p2yjl2b8jd9rnsqbl5";
};
# Test directory contains examples, not tests.
doCheck = false;
meta = with stdenv.lib; {
@ -23,5 +24,4 @@ buildPythonPackage rec {
maintainers = with maintainers; [ montag451 ];
platforms = platforms.linux;
};
}

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

@ -5,11 +5,11 @@
}:
buildPythonPackage rec {
pname = "sqlalchemy-migrate";
version = "0.12.0";
version = "0.13.0";
src = fetchPypi {
inherit pname version;
sha256 = "1bngmbcry97kwhrxwm0d74zg9qg7gmiws6rd78xshyfgpcqdmylc";
sha256 = "1y0lcqii7b4vp7yh9dyxrl4i77hi8jkkw7d06mgdw2h458ljxh0b";
};
# See: https://review.openstack.org/#/c/608382/

32
pkgs/development/python-modules/whois/default.nix Normal file
View file

@ -0,0 +1,32 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, inetutils
}:
buildPythonPackage rec {
pname = "whois";
version = "0.9.7";
src = fetchFromGitHub {
owner = "DannyCork";
repo = "python-whois";
rev = version;
sha256 = "1rbc4xif4dn455vc8dhxdvwszrb0nik5q9fy12db6mxfx6zikb7z";
};
# whois is needed
propagatedBuildInputs = [ inetutils ];
# tests require network access
doCheck = false;
pythonImportsCheck = [ "whois" ];
meta = with lib; {
description = "Python module/library for retrieving WHOIS information";
homepage = "https://github.com/DannyCork/python-whois/";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

25
pkgs/development/tools/analysis/lcov/default.nix
View file

@ -1,24 +1,16 @@
{stdenv, fetchurl, fetchpatch, perl, perlPackages, makeWrapper }:
{stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper }:
stdenv.mkDerivation rec {
name = "lcov-1.14";
pname = "lcov";
version = "1.15";
src = fetchurl {
url = "mirror://sourceforge/ltp/${name}.tar.gz";
sha256 = "06h7ixyznf6vz1qvksjgy5f3q2nw9akf6zx59npf0h3l32cmd68l";
src = fetchFromGitHub {
owner = "linux-test-project";
repo = "lcov";
rev = "v${version}";
sha256 = "1kvc7fkp45w48f0bxwbxvxkicnjrrydki0hllg294n1wrp80zzyk";
};
patches =
[ (fetchpatch {
url = "https://github.com/linux-test-project/lcov/commit/ebfeb3e179e450c69c3532f98cd5ea1fbf6ccba7.patch";
sha256 = "0dalkqbjb6a4vp1lcsxd39dpn5fzdf7ihsjbiviq285s15nxdj1j";
})
(fetchpatch {
url = "https://github.com/linux-test-project/lcov/commit/75fbae1cfc5027f818a0bb865bf6f96fab3202da.patch";
sha256 = "0v1hn0511dxqbf50ppwasc6vmg0m6rns7ydbdy2rdbn0j7gxw30x";
})
];
buildInputs = [ perl makeWrapper ];
preBuild = ''
@ -28,6 +20,7 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/lcov --set PERL5LIB ${perlPackages.makeFullPerlPath [ perlPackages.PerlIOgzip perlPackages.JSON ]}
wrapProgram $out/bin/genpng --set PERL5LIB ${perlPackages.makeFullPerlPath [ perlPackages.GD ]}
'';
meta = with stdenv.lib; {

20
pkgs/games/zdoom/zdbsp.nix
View file

@ -1,16 +1,22 @@
{ stdenv, fetchurl, cmake, unzip, zlib }:
{ stdenv, fetchzip, cmake, zlib }:
stdenv.mkDerivation rec {
pname = "zdbsp";
version = "1.19";
src = fetchurl {
src = fetchzip {
url = "https://zdoom.org/files/utils/zdbsp/zdbsp-${version}-src.zip";
sha256 = "0j82q7g7hgvnahk6gdyhmn9880mqii3b4agqc98f5xaj3kxmd2dr";
sha256 = "1j6k0appgjjj3ffbll9hy9nnbqr17szd1s66q08zrbkfqf6g8f0d";
stripRoot = false;
};
nativeBuildInputs = [cmake unzip];
buildInputs = [zlib];
nativeBuildInputs = [
cmake
];
buildInputs = [
zlib
];
installPhase = ''
install -Dm755 zdbsp $out/bin/zdbsp
@ -20,7 +26,7 @@ stdenv.mkDerivation rec {
description = "ZDoom's internal node builder for DOOM maps";
homepage = "https://zdoom.org/wiki/ZDBSP";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ertes];
platforms = platforms.linux;
maintainers = with maintainers; [ lassulus siraben ];
platforms = platforms.unix;
};
}

12
pkgs/misc/vim-plugins/generated.nix
View file

@ -5185,6 +5185,18 @@ let
meta.homepage = "https://github.com/tikhomirov/vim-glsl/";
};
vim-gnupg = buildVimPluginFrom2Nix {
pname = "vim-gnupg";
version = "2021-01-03";
src = fetchFromGitHub {
owner = "jamessan";
repo = "vim-gnupg";
rev = "96be0be1240a848da56d665b38e1b0fe7ee3f1af";
sha256 = "10syaaylyaqn60zhyx008863b5b1349pygg7lnaqchw6bard1135";
};
meta.homepage = "https://github.com/jamessan/vim-gnupg/";
};
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
version = "2020-12-27";

1
pkgs/misc/vim-plugins/vim-plugin-names
View file

@ -180,6 +180,7 @@ ivanov/vim-ipython
jackguo380/vim-lsp-cxx-highlight
jacoborus/tender.vim
jakwings/vim-pony
jamessan/vim-gnupg@main
jaredgorski/SpaceCamp
jaxbot/semantic-highlight.vim
JazzCore/ctrlp-cmatcher

21
pkgs/os-specific/linux/fatrace/default.nix
View file

@ -1,12 +1,18 @@
{ stdenv, fetchurl, python3, which }:
{ stdenv
, fetchFromGitHub
, python3
, which
}:
stdenv.mkDerivation rec {
pname = "fatrace";
version = "0.13";
version = "0.16.1";
src = fetchurl {
url = "https://launchpad.net/fatrace/trunk/${version}/+download/${pname}-${version}.tar.bz2";
sha256 = "0hrh45bpzncw0jkxw3x2smh748r65k2yxvfai466043bi5q0d2vx";
src = fetchFromGitHub {
owner = "martinpitt";
repo = pname;
rev = version;
sha256 = "0lxfqin2bw9235yah8ylb4p8lc3755050sjg30z3gy7bab0lfyg9";
};
buildInputs = [ python3 which ];
@ -14,16 +20,13 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace power-usage-report \
--replace "'which'" "'${which}/bin/which'"
# Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
sed 1i'#include <sys/sysmacros.h>' -i fatrace.c
'';
makeFlags = [ "PREFIX=$(out)" ];
meta = with stdenv.lib; {
description = "Report system-wide file access events";
homepage = "https://launchpad.net/fatrace/";
homepage = "https://github.com/martinpitt/fatrace";
license = licenses.gpl3Plus;
longDescription = ''
fatrace reports file access events from all running processes.

4
pkgs/os-specific/linux/rdma-core/default.nix
View file

@ -4,7 +4,7 @@
} :
let
version = "31.2";
version = "33.0";
in stdenv.mkDerivation {
pname = "rdma-core";
@ -14,7 +14,7 @@ in stdenv.mkDerivation {
owner = "linux-rdma";
repo = "rdma-core";
rev = "v${version}";
sha256 = "0njfn8ziip57a2s435d4s0p3yylb85y7hdgbq660vwpsia9fb4sq";
sha256 = "04q4z95nxxxjc674qnbwn19bv18nl3x7xwp6aql17h1cw3gdmhw4";
};
nativeBuildInputs = [ cmake pkgconfig pandoc docutils makeWrapper ];

10
pkgs/servers/dns/powerdns/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, nixosTests
{ stdenv, fetchurl, fetchpatch, pkgconfig, nixosTests
, boost, libyamlcpp, libsodium, sqlite, protobuf, openssl, systemd
, mysql57, postgresql, lua, openldap, geoip, curl, unixODBC
}:
@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
sha256 = "0if27znz528sir52y9i4gcfhdsym7yxiwjgffy9lpscf1426q56m";
};
patches = [
(fetchpatch { # remove for >= 4.4.0
name = "gcc-10_undefined-reference.diff";
url = "https://github.com/PowerDNS/pdns/commit/05c9dd77b28.diff";
sha256 = "1m9szbi02h9kcabgw3kb8k9qrb54d34z0qzizrlfiw3hxs6c2zql";
})
];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
boost mysql57.connector-c postgresql lua openldap sqlite protobuf geoip

2
pkgs/servers/home-assistant/component-packages.nix
View file

@ -925,7 +925,7 @@
"webostv" = ps: with ps; [ ]; # missing inputs: aiopylgtv
"websocket_api" = ps: with ps; [ aiohttp-cors ];
"wemo" = ps: with ps; [ ]; # missing inputs: pywemo
"whois" = ps: with ps; [ ]; # missing inputs: python-whois
"whois" = ps: with ps; [ python-whois ];
"wiffi" = ps: with ps; [ ]; # missing inputs: wiffi
"wilight" = ps: with ps; [ ]; # missing inputs: pywilight
"wink" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pubnubsub-handler python-wink

5
pkgs/servers/mail/dovecot/default.nix
View file

@ -10,7 +10,7 @@
stdenv.mkDerivation rec {
pname = "dovecot";
version = "2.3.11.3";
version = "2.3.13";
nativeBuildInputs = [ perl pkgconfig ];
buildInputs =
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://dovecot.org/releases/2.3/${pname}-${version}.tar.gz";
sha256 = "1p5gp8jbavcsaara5mfn5cbrnlxssajnchczbgmmfzr7228fmnfk";
sha256 = "1i7ijss79a23v7b6lycfzaa8r5rh01k0h0b9h0j4a6n11sw7by53";
};
enableParallelBuilding = true;
@ -89,5 +89,6 @@ stdenv.mkDerivation rec {
};
passthru.tests = {
opensmtpd-interaction = nixosTests.opensmtpd;
inherit (nixosTests) dovecot;
};
}

4
pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "dovecot-pigeonhole";
version = "0.5.11";
version = "0.5.13";
src = fetchurl {
url = "https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz";
sha256 = "1w5mryv6izh1gv7davnl94rb0pvh5bxl2bydzbfla1b83x22m5qb";
sha256 = "05xz2d82ck6lmv94nbc3qff09j8b60a5640i3fmqwqsvv9kfa7wi";
};
buildInputs = [ dovecot openssl ];

6
pkgs/servers/metabase/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "metabase";
version = "0.37.3";
version = "0.37.4";
src = fetchurl {
url = "http://downloads.metabase.com/v${version}/metabase.jar";
sha256 = "0ka0k0ficvw8srpaa89l0jdzpl4n7hjwz18r41kw1hzk2ydd3p5c";
url = "https://downloads.metabase.com/v${version}/metabase.jar";
sha256 = "0l781b7mc33kkp4ic57ylghxw671b4ldv6b0wgphmrrwmp0cd3vm";
};
nativeBuildInputs = [ makeWrapper ];

3
pkgs/tools/system/efivar/default.nix
View file

@ -39,8 +39,9 @@ stdenv.mkDerivation rec {
sha256 = "1ajj11wwsvamfspq4naanvw08h63gr0g71q0dfbrrywrhc0jlmdw";
})
];
# We have no LTO here since commit 22284b07.
# We have no LTO here since commit 22284b07. With GCC 10 that triggers a warning.
postPatch = if stdenv.isi686 then "sed '/^OPTIMIZE /s/-flto//' -i Make.defaults" else null;
NIX_CFLAGS_COMPILE = if stdenv.isi686 then "-Wno-error=stringop-truncation" else null;
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ popt ];

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

@ -9022,7 +9022,7 @@ in
colm = callPackage ../development/compilers/colm { };
colmap = libsForQt514.callPackage ../applications/science/misc/colmap { };
colmapWithCuda = colmap.override { cudaSupport = true; };
colmapWithCuda = colmap.override { cudaSupport = true; cudatoolkit = cudatoolkit_11; };
chickenPackages_4 = callPackage ../development/compilers/chicken/4 { };
chickenPackages_5 = callPackage ../development/compilers/chicken/5 { };
@ -28770,6 +28770,8 @@ in
giflib = giflib_4_1;
};
ViennaRNA = callPackage ../applications/science/molecular-dynamics/viennarna { };
viewnior = callPackage ../applications/graphics/viewnior { };
vimUtils = callPackage ../misc/vim-plugins/vim-utils.nix { };

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

@ -167,6 +167,10 @@ in {
adb-shell = callPackage ../development/python-modules/adb-shell { };
adblock = callPackage ../development/python-modules/adblock {
inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security;
};
addic7ed-cli = callPackage ../development/python-modules/addic7ed-cli { };
adguardhome= callPackage ../development/python-modules/adguardhome { };
@ -455,6 +459,8 @@ in {
async-upnp-client = callPackage ../development/python-modules/async-upnp-client { };
asyncwhois = callPackage ../development/python-modules/asyncwhois { };
atlassian-python-api = callPackage ../development/python-modules/atlassian-python-api { };
atom = callPackage ../development/python-modules/atom { };
@ -6157,6 +6163,8 @@ in {
python-vlc = callPackage ../development/python-modules/python-vlc { };
python-whois = callPackage ../development/python-modules/python-whois { };
python-wifi = callPackage ../development/python-modules/python-wifi { };
python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { };
@ -7782,6 +7790,8 @@ in {
vidstab = callPackage ../development/python-modules/vidstab { };
ViennaRNA = toPythonModule pkgs.ViennaRNA;
viewstate = callPackage ../development/python-modules/viewstate { };
vine = callPackage ../development/python-modules/vine { };
@ -7908,6 +7918,8 @@ in {
whitenoise = callPackage ../development/python-modules/whitenoise { };
whois = callPackage ../development/python-modules/whois { };
whoosh = callPackage ../development/python-modules/whoosh { };
widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { };