diff options
46 files changed, 640 insertions, 217 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ea4cd3fdf83..c391832a37c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3841,6 +3841,11 @@ github = "sauyon"; name = "Sauyon Lee"; }; + sboosali = { + email = "SamBoosalis@gmail.com"; + github = "sboosali"; + name = "Sam Boosalis"; + }; schmitthenner = { email = "development@schmitthenner.eu"; github = "fkz"; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 7327d4ac4df..ae5084ca2a2 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -103,6 +103,7 @@ ./programs/less.nix ./programs/light.nix ./programs/mosh.nix + ./programs/mininet.nix ./programs/mtr.nix ./programs/nano.nix ./programs/npm.nix diff --git a/nixos/modules/programs/mininet.nix b/nixos/modules/programs/mininet.nix new file mode 100644 index 00000000000..ecc924325e6 --- /dev/null +++ b/nixos/modules/programs/mininet.nix @@ -0,0 +1,39 @@ +# Global configuration for mininet +# kernel must have NETNS/VETH/SCHED +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.mininet; + + generatedPath = with pkgs; makeSearchPath "bin" [ + iperf ethtool iproute socat + ]; + + pyEnv = pkgs.python.withPackages(ps: [ ps.mininet-python ]); + + mnexecWrapped = pkgs.runCommand "mnexec-wrapper" + { buildInputs = [ pkgs.makeWrapper pkgs.pythonPackages.wrapPython ]; } + '' + makeWrapper ${pkgs.mininet}/bin/mnexec \ + $out/bin/mnexec \ + --prefix PATH : "${generatedPath}" + + ln -s ${pyEnv}/bin/mn $out/bin/mn + + # mn errors out without a telnet binary + # pkgs.telnet brings an undesired ifconfig into PATH see #43105 + ln -s ${pkgs.telnet}/bin/telnet $out/bin/telnet + ''; +in +{ + options.programs.mininet.enable = mkEnableOption "Mininet"; + + config = mkIf cfg.enable { + + virtualisation.vswitch.enable = true; + + environment.systemPackages = [ mnexecWrapped ]; + }; +} diff --git a/nixos/modules/services/desktops/gnome3/seahorse.nix b/nixos/modules/services/desktops/gnome3/seahorse.nix index e9ad738269e..9631157934f 100644 --- a/nixos/modules/services/desktops/gnome3/seahorse.nix +++ b/nixos/modules/services/desktops/gnome3/seahorse.nix @@ -29,7 +29,7 @@ with lib; config = mkIf config.services.gnome3.seahorse.enable { - environment.systemPackages = [ pkgs.gnome3.seahorse ]; + environment.systemPackages = [ pkgs.gnome3.seahorse pkgs.gnome3.dconf ]; services.dbus.packages = [ pkgs.gnome3.seahorse ]; diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index 7715e291d32..4873ab1fc60 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -99,19 +99,23 @@ in { message = "Cannot specify both config and configText"; } ]; + + systemd.tmpfiles.rules = [ + "d /var/cache/netdata 0755 ${cfg.user} ${cfg.group} -" + "Z /var/cache/netdata - ${cfg.user} ${cfg.group} -" + "d /var/log/netdata 0755 ${cfg.user} ${cfg.group} -" + "Z /var/log/netdata - ${cfg.user} ${cfg.group} -" + "d /var/lib/netdata 0755 ${cfg.user} ${cfg.group} -" + "Z /var/lib/netdata - ${cfg.user} ${cfg.group} -" + "d /etc/netdata 0755 ${cfg.user} ${cfg.group} -" + "Z /etc/netdata - ${cfg.user} ${cfg.group} -" + ]; systemd.services.netdata = { description = "Real time performance monitoring"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; path = (with pkgs; [ gawk curl ]) ++ lib.optional cfg.python.enable (pkgs.python3.withPackages cfg.python.extraPackages); - preStart = concatStringsSep "\n" (map (dir: '' - mkdir -vp ${dir} - chmod 750 ${dir} - chown -R ${cfg.user}:${cfg.group} ${dir} - '') [ "/var/cache/netdata" - "/var/log/netdata" - "/var/lib/netdata" ]); serviceConfig = { User = cfg.user; Group = cfg.group; diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix index b2c9fdfd1ee..da504d63382 100644 --- a/pkgs/applications/altcoins/parity/beta.nix +++ b/pkgs/applications/altcoins/parity/beta.nix @@ -1,9 +1,9 @@ let - version = "2.1.3"; - sha256 = "0il18r229r32jzwsjksp8cc63rp6cf6c0j5dvbfzrnv1zndw0cg3"; - cargoSha256 = "08dyb0lgf66zfq9xmfkhcn6rj070d49dm0rjl3v39sfag6sryz20"; + version = "2.2.1"; + sha256 = "1m65pks2jk83j82f1i901p03qb54xhcp6gfjngcm975187zzvmcq"; + cargoSha256 = "1mf1jgphwvhlqkvzrgbhnqfyqgf3ljc1l9zckyilzmw5k4lf4g1w"; patches = [ - ./patches/vendored-sources-2.1.patch + ./patches/vendored-sources-2.2.patch ]; in import ./parity.nix { inherit version sha256 cargoSha256 patches; } diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index b0286bf6583..2abc1abe0ed 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,7 +1,7 @@ let - version = "2.0.8"; - sha256 = "1bz6dvx8wxhs3g447s62d9091sard2x7w2zd6iy7hf76wg0p73hr"; - cargoSha256 = "0wj93md87fr7a9ag73h0rd9xxqscl0lhbj3g3kvnqrqz9xxajing"; - patches = [ ./patches/vendored-sources-2.0.patch ]; + version = "2.1.6"; + sha256 = "0njkypszi0fjh9y0zfgxbycs4c1wpylk7wx6xn1pp6gqvvri6hav"; + cargoSha256 = "116sj7pi50k5gb1i618g4pgckqaf8kb13jh2a3shj2kwywzzcgjs"; + patches = [ ./patches/vendored-sources-2.1.patch ]; in import ./parity.nix { inherit version sha256 cargoSha256 patches; } diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-2.1.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-2.1.patch index 4af536cdf3c..678dd082923 100644 --- a/pkgs/applications/altcoins/parity/patches/vendored-sources-2.1.patch +++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-2.1.patch @@ -14,7 +14,7 @@ index 72652ad2f..3c0eca89a 100644 + +[source."https://github.com/nikvolf/parity-tokio-ipc"] +git = "https://github.com/nikvolf/parity-tokio-ipc" -+rev = "7c9bbe3bc45d8e72a92b0951acc877da228abd50" ++rev = "c0f80b40399d7f08ef1e6869569640eb28645f56" +replace-with = "vendored-sources" + +[source."https://github.com/nikvolf/tokio-named-pipes"] diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-2.0.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-2.2.patch index 9af64559d97..f45de5ed856 100644 --- a/pkgs/applications/altcoins/parity/patches/vendored-sources-2.0.patch +++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-2.2.patch @@ -44,7 +44,7 @@ index 72652ad2f..3c0eca89a 100644 + +[source."https://github.com/paritytech/jsonrpc.git"] +git = "https://github.com/paritytech/jsonrpc.git" -+branch = "parity-1.11" ++branch = "parity-2.2" +replace-with = "vendored-sources" + +[source."https://github.com/paritytech/libusb-rs"] diff --git a/pkgs/applications/audio/traverso/default.nix b/pkgs/applications/audio/traverso/default.nix new file mode 100644 index 00000000000..9729b136d90 --- /dev/null +++ b/pkgs/applications/audio/traverso/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, cmake, pkgconfig +, alsaLib, fftw, flac, lame, libjack2, libmad, libpulseaudio +, libsamplerate, libsndfile, libvorbis, portaudio, qtbase, wavpack +}: +stdenv.mkDerivation rec { + name = "traverso-${version}"; + version = "0.49.5"; + + src = fetchurl { + url = "http://traverso-daw.org/traverso-0.49.5.tar.gz"; + sha256 = "169dsqrf807ciavrd82d3iil0xy0r3i1js08xshcrn80ws9hv63m"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ alsaLib fftw flac.dev libjack2 lame + libmad libpulseaudio libsamplerate.dev libsndfile.dev libvorbis + portaudio qtbase wavpack ]; + + cmakeFlags = [ "-DWANT_PORTAUDIO=1" "-DWANT_PULSEAUDIO=1" "-DWANT_MP3_ENCODE=1" "-DWANT_LV2=0" ]; + + enableParallelBuilding = true; + hardeningDisable = [ "format" ]; + + meta = with stdenv.lib; { + description = "Cross-platform multitrack audio recording and audio editing suite"; + homepage = http://traverso-daw.org/; + license = with licenses; [ gpl2Plus lgpl21Plus ]; + platforms = platforms.all; + maintainers = with maintainers; [ coconnor ]; + }; +} diff --git a/pkgs/applications/editors/mindforger/build.patch b/pkgs/applications/editors/mindforger/build.patch new file mode 100644 index 00000000000..e2745cbce2d --- /dev/null +++ b/pkgs/applications/editors/mindforger/build.patch @@ -0,0 +1,91 @@ +diff --git a/app/app.pro b/app/app.pro +index 4d47065..a39a320 100644 +--- a/app/app.pro ++++ b/app/app.pro +@@ -18,6 +18,8 @@ + TARGET = mindforger + TEMPLATE = app + ++include(../config.pri) ++ + QT += widgets + + mfner { +@@ -297,7 +299,7 @@ RESOURCES += \ + # See http://doc.qt.io/qt-5/qmake-advanced-usage.html + + binfile.files += mindforger +-binfile.path = /usr/bin/ ++binfile.path = $$PREFIX/bin/ + INSTALLS += binfile + + # ######################################## +diff --git a/config.pri b/config.pri +new file mode 100644 +index 0000000..ce05df1 +--- /dev/null ++++ b/config.pri +@@ -0,0 +1,3 @@ ++isEmpty(PREFIX) { ++ PREFIX = /usr ++} +diff --git a/deps/discount/discount.pro b/deps/discount/discount.pro +index a8dfe35..ec16468 100644 +--- a/deps/discount/discount.pro ++++ b/deps/discount/discount.pro +@@ -5,6 +5,8 @@ + # Webpage: http://www.pell.portland.or.us/~orc/Code/discount/ + # + ++include(../../config.pri) ++ + QT -= core gui + + TARGET = discount +@@ -46,7 +48,7 @@ unix:!symbian { + maemo5 { + target.path = /opt/usr/lib + } else { +- target.path = /usr/lib ++ target.path = $$PREFIX/lib + } + INSTALLS += target + } +diff --git a/mindforger.pro b/mindforger.pro +index ae627f2..0953856 100644 +--- a/mindforger.pro ++++ b/mindforger.pro +@@ -32,6 +32,8 @@ TEMPLATE = subdirs + + SUBDIRS = deps lib app + ++include(config.pri) ++ + # build dependencies + lib.depends = deps + app.depends = lib +@@ -44,20 +46,20 @@ app.depends = lib + #IMPORTANT: binfile MUST be specified in app/app.pro (project next to/that builds binary) + + docfiles.files += doc/* +-docfiles.path = /usr/share/doc/mindforger/ ++docfiles.path = $$PREFIX/share/doc/mindforger/ + INSTALLS += docfiles + + manfiles.files += man/* +-manfiles.path = /usr/share/man/man1/ ++manfiles.path = $$PREFIX/share/man/man1/ + INSTALLS += manfiles + + iconfiles.files += app/resources/icons/* +-iconfiles.path = /usr/share/icons/mindforger/ ++iconfiles.path = $$PREFIX/share/icons/mindforger/ + INSTALLS += iconfiles + + # experiment w/ file + shortcutfiles.files += app/resources/gnome-shell/mindforger.desktop +-shortcutfiles.path = /usr/share/applications/ ++shortcutfiles.path = $$PREFIX/share/applications/ + INSTALLS += shortcutfiles + + # eof diff --git a/pkgs/applications/editors/mindforger/default.nix b/pkgs/applications/editors/mindforger/default.nix new file mode 100644 index 00000000000..a027242c5ee --- /dev/null +++ b/pkgs/applications/editors/mindforger/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, qmake, qtbase, qtwebkit }: + +stdenv.mkDerivation rec { + name = "mindforger-${version}"; + version = "1.48.2"; + + src = fetchurl { + url = "https://github.com/dvorka/mindforger/releases/download/1.48.0/mindforger_${version}.tgz"; + sha256 = "1wlrl8hpjcpnq098l3n2d1gbhbjylaj4z366zvssqvmafr72iyw4"; + }; + + nativeBuildInputs = [ qmake ] ; + buildInputs = [ qtbase qtwebkit ] ; + + doCheck = true; + + enableParallelBuilding = true ; + + patches = [ ./build.patch ] ; + + postPatch = '' + substituteInPlace deps/discount/version.c.in --subst-var-by TABSTOP 4 + substituteInPlace app/resources/gnome-shell/mindforger.desktop --replace /usr "$out" + ''; + + preConfigure = '' + export AC_PATH="$PATH" + pushd deps/discount + ./configure.sh + popd + ''; + + qmakeFlags = [ "-r mindforger.pro" "CONFIG+=mfnoccache" ] ; + + meta = with stdenv.lib; { + description = "Thinking Notebook & Markdown IDE"; + longDescription = '' + MindForger is actually more than an editor or IDE - it's human + mind inspired personal knowledge management tool + ''; + homepage = https://www.mindforger.com; + license = licenses.gpl2Plus; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/graphics/processing3/default.nix b/pkgs/applications/graphics/processing3/default.nix index 5575c56b7fd..6f90131db12 100644 --- a/pkgs/applications/graphics/processing3/default.nix +++ b/pkgs/applications/graphics/processing3/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ${xmlstarlet}/bin/xmlstarlet ed --inplace -P -d '//get[@src="http://download.processing.org/reference.zip"]' build/build.xml install -D -m0444 ${fetchurl { url = http://download.processing.org/reference.zip; - sha256 = "0dli1bdgw8hsx7g7b048ap81v2za9maa6pfcwdqm3qkfypr8q7pr"; + sha256 = "0ai0cr62gc7n6y22ki3qibyj1qnlaxv1miqxmmahfk3hpbyfqz9n"; } } ./java/reference.zip diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index 21b55e6e7a0..7b28462d552 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -1,28 +1,27 @@ { stdenv, fetchgit, perl, makeWrapper, makeDesktopItem -, which, perlPackages +, which, perlPackages, boost }: stdenv.mkDerivation rec { - version = "1.2.9"; + version = "1.3.0"; name = "slic3r-${version}"; src = fetchgit { url = "git://github.com/alexrj/Slic3r"; - rev = "refs/tags/${version}"; - sha256 = "1z8h11k29b7z49z5k8ikyfiijyycy1q3krlzi8hfd0vdybvymw21"; + rev = version; + sha256 = "1pg4jxzb7f58ls5s8mygza8kqdap2c50kwlsdkf28bz1xi611zbi"; }; - patches = [ - ./gcc6.patch - ]; - - buildInputs = with perlPackages; [ perl makeWrapper which + buildInputs = + [boost] ++ + (with perlPackages; [ perl makeWrapper which EncodeLocale MathClipper ExtUtilsXSpp threads MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus ImportInto XMLSAX ExtUtilsMakeMaker OpenGL WxGLCanvas ModuleBuild LWP ExtUtilsCppGuess ModuleBuildWithXSpp ExtUtilsTypemapsDefault - ]; + DevelChecklib locallib + ]); desktopItem = makeDesktopItem { name = "slic3r"; @@ -34,6 +33,13 @@ stdenv.mkDerivation rec { categories = "Application;Development;"; }; + prePatch = '' + # In nix ioctls.h isn't available from the standard kernel-headers package + # on other distributions. As the copy in glibc seems to be identical to the + # one in the kernel, we use that one instead. + sed -i 's|"/usr/include/asm-generic/ioctls.h"|<asm-generic/ioctls.h>|g' xs/src/libslic3r/GCodeSender.cpp + ''; + buildPhase = '' export SLIC3R_NO_AUTO=true export LD=$CXX diff --git a/pkgs/applications/misc/slic3r/gcc6.patch b/pkgs/applications/misc/slic3r/gcc6.patch deleted file mode 100644 index f382a252f0d..00000000000 --- a/pkgs/applications/misc/slic3r/gcc6.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git i/xs/src/libslic3r/Config.hpp w/xs/src/libslic3r/Config.hpp -index 49e999b..d9b65d8 100644 ---- i/xs/src/libslic3r/Config.hpp -+++ w/xs/src/libslic3r/Config.hpp -@@ -65,7 +65,7 @@ class ConfigOptionFloat : public ConfigOption - - bool deserialize(std::string str) { - std::istringstream iss(str); -- return iss >> this->value; -+ return bool(iss >> this->value); - }; - }; - -@@ -124,7 +124,7 @@ class ConfigOptionInt : public ConfigOption - - bool deserialize(std::string str) { - std::istringstream iss(str); -- return iss >> this->value; -+ return bool(iss >> this->value); - }; - }; - -@@ -249,7 +249,7 @@ class ConfigOptionPercent : public ConfigOption - bool deserialize(std::string str) { - // don't try to parse the trailing % since it's optional - std::istringstream iss(str); -- return iss >> this->value; -+ return bool(iss >> this->value); - }; - }; - -@@ -279,7 +279,7 @@ class ConfigOptionFloatOrPercent : public ConfigOption - bool deserialize(std::string str) { - this->percent = str.find_first_of("%") != std::string::npos; - std::istringstream iss(str); -- return iss >> this->value; -+ return bool(iss >> this->value); - }; - }; - diff --git a/pkgs/applications/misc/termonad/default.nix b/pkgs/applications/misc/termonad/default.nix new file mode 100644 index 00000000000..4388cbcfb44 --- /dev/null +++ b/pkgs/applications/misc/termonad/default.nix @@ -0,0 +1,19 @@ +{ stdenv, ghcWithPackages, makeWrapper, packages ? (pkgSet: []) }: + +let + termonadEnv = ghcWithPackages (self: [ self.termonad ] ++ packages self); +in stdenv.mkDerivation { + name = "termonad-with-packages-${termonadEnv.version}"; + + nativeBuildInputs = [ makeWrapper ]; + + buildCommand = '' + mkdir -p $out/bin $out/share + makeWrapper ${termonadEnv}/bin/termonad $out/bin/termonad \ + --set NIX_GHC "${termonadEnv}/bin/ghc" + ''; + + # trivial derivation + preferLocalBuild = true; + allowSubstitutes = false; +} diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix new file mode 100644 index 00000000000..a01cef9227b --- /dev/null +++ b/pkgs/applications/misc/wtf/default.nix @@ -0,0 +1,28 @@ +{ buildGoPackage +, fetchFromGitHub +, lib +}: + +buildGoPackage rec { + name = "wtf-${version}"; + version = "0.4.0"; + + goPackagePath = "github.com/senorprogrammer/wtf"; + + src = fetchFromGitHub { + owner = "senorprogrammer"; + repo = "wtf"; + rev = "${version}"; + sha256 = "1vgjqmw27baiq9brmnafic3w3hw11p5qc6ahbdxi5n5n4bx7j6vn"; + }; + + buildFlagsArray = [ "-ldflags=" "-X main.version=${version}" ]; + + meta = with lib; { + description = "The personal information dashboard for your terminal"; + homepage = http://wtfutil.com/; + license = licenses.mpl20; + maintainers = with maintainers; [ kalbasit ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 3c0993d8733..725adda56e7 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -12,6 +12,7 @@ gdk_pixbuf, glib, gnome2, + gnome3, gtk3, libuuid, libX11, @@ -31,7 +32,8 @@ udev, xorg, zlib, - xdg_utils + xdg_utils, + wrapGAppsHook }: let rpath = lib.makeLibraryPath [ @@ -71,7 +73,7 @@ let rpath = lib.makeLibraryPath [ in stdenv.mkDerivation rec { - name = "brave"; + name = "brave-${version}"; version = "0.56.12"; src = fetchurl { @@ -83,14 +85,16 @@ in stdenv.mkDerivation rec { dontBuild = true; dontPatchELF = true; - nativeBuildInputs = [ dpkg ]; + nativeBuildInputs = [ dpkg wrapGAppsHook ]; + + buildInputs = [ glib gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme ]; unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"; installPhase = '' - mkdir -p $out + mkdir -p $out $out/bin - cp -R usr/* $out + cp -R usr/share $out cp -R opt/ $out/opt export BINARYWRAPPER=$out/opt/brave.com/brave/brave-browser diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix index c3be5eade39..8271346f25e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix @@ -11,8 +11,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-alicloud"; - version = "1.22.0"; - sha256 = "19qn7q280ppsg7hjlmyagbhgb7qw365mk6c4avs0apvpq6n64rn3"; + version = "1.23.0"; + sha256 = "14hs58lqlj9vkmr4bxbyga8yz4h6mrx6zla587sqwgj5bjrg5vld"; }; archive = { @@ -39,15 +39,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-aws"; - version = "1.43.1"; - sha256 = "0fhw07kqcykfzlfhqh3wdz43kkhz3c63xkymnpw68kqx2vxx8ncv"; + version = "1.46.0"; + sha256 = "1xp02cwyl9sf8swl7x3wah3bg0ssm7y0svq8bkfki6632nfw9vzi"; }; azurerm = { owner = "terraform-providers"; repo = "terraform-provider-azurerm"; - version = "1.18.0"; - sha256 = "03vkpk9kl9zvfrprhqqn739klr9gpps5d6zq5r3qa56k588zcg4p"; + version = "1.19.0"; + sha256 = "1b07g90vmdvlfyz2q40sjd14xnbjyf9c7hgg7rzyhnkfi7imjbbf"; }; azurestack = { @@ -102,8 +102,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-cloudflare"; - version = "1.8.0"; - sha256 = "1hsqxi27mwr96k8yn8f1nxwvs1jaq7nr8plxi7y4lqsv6s7mghjk"; + version = "1.9.0"; + sha256 = "0z11zaii99cilqcq4lgikaanb2zc457qv19sxdh6b3v88n5n8qsf"; }; cloudscale = { @@ -228,15 +228,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-grafana"; - version = "1.2.0"; - sha256 = "1kn2bbdgci6nfl2gyk4w8w203fscqws2748idv9m53ikczg8n573"; + version = "1.3.0"; + sha256 = "1gyma31iv05nfy9jrd8zlkls35fbrxx4nrh56gdgwchv054rxzff"; }; hcloud = { owner = "terraform-providers"; repo = "terraform-provider-hcloud"; - version = "1.4.0"; - sha256 = "00mq6p2y61z4hg9dncf3mj59cp6fx4iqrn86m96wkw346shs6prs"; + version = "1.5.0"; + sha256 = "135h811qh1l1kn66n371f00b422xi4zw15cgs3id866za5cavxf3"; }; helm = { @@ -249,8 +249,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-heroku"; - version = "1.5.0"; - sha256 = "0hzzhqd87vkcbzndsn15g4nl3qhv2kvnhs9zv6kbxaxm7p7rm3pz"; + version = "1.6.0"; + sha256 = "0byz9prx2x3nz9dl65mjnp0f33in62am35kcsza3538jcvymkhk2"; }; http = { @@ -396,8 +396,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-oci"; - version = "3.6.0"; - sha256 = "0ilg52j6js6bvw9wng5rbcv2n9kp926x4f2q340qwyyna59r5s5l"; + version = "3.7.0"; + sha256 = "10d8hvcr019cr8fh54klnr9xhi0y3l5w4nb2h9bny84nv2rznk38"; }; oneandone = { @@ -417,8 +417,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-openstack"; - version = "1.11.0"; - sha256 = "1wqb7q10nyr4jy9ny4giazblwhh3qrn4s1f0xb5q702b5igbfwwm"; + version = "1.12.0"; + sha256 = "1zv5z55yiqvsh5sh26qlyw8fcc7kyw7v4p60kfnw2ds5kd0b51i1"; }; opentelekomcloud = { @@ -592,8 +592,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-tfe"; - version = "0.2.0"; - sha256 = "1d3yiaxmmlnnjmx6vnckvdnqgyxakc9i70dgxdbn8ihw5i6anvik"; + version = "0.3.0"; + sha256 = "125k1hgpzwlsgslnz2nwz4mc5yl3hqyg48xdcn7bxvmvaf6kw9gd"; }; tls = { diff --git a/pkgs/applications/science/math/polymake/default.nix b/pkgs/applications/science/math/polymake/default.nix new file mode 100644 index 00000000000..4fba231f094 --- /dev/null +++ b/pkgs/applications/science/math/polymake/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl +, ninja, libxml2, libxslt, readline, perl, gmp, mpfr, boost +, bliss, ppl, singular, cddlib, lrs, nauty +, ant, openjdk +, perlPackages +, makeWrapper +}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "polymake"; + version = "3.2.rc4"; + + src = fetchurl { + url = "https://polymake.org/lib/exe/fetch.php/download/polymake-3.2r4.tar.bz2"; + sha256 = "02jpkvy1cc6kc23vkn7nkndzr40fq1gkb3v257bwyi1h5d37fyqy"; + }; + + buildInputs = [ + libxml2 libxslt readline perl gmp mpfr boost + bliss ppl singular cddlib lrs nauty + openjdk + ] ++ + (with perlPackages; [ + XMLLibXML XMLLibXSLT XMLWriter TermReadLineGnu TermReadKey + ]); + + nativeBuildInputs = [ + makeWrapper ninja ant perl + ]; + + ninjaFlags = "-C build/Opt"; + + postInstall = '' + for i in "$out"/bin/*; do + wrapProgram "$i" --prefix PERL5LIB : "$PERL5LIB" + done + ''; + + meta = { + inherit version; + description = "Software for research in polyhedral geometry"; + license = stdenv.lib.licenses.gpl2 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "https://www.polymake.org/doku.php"; + }; +} diff --git a/pkgs/applications/science/misc/netlogo/default.nix b/pkgs/applications/science/misc/netlogo/default.nix new file mode 100644 index 00000000000..76f958cc3a8 --- /dev/null +++ b/pkgs/applications/science/misc/netlogo/default.nix @@ -0,0 +1,58 @@ +{ jre, stdenv, fetchurl, makeWrapper, makeDesktopItem }: + +let + + desktopItem = makeDesktopItem rec { + name = "netlogo"; + exec = name; + icon = name; + comment = "A multi-agent programmable modeling environment"; + desktopName = "NetLogo"; + categories = "Science;"; + }; + +in + +stdenv.mkDerivation rec { + name = "netlogo-${version}"; + version = "6.0.4"; + + src = fetchurl { + url = "https://ccl.northwestern.edu/netlogo/${version}/NetLogo-${version}-64.tgz"; + sha256 = "0dcd9df4dfb218826a74f9df42163fa588908a1dfe58864106936f8dfb76acec"; + }; + + src1 = fetchurl { + name = "netlogo.png"; + url = "https://netlogoweb.org/assets/images/desktopicon.png"; + sha256 = "1i43lhr31lzva8d2r0dxpcgr58x496gb5vmb0h2da137ayvifar8"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -pv $out/share/netlogo $out/share/icons/hicolor/256x256/apps $out/share/applications $out/share/doc + cp -rv app $out/share/netlogo + cp -v readme.md $out/share/doc/ + + # launcher with `cd` is required b/c otherwise the model library isn't usable + makeWrapper "${jre}/bin/java" "$out/bin/netlogo" \ + --run "cd $out/share/netlogo/app" \ + --add-flags "-jar netlogo-${version}.jar" + + cp $src1 $out/share/icons/hicolor/256x256/apps/netlogo.png + cp ${desktopItem}/share/applications/* $out/share/applications + ''; + + meta = with stdenv.lib; { + description = "A multi-agent programmable modeling environment"; + longDescription = '' + NetLogo is a multi-agent programmable modeling environment. It is used by + many tens of thousands of students, teachers and researchers worldwide. + ''; + homepage = https://ccl.northwestern.edu/netlogo/index.shtml; + license = licenses.gpl2; + maintainers = [ maintainers.dpaetzel ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 7419c52c48b..b97123926eb 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -4,17 +4,13 @@ with rustPlatform; buildRustPackage rec { name = "pijul-${version}"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { url = "https://pijul.org/releases/${name}.tar.gz"; - sha256 = "1lkipcp83rfsj9yqddvb46dmqdf2ch9njwvjv8f3g91rmfjcngys"; + sha256 = "e60793ab124e9054c1d5509698acbae507ebb2fab5364d964067bc9ae8b6b5e5"; }; - cargoPatches = [ - ./libpijul.patch - ]; - nativeBuildInputs = [ pkgconfig ]; postInstall = '' @@ -29,7 +25,7 @@ buildRustPackage rec { doCheck = false; - cargoSha256 = "1419mlxa4p53hm5qzfd1yi2k0n1bcv8kaslls1nyx661vknhfamw"; + cargoSha256 = "1r76azmka1d76ff0ddfhzr24b0ry496qrp13945i3vs0fgzk2sdz"; meta = with stdenv.lib; { description = "A distributed version control system"; diff --git a/pkgs/applications/version-management/pijul/libpijul.patch b/pkgs/applications/version-management/pijul/libpijul.patch deleted file mode 100644 index 9e4aa3cdd4b..00000000000 --- a/pkgs/applications/version-management/pijul/libpijul.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- 2/pijul-0.10.0/Cargo.lock 1970-01-01 01:00:00.000000000 +0100 -+++ pijul-0.10.0/Cargo.lock 2018-10-28 10:09:48.557639255 +0000 -@@ -552,7 +552,7 @@ - - [[package]] - name = "libpijul" --version = "0.10.0" -+version = "0.10.1" - dependencies = [ - "base64 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -577,9 +577,29 @@ - - [[package]] - name = "libpijul" --version = "0.10.0" -+version = "0.10.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --replace = "libpijul 0.10.0" -+dependencies = [ -+ "base64 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bs58 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "chrono 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "flate2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "ignore 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "sanakirja 0.8.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thrussh-keys 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)", -+] - - [[package]] - name = "line" -@@ -917,7 +937,7 @@ - "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ignore 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "isatty 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "libpijul 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libpijul 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", - "line 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "pager 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -1796,7 +1816,7 @@ - "checksum lazycell 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a6f08839bc70ef4a3fe1d566d5350f519c5912ea86be0df1740a7d247c7fc0ef" - "checksum libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "6fd41f331ac7c5b8ac259b8bf82c75c0fb2e469bbf37d2becbba9a6a2221965b" - "checksum libflate 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "1a429b86418868c7ea91ee50e9170683f47fd9d94f5375438ec86ec3adb74e8e" --"checksum libpijul 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "80fd579ba6762eac3f12c9624d5496edaba5a2f2e8785bcf8310372328e06ebe" -+"checksum libpijul 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cf6fc1aa0e9402f8283bdeb2507cfb6798d2f2f973da34c3f4b0c96a456b74cd" - "checksum line 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ecdd22a3856203276b7854e16213139428e82922530438f36356e5b361ea4a42" - "checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" - "checksum log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "89f010e843f2b1a31dbd316b3b8d443758bc634bed37aabade59c686d644e0a2" diff --git a/pkgs/development/compilers/ghcjs-ng/8.4/git.json b/pkgs/development/compilers/ghcjs-ng/8.4/git.json index b27c75bfe71..cfa6cf1d7d2 100644 --- a/pkgs/development/compilers/ghcjs-ng/8.4/git.json +++ b/pkgs/development/compilers/ghcjs-ng/8.4/git.json @@ -1,6 +1,6 @@ { "url": "https://github.com/ghcjs/ghcjs", - "rev": "d20da90a4819faad1c6309a06363b34edac0374c", - "sha256": "0jmxgfm1zwg6xscjcaycfam7zss8ik4ql4ii5lpryh4h6cdhvkbr", + "rev": "81bf5f31dabaa711aab234cb119eb9c998ccb129", + "sha256": "1bgnc71kjqicqv2xq8p70nck600yi2p7g4k9r1jclv21ib7i5hmx", "fetchSubmodules": true } diff --git a/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix b/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix index 051b0a19b5b..bf4fd6d68a7 100644 --- a/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix +++ b/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix @@ -156,6 +156,7 @@ tree-diff ]; testToolDepends = [ hspec-discover ]; + doHaddock = false; homepage = "http://www.haskell.org/haddock/"; description = "Library exposing some functionality of Haddock"; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 48d595137b3..925e253b606 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation (rec { name = "libgit2-${version}"; - version = "0.26.6"; + version = "0.26.8"; # keep the version in sync with pythonPackages.pygit2 and gnome3.libgit2-glib src = fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - sha256 = "17pjvprmdrx4h6bb1hhc98w9qi6ki7yl57f090n9kbhswxqfs7s3"; + sha256 = "0wmjgvz8nrpk2dsn5bcc87nl0j5hb6pah2hzrj0b6jkk9mnin9fl"; }; cmakeFlags = [ "-DTHREADSAFE=ON" ]; diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix index 973f8304273..f07ebad9e81 100644 --- a/pkgs/development/libraries/openssl/chacha.nix +++ b/pkgs/development/libraries/openssl/chacha.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, perl, zlib -, withCryptodev ? false, cryptodevHeaders +, withCryptodev ? false, cryptodev }: with stdenv.lib; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { setOutputFlags = false; nativeBuildInputs = [ perl zlib ]; - buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders; + buildInputs = stdenv.lib.optional withCryptodev cryptodev; configureScript = "./config"; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 2ad4b8d904b..9e33e1b628b 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildPackages, perl, coreutils -, withCryptodev ? false, cryptodevHeaders +, withCryptodev ? false, cryptodev , enableSSL2 ? false , static ? false }: @@ -44,7 +44,7 @@ let separateDebugInfo = stdenv.hostPlatform.isLinux; nativeBuildInputs = [ perl ]; - buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders; + buildInputs = stdenv.lib.optional withCryptodev cryptodev; # TODO(@Ericson2314): Improve with mass rebuild configurePlatforms = []; diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix index 7a65da25890..3828cfda2af 100644 --- a/pkgs/development/libraries/physics/fastjet/default.nix +++ b/pkgs/development/libraries/physics/fastjet/default.nix @@ -2,21 +2,15 @@ stdenv.mkDerivation rec { name = "fastjet-${version}"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { url = "http://fastjet.fr/repo/fastjet-${version}.tar.gz"; - sha256 = "0lvchyh9q2p8lb10isazw0wbwzs24yg7gxyhpj9xpvz5hydyvgvn"; + sha256 = "1hk3k7dyik640dzg21filpywc2dl862nl2hbpg384hf5pw9syn9z"; }; buildInputs = [ python2 ]; - postPatch = '' - substituteInPlace plugins/SISCone/SISConeBasePlugin.cc \ - --replace 'structure_of<UserScaleBase::StructureType>()' \ - 'structure_of<UserScaleBase>()' - ''; - configureFlags = [ "--enable-allcxxplugins" "--enable-pyext" diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index a8655c2dcbe..722dccaea7b 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "herwig-${version}"; - version = "7.1.3"; + version = "7.1.4"; src = fetchurl { url = "https://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; - sha256 = "1iq1h5ap86729c4pfkswzfh0l2v20fyvqsb15c35g0407l54wfqm"; + sha256 = "1awr1jz0q873x8bgwiilzklhk1zkgm6slvpychpnvsf9vk05mmdx"; }; nativeBuildInputs = [ autoconf automake libtool ]; @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { homepage = https://herwig.hepforge.org/; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ veprbl ]; + broken = stdenv.isAarch64; # doesn't compile: ignoring return value of 'FILE* freopen... }; } diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix index feffa5c11d5..63bc3c06e10 100644 --- a/pkgs/development/libraries/physics/thepeg/default.nix +++ b/pkgs/development/libraries/physics/thepeg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "thepeg-${version}"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { url = "https://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2"; - sha256 = "030wpk78mwb56iph5iqmblsxgzpydsa25bbkv07bihihfm8gds0n"; + sha256 = "1x9dfxmsbmzmsxrv3cczfyrnqkxjcpy89v6v7ycysrx9k8qkf320"; }; buildInputs = [ boost fastjet gsl hepmc lhapdf rivet zlib ]; diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 72e09bf98f9..2334e4a3431 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -1,19 +1,25 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, isPyPy, libgit2, six, cffi }: +{ stdenv, lib, buildPythonPackage, fetchPypi, fetchpatch, isPyPy, libgit2_0_27, six, cffi }: buildPythonPackage rec { pname = "pygit2"; - version = "0.26.4"; + version = "0.27.2"; src = fetchPypi { inherit pname version; - sha256 = "a8a0ecce4aadac2675afa5bcda0f698bfe39ec61ac1e15b9264704d1b41bb390"; + sha256 = "0d9bgxd6ch5jxz0j5cmx7c4kw933g8pgm2zxf3id1a6w9g2r7hpw"; }; preConfigure = lib.optionalString stdenv.isDarwin '' - export DYLD_LIBRARY_PATH="${libgit2}/lib" + export DYLD_LIBRARY_PATH="${libgit2_0_27}/lib" ''; - propagatedBuildInputs = [ libgit2 six ] ++ lib.optional (!isPyPy) cffi; + patches = [ (fetchpatch { + name = "dont-require-old-pycparser"; # https://github.com/libgit2/pygit2/issues/819 + url = https://github.com/libgit2/pygit2/commit/1eaba181577de206d3d43ec7886d0353fc0c9f2a.patch; + sha256 = "18x1fpmywhjjr4lvakwmy34zpxfqi8pqqj48g1wcib39lh3s7l4f"; + }) ]; + + propagatedBuildInputs = [ libgit2_0_27 six ] ++ lib.optional (!isPyPy) cffi; preCheck = '' # disable tests that require networking diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix new file mode 100644 index 00000000000..7d96f4d39bd --- /dev/null +++ b/pkgs/development/python-modules/pytesseract/default.nix @@ -0,0 +1,31 @@ +{ buildPythonPackage, fetchPypi, lib, pillow, tesseract, substituteAll }: + +buildPythonPackage rec { + pname = "pytesseract"; + version = "0.2.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0wlz1vbg1k8cdrpzvrahjnbsfs4ki6xqhbkv17ycfchh7h6kfkfm"; + }; + + patches = [ + (substituteAll { + src = ./tesseract-binary.patch; + drv = "${tesseract}"; + }) + ]; + + buildInputs = [ tesseract ]; + propagatedBuildInputs = [ pillow ]; + + # the package doesn't have any tests. + doCheck = false; + + meta = with lib; { + homepage = https://pypi.org/project/pytesseract/; + license = licenses.gpl3; + description = "A Python wrapper for Google Tesseract"; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/development/python-modules/pytesseract/tesseract-binary.patch b/pkgs/development/python-modules/pytesseract/tesseract-binary.patch new file mode 100644 index 00000000000..f7eb9fb1d42 --- /dev/null +++ b/pkgs/development/python-modules/pytesseract/tesseract-binary.patch @@ -0,0 +1,13 @@ +diff --git a/src/pytesseract.py b/src/pytesseract.py +index 32713cf..5f9209d 100755 +--- a/src/pytesseract.py ++++ b/src/pytesseract.py +@@ -25,7 +25,7 @@ if numpy_installed: + from numpy import ndarray + + # CHANGE THIS IF TESSERACT IS NOT IN YOUR PATH, OR IS NAMED DIFFERENTLY +-tesseract_cmd = 'tesseract' ++tesseract_cmd = '@drv@/bin/tesseract' + RGB_MODE = 'RGB' + OSD_KEYS = { + 'Page number': ('page_num', int), diff --git a/pkgs/development/python-modules/simanneal/default.nix b/pkgs/development/python-modules/simanneal/default.nix index d059d720f8b..ad1f2643e5f 100644 --- a/pkgs/development/python-modules/simanneal/default.nix +++ b/pkgs/development/python-modules/simanneal/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "simanneal"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "perrygeo"; repo = "simanneal"; rev = version; - sha256 = "12499wvf7ii7cy8z2f1d472p7q9napg1lj0h9xx8l1mbr1hjlp3q"; + sha256 = "0p75da4nbk6iy16aahl0ilqg605jrr6aa1pzfyd9hc7ak2vs6840"; }; checkInputs = [ pytest ]; diff --git a/pkgs/games/openarena/default.nix b/pkgs/games/openarena/default.nix index 212cd28d62c..8ac020f3ce0 100644 --- a/pkgs/games/openarena/default.nix +++ b/pkgs/games/openarena/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, makeWrapper, patchelf, pkgs, stdenv, SDL, libglvnd, libogg, libvorbis, curl }: +{ fetchurl, makeWrapper, patchelf, pkgs, stdenv, SDL, libglvnd, libogg, libvorbis, curl, openal }: stdenv.mkDerivation rec { name = "openarena-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { installPhase = let gameDir = "$out/openarena-$version"; interpreter = "$(< \"$NIX_CC/nix-support/dynamic-linker\")"; - libPath = stdenv.lib.makeLibraryPath [ SDL libglvnd libogg libvorbis curl ]; + libPath = stdenv.lib.makeLibraryPath [ SDL libglvnd libogg libvorbis curl openal ]; in '' mkdir -pv $out/bin cd $out diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 4045db5e5f2..dd397598c97 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, jansson +{ stdenv, lib, fetchurl, pkgconfig, jansson, pcre # plugins: list of strings, eg. [ "python2" "python3" ] , plugins , pam, withPAM ? false @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python3 pkgconfig ]; - buildInputs = [ jansson ] + buildInputs = [ jansson pcre ] ++ lib.optional withPAM pam ++ lib.optional withSystemd systemd ++ lib.concatMap (x: x.inputs) needed @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_LINK = [ "-lsystemd" ] ++ lib.concatMap (x: x.NIX_CFLAGS_LINK or []) needed; meta = with stdenv.lib; { - homepage = http://uwsgi-docs.readthedocs.org/en/latest/; + homepage = https://uwsgi-docs.readthedocs.org/en/latest/; description = "A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C"; license = licenses.gpl2; maintainers = with maintainers; [ abbradar schneefux ]; diff --git a/pkgs/test/nixos-functions/default.nix b/pkgs/test/nixos-functions/default.nix index c8f7122006f..6dee0a27a79 100644 --- a/pkgs/test/nixos-functions/default.nix +++ b/pkgs/test/nixos-functions/default.nix @@ -11,10 +11,17 @@ To run this test: */ { pkgs, lib, stdenv, ... }: -lib.optionalAttrs stdenv.hostPlatform.isLinux ( +let + dummyVersioning = { + revision = "test"; + versionSuffix = "test"; + label = "test"; + }; +in lib.optionalAttrs stdenv.hostPlatform.isLinux ( pkgs.recurseIntoAttrs { nixos-test = (pkgs.nixos { + system.nixos = dummyVersioning; boot.loader.grub.enable = false; fileSystems."/".device = "/dev/null"; }).toplevel; @@ -22,6 +29,7 @@ lib.optionalAttrs stdenv.hostPlatform.isLinux ( nixosTest-test = pkgs.nixosTest ({ lib, pkgs, ... }: { name = "nixosTest-test"; machine = { pkgs, ... }: { + system.nixos = dummyVersioning; environment.systemPackages = [ pkgs.hello ]; }; testScript = '' diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix index 4c565e91a4d..c5737554b77 100644 --- a/pkgs/tools/graphics/oxipng/default.nix +++ b/pkgs/tools/graphics/oxipng/default.nix @@ -1,26 +1,26 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - version = "2.1.0"; + version = "2.1.6"; name = "oxipng-${version}"; src = fetchFromGitHub { owner = "shssoichiro"; repo = "oxipng"; rev = "v${version}"; - sha256 = "13rzkfb025y4i9dj66fgc74whgs90gyw861dccsj16cpfl6kh5z0"; + sha256 = "0n3v2dxybfkf07hb4p2hbhhkwx907b85wzj8wa4whwil89igyrdm"; }; - cargoSha256 = "0l6ad8rnifd5hkv6x2cr0frdddsfwm1xd1v56imlglsjkgz56cva"; + cargoSha256 = "1ycacwhwbn27i81jpp55m1446b9a50knlqv0kzkjcv8yf27213y9"; meta = with stdenv.lib; { homepage = https://github.com/shssoichiro/oxipng; - description = "A lossless PNG compression optimizer"; + description = "A multithreaded lossless PNG compression optimizer"; license = licenses.mit; maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; - # macro is_arm_feature_detected! is unstable + # Needs newer/unstable rust: error[E0658]: macro is_arm_feature_detected! is unstable broken = stdenv.isAarch64; }; } diff --git a/pkgs/tools/misc/fpart/default.nix b/pkgs/tools/misc/fpart/default.nix index 394310e572d..f75dfec5e56 100644 --- a/pkgs/tools/misc/fpart/default.nix +++ b/pkgs/tools/misc/fpart/default.nix @@ -1,14 +1,18 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { name = "fpart-${version}"; - version = "1.0.0"; + version = "1.1.0"; - src = fetchurl { - url = "http://contribs.martymac.org/fpart/${name}.tar.gz"; - sha256 = "1p0ajmry18lcg82znfp8nxs4w3izic775l7df08hywlq4vfa66pg"; + src = fetchFromGitHub { + owner = "martymac"; + repo = "fpart"; + rev = name; + sha256 = "0h3mqc1xj5j2z8s8g3pvvpbjs6x74dj8niyh3p2ymla35kbzskf4"; }; + nativeBuildInputs = [ autoreconfHook ]; + postInstall = '' sed "s|^FPART_BIN=.*|FPART_BIN=\"$out/bin/fpart\"|" \ -i "$out/bin/fpsync" diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix new file mode 100644 index 00000000000..ce157f30cd0 --- /dev/null +++ b/pkgs/tools/misc/miniserve/default.nix @@ -0,0 +1,25 @@ +{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkgconfig, zlib }: + +rustPlatform.buildRustPackage rec { + name = "miniserve-${version}"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "svenstaro"; + repo = "miniserve"; + rev = "v${version}"; + sha256 = "1g8ggqs4fyscb1r98qj22f61jgkqnr4vdyps0drrvydl9lafdmpl"; + }; + + cargoSha256 = "18wyr0q5pkxds5hrl4g3mqmk46mr0nvs0id94aiw87729ly4vi8c"; + + nativeBuildInputs = [ cmake pkgconfig zlib ]; + + meta = with stdenv.lib; { + description = "For when you really just want to serve some files over HTTP right now!"; + homepage = https://github.com/svenstaro/miniserve; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ nequissimus ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/tools/security/duo-unix/default.nix index a76e88772bc..6394eec1b63 100644 --- a/pkgs/tools/security/duo-unix/default.nix +++ b/pkgs/tools/security/duo-unix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "duo-unix-${version}"; - version = "1.10.5"; + version = "1.11.0"; src = fetchurl { url = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz"; - sha256 = "1h88gwvbh8vwwga7d65iwa9qrmyx23wh5m0rmlv8qbx4fyj7q1f9"; + sha256 = "1i3dx7nim7xwlrjzcs9aqfyp87fangxqvhhpr16vpqklkz2zwmw4"; }; buildInputs = [ pam openssl zlib ]; diff --git a/pkgs/tools/virtualization/mininet/default.nix b/pkgs/tools/virtualization/mininet/default.nix new file mode 100644 index 00000000000..a2f4b165087 --- /dev/null +++ b/pkgs/tools/virtualization/mininet/default.nix @@ -0,0 +1,48 @@ +{ stdenv, lib, fetchFromGitHub +, which +, python +, help2man +}: + +let + pyEnv = python.withPackages(ps: [ ps.setuptools ]); +in +stdenv.mkDerivation rec { + name = "mininet-${version}"; + version = "2.3.0d4"; + + outputs = [ "out" "py" ]; + + src = fetchFromGitHub { + owner = "mininet"; + repo = "mininet"; + rev = version; + sha256 = "02hsqa7r5ykj8m1ycl32xwn1agjrw78wkq87xif0dl2vkzln41i4"; + }; + + buildFlags = [ "mnexec" ]; + makeFlags = [ "PREFIX=$(out)" ]; + + pythonPath = [ python.pkgs.setuptools ]; + buildInputs = [ python which help2man ]; + + installTargets = [ "install-mnexec" "install-manpages" ]; + + preInstall = '' + mkdir -p $out $py + # without --root, install fails + ${pyEnv.interpreter} setup.py install --root="/" --prefix=$py + ''; + + doCheck = false; + + + meta = with lib; { + description = "Emulator for rapid prototyping of Software Defined Networks"; + license = { + fullName = "Mininet 2.3.0d4 License"; + }; + homepage = https://github.com/mininet/mininet; + maintainers = with maintainers; [ teto ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81e0d6a43e3..9ad7474c5ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1520,6 +1520,8 @@ with pkgs; metabase = callPackage ../servers/metabase { }; + miniserve = callPackage ../tools/misc/miniserve { }; + mkspiffs = callPackage ../tools/filesystems/mkspiffs { }; mkspiffs-presets = recurseIntoAttrs (callPackages ../tools/filesystems/mkspiffs/presets.nix { }); @@ -11690,20 +11692,11 @@ with pkgs; inherit (callPackages ../development/libraries/openssl { fetchurl = fetchurlBoot; - cryptodevHeaders = linuxPackages.cryptodev.override { - fetchurl = fetchurlBoot; - onlyHeaders = true; - }; }) openssl_1_0_2 openssl_1_1; - openssl-chacha = callPackage ../development/libraries/openssl/chacha.nix { - cryptodevHeaders = linuxPackages.cryptodev.override { - fetchurl = fetchurlBoot; - onlyHeaders = true; - }; - }; + openssl-chacha = callPackage ../development/libraries/openssl/chacha.nix { }; opensubdiv = callPackage ../development/libraries/opensubdiv { cudaSupport = config.cudaSupport or false; @@ -14631,6 +14624,8 @@ with pkgs; buildLinux = attrs: callPackage ../os-specific/linux/kernel/generic.nix attrs; + cryptodev = linuxPackages_4_9.cryptodev; + dpdk = callPackage ../os-specific/linux/dpdk { kernel = null; # dpdk modules are in linuxPackages.dpdk.kmod }; @@ -17086,6 +17081,8 @@ with pkgs; manul = callPackage ../development/tools/manul { }; + mindforger = libsForQt5.callPackage ../applications/editors/mindforger { }; + mi2ly = callPackage ../applications/audio/mi2ly {}; moe = callPackage ../applications/editors/moe { }; @@ -18549,6 +18546,8 @@ with pkgs; pommed_light = callPackage ../os-specific/linux/pommed-light {}; + polymake = callPackage ../applications/science/math/polymake { }; + pond = callPackage ../applications/networking/instant-messengers/pond { }; ponymix = callPackage ../applications/audio/ponymix { }; @@ -19387,6 +19386,8 @@ with pkgs; transgui = callPackage ../applications/networking/p2p/transgui { }; + traverso = libsForQt5.callPackage ../applications/audio/traverso { }; + trayer = callPackage ../applications/window-managers/trayer { }; tree = callPackage ../tools/system/tree {}; @@ -20017,6 +20018,10 @@ with pkgs; inherit (gnome3) gsettings-desktop-schemas vte; }; + termonad-with-packages = callPackage ../applications/misc/termonad { + inherit (haskellPackages) ghcWithPackages; + }; + xtrace = callPackage ../tools/X11/xtrace { }; xmacro = callPackage ../tools/X11/xmacro { }; @@ -21736,6 +21741,8 @@ with pkgs; scotch = callPackage ../applications/science/math/scotch { }; + mininet = callPackage ../tools/virtualization/mininet { }; + msieve = callPackage ../applications/science/math/msieve { }; weka = callPackage ../applications/science/math/weka { }; @@ -21773,6 +21780,8 @@ with pkgs; megam = callPackage ../applications/science/misc/megam { }; + netlogo = callPackage ../applications/science/misc/netlogo { }; + ns-3 = callPackage ../development/libraries/science/networking/ns3 { }; root = callPackage ../applications/science/misc/root { @@ -22856,6 +22865,8 @@ with pkgs; zimg = callPackage ../development/libraries/zimg { }; + wtf = callPackage ../applications/misc/wtf { }; + zk-shell = callPackage ../applications/misc/zk-shell { }; zuki-themes = callPackage ../misc/themes/zuki { }; diff --git a/pkgs/top-level/metrics.nix b/pkgs/top-level/metrics.nix index 77f620da724..a199f61020c 100644 --- a/pkgs/top-level/metrics.nix +++ b/pkgs/top-level/metrics.nix @@ -49,6 +49,9 @@ runCommand "nixpkgs-metrics" run nix-env.qa nix-env -f ${nixpkgs} -qa run nix-env.qaDrv nix-env -f ${nixpkgs} -qa --drv-path --meta --xml + num=$(nix-env -f ${nixpkgs} -qa | wc -l) + echo "nix-env.qaCount $num" >> $out/nix-support/hydra-metrics + export GC_INITIAL_HEAP_SIZE=128k run nix-env.qaAggressive nix-env -f ${nixpkgs} -qa run nix-env.qaDrvAggressive nix-env -f ${nixpkgs} -qa --drv-path --meta --xml diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9019e28b724..f1f3021d79b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -422,6 +422,8 @@ in { monty = callPackage ../development/python-modules/monty { }; + mininet-python = (toPythonModule (pkgs.mininet.override{ inherit python; })).py; + mpi4py = callPackage ../development/python-modules/mpi4py { mpi = pkgs.openmpi; }; @@ -607,6 +609,8 @@ in { pystache = callPackage ../development/python-modules/pystache { }; + pytesseract = callPackage ../development/python-modules/pytesseract { }; + pytest-tornado = callPackage ../development/python-modules/pytest-tornado { }; python-binance = callPackage ../development/python-modules/python-binance { }; |