diff options
67 files changed, 672 insertions, 326 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index 3d75ceac8010..d21ac882f275 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -589,6 +589,15 @@ auth required pam_succeed_if.so uid >= 1000 quiet <literal>qesteidutil</literal> has been deprecated in favor of <literal>qdigidoc</literal>. </para> </listitem> + <listitem> + <para> + <package>sqldeveloper_18</package> has been removed as it's not maintained anymore, + <package>sqldeveloper</package> has been updated to version <literal>19.4</literal>. + Please note that this means that this means that the <package>oraclejdk</package> is now + required. For further information please read the + <link xlink:href="https://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/sqldev-relnotes-194-5908846.html">release notes</link>. + </para> + </listitem> </itemizedlist> </section> diff --git a/nixos/modules/config/ldap.nix b/nixos/modules/config/ldap.nix index 9c8e9d149371..b554f197dc4b 100644 --- a/nixos/modules/config/ldap.nix +++ b/nixos/modules/config/ldap.nix @@ -28,8 +28,6 @@ let }; nslcdConfig = writeText "nslcd.conf" '' - uid nslcd - gid nslcd uri ${cfg.server} base ${cfg.base} timelimit ${toString cfg.timeLimit} @@ -282,6 +280,7 @@ in Group = "nslcd"; RuntimeDirectory = [ "nslcd" ]; PIDFile = "/run/nslcd/nslcd.pid"; + AmbientCapabilities = "CAP_SYS_RESOURCE"; }; }; diff --git a/nixos/modules/hardware/openrazer.nix b/nixos/modules/hardware/openrazer.nix index 883db7f2f4f1..b5c3d6744142 100644 --- a/nixos/modules/hardware/openrazer.nix +++ b/nixos/modules/hardware/openrazer.nix @@ -49,7 +49,7 @@ in { options = { hardware.openrazer = { - enable = mkEnableOption "OpenRazer drivers and userspace daemon."; + enable = mkEnableOption "OpenRazer drivers and userspace daemon"; verboseLogging = mkOption { type = types.bool; diff --git a/nixos/modules/services/hardware/irqbalance.nix b/nixos/modules/services/hardware/irqbalance.nix index b139154432cf..c79e0eb83ece 100644 --- a/nixos/modules/services/hardware/irqbalance.nix +++ b/nixos/modules/services/hardware/irqbalance.nix @@ -13,18 +13,12 @@ in config = mkIf cfg.enable { - systemd.services = { - irqbalance = { - description = "irqbalance daemon"; - path = [ pkgs.irqbalance ]; - serviceConfig = - { ExecStart = "${pkgs.irqbalance}/bin/irqbalance --foreground"; }; - wantedBy = [ "multi-user.target" ]; - }; - }; - environment.systemPackages = [ pkgs.irqbalance ]; + systemd.services.irqbalance.wantedBy = ["multi-user.target"]; + + systemd.packages = [ pkgs.irqbalance ]; + }; } diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index e9440a4ebb71..17f36265c51a 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -213,8 +213,7 @@ in openldap = handleTest ./openldap.nix {}; opensmtpd = handleTest ./opensmtpd.nix {}; openssh = handleTest ./openssh.nix {}; - # openstack-image-userdata doesn't work in a sandbox as the simulated openstack instance needs network access - #openstack-image-userdata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).userdata or {}; + openstack-image-userdata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).userdata or {}; openstack-image-metadata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).metadata or {}; orangefs = handleTest ./orangefs.nix {}; os-prober = handleTestOn ["x86_64-linux"] ./os-prober.nix {}; diff --git a/nixos/tests/openstack-image.nix b/nixos/tests/openstack-image.nix index 8a21dd1b599e..97c9137fe1d6 100644 --- a/nixos/tests/openstack-image.nix +++ b/nixos/tests/openstack-image.nix @@ -16,6 +16,12 @@ let ../maintainers/scripts/openstack/openstack-image.nix ../modules/testing/test-instrumentation.nix ../modules/profiles/qemu-guest.nix + { + # Needed by nixos-rebuild due to lack of network access. + system.extraDependencies = with pkgs; [ + stdenv + ]; + } ]; }).config.system.build.openstackImage + "/nixos.qcow2"; diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/editors/kdevelop5/kdev-php.nix index 35efe76cfb2e..72ef08107040 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-php.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-php.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kdev-php"; - version = "5.4.6"; + version = "5.5.0"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "0p532r0ld6j6fpwqyf9m5m0d27y37chgbvcjp1x6g5jjvm7m77xk"; + sha256 = "1hd3ckayrwszda517zfvhihrfmzq4m3kcsrz4sqkbvib0giwsfkp"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/editors/kdevelop5/kdev-python.nix index 0f15a63be7a8..275aaba4f2eb 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-python.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-python.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kdev-python"; - version = "5.4.6"; + version = "5.5.0"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "1xzk0zgbc4nnz8gjbhw5h6kwznzxsqrg19ggyb8ijpmgg0ncxk8l"; + sha256 = "0kna6vkxc6lrfzb3gzn11qvw8jpa86gi1k996hdk83gn0lhmkvx5"; }; cmakeFlags = [ diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index ed5017a0487c..51dfbbab61e8 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -10,11 +10,11 @@ mkDerivation rec { pname = "kdevelop"; - version = "5.4.6"; + version = "5.5.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "01jmrmwbc1hrvq7jdfcc7mxl03q2l6kz57yca2j26xwyvfcfv5sz"; + sha256 = "0438721v24pim5q0q54ivsws9a679fm7ymrm1nn9g1fv06qsm4d8"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index f6236a301dba..98aebc32dba1 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 = "6.3.3"; + version = "6.3.4"; 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 = "08rf7igfzh5g40bapsj0f424jxfx62y97syr3fxmqv3ik7iav9k4"; + sha256 = "1b4ac7vsfz3c9vk7yv33pcfflcxl5fcnbzfdva1yfq63v28g38gk"; }; installPhase = '' diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index a1015c880df4..6ab297c69700 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "hugo"; - version = "0.63.2"; + version = "0.64.0"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "1fylsx2isvims0xwcj831b1zcwsmd3igrnxjad44rhl2k3anq8vm"; + sha256 = "10zbi2414c9grqhi9vcj3sczjh7hf20dihvcsirj551fmiqxrvpy"; }; - modSha256 = "0h95r3m6ca60dn1bllnw127nbfnkdjld94c3nyrzlwdczl2iaiyf"; + modSha256 = "18wfsp3ypfxj5qljmb19kzyc5byf413nkabz5mfvq8srjhcq1ifl"; buildFlags = [ "-tags" "extended" ]; @@ -23,6 +23,6 @@ buildGoModule rec { description = "A fast and modern static website engine."; homepage = "https://gohugo.io"; license = licenses.asl20; - maintainers = with maintainers; [ schneefux filalex77 ]; + maintainers = with maintainers; [ schneefux filalex77 Frostman ]; }; } diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix new file mode 100644 index 000000000000..762d1d6d15cb --- /dev/null +++ b/pkgs/applications/misc/pueue/default.nix @@ -0,0 +1,28 @@ +{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: + +rustPlatform.buildRustPackage rec { + pname = "pueue"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "Nukesor"; + repo = pname; + rev = "v${version}"; + sha256 = "03aj4vw8kvwqk1i1a4kah5b574ahs930ij7xmqsvdy7f8c2g6pbq"; + }; + + nativeBuildInputs = [ installShellFiles ]; + + cargoSha256 = "1y33n0dmrssv35l0apfq1mchyh92cfbzjarh0m8zb2nxwhvk7paw"; + + postInstall = '' + installShellCompletion utils/completions/pueue.{bash,fish} --zsh utils/completions/_pueue + ''; + + meta = with lib; { + description = "A daemon for managing long running shell commands"; + homepage = "https://github.com/Nukesor/pueue"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 80945fbc2bdb..4824e6aabdda 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -21,12 +21,12 @@ let in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "1.9.0"; + version = "1.10.0"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1y0yq1qfr6g1s7kf3w2crd0b025dv2dfknhlz3v0001ns3rgwj17"; + sha256 = "1prvd3cysmcjfybn0dmr3ih0bl6lm5ml9i7wd09fn8hb7047mkby"; }; # Needs tox diff --git a/pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch b/pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch index 985f916b32c4..d54a37fe71fe 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch +++ b/pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch @@ -1,8 +1,8 @@ -diff --git a/qutebrowser/app.py b/qutebrowser/app.py -index a47b5d2f4..f23ee23ef 100644 ---- a/qutebrowser/app.py -+++ b/qutebrowser/app.py -@@ -573,13 +573,8 @@ class Quitter(QObject): +diff --git a/quitter.py b/quitterb.py +index a42b9d0..f544ccb 100644 +--- a/qutebrowser/misc/quitter.py ++++ b/qutebrowser/misc/quitter.py +@@ -112,13 +112,7 @@ class Quitter(QObject): Return: The commandline as a list of strings. """ @@ -14,7 +14,6 @@ index a47b5d2f4..f23ee23ef 100644 - else: - args = [sys.executable, '-m', 'qutebrowser'] + args = ['@qutebrowser@'] -+ cwd = None # Add all open pages so they get reopened. page_args = [] # type: typing.MutableSequence[str] diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 8c381df122d8..2d29a409d375 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "FlexGet"; - version = "3.1.13"; + version = "3.1.18"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "51215f71ed2d2666313c7965a2b22b5463b4a51f319d64db61f6a4fd221e124e"; + sha256 = "34be4ac61dbb5699cfbc9db8bf4f4be15a63164d9006d8ac7c488278d00baa62"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 4358ed8f2019..be1fe96526c3 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -23,7 +23,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.30.0"; # Please backport all updates to the stable channel. + version = "1.30.1"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1gbvna40sc83s7mwip5281yn4bs0k19fj061y0xzwkvh0yk06x3i"; + sha256 = "08l51f1fq9jlnqb4j38lxdfwfbqfzb85zrim57wlgcj8azp2ash6"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix index f3d96a1b5c6b..632a485381d0 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wee-slack"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { repo = "wee-slack"; owner = "wee-slack"; rev = "v${version}"; - sha256 = "0544j6vqbvb2xshq7ma2a3apx2vvpgfg3jh5prg265wnh4991nsw"; + sha256 = "0h425ln5vv76zv41dccapyfbl8qmmflbpwmrd26knqyj8k24zfpr"; }; patches = [ diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index 6915cfd79821..0fa30a85d1b6 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -3,15 +3,19 @@ , python3, perl, w3m, dante }: -buildGoModule rec { +let + rev = "ea0df7bee433fedae5716906ea56141f92b9ce53"; +in buildGoModule rec { pname = "aerc"; - version = "0.3.0"; + version = "unstable-2020-02-01"; src = fetchurl { - url = "https://git.sr.ht/~sircmpwn/aerc/archive/${version}.tar.gz"; - sha256 = "188jln8hmgiqn5il5m54bns0wk4grj09di8y6mmid58ibw6spma4"; + url = "https://git.sr.ht/~sircmpwn/aerc/archive/${rev}.tar.gz"; + sha256 = "1bx2fypw053v3bzalfgyi6a0s5fvv040z8jy4i63s7p53m8gmzs9"; }; + modSha256 = "127xrah6xxrvc224g5dxn432sagrssx8v7phzapcsdajsnmagq6x"; + nativeBuildInputs = [ go scdoc @@ -51,8 +55,6 @@ buildGoModule rec { ${stdenv.lib.makeBinPath [ w3m dante ]} ''; - modSha256 = "0pxbv4zfhii0g41cy0ycfpkkxw6nnd4ibavic6zqw30j476jnm2x"; - meta = with stdenv.lib; { description = "aerc is an email client for your terminal"; homepage = https://aerc-mail.org/; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 8a110c63929d..2d7624ed89cb 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,19 +3,19 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { - version = "1.3.3"; + version = "1.3.4"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "0bcp8kbj8xsnly2dfafnfvj6vl27mbgvj84pjk0wxdjfnr2my9ic"; + sha256 = "076k06p2vqqz2r5bgvqkjipnhznbfbalp3pa2gjm2j9hy7nldr9f"; }; goPackagePath = "github.com/syncthing/syncthing"; - modSha256 = "0kv24bi3w3pvjyjng7ly67brq8wkc1xnhsyha1h7v3jbmj5fgb12"; + modSha256 = "10fgfjip5xr8lim2z0dh7399xpcnhxis9s9yd36fk934h1k1hwzd"; patches = [ ./add-stcli-target.patch diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix new file mode 100644 index 000000000000..abc227e9e394 --- /dev/null +++ b/pkgs/applications/office/elementary-planner/default.nix @@ -0,0 +1,71 @@ +{ stdenv, fetchFromGitHub, fetchpatch +, meson, ninja, pkgconfig, desktop-file-utils +, python3, vala, wrapGAppsHook +, evolution-data-server +, libical +, libgee +, json-glib +, glib +, sqlite +, libsoup +, gtk3 +, pantheon /* granite, icons, maintainers */ +, webkitgtk +}: + +stdenv.mkDerivation rec { + pname = "elementary-planner"; + version = "2.1.1"; + + src = fetchFromGitHub { + owner = "alainm23"; + repo = "planner"; + rev = version; + sha256 = "0swj94pqf00wwzsgjap8z19k33gg1wj2b78ba1aj9h791j8lmaim"; + }; + + nativeBuildInputs = [ + desktop-file-utils + meson + ninja + pkgconfig + python3 + vala + wrapGAppsHook + ]; + + buildInputs = [ + evolution-data-server + libical + libgee + json-glib + glib + sqlite + libsoup + gtk3 + pantheon.granite + webkitgtk + pantheon.elementary-icon-theme + ]; + + # Fix version string, remove in next update! + patches = [ + (fetchpatch { + url = "https://github.com/alainm23/planner/pull/194/commits/3d0a2197087b13fe90fa6f85f817ba56798d632c.patch"; + sha256 = "077q5jddi8jaw2ypc6szbd1c50i4x3b21jvmvi3w7g5zhjwpkmf5"; + }) + ]; + + postPatch = '' + chmod +x build-aux/meson/post_install.py + patchShebangs build-aux/meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "Task and project manager designed to elementary OS"; + homepage = "https://planner-todo.web.app"; + license = licenses.gpl3; + maintainers = with maintainers; [ dtzWill ] ++ pantheon.maintainers; + }; +} + diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix index b76e09d4d1d6..b4adc947c4d1 100644 --- a/pkgs/applications/office/zanshin/default.nix +++ b/pkgs/applications/office/zanshin/default.nix @@ -1,21 +1,19 @@ { mkDerivation, lib, - fetchFromGitHub, + fetchurl, extra-cmake-modules, qtbase, boost, akonadi-calendar, akonadi-notes, akonadi-search, kidentitymanagement, kontactinterface, kldap, - krunner, kwallet + krunner, kwallet, kcalendarcore }: -mkDerivation { +mkDerivation rec { pname = "zanshin"; - version = "2019-07-28"; + version = "0.5.71"; - src = fetchFromGitHub { - owner = "KDE"; - repo = "zanshin"; - rev = "a8c223e745ed7e6aa3dd3cb0786a625a5c54e378"; - sha256 = "0jglwh30x7qrl41n3dhawn4c25dmrzscpvcajhgb6fwcl4w8cgfm"; + src = fetchurl { + url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; + sha256 = "0b316ddcd46sawva84x5d8nsp19v66gbm83djrra7fv3k8nkv4xh"; }; nativeBuildInputs = [ @@ -25,7 +23,7 @@ mkDerivation { buildInputs = [ qtbase boost akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface kldap - krunner kwallet + krunner kwallet kcalendarcore ]; meta = with lib; { diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index 900f0ed7c04a..48c53ccc59f6 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, hamlib, fltk13, libjpeg, libpng, portaudio, libsndfile, +{ stdenv, fetchurl, hamlib, fltk14, libjpeg, libpng, portaudio, libsndfile, libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0wki9d19q8rkjxcd3dz3k0a395gmbnji4fxlhw6dpcyqpfw88fcs"; }; - buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio + buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio libsndfile libsamplerate libpulseaudio pkgconfig alsaLib ]; meta = { diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 44b0f5d84b66..b8aef4bd53fe 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -18,14 +18,14 @@ in stdenv.mkDerivation rec { pname = "simgrid"; - version = "3.24"; + version = "3.25"; src = fetchFromGitLab { domain = "framagit.org"; owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1r9zgfx5npjw4mk0ywxx07jyi1m1b1i06j0m60n3dsrz75492x6m"; + sha256 = "019fgryfwpcrkv1f3271v7qxk0mfw2w990vgnk1cqhmr9i1f17gs"; }; nativeBuildInputs = [ cmake perl python3 boost valgrind ] diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 3682717f314d..fc3af0a933bb 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -28,6 +28,8 @@ let diff-so-fancy = callPackage ./diff-so-fancy { }; + gh = callPackage ./gh { }; + ghq = callPackage ./ghq { }; git = appendToName "minimal" gitBase; diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix new file mode 100644 index 000000000000..02f830a3f07e --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -0,0 +1,36 @@ +{ lib, fetchFromGitHub, buildGoModule, installShellFiles }: + +buildGoModule rec { + pname = "gh"; + version = "0.5.3"; + + src = fetchFromGitHub { + owner = "cli"; + repo = "cli"; + rev = "v${version}"; + sha256 = "033y9bwdaj8735nmj22k8lrgkgimji7hyly9i4jyp11iaa7cgd7a"; + }; + + modSha256 = "0ina3m2ixkkz2fws6ifwy34pmp6kn5s3j7w40alz6vmybn2smy1h"; + + buildFlagsArray = [ + "-ldflags=-X github.com/cli/cli/command.Version=${version}" + ]; + + subPackages = [ "cmd/gh" ]; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + for shell in bash fish zsh; do + $out/bin/gh completion -s $shell > gh.$shell + installShellCompletion gh.$shell + done + ''; + + meta = with lib; { + description = "GitHub CLI tool"; + homepage = "https://github.com/cli/cli"; + license = licenses.mit; + maintainers = with maintainers; [ zowoq ]; + }; +} diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index d5abb6d004b0..077511a06607 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchFromGitHub, makeWrapper -, python, git, gnupg, less, cacert +, python3, git, gnupg, less, cacert }: stdenv.mkDerivation rec { pname = "git-repo"; - version = "1.13.8"; + version = "1.13.9.1"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "1wmzgijmssgwkkw8g4zgmc4x64xkvz6nq1b3szcvawgv1ndwnb2j"; + sha256 = "0yns7n8gpac33cbkm85slslcnfdb55ax9c0vpvmmfbgcgkvqlknb"; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ python ]; + buildInputs = [ python3 ]; patchPhase = '' substituteInPlace repo --replace \ diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 3c5539189252..32222c12c7cc 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -20,6 +20,15 @@ in rustPlatform.buildRustPackage rec { sha256 = "1rm787kkh3ya8ix0rjvj7sbrg9armm0rnpkga6gjmsbg5bx20y4q"; }; + postPatch = '' + pushd ../${pname}-${version}-vendor/thrussh/ + patch -p1 < ${./thrussh-build-fix.patch} + substituteInPlace .cargo-checksum.json --replace \ + 9696ed2422a483cd8de48ac241178a0441be6636909c76174c536b8b1cba9d45 \ + a199f2bba520d56e11607b77be4dde0cfae576c90badb9fbd39af4784e8120d1 + popd + ''; + nativeBuildInputs = [ pkgconfig clang ]; postInstall = '' diff --git a/pkgs/applications/version-management/pijul/thrussh-build-fix.patch b/pkgs/applications/version-management/pijul/thrussh-build-fix.patch new file mode 100644 index 000000000000..3989639620bf --- /dev/null +++ b/pkgs/applications/version-management/pijul/thrussh-build-fix.patch @@ -0,0 +1,12 @@ +--- a/src/client/connection.rs 2020-02-04 12:48:43.845299096 +0100 ++++ b/src/client/connection.rs 2020-02-04 12:50:00.140329310 +0100 +@@ -546,8 +546,8 @@ + &[msg::NEWKEYS], + &mut session.0.write_buffer, + ); +- session.0.kex = Some(Kex::NewKeys(newkeys)); + newkeys.sent = true; ++ session.0.kex = Some(Kex::NewKeys(newkeys)); + } + Ok(()) + } diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 6fc60780ba7f..b49a62948324 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "crun"; - version = "0.11"; + version = "0.12"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "0mn64hrgx4a7mhqjxn127i8yivhn1grp93wws1da1ffj4ap6ay76"; + sha256 = "0sxpdv3afh8hn39jdg06vwkyp7i6dsyf1gg8719vwiwmcbhzj8mx"; fetchSubmodules = true; }; diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index 8fa3cc55279b..a17712472b19 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -23,6 +23,8 @@ args@{ # # [1]: https://github.com/bazelbuild/rules_cc , removeRulesCC ? true +, removeLocalConfigCc ? true +, removeLocal ? true , ... }: @@ -86,7 +88,8 @@ in stdenv.mkDerivation (fBuildAttrs // { rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker} ${if removeRulesCC then "rm -rf $bazelOut/external/{rules_cc,\\@rules_cc.marker}" else ""} rm -rf $bazelOut/external/{embedded_jdk,\@embedded_jdk.marker} - rm -rf $bazelOut/external/{local_*,\@local_*.marker} + ${if removeLocalConfigCc then "rm -rf $bazelOut/external/{local_config_cc,\@local_config_cc.marker}" else ""} + ${if removeLocal then "rm -rf $bazelOut/external/{local_*,\@local_*.marker}" else ""} # Clear markers find $bazelOut/external -name '@*\.marker' -exec sh -c 'echo > {}' \; @@ -145,7 +148,6 @@ in stdenv.mkDerivation (fBuildAttrs // { buildPhase = fBuildAttrs.buildPhase or '' runHook preBuild - '' + lib.optionalString stdenv.isDarwin '' # Bazel sandboxes the execution of the tools it invokes, so even though we are # calling the correct nix wrappers, the values of the environment variables # the wrappers are expecting will not be set. So instead of relying on the @@ -168,7 +170,6 @@ in stdenv.mkDerivation (fBuildAttrs // { linkopts+=( "--linkopt=$flag" ) host_linkopts+=( "--host_linkopt=$flag" ) done - '' + '' BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \ USER=homeless-shelter \ @@ -177,12 +178,10 @@ in stdenv.mkDerivation (fBuildAttrs // { --output_user_root="$bazelUserRoot" \ build \ -j $NIX_BUILD_CORES \ - '' + lib.optionalString stdenv.isDarwin '' "''${copts[@]}" \ "''${host_copts[@]}" \ "''${linkopts[@]}" \ "''${host_linkopts[@]}" \ - '' + '' $bazelFlags \ $bazelBuildFlags \ $bazelTarget diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix index c110d327d3af..54749e416ea3 100644 --- a/pkgs/build-support/singularity-tools/default.nix +++ b/pkgs/build-support/singularity-tools/default.nix @@ -59,7 +59,8 @@ rec { mkdir disk mkfs -t ext3 -b 4096 /dev/${vmTools.hd} mount /dev/${vmTools.hd} disk - cd disk + mkdir -p disk/img + cd disk/img mkdir proc sys dev # Run root script @@ -84,8 +85,10 @@ rec { done done - # Create runScript - ln -s ${runScriptFile} singularity + # Create runScript and link shell + ln -s ${runtimeShell} bin/sh + mkdir -p .singularity.d + ln -s ${runScriptFile} .singularity.d/runscript # Fill out .singularity.d mkdir -p .singularity.d/env @@ -94,7 +97,7 @@ rec { cd .. mkdir -p /var/singularity/mnt/{container,final,overlay,session,source} echo "root:x:0:0:System administrator:/root:/bin/sh" > /etc/passwd - singularity build $out ./disk + TMPDIR=$(pwd -P) singularity build $out ./img ''); in result; diff --git a/pkgs/data/themes/jade1/default.nix b/pkgs/data/themes/jade1/default.nix index 01221d450142..cba38cb297a8 100644 --- a/pkgs/data/themes/jade1/default.nix +++ b/pkgs/data/themes/jade1/default.nix @@ -2,25 +2,25 @@ stdenv.mkDerivation rec { pname = "theme-jade1"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "madmaxms"; repo = "theme-jade-1"; rev = "v${version}"; - sha256 = "1m3150iyk8421mkwj4x2pv29wjzqdcnvvnp3bsg11k5kszsm27a8"; + sha256 = "1lnajrsikw6dljf6dvgmj8aqwywmgdp34h3xsc0xiyq07arhp606"; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; installPhase = '' mkdir -p $out/share/themes - cp -a Jade-1 $out/share/themes + cp -a Jade* $out/share/themes ''; meta = with stdenv.lib; { description = "Fork of the original Linux Mint theme with dark menus, more intensive green and some other modifications"; - homepage = https://github.com/madmaxms/theme-jade-1; + homepage = "https://github.com/madmaxms/theme-jade-1"; license = with licenses; [ gpl3 ]; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/gnustep/base/default.nix b/pkgs/desktops/gnustep/base/default.nix index 87cded31e5ff..7017100565c6 100644 --- a/pkgs/desktops/gnustep/base/default.nix +++ b/pkgs/desktops/gnustep/base/default.nix @@ -3,7 +3,7 @@ , cups , fetchurl , gmp, gnutls -, libffi, libbfd +, libffi, binutils-unwrapped , libjpeg, libtiff, libpng, giflib, libungif , libxml2, libxslt, libiconv , libobjc, libgcrypt @@ -25,7 +25,7 @@ gsmakeDerivation { aspell audiofile cups gmp gnutls - libffi libbfd + libffi binutils-unwrapped libjpeg libtiff libpng giflib libungif libxml2 libxslt libiconv libobjc libgcrypt @@ -35,10 +35,6 @@ gsmakeDerivation { ]; patches = [ ./fixup-paths.patch ]; - # Bump to gcc9 has give missing xmemdup symbols. Need libiberty here - # to resolve it, unclear why. See #76927 for more info - NIX_LDFLAGS = "-liberty"; - meta = { description = "An implementation of AppKit and Foundation libraries of OPENSTEP and Cocoa"; }; diff --git a/pkgs/development/compilers/go/1.12.nix b/pkgs/development/compilers/go/1.12.nix index 0a684a3a49e0..8f02de2cddbb 100644 --- a/pkgs/development/compilers/go/1.12.nix +++ b/pkgs/development/compilers/go/1.12.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.12.15"; + version = "1.12.16"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "1hw4xjywcl883dnvfbb92w85sy8n231fdri4aynj8xajgr0p9fla"; + sha256 = "1y0x10fsvgpc1x24b9q9y6kv9b0kwf7879am3p0gym2abgc5wvnf"; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix index f9723728caa8..9006725f639b 100644 --- a/pkgs/development/compilers/go/1.13.nix +++ b/pkgs/development/compilers/go/1.13.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.13.6"; + version = "1.13.7"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "03220q6n4wlpmz6zz3mw48kl3pjxia6pxdvf03wbqh6w9favxrda"; + sha256 = "1x21kfpzfkvmqd42pan6nl862m7jjl4niqxxpcgm46awbz645bg4"; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/sbcl/2.0.0.nix b/pkgs/development/compilers/sbcl/2.0.0.nix new file mode 100644 index 000000000000..bb0056bb9ece --- /dev/null +++ b/pkgs/development/compilers/sbcl/2.0.0.nix @@ -0,0 +1,112 @@ +{ stdenv, fetchurl, writeText, sbclBootstrap +, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" +, threadSupport ? (stdenv.isi686 || stdenv.isx86_64 || "aarch64-linux" == stdenv.hostPlatform.system) + # Meant for sbcl used for creating binaries portable to non-NixOS via save-lisp-and-die. + # Note that the created binaries still need `patchelf --set-interpreter ...` + # to get rid of ${glibc} dependency. +, purgeNixReferences ? false +, texinfo +}: + +stdenv.mkDerivation rec { + pname = "sbcl"; + version = "2.0.0"; + + src = fetchurl { + url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${pname}-${version}-source.tar.bz2"; + sha256 = "1krgd69cirp4ili2pfsh1a0mfvq722jbknlvmf17qhsxh1b94dlh"; + }; + + buildInputs = [texinfo]; + + patchPhase = '' + echo '"${version}.nixos"' > version.lisp-expr + echo " + (lambda (features) + (flet ((enable (x) + (pushnew x features)) + (disable (x) + (setf features (remove x features)))) + '' + + (if threadSupport then "(enable :sb-thread)" else "(disable :sb-thread)") + + stdenv.lib.optionalString stdenv.isAarch32 "(enable :arm)" + + '' + )) " > customize-target-features.lisp + + pwd + + # SBCL checks whether files are up-to-date in many places.. + # Unfortunately, same timestamp is not good enough + sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp + #sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp + sed -i src/cold/slam.lisp -e \ + '/file-write-date input/a)' + sed -i src/cold/slam.lisp -e \ + '/file-write-date output/i(or (and (= 2208988801 (file-write-date output)) (= 2208988801 (file-write-date input)))' + sed -i src/code/target-load.lisp -e \ + '/date defaulted-fasl/a)' + sed -i src/code/target-load.lisp -e \ + '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))' + + # Fix the tests + sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp + sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp + + # Use whatever `cc` the stdenv provides + substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc + + substituteInPlace src/runtime/Config.x86-64-darwin \ + --replace mmacosx-version-min=10.4 mmacosx-version-min=10.5 + '' + + (if purgeNixReferences + then + # This is the default location to look for the core; by default in $out/lib/sbcl + '' + sed 's@^\(#define SBCL_HOME\) .*$@\1 "/no-such-path"@' \ + -i src/runtime/runtime.c + '' + else + # Fix software version retrieval + '' + sed -e "s@/bin/uname@$(command -v uname)@g" -i src/code/*-os.lisp \ + src/code/run-program.lisp + '' + ); + + + preBuild = '' + export INSTALL_ROOT=$out + mkdir -p test-home + export HOME=$PWD/test-home + ''; + + buildPhase = '' + sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}" + (cd doc/manual ; make info) + ''; + + installPhase = '' + INSTALL_ROOT=$out sh install.sh + '' + + stdenv.lib.optionalString (!purgeNixReferences) '' + cp -r src $out/lib/sbcl + cp -r contrib $out/lib/sbcl + cat >$out/lib/sbcl/sbclrc <<EOF + (setf (logical-pathname-translations "SYS") + '(("SYS:SRC;**;*.*.*" #P"$out/lib/sbcl/src/**/*.*") + ("SYS:CONTRIB;**;*.*.*" #P"$out/lib/sbcl/contrib/**/*.*"))) + EOF + ''; + + setupHook = stdenv.lib.optional purgeNixReferences (writeText "setupHook.sh" '' + addEnvHooks "$targetOffset" _setSbclHome + _setSbclHome() { + export SBCL_HOME='@out@/lib/sbcl/' + } + ''); + + meta = sbclBootstrap.meta // { + inherit version; + updateWalker = true; + }; +} diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix index 5f9c72f04afe..f0c7c7d2064e 100644 --- a/pkgs/development/libraries/editline/default.nix +++ b/pkgs/development/libraries/editline/default.nix @@ -1,15 +1,23 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ stdenv, fetchFromGitHub, autoreconfHook, fetchpatch }: stdenv.mkDerivation rec { pname = "editline"; - version = "1.16.1"; + version = "1.17.0"; src = fetchFromGitHub { owner = "troglobit"; repo = "editline"; rev = version; - sha256 = "192valxbvkxh47dszrnahv7xiccarjw9y84g4zaw5y0lxfc54dir"; + sha256 = "0vjm42y6zjmi6hdcng0l7wkksw7s50agbmk5dxsc3292q8mvq8v6"; }; + patches = [ + (fetchpatch { + name = "fix-for-multiline-as-one-line.patch"; + url = "https://github.com/troglobit/editline/commit/ceee039cfc819c8e09eebbfca192091b0cf8df75.patch"; + sha256 = "149fmfva05ghzwkd0bq1sahdbkys3qyyky28ssqb5jq7q9hw3ddm"; + }) + ]; + nativeBuildInputs = [ autoreconfHook ]; outputs = [ "out" "dev" "man" "doc" ]; diff --git a/pkgs/development/libraries/libcint/default.nix b/pkgs/development/libraries/libcint/default.nix new file mode 100644 index 000000000000..e56583e45ba9 --- /dev/null +++ b/pkgs/development/libraries/libcint/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, openblas + # Check Inputs +, python2 +}: + +stdenv.mkDerivation rec { + pname = "libcint"; + version = "3.0.19"; + + src = fetchFromGitHub { + owner = "sunqm"; + repo = "libcint"; + rev = "v${version}"; + sha256 = "0x613f2hiqi2vbhp20fcl7rhxb07f2714lplzd0vkvv07phagip9"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ openblas ]; + cmakeFlags = [ + "-DENABLE_TEST=1" + "-DQUICK_TEST=1" + "-DCMAKE_INSTALL_PREFIX=" # ends up double-adding /nix/store/... prefix, this avoids issue + ]; + + doCheck = true; + # Test syntax (like print statements) is written in python2. Fixed when #33 merged: https://github.com/sunqm/libcint/pull/33 + checkInputs = [ python2.pkgs.numpy ]; + + meta = with lib; { + description = "General GTO integrals for quantum chemistry"; + longDescription = '' + libcint is an open source library for analytical Gaussian integrals. + It provides C/Fortran API to evaluate one-electron / two-electron + integrals for Cartesian / real-spheric / spinor Gaussian type functions. + ''; + homepage = "http://wiki.sunqm.net/libcint"; + downloadPage = "https://github.com/sunqm/libcint"; + license = licenses.bsd2; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index f3e33d7616fb..eb8ad5e1a796 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -12,7 +12,7 @@ let in stdenv.mkDerivation rec { name = "poppler-${suffix}-${version}"; - version = "0.84.0"; # beware: updates often break cups-filters build + version = "0.84.0"; # beware: updates often break cups-filters build, check texlive too! src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 375c1b6ea1be..909ddc5d1a9e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -211,4 +211,11 @@ $out/lib/common-lisp/query-fs" ''; }; }; + cl-store = x: { + overrides = y: (x.overrides y) // { + postPatch = '' + sed -i -e 's/:initform "Unknown" /:initform #:|Unknown| /' backends.lisp + ''; + }; + }; } diff --git a/pkgs/development/ocaml-modules/lwt/4.x.nix b/pkgs/development/ocaml-modules/lwt/4.x.nix index 3ec3574ea096..a809e68000fe 100644 --- a/pkgs/development/ocaml-modules/lwt/4.x.nix +++ b/pkgs/development/ocaml-modules/lwt/4.x.nix @@ -7,11 +7,11 @@ let inherit (lib) optional versionAtLeast; in buildDunePackage rec { pname = "lwt"; - version = "4.4.0"; + version = "4.5.0"; src = fetchzip { url = "https://github.com/ocsigen/${pname}/archive/${version}.tar.gz"; - sha256 = "1l97zdcql7y13fhaq0m9n9xvxf712jg0w70r72fvv6j49xm4nlhi"; + sha256 = "0l836z5zr38969bi77aga7ismj4wb01i3ffxf5v59jsgd3g44r2w"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/ocaml-modules/parmap/default.nix b/pkgs/development/ocaml-modules/parmap/default.nix new file mode 100644 index 000000000000..a37120b2496b --- /dev/null +++ b/pkgs/development/ocaml-modules/parmap/default.nix @@ -0,0 +1,20 @@ +{ lib, buildDunePackage, fetchzip }: + +buildDunePackage rec { + pname = "parmap"; + version = "1.1"; + + src = fetchzip { + url = "https://github.com/rdicosmo/${pname}/releases/download/${version}/${pname}-${version}.tbz"; + sha256 = "13ahqaga1palf0s0dll512cl7k43sllmwvw6r03y70kfmky1j114"; + }; + + doCheck = true; + + meta = with lib; { + description = "Library for multicore parallel programming"; + homepage = "https://rdicosmo.github.io/parmap"; + maintainers = [ maintainers.bcdarwin ]; + license = licenses.lgpl2; + }; +} diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix index eac2751ce3e5..f231169115fd 100644 --- a/pkgs/development/python-modules/openrazer/common.nix +++ b/pkgs/development/python-modules/openrazer/common.nix @@ -1,17 +1,17 @@ { stdenv , fetchFromGitHub }: rec { - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "openrazer"; repo = "openrazer"; rev = "v${version}"; - sha256 = "1s5irs3avrlp891mxan3z8p55ias9rq26rqp2qrlcc6i4vl29di0"; + sha256 = "013r9q4xg2xjmyxybx07zsl2b5lm9vw843anx22ygpvxz1qgz9hp"; }; meta = with stdenv.lib; { homepage = https://openrazer.github.io/; license = licenses.gpl2; - maintainers = with maintainers; [ roelvandijk ]; + maintainers = with maintainers; [ roelvandijk evanjs ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix index 9f1bf2390b6a..4cf2200eda72 100644 --- a/pkgs/development/python-modules/tablib/default.nix +++ b/pkgs/development/python-modules/tablib/default.nix @@ -1,29 +1,36 @@ -{ buildPythonPackage, stdenv, fetchPypi, pytest, unicodecsv, pandas -, xlwt, openpyxl, pyyaml, xlrd, odfpy, fetchpatch +{ buildPythonPackage, lib, fetchPypi, isPy27 +, odfpy +, openpyxl +, pandas +, pytest +, pytestcov +, pyyaml +, unicodecsv +, xlrd +, xlwt }: buildPythonPackage rec { pname = "tablib"; - version = "0.12.1"; + version = "1.0.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "11wxchj0qz77dn79yiq30k4b4gsm429f4bizk4lm4rb63nk51kxq"; + sha256 = "0ddvcgycv5m7q4rn5bch9qnhxjgn7192z537b1wzpmwd5s074cgz"; }; - checkInputs = [ pytest unicodecsv pandas ]; propagatedBuildInputs = [ xlwt openpyxl pyyaml xlrd odfpy ]; + checkInputs = [ pytest pytestcov unicodecsv pandas ]; - patches = [ - (fetchpatch { - url = "https://github.com/kennethreitz/tablib/commit/0e51a2d0944022af186d2dcd34c0ab3c47141ba5.patch"; - sha256 = "0lbbl871zdn5vpgqyjkil0c2ap3b5hz19rmihhyvrx7m4mlh1aij"; - }) - ]; + # test_tablib needs MarkupPy, which isn't packaged yet + checkPhase = '' + pytest --ignore tests/test_tablib.py + ''; - meta = with stdenv.lib; { - description = "Tablib: format-agnostic tabular dataset library"; - homepage = http://python-tablib.org; + meta = with lib; { + description = "Format-agnostic tabular dataset library"; + homepage = "https://python-tablib.org"; license = licenses.mit; }; } diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/pkgs/development/tools/analysis/radare2/cutter.nix index 252e95e5793d..fd5c58985cfb 100644 --- a/pkgs/development/tools/analysis/radare2/cutter.nix +++ b/pkgs/development/tools/analysis/radare2/cutter.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "radare2-cutter"; - version = "1.9.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "radareorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "1ln55ssrasbaam267lwc2vxnm8j0c2x35qsda44xi2p8hqxslf8k"; + sha256 = "1gvsrcskcdd1hxrjpkpc657anmfs25f174vxk4wzvn385rnmrxd3"; }; postUnpack = "export sourceRoot=$sourceRoot/src"; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 667f689b8e73..a1140dbab814 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -110,22 +110,22 @@ in { #<generated> # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "23159"; - gittap = "4.0.0"; - gittip = "e97047299af43e9b4e658c246816a2b48bdc087e"; - rev = "4.0.0"; - version = "4.0.0"; - sha256 = "15b79hska3skrlbrig7fl405kmbvy4410m93lfsfmkwxs0wr9jis"; + version_commit = "23710"; + gittap = "4.2.0"; + gittip = "57a60ba8c5e782ca0807e3c7b1d26a8b3923073d"; + rev = "4.2.0"; + version = "4.2.0"; + sha256 = "1xkvc9msbcvwgcasx9q10098ciw1zpnwgrciw397rq9ayrrvpngz"; cs_ver = "4.0.1"; cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; }; r2-for-cutter = generic { - version_commit = "22888"; - gittap = "3.8.0"; - gittip = "b4860e4eecad2053202965926f16296864b2f1e5"; - rev = "b4860e4eecad2053202965926f16296864b2f1e5"; - version = "2019-09-03"; - sha256 = "0rx6az2vpqy12lvzpxx9pappqj84d88daj8bis3zsffqgmhsafcd"; + version_commit = "23710"; + gittap = "4.2.1"; + gittip = "08478fdd29d8ce2a6c61fbd7b207bffc10682938"; + rev = "08478fdd29d8ce2a6c61fbd7b207bffc10682938"; + version = "2020-01-31"; + sha256 = "14b9433cgc2nabhz836zfgvgh2dwailcmvy05krsa0inmzbvx9fg"; cs_ver = "4.0.1"; cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; }; diff --git a/pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix deleted file mode 100644 index 62a1329eca6a..000000000000 --- a/pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, buildBazelPackage, lib, fetchFromGitHub, git, jre, makeWrapper }: - -buildBazelPackage rec { - name = "bazel-deps-${version}"; - version = "2019-07-11"; - - meta = with stdenv.lib; { - homepage = "https://github.com/johnynek/bazel-deps"; - description = "Generate bazel dependencies for maven artifacts"; - license = licenses.mit; - maintainers = [ maintainers.uri-canva ]; - platforms = platforms.all; - broken = true; # global variable '_common_attrs_for_plugin_bootstrapping' is referenced before assignment. - }; - - src = fetchFromGitHub { - owner = "johnynek"; - repo = "bazel-deps"; - rev = "48fdf7f8bcf3aadfa07f9f7e6f0c9f4247cb0f58"; - sha256 = "0wpn5anfgq5wfljfhpn8gbgdmgcp0claffjgqcnv5dh70ch7i0gi"; - }; - - bazelTarget = "//src/scala/com/github/johnynek/bazel_deps:parseproject_deploy.jar"; - - buildInputs = [ git makeWrapper ]; - - fetchAttrs = { - sha256 = "1r5qxsbw2cgww7vcg5psh7404l3jcxpvc0ndgl3k8vj1x8y93nkf"; - }; - - buildAttrs = { - installPhase = '' - mkdir -p $out/bin/bazel-bin/src/scala/com/github/johnynek/bazel_deps - - cp gen_maven_deps.sh $out/bin - wrapProgram "$out/bin/gen_maven_deps.sh" --set JAVA_HOME "${jre}" --prefix PATH : ${lib.makeBinPath [ jre ]} - cp bazel-bin/src/scala/com/github/johnynek/bazel_deps/parseproject_deploy.jar $out/bin/bazel-bin/src/scala/com/github/johnynek/bazel_deps - ''; - }; -} diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index 2eb5f772f890..f2f3588ba29c 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -8,19 +8,25 @@ buildBazelPackage rec { name = "bazel-remote-${version}"; - version = "2019-01-12"; + version = "2020-01-29"; src = fetchFromGitHub { owner = "buchgr"; repo = "bazel-remote"; - rev = "3f65b6ccf69e223950c77275a743d0d3a04a8583"; - sha256 = "0fklrlylmc55yzhm3m1f211x5gmk7hpqjb7k5kml7n3gw3npbjda"; + rev = "ae9378321552dd14066332f8fa55076040228cb7"; + sha256 = "1jbd319n255cmmncnjfdkdcpx0x62asp3dqwgl6vimx4dqqj8v1p"; }; nativeBuildInputs = [ go git ]; bazelTarget = "//:bazel-remote"; + removeRulesCC = false; + + # this is to work around `test -f` failing when called by gazelle + # https://github.com/bazelbuild/bazel-gazelle/blob/v0.19.1/internal/go_repository.bzl#L135 + patches = [ ./disable_build_file_generation.patch ]; + fetchAttrs = { preBuild = '' patchShebangs . @@ -28,12 +34,11 @@ buildBazelPackage rec { # tell rules_go to use the Go binary found in the PATH sed -e 's:go_register_toolchains():go_register_toolchains(go_version = "host"):g' -i WORKSPACE - # update gazelle to work around https://github.com/golang/go/issues/29850 - sed -e 's,https://github.com/bazelbuild/bazel-gazelle/releases/download/0.15.0/bazel-gazelle-0.15.0.tar.gz,https://github.com/bazelbuild/bazel-gazelle/releases/download/0.16.0/bazel-gazelle-0.16.0.tar.gz,g' -i WORKSPACE - sed -e 's,6e875ab4b6bf64a38c352887760f21203ab054676d9c1b274963907e0768740d,7949fc6cc17b5b191103e97481cf8889217263acf52e00b560683413af204fcb,g' -i WORKSPACE - # tell rules_go to invoke GIT with custom CAINFO path export GIT_SSL_CAINFO="${cacert}/etc/ssl/certs/ca-bundle.crt" + + # force gazelle to use the nix go cache rather than its own + # export GO_REPOSITORY_USE_HOST_CACHE=1 ''; preInstall = '' @@ -47,6 +52,11 @@ buildBazelPackage rec { rm -rf $bazelOut/external/{go_sdk,\@go_sdk.marker} sed -e '/^FILE:@go_sdk.*/d' -i $bazelOut/external/\@*.marker + # Remove the gazelle repository cache as it contains built binaries + chmod -R u+w $bazelOut/external/bazel_gazelle_go_repository_cache + rm -rf $bazelOut/external/{bazel_gazelle_go_repository_cache,\@bazel_gazelle_go_repository_cache.marker} + sed -e '/^FILE:@bazel_gazelle_go_repository_cache.*/d' -i $bazelOut/external/\@*.marker + # Remove the gazelle tools, they contain go binaries that are built # non-deterministically. As long as the gazelle version matches the tools # should be equivalent. @@ -54,7 +64,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "1wvyv3w5y6vj6qs6v5qyd356j1lxc3mf7n3j2pcib1bqmx3igw35"; + sha256 = "1n66hg1w5jv2rc8q4sjlaf0agvxr713aa40mbkhgjv57x9j7bgn0"; }; buildAttrs = { @@ -75,7 +85,6 @@ buildBazelPackage rec { description = "A remote HTTP/1.1 cache for Bazel."; license = licenses.asl20; maintainers = [ maintainers.uri-canva ]; - platforms = platforms.darwin; - broken = true; # global variable '_layer' is referenced before assignment. + platforms = platforms.darwin ++ platforms.linux; }; } diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/disable_build_file_generation.patch b/pkgs/development/tools/build-managers/bazel/bazel-remote/disable_build_file_generation.patch new file mode 100644 index 000000000000..67df8f559a20 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/disable_build_file_generation.patch @@ -0,0 +1,24 @@ +From 3f5abd591b93ebdbc1ae82e5c29cf26024222f5f Mon Sep 17 00:00:00 2001 +From: Uri Baghin <uri@canva.com> +Date: Thu, 30 Jan 2020 16:47:36 +1100 +Subject: [PATCH] Disable build file generation for remote apis. + +--- + WORKSPACE | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/WORKSPACE b/WORKSPACE +index f9ebafa..52e4e0b 100644 +--- a/WORKSPACE ++++ b/WORKSPACE +@@ -208,6 +208,7 @@ http_archive( + + go_repository( + name = "com_github_bazelbuild_remote_apis", ++ build_file_generation = "off", + importpath = "github.com/bazelbuild/remote-apis", + sum = "h1:OPH+hf+ICw8WEp2CV2ncfdyWPC30Cmw8b5NKun0n5IQ=", + version = "v0.0.0-20191119143007-b5123b1bb285", +-- +2.25.0 + diff --git a/pkgs/development/tools/database/sqldeveloper/18.2.nix b/pkgs/development/tools/database/sqldeveloper/18.2.nix deleted file mode 100644 index 070c7c81c403..000000000000 --- a/pkgs/development/tools/database/sqldeveloper/18.2.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ stdenv, makeDesktopItem, makeWrapper, requireFile, unzip, jdk }: - -let - version = "18.2.0.183.1748"; - - desktopItem = makeDesktopItem { - name = "sqldeveloper"; - exec = "sqldeveloper"; - icon = "sqldeveloper"; - desktopName = "Oracle SQL Developer 18"; - genericName = "Oracle SQL Developer 18"; - comment = "Oracle's Oracle DB GUI client"; - categories = "Application;Development;"; - }; -in - stdenv.mkDerivation { - - inherit version; - pname = "sqldeveloper"; - - src = requireFile rec { - name = "sqldeveloper-${version}-no-jre.zip"; - url = "http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/"; - message = '' - This Nix expression requires that ${name} already be part of the store. To - obtain it you need to - - - navigate to ${url} - - make sure that it says "Version ${version}" above the list of downloads - - if it does not, click on the "Previous Version" link below the downloads - and repeat until the version is correct. This is necessarry because as the - time of this writing there exists no permanent link for the current version - yet. - Also consider updating this package yourself (you probably just need to - change the `version` variable and update the sha256 to the one of the - new file) or opening an issue at the nixpkgs repo. - - accept the license agreement - - download the file listed under "Other Platforms" - - sign in or create an oracle account if neccessary - - and then add the file to the Nix store using either: - - nix-store --add-fixed sha256 ${name} - - or - - nix-prefetch-url --type sha256 file:///path/to/${name} - ''; - sha256 = "0clz2w4ghqczy9sz6j4qqygk20whdwkca192pd3v0dw09875as0k"; - }; - - buildInputs = [ makeWrapper unzip ]; - - unpackCmd = "unzip $curSrc"; - - installPhase = '' - mkdir -p $out/libexec $out/share/{applications,pixmaps} - mv * $out/libexec/ - - mv $out/libexec/icon.png $out/share/pixmaps/sqldeveloper.png - cp ${desktopItem}/share/applications/* $out/share/applications - - makeWrapper $out/libexec/sqldeveloper/bin/sqldeveloper $out/bin/sqldeveloper \ - --set JAVA_HOME ${jdk.home} \ - --run "cd $out/libexec/sqldeveloper/bin" - ''; - - meta = with stdenv.lib; { - description = "Oracle's Oracle DB GUI client"; - longDescription = '' - Oracle SQL Developer is a free integrated development environment that - simplifies the development and management of Oracle Database in both - traditional and Cloud deployments. SQL Developer offers complete - end-to-end development of your PL/SQL applications, a worksheet for - running queries and scripts, a DBA console for managing the database, - a reports interface, a complete data modeling solution, and a migration - platform for moving your 3rd party databases to Oracle. - ''; - homepage = http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ ardumont flokli ma27 ]; - }; -} diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index 9e75088aa5cb..38be9089559f 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -1,7 +1,7 @@ { stdenv, makeDesktopItem, makeWrapper, requireFile, unzip, jdk }: let - version = "17.4.1.054.0712"; + version = "19.4.0.354.1759"; desktopItem = makeDesktopItem { name = "sqldeveloper"; @@ -20,7 +20,7 @@ in src = requireFile rec { name = "sqldeveloper-${version}-no-jre.zip"; - url = "http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/"; + url = "https://www.oracle.com/tools/downloads/sqldev-downloads.html"; message = '' This Nix expression requires that ${name} already be part of the store. To obtain it you need to @@ -46,7 +46,7 @@ in nix-prefetch-url --type sha256 file:///path/to/${name} ''; - sha256 = "7e92ca94d02489002db291c96f1d67f9b2501a8967ff3457103fcf60c1eb154a"; + sha256 = "1hk3hfxyl6ryp4v1l9mgzflban565ayfmm2k412azmw5rnmjf6fv"; }; buildInputs = [ makeWrapper unzip ]; @@ -78,7 +78,7 @@ in ''; homepage = http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/; license = licenses.unfree; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ ardumont flokli ]; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ ardumont ma27 ]; }; } diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/development/tools/misc/editorconfig-checker/default.nix index cbb6a38f67a8..88c43a8c42a5 100644 --- a/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ b/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "editorconfig-checker"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "editorconfig-checker"; repo = "editorconfig-checker"; rev = "${version}"; - sha256 = "0v2ml9r8b5admi3sv80wa1pwl9qnz03q2p84vgcmgg2nv1v6yxf3"; + sha256 = "1gn7q6wg7byhr1l5ly60rbb700xrww9slbq7gbxbw5c1fl0pp3yk"; }; - modSha256 = "09b1v9gyh6827yqlfxxxq3lcqhd5snn3n7gdlbjmga3wyp2x4g2r"; + modSha256 = "1iiv12ginb3ky739z7v8wf4z5lv24gmghbybs3lzay0kqn449n4x"; meta = with lib; { description = "A tool to verify that your files are in harmony with your .editorconfig"; diff --git a/pkgs/os-specific/linux/asus-wmi-sensors/default.nix b/pkgs/os-specific/linux/asus-wmi-sensors/default.nix new file mode 100644 index 000000000000..8eb8a7484e15 --- /dev/null +++ b/pkgs/os-specific/linux/asus-wmi-sensors/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, kernel }: + +stdenv.mkDerivation rec { + name = "asus-wmi-sensors-${version}-${kernel.version}"; + version = "unstable-2019-11-07"; + + # The original was deleted from github, but this seems to be an active fork + src = fetchFromGitHub { + owner = "electrified"; + repo = "asus-wmi-sensors"; + rev = "8daafd45d1b860cf5b17eee1c94d93feb04164a9"; + sha256 = "0kc0xlrsmf783ln5bqyj6qxzmrhdxdfdd2b9ygf2lbl2153i04vc"; + }; + + hardeningDisable = [ "pic" ]; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + preConfigure = '' + sed -i 's|depmod|#depmod|' Makefile + ''; + + makeFlags = [ + "TARGET=${kernel.modDirVersion}" + "KERNEL_MODULES=${kernel.dev}/lib/modules/${kernel.modDirVersion}" + "MODDESTDIR=${placeholder "out"}/lib/modules/${kernel.modDirVersion}/kernel/drivers/hwmon" + ]; + + meta = with stdenv.lib; { + description = "Linux HWMON (lmsensors) sensors driver for various ASUS Ryzen and Threadripper motherboards"; + homepage = "https://github.com/electrified/asus-wmi-sensors"; + license = licenses.gpl2; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = with maintainers; [ Frostman ]; + broken = versionOlder kernel.version "4.12"; + }; +} diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix index 8dc9e2694d47..27f176f6a724 100644 --- a/pkgs/os-specific/linux/irqbalance/default.nix +++ b/pkgs/os-specific/linux/irqbalance/default.nix @@ -16,6 +16,16 @@ stdenv.mkDerivation rec { LDFLAGS = "-lncurses"; + postInstall = + '' + # Systemd service + mkdir -p $out/lib/systemd/system + grep -vi "EnvironmentFile" misc/irqbalance.service >$out/lib/systemd/system/irqbalance.service + substituteInPlace $out/lib/systemd/system/irqbalance.service \ + --replace /usr/sbin/irqbalance $out/bin/irqbalance \ + --replace ' $IRQBALANCE_ARGS' "" + ''; + meta = { homepage = https://github.com/Irqbalance/irqbalance; description = "A daemon to help balance the cpu load generated by interrupts across all of a systems cpus"; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 4ce6a37e689c..7ecff5207df8 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -710,6 +710,7 @@ let HWMON = yes; THERMAL_HWMON = yes; # Hardware monitoring support + NVME_HWMON = whenAtLeast "5.5" yes; # NVMe drives temperature reporting UEVENT_HELPER = no; USERFAULTFD = yes; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index f5aad76b0b49..9a9c48a79088 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -22,10 +22,10 @@ rec { # Policy: use the highest stable version as the default (on our master). stable = if stdenv.hostPlatform.system == "x86_64-linux" then generic { - version = "440.44"; - sha256_64bit = "057wq9p2vl87gy61f079b6d7clw2vhw3kq7rj411brhrnvr7shmd"; - settingsSha256 = "1hr1n78c92zksnnryrcz4b8kxvi6kz4yp801ks85hq4a3rryj4vg"; - persistencedSha256 = "050znx2scm7x3r7czsz77ddjh4bs18hdd3k3shwpi3zflkmnhnvj"; + version = "440.59"; + sha256_64bit = "162gq6w44l8sgnn4qnl2rdlx8c008p04zv4c3i1ps20p21n1mjv1"; + settingsSha256 = "0vxhmirqzyav5ljf0f04yk0az48ir5v0817dq9z9kyqfdvnby93g"; + persistencedSha256 = "0npjh7nashasydp8q6bbcp21w8fc1dycgjy50ics775hjnvm61qn"; } else legacy_390; diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index c5e0b47e238c..e300c5b7a95d 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.17.3"; - sha256 = "0g0g9prwjy0rnv6n5smny5yl5dhnmflqdr3hwgyj5jpr5hfgx11v"; + version = "1.17.8"; + sha256 = "0nwn4md8sxhks2j77qq1nvk5pfz3yykfhh2b507b6l2idp7kxllp"; }) diff --git a/pkgs/servers/mail/mailman/web.nix b/pkgs/servers/mail/mailman/web.nix index 408840c3f934..4586c3d0fdf7 100644 --- a/pkgs/servers/mail/mailman/web.nix +++ b/pkgs/servers/mail/mailman/web.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { meta = with lib; { description = "Django project for Mailman 3 web interface"; license = licenses.gpl3; - maintainers = with maintainers; [ qyliss ]; + maintainers = with maintainers; [ peti qyliss ]; }; } diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 5089acc2a0f3..73a008d3fe7c 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -1,25 +1,17 @@ -{ lib, python3, mautrix-telegram, fetchpatch }: +{ lib, python3, mautrix-telegram }: with python3.pkgs; buildPythonPackage rec { pname = "mautrix-telegram"; - version = "0.7.0"; + version = "0.7.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0xzivcn1s5j2nn9p7li9bzr0h225bnli4fr3yrh8v7npx2ymg1r3"; + sha256 = "1yi4h37lhlpa095hzd0gwn1ifbycq8878kj5n2sjhw8kk6nblda9"; }; - patches = [ - # fix tests - (fetchpatch { - url = "https://github.com/tulir/mautrix-telegram/commit/fe52f0ad106122f08af72e356c4c62bb8875b453.patch"; - sha256 = "0r7j7q78brqqx0rkchld328k00yq0ykdk7syvwpihqzj3gchacb7"; - }) - ]; - postPatch = '' sed -i -e '/alembic>/d' setup.py substituteInPlace setup.py \ diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index d451c1dab5c9..c86ed3defbcc 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -194,7 +194,7 @@ server = stdenv.mkDerivation (common // { # perlPackages.DBDmysql is broken on darwin postFixup = optionalString (!stdenv.hostPlatform.isDarwin) '' - wrapProgram $out/bin/mytop --set PATH ${less}/bin/less + wrapProgram $out/bin/mytop --set PATH ${makeBinPath [ less ncurses ]} ''; CXXFLAGS = optionalString stdenv.hostPlatform.isi686 "-fpermissive"; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index e4af7d6fedcc..ada885b974c2 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-01-31"; + version = "2020-02-04"; pname = "oh-my-zsh"; - rev = "69caf98cf754553fda969b0bf1d4966f0498f58f"; + rev = "6bebc254e88ac9b7fdaa7491d031f82ec107e418"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "0hkgqhb7a5a0zm2rn22agfphzzvd9y9v6hs8zc6cpx1xxdqp36pm"; + sha256 = "1lmg1givymr4hgmvmngklm7q3g7dpqwm7aj5xild72cdhx0g5qqw"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 46812da8954b..e331e43956e4 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "graylog"; - version = "3.1.4"; + version = "3.2.0"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "1z7jy82dk5l2yxmcb7y0jws4p1l367fxj69pfi10ajssj66vwjfw"; + sha256 = "128hlk2m7dy1ajvxkkazbi2npx738jfrkkznvmhyxm0hllcw4r9z"; }; dontBuild = true; diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 9eaa81e144b6..03394e1eb4c4 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -68,6 +68,9 @@ let done cp -pv ${pdftoepdf} texk/web2c/pdftexdir/pdftoepdf.cc cp -pv ${pdftosrc} texk/web2c/pdftexdir/pdftosrc.cc + + # poppler 0.84 compat fixups, use 0.83 files otherwise + patch -p1 -i ${./poppler84.patch} ''; # remove when removing synctex-missing-header.patch diff --git a/pkgs/tools/typesetting/tex/texlive/poppler84.patch b/pkgs/tools/typesetting/tex/texlive/poppler84.patch new file mode 100644 index 000000000000..02dc9e2413d3 --- /dev/null +++ b/pkgs/tools/typesetting/tex/texlive/poppler84.patch @@ -0,0 +1,43 @@ +From cf05aae9685e5c6a46b4313e7bfce49edc6f51f9 Mon Sep 17 00:00:00 2001 +From: Mikle Kolyada <zlogene@gentoo.org> +Date: Tue, 31 Dec 2019 11:29:30 +0300 +Subject: [PATCH] poppler-0.84 compat + +Upstream report: https://tug.org/pipermail/tex-k/2019-December/003096.html + +Signed-off-by: Mikle Kolyada <zlogene@gentoo.org> +--- + texk/web2c/pdftexdir/utils.c | 1 - + texk/web2c/xetexdir/XeTeX_ext.c | 3 +++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/texk/web2c/pdftexdir/utils.c b/texk/web2c/pdftexdir/utils.c +index c93a8781..6f866e76 100644 +--- a/texk/web2c/pdftexdir/utils.c ++++ b/texk/web2c/pdftexdir/utils.c +@@ -33,7 +33,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>. + #include "ptexlib.h" + #include <png.h> + #ifdef POPPLER_VERSION +-#include <poppler-config.h> + #define xpdfVersion POPPLER_VERSION + #define xpdfString "poppler" + #else +diff --git a/texk/web2c/xetexdir/XeTeX_ext.c b/texk/web2c/xetexdir/XeTeX_ext.c +index 4968ee41..0aee4ee3 100644 +--- a/texk/web2c/xetexdir/XeTeX_ext.c ++++ b/texk/web2c/xetexdir/XeTeX_ext.c +@@ -38,7 +38,10 @@ authorization from the copyright holders. + + #include <w2c/config.h> + ++#ifndef POPPLER_VERSION + #include <poppler-config.h> ++#endif ++ + #include <png.h> + #include <zlib.h> + #include <graphite2/Font.h> +-- +2.24.1 + diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6b4fb1f9f746..590fa79108f0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -84,6 +84,7 @@ mapAliases ({ cv = progress; # added 2015-09-06 d1x_rebirth = dxx-rebirth; # added 2018-04-25 d2x_rebirth = dxx-rebirth; # added 2018-04-25 + dat = nodePackages.dat; dbus_daemon = dbus.daemon; # added 2018-04-25 dbus_glib = dbus-glib; # added 2018-02-25 dbus_libs = dbus; # added 2018-04-25 @@ -237,6 +238,7 @@ mapAliases ({ man_db = man-db; # added 2016-05 manpages = man-pages; # added 2015-12-06 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 + matrique = spectral; # added 2020-01-27 mbedtls_1_3 = throw "mbedtls_1_3 is end of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # added 2019-12-08 mess = mame; # added 2019-10-30 mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10 @@ -567,4 +569,5 @@ mapAliases ({ oraclejdk8psu_distro = oraclejdk8psu; dnscrypt-proxy = throw "dnscrypt-proxy has been removed. Please use dnscrypt-proxy2."; # added 2020-02-02 + sqldeveloper_18 = throw "sqldeveloper_18 is not maintained anymore!"; # added 2020-02-04 }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0c475483078..df18fc6e00a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2043,6 +2043,8 @@ in parallel-rust = callPackage ../tools/misc/parallel-rust { }; + pueue = callPackage ../applications/misc/pueue { }; + pyCA = python3Packages.callPackage ../applications/video/pyca {}; pyznap = python3Packages.callPackage ../tools/backup/pyznap {}; @@ -8829,7 +8831,8 @@ in sagittarius-scheme = callPackage ../development/compilers/sagittarius-scheme {}; sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; - sbcl = callPackage ../development/compilers/sbcl {}; + sbcl_2_0_1 = callPackage ../development/compilers/sbcl {}; + sbcl = callPackage ../development/compilers/sbcl/2.0.0.nix {}; scala_2_10 = callPackage ../development/compilers/scala/2.10.nix { }; scala_2_11 = callPackage ../development/compilers/scala/2.11.nix { }; @@ -8860,12 +8863,7 @@ in spirv-llvm-translator = callPackage ../development/compilers/spirv-llvm-translator { }; - sqldeveloper = callPackage ../development/tools/database/sqldeveloper { }; - - # sqldeveloper_18 needs JavaFX, which currently only is available inside the - # (non-free and net yet packaged for Darwin) OracleJDK - # we might be able to get rid of it, as soon as we have an OpenJDK with OpenJFX included - sqldeveloper_18 = callPackage ../development/tools/database/sqldeveloper/18.2.nix { + sqldeveloper = callPackage ../development/tools/database/sqldeveloper { jdk = oraclejdk; }; @@ -9178,6 +9176,7 @@ in let defaultOctaveOptions = { qt = null; + qscintilla = null; ghostscript = null; graphicsmagick = null; llvm = null; @@ -9199,6 +9198,7 @@ in octaveFull = (lowPrio (octave.override { qt = qt4; + inherit qscintilla; overridePlatforms = ["x86_64-linux" "x86_64-darwin"]; openblas = if stdenv.isDarwin then openblasCompat else openblas; })); @@ -9717,8 +9717,6 @@ in buildozer = bazel-buildtools; unused_deps = bazel-buildtools; - bazel-deps = callPackage ../development/tools/build-managers/bazel/bazel-deps { }; - bazel-remote = callPackage ../development/tools/build-managers/bazel/bazel-remote { }; bazel-watcher = callPackage ../development/tools/bazel-watcher { @@ -12289,6 +12287,8 @@ in libchop = callPackage ../development/libraries/libchop { }; + libcint = callPackage ../development/libraries/libcint { }; + libclc = callPackage ../development/libraries/libclc { }; libcli = callPackage ../development/libraries/libcli { }; @@ -16519,6 +16519,8 @@ in it87 = callPackage ../os-specific/linux/it87 {}; + asus-wmi-sensors = callPackage ../os-specific/linux/asus-wmi-sensors {}; + ena = callPackage ../os-specific/linux/ena {}; v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { }; @@ -18609,12 +18611,6 @@ in dmenu = callPackage ../applications/misc/dmenu { }; - # TODO (@primeos): Remove after the 19.09 branch-off: - dmenu2 = throw '' - The fork "dmenu2" is not maintained by upstream anymore. Please use the - original "dmenu" instead. - ''; - dmensamenu = callPackage ../applications/misc/dmensamenu { inherit (python3Packages) buildPythonApplication requests; }; @@ -18736,6 +18732,8 @@ in electrum-ltc = callPackage ../applications/misc/electrum/ltc.nix { }; + elementary-planner = callPackage ../applications/office/elementary-planner { }; + elinks = callPackage ../applications/networking/browsers/elinks { openssl = openssl_1_0_2; }; @@ -19276,9 +19274,7 @@ in withpcre2 = false; }; - gitRepo = callPackage ../applications/version-management/git-repo { - python = python27; - }; + gitRepo = callPackage ../applications/version-management/git-repo { }; git-quick-stats = callPackage ../development/tools/git-quick-stats {}; @@ -20372,9 +20368,6 @@ in mm-common = callPackage ../development/libraries/mm-common { }; - # Renamed - matrique = spectral; - mpc-qt = libsForQt5.callPackage ../applications/video/mpc-qt { }; mplayer = callPackage ../applications/video/mplayer ({ @@ -21658,13 +21651,6 @@ in taskopen = callPackage ../applications/misc/taskopen { }; - # TODO (@primeos): Remove after the 19.09 branch-off: - tdesktopPackages = throw '' - The attributes "tdesktopPackages.*" where removed as the preview version - will not be maintained anymore (there are regular stable releases and we - depend on the patches from Arch Linux which only track the stable version - as well). Please switch to "tdesktop" (stable version). - ''; tdesktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { }; telepathy-gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble { }; @@ -22588,7 +22574,7 @@ in zanshin = libsForQt5.callPackage ../applications/office/zanshin { inherit (kdeApplications) akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface kldap; - inherit (kdeFrameworks) krunner kwallet; + inherit (kdeFrameworks) krunner kwallet kcalendarcore; boost = boost160; }; @@ -25943,5 +25929,4 @@ in quartus-prime-lite = callPackage ../applications/editors/quartus-prime {}; - dat = nodePackages.dat; } diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index f90068e00eb4..56ae90ae3920 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -562,6 +562,8 @@ let then callPackage ../development/ocaml-modules/num {} else null; + parmap = callPackage ../development/ocaml-modules/parmap { }; + comparelib = callPackage ../development/ocaml-modules/comparelib { }; core_extended_p4 = callPackage ../development/ocaml-modules/core_extended { }; |