diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index c26e47bdbaba..2b42c6cc863f 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "7.1.2"; + version = "7.1.3"; 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 = "131v8y5la2pv3cqf2qknd816z24dvhf2c4f7js8vfzrfw5vwsqbq"; + sha256 = "0i8f0rhs11wwx3cy37y9rv61rd451gg138zl8rndri1hdgsz148b"; }; installPhase = '' diff --git a/pkgs/applications/misc/subsurface/0001-core-fix-libgit-ifdef-to-handle-libgit2-v1.0-and-onw.patch b/pkgs/applications/misc/subsurface/0001-core-fix-libgit-ifdef-to-handle-libgit2-v1.0-and-onw.patch deleted file mode 100644 index 027e3f493e12..000000000000 --- a/pkgs/applications/misc/subsurface/0001-core-fix-libgit-ifdef-to-handle-libgit2-v1.0-and-onw.patch +++ /dev/null @@ -1,41 +0,0 @@ -From dfa4bcafec4425659a409550085417af3c5c787b Mon Sep 17 00:00:00 2001 -From: Florian Klink -Date: Sat, 11 Apr 2020 12:38:38 +0200 -Subject: [PATCH] core: fix libgit ifdef to handle libgit2 v1.0 and onwards - -Conditional code for older libgit versions was removed in -https://github.com/Subsurface-divelog/subsurface/pull/2737, -but it's a non-trivial backport, and master currently isn't really ready -for a release. - -So instead ship a patch fixing the one broken libgit2 conditional until -a 4.10 release has been made. - -Note the inverted logic - the if branch now handles the old libgit -condition, and the else branch the newer versions, consistent with how -it's done in the rest of the subsurface codebase. ---- - core/git-access.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/core/git-access.c b/core/git-access.c -index 3688cb90c..9997fc8fd 100644 ---- a/core/git-access.c -+++ b/core/git-access.c -@@ -359,10 +359,10 @@ static int try_to_git_merge(git_repository *repo, git_reference **local_p, git_r - } - - git_merge_init_options(&merge_options, GIT_MERGE_OPTIONS_VERSION); --#if !LIBGIT2_VER_MAJOR && LIBGIT2_VER_MINOR > 23 -- merge_options.flags = GIT_MERGE_FIND_RENAMES; --#else -+#if !LIBGIT2_VER_MAJOR && LIBGIT2_VER_MINOR <= 22 - merge_options.tree_flags = GIT_MERGE_TREE_FIND_RENAMES; -+#else -+ merge_options.flags = GIT_MERGE_FIND_RENAMES; - #endif - merge_options.file_favor = GIT_MERGE_FILE_FAVOR_UNION; - merge_options.rename_threshold = 100; --- -2.25.1 - diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index e189351022b9..d8773240bac1 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -4,13 +4,13 @@ }: let - version = "4.9.3"; + version = "4.9.6"; subsurfaceSrc = (fetchFromGitHub { - owner = "Subsurface-divelog"; + owner = "Subsurface"; repo = "subsurface"; rev = "v${version}"; - sha256 = "1i07f7appifx9j205x5a7ng01wsipxr6n9a3692pm60jli2nsir5"; + sha256 = "1w1ak0fi6ljhg2jc4mjqyrbpax3iawrnsaqq6ls7qdzrhi37rggf"; fetchSubmodules = true; }); @@ -39,13 +39,13 @@ let googlemaps = stdenv.mkDerivation rec { pname = "googlemaps"; - version = "2017-12-18"; + version = "2018-06-02"; src = fetchFromGitHub { owner = "vladest"; repo = "googlemaps"; - rev = "79f3511d60dc9640de02a5f24656094c8982b26d"; - sha256 = "11334w0bnfb97sv23vvj2b5hcwvr0171hxldn91jms9y12l5j15d"; + rev = "54a357f9590d9cf011bf1713589f66bad65e00eb"; + sha256 = "159kslp6rj0qznzxijppwvv8jnswlfgf2pw4x8ladi8vp6bzxnzi"; }; nativeBuildInputs = [ qmake ]; @@ -78,9 +78,6 @@ in stdenv.mkDerivation { src = subsurfaceSrc; - # remove with the 4.10 release - patches = [ ./0001-core-fix-libgit-ifdef-to-handle-libgit2-v1.0-and-onw.patch ]; - buildInputs = [ libdc googlemaps curl grantlee libgit2 libssh2 libusb-compat-0_1 libxml2 libxslt libzip diff --git a/pkgs/applications/misc/taskell/default.nix b/pkgs/applications/misc/taskell/default.nix index 488e49c21817..e8f1c711d276 100644 --- a/pkgs/applications/misc/taskell/default.nix +++ b/pkgs/applications/misc/taskell/default.nix @@ -1,8 +1,8 @@ { lib, haskellPackages, fetchFromGitHub }: let - version = "1.7.3"; - sha256 = "1439fh79ilc6jvz894cfzhk7gy5r2sv4v79bvqmmqbzbqk9qsbvx"; + version = "1.9.3"; + sha256 = "1xh18884xkhcln4blglzi0faag4ydhxxsk9hj6llb81kcsxlsi89"; in (haskellPackages.mkDerivation { pname = "taskell"; @@ -46,6 +46,7 @@ in (haskellPackages.mkDerivation { # text time vty + tz ]; executableHaskellDepends = []; @@ -61,5 +62,5 @@ in (haskellPackages.mkDerivation { homepage = "https://taskell.app"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ matthiasbeyer ]; - platforms = with lib.platforms; unix ++ darwin; + platforms = [ "x86_64-linux" ]; }) diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/applications/networking/instant-messengers/zulip/default.nix index 1adfb71dd9b6..c1ae0ce0a067 100644 --- a/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip/default.nix @@ -5,12 +5,12 @@ let pname = "zulip"; - version = "5.2.0"; + version = "5.4.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; - sha256 = "0rgvllm1pzg6smyjrhh8v1ial0dvav0h2zccxp4p5nqmq6zdvs3h"; + sha256 = "14p0nly144rivd9yk273asfjza5p9qncpbmh4qxnd4gq01f98igh"; name="${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 5421bedf2927..89f04acb87fd 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.18.2"; + version = "1.18.3"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "0p6gprbs54v3n09fjpyfxnzxs680ms8924wdim4q9qw52wc6sbdz"; + sha256 = "1csdbyypqwxkfc061pdv7nj52a52b9xxzb6qgxcznd82w7wgfb3g"; }; vendorSha256 = null; outputs = [ "out" "man" ]; diff --git a/pkgs/development/libraries/dbxml/default.nix b/pkgs/development/libraries/dbxml/default.nix index 4913cfe28473..a0005f1bf720 100644 --- a/pkgs/development/libraries/dbxml/default.nix +++ b/pkgs/development/libraries/dbxml/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "a8fc8f5e0c3b6e42741fa4dfc3b878c982ff8f5e5f14843f6a7e20d22e64251a"; }; + outputs = [ "bin" "dev" "out" ]; + patches = [ ./cxx11.patch ./incorrect-optimization.patch diff --git a/pkgs/development/libraries/libcryptui/default.nix b/pkgs/development/libraries/libcryptui/default.nix index e3db41c73e1a..829d16e59d06 100644 --- a/pkgs/development/libraries/libcryptui/default.nix +++ b/pkgs/development/libraries/libcryptui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, gnome3, gtk3, gnupg20, gpgme, dbus-glib, libgnome-keyring }: +{ stdenv, fetchurl, autoreconfHook, pkgconfig, intltool, glib, gnome3, gtk3, gnupg22, gpgme, dbus-glib, libgnome-keyring }: stdenv.mkDerivation rec { pname = "libcryptui"; @@ -9,8 +9,12 @@ stdenv.mkDerivation rec { sha256 = "0rh8wa5k2iwbwppyvij2jdxmnlfjbna7kbh2a5n7zw4nnjkx3ski"; }; - nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ glib gtk3 gnupg20 gpgme dbus-glib libgnome-keyring ]; + patches = [ + ./fix-gnupg-2.2.patch # based on https://gitlab.gnome.org/GNOME/libcryptui/-/commit/b05e301d1b264a5d8f07cb96e5edc243d99bff79.patch + ]; + + nativeBuildInputs = [ pkgconfig intltool autoreconfHook ]; + buildInputs = [ glib gtk3 gnupg22 gpgme dbus-glib libgnome-keyring ]; propagatedBuildInputs = [ dbus-glib ]; passthru = { diff --git a/pkgs/development/libraries/libcryptui/fix-gnupg-2.2.patch b/pkgs/development/libraries/libcryptui/fix-gnupg-2.2.patch new file mode 100644 index 000000000000..50d5e0c82c1c --- /dev/null +++ b/pkgs/development/libraries/libcryptui/fix-gnupg-2.2.patch @@ -0,0 +1,26 @@ +From b05e301d1b264a5d8f07cb96e5edc243d99bff79 Mon Sep 17 00:00:00 2001 +From: Antoine Jacoutot +Date: Fri, 10 Nov 2017 08:55:55 +0100 +Subject: [PATCH] Accept GnuPG 2.2.x as supported version + +https://bugzilla.gnome.org/show_bug.cgi?id=790152 +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 4486e7b2..be5b28b4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -95,7 +95,7 @@ AC_ARG_ENABLE(gpg-check, + DO_CHECK=$enableval, DO_CHECK=yes) + + if test "$DO_CHECK" = "yes"; then +- accepted_versions="1.2 1.4 2.0" ++ accepted_versions="1.2 1.4 2.0 2.2" + AC_PATH_PROGS(GNUPG, [gpg gpg2], no) + AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.]) + ok="no" +-- +GitLab + diff --git a/pkgs/tools/admin/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix similarity index 56% rename from pkgs/tools/admin/certbot/default.nix rename to pkgs/development/python-modules/certbot/default.nix index 67d698a64fa7..79e5c3288b7f 100644 --- a/pkgs/tools/admin/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -1,12 +1,13 @@ { lib -, buildPythonApplication +, buildPythonPackage +, python, runCommand , fetchFromGitHub , ConfigArgParse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface , dialog, mock, gnureadline -, pytest_xdist, pytest, dateutil +, pytest_xdist, pytest, pytestCheckHook, dateutil }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "certbot"; version = "1.6.0"; @@ -17,6 +18,8 @@ buildPythonApplication rec { sha256 = "1y0m5qm853i6pcpb2mrf8kjkr9wr80mdrx1qmck38ayvr2v2p5lc"; }; + sourceRoot = "source/${pname}"; + propagatedBuildInputs = [ ConfigArgParse acme @@ -36,21 +39,32 @@ buildPythonApplication rec { buildInputs = [ dialog mock gnureadline ]; - checkInputs = [ pytest_xdist pytest dateutil ]; + checkInputs = [ + dateutil + pytest + pytestCheckHook + pytest_xdist + ]; - preBuild = '' - cd certbot - ''; - - postInstall = '' - for i in $out/bin/*; do - wrapProgram "$i" --prefix PYTHONPATH : "$PYTHONPATH" \ - --prefix PATH : "${dialog}/bin:$PATH" - done - ''; + pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" ]; doCheck = true; + makeWrapperArgs = [ "--prefix PATH : ${dialog}/bin" ]; + + # certbot.withPlugins has a similar calling convention as python*.withPackages + # it gets invoked with a lambda, and invokes that lambda with the python package set matching certbot's: + # certbot.withPlugins (cp: [ cp.certbot-dns-foo ]) + passthru.withPlugins = f: let + pythonEnv = python.withPackages f; + + in runCommand "certbot-with-plugins" { + } '' + mkdir -p $out/bin + cd $out/bin + ln -s ${pythonEnv}/bin/certbot + ''; + meta = with lib; { homepage = src.meta.homepage; description = "ACME client that can obtain certs and extensibly update server configurations"; diff --git a/pkgs/development/python-modules/pystray/default.nix b/pkgs/development/python-modules/pystray/default.nix index a2652fe1edc3..cd9259e33c2b 100644 --- a/pkgs/development/python-modules/pystray/default.nix +++ b/pkgs/development/python-modules/pystray/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "pystray"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "moses-palmer"; repo = "pystray"; rev = "v${version}"; - sha256 = "0m5raxahyix3lmmbjbrsfd9yhr4vdil8gcy155hh6lqm2b1fmmss"; + sha256 = "0q5yqfm5mzffx9vnp9xcnclgjzgs0b7f50i9xmxn1m1iha1zawh1"; }; propagatedBuildInputs = [ pillow xlib six ]; diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix index 6ea0b9d3e574..577400b859eb 100644 --- a/pkgs/development/python-modules/pytest-localserver/default.nix +++ b/pkgs/development/python-modules/pytest-localserver/default.nix @@ -1,9 +1,6 @@ { buildPythonPackage , lib , fetchPypi -, requests -, pytest -, six , werkzeug }: @@ -17,16 +14,16 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ werkzeug ]; - checkInputs = [ pytest six requests ]; - checkPhase = '' - pytest - ''; + # all tests access network: does not work in sandbox + doCheck = false; + pythonImportsCheck = [ "pytest_localserver" ]; - meta = { + meta = with lib; { description = "Plugin for the pytest testing framework to test server connections locally"; homepage = "https://pypi.python.org/pypi/pytest-localserver"; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ siriobalmelli ]; }; } diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix index 45e2fcd3f18b..a8ade2b815cc 100644 --- a/pkgs/development/tools/wabt/default.nix +++ b/pkgs/development/tools/wabt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wabt"; - version = "1.0.18"; + version = "1.0.19"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "wabt"; rev = version; - sha256 = "06b90ajgxqp4hcw7fqag7gphdn4q1rfglb7cw868n7wskwv45kc7"; + sha256 = "0g1iy1icnjfkc0dadkrif4nlixpvq626023rgj02m9al64gf9hvx"; fetchSubmodules = true; }; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index ff77b344e896..d559b69fcf67 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.188"; + version = "4.14.189"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0jq6cyxa0mxnvd33gi66a4x3xlfsih2aaifa6yyvgldihw9y0vvn"; + sha256 = "1qgr6hb714xi7rav4za4vk4l7c0ma3ndf0f2ca3q8ly5gd2j3rd7"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index f7bdc93cd6de..5cf6cd26cab1 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.133"; + version = "4.19.134"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1i6vfzg8xds4lvvzkxaak74727iq35hx4vxr14w65bq9gpzfacxr"; + sha256 = "0vrsiqqsiv0z4jhafqch2g27ig28nmw69hw32a8lc5fkcm7shzbx"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index c5474eb2ebad..740e6e014f52 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.230"; + version = "4.4.231"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1qx74qli8yjc2rkb7kig79c1yv7pfqa8zi1wi0rndn4d4yk62cfa"; + sha256 = "1c6p5hv18isa328pvpa3qmmsg4qsssf2mwsx3hzn489rb8ycdxp7"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index dc1503f7133d..41347d33ee5a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.230"; + version = "4.9.231"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0z03djys7k3z6z55xrw8rj4mv5i4h763lckz2anwxwgbwdb95fnm"; + sha256 = "1sz8xk767yy4lxqvy4229yrgkwnm43hdrbr54aa1flns5yh3p12g"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 4f0036b05f51..6f0a0eb785e5 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.52"; + version = "5.4.53"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0fjxx8xpp0v0wwfw6zd5nc21i2r82wzcsy2yyl7w5c90259zlzh3"; + sha256 = "08bd7lgj2c26h3rm8lm7w6dvi8zhjiilmrxf1rpp5m90jbwvd9zs"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.7.nix b/pkgs/os-specific/linux/kernel/linux-5.7.nix index eb77023e6755..c32f4a2352f9 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.7.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.7.9"; + version = "5.7.10"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "qH0wZqeEnNa6mgBDEanuBALSnRfxL2StfZQkRwcLQ/g="; + sha256 = "0i1x347q1rs9r11f7qic62d5465dzngxs0n44ryknmxpcl6469a7"; }; } // (args.argsOverride or {})) diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index 3dad2f1c6cea..96feac600264 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -1,15 +1,14 @@ { stdenv , buildGoModule -, lib , fetchFromGitHub -, rocksdb -, bzip2 -, zlib , packr -, snappy , pkg-config -, zeromq +, bzip2 , lz4 +, rocksdb +, snappy +, zeromq +, zlib }: buildGoModule rec { @@ -26,9 +25,9 @@ buildGoModule rec { vendorSha256 = "1qjlvhizl8cy06cgf4phia70bgbm4lj57z5z2gyr8aglx98bnpdn"; - buildInputs = [ bzip2 zlib snappy zeromq lz4 ]; + nativeBuildInputs = [ packr pkg-config ]; - nativeBuildInputs = [ pkg-config packr ]; + buildInputs = [ bzip2 lz4 rocksdb snappy zeromq zlib ]; buildFlagsArray = '' -ldflags= @@ -45,17 +44,16 @@ buildGoModule rec { }; overrideModAttrs = (_: { - postBuild = '' + postBuild = '' rm -r vendor/github.com/ethereum/go-ethereum cp -r --reflink=auto ${goethereum} vendor/github.com/ethereum/go-ethereum - ''; - }); + ''; + }); - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = stdenv.lib.optionalString stdenv.isDarwin '' ulimit -n 8192 '' + '' - export CGO_CFLAGS="-I${rocksdb}/include" - export CGO_LDFLAGS="-L${rocksdb}/lib -lrocksdb -lstdc++ -lm -lz -lbz2 -lsnappy -llz4" + export CGO_LDFLAGS="-L${stdenv.cc.cc.lib}/lib -lrocksdb -lz -lbz2 -lsnappy -llz4 -lm -lstdc++" packr clean && packr ''; @@ -67,11 +65,11 @@ buildGoModule rec { cp -r $src/static/css/ $out/share/ ''; - meta = with lib; { + meta = with stdenv.lib; { description = "Trezor address/account balance backend"; homepage = "https://github.com/trezor/blockbook"; license = licenses.agpl3; maintainers = with maintainers; [ mmahut maintainers."1000101" ]; - platforms = remove "aarch64-linux" platforms.unix; + platforms = platforms.unix; }; } diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index b56a10a189d4..10d1b4267ebb 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0d298v7rf8lxdavhfad68rq4sgmg6gw6vc7phh1lnhx5pbhkvv22"; + sha256 = "1a5jr1fh2n57lz84n6bvh78kjnvyaivjxwn95qkiiacvam2ji1h5"; }; - cargoSha256 = "0xibrdbqfmmkncqpjsllzx1w79crm0v4liwf2aldnafji7jqclb4"; + cargoSha256 = "16m2bjmkcby14sd21axfr9qvghhyf5q2wdrmjw1dl3c8xhghqyy8"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 0a3c6a21022e..050367703165 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -196,13 +196,13 @@ in rec { nixUnstable = lib.lowPrio (callPackage common rec { name = "nix-2.4${suffix}"; - suffix = "pre20200719_a79b6dd"; + suffix = "pre20200721_ff314f1"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "a79b6ddaa5dd5960da845d1b8d3c80601cd918a4"; - hash = "sha256-bOXZcOVh/4tnOb0vXCwDpmNHuW7aVfGUvmz3KyYMCuo="; + rev = "ff314f186e3f91d87af6ad96c0ae3b472494b940"; + hash = "sha256-QibpLo4/gf2xYGoeQcgjZzH/qy5TBRVH+QCHgqOwur0="; }; inherit storeDir stateDir confDir boehmgc; diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix deleted file mode 100644 index f5b693fed35a..000000000000 --- a/pkgs/tools/security/gnupg/20.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ fetchurl, stdenv, readline, zlib, libgpgerror, pth, libgcrypt, libassuan -, libksba, coreutils, libiconv, pcsclite - -# Each of the dependencies below are optional. -# Gnupg can be built without them at the cost of reduced functionality. -, pinentry ? null, guiSupport ? false -, openldap ? null, bzip2 ? null, libusb-compat-0_1 ? null, curl ? null -}: - -with stdenv.lib; - -assert guiSupport -> pinentry != null; - -stdenv.mkDerivation rec { - pname = "gnupg"; - version = "2.0.30"; - - src = fetchurl { - url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2"; - sha256 = "0wax4cy14hh0h7kg9hj0hjn9424b71z8lrrc5kbsasrn9xd7hag3"; - }; - - buildInputs - = [ readline zlib libgpgerror libgcrypt libassuan libksba pth - openldap bzip2 libusb-compat-0_1 curl libiconv ]; - - patches = [ ./gpgkey2ssh-20.patch ]; - - prePatch = '' - find tests -type f | xargs sed -e 's@/bin/pwd@${coreutils}&@g' -i - '' + stdenv.lib.optionalString stdenv.isLinux '' - sed -i 's,"libpcsclite\.so[^"]*","${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c - '' + stdenv.lib.optionalString stdenv.isDarwin '' - find . -name pcsc-wrapper.c | xargs sed -i 's/typedef unsinged int pcsc_dword_t/typedef unsigned int pcsc_dword_t/' - '' + '' - patch gl/stdint_.h < ${./clang.patch} - ''; - - pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry"; - configureFlags = optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}"; - - postConfigure = "substituteAllInPlace tools/gpgkey2ssh.c"; - - checkPhase="GNUPGHOME=`pwd` ./agent/gpg-agent --daemon make check"; - - doCheck = true; - - meta = with stdenv.lib; { - homepage = "https://gnupg.org"; - description = "Stable (2.0) release of the GNU Privacy Guard, a GPL OpenPGP implementation"; - license = licenses.gpl3Plus; - longDescription = '' - The GNU Privacy Guard is the GNU project's complete and free - implementation of the OpenPGP standard as defined by RFC4880. GnuPG - "stable" (2.0) is the current stable version for general use. This is - what most users are still using. GnuPG allows to encrypt and sign your - data and communication, features a versatile key management system as well - as access modules for all kind of public key directories. GnuPG, also - known as GPG, is a command line tool with features for easy integration - with other applications. A wealth of frontend applications and libraries - are available. Version 2 of GnuPG also provides support for S/MIME. - ''; - maintainers = with maintainers; [ roconnor ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 82d1e5b78097..42fc91f375f8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -164,6 +164,7 @@ mapAliases ({ gnuradio-rds = gr-rds; # added 2019-05-27 gnuradio-osmosdr = gr-osmosdr; # added 2019-05-27 gnustep-make = gnustep.make; # added 2016-7-6 + gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# added 2020-07-12 go_1_12 = throw "go_1_12 has been removed"; # added 2020-04-26 go-pup = pup; # added 2017-12-19 gobjectIntrospection = gobject-introspection; # added 2018-12-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c80f133f1e0..2853013d3f8f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3849,10 +3849,6 @@ in gnupg1orig = callPackage ../tools/security/gnupg/1.nix { }; gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { }; gnupg1 = gnupg1compat; # use config.packageOverrides if you prefer original gnupg1 - gnupg20 = callPackage ../tools/security/gnupg/20.nix { - guiSupport = stdenv.isDarwin; - pinentry = if stdenv.isDarwin then pinentry_mac else pinentry-gtk2; - }; gnupg22 = callPackage ../tools/security/gnupg/22.nix { guiSupport = stdenv.isDarwin; pinentry = if stdenv.isDarwin then pinentry_mac else pinentry-gtk2; @@ -11604,7 +11600,13 @@ in ogre = ogre1_10; }; - certbot = python3Packages.callPackage ../tools/admin/certbot { }; + certbot = python3.pkgs.toPythonApplication python3.pkgs.certbot; + + certbot-full = certbot.withPlugins (cp: with cp; [ + certbot-dns-cloudflare + certbot-dns-rfc2136 + certbot-dns-route53 + ]); caf = callPackage ../development/libraries/caf {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fc5f73d2108c..1f43cc00d037 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -585,6 +585,8 @@ in { cdecimal = callPackage ../development/python-modules/cdecimal { }; + certbot = callPackage ../development/python-modules/certbot { }; + certbot-dns-cloudflare = callPackage ../development/python-modules/certbot-dns-cloudflare { }; certbot-dns-rfc2136 = callPackage ../development/python-modules/certbot-dns-rfc2136 { }; @@ -1047,7 +1049,7 @@ in { nvchecker = callPackage ../development/python-modules/nvchecker { }; numericalunits = callPackage ../development/python-modules/numericalunits { }; - + nunavut = callPackage ../development/python-modules/nunavut { }; oath = callPackage ../development/python-modules/oath { }; @@ -1681,7 +1683,7 @@ in { inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices CoreServices; }; - pyuavcan = callPackage ../development/python-modules/pyuavcan { + pyuavcan = callPackage ../development/python-modules/pyuavcan { # this version pinpoint to anold version is necessary due to a regression nunavut = self.nunavut.overridePythonAttrs ( old: rec { version = "0.2.3"; @@ -4495,7 +4497,7 @@ in { })); libkeepass = callPackage ../development/python-modules/libkeepass { }; - + libredwg = toPythonModule (pkgs.libredwg.override { enablePython = true; inherit (self) python libxml2; @@ -4548,7 +4550,7 @@ in { locustio = callPackage ../development/python-modules/locustio { }; - llvmlite = callPackage ../development/python-modules/llvmlite { + llvmlite = callPackage ../development/python-modules/llvmlite { llvm = pkgs.llvm_9; # llvmlite always requires a specific version of llvm. }; @@ -6710,7 +6712,7 @@ in { zipp = if pythonOlder "3.6" then callPackage ../development/python-modules/zipp/1.nix { } - else + else callPackage ../development/python-modules/zipp { }; zope_broken = callPackage ../development/python-modules/zope_broken { };