From b8ae6b12f822a84f580806834e7610ec21513402 Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Thu, 19 Sep 2019 22:57:20 +0000 Subject: [PATCH 001/142] netbeans: 11.0 -> 11.1 --- pkgs/applications/editors/netbeans/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index ba01304f723a..9185fbd54a60 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -3,7 +3,7 @@ }: let - version = "11.0"; + version = "11.1"; desktopItem = makeDesktopItem { name = "netbeans"; exec = "netbeans"; @@ -18,8 +18,8 @@ stdenv.mkDerivation { pname = "netbeans"; inherit version; src = fetchurl { - url = "mirror://apache/incubator/netbeans/incubating-netbeans/incubating-${version}/incubating-netbeans-${version}-bin.zip"; - sha512 = "15mv59njrnq3sjfzb0n7xcc79kpixygf37cxvbswnvm651cw6lb1i9w8wbjivh0z4zcf3f62vbmshxh5pkaxqpqsg0iyy6gddfbwzwx"; + url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip"; + sha512 = "bb061b9258d524b7b53b3b5ee9aa95111f7a391a5e2c5c0bc949164166af9a03d0cebbde2b47a8853fb765307b4c93ce8389a9c87bef26c92c08cdf446314e4d"; }; buildCommand = '' @@ -48,7 +48,7 @@ stdenv.mkDerivation { convert -resize "$size"x"$size" netbeans_1024x1024x32.png $out/share/icons/hicolor/"$size"x"$size"/apps/netbeans.png fi done; - + # Create desktop item, so we can pick it from the KDE/GNOME menu mkdir -pv $out/share/applications ln -s ${desktopItem}/share/applications/* $out/share/applications From 3954ddd33ba4a34019763ff8cd4c49fd41a5328c Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Thu, 19 Sep 2019 23:05:19 +0000 Subject: [PATCH 002/142] netbeans: added camel case syntax and added Apache prefix for `desktopName` --- pkgs/applications/editors/netbeans/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index 9185fbd54a60..0b557a216841 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -8,7 +8,7 @@ let name = "netbeans"; exec = "netbeans"; comment = "Integrated Development Environment"; - desktopName = "Netbeans IDE"; + desktopName = "Apache NetBeans IDE"; genericName = "Integrated Development Environment"; categories = "Application;Development;"; icon = "netbeans"; From 1aef41c87697a29cd43d8e936c6726a0d492244f Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Thu, 19 Sep 2019 23:15:28 +0000 Subject: [PATCH 003/142] netbeans: changed hompage url to netbeans space hosted on apache network --- pkgs/applications/editors/netbeans/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index 0b557a216841..38b92151b29f 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation { meta = { description = "An integrated development environment for Java, C, C++ and PHP"; - homepage = "https://netbeans.org/"; + homepage = "https://netbeans.apache.org/"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ sander rszibele ]; platforms = stdenv.lib.platforms.unix; From eb1cd0d27d42f5a3d969a5a87330d1322812b09c Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Fri, 4 Oct 2019 14:12:07 +0200 Subject: [PATCH 004/142] qscintilla: Fix qt4 build --- pkgs/development/libraries/qscintilla/default.nix | 4 ++-- .../libraries/qscintilla/fix-qt4-build.patch | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/qscintilla/fix-qt4-build.patch diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index 33e57a682b97..a8be20b73b12 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -32,7 +32,8 @@ in stdenv.mkDerivation rec { ++ (if withQt5 then [ qmake ] else [ qmake4Hook ]) ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - patches = lib.optional (stdenv.isDarwin && withQt5) [ xcodePatch ]; + patches = (lib.optional (stdenv.isDarwin && withQt5) xcodePatch) ++ + (lib.optional (!withQt5) ./fix-qt4-build.patch ); # Make sure that libqscintilla2.so is available in $out/lib since it is expected # by some packages such as sqlitebrowser @@ -72,6 +73,5 @@ in stdenv.mkDerivation rec { license = with licenses; [ gpl2 gpl3 ]; # and commercial maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; - broken = !withQt5; }; } diff --git a/pkgs/development/libraries/qscintilla/fix-qt4-build.patch b/pkgs/development/libraries/qscintilla/fix-qt4-build.patch new file mode 100644 index 000000000000..520a55b1ea21 --- /dev/null +++ b/pkgs/development/libraries/qscintilla/fix-qt4-build.patch @@ -0,0 +1,11 @@ +diff -ur QScintilla_gpl-2.11.2/Qt4Qt5/Qsci/qsciscintillabase.h QScintilla_gpl-2.11.2-fix/Qt4Qt5/Qsci/qsciscintillabase.h +--- Qt4Qt5/Qsci/qsciscintillabase.h 2019-06-25 14:49:27.000000000 +0200 ++++ Qt4Qt5-fix/Qsci/qsciscintillabase.h 2019-10-04 10:22:26.337474261 +0200 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + #include + From 68bae316eb5869ca781bba37f4d4ea025cee093c Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Fri, 4 Oct 2019 13:24:43 +0200 Subject: [PATCH 005/142] perlPackages.CSSMinifierXS: rename from perlPackages.CSSMinifierXP The attribute CSS::Minifier::XS module was likely misnamed, this commit changes the attribute name from CSSMinifierXP to CSSMinifierXS. Affected dependency: servers/rt --- pkgs/servers/rt/default.nix | 2 +- pkgs/top-level/perl-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/rt/default.nix b/pkgs/servers/rt/default.nix index 4d8ead30add6..b4400215dd01 100644 --- a/pkgs/servers/rt/default.nix +++ b/pkgs/servers/rt/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { name = "rt-perl-deps"; paths = (with perlPackages; [ ApacheSession BusinessHours CGIEmulatePSGI CGIPSGI - CSSMinifierXP CSSSquish ConvertColor CryptEksblowfish + CSSMinifierXS CSSSquish ConvertColor CryptEksblowfish CryptSSLeay DBDSQLite DBDmysql DBIxSearchBuilder DataGUID DataICal DataPagePageset DateExtract DateManip DateTimeFormatNatural DevelGlobalDestruction EmailAddress diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index eabcff964b9f..dd39e60691b8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3517,7 +3517,7 @@ let propagatedBuildInputs = [ Clone ]; }; - CSSMinifierXP = buildPerlModule { + CSSMinifierXS = buildPerlModule { pname = "CSS-Minifier-XS"; version = "0.09"; src = fetchurl { From f403291206b880d262ac000ee96ed5aca79e5db5 Mon Sep 17 00:00:00 2001 From: Sam Doshi Date: Wed, 9 Oct 2019 07:34:00 +0100 Subject: [PATCH 006/142] picard: 2.2.1 -> 2.2.2 --- pkgs/applications/audio/picard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index f6eee17f834a..dc1118f47e04 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -4,13 +4,13 @@ let pythonPackages = python3Packages; in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; rev = "release-${version}"; - sha256 = "1g7pbicf65hswbqmhrwlba9jm4r2vnggy7vy75z4256y7qcpwdfd"; + sha256 = "1iibkvwpj862wcrl0fmyi6qhcgx4q5ay63yr0zyg0bkqgcka0gpr"; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]; From 407f51384f42773d2c0198acb23476dd385d3321 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 12 Oct 2019 02:03:46 +0200 Subject: [PATCH 007/142] mlarchive2maildir: 0.0.6 -> 0.0.8 --- .../networking/mailreaders/mlarchive2maildir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix index 7019c309feb9..2fb30e5ae6ad 100644 --- a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix +++ b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "mlarchive2maildir"; - version = "0.0.6"; + version = "0.0.8"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "025mv890zsk25cral9cas3qgqdsszh5025khz473zs36innjd0mw"; + sha256 = "1din3yay2sas85178v0xr0hbm2396y4dalkcqql1ny9vdm94h6sp"; }; nativeBuildInputs = with python3.pkgs; [ setuptools_scm ]; From a24e9b6787fc2fc3d46a3846e555d667ada40f7d Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Wed, 9 Oct 2019 12:00:00 +0000 Subject: [PATCH 008/142] system-config-printer: 1.5.11 -> 1.5.12 Source for the change of upstream url: * zdohnal/system-config-printer is a fork of OpenPrinting/system-config-printer * This is what fedora did: https://apps.fedoraproject.org/packages/system-config-printer/sources/spec/ (see changelog for 1.5.11-17) --- .../misc/system-config-printer/default.nix | 49 ++++++++++--------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 1b949108c54a..e9ee91de6776 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -1,47 +1,56 @@ -{ stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook +{ stdenv, fetchFromGitHub, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook , docbook_xml_dtd_412, docbook_xsl , libxml2, desktop-file-utils, libusb1, cups, gdk-pixbuf, pango, atk, libnotify -, gobject-introspection, libsecret +, gobject-introspection, libsecret, packagekit , cups-filters -, pythonPackages +, python3Packages, autoreconfHook, bash }: stdenv.mkDerivation rec { pname = "system-config-printer"; - version = "1.5.11"; + version = "1.5.12"; - src = fetchurl { - url = "https://github.com/zdohnal/system-config-printer/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "1lq0q51bhanirpjjvvh4xiafi8hgpk8r32h0dj6dn3f32z8pib9q"; + src = fetchFromGitHub { + owner = "openPrinting"; + repo = pname; + rev = version; + sha256 = "1a812jsd9pb02jbz9bq16qj5j6k2kw44g7s1xdqqkg7061rd7mwf"; }; + prePatch = '' + # for automake + touch README ChangeLog + # for tests + substituteInPlace Makefile.am --replace /bin/bash ${bash}/bin/bash + ''; + patches = [ ./detect_serverbindir.patch ]; buildInputs = [ glib udev libusb1 cups - pythonPackages.python - libnotify gobject-introspection gdk-pixbuf pango atk + python3Packages.python + libnotify gobject-introspection gdk-pixbuf pango atk packagekit libsecret ]; nativeBuildInputs = [ intltool pkgconfig xmlto libxml2 docbook_xml_dtd_412 docbook_xsl desktop-file-utils - pythonPackages.wrapPython - wrapGAppsHook + python3Packages.wrapPython + wrapGAppsHook autoreconfHook ]; - pythonPath = with pythonPackages; requiredPythonModules [ pycups pycurl dbus-python pygobject3 requests pycairo pysmbc ]; + pythonPath = with python3Packages; requiredPythonModules [ pycups pycurl dbus-python pygobject3 requests pycairo pysmbc ]; configureFlags = [ "--with-udev-rules" - "--with-udevdir=$(out)/etc/udev" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--with-udevdir=${placeholder "out"}/etc/udev" + "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" ]; stripDebugList = [ "bin" "lib" "etc/udev" ]; - doCheck = false; # generates shebangs in check phase, too lazy to fix + doCheck = true; postInstall = '' @@ -54,20 +63,14 @@ stdenv.mkDerivation rec { find $out/share/system-config-printer -name \*.py -type f -perm -0100 -print0 | while read -d "" f; do patchPythonScript "$f" done - - # The below line will be unneeded when the next upstream release arrives. - sed -i -e "s|/usr/local/bin|$out/bin|" "$out/share/dbus-1/services/org.fedoraproject.Config.Printing.service" - - # Manually expand literal "$(out)", which have failed to expand - sed -e "s|ExecStart=\$(out)|ExecStart=$out|" \ - -i "$out/etc/systemd/system/configure-printer@.service" + patchPythonScript $out/etc/udev/udev-add-printer substituteInPlace $out/etc/udev/rules.d/70-printers.rules \ --replace "udev-configure-printer" "$out/etc/udev/udev-configure-printer" ''; meta = { - homepage = http://cyberelk.net/tim/software/system-config-printer/; + homepage = "https://github.com/openprinting/system-config-printer"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a27f73a16c9..5bbe3a7737bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6367,7 +6367,6 @@ in system-config-printer = callPackage ../tools/misc/system-config-printer { libxml2 = libxml2Python; - pythonPackages = python3Packages; }; stricat = callPackage ../tools/security/stricat { }; From 172950661f59a16d3af17a41efff0aa33e26d666 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 12 Oct 2019 12:00:00 +0000 Subject: [PATCH 009/142] nixos/system-config-printer: depends on packagekit --- nixos/modules/services/desktops/system-config-printer.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/desktops/system-config-printer.nix b/nixos/modules/services/desktops/system-config-printer.nix index 8a80be266b20..09c68c587b43 100644 --- a/nixos/modules/services/desktops/system-config-printer.nix +++ b/nixos/modules/services/desktops/system-config-printer.nix @@ -33,6 +33,9 @@ with lib; pkgs.system-config-printer ]; + # for $out/bin/install-printer-driver + services.packagekit.enable = true; + }; } From d849c213ba82eb4890c6ebec5e2d1be1591cfb4d Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Sun, 13 Oct 2019 11:58:00 +0200 Subject: [PATCH 010/142] betaflight-configurator: 10.5.1 -> 10.6.0 --- .../betaflight-configurator/default.nix | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix index 6449e966959b..31295114375d 100644 --- a/pkgs/applications/science/robotics/betaflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix @@ -1,22 +1,22 @@ {stdenv, fetchurl, unzip, makeDesktopItem, nwjs, wrapGAppsHook, gsettings-desktop-schemas, gtk3 }: let - strippedName = "betaflight-configurator"; + pname = "betaflight-configurator"; desktopItem = makeDesktopItem { - name = strippedName; - exec = strippedName; - icon = "${strippedName}-icon.png"; + name = pname; + exec = pname; + icon = pname; comment = "Betaflight configuration tool"; desktopName = "Betaflight Configurator"; genericName = "Flight controller configuration tool"; }; in stdenv.mkDerivation rec { - name = "${strippedName}-${version}"; - version = "10.5.1"; + inherit pname; + version = "10.6.0"; src = fetchurl { - url = "https://github.com/betaflight/betaflight-configurator/releases/download/${version}/${strippedName}_${version}_linux64.zip"; - sha256 = "1l4blqgaqfrnydk05q6pwdqdhcly2f8nwzrv0749cqmfiinh8ygc"; + url = "https://github.com/betaflight/${pname}/releases/download/${version}/${pname}_${version}_linux64.zip"; + sha256 = "09hayzhwangh8b81r038p320vbg0xxlyzrdp9pcmfyxp6s00xslw"; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -25,14 +25,13 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin \ - $out/opt/${strippedName} \ - $out/share/icons + $out/opt/${pname} - cp -r . $out/opt/${strippedName}/ - cp icon/*_icon_128.png $out/share/icons/${strippedName}-icon.png + cp -r . $out/opt/${pname}/ + install -m 444 -D icon/bf_icon_128.png $out/share/icons/hicolor/128x128/apps/${pname}.png cp -r ${desktopItem}/share/applications $out/share/ - makeWrapper ${nwjs}/bin/nw $out/bin/${strippedName} --add-flags $out/opt/${strippedName} + makeWrapper ${nwjs}/bin/nw $out/bin/${pname} --add-flags $out/opt/${pname} ''; meta = with stdenv.lib; { From 1263a712fff1be63be349b2dfe728b08dbf516dc Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 14 Oct 2019 15:24:54 -0500 Subject: [PATCH 011/142] musl: 1.1.2x -> 1.1.24 https://www.openwall.com/lists/musl/2019/10/13/5 Apparently 1.1.23 never made it to nixpkgs proper (?!), see: https://git.musl-libc.org/cgit/musl/commit/?id=b07d45eb01e900f0176894fdedab62285f5cb8be (sorry I apparently dropped the ball here) --- pkgs/os-specific/linux/musl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 91e1ae36f709..842b68c86538 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { pname = "musl"; - version = "1.1.22"; + version = "1.1.24"; src = fetchurl { url = "https://www.musl-libc.org/releases/${pname}-${version}.tar.gz"; - sha256 = "1qr9xqdzziy5bsyyqlh6k8yz056ll55d5yvc0gbhz61ginj422cb"; + sha256 = "18r2a00k82hz0mqdvgm7crzc7305l36109c0j9yjmkxj2alcjw0k"; }; enableParallelBuilding = true; From 1e746cae1e053b5d9a40caa20c2155da05d3d4a9 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 14 Oct 2019 18:51:51 -0500 Subject: [PATCH 012/142] musl: touchup meta, add myself (@dtzWill) to maintainers list --- pkgs/os-specific/linux/musl/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 842b68c86538..93e9ba614f88 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -110,11 +110,11 @@ stdenv.mkDerivation rec { passthru.linuxHeaders = linuxHeaders; - meta = { + meta = with lib; { description = "An efficient, small, quality libc implementation"; homepage = "http://www.musl-libc.org"; - license = lib.licenses.mit; - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.thoughtpolice ]; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ thoughtpolice dtzWill ]; }; } From 8479d2b54d7a0c3c0da3030e846355b3bec4c493 Mon Sep 17 00:00:00 2001 From: MicrosoftTakeover <49256525+MicrosoftTakeover@users.noreply.github.com> Date: Wed, 16 Oct 2019 13:41:14 -0700 Subject: [PATCH 013/142] minetest 5.0.1 -> 5.1.0 --- pkgs/games/minetest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 52a911655373..0f457cc688ba 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -73,9 +73,9 @@ let }; v5 = { - version = "5.0.1"; - sha256 = "11i8fqjpdggqfdlx440k5758zy0nbf9phxan9r63mavc7mph88ay"; - dataSha256 = "1hw3n7qqpasq6bivxhq01kr0d58w0gp46s0baxixp1fakd79p8a7"; + version = "5.1.0"; + sha256 = "184n9gxfa7yr0j85z2x736maaymsnppd5jzm326wlqri3c0qqy3z"; + dataSha256 = "1r9fxz2j24q74a9injvbxbf2xk67fzabv616i676zw2cvgv9hn39"; }; in { From 91a86cbd0c8408059e72d59836c79570b658fd46 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 16 Oct 2019 21:55:35 -0400 Subject: [PATCH 014/142] nss-pam-ldapd: 0.9.10 -> 0.9.11 --- pkgs/tools/networking/nss-pam-ldapd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix index dc921dc495af..569a6d118e77 100644 --- a/pkgs/tools/networking/nss-pam-ldapd/default.nix +++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "nss-pam-ldapd"; - version = "0.9.10"; + version = "0.9.11"; src = fetchurl { url = "https://arthurdejong.org/nss-pam-ldapd/${pname}-${version}.tar.gz"; - sha256 = "1cqamcr6qpgwxijlr6kg7jspjamjra8w0haan0qssn0yxn95d7c0"; + sha256 = "1dna3r0q6sjhhlkhcp8x2zkslrd4y7701kk6fl5r940sdph1pmyh"; }; nativeBuildInputs = [ pkgconfig makeWrapper autoreconfHook ]; From ab9fd67b68d6db6de04a6a9643f2d4b8969b23a2 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 17 Oct 2019 19:03:19 +0300 Subject: [PATCH 015/142] awesome: Make sure it compiles with luajit --- .../applications/window-managers/awesome/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 2551ea80550e..b8f31e5b512a 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -12,7 +12,10 @@ # needed for beautiful.gtk to work assert gtk3Support -> gtk3 != null; -with luaPackages; stdenv.mkDerivation rec { +stdenv.mkDerivation rec { + lgi = luaPackages.lgi; + lua = luaPackages.lua; + ldoc = luaPackages.ldoc; pname = "awesome"; version = "4.3"; @@ -49,8 +52,11 @@ with luaPackages; stdenv.mkDerivation rec { xcbutilxrm ] ++ stdenv.lib.optional gtk3Support gtk3; - #cmakeFlags = "-DGENERATE_MANPAGES=ON"; - cmakeFlags = "-DOVERRIDE_VERSION=${version}"; + cmakeFlags = [ + #"-DGENERATE_MANPAGES=ON" + "-DOVERRIDE_VERSION=${version}" + ] ++ stdenv.lib.optional luaPackages.isLuaJIT "-DLUA_LIBRARY=${lua}/lib/libluajit-5.1.so" + ; GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0"; # LUA_CPATH and LUA_PATH are used only for *building*, see the --search flags From a9de4a3a09a0c5f0fe1f75ab707c3fa65ddd4c00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 14 Oct 2019 23:54:55 -0300 Subject: [PATCH 016/142] lxqt.lxqt-globalkeys: 0.14.1 -> 0.14.3 --- pkgs/desktops/lxqt/lxqt-globalkeys/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix index d836ddeea38f..43db6b39c674 100644 --- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix +++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "lxqt-globalkeys"; - version = "0.14.1"; + version = "0.14.3"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0q7hfbs4dhsgyzch2msq2hsfzzfgbc611ki9x1x132n7zqk76pmp"; + sha256 = "1ij9abjnqbnkcb7qqk3x7y4amr6l7kkmwhdpc0x2qk4yikn5ijdg"; }; nativeBuildInputs = [ @@ -27,7 +27,7 @@ mkDerivation rec { ]; meta = with lib; { - description = "Daemon used to register global keyboard shortcuts"; + description = "LXQt service for global keyboard shortcuts registration"; homepage = https://github.com/lxqt/lxqt-globalkeys; license = licenses.lgpl21; platforms = with platforms; unix; From bb0a4bf05dd8f0408d2c2411e6d6f5a6e57e7988 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 17 Oct 2019 20:00:00 -0500 Subject: [PATCH 017/142] terraform: 0.12.10 -> 0.12.12 Changelog: + https://github.com/hashicorp/terraform/releases/tag/v0.12.11 + https://github.com/hashicorp/terraform/releases/tag/v0.12.12 --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index e0bc882c4221..e3a5d1e36650 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -97,8 +97,8 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.10"; - sha256 = "0bmqcmzjsrpvvnd9pn40f774c8jy6j810qz0njxqh60yh27f5rhx"; + version = "0.12.12"; + sha256 = "04qvzbm33ngkbkh45jbcv06c9s1lkgjk39sxvfxw7y6ygxzsrqq5"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); From dd78c00970ec6cc895c73537d2ae1dc03b92335d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 17 Oct 2019 20:01:00 -0500 Subject: [PATCH 018/142] terraform: add marsam as maintainer --- pkgs/applications/networking/cluster/terraform/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index e3a5d1e36650..5d4a60b4c6bc 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -43,7 +43,7 @@ let description = "Tool for building, changing, and versioning infrastructure"; homepage = https://www.terraform.io/; license = licenses.mpl20; - maintainers = with maintainers; [ zimbatm peterhoeg kalbasit ]; + maintainers = with maintainers; [ zimbatm peterhoeg kalbasit marsam ]; }; } // attrs'); From 0f93c22626a675ddfe987b5d4f1680d404305f97 Mon Sep 17 00:00:00 2001 From: edef Date: Wed, 9 Oct 2019 11:42:00 +0000 Subject: [PATCH 019/142] plover.stable: add missing dbus dependency --- pkgs/applications/misc/plover/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index 8021ffdc8f51..d8b9ae7add58 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -19,7 +19,7 @@ nativeBuildInputs = [ setuptools_scm ]; buildInputs = [ pytest mock ]; propagatedBuildInputs = [ - six setuptools pyserial appdirs hidapi wxPython xlib wmctrl + six setuptools pyserial appdirs hidapi wxPython xlib wmctrl dbus-python ]; }; From b954169efc28a80d8b153781e8da602078c39b12 Mon Sep 17 00:00:00 2001 From: edef Date: Wed, 9 Oct 2019 11:55:49 +0000 Subject: [PATCH 020/142] plover.dev: add missing setuptools dependency Without this, it crashes instantly at startup looking for pkg_resources. --- pkgs/applications/misc/plover/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index d8b9ae7add58..f7019d1eea82 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -43,6 +43,6 @@ postPatch = "sed -i /PyQt5/d setup.cfg"; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ Babel pyqt5 xlib pyserial appdirs wcwidth ]; + propagatedBuildInputs = [ Babel pyqt5 xlib pyserial appdirs wcwidth setuptools ]; }; } From a68219b79bf9f6cd84d443b0eb94f38287c19cd4 Mon Sep 17 00:00:00 2001 From: edef Date: Tue, 8 Oct 2019 06:53:53 +0000 Subject: [PATCH 021/142] nixos/nix-daemon: don't refer to deprecated option aliases The `gc-` prefixed versions of these options have been deprecated since Nix 2.0. --- .../modules/services/continuous-integration/hydra/default.nix | 4 ++-- nixos/modules/services/misc/nix-daemon.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index 2da10a9a5e2a..30c5550f71c5 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -242,8 +242,8 @@ in environment.variables = hydraEnv; nix.extraOptions = '' - gc-keep-outputs = true - gc-keep-derivations = true + keep-outputs = true + keep-derivations = true # The default (`true') slows Nix down a lot since the build farm # has so many GC roots. diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index ff4e4f5b97d5..c1754c0e0ecb 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -152,8 +152,8 @@ in type = types.lines; default = ""; example = '' - gc-keep-outputs = true - gc-keep-derivations = true + keep-outputs = true + keep-derivations = true ''; description = "Additional text appended to nix.conf."; }; From 29f4fd41d23c4b0571818e92ed6bcda283fcb051 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 19 Oct 2019 01:15:21 +0800 Subject: [PATCH 022/142] emacsPackages.evil-escape: fix build --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 838e57343c43..374dfb411e77 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -85,6 +85,15 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac stripDebugList = [ "share" ]; }); + # https://github.com/syl20bnr/evil-escape/pull/86 + evil-escape = super.evil-escape.overrideAttrs (attrs: { + postPatch = '' + substituteInPlace evil-escape.el \ + --replace ' ;;; evil' ';;; evil' + ''; + packageRequires = with self; [ evil ]; + }); + evil-magit = super.evil-magit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = From 327d406f037d195618569f50bc0b19f1eca49bf5 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Fri, 18 Oct 2019 19:05:35 -0400 Subject: [PATCH 023/142] wordpress: 5.2.3 -> 5.2.4 --- pkgs/servers/web-apps/wordpress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 9dbf060aa9a7..0cf16f177912 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wordpress"; - version = "5.2.3"; + version = "5.2.4"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "07gqdzhnqivyfah386lwyz984y9k2bc0hmji1y2pbvv0a60r63wr"; + sha256 = "1vf5220rw37sxvzy6yxn636ip2lx4bkc84z7q8rdwcs2wkv6md1p"; }; installPhase = '' From 4fc18fb52f5d90a081a63a7edc13e089b45816c4 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Tue, 15 Oct 2019 00:52:34 +0200 Subject: [PATCH 024/142] perlPackages.MojoliciousPluginMail: init at 1.5 dependencies: perlPackages.MIMEEncWords: init at 1.014.3 --- pkgs/top-level/perl-packages.nix | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bb6c7b31d0ff..4f120ee27905 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10905,6 +10905,22 @@ let buildInputs = [ ProcWaitStat ]; }; + MIMEEncWords = buildPerlPackage { + pname = "MIME-EncWords"; + version = "1.014.3"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NE/NEZUMI/MIME-EncWords-1.014.3.tar.gz"; + sha256 = "e9afb548611d4e7e6c50b7f06bbd2b1bb2808e37a810deefb537c67af5485238"; + }; + propagatedBuildInputs = [ MIMECharset ]; + meta = { + homepage = "https://metacpan.org/pod/MIME::EncWords"; + description = "Deal with RFC 2047 encoded words (improved)"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + MIMELite = buildPerlPackage { pname = "MIME-Lite"; version = "3.030"; @@ -11444,6 +11460,22 @@ let }; }; + MojoliciousPluginMail = buildPerlModule { + pname = "Mojolicious-Plugin-Mail"; + version = "1.5"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHARIFULN/Mojolicious-Plugin-Mail-1.5.tar.gz"; + sha256 = "56f0d341ebc3a7acf3919f5add43e98216ea1285aa0d87e7fb00c02bb0eff146"; + }; + propagatedBuildInputs = [ MIMEEncWords MIMELite Mojolicious ]; + meta = { + homepage = "https://github.com/sharifulin/Mojolicious-Plugin-Mail"; + description = "Mojolicious Plugin for send mail"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + MojoliciousPluginStatus = buildPerlPackage { pname = "Mojolicious-Plugin-Status"; version = "1.0"; From fb89b3c07a111846e230f0ca7e13fa20d9cb99d0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 19 Oct 2019 04:20:00 -0500 Subject: [PATCH 025/142] rclone: 1.49.4 -> 1.49.5 Changelog: https://forum.rclone.org/t/rclone-1-49-5-release/12166 --- pkgs/applications/networking/sync/rclone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index bc26541f4d7c..7475692b962c 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "rclone"; - version = "1.49.4"; + version = "1.49.5"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "04fa85ch85dxm2nq7vqria34zn6fbgvky7p1i59j1wib753jpxyp"; + sha256 = "0firfb2300grfp5fnqaifhp346m4d0x8r1xshs9d8r6jxb160n03"; }; goPackagePath = "github.com/rclone/rclone"; From 152e9882c4723a13e43c383eda294eb6e7c85ccc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 19 Oct 2019 04:20:00 -0500 Subject: [PATCH 026/142] bazelisk: 1.0 -> 1.1.0 Changelog: https://github.com/bazelbuild/bazelisk/releases/tag/v1.1.0 --- pkgs/development/tools/bazelisk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index 6c0532eac48d..15303c2c87fa 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "0516rx3qx6nxavy0a1qxjx2rcvdfb2ggig0q4n7fkmrxbnwxh2c9"; + sha256 = "1pv113sk7hfxp4m2rcriqqp6mbbzcfdr0yrx4g1yiam93rx34yb7"; }; - modSha256 = "1f73j6ryidzi3kfy3rhsqx047vzwvzaqcsl7ykhg87rn2l2s7fdl"; + modSha256 = "0gs8y618izqi0gfa46jqh79yj8lzsmc6yj95fakhp2f5i8v1xrmx"; meta = with stdenv.lib; { description = "A user-friendly launcher for Bazel"; From 3b0bc6354a5242eb36bdb85e2d74dc10b4c7e4f1 Mon Sep 17 00:00:00 2001 From: edef Date: Sat, 19 Oct 2019 09:44:27 +0000 Subject: [PATCH 027/142] plover.dev: apply the Qt wrapper Without this, it crashes instantly at startup looking for the Qt xcb plugin. Co-authored-by: Kovacsics Robert --- pkgs/applications/misc/plover/default.nix | 10 ++++++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index f7019d1eea82..77e93eaba7e9 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, python27Packages, python36Packages, wmctrl }: +{ stdenv, fetchurl, python27Packages, python36Packages, wmctrl, + qtbase, mkDerivationWith }: { stable = with python27Packages; buildPythonPackage rec { @@ -23,7 +24,7 @@ ]; }; - dev = with python36Packages; buildPythonPackage rec { + dev = with python36Packages; mkDerivationWith buildPythonPackage rec { pname = "plover"; version = "4.0.0.dev8"; @@ -44,5 +45,10 @@ checkInputs = [ pytest mock ]; propagatedBuildInputs = [ Babel pyqt5 xlib pyserial appdirs wcwidth setuptools ]; + + dontWrapQtApps = true; + makeWrapperArgs = [ + "\${qtWrapperArgs[@]}" + ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e239164a5c45..324f62e84b58 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20285,7 +20285,7 @@ in plex-media-player = libsForQt59.callPackage ../applications/video/plex-media-player { }; - plover = recurseIntoAttrs (callPackage ../applications/misc/plover { }); + plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { }); plugin-torture = callPackage ../applications/audio/plugin-torture { }; From b36ee87814496158d11471fd904e4b51e54c5087 Mon Sep 17 00:00:00 2001 From: Dima Date: Sat, 19 Oct 2019 15:39:09 +0200 Subject: [PATCH 028/142] docker-runc: switch to OCI runc 1.0.0-rc8+dev The revision picked is based on https://github.com/docker/docker-ce/blob/19.03/components/engine/hack/dockerfile/install/runc.installer and https://github.com/docker/docker-ce/blob/18.09/components/engine/hack/dockerfile/install/runc.installer This should address CVE-2019-16884. --- pkgs/applications/virtualization/docker/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 027404439cd5..9902ae2140c4 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -19,7 +19,7 @@ rec { name = "docker-runc-${version}"; inherit version; src = fetchFromGitHub { - owner = "docker"; + owner = "opencontainers"; repo = "runc"; rev = runcRev; sha256 = runcSha256; @@ -198,14 +198,14 @@ rec { }); # Get revisions from - # https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/* + # https://github.com/docker/docker-ce/tree/${version}/components/engine/hack/dockerfile/install/* docker_18_09 = makeOverridable dockerGen { version = "18.09.9"; rev = "039a7df9ba8097dd987370782fcdd6ea79b26016"; sha256 = "0wqhjx9qs96q2jd091wffn3cyv2aslqn2cvpdpgljk8yr9s0yg7h"; - runcRev = "425e105d5a03fabd737a126ad93d62a9eeede87f"; - runcSha256 = "05s4p12mgmdcy7gjralh41wlgds6m69zdgwbpdn1xjj2487dmhxf"; + runcRev = "3e425f80a8c931f88e6d94a8c831b9d5aa481657"; + runcSha256 = "18psc830b2rkwml1x6vxngam5b5wi3pj14mw817rshpzy87prspj"; containerdRev = "894b81a4b802e4eb2a91d1ce216b8817763c29fb"; containerdSha256 = "0sp5mn5wd3xma4svm6hf67hyhiixzkzz6ijhyjkwdrc4alk81357"; tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; @@ -216,8 +216,8 @@ rec { version = "19.03.2"; rev = "6a30dfca03664a0b6bf0646a7d389ee7d0318e6e"; sha256 = "0bghqwxlx4v06bwcv3c2wizbihhf983gvypx5sjcbgmiyd3bgb47"; - runcRev = "425e105d5a03fabd737a126ad93d62a9eeede87f"; - runcSha256 = "05s4p12mgmdcy7gjralh41wlgds6m69zdgwbpdn1xjj2487dmhxf"; + runcRev = "3e425f80a8c931f88e6d94a8c831b9d5aa481657"; + runcSha256 = "18psc830b2rkwml1x6vxngam5b5wi3pj14mw817rshpzy87prspj"; containerdRev = "894b81a4b802e4eb2a91d1ce216b8817763c29fb"; containerdSha256 = "0sp5mn5wd3xma4svm6hf67hyhiixzkzz6ijhyjkwdrc4alk81357"; tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; From 465c412b8a9400d7bdaf759623ba193b2f174aa8 Mon Sep 17 00:00:00 2001 From: Simon Weber Date: Sat, 19 Oct 2019 18:20:26 +0200 Subject: [PATCH 029/142] home-assistant-frontend: 20190514.0 -> 20190919.0 --- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 13ea1b072652..0a5e3d328b73 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20190514.0"; + version = "20190919.0"; src = fetchPypi { inherit pname version; - sha256 = "ba8cfa01b00ff2ee94a91cd83197b4d213e9b9df151daaef11dd0a56d34c5414"; + sha256 = "1xdw8fj4njc3sf15mlyiwigrwf89xsz4r2dsv6zs5fnl512r439a"; }; # no Python tests implemented From ed4a09c6f362bdbb1a25d16078dde7580c933663 Mon Sep 17 00:00:00 2001 From: talyz Date: Sat, 19 Oct 2019 16:36:24 +0200 Subject: [PATCH 030/142] gitlab: Get rid of most 'already initialized constant'-warnings On start, unicorn, sidekiq and other parts running ruby code emits quite a few warnings similar to /var/gitlab/state/config/application.rb:202: warning: already initialized constant Gitlab::Application::LOOSE_EE_APP_ASSETS /nix/store/ysb0lgbzxp7a9y4yl8d4f9wrrzy9kafc-gitlab-ee-12.3.5/share/gitlab/config/application.rb:202: warning: previous definition of LOOSE_EE_APP_ASSETS was here /var/gitlab/state/lib/gitlab.rb:38: warning: already initialized constant Gitlab::COM_URL /nix/store/ysb0lgbzxp7a9y4yl8d4f9wrrzy9kafc-gitlab-ee-12.3.5/share/gitlab/lib/gitlab.rb:38: warning: previous definition of COM_URL was here This seems to be caused by the same ruby files being evaluated multiple times due to the paths being different - sometimes they're loaded using the direct path and sometimes through a symlink, due to our split between config and package data. To fix this, we make sure that the offending files in the state directory always reference the store path, regardless of that being the real file or a symlink. --- nixos/modules/services/misc/gitlab.nix | 1 - pkgs/applications/version-management/gitlab/default.nix | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 20b87af23a5a..f5d37172a101 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -666,7 +666,6 @@ in { "d ${gitlabConfig.production.shared.path}/artifacts 0750 ${cfg.user} ${cfg.group} -" "d ${gitlabConfig.production.shared.path}/lfs-objects 0750 ${cfg.user} ${cfg.group} -" "d ${gitlabConfig.production.shared.path}/pages 0750 ${cfg.user} ${cfg.group} -" - "L+ ${cfg.statePath}/lib - - - - ${cfg.packages.gitlab}/share/gitlab/lib" "L+ /run/gitlab/config - - - - ${cfg.statePath}/config" "L+ /run/gitlab/log - - - - ${cfg.statePath}/log" "L+ /run/gitlab/tmp - - - - ${cfg.statePath}/tmp" diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 99b408bcef32..e6ed0ef53a22 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv , ruby, tzdata, git, nettools, nixosTests, nodejs , gitlabEnterprise ? false, callPackage, yarn -, yarn2nix-moretea +, yarn2nix-moretea, replace }: let @@ -118,6 +118,13 @@ stdenv.mkDerivation { sed -i '/ask_to_continue/d' lib/tasks/gitlab/two_factor.rake sed -ri -e '/log_level/a config.logger = Logger.new(STDERR)' config/environments/production.rb + + # Always require lib-files and application.rb through their store + # path, not their relative state directory path. This gets rid of + # warnings and means we don't have to link back to lib from the + # state directory. + ${replace}/bin/replace-literal -f -r -e '../lib' "$out/share/gitlab/lib" config + ${replace}/bin/replace-literal -f -r -e "require_relative 'application'" "require_relative '$out/share/gitlab/config/application'" config ''; buildPhase = '' From 5ed5e6125bea5d74d36fe6a288669b90461b8b31 Mon Sep 17 00:00:00 2001 From: Simon Weber Date: Sat, 19 Oct 2019 18:33:22 +0200 Subject: [PATCH 031/142] home-assistant-frontend: document home-assistant to home-assistant-frontend package version relationship --- pkgs/servers/home-assistant/frontend.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 0a5e3d328b73..fd873011488a 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -1,6 +1,8 @@ { lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { + # the frontend version corresponding to a specific home-assistant version can be found here + # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; version = "20190919.0"; From 7be6ba2ccaf6498eff1eb59db807a0191a0772cf Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Sat, 19 Oct 2019 14:15:19 -0700 Subject: [PATCH 032/142] chit: 0.1.14 -> 0.1.15 --- pkgs/development/tools/chit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/chit/default.nix b/pkgs/development/tools/chit/default.nix index b312b888e908..e939ddb1334e 100644 --- a/pkgs/development/tools/chit/default.nix +++ b/pkgs/development/tools/chit/default.nix @@ -6,16 +6,16 @@ with rustPlatform; buildRustPackage rec { pname = "chit"; - version = "0.1.14"; + version = "0.1.15"; src = fetchFromGitHub { owner = "peterheesterman"; repo = pname; rev = version; - sha256 = "1rzy15xwlf87c8kpy9pwvir6s9z3qc8d9iz4pk0gfdj2il3vmjwv"; + sha256 = "0iixczy3cad44j2d7zzj8f3lnmp4jwnb0snmwfgiq3vj9wrn28pz"; }; - cargoSha256 = "1jqnnf4jgjpm1i310hda15423nxfw9frgpmc2kbrs66qcsj7avaw"; + cargoSha256 = "0k6z69a09ps55w2rdgnf92yscw6rlbcpb4q9yf3rsav15pgpqvw8"; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkgconfig ]; buildInputs = [] From e2283d95336f5e495c0dec11a9eff6f52380e3a6 Mon Sep 17 00:00:00 2001 From: Astro Date: Thu, 17 Oct 2019 21:40:57 +0200 Subject: [PATCH 033/142] nixos/collectd: add plugin config --- nixos/modules/services/monitoring/collectd.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/collectd.nix b/nixos/modules/services/monitoring/collectd.nix index 6a4c678eb21f..3d672613296f 100644 --- a/nixos/modules/services/monitoring/collectd.nix +++ b/nixos/modules/services/monitoring/collectd.nix @@ -16,8 +16,15 @@ let NotifyLevel "OKAY" + ${concatStrings (mapAttrsToList (plugin: pluginConfig: '' + LoadPlugin ${plugin} + + ${pluginConfig} + + '') cfg.plugins)} + ${concatMapStrings (f: '' - Include "${f}" + Include "${f}" '') cfg.include} ${cfg.extraConfig} @@ -68,6 +75,15 @@ in { type = listOf str; }; + plugins = mkOption { + default = {}; + example = { cpu = ""; memory = ""; network = "Server 192.168.1.1 25826"; }; + description = '' + Attribute set of plugin names to plugin config segments + ''; + type = types.attrsOf types.str; + }; + extraConfig = mkOption { default = ""; description = '' From efab03957535a1ed749bf286f78fad03e9b0f511 Mon Sep 17 00:00:00 2001 From: Astro Date: Sun, 20 Oct 2019 00:35:55 +0200 Subject: [PATCH 034/142] collectd: parameterize with optional enabledPlugins --- pkgs/tools/system/collectd/default.nix | 63 +---- pkgs/tools/system/collectd/plugins.nix | 342 +++++++++++++++++++++++++ 2 files changed, 351 insertions(+), 54 deletions(-) create mode 100644 pkgs/tools/system/collectd/plugins.nix diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 3e7e4e5969ab..517d0afb95f2 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -1,45 +1,12 @@ -{ stdenv, fetchurl, fetchpatch, darwin +{ stdenv, fetchurl, fetchpatch, darwin, callPackage , autoreconfHook , pkgconfig -, curl -, iptables -, jdk -, libapparmor -, libatasmart -, libcap_ng -, libcredis -, libdbi -, libgcrypt -, libmemcached, cyrus_sasl -, libmicrohttpd -, libmodbus -, libnotify, gdk-pixbuf -, liboping -, libpcap -, libsigrok -, libvirt -, libxml2 , libtool -, lm_sensors -, lvm2 -, libmysqlclient -, numactl -, postgresql -, protobufc -, python -, rabbitmq-c -, riemann_c_client -, rrdtool -, udev -, varnish -, yajl -, net_snmp -, hiredis -, libmnl -, mosquitto -, rdkafka -, mongoc -}: +, ... +}@args: +let + plugins = callPackage ./plugins.nix args; +in stdenv.mkDerivation rec { version = "5.8.1"; pname = "collectd"; @@ -58,27 +25,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ - curl libdbi libgcrypt libmemcached - cyrus_sasl libnotify gdk-pixbuf liboping libpcap libvirt - libxml2 postgresql protobufc rrdtool - varnish yajl jdk libtool python hiredis libmicrohttpd - riemann_c_client mosquitto rdkafka mongoc - ] ++ stdenv.lib.optionals (libmysqlclient != null) [ libmysqlclient - ] ++ stdenv.lib.optionals stdenv.isLinux [ - iptables libatasmart libcredis libmodbus libsigrok - lm_sensors lvm2 rabbitmq-c udev net_snmp libmnl - # those might be no longer required when https://github.com/NixOS/nixpkgs/pull/51767 - # is merged - libapparmor numactl libcap_ng + libtool ] ++ stdenv.lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.IOKit darwin.apple_sdk.frameworks.ApplicationServices - ]; + ] ++ plugins.buildInputs; configureFlags = [ "--localstatedir=/var" "--disable-werror" - ]; + ] ++ plugins.configureFlags; # do not create directories in /var during installPhase postConfigure = '' diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix new file mode 100644 index 000000000000..10f850419872 --- /dev/null +++ b/pkgs/tools/system/collectd/plugins.nix @@ -0,0 +1,342 @@ +{ stdenv +, curl +, darwin +, hiredis +, iptables +, jdk +, libatasmart +, libdbi +, libgcrypt +, libmemcached, cyrus_sasl +, libmodbus +, libmicrohttpd +, libmnl +, libmysqlclient +, libnotify, gdk-pixbuf +, liboping +, libpcap +, libsigrok +, libvirt +, libxml2 +, libapparmor, libcap_ng, numactl +, lvm2 +, lm_sensors +, mongoc +, mosquitto +, net_snmp +, postgresql +, protobufc +, python +, rabbitmq-c +, rdkafka +, riemann_c_client +, rrdtool +, udev +, varnish +, yajl +# Defaults to `null` for all supported plugins, +# list of plugin names for a custom build +, enabledPlugins ? null +, ... +}: + +let + plugins = { + aggregation = {}; + amqp = { + buildInputs = [ yajl ] ++ + stdenv.lib.optionals stdenv.isLinux [ rabbitmq-c ]; + }; + apache = { + buildInputs = [ curl ]; + }; + apcups = {}; + apple_sensors = {}; + aquaero = {}; + ascent = { + buildInputs = [ curl libxml2 ]; + }; + barometer = {}; + battery = { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.IOKit + ]; + }; + bind = { + buildInputs = [ curl libxml2 ]; + }; + ceph = { + buildInputs = [ yajl ]; + }; + cgroups = {}; + chrony = {}; + conntrack = {}; + contextswitch = {}; + cpu = {}; + cpufreq = {}; + cpusleep = {}; + csv = {}; + curl = { + buildInputs = [ curl ]; + }; + curl_json = { + buildInputs = [ curl yajl ]; + }; + curl_xml = { + buildInputs = [ curl libxml2 ]; + }; + dbi = { + buildInputs = [ libdbi ]; + }; + df = {}; + disk = { + buildInputs = stdenv.lib.optionals stdenv.isLinux [ + udev + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.IOKit + ]; + }; + dns = { + buildInputs = [ libpcap ]; + }; + dpdkevents = {}; + dpdkstat = {}; + drbd = {}; + email = {}; + entropy = {}; + ethstat = {}; + exec = {}; + fhcount = {}; + filecount = {}; + fscache = {}; + gmond = {}; + gps = {}; + grpc = {}; + hddtemp = {}; + hugepages = {}; + intel_pmu = {}; + intel_rdt = {}; + interface = {}; + ipc = {}; + ipmi = {}; + iptables = { + buildInputs = [ + libpcap + ] ++ stdenv.lib.optionals stdenv.isLinux [ + iptables libmnl + ]; + }; + ipvs = {}; + irq = {}; + java = { + buildInputs = [ jdk libgcrypt libxml2 ]; + }; + load = {}; + logfile = {}; + log_logstash = { + buildInputs = [ yajl ]; + }; + lpar = {}; + lua = {}; + lvm = {}; + madwifi = {}; + match_empty_counter = {}; + match_hashed = {}; + match_regex = {}; + match_timediff = {}; + match_value = {}; + mbmon = {}; + mcelog = {}; + md = {}; + memcachec = { + buildInputs = [ libmemcached cyrus_sasl ]; + }; + memcached = {}; + memory = {}; + mic = {}; + modbus = { + buildInputs = stdenv.lib.optionals stdenv.isLinux [ libmodbus ]; + }; + mqtt = { + buildInputs = [ mosquitto ]; + }; + multimeter = {}; + mysql = { + buildInputs = stdenv.lib.optionals (libmysqlclient != null) [ + libmysqlclient + ]; + }; + netapp = {}; + netlink = { + buildInputs = [ + libpcap + ] ++ stdenv.lib.optionals stdenv.isLinux [ + libmnl + ]; + }; + network = { + buildInputs = [ libgcrypt ]; + }; + nfs = {}; + nginx = { + buildInputs = [ curl ]; + }; + notify_desktop = { + buildInputs = [ libnotify gdk-pixbuf ]; + }; + notify_email = {}; + notify_nagios = {}; + ntpd = {}; + numa = {}; + nut = {}; + olsrd = {}; + onewire = {}; + openldap = {}; + openvpn = {}; + oracle = {}; + ovs_events = { + buildInputs = [ yajl ]; + }; + ovs_stats = { + buildInputs = [ yajl ]; + }; + perl = {}; + pf = {}; + pinba = { + buildInputs = [ protobufc ]; + }; + ping = { + buildInputs = [ liboping ]; + }; + postgresql = { + buildInputs = [ postgresql ]; + }; + powerdns = {}; + processes = {}; + protocols = {}; + python = { + buildInputs = [ python ]; + }; + redis = { + buildInputs = [ hiredis ]; + }; + routeros = {}; + rrdcached = { + buildInputs = [ rrdtool libxml2 ]; + }; + rrdtool = { + buildInputs = [ rrdtool libxml2 ]; + }; + sensors = { + buildInputs = stdenv.lib.optionals stdenv.isLinux [ lm_sensors ]; + }; + serial = {}; + sigrok = { + buildInputs = stdenv.lib.optionals stdenv.isLinux [ libsigrok udev ]; + }; + smart = { + buildInputs = stdenv.lib.optionals stdenv.isLinux [ libatasmart udev ]; + }; + snmp = { + buildInputs = stdenv.lib.optionals stdenv.isLinux [ net_snmp ]; + }; + snmp_agent = { + buildInputs = stdenv.lib.optionals stdenv.isLinux [ net_snmp ]; + }; + statsd = {}; + swap = {}; + synproxy = {}; + syslog = {}; + table = {}; + tail_csv = {}; + tail = {}; + tape = {}; + target_notification = {}; + target_replace = {}; + target_scale = {}; + target_set = {}; + target_v5upgrade = {}; + tcpconns = {}; + teamspeak2 = {}; + ted = {}; + thermal = {}; + threshold = {}; + tokyotyrant = {}; + turbostat = {}; + unixsock = {}; + uptime = {}; + users = {}; + uuid = {}; + varnish = { + buildInputs = [ curl varnish ]; + }; + virt = { + buildInputs = [ libvirt libxml2 yajl ] ++ + stdenv.lib.optionals stdenv.isLinux [ lvm2 udev + # those might be no longer required when https://github.com/NixOS/nixpkgs/pull/51767 + # is merged + libapparmor numactl libcap_ng + ]; + }; + vmem = {}; + vserver = {}; + wireless = {}; + write_graphite = {}; + write_http = { + buildInputs = [ curl yajl ]; + }; + write_kafka = { + buildInputs = [ yajl rdkafka ]; + }; + write_log = { + buildInputs = [ yajl ]; + }; + write_mongodb = { + buildInputs = [ mongoc ]; + }; + write_prometheus = { + buildInputs = [ protobufc libmicrohttpd ]; + }; + write_redis = { + buildInputs = [ hiredis ]; + }; + write_riemann = { + buildInputs = [ protobufc riemann_c_client ]; + }; + write_sensu = {}; + write_tsdb = {}; + xencpu = {}; + xmms = {}; + zfs_arc = {}; + zone = {}; + zookeeper = {}; + }; + + configureFlags = + if enabledPlugins == null + then [] + else (map (plugin: "--enable-${plugin}") enabledPlugins) ++ + (map (plugin: "--disable-${plugin}") + (builtins.filter (plugin: ! builtins.elem plugin enabledPlugins) + (builtins.attrNames plugins)) + ); + + pluginBuildInputs = plugin: + if ! builtins.hasAttr plugin plugins + then throw "Unknown collectd plugin: ${plugin}" + else + let + pluginAttrs = builtins.getAttr plugin plugins; + in + if pluginAttrs ? "buildInputs" + then pluginAttrs.buildInputs + else []; + + buildInputs = + if enabledPlugins == null + then builtins.concatMap pluginBuildInputs + (builtins.attrNames plugins) + else builtins.concatMap pluginBuildInputs enabledPlugins; +in { + inherit configureFlags buildInputs; +} From 06abd2488673f4563d5ae157f9167dd13a6ce469 Mon Sep 17 00:00:00 2001 From: Astro Date: Sun, 20 Oct 2019 00:37:15 +0200 Subject: [PATCH 035/142] nixos/collectd: add option buildMinimalPackage --- .../modules/services/monitoring/collectd.nix | 21 +++++++++++++++++-- pkgs/tools/system/collectd/plugins.nix | 2 ++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/monitoring/collectd.nix b/nixos/modules/services/monitoring/collectd.nix index 3d672613296f..b2e44a1e3666 100644 --- a/nixos/modules/services/monitoring/collectd.nix +++ b/nixos/modules/services/monitoring/collectd.nix @@ -30,6 +30,15 @@ let ${cfg.extraConfig} ''; + package = + if cfg.buildMinimalPackage + then minimalPackage + else cfg.package; + + minimalPackage = cfg.package.override { + enabledPlugins = [ "syslog" ] ++ builtins.attrNames cfg.plugins; + }; + in { options.services.collectd = with types; { enable = mkEnableOption "collectd agent"; @@ -40,7 +49,15 @@ in { description = '' Which collectd package to use. ''; - type = package; + type = types.package; + }; + + buildMinimalPackage = mkOption { + default = false; + description = '' + Build a minimal collectd package with only the configured `services.collectd.plugins` + ''; + type = types.bool; }; user = mkOption { @@ -105,7 +122,7 @@ in { wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${cfg.package}/sbin/collectd -C ${conf} -f"; + ExecStart = "${package}/sbin/collectd -C ${conf} -f"; User = cfg.user; Restart = "on-failure"; RestartSec = 3; diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index 10f850419872..8f0603b7cbdb 100644 --- a/pkgs/tools/system/collectd/plugins.nix +++ b/pkgs/tools/system/collectd/plugins.nix @@ -41,6 +41,8 @@ }: let + # All plugins and their dependencies. + # Please help complete this! plugins = { aggregation = {}; amqp = { From 690b3c4e196bee50e68ebf92105f674af15b92cc Mon Sep 17 00:00:00 2001 From: Astro Date: Sun, 20 Oct 2019 00:53:23 +0200 Subject: [PATCH 036/142] collectd: add lua plugin buildInputs --- pkgs/tools/system/collectd/plugins.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index 8f0603b7cbdb..c29ebc925bcd 100644 --- a/pkgs/tools/system/collectd/plugins.nix +++ b/pkgs/tools/system/collectd/plugins.nix @@ -20,6 +20,7 @@ , libxml2 , libapparmor, libcap_ng, numactl , lvm2 +, lua , lm_sensors , mongoc , mosquitto @@ -139,7 +140,9 @@ let buildInputs = [ yajl ]; }; lpar = {}; - lua = {}; + lua = { + buildInputs = [ lua ]; + }; lvm = {}; madwifi = {}; match_empty_counter = {}; From d13022417f94a0b006820ec0396d479f3ec814c1 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 25 Jul 2019 12:34:22 +0200 Subject: [PATCH 037/142] buildRustPackage: support checkFlags and checkFlagsArray --- pkgs/build-support/rust/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 27601e481c68..8b41d992d1ef 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -149,8 +149,8 @@ stdenv.mkDerivation (args // { checkPhase = args.checkPhase or '' runHook preCheck - echo "Running cargo test" - cargo test + echo "Running cargo cargo test -- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}" + cargo test -- ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"} runHook postCheck ''; From 06744bb2d40b1196b7e7ddb80a7be32e218e8463 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 25 Jul 2019 12:34:44 +0200 Subject: [PATCH 038/142] rust-cbindgen: skip expand tests The expand tests require unstable rust features. --- pkgs/development/tools/rust/cbindgen/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index d58b848c87e9..64b40bdecf34 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -15,8 +15,10 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optional stdenv.isDarwin Security; - # https://github.com/eqrion/cbindgen/issues/338 - RUSTC_BOOTSTRAP = 1; + checkFlags = [ + # https://github.com/eqrion/cbindgen/issues/338 + "--skip test_expand" + ]; meta = with stdenv.lib; { description = "A project for generating C bindings from Rust code"; From e07c2974e67449bbe2f130c04f2cf350affb2ff2 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sun, 20 Oct 2019 03:04:23 +0200 Subject: [PATCH 039/142] rust-cbdindgen: 0.9.0 -> 0.9.1 --- pkgs/development/tools/rust/cbindgen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index 64b40bdecf34..8e08e5e50eb8 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-cbindgen"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "1sh9kll3ky0d6chp7l7z8j91ckibxkfhi0v7imz2fgzzy2lbqy88"; + sha256 = "1g0vrkwkc8wsyiz04qchw07chg0mg451if02sr17s65chwmbrc19"; }; - cargoSha256 = "1cn84xai1n0f8xwwwwig93dawk73g1w6n6zm4axg5zl4vrmq4j6w"; + cargoSha256 = "1y96m2my0h8fxglxz20y68fr8mnw031pxvzjsq801gwz2p858d75"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; From 95dfbe2d632b71a72634d2d65e3f738f500ee5ce Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 20 Oct 2019 12:17:58 +0200 Subject: [PATCH 040/142] doc: organize chapters into parts, and reduce toc depth Reorganize the chapters into parts and reduce the TOC depth to make the TOC useful again. The top-level TOC is very brief, but that is fine because every part will have its own TOC. Section titles of languages/frameworks are also simplified to just the name of the language/framework. --- ....xml => contributing-to-documentation.xml} | 0 doc/doc-support/parameters.xml | 2 +- .../emscripten.section.md | 2 +- doc/languages-frameworks/haskell.section.md | 2 +- doc/languages-frameworks/idris.section.md | 2 +- doc/languages-frameworks/index.xml | 2 +- doc/languages-frameworks/node.section.md | 4 +- doc/languages-frameworks/r.section.md | 4 +- doc/languages-frameworks/rust.section.md | 2 +- doc/languages-frameworks/vim.section.md | 2 +- doc/manual.xml | 44 ++++++++++++------- doc/platform-notes.xml | 2 +- doc/reviewing-contributions.xml | 2 +- 13 files changed, 41 insertions(+), 29 deletions(-) rename doc/{contributing.xml => contributing-to-documentation.xml} (100%) diff --git a/doc/contributing.xml b/doc/contributing-to-documentation.xml similarity index 100% rename from doc/contributing.xml rename to doc/contributing-to-documentation.xml diff --git a/doc/doc-support/parameters.xml b/doc/doc-support/parameters.xml index bc13e2b70dec..e4b33e66ee4d 100644 --- a/doc/doc-support/parameters.xml +++ b/doc/doc-support/parameters.xml @@ -8,7 +8,7 @@ - + diff --git a/doc/languages-frameworks/emscripten.section.md b/doc/languages-frameworks/emscripten.section.md index 24c49ec1409c..80e1094809ad 100644 --- a/doc/languages-frameworks/emscripten.section.md +++ b/doc/languages-frameworks/emscripten.section.md @@ -1,4 +1,4 @@ -# User's Guide to Emscripten in Nixpkgs +# Emscripten [Emscripten](https://github.com/kripken/emscripten): An LLVM-to-JavaScript Compiler diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index 48d22831cd9b..1e677450aa19 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -3,7 +3,7 @@ title: User's Guide for Haskell in Nixpkgs author: Peter Simons date: 2015-06-01 --- -# User's Guide to the Haskell Infrastructure +# Haskell ## How to install Haskell packages diff --git a/doc/languages-frameworks/idris.section.md b/doc/languages-frameworks/idris.section.md index e88015f08e3f..8d7962d7fb9b 100644 --- a/doc/languages-frameworks/idris.section.md +++ b/doc/languages-frameworks/idris.section.md @@ -1,4 +1,4 @@ -# Idris packages +# Idris ## Installing Idris diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index cd0b48adb14a..86076085799e 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -1,7 +1,7 @@ - Support for specific programming languages and frameworks + Languages and frameworks The standard build environment makes it easy to build typical Autotools-based packages with very little code. Any other kind of package can be accomodated by overriding the appropriate phases of stdenv. However, there are specialised functions in Nixpkgs to easily build packages for other programming languages, such as Perl or Haskell. These are described in this chapter. diff --git a/doc/languages-frameworks/node.section.md b/doc/languages-frameworks/node.section.md index c6dce04c7b8b..4dc95fc1dd98 100644 --- a/doc/languages-frameworks/node.section.md +++ b/doc/languages-frameworks/node.section.md @@ -1,5 +1,5 @@ -Node.js packages -================ +Node.js +======= The `pkgs/development/node-packages` folder contains a generated collection of [NPM packages](https://npmjs.com/) that can be installed with the Nix package manager. diff --git a/doc/languages-frameworks/r.section.md b/doc/languages-frameworks/r.section.md index c8f02bd14780..d4e1617779ce 100644 --- a/doc/languages-frameworks/r.section.md +++ b/doc/languages-frameworks/r.section.md @@ -1,5 +1,5 @@ -R packages -========== +R += ## Installation diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 83b7b159bd63..31f1abd197b5 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -4,7 +4,7 @@ author: Matthias Beyer date: 2017-03-05 --- -# User's Guide to the Rust Infrastructure +# Rust To install the rust compiler and cargo put diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index 537e7b93e523..05a23d26cf2f 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -3,7 +3,7 @@ title: User's Guide for Vim in Nixpkgs author: Marc Weber date: 2016-06-25 --- -# User's Guide to Vim Plugins/Addons/Bundles/Scripts in Nixpkgs +# Vim Both Neovim and Vim can be configured to include your favorite plugins and additional libraries. diff --git a/doc/manual.xml b/doc/manual.xml index ab845e1a1086..7015e18d1e97 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -6,20 +6,32 @@ - - - - - - - - - - - - - - - - + + Using Nixpkgs + + + + + + Standard environment + + + + + + + + Languages, frameworks and packages + + + + + + Contributing to Nixpkgs + + + + + + diff --git a/doc/platform-notes.xml b/doc/platform-notes.xml index d8d7692fc9a7..5a266fdc0eea 100644 --- a/doc/platform-notes.xml +++ b/doc/platform-notes.xml @@ -1,6 +1,6 @@ + xml:id="chap-platform-notes"> Platform Notes
Darwin (macOS) diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml index 5a14684f9b1e..c6fb62567815 100644 --- a/doc/reviewing-contributions.xml +++ b/doc/reviewing-contributions.xml @@ -2,7 +2,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" - xml:id="sec-reviewing-contributions"> + xml:id="chap-reviewing-contributions"> Reviewing contributions From 115018ff15528f51235a8ac45c4261b7bd6a8173 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 20 Oct 2019 12:37:45 +0200 Subject: [PATCH 041/142] doc: merge package notes and package-specific notes Maybe there was an idea behind this separation, but looking at the contents I don't see any reason for these being separate. --- doc/languages-frameworks/index.xml | 4 +- doc/manual.xml | 1 - doc/package-notes.xml | 351 +++++++++++++++++++++++++++ doc/package-specific-user-notes.xml | 357 ---------------------------- 4 files changed, 353 insertions(+), 360 deletions(-) delete mode 100644 doc/package-specific-user-notes.xml diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index 86076085799e..9364c764bbf9 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -9,6 +9,8 @@ + + @@ -27,6 +29,4 @@ - - diff --git a/doc/manual.xml b/doc/manual.xml index 7015e18d1e97..1083af3cdd84 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -23,7 +23,6 @@ Languages, frameworks and packages - diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 770b277cd909..84b7e232eab6 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -419,4 +419,355 @@ stdenv.mkDerivation {
+
+ OpenGL + + + Packages that use OpenGL have NixOS desktop as their primary target. The current solution for loading the GPU-specific drivers is based on libglvnd and looks for the driver implementation in LD_LIBRARY_PATH. If you are using a non-NixOS GNU/Linux/X11 desktop with free software video drivers, consider launching OpenGL-dependent programs from Nixpkgs with Nixpkgs versions of libglvnd and mesa_drivers in LD_LIBRARY_PATH. For proprietary video drivers you might have luck with also adding the corresponding video driver package. + +
+
+ Locales + + + To allow simultaneous use of packages linked against different versions of glibc with different locale archive formats Nixpkgs patches glibc to rely on LOCALE_ARCHIVE environment variable. + + + + On non-NixOS distributions this variable is obviously not set. This can cause regressions in language support or even crashes in some Nixpkgs-provided programs. The simplest way to mitigate this problem is exporting the LOCALE_ARCHIVE variable pointing to ${glibcLocales}/lib/locale/locale-archive. The drawback (and the reason this is not the default) is the relatively large (a hundred MiB) size of the full set of locales. It is possible to build a custom set of locales by overriding parameters allLocales and locales of the package. + +
+
+ Emacs + +
+ Configuring Emacs + + + The Emacs package comes with some extra helpers to make it easier to configure. emacsWithPackages allows you to manage packages from ELPA. This means that you will not have to install that packages from within Emacs. For instance, if you wanted to use company, counsel, flycheck, ivy, magit, projectile, and use-package you could use this as a ~/.config/nixpkgs/config.nix override: + + + +{ + packageOverrides = pkgs: with pkgs; { + myEmacs = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ + company + counsel + flycheck + ivy + magit + projectile + use-package + ])); + } +} + + + + You can install it like any other packages via nix-env -iA myEmacs. However, this will only install those packages. It will not configure them for us. To do this, we need to provide a configuration file. Luckily, it is possible to do this from within Nix! By modifying the above example, we can make Emacs load a custom config file. The key is to create a package that provide a default.el file in /share/emacs/site-start/. Emacs knows to load this file automatically when it starts. + + + +{ + packageOverrides = pkgs: with pkgs; rec { + myEmacsConfig = writeText "default.el" '' +;; initialize package + +(require 'package) +(package-initialize 'noactivate) +(eval-when-compile + (require 'use-package)) + +;; load some packages + +(use-package company + :bind ("<C-tab>" . company-complete) + :diminish company-mode + :commands (company-mode global-company-mode) + :defer 1 + :config + (global-company-mode)) + +(use-package counsel + :commands (counsel-descbinds) + :bind (([remap execute-extended-command] . counsel-M-x) + ("C-x C-f" . counsel-find-file) + ("C-c g" . counsel-git) + ("C-c j" . counsel-git-grep) + ("C-c k" . counsel-ag) + ("C-x l" . counsel-locate) + ("M-y" . counsel-yank-pop))) + +(use-package flycheck + :defer 2 + :config (global-flycheck-mode)) + +(use-package ivy + :defer 1 + :bind (("C-c C-r" . ivy-resume) + ("C-x C-b" . ivy-switch-buffer) + :map ivy-minibuffer-map + ("C-j" . ivy-call)) + :diminish ivy-mode + :commands ivy-mode + :config + (ivy-mode 1)) + +(use-package magit + :defer + :if (executable-find "git") + :bind (("C-x g" . magit-status) + ("C-x G" . magit-dispatch-popup)) + :init + (setq magit-completing-read-function 'ivy-completing-read)) + +(use-package projectile + :commands projectile-mode + :bind-keymap ("C-c p" . projectile-command-map) + :defer 5 + :config + (projectile-global-mode)) + ''; + myEmacs = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ + (runCommand "default.el" {} '' +mkdir -p $out/share/emacs/site-lisp +cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el +'') + company + counsel + flycheck + ivy + magit + projectile + use-package + ])); + }; +} + + + + This provides a fairly full Emacs start file. It will load in addition to the user's presonal config. You can always disable it by passing -q to the Emacs command. + + + + Sometimes emacsWithPackages is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to Melpa Unstable, and the highest for packages manually defined in pkgs/top-level/emacs-packages.nix). But you can't control this priorities when some package is installed as a dependency. You can override it on per-package-basis, providing all the required dependencies manually - but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package you can use overrideScope'. + + + +overrides = self: super: rec { + haskell-mode = self.melpaPackages.haskell-mode; + ... +}; +((emacsPackagesGen emacs).overrideScope' overrides).emacsWithPackages (p: with p; [ + # here both these package will use haskell-mode of our own choice + ghc-mod + dante +]) + +
+
+
+ DLib + + + DLib is a modern, C++-based toolkit which provides several machine learning algorithms. + + +
+ Compiling without AVX support + + + Especially older CPUs don't support AVX (Advanced Vector Extensions) instructions that are used by DLib to optimize their algorithms. + + + + On the affected hardware errors like Illegal instruction will occur. In those cases AVX support needs to be disabled: +self: super: { + dlib = super.dlib.override { avxSupport = false; }; +} + +
+
+
+ Unfree software + + + All users of Nixpkgs are free software users, and many users (and developers) of Nixpkgs want to limit and tightly control their exposure to unfree software. At the same time, many users need (or want) to run some specific pieces of proprietary software. Nixpkgs includes some expressions for unfree software packages. By default unfree software cannot be installed and doesn’t show up in searches. To allow installing unfree software in a single Nix invocation one can export NIXPKGS_ALLOW_UNFREE=1. For a persistent solution, users can set allowUnfree in the Nixpkgs configuration. + + + + Fine-grained control is possible by defining allowUnfreePredicate function in config; it takes the mkDerivation parameter attrset and returns true for unfree packages that should be allowed. + +
+
+ Steam + +
+ Steam in Nix + + + Steam is distributed as a .deb file, for now only as an i686 package (the amd64 package only has documentation). When unpacked, it has a script called steam that in Ubuntu (their target distro) would go to /usr/bin . When run for the first time, this script copies some files to the user's home, which include another script that is the ultimate responsible for launching the steam binary, which is also in $HOME. + + + + Nix problems and constraints: + + + + We don't have /bin/bash and many scripts point there. Similarly for /usr/bin/python . + + + + + We don't have the dynamic loader in /lib . + + + + + The steam.sh script in $HOME can not be patched, as it is checked and rewritten by steam. + + + + + The steam binary cannot be patched, it's also checked. + + + + + + + The current approach to deploy Steam in NixOS is composing a FHS-compatible chroot environment, as documented here. This allows us to have binaries in the expected paths without disrupting the system, and to avoid patching them to work in a non FHS environment. + +
+ +
+ How to play + + + For 64-bit systems it's important to have +hardware.opengl.driSupport32Bit = true; + in your /etc/nixos/configuration.nix. You'll also need +hardware.pulseaudio.support32Bit = true; + if you are using PulseAudio - this will enable 32bit ALSA apps integration. To use the Steam controller or other Steam supported controllers such as the DualShock 4 or Nintendo Switch Pro, you need to add +hardware.steam-hardware.enable = true; + to your configuration. + +
+ +
+ Troubleshooting + + + + + + Steam fails to start. What do I do? + + + + Try to run +strace steam + to see what is causing steam to fail. + + + + + + Using the FOSS Radeon or nouveau (nvidia) drivers + + + + + + The newStdcpp parameter was removed since NixOS 17.09 and should not be needed anymore. + + + + + Steam ships statically linked with a version of libcrypto that conflics with the one dynamically loaded by radeonsi_dri.so. If you get the error +steam.sh: line 713: 7842 Segmentation fault (core dumped) + have a look at this pull request. + + + + + + + + Java + + + + + + There is no java in steam chrootenv by default. If you get a message like +/home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found + You need to add + steam.override { withJava = true; }; + to your configuration. + + + + + + + +
+ +
+ steam-run + + + The FHS-compatible chroot used for steam can also be used to run other linux games that expect a FHS environment. To do it, add +pkgs.(steam.override { + nativeOnly = true; + newStdcpp = true; + }).run + to your configuration, rebuild, and run the game with +steam-run ./foo + +
+
+
+ Citrix Receiver & Citrix Workspace App + + + + + Please note that the citrix_receiver package has been deprecated since its development was discontinued by upstream and has been replaced by the citrix workspace app. + + + Citrix Receiver and Citrix Workspace App are a remote desktop viewers which provide access to XenDesktop installations. + + +
+ Basic usage + + + The tarball archive needs to be downloaded manually as the license agreements of the vendor for Citrix Receiver or Citrix Workspace need to be accepted first. Then run nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz. With the archive available in the store the package can be built and installed with Nix. + + + + Caution with <command>nix-shell</command> installs + + It's recommended to install Citrix Receiver and/or Citrix Workspace using nix-env -i or globally to ensure that the .desktop files are installed properly into $XDG_CONFIG_DIRS. Otherwise it won't be possible to open .ica files automatically from the browser to start a Citrix connection. + + +
+ +
+ Custom certificates + + + The Citrix Workspace App in nixpkgs trust several certificates from the Mozilla database by default. However several companies using Citrix might require their own corporate certificate. On distros with imperative packaging these certs can be stored easily in $ICAROOT, however this directory is a store path in nixpkgs. In order to work around this issue the package provides a simple mechanism to add custom certificates without rebuilding the entire package using symlinkJoin: + + { config.allowUnfree = true; }; +let extraCerts = [ ./custom-cert-1.pem ./custom-cert-2.pem /* ... */ ]; in +citrix_workspace.override { + inherit extraCerts; +}]]> + + +
+
diff --git a/doc/package-specific-user-notes.xml b/doc/package-specific-user-notes.xml deleted file mode 100644 index a3ee42dc7fa0..000000000000 --- a/doc/package-specific-user-notes.xml +++ /dev/null @@ -1,357 +0,0 @@ - - Package-specific usage notes - - These chapters includes some notes that apply to specific packages and should answer some of the frequently asked questions related to Nixpkgs use. Some useful information related to package use can be found in package-specific development notes. - -
- OpenGL - - - Packages that use OpenGL have NixOS desktop as their primary target. The current solution for loading the GPU-specific drivers is based on libglvnd and looks for the driver implementation in LD_LIBRARY_PATH. If you are using a non-NixOS GNU/Linux/X11 desktop with free software video drivers, consider launching OpenGL-dependent programs from Nixpkgs with Nixpkgs versions of libglvnd and mesa_drivers in LD_LIBRARY_PATH. For proprietary video drivers you might have luck with also adding the corresponding video driver package. - -
-
- Locales - - - To allow simultaneous use of packages linked against different versions of glibc with different locale archive formats Nixpkgs patches glibc to rely on LOCALE_ARCHIVE environment variable. - - - - On non-NixOS distributions this variable is obviously not set. This can cause regressions in language support or even crashes in some Nixpkgs-provided programs. The simplest way to mitigate this problem is exporting the LOCALE_ARCHIVE variable pointing to ${glibcLocales}/lib/locale/locale-archive. The drawback (and the reason this is not the default) is the relatively large (a hundred MiB) size of the full set of locales. It is possible to build a custom set of locales by overriding parameters allLocales and locales of the package. - -
-
- Emacs - -
- Configuring Emacs - - - The Emacs package comes with some extra helpers to make it easier to configure. emacsWithPackages allows you to manage packages from ELPA. This means that you will not have to install that packages from within Emacs. For instance, if you wanted to use company, counsel, flycheck, ivy, magit, projectile, and use-package you could use this as a ~/.config/nixpkgs/config.nix override: - - - -{ - packageOverrides = pkgs: with pkgs; { - myEmacs = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ - company - counsel - flycheck - ivy - magit - projectile - use-package - ])); - } -} - - - - You can install it like any other packages via nix-env -iA myEmacs. However, this will only install those packages. It will not configure them for us. To do this, we need to provide a configuration file. Luckily, it is possible to do this from within Nix! By modifying the above example, we can make Emacs load a custom config file. The key is to create a package that provide a default.el file in /share/emacs/site-start/. Emacs knows to load this file automatically when it starts. - - - -{ - packageOverrides = pkgs: with pkgs; rec { - myEmacsConfig = writeText "default.el" '' -;; initialize package - -(require 'package) -(package-initialize 'noactivate) -(eval-when-compile - (require 'use-package)) - -;; load some packages - -(use-package company - :bind ("<C-tab>" . company-complete) - :diminish company-mode - :commands (company-mode global-company-mode) - :defer 1 - :config - (global-company-mode)) - -(use-package counsel - :commands (counsel-descbinds) - :bind (([remap execute-extended-command] . counsel-M-x) - ("C-x C-f" . counsel-find-file) - ("C-c g" . counsel-git) - ("C-c j" . counsel-git-grep) - ("C-c k" . counsel-ag) - ("C-x l" . counsel-locate) - ("M-y" . counsel-yank-pop))) - -(use-package flycheck - :defer 2 - :config (global-flycheck-mode)) - -(use-package ivy - :defer 1 - :bind (("C-c C-r" . ivy-resume) - ("C-x C-b" . ivy-switch-buffer) - :map ivy-minibuffer-map - ("C-j" . ivy-call)) - :diminish ivy-mode - :commands ivy-mode - :config - (ivy-mode 1)) - -(use-package magit - :defer - :if (executable-find "git") - :bind (("C-x g" . magit-status) - ("C-x G" . magit-dispatch-popup)) - :init - (setq magit-completing-read-function 'ivy-completing-read)) - -(use-package projectile - :commands projectile-mode - :bind-keymap ("C-c p" . projectile-command-map) - :defer 5 - :config - (projectile-global-mode)) - ''; - myEmacs = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ - (runCommand "default.el" {} '' -mkdir -p $out/share/emacs/site-lisp -cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el -'') - company - counsel - flycheck - ivy - magit - projectile - use-package - ])); - }; -} - - - - This provides a fairly full Emacs start file. It will load in addition to the user's presonal config. You can always disable it by passing -q to the Emacs command. - - - - Sometimes emacsWithPackages is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to Melpa Unstable, and the highest for packages manually defined in pkgs/top-level/emacs-packages.nix). But you can't control this priorities when some package is installed as a dependency. You can override it on per-package-basis, providing all the required dependencies manually - but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package you can use overrideScope'. - - - -overrides = self: super: rec { - haskell-mode = self.melpaPackages.haskell-mode; - ... -}; -((emacsPackagesGen emacs).overrideScope' overrides).emacsWithPackages (p: with p; [ - # here both these package will use haskell-mode of our own choice - ghc-mod - dante -]) - -
-
-
- DLib - - - DLib is a modern, C++-based toolkit which provides several machine learning algorithms. - - -
- Compiling without AVX support - - - Especially older CPUs don't support AVX (Advanced Vector Extensions) instructions that are used by DLib to optimize their algorithms. - - - - On the affected hardware errors like Illegal instruction will occur. In those cases AVX support needs to be disabled: -self: super: { - dlib = super.dlib.override { avxSupport = false; }; -} - -
-
-
- Unfree software - - - All users of Nixpkgs are free software users, and many users (and developers) of Nixpkgs want to limit and tightly control their exposure to unfree software. At the same time, many users need (or want) to run some specific pieces of proprietary software. Nixpkgs includes some expressions for unfree software packages. By default unfree software cannot be installed and doesn’t show up in searches. To allow installing unfree software in a single Nix invocation one can export NIXPKGS_ALLOW_UNFREE=1. For a persistent solution, users can set allowUnfree in the Nixpkgs configuration. - - - - Fine-grained control is possible by defining allowUnfreePredicate function in config; it takes the mkDerivation parameter attrset and returns true for unfree packages that should be allowed. - -
-
- Steam - -
- Steam in Nix - - - Steam is distributed as a .deb file, for now only as an i686 package (the amd64 package only has documentation). When unpacked, it has a script called steam that in Ubuntu (their target distro) would go to /usr/bin . When run for the first time, this script copies some files to the user's home, which include another script that is the ultimate responsible for launching the steam binary, which is also in $HOME. - - - - Nix problems and constraints: - - - - We don't have /bin/bash and many scripts point there. Similarly for /usr/bin/python . - - - - - We don't have the dynamic loader in /lib . - - - - - The steam.sh script in $HOME can not be patched, as it is checked and rewritten by steam. - - - - - The steam binary cannot be patched, it's also checked. - - - - - - - The current approach to deploy Steam in NixOS is composing a FHS-compatible chroot environment, as documented here. This allows us to have binaries in the expected paths without disrupting the system, and to avoid patching them to work in a non FHS environment. - -
- -
- How to play - - - For 64-bit systems it's important to have -hardware.opengl.driSupport32Bit = true; - in your /etc/nixos/configuration.nix. You'll also need -hardware.pulseaudio.support32Bit = true; - if you are using PulseAudio - this will enable 32bit ALSA apps integration. To use the Steam controller or other Steam supported controllers such as the DualShock 4 or Nintendo Switch Pro, you need to add -hardware.steam-hardware.enable = true; - to your configuration. - -
- -
- Troubleshooting - - - - - - Steam fails to start. What do I do? - - - - Try to run -strace steam - to see what is causing steam to fail. - - - - - - Using the FOSS Radeon or nouveau (nvidia) drivers - - - - - - The newStdcpp parameter was removed since NixOS 17.09 and should not be needed anymore. - - - - - Steam ships statically linked with a version of libcrypto that conflics with the one dynamically loaded by radeonsi_dri.so. If you get the error -steam.sh: line 713: 7842 Segmentation fault (core dumped) - have a look at this pull request. - - - - - - - - Java - - - - - - There is no java in steam chrootenv by default. If you get a message like -/home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found - You need to add - steam.override { withJava = true; }; - to your configuration. - - - - - - - -
- -
- steam-run - - - The FHS-compatible chroot used for steam can also be used to run other linux games that expect a FHS environment. To do it, add -pkgs.(steam.override { - nativeOnly = true; - newStdcpp = true; - }).run - to your configuration, rebuild, and run the game with -steam-run ./foo - -
-
-
- Citrix Receiver & Citrix Workspace App - - - - - Please note that the citrix_receiver package has been deprecated since its development was discontinued by upstream and has been replaced by the citrix workspace app. - - - Citrix Receiver and Citrix Workspace App are a remote desktop viewers which provide access to XenDesktop installations. - - -
- Basic usage - - - The tarball archive needs to be downloaded manually as the license agreements of the vendor for Citrix Receiver or Citrix Workspace need to be accepted first. Then run nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz. With the archive available in the store the package can be built and installed with Nix. - - - - Caution with <command>nix-shell</command> installs - - It's recommended to install Citrix Receiver and/or Citrix Workspace using nix-env -i or globally to ensure that the .desktop files are installed properly into $XDG_CONFIG_DIRS. Otherwise it won't be possible to open .ica files automatically from the browser to start a Citrix connection. - - -
- -
- Custom certificates - - - The Citrix Workspace App in nixpkgs trust several certificates from the Mozilla database by default. However several companies using Citrix might require their own corporate certificate. On distros with imperative packaging these certs can be stored easily in $ICAROOT, however this directory is a store path in nixpkgs. In order to work around this issue the package provides a simple mechanism to add custom certificates without rebuilding the entire package using symlinkJoin: - - { config.allowUnfree = true; }; -let extraCerts = [ ./custom-cert-1.pem ./custom-cert-2.pem /* ... */ ]; in -citrix_workspace.override { - inherit extraCerts; -}]]> - - -
-
- From efb55d2a42e1b047c65b1d125cc955df84f8e0af Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 20 Oct 2019 13:14:30 +0200 Subject: [PATCH 042/142] doc: split packages part into xml file per package --- doc/manual.xml | 2 +- doc/package-notes.xml | 773 --------------------------------- doc/packages/citrix.xml | 44 ++ doc/packages/dlib.xml | 24 + doc/packages/eclipse.xml | 72 +++ doc/packages/elm.xml | 17 + doc/packages/emacs.xml | 131 ++++++ doc/packages/ibus.xml | 57 +++ doc/packages/index.xml | 23 + doc/packages/kakoune.xml | 14 + doc/packages/linux.xml | 85 ++++ doc/packages/locales.xml | 13 + doc/packages/nginx.xml | 25 ++ doc/packages/opengl.xml | 9 + doc/packages/shell-helpers.xml | 25 ++ doc/packages/steam.xml | 131 ++++++ doc/packages/unfree.xml | 13 + doc/packages/weechat.xml | 85 ++++ doc/packages/xorg.xml | 34 ++ 19 files changed, 803 insertions(+), 774 deletions(-) delete mode 100644 doc/package-notes.xml create mode 100644 doc/packages/citrix.xml create mode 100644 doc/packages/dlib.xml create mode 100644 doc/packages/eclipse.xml create mode 100644 doc/packages/elm.xml create mode 100644 doc/packages/emacs.xml create mode 100644 doc/packages/ibus.xml create mode 100644 doc/packages/index.xml create mode 100644 doc/packages/kakoune.xml create mode 100644 doc/packages/linux.xml create mode 100644 doc/packages/locales.xml create mode 100644 doc/packages/nginx.xml create mode 100644 doc/packages/opengl.xml create mode 100644 doc/packages/shell-helpers.xml create mode 100644 doc/packages/steam.xml create mode 100644 doc/packages/unfree.xml create mode 100644 doc/packages/weechat.xml create mode 100644 doc/packages/xorg.xml diff --git a/doc/manual.xml b/doc/manual.xml index 1083af3cdd84..001a5f3eca53 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -23,7 +23,7 @@ Languages, frameworks and packages - + Contributing to Nixpkgs diff --git a/doc/package-notes.xml b/doc/package-notes.xml deleted file mode 100644 index 84b7e232eab6..000000000000 --- a/doc/package-notes.xml +++ /dev/null @@ -1,773 +0,0 @@ - - Package Notes - - This chapter contains information about how to use and maintain the Nix expressions for a number of specific packages, such as the Linux kernel or X.org. - - -
- Linux kernel - - - The Nix expressions to build the Linux kernel are in pkgs/os-specific/linux/kernel. - - - - The function that builds the kernel has an argument kernelPatches which should be a list of {name, patch, extraConfig} attribute sets, where name is the name of the patch (which is included in the kernel’s meta.description attribute), patch is the patch itself (possibly compressed), and extraConfig (optional) is a string specifying extra options to be concatenated to the kernel configuration file (.config). - - - - The kernel derivation exports an attribute features specifying whether optional functionality is or isn’t enabled. This is used in NixOS to implement kernel-specific behaviour. For instance, if the kernel has the iwlwifi feature (i.e. has built-in support for Intel wireless chipsets), then NixOS doesn’t have to build the external iwlwifi package: - -modulesTree = [kernel] - ++ pkgs.lib.optional (!kernel.features ? iwlwifi) kernelPackages.iwlwifi - ++ ...; - - - - - How to add a new (major) version of the Linux kernel to Nixpkgs: - - - - Copy the old Nix expression (e.g. linux-2.6.21.nix) to the new one (e.g. linux-2.6.22.nix) and update it. - - - - - Add the new kernel to all-packages.nix (e.g., create an attribute kernel_2_6_22). - - - - - Now we’re going to update the kernel configuration. First unpack the kernel. Then for each supported platform (i686, x86_64, uml) do the following: - - - - Make an copy from the old config (e.g. config-2.6.21-i686-smp) to the new one (e.g. config-2.6.22-i686-smp). - - - - - Copy the config file for this platform (e.g. config-2.6.22-i686-smp) to .config in the kernel source tree. - - - - - Run make oldconfig ARCH={i386,x86_64,um} and answer all questions. (For the uml configuration, also add SHELL=bash.) Make sure to keep the configuration consistent between platforms (i.e. don’t enable some feature on i686 and disable it on x86_64). - - - - - If needed you can also run make menuconfig: - -$ nix-env -i ncurses -$ export NIX_CFLAGS_LINK=-lncurses -$ make menuconfig ARCH=arch - - - - - Copy .config over the new config file (e.g. config-2.6.22-i686-smp). - - - - - - - - Test building the kernel: nix-build -A kernel_2_6_22. If it compiles, ship it! For extra credit, try booting NixOS with it. - - - - - It may be that the new kernel requires updating the external kernel modules and kernel-dependent packages listed in the linuxPackagesFor function in all-packages.nix (such as the NVIDIA drivers, AUFS, etc.). If the updated packages aren’t backwards compatible with older kernels, you may need to keep the older versions around. - - - - -
- -
- X.org - - - The Nix expressions for the X.org packages reside in pkgs/servers/x11/xorg/default.nix. This file is automatically generated from lists of tarballs in an X.org release. As such it should not be modified directly; rather, you should modify the lists, the generator script or the file pkgs/servers/x11/xorg/overrides.nix, in which you can override or add to the derivations produced by the generator. - - - - The generator is invoked as follows: - -$ cd pkgs/servers/x11/xorg -$ cat tarballs-7.5.list extra.list old.list \ - | perl ./generate-expr-from-tarballs.pl - - For each of the tarballs in the .list files, the script downloads it, unpacks it, and searches its configure.ac and *.pc.in files for dependencies. This information is used to generate default.nix. The generator caches downloaded tarballs between runs. Pay close attention to the NOT FOUND: name messages at the end of the run, since they may indicate missing dependencies. (Some might be optional dependencies, however.) - - - - A file like tarballs-7.5.list contains all tarballs in a X.org release. It can be generated like this: - -$ export i="mirror://xorg/X11R7.4/src/everything/" -$ cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) \ - | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' \ - | sort > tarballs-7.4.list - - extra.list contains libraries that aren’t part of X.org proper, but are closely related to it, such as libxcb. old.list contains some packages that were removed from X.org, but are still needed by some people or by other packages (such as imake). - - - - If the expression for a package requires derivation attributes that the generator cannot figure out automatically (say, patches or a postInstall hook), you should modify pkgs/servers/x11/xorg/overrides.nix. - -
- - - - - -
- Eclipse - - - The Nix expressions related to the Eclipse platform and IDE are in pkgs/applications/editors/eclipse. - - - - Nixpkgs provides a number of packages that will install Eclipse in its various forms. These range from the bare-bones Eclipse Platform to the more fully featured Eclipse SDK or Scala-IDE packages and multiple version are often available. It is possible to list available Eclipse packages by issuing the command: - -$ nix-env -f '<nixpkgs>' -qaP -A eclipses --description - - Once an Eclipse variant is installed it can be run using the eclipse command, as expected. From within Eclipse it is then possible to install plugins in the usual manner by either manually specifying an Eclipse update site or by installing the Marketplace Client plugin and using it to discover and install other plugins. This installation method provides an Eclipse installation that closely resemble a manually installed Eclipse. - - - - If you prefer to install plugins in a more declarative manner then Nixpkgs also offer a number of Eclipse plugins that can be installed in an Eclipse environment. This type of environment is created using the function eclipseWithPlugins found inside the nixpkgs.eclipses attribute set. This function takes as argument { eclipse, plugins ? [], jvmArgs ? [] } where eclipse is a one of the Eclipse packages described above, plugins is a list of plugin derivations, and jvmArgs is a list of arguments given to the JVM running the Eclipse. For example, say you wish to install the latest Eclipse Platform with the popular Eclipse Color Theme plugin and also allow Eclipse to use more RAM. You could then add - -packageOverrides = pkgs: { - myEclipse = with pkgs.eclipses; eclipseWithPlugins { - eclipse = eclipse-platform; - jvmArgs = [ "-Xmx2048m" ]; - plugins = [ plugins.color-theme ]; - }; -} - - to your Nixpkgs configuration (~/.config/nixpkgs/config.nix) and install it by running nix-env -f '<nixpkgs>' -iA myEclipse and afterward run Eclipse as usual. It is possible to find out which plugins are available for installation using eclipseWithPlugins by running - -$ nix-env -f '<nixpkgs>' -qaP -A eclipses.plugins --description - - - - - If there is a need to install plugins that are not available in Nixpkgs then it may be possible to define these plugins outside Nixpkgs using the buildEclipseUpdateSite and buildEclipsePlugin functions found in the nixpkgs.eclipses.plugins attribute set. Use the buildEclipseUpdateSite function to install a plugin distributed as an Eclipse update site. This function takes { name, src } as argument where src indicates the Eclipse update site archive. All Eclipse features and plugins within the downloaded update site will be installed. When an update site archive is not available then the buildEclipsePlugin function can be used to install a plugin that consists of a pair of feature and plugin JARs. This function takes an argument { name, srcFeature, srcPlugin } where srcFeature and srcPlugin are the feature and plugin JARs, respectively. - - - - Expanding the previous example with two plugins using the above functions we have - -packageOverrides = pkgs: { - myEclipse = with pkgs.eclipses; eclipseWithPlugins { - eclipse = eclipse-platform; - jvmArgs = [ "-Xmx2048m" ]; - plugins = [ - plugins.color-theme - (plugins.buildEclipsePlugin { - name = "myplugin1-1.0"; - srcFeature = fetchurl { - url = "http://…/features/myplugin1.jar"; - sha256 = "123…"; - }; - srcPlugin = fetchurl { - url = "http://…/plugins/myplugin1.jar"; - sha256 = "123…"; - }; - }); - (plugins.buildEclipseUpdateSite { - name = "myplugin2-1.0"; - src = fetchurl { - stripRoot = false; - url = "http://…/myplugin2.zip"; - sha256 = "123…"; - }; - }); - ]; - }; -} - - -
-
- Elm - - - To start a development environment do nix-shell -p elmPackages.elm elmPackages.elm-format - - - - To update Elm compiler, see nixpkgs/pkgs/development/compilers/elm/README.md. - - - - To package Elm applications, read about elm2nix. - -
-
- Kakoune - - - Kakoune can be built to autoload plugins: -(kakoune.override { - configure = { - plugins = with pkgs.kakounePlugins; [ parinfer-rust ]; - }; -}) - -
-
- Interactive shell helpers - - - Some packages provide the shell integration to be more useful. But unlike other systems, nix doesn't have a standard share directory location. This is why a bunch PACKAGE-share scripts are shipped that print the location of the corresponding shared folder. Current list of such packages is as following: - - - - autojump: autojump-share - - - - - fzf: fzf-share - - - - E.g. autojump can then used in the .bashrc like this: - - source "$(autojump-share)/autojump.bash" - - -
-
- Weechat - - - Weechat can be configured to include your choice of plugins, reducing its closure size from the default configuration which includes all available plugins. To make use of this functionality, install an expression that overrides its configuration such as -weechat.override {configure = {availablePlugins, ...}: { - plugins = with availablePlugins; [ python perl ]; - } -} - If the configure function returns an attrset without the plugins attribute, availablePlugins will be used automatically. - - - - The plugins currently available are python, perl, ruby, guile, tcl and lua. - - - - The python and perl plugins allows the addition of extra libraries. For instance, the inotify.py script in weechat-scripts requires D-Bus or libnotify, and the fish.py script requires pycrypto. To use these scripts, use the plugin's withPackages attribute: -weechat.override { configure = {availablePlugins, ...}: { - plugins = with availablePlugins; [ - (python.withPackages (ps: with ps; [ pycrypto python-dbus ])) - ]; - }; -} - - - - - In order to also keep all default plugins installed, it is possible to use the following method: -weechat.override { configure = { availablePlugins, ... }: { - plugins = builtins.attrValues (availablePlugins // { - python = availablePlugins.python.withPackages (ps: with ps; [ pycrypto python-dbus ]); - }); -}; } - - - - - WeeChat allows to set defaults on startup using the --run-command. The configure method can be used to pass commands to the program: -weechat.override { - configure = { availablePlugins, ... }: { - init = '' - /set foo bar - /server add freenode chat.freenode.org - ''; - }; -} - Further values can be added to the list of commands when running weechat --run-command "your-commands". - - - - Additionally it's possible to specify scripts to be loaded when starting weechat. These will be loaded before the commands from init: -weechat.override { - configure = { availablePlugins, ... }: { - scripts = with pkgs.weechatScripts; [ - weechat-xmpp weechat-matrix-bridge wee-slack - ]; - init = '' - /set plugins.var.python.jabber.key "val" - '': - }; -} - - - - In nixpkgs there's a subpackage which contains derivations for WeeChat scripts. Such derivations expect a passthru.scripts attribute which contains a list of all scripts inside the store path. Furthermore all scripts have to live in $out/share. An exemplary derivation looks like this: -{ stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "exemplary-weechat-script"; - src = fetchurl { - url = "https://scripts.tld/your-scripts.tar.gz"; - sha256 = "..."; - }; - passthru.scripts = [ "foo.py" "bar.lua" ]; - installPhase = '' - mkdir $out/share - cp foo.py $out/share - cp bar.lua $out/share - ''; -} - -
-
- ibus-engines.typing-booster - - - This package is an ibus-based completion method to speed up typing. - - -
- Activating the engine - - - IBus needs to be configured accordingly to activate typing-booster. The configuration depends on the desktop manager in use. For detailed instructions, please refer to the upstream docs. - - - - On NixOS you need to explicitly enable ibus with given engines before customizing your desktop to use typing-booster. This can be achieved using the ibus module: -{ pkgs, ... }: { - i18n.inputMethod = { - enabled = "ibus"; - ibus.engines = with pkgs.ibus-engines; [ typing-booster ]; - }; -} - -
- -
- Using custom hunspell dictionaries - - - The IBus engine is based on hunspell to support completion in many languages. By default the dictionaries de-de, en-us, fr-moderne es-es, it-it, sv-se and sv-fi are in use. To add another dictionary, the package can be overridden like this: -ibus-engines.typing-booster.override { - langs = [ "de-at" "en-gb" ]; -} - - - - Note: each language passed to langs must be an attribute name in pkgs.hunspellDicts. - -
- -
- Built-in emoji picker - - - The ibus-engines.typing-booster package contains a program named emoji-picker. To display all emojis correctly, a special font such as noto-fonts-emoji is needed: - - - - On NixOS it can be installed using the following expression: -{ pkgs, ... }: { - fonts.fonts = with pkgs; [ noto-fonts-emoji ]; -} - -
-
-
- Nginx - - - Nginx is a reverse proxy and lightweight webserver. - - -
- ETags on static files served from the Nix store - - - HTTP has a couple different mechanisms for caching to prevent clients from having to download the same content repeatedly if a resource has not changed since the last time it was requested. When nginx is used as a server for static files, it implements the caching mechanism based on the Last-Modified response header automatically; unfortunately, it works by using filesystem timestamps to determine the value of the Last-Modified header. This doesn't give the desired behavior when the file is in the Nix store, because all file timestamps are set to 0 (for reasons related to build reproducibility). - - - - Fortunately, HTTP supports an alternative (and more effective) caching mechanism: the ETag response header. The value of the ETag header specifies some identifier for the particular content that the server is sending (e.g. a hash). When a client makes a second request for the same resource, it sends that value back in an If-None-Match header. If the ETag value is unchanged, then the server does not need to resend the content. - - - - As of NixOS 19.09, the nginx package in Nixpkgs is patched such that when nginx serves a file out of /nix/store, the hash in the store path is used as the ETag header in the HTTP response, thus providing proper caching functionality. This happens automatically; you do not need to do modify any configuration to get this behavior. - -
-
-
- OpenGL - - - Packages that use OpenGL have NixOS desktop as their primary target. The current solution for loading the GPU-specific drivers is based on libglvnd and looks for the driver implementation in LD_LIBRARY_PATH. If you are using a non-NixOS GNU/Linux/X11 desktop with free software video drivers, consider launching OpenGL-dependent programs from Nixpkgs with Nixpkgs versions of libglvnd and mesa_drivers in LD_LIBRARY_PATH. For proprietary video drivers you might have luck with also adding the corresponding video driver package. - -
-
- Locales - - - To allow simultaneous use of packages linked against different versions of glibc with different locale archive formats Nixpkgs patches glibc to rely on LOCALE_ARCHIVE environment variable. - - - - On non-NixOS distributions this variable is obviously not set. This can cause regressions in language support or even crashes in some Nixpkgs-provided programs. The simplest way to mitigate this problem is exporting the LOCALE_ARCHIVE variable pointing to ${glibcLocales}/lib/locale/locale-archive. The drawback (and the reason this is not the default) is the relatively large (a hundred MiB) size of the full set of locales. It is possible to build a custom set of locales by overriding parameters allLocales and locales of the package. - -
-
- Emacs - -
- Configuring Emacs - - - The Emacs package comes with some extra helpers to make it easier to configure. emacsWithPackages allows you to manage packages from ELPA. This means that you will not have to install that packages from within Emacs. For instance, if you wanted to use company, counsel, flycheck, ivy, magit, projectile, and use-package you could use this as a ~/.config/nixpkgs/config.nix override: - - - -{ - packageOverrides = pkgs: with pkgs; { - myEmacs = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ - company - counsel - flycheck - ivy - magit - projectile - use-package - ])); - } -} - - - - You can install it like any other packages via nix-env -iA myEmacs. However, this will only install those packages. It will not configure them for us. To do this, we need to provide a configuration file. Luckily, it is possible to do this from within Nix! By modifying the above example, we can make Emacs load a custom config file. The key is to create a package that provide a default.el file in /share/emacs/site-start/. Emacs knows to load this file automatically when it starts. - - - -{ - packageOverrides = pkgs: with pkgs; rec { - myEmacsConfig = writeText "default.el" '' -;; initialize package - -(require 'package) -(package-initialize 'noactivate) -(eval-when-compile - (require 'use-package)) - -;; load some packages - -(use-package company - :bind ("<C-tab>" . company-complete) - :diminish company-mode - :commands (company-mode global-company-mode) - :defer 1 - :config - (global-company-mode)) - -(use-package counsel - :commands (counsel-descbinds) - :bind (([remap execute-extended-command] . counsel-M-x) - ("C-x C-f" . counsel-find-file) - ("C-c g" . counsel-git) - ("C-c j" . counsel-git-grep) - ("C-c k" . counsel-ag) - ("C-x l" . counsel-locate) - ("M-y" . counsel-yank-pop))) - -(use-package flycheck - :defer 2 - :config (global-flycheck-mode)) - -(use-package ivy - :defer 1 - :bind (("C-c C-r" . ivy-resume) - ("C-x C-b" . ivy-switch-buffer) - :map ivy-minibuffer-map - ("C-j" . ivy-call)) - :diminish ivy-mode - :commands ivy-mode - :config - (ivy-mode 1)) - -(use-package magit - :defer - :if (executable-find "git") - :bind (("C-x g" . magit-status) - ("C-x G" . magit-dispatch-popup)) - :init - (setq magit-completing-read-function 'ivy-completing-read)) - -(use-package projectile - :commands projectile-mode - :bind-keymap ("C-c p" . projectile-command-map) - :defer 5 - :config - (projectile-global-mode)) - ''; - myEmacs = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ - (runCommand "default.el" {} '' -mkdir -p $out/share/emacs/site-lisp -cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el -'') - company - counsel - flycheck - ivy - magit - projectile - use-package - ])); - }; -} - - - - This provides a fairly full Emacs start file. It will load in addition to the user's presonal config. You can always disable it by passing -q to the Emacs command. - - - - Sometimes emacsWithPackages is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to Melpa Unstable, and the highest for packages manually defined in pkgs/top-level/emacs-packages.nix). But you can't control this priorities when some package is installed as a dependency. You can override it on per-package-basis, providing all the required dependencies manually - but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package you can use overrideScope'. - - - -overrides = self: super: rec { - haskell-mode = self.melpaPackages.haskell-mode; - ... -}; -((emacsPackagesGen emacs).overrideScope' overrides).emacsWithPackages (p: with p; [ - # here both these package will use haskell-mode of our own choice - ghc-mod - dante -]) - -
-
-
- DLib - - - DLib is a modern, C++-based toolkit which provides several machine learning algorithms. - - -
- Compiling without AVX support - - - Especially older CPUs don't support AVX (Advanced Vector Extensions) instructions that are used by DLib to optimize their algorithms. - - - - On the affected hardware errors like Illegal instruction will occur. In those cases AVX support needs to be disabled: -self: super: { - dlib = super.dlib.override { avxSupport = false; }; -} - -
-
-
- Unfree software - - - All users of Nixpkgs are free software users, and many users (and developers) of Nixpkgs want to limit and tightly control their exposure to unfree software. At the same time, many users need (or want) to run some specific pieces of proprietary software. Nixpkgs includes some expressions for unfree software packages. By default unfree software cannot be installed and doesn’t show up in searches. To allow installing unfree software in a single Nix invocation one can export NIXPKGS_ALLOW_UNFREE=1. For a persistent solution, users can set allowUnfree in the Nixpkgs configuration. - - - - Fine-grained control is possible by defining allowUnfreePredicate function in config; it takes the mkDerivation parameter attrset and returns true for unfree packages that should be allowed. - -
-
- Steam - -
- Steam in Nix - - - Steam is distributed as a .deb file, for now only as an i686 package (the amd64 package only has documentation). When unpacked, it has a script called steam that in Ubuntu (their target distro) would go to /usr/bin . When run for the first time, this script copies some files to the user's home, which include another script that is the ultimate responsible for launching the steam binary, which is also in $HOME. - - - - Nix problems and constraints: - - - - We don't have /bin/bash and many scripts point there. Similarly for /usr/bin/python . - - - - - We don't have the dynamic loader in /lib . - - - - - The steam.sh script in $HOME can not be patched, as it is checked and rewritten by steam. - - - - - The steam binary cannot be patched, it's also checked. - - - - - - - The current approach to deploy Steam in NixOS is composing a FHS-compatible chroot environment, as documented here. This allows us to have binaries in the expected paths without disrupting the system, and to avoid patching them to work in a non FHS environment. - -
- -
- How to play - - - For 64-bit systems it's important to have -hardware.opengl.driSupport32Bit = true; - in your /etc/nixos/configuration.nix. You'll also need -hardware.pulseaudio.support32Bit = true; - if you are using PulseAudio - this will enable 32bit ALSA apps integration. To use the Steam controller or other Steam supported controllers such as the DualShock 4 or Nintendo Switch Pro, you need to add -hardware.steam-hardware.enable = true; - to your configuration. - -
- -
- Troubleshooting - - - - - - Steam fails to start. What do I do? - - - - Try to run -strace steam - to see what is causing steam to fail. - - - - - - Using the FOSS Radeon or nouveau (nvidia) drivers - - - - - - The newStdcpp parameter was removed since NixOS 17.09 and should not be needed anymore. - - - - - Steam ships statically linked with a version of libcrypto that conflics with the one dynamically loaded by radeonsi_dri.so. If you get the error -steam.sh: line 713: 7842 Segmentation fault (core dumped) - have a look at this pull request. - - - - - - - - Java - - - - - - There is no java in steam chrootenv by default. If you get a message like -/home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found - You need to add - steam.override { withJava = true; }; - to your configuration. - - - - - - - -
- -
- steam-run - - - The FHS-compatible chroot used for steam can also be used to run other linux games that expect a FHS environment. To do it, add -pkgs.(steam.override { - nativeOnly = true; - newStdcpp = true; - }).run - to your configuration, rebuild, and run the game with -steam-run ./foo - -
-
-
- Citrix Receiver & Citrix Workspace App - - - - - Please note that the citrix_receiver package has been deprecated since its development was discontinued by upstream and has been replaced by the citrix workspace app. - - - Citrix Receiver and Citrix Workspace App are a remote desktop viewers which provide access to XenDesktop installations. - - -
- Basic usage - - - The tarball archive needs to be downloaded manually as the license agreements of the vendor for Citrix Receiver or Citrix Workspace need to be accepted first. Then run nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz. With the archive available in the store the package can be built and installed with Nix. - - - - Caution with <command>nix-shell</command> installs - - It's recommended to install Citrix Receiver and/or Citrix Workspace using nix-env -i or globally to ensure that the .desktop files are installed properly into $XDG_CONFIG_DIRS. Otherwise it won't be possible to open .ica files automatically from the browser to start a Citrix connection. - - -
- -
- Custom certificates - - - The Citrix Workspace App in nixpkgs trust several certificates from the Mozilla database by default. However several companies using Citrix might require their own corporate certificate. On distros with imperative packaging these certs can be stored easily in $ICAROOT, however this directory is a store path in nixpkgs. In order to work around this issue the package provides a simple mechanism to add custom certificates without rebuilding the entire package using symlinkJoin: - - { config.allowUnfree = true; }; -let extraCerts = [ ./custom-cert-1.pem ./custom-cert-2.pem /* ... */ ]; in -citrix_workspace.override { - inherit extraCerts; -}]]> - - -
-
- diff --git a/doc/packages/citrix.xml b/doc/packages/citrix.xml new file mode 100644 index 000000000000..bc685f97932d --- /dev/null +++ b/doc/packages/citrix.xml @@ -0,0 +1,44 @@ +
+ Citrix Workspace + + + + + Please note that the citrix_receiver package has been deprecated since its development was discontinued by upstream and has been replaced by the citrix workspace app. + + + Citrix Receiver and Citrix Workspace App are a remote desktop viewers which provide access to XenDesktop installations. + + +
+ Basic usage + + + The tarball archive needs to be downloaded manually as the license agreements of the vendor for Citrix Receiver or Citrix Workspace need to be accepted first. Then run nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz. With the archive available in the store the package can be built and installed with Nix. + + + + Caution with <command>nix-shell</command> installs + + It's recommended to install Citrix Receiver and/or Citrix Workspace using nix-env -i or globally to ensure that the .desktop files are installed properly into $XDG_CONFIG_DIRS. Otherwise it won't be possible to open .ica files automatically from the browser to start a Citrix connection. + + +
+ +
+ Custom certificates + + + The Citrix Workspace App in nixpkgs trust several certificates from the Mozilla database by default. However several companies using Citrix might require their own corporate certificate. On distros with imperative packaging these certs can be stored easily in $ICAROOT, however this directory is a store path in nixpkgs. In order to work around this issue the package provides a simple mechanism to add custom certificates without rebuilding the entire package using symlinkJoin: + + { config.allowUnfree = true; }; +let extraCerts = [ ./custom-cert-1.pem ./custom-cert-2.pem /* ... */ ]; in +citrix_workspace.override { + inherit extraCerts; +}]]> + + +
+
\ No newline at end of file diff --git a/doc/packages/dlib.xml b/doc/packages/dlib.xml new file mode 100644 index 000000000000..98c211cf9df7 --- /dev/null +++ b/doc/packages/dlib.xml @@ -0,0 +1,24 @@ +
+ DLib + + + DLib is a modern, C++-based toolkit which provides several machine learning algorithms. + + +
+ Compiling without AVX support + + + Especially older CPUs don't support AVX (Advanced Vector Extensions) instructions that are used by DLib to optimize their algorithms. + + + + On the affected hardware errors like Illegal instruction will occur. In those cases AVX support needs to be disabled: +self: super: { + dlib = super.dlib.override { avxSupport = false; }; +} + +
+
\ No newline at end of file diff --git a/doc/packages/eclipse.xml b/doc/packages/eclipse.xml new file mode 100644 index 000000000000..968c58d3b5bb --- /dev/null +++ b/doc/packages/eclipse.xml @@ -0,0 +1,72 @@ +
+ Eclipse + + + The Nix expressions related to the Eclipse platform and IDE are in pkgs/applications/editors/eclipse. + + + + Nixpkgs provides a number of packages that will install Eclipse in its various forms. These range from the bare-bones Eclipse Platform to the more fully featured Eclipse SDK or Scala-IDE packages and multiple version are often available. It is possible to list available Eclipse packages by issuing the command: + +$ nix-env -f '<nixpkgs>' -qaP -A eclipses --description + + Once an Eclipse variant is installed it can be run using the eclipse command, as expected. From within Eclipse it is then possible to install plugins in the usual manner by either manually specifying an Eclipse update site or by installing the Marketplace Client plugin and using it to discover and install other plugins. This installation method provides an Eclipse installation that closely resemble a manually installed Eclipse. + + + + If you prefer to install plugins in a more declarative manner then Nixpkgs also offer a number of Eclipse plugins that can be installed in an Eclipse environment. This type of environment is created using the function eclipseWithPlugins found inside the nixpkgs.eclipses attribute set. This function takes as argument { eclipse, plugins ? [], jvmArgs ? [] } where eclipse is a one of the Eclipse packages described above, plugins is a list of plugin derivations, and jvmArgs is a list of arguments given to the JVM running the Eclipse. For example, say you wish to install the latest Eclipse Platform with the popular Eclipse Color Theme plugin and also allow Eclipse to use more RAM. You could then add + +packageOverrides = pkgs: { + myEclipse = with pkgs.eclipses; eclipseWithPlugins { + eclipse = eclipse-platform; + jvmArgs = [ "-Xmx2048m" ]; + plugins = [ plugins.color-theme ]; + }; +} + + to your Nixpkgs configuration (~/.config/nixpkgs/config.nix) and install it by running nix-env -f '<nixpkgs>' -iA myEclipse and afterward run Eclipse as usual. It is possible to find out which plugins are available for installation using eclipseWithPlugins by running + +$ nix-env -f '<nixpkgs>' -qaP -A eclipses.plugins --description + + + + + If there is a need to install plugins that are not available in Nixpkgs then it may be possible to define these plugins outside Nixpkgs using the buildEclipseUpdateSite and buildEclipsePlugin functions found in the nixpkgs.eclipses.plugins attribute set. Use the buildEclipseUpdateSite function to install a plugin distributed as an Eclipse update site. This function takes { name, src } as argument where src indicates the Eclipse update site archive. All Eclipse features and plugins within the downloaded update site will be installed. When an update site archive is not available then the buildEclipsePlugin function can be used to install a plugin that consists of a pair of feature and plugin JARs. This function takes an argument { name, srcFeature, srcPlugin } where srcFeature and srcPlugin are the feature and plugin JARs, respectively. + + + + Expanding the previous example with two plugins using the above functions we have + +packageOverrides = pkgs: { + myEclipse = with pkgs.eclipses; eclipseWithPlugins { + eclipse = eclipse-platform; + jvmArgs = [ "-Xmx2048m" ]; + plugins = [ + plugins.color-theme + (plugins.buildEclipsePlugin { + name = "myplugin1-1.0"; + srcFeature = fetchurl { + url = "http://…/features/myplugin1.jar"; + sha256 = "123…"; + }; + srcPlugin = fetchurl { + url = "http://…/plugins/myplugin1.jar"; + sha256 = "123…"; + }; + }); + (plugins.buildEclipseUpdateSite { + name = "myplugin2-1.0"; + src = fetchurl { + stripRoot = false; + url = "http://…/myplugin2.zip"; + sha256 = "123…"; + }; + }); + ]; + }; +} + + +
\ No newline at end of file diff --git a/doc/packages/elm.xml b/doc/packages/elm.xml new file mode 100644 index 000000000000..8ee052852654 --- /dev/null +++ b/doc/packages/elm.xml @@ -0,0 +1,17 @@ +
+ Elm + + + To start a development environment do nix-shell -p elmPackages.elm elmPackages.elm-format + + + + To update Elm compiler, see nixpkgs/pkgs/development/compilers/elm/README.md. + + + + To package Elm applications, read about elm2nix. + +
\ No newline at end of file diff --git a/doc/packages/emacs.xml b/doc/packages/emacs.xml new file mode 100644 index 000000000000..a9a26882c9cd --- /dev/null +++ b/doc/packages/emacs.xml @@ -0,0 +1,131 @@ +
+ Emacs + +
+ Configuring Emacs + + + The Emacs package comes with some extra helpers to make it easier to configure. emacsWithPackages allows you to manage packages from ELPA. This means that you will not have to install that packages from within Emacs. For instance, if you wanted to use company, counsel, flycheck, ivy, magit, projectile, and use-package you could use this as a ~/.config/nixpkgs/config.nix override: + + + +{ + packageOverrides = pkgs: with pkgs; { + myEmacs = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ + company + counsel + flycheck + ivy + magit + projectile + use-package + ])); + } +} + + + + You can install it like any other packages via nix-env -iA myEmacs. However, this will only install those packages. It will not configure them for us. To do this, we need to provide a configuration file. Luckily, it is possible to do this from within Nix! By modifying the above example, we can make Emacs load a custom config file. The key is to create a package that provide a default.el file in /share/emacs/site-start/. Emacs knows to load this file automatically when it starts. + + + +{ + packageOverrides = pkgs: with pkgs; rec { + myEmacsConfig = writeText "default.el" '' +;; initialize package + +(require 'package) +(package-initialize 'noactivate) +(eval-when-compile + (require 'use-package)) + +;; load some packages + +(use-package company + :bind ("<C-tab>" . company-complete) + :diminish company-mode + :commands (company-mode global-company-mode) + :defer 1 + :config + (global-company-mode)) + +(use-package counsel + :commands (counsel-descbinds) + :bind (([remap execute-extended-command] . counsel-M-x) + ("C-x C-f" . counsel-find-file) + ("C-c g" . counsel-git) + ("C-c j" . counsel-git-grep) + ("C-c k" . counsel-ag) + ("C-x l" . counsel-locate) + ("M-y" . counsel-yank-pop))) + +(use-package flycheck + :defer 2 + :config (global-flycheck-mode)) + +(use-package ivy + :defer 1 + :bind (("C-c C-r" . ivy-resume) + ("C-x C-b" . ivy-switch-buffer) + :map ivy-minibuffer-map + ("C-j" . ivy-call)) + :diminish ivy-mode + :commands ivy-mode + :config + (ivy-mode 1)) + +(use-package magit + :defer + :if (executable-find "git") + :bind (("C-x g" . magit-status) + ("C-x G" . magit-dispatch-popup)) + :init + (setq magit-completing-read-function 'ivy-completing-read)) + +(use-package projectile + :commands projectile-mode + :bind-keymap ("C-c p" . projectile-command-map) + :defer 5 + :config + (projectile-global-mode)) + ''; + myEmacs = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ + (runCommand "default.el" {} '' +mkdir -p $out/share/emacs/site-lisp +cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el +'') + company + counsel + flycheck + ivy + magit + projectile + use-package + ])); + }; +} + + + + This provides a fairly full Emacs start file. It will load in addition to the user's presonal config. You can always disable it by passing -q to the Emacs command. + + + + Sometimes emacsWithPackages is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to Melpa Unstable, and the highest for packages manually defined in pkgs/top-level/emacs-packages.nix). But you can't control this priorities when some package is installed as a dependency. You can override it on per-package-basis, providing all the required dependencies manually - but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package you can use overrideScope'. + + + +overrides = self: super: rec { + haskell-mode = self.melpaPackages.haskell-mode; + ... +}; +((emacsPackagesGen emacs).overrideScope' overrides).emacsWithPackages (p: with p; [ + # here both these package will use haskell-mode of our own choice + ghc-mod + dante +]) + +
+
\ No newline at end of file diff --git a/doc/packages/ibus.xml b/doc/packages/ibus.xml new file mode 100644 index 000000000000..561d4d2eabdc --- /dev/null +++ b/doc/packages/ibus.xml @@ -0,0 +1,57 @@ +
+ ibus-engines.typing-booster + + + This package is an ibus-based completion method to speed up typing. + + +
+ Activating the engine + + + IBus needs to be configured accordingly to activate typing-booster. The configuration depends on the desktop manager in use. For detailed instructions, please refer to the upstream docs. + + + + On NixOS you need to explicitly enable ibus with given engines before customizing your desktop to use typing-booster. This can be achieved using the ibus module: +{ pkgs, ... }: { + i18n.inputMethod = { + enabled = "ibus"; + ibus.engines = with pkgs.ibus-engines; [ typing-booster ]; + }; +} + +
+ +
+ Using custom hunspell dictionaries + + + The IBus engine is based on hunspell to support completion in many languages. By default the dictionaries de-de, en-us, fr-moderne es-es, it-it, sv-se and sv-fi are in use. To add another dictionary, the package can be overridden like this: +ibus-engines.typing-booster.override { + langs = [ "de-at" "en-gb" ]; +} + + + + Note: each language passed to langs must be an attribute name in pkgs.hunspellDicts. + +
+ +
+ Built-in emoji picker + + + The ibus-engines.typing-booster package contains a program named emoji-picker. To display all emojis correctly, a special font such as noto-fonts-emoji is needed: + + + + On NixOS it can be installed using the following expression: +{ pkgs, ... }: { + fonts.fonts = with pkgs; [ noto-fonts-emoji ]; +} + +
+
\ No newline at end of file diff --git a/doc/packages/index.xml b/doc/packages/index.xml new file mode 100644 index 000000000000..9f3f58a8d903 --- /dev/null +++ b/doc/packages/index.xml @@ -0,0 +1,23 @@ + + Packages + + This chapter contains information about how to use and maintain the Nix expressions for a number of specific packages, such as the Linux kernel or X.org. + + + + + + + + + + + + + + + + + diff --git a/doc/packages/kakoune.xml b/doc/packages/kakoune.xml new file mode 100644 index 000000000000..fd40dad7ca87 --- /dev/null +++ b/doc/packages/kakoune.xml @@ -0,0 +1,14 @@ +
+ Kakoune + + + Kakoune can be built to autoload plugins: +(kakoune.override { + configure = { + plugins = with pkgs.kakounePlugins; [ parinfer-rust ]; + }; +}) + +
\ No newline at end of file diff --git a/doc/packages/linux.xml b/doc/packages/linux.xml new file mode 100644 index 000000000000..3adfacb6e457 --- /dev/null +++ b/doc/packages/linux.xml @@ -0,0 +1,85 @@ +
+ Linux kernel + + + The Nix expressions to build the Linux kernel are in pkgs/os-specific/linux/kernel. + + + + The function that builds the kernel has an argument kernelPatches which should be a list of {name, patch, extraConfig} attribute sets, where name is the name of the patch (which is included in the kernel’s meta.description attribute), patch is the patch itself (possibly compressed), and extraConfig (optional) is a string specifying extra options to be concatenated to the kernel configuration file (.config). + + + + The kernel derivation exports an attribute features specifying whether optional functionality is or isn’t enabled. This is used in NixOS to implement kernel-specific behaviour. For instance, if the kernel has the iwlwifi feature (i.e. has built-in support for Intel wireless chipsets), then NixOS doesn’t have to build the external iwlwifi package: + +modulesTree = [kernel] + ++ pkgs.lib.optional (!kernel.features ? iwlwifi) kernelPackages.iwlwifi + ++ ...; + + + + + How to add a new (major) version of the Linux kernel to Nixpkgs: + + + + Copy the old Nix expression (e.g. linux-2.6.21.nix) to the new one (e.g. linux-2.6.22.nix) and update it. + + + + + Add the new kernel to all-packages.nix (e.g., create an attribute kernel_2_6_22). + + + + + Now we’re going to update the kernel configuration. First unpack the kernel. Then for each supported platform (i686, x86_64, uml) do the following: + + + + Make an copy from the old config (e.g. config-2.6.21-i686-smp) to the new one (e.g. config-2.6.22-i686-smp). + + + + + Copy the config file for this platform (e.g. config-2.6.22-i686-smp) to .config in the kernel source tree. + + + + + Run make oldconfig ARCH={i386,x86_64,um} and answer all questions. (For the uml configuration, also add SHELL=bash.) Make sure to keep the configuration consistent between platforms (i.e. don’t enable some feature on i686 and disable it on x86_64). + + + + + If needed you can also run make menuconfig: + +$ nix-env -i ncurses +$ export NIX_CFLAGS_LINK=-lncurses +$ make menuconfig ARCH=arch + + + + + Copy .config over the new config file (e.g. config-2.6.22-i686-smp). + + + + + + + + Test building the kernel: nix-build -A kernel_2_6_22. If it compiles, ship it! For extra credit, try booting NixOS with it. + + + + + It may be that the new kernel requires updating the external kernel modules and kernel-dependent packages listed in the linuxPackagesFor function in all-packages.nix (such as the NVIDIA drivers, AUFS, etc.). If the updated packages aren’t backwards compatible with older kernels, you may need to keep the older versions around. + + + + +
\ No newline at end of file diff --git a/doc/packages/locales.xml b/doc/packages/locales.xml new file mode 100644 index 000000000000..15954495e217 --- /dev/null +++ b/doc/packages/locales.xml @@ -0,0 +1,13 @@ +
+ Locales + + + To allow simultaneous use of packages linked against different versions of glibc with different locale archive formats Nixpkgs patches glibc to rely on LOCALE_ARCHIVE environment variable. + + + + On non-NixOS distributions this variable is obviously not set. This can cause regressions in language support or even crashes in some Nixpkgs-provided programs. The simplest way to mitigate this problem is exporting the LOCALE_ARCHIVE variable pointing to ${glibcLocales}/lib/locale/locale-archive. The drawback (and the reason this is not the default) is the relatively large (a hundred MiB) size of the full set of locales. It is possible to build a custom set of locales by overriding parameters allLocales and locales of the package. + +
\ No newline at end of file diff --git a/doc/packages/nginx.xml b/doc/packages/nginx.xml new file mode 100644 index 000000000000..921a6add2a0a --- /dev/null +++ b/doc/packages/nginx.xml @@ -0,0 +1,25 @@ +
+ Nginx + + + Nginx is a reverse proxy and lightweight webserver. + + +
+ ETags on static files served from the Nix store + + + HTTP has a couple different mechanisms for caching to prevent clients from having to download the same content repeatedly if a resource has not changed since the last time it was requested. When nginx is used as a server for static files, it implements the caching mechanism based on the Last-Modified response header automatically; unfortunately, it works by using filesystem timestamps to determine the value of the Last-Modified header. This doesn't give the desired behavior when the file is in the Nix store, because all file timestamps are set to 0 (for reasons related to build reproducibility). + + + + Fortunately, HTTP supports an alternative (and more effective) caching mechanism: the ETag response header. The value of the ETag header specifies some identifier for the particular content that the server is sending (e.g. a hash). When a client makes a second request for the same resource, it sends that value back in an If-None-Match header. If the ETag value is unchanged, then the server does not need to resend the content. + + + + As of NixOS 19.09, the nginx package in Nixpkgs is patched such that when nginx serves a file out of /nix/store, the hash in the store path is used as the ETag header in the HTTP response, thus providing proper caching functionality. This happens automatically; you do not need to do modify any configuration to get this behavior. + +
+
\ No newline at end of file diff --git a/doc/packages/opengl.xml b/doc/packages/opengl.xml new file mode 100644 index 000000000000..fcb624736b09 --- /dev/null +++ b/doc/packages/opengl.xml @@ -0,0 +1,9 @@ +
+ OpenGL + + + Packages that use OpenGL have NixOS desktop as their primary target. The current solution for loading the GPU-specific drivers is based on libglvnd and looks for the driver implementation in LD_LIBRARY_PATH. If you are using a non-NixOS GNU/Linux/X11 desktop with free software video drivers, consider launching OpenGL-dependent programs from Nixpkgs with Nixpkgs versions of libglvnd and mesa_drivers in LD_LIBRARY_PATH. For proprietary video drivers you might have luck with also adding the corresponding video driver package. + +
\ No newline at end of file diff --git a/doc/packages/shell-helpers.xml b/doc/packages/shell-helpers.xml new file mode 100644 index 000000000000..53416ce7e171 --- /dev/null +++ b/doc/packages/shell-helpers.xml @@ -0,0 +1,25 @@ +
+ Interactive shell helpers + + + Some packages provide the shell integration to be more useful. But unlike other systems, nix doesn't have a standard share directory location. This is why a bunch PACKAGE-share scripts are shipped that print the location of the corresponding shared folder. Current list of such packages is as following: + + + + autojump: autojump-share + + + + + fzf: fzf-share + + + + E.g. autojump can then used in the .bashrc like this: + + source "$(autojump-share)/autojump.bash" + + +
\ No newline at end of file diff --git a/doc/packages/steam.xml b/doc/packages/steam.xml new file mode 100644 index 000000000000..413247ee4685 --- /dev/null +++ b/doc/packages/steam.xml @@ -0,0 +1,131 @@ +
+ Steam + +
+ Steam in Nix + + + Steam is distributed as a .deb file, for now only as an i686 package (the amd64 package only has documentation). When unpacked, it has a script called steam that in Ubuntu (their target distro) would go to /usr/bin . When run for the first time, this script copies some files to the user's home, which include another script that is the ultimate responsible for launching the steam binary, which is also in $HOME. + + + + Nix problems and constraints: + + + + We don't have /bin/bash and many scripts point there. Similarly for /usr/bin/python . + + + + + We don't have the dynamic loader in /lib . + + + + + The steam.sh script in $HOME can not be patched, as it is checked and rewritten by steam. + + + + + The steam binary cannot be patched, it's also checked. + + + + + + + The current approach to deploy Steam in NixOS is composing a FHS-compatible chroot environment, as documented here. This allows us to have binaries in the expected paths without disrupting the system, and to avoid patching them to work in a non FHS environment. + +
+ +
+ How to play + + + For 64-bit systems it's important to have +hardware.opengl.driSupport32Bit = true; + in your /etc/nixos/configuration.nix. You'll also need +hardware.pulseaudio.support32Bit = true; + if you are using PulseAudio - this will enable 32bit ALSA apps integration. To use the Steam controller or other Steam supported controllers such as the DualShock 4 or Nintendo Switch Pro, you need to add +hardware.steam-hardware.enable = true; + to your configuration. + +
+ +
+ Troubleshooting + + + + + + Steam fails to start. What do I do? + + + + Try to run +strace steam + to see what is causing steam to fail. + + + + + + Using the FOSS Radeon or nouveau (nvidia) drivers + + + + + + The newStdcpp parameter was removed since NixOS 17.09 and should not be needed anymore. + + + + + Steam ships statically linked with a version of libcrypto that conflics with the one dynamically loaded by radeonsi_dri.so. If you get the error +steam.sh: line 713: 7842 Segmentation fault (core dumped) + have a look at this pull request. + + + + + + + + Java + + + + + + There is no java in steam chrootenv by default. If you get a message like +/home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found + You need to add + steam.override { withJava = true; }; + to your configuration. + + + + + + + +
+ +
+ steam-run + + + The FHS-compatible chroot used for steam can also be used to run other linux games that expect a FHS environment. To do it, add +pkgs.(steam.override { + nativeOnly = true; + newStdcpp = true; + }).run + to your configuration, rebuild, and run the game with +steam-run ./foo + +
+
\ No newline at end of file diff --git a/doc/packages/unfree.xml b/doc/packages/unfree.xml new file mode 100644 index 000000000000..b2d8402005e9 --- /dev/null +++ b/doc/packages/unfree.xml @@ -0,0 +1,13 @@ +
+ Unfree software + + + All users of Nixpkgs are free software users, and many users (and developers) of Nixpkgs want to limit and tightly control their exposure to unfree software. At the same time, many users need (or want) to run some specific pieces of proprietary software. Nixpkgs includes some expressions for unfree software packages. By default unfree software cannot be installed and doesn’t show up in searches. To allow installing unfree software in a single Nix invocation one can export NIXPKGS_ALLOW_UNFREE=1. For a persistent solution, users can set allowUnfree in the Nixpkgs configuration. + + + + Fine-grained control is possible by defining allowUnfreePredicate function in config; it takes the mkDerivation parameter attrset and returns true for unfree packages that should be allowed. + +
\ No newline at end of file diff --git a/doc/packages/weechat.xml b/doc/packages/weechat.xml new file mode 100644 index 000000000000..aeb240d904b5 --- /dev/null +++ b/doc/packages/weechat.xml @@ -0,0 +1,85 @@ +
+ Weechat + + + Weechat can be configured to include your choice of plugins, reducing its closure size from the default configuration which includes all available plugins. To make use of this functionality, install an expression that overrides its configuration such as +weechat.override {configure = {availablePlugins, ...}: { + plugins = with availablePlugins; [ python perl ]; + } +} + If the configure function returns an attrset without the plugins attribute, availablePlugins will be used automatically. + + + + The plugins currently available are python, perl, ruby, guile, tcl and lua. + + + + The python and perl plugins allows the addition of extra libraries. For instance, the inotify.py script in weechat-scripts requires D-Bus or libnotify, and the fish.py script requires pycrypto. To use these scripts, use the plugin's withPackages attribute: +weechat.override { configure = {availablePlugins, ...}: { + plugins = with availablePlugins; [ + (python.withPackages (ps: with ps; [ pycrypto python-dbus ])) + ]; + }; +} + + + + + In order to also keep all default plugins installed, it is possible to use the following method: +weechat.override { configure = { availablePlugins, ... }: { + plugins = builtins.attrValues (availablePlugins // { + python = availablePlugins.python.withPackages (ps: with ps; [ pycrypto python-dbus ]); + }); +}; } + + + + + WeeChat allows to set defaults on startup using the --run-command. The configure method can be used to pass commands to the program: +weechat.override { + configure = { availablePlugins, ... }: { + init = '' + /set foo bar + /server add freenode chat.freenode.org + ''; + }; +} + Further values can be added to the list of commands when running weechat --run-command "your-commands". + + + + Additionally it's possible to specify scripts to be loaded when starting weechat. These will be loaded before the commands from init: +weechat.override { + configure = { availablePlugins, ... }: { + scripts = with pkgs.weechatScripts; [ + weechat-xmpp weechat-matrix-bridge wee-slack + ]; + init = '' + /set plugins.var.python.jabber.key "val" + '': + }; +} + + + + In nixpkgs there's a subpackage which contains derivations for WeeChat scripts. Such derivations expect a passthru.scripts attribute which contains a list of all scripts inside the store path. Furthermore all scripts have to live in $out/share. An exemplary derivation looks like this: +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "exemplary-weechat-script"; + src = fetchurl { + url = "https://scripts.tld/your-scripts.tar.gz"; + sha256 = "..."; + }; + passthru.scripts = [ "foo.py" "bar.lua" ]; + installPhase = '' + mkdir $out/share + cp foo.py $out/share + cp bar.lua $out/share + ''; +} + +
\ No newline at end of file diff --git a/doc/packages/xorg.xml b/doc/packages/xorg.xml new file mode 100644 index 000000000000..4526121687fc --- /dev/null +++ b/doc/packages/xorg.xml @@ -0,0 +1,34 @@ +
+ X.org + + + The Nix expressions for the X.org packages reside in pkgs/servers/x11/xorg/default.nix. This file is automatically generated from lists of tarballs in an X.org release. As such it should not be modified directly; rather, you should modify the lists, the generator script or the file pkgs/servers/x11/xorg/overrides.nix, in which you can override or add to the derivations produced by the generator. + + + + The generator is invoked as follows: + +$ cd pkgs/servers/x11/xorg +$ cat tarballs-7.5.list extra.list old.list \ + | perl ./generate-expr-from-tarballs.pl + + For each of the tarballs in the .list files, the script downloads it, unpacks it, and searches its configure.ac and *.pc.in files for dependencies. This information is used to generate default.nix. The generator caches downloaded tarballs between runs. Pay close attention to the NOT FOUND: name messages at the end of the run, since they may indicate missing dependencies. (Some might be optional dependencies, however.) + + + + A file like tarballs-7.5.list contains all tarballs in a X.org release. It can be generated like this: + +$ export i="mirror://xorg/X11R7.4/src/everything/" +$ cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) \ + | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' \ + | sort > tarballs-7.4.list + + extra.list contains libraries that aren’t part of X.org proper, but are closely related to it, such as libxcb. old.list contains some packages that were removed from X.org, but are still needed by some people or by other packages (such as imake). + + + + If the expression for a package requires derivation attributes that the generator cannot figure out automatically (say, patches or a postInstall hook), you should modify pkgs/servers/x11/xorg/overrides.nix. + +
\ No newline at end of file From 16d733bbe58baa9e4dfd1912d13d7fdc59268212 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 20 Oct 2019 13:34:32 +0200 Subject: [PATCH 043/142] doc: move fetchers and trivial builders under builders --- doc/{functions => builders}/fetchers.xml | 8 ++++---- doc/{functions => builders}/trivial-builders.xml | 6 +++--- doc/functions.xml | 2 -- doc/manual.xml | 4 +++- 4 files changed, 10 insertions(+), 10 deletions(-) rename doc/{functions => builders}/fetchers.xml (97%) rename doc/{functions => builders}/trivial-builders.xml (97%) diff --git a/doc/functions/fetchers.xml b/doc/builders/fetchers.xml similarity index 97% rename from doc/functions/fetchers.xml rename to doc/builders/fetchers.xml index 369c1fb153eb..6f8990e8d16c 100644 --- a/doc/functions/fetchers.xml +++ b/doc/builders/fetchers.xml @@ -1,8 +1,8 @@ -
- Fetcher functions + xml:id="chap-pkgs-fetchers"> + Fetchers When using Nix, you will frequently need to download source code and other files from the internet. Nixpkgs comes with a few helper functions that allow you to fetch fixed-output derivations in a structured way. @@ -145,4 +145,4 @@ stdenv.mkDerivation { -
+ diff --git a/doc/functions/trivial-builders.xml b/doc/builders/trivial-builders.xml similarity index 97% rename from doc/functions/trivial-builders.xml rename to doc/builders/trivial-builders.xml index ae9f3a1b255d..c99425620b16 100644 --- a/doc/functions/trivial-builders.xml +++ b/doc/builders/trivial-builders.xml @@ -1,7 +1,7 @@ -
+ xml:id="chap-trivial-builders"> Trivial builders @@ -76,4 +76,4 @@ -
+ diff --git a/doc/functions.xml b/doc/functions.xml index 3e126e6b1397..81aef5f3a830 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -10,8 +10,6 @@ - - diff --git a/doc/manual.xml b/doc/manual.xml index 001a5f3eca53..d0ded1e2e167 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -21,7 +21,9 @@ - Languages, frameworks and packages + Builders + + From fdee83d0fb46f326265dfa5d84de43416dac770d Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 20 Oct 2019 09:02:45 -0400 Subject: [PATCH 044/142] zabbix: init at 4.4.0 --- pkgs/servers/monitoring/zabbix/versions.nix | 5 +++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 6 insertions(+) diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 21557634197c..03e9464de014 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,4 +1,9 @@ generic: { + v44 = generic { + version = "4.4.0"; + sha256 = "1a4csx1i21lcavfvj5djalcnxnlyh4mhk4dddzm895ipl87afzf4"; + }; + v42 = generic { version = "4.2.7"; sha256 = "09znh8x1sass5mw6wjrfmizjbfls8ad2c16y24ldfj40hlfxz6wx"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0320c9f2aba..01e7176a8221 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15503,6 +15503,7 @@ in server = server-pgsql; }; + zabbix44 = zabbixFor "v44"; zabbix42 = zabbixFor "v42"; zabbix40 = zabbixFor "v40"; zabbix30 = zabbixFor "v30"; From add1b8c863cb7cc437435eb654eba44eee4c8416 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 Oct 2019 06:54:32 -0700 Subject: [PATCH 045/142] bitcoin-abc: 0.20.2 -> 0.20.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/bitcoin-abc/versions --- pkgs/applications/blockchains/bitcoin-abc.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix index cd07a57cba7f..5bdfc39e0aab 100644 --- a/pkgs/applications/blockchains/bitcoin-abc.nix +++ b/pkgs/applications/blockchains/bitcoin-abc.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version; - version = "0.20.2"; + version = "0.20.3"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "1hii6wjz6095jpy5kw7z6i3fn2jf1dvsppf162xx2c08n9vmz3s3"; + sha256 = "1m0k685czpywmkzhzfa09jc0hvmh7rk5rywwlq2chxz50pzm2m3a"; }; patches = [ ./fix-bitcoin-qt-build.patch ]; From ca6c91e395763b3083b2cca40f733e66696d2506 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 18 Oct 2019 14:05:53 +0200 Subject: [PATCH 046/142] nixos/networkmanager: remove networking.networkmanager.dynamicHosts This option was removed because allowing (multiple) regular users to override host entries affecting the whole system opens up a huge attack vector. There seem to be very rare cases where this might be useful. Consider setting system-wide host entries using networking.hosts, provide them via the DNS server in your network, or use networking.networkmanager.appendNameservers to point your system to another (local) nameserver to set those entries. --- nixos/doc/manual/release-notes/rl-2003.xml | 14 ++- .../services/networking/networkmanager.nix | 87 +++---------------- 2 files changed, 24 insertions(+), 77 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index ab0951e831ce..33eba8002bab 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -85,7 +85,19 @@ - + + The dynamicHosts option has been removed from the + networkd + module. Allowing (multiple) regular users to override host entries + affecting the whole system opens up a huge attack vector. + There seem to be very rare cases where this might be useful. + Consider setting system-wide host entries using + networking.hosts, provide + them via the DNS server in your network, or use + environment.etc + to add a file into /etc/NetworkManager/dnsmasq.d + reconfiguring hostsdir. + diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 3f1d0727d9bc..870a7264d268 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -17,9 +17,6 @@ let networkmanager-vpnc ] ++ optional (!delegateWireless && !enableIwd) wpa_supplicant; - dynamicHostsEnabled = - cfg.dynamicHosts.enable && cfg.dynamicHosts.hostsDirs != {}; - delegateWireless = config.networking.wireless.enable == true && cfg.unmanaged != []; enableIwd = cfg.wifi.backend == "iwd"; @@ -338,55 +335,20 @@ in { so you don't need to to that yourself. ''; }; - - dynamicHosts = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enabling this option requires the - option to be - set to dnsmasq. If enabled, the directories - defined by the - - option will be set up when the service starts. The dnsmasq instance - managed by NetworkManager will then watch those directories for - hosts files (see the --hostsdir option of - dnsmasq). This way a non-privileged user can add or override DNS - entries on the local system (depending on what hosts directories - that are configured).. - ''; - }; - hostsDirs = mkOption { - type = with types; attrsOf (submodule { - options = { - user = mkOption { - type = types.str; - default = "root"; - description = '' - The user that will own the hosts directory. - ''; - }; - group = mkOption { - type = types.str; - default = "root"; - description = '' - The group that will own the hosts directory. - ''; - }; - }; - }); - default = {}; - description = '' - Defines a set of directories (relative to - /run/NetworkManager/hostdirs) that dnsmasq will - watch for hosts files. - ''; - }; - }; }; }; + imports = [ + (mkRemovedOptionModule ["networking" "networkmanager" "dynamicHosts"] '' + This option was removed because allowing (multiple) regular users to + override host entries affecting the whole system opens up a huge attack + vector. There seem to be very rare cases where this might be useful. + Consider setting system-wide host entries using networking.hosts, provide + them via the DNS server in your network, or use environment.etc + to add a file into /etc/NetworkManager/dnsmasq.d reconfiguring hostsdir. + '') + ]; + ###### implementation @@ -399,12 +361,6 @@ in { Except if you mark some interfaces as unmanaged by NetworkManager. ''; } - { assertion = !dynamicHostsEnabled || (dynamicHostsEnabled && cfg.dns == "dnsmasq"); - message = '' - To use networking.networkmanager.dynamicHosts you also need to set - `networking.networkmanager.dns = "dnsmasq"` - ''; - } ]; environment.etc = with pkgs; [ @@ -438,12 +394,6 @@ in { target = "NetworkManager/dispatcher.d/${dispatcherTypesSubdirMap.${s.type}}03userscript${lib.fixedWidthNumber 4 i}"; mode = "0544"; }) cfg.dispatcherScripts - ++ optional dynamicHostsEnabled - { target = "NetworkManager/dnsmasq.d/dyndns.conf"; - text = concatMapStrings (n: '' - hostsdir=/run/NetworkManager/hostsdirs/${n} - '') (attrNames cfg.dynamicHosts.hostsDirs); - } ++ optional cfg.enableStrongSwan { source = "${pkgs.networkmanager_strongswan}/lib/NetworkManager/VPN/nm-strongswan-service.name"; target = "NetworkManager/VPN/nm-strongswan-service.name"; @@ -491,21 +441,6 @@ in { systemd.services.ModemManager.aliases = [ "dbus-org.freedesktop.ModemManager1.service" ]; - systemd.services.nm-setup-hostsdirs = mkIf dynamicHostsEnabled { - wantedBy = [ "NetworkManager.service" ]; - before = [ "NetworkManager.service" ]; - partOf = [ "NetworkManager.service" ]; - script = concatStrings (mapAttrsToList (n: d: '' - mkdir -p "/run/NetworkManager/hostsdirs/${n}" - chown "${d.user}:${d.group}" "/run/NetworkManager/hostsdirs/${n}" - chmod 0775 "/run/NetworkManager/hostsdirs/${n}" - '') cfg.dynamicHosts.hostsDirs); - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - }; - }; - systemd.services.NetworkManager-dispatcher = { wantedBy = [ "network.target" ]; restartTriggers = [ configFile ]; From bc09bf4d712bc4bc601696706259e21d04d88b67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcial=20Gai=C3=9Fert?= Date: Sun, 20 Oct 2019 14:04:01 +0200 Subject: [PATCH 047/142] ricty: change mirror and homepage url The old mirror and homepage at www.rs.tus.ac.jp return a 403 Forbidden. --- pkgs/data/fonts/ricty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/ricty/default.nix b/pkgs/data/fonts/ricty/default.nix index ab794992e45f..a248bb9d4949 100644 --- a/pkgs/data/fonts/ricty/default.nix +++ b/pkgs/data/fonts/ricty/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.1.1"; src = fetchurl { - url = "https://www.rs.tus.ac.jp/yyusa/ricty/ricty_generator-${version}.sh"; + url = "http://www.yusa.lab.uec.ac.jp/~yusa/ricty/ricty_generator-${version}.sh"; sha256 = "03fngb8f5hl7ifigdm5yljhs4z2x80cq8y8kna86d07ghknhzgw6"; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A high-quality Japanese font based on Inconsolata and Migu 1M"; - homepage = https://www.rs.tus.ac.jp/yyusa/ricty.html; + homepage = http://www.yusa.lab.uec.ac.jp/~yusa/ricty.html; license = licenses.unfree; maintainers = [ maintainers.mikoim ]; }; From bd42bcd2404245f926089069a07268e594ff50af Mon Sep 17 00:00:00 2001 From: Renaud Date: Sun, 20 Oct 2019 16:49:18 +0200 Subject: [PATCH 048/142] libwhereami: disable on ARM Hydra still tries to build it on aarch64 even though this lib is incompatible with ARMv7 / ARMv8 --- pkgs/development/libraries/libwhereami/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwhereami/default.nix b/pkgs/development/libraries/libwhereami/default.nix index 4014dc8dd769..a6715bdc18df 100644 --- a/pkgs/development/libraries/libwhereami/default.nix +++ b/pkgs/development/libraries/libwhereami/default.nix @@ -24,8 +24,7 @@ stdenv.mkDerivation rec { description = "Library to report hypervisor information from inside a VM"; license = licenses.asl20; maintainers = [ maintainers.womfoo ]; - platforms = platforms.linux; - badPlatforms = platforms.arm; + platforms = with platforms; [ "i686-linux" "x86_64-linux" ]; # fails on aarch64 }; } From a110c8e69dbd937f76bb3e0dd6b6df916c7fbd30 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 17 Oct 2019 12:35:51 +0200 Subject: [PATCH 049/142] pythonPackages.zope-deferredimport: disable tests relies on zope-testrunner. Import fails, likely because of how zope-testrunner functions. --- pkgs/development/python-modules/zope-deferredimport/default.nix | 2 ++ pkgs/development/python-modules/zope_testrunner/default.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/zope-deferredimport/default.nix b/pkgs/development/python-modules/zope-deferredimport/default.nix index f447d29f2804..26d8255c03b2 100644 --- a/pkgs/development/python-modules/zope-deferredimport/default.nix +++ b/pkgs/development/python-modules/zope-deferredimport/default.nix @@ -23,6 +23,8 @@ buildPythonPackage rec { zope-testrunner --test-path=src [] ''; + doCheck = false; + meta = with lib; { description = "Allows you to perform imports names that will only be resolved when used in the code"; homepage = https://github.com/zopefoundation/zope.deferredimport; diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix index fd2cf470e6f0..e310cdbf3121 100644 --- a/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ]; - doCheck = !stdenv.isDarwin; + doCheck = false; # custom test modifies sys.path meta = with stdenv.lib; { description = "A flexible test runner with layer support"; From deee216d420a999ec620f4b6907fdc3aa32195f9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 20 Oct 2019 18:02:03 +0200 Subject: [PATCH 050/142] anydesk: add pulseaudio to buildInputs Audio support requires libpulse.so and the application complained about not being able to find it. --- pkgs/applications/networking/remote/anydesk/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index cec4e72e2ad3..3ee934e8b291 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, makeWrapper, makeDesktopItem , atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU_combined, pango, xorg -, lsb-release, freetype, fontconfig, pangox_compat, polkit, polkit_gnome }: +, lsb-release, freetype, fontconfig, pangox_compat, polkit, polkit_gnome +, pulseaudio }: let sha256 = { @@ -37,7 +38,7 @@ in stdenv.mkDerivation rec { buildInputs = [ atk cairo gdk-pixbuf glib gtk2 stdenv.cc.cc pango gnome2.gtkglext libGLU_combined freetype fontconfig - pangox_compat polkit polkit_gnome + pangox_compat polkit polkit_gnome pulseaudio ] ++ (with xorg; [ libxcb libX11 libXdamage libXext libXfixes libXi libXmu libXrandr libXtst libXt libICE libSM libXrender From db6505e293023ec3585d5933258fb71f5e51cb64 Mon Sep 17 00:00:00 2001 From: dadada Date: Thu, 17 Oct 2019 08:47:11 +0200 Subject: [PATCH 051/142] maintainers: add dadada --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7a3aa7b8f005..5cf709241d01 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1432,6 +1432,16 @@ } ]; }; + dadada = { + name = "dadada"; + email = "dadada@dadada.li"; + github = "dadada"; + githubId = 7216772; + keys = [{ + longkeyid = "ed25519/0xEEB8D1CE62C4DFEA"; + fingerprint = "D68C 8469 5C08 7E0F 733A 28D0 EEB8 D1CE 62C4 DFEA"; + }]; + }; dalance = { email = "dalance@gmail.com"; github = "dalance"; From e30988e506b58475e8f7173082ecdcb484c375a4 Mon Sep 17 00:00:00 2001 From: dadada Date: Thu, 17 Oct 2019 08:50:49 +0200 Subject: [PATCH 052/142] init: managesieve at 0.6 --- .../python-modules/managesieve/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 3 +++ 3 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/managesieve/default.nix diff --git a/pkgs/development/python-modules/managesieve/default.nix b/pkgs/development/python-modules/managesieve/default.nix new file mode 100644 index 000000000000..e23c3621c2e9 --- /dev/null +++ b/pkgs/development/python-modules/managesieve/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestrunner +, pytest +}: + +buildPythonPackage rec { + pname = "managesieve"; + version = "0.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "ee70e298e9b68eb81f93d52a1320a034fdc182f3927fdd551836fc93b0ed2c5f"; + }; + + checkInputs = [ pytestrunner pytest ]; + + meta = with lib; { + description = "ManageSieve client library for remotely managing Sieve scripts"; + homepage = "https://managesieve.readthedocs.io/"; + # PSFL for the python module, GPLv3 for sieveshell + license = with licenses; [ gpl3 psfl ]; + maintainers = with maintainers; [ dadada ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 332771dee458..562ffa3c743b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25205,4 +25205,6 @@ in keycard-cli = callPackage ../tools/security/keycard-cli {}; + sieveshell = with python3.pkgs; toPythonApplication managesieve; + } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 193ea4596212..8de4b638a06d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6338,6 +6338,9 @@ in { pyprof2calltree = callPackage ../development/python-modules/pyprof2calltree { }; hcloud = callPackage ../development/python-modules/hcloud { }; + + managesieve = callPackage ../development/python-modules/managesieve { }; + }); in fix' (extends overrides packages) From 7c6f46511d310936f509535d59656fe47c88f18f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 Oct 2019 09:47:44 -0700 Subject: [PATCH 053/142] facter: 3.13.2 -> 3.14.5 (#64019) * facter: 3.13.2 -> 3.14.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/facter/versions * facter: 3.14.0 -> 3.14.5 --- pkgs/tools/system/facter/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index ee9cdf361294..ad90a52a5bdb 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,29 +2,30 @@ stdenv.mkDerivation rec { pname = "facter"; - version = "3.13.2"; + version = "3.14.5"; src = fetchFromGitHub { - sha256 = "1yaj1qlyzsaffzpm4zmzm53mc6bhpzka8wc3dfk909nzykxg34zf"; + sha256 = "0xzzhlsfw8yd3ac4kvr3za0rlkgfw28dzxzi5i1qbhzljivvipm5"; rev = version; - repo = "facter"; + repo = pname; owner = "puppetlabs"; }; CXXFLAGS = "-fpermissive -Wno-error=catch-value"; NIX_LDFLAGS = "-lblkid"; - cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby.so" ]; + cmakeFlags = [ + "-DFACTER_RUBY=${ruby}/lib/libruby.so" + "-DRUBY_LIB_INSTALL=${placeholder "out"}/lib/ruby" + ]; - # since we cant expand $out in cmakeFlags - preConfigure = "cmakeFlags+=\" -DRUBY_LIB_INSTALL=$out/lib/ruby\""; - - buildInputs = [ boost cmake cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby utillinux ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby utillinux ]; enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/puppetlabs/facter; + homepage = "https://github.com/puppetlabs/facter"; description = "A system inventory tool"; license = licenses.asl20; maintainers = [ maintainers.womfoo ]; From 0486eacdbb24f901347acb76bf5a3646fd2c29cd Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Mon, 14 Oct 2019 17:11:49 +0200 Subject: [PATCH 054/142] perlPackages.CryptScryptKDF: init at 0.010 --- pkgs/top-level/perl-packages.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8f5b3b0a5522..36dcacd08837 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3451,6 +3451,23 @@ let }; }; + CryptScryptKDF = buildPerlModule { + pname = "Crypt-ScryptKDF"; + version = "0.010"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MIK/Crypt-ScryptKDF-0.010.tar.gz"; + sha256 = "7d16ee95cce3eb54c174673a7299f4c086fba3ac85f847d0e134feed5f776017"; + }; + propagatedBuildInputs = [ CryptOpenSSLRandom ]; + perlPreHook = "export LD=$CC"; + meta = { + description = "Scrypt password based key derivation function"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/DCIT/perl-Crypt-ScryptKDF"; + maintainers = [ maintainers.sgo ]; + }; + }; + CryptSmbHash = buildPerlPackage { pname = "Crypt-SmbHash"; version = "0.12"; From f70fbfa63b4ce59362634faf662e133982c6d1d9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Sep 2019 18:00:01 -0700 Subject: [PATCH 055/142] ldc: 1.16.0 -> 1.17.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ldc/versions --- pkgs/development/compilers/ldc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index 787a9352e225..03e6fa82b9d0 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -2,8 +2,8 @@ , python, libconfig, lit, gdb, unzip, darwin, bash , callPackage, makeWrapper, targetPackages , bootstrapVersion ? false -, version ? "1.16.0" -, ldcSha256 ? "00kk6pijn1ay2kkrp6b5ismawxr10azwij89k1rkszavqq6rsva2" +, version ? "1.17.0" +, ldcSha256 ? "1aag5jfrng6p4ms0fs90hjbv9bcj3hj8h52r68c3cm6racdajbva" }: let From f35f0880f2cdbc8c1bc81492811251f120d7a9bc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Sep 2019 17:00:17 -0700 Subject: [PATCH 056/142] libabw: 0.1.2 -> 0.1.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libabw/versions --- pkgs/development/libraries/libabw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libabw/default.nix b/pkgs/development/libraries/libabw/default.nix index f953c170ab50..a37d4756cbd8 100644 --- a/pkgs/development/libraries/libabw/default.nix +++ b/pkgs/development/libraries/libabw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libabw"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { url = "https://dev-www.libreoffice.org/src/libabw/${pname}-${version}.tar.xz"; - sha256 = "11949iscdb99f2jplxjd39282jxcrf2fw0sqbh5dl7gqb96r8whb"; + sha256 = "1vbfrmnvib3cym0yyyabnd8xpx4f7wp20vnn09s6dln347fajqz7"; }; # Boost 1.59 compatability fix From 8d04355d877ecb38f0fd0725629ba3dfa4d3adf6 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 20 Oct 2019 13:27:23 -0400 Subject: [PATCH 057/142] qgroundcontrol: 3.3.0 -> 3.5.5, fix build (#71308) * qgroundcontrol: 3.3.0 -> 3.5.4, fix build * qgroundcontrol: 3.5.4 -> 3.5.5 --- .../robotics/qgroundcontrol/default.nix | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index f9fea3f31462..cbf7f4db8c41 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchgit, git, SDL2, udev, doxygen -, qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns -, qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmake, qtspeech +{ lib, mkDerivation, fetchgit, SDL2 +, qtbase, qtcharts, qtlocation, qtserialport, qtsvg, qtquickcontrols2 +, qtgraphicaleffects, qtspeech, qmake , makeWrapper , gst_all_1, pkgconfig }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "qgroundcontrol"; - version = "3.3.0"; + version = "3.5.5"; qtInputs = [ - qtbase qtlocation qtserialport qtdeclarative qtconnectivity qtxmlpatterns qtsvg - qtquick1 qtquickcontrols qtgraphicaleffects qtspeech + qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 + qtgraphicaleffects qtspeech ]; gstInputs = with gst_all_1; [ @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; - buildInputs = [ SDL2 udev doxygen git ] ++ gstInputs ++ qtInputs; + buildInputs = [ SDL2 ] ++ gstInputs ++ qtInputs; nativeBuildInputs = [ pkgconfig makeWrapper qmake ]; preConfigure = '' @@ -58,17 +58,16 @@ stdenv.mkDerivation rec { # TODO: package mavlink so we can build from a normal source tarball src = fetchgit { url = "https://github.com/mavlink/qgroundcontrol.git"; - rev = "refs/tags/v${version}"; - sha256 = "0abjm0wywp24qlgg9w8g35ijprjg5csq4fgba9caaiwvmpfbhmpw"; + rev = "v${version}"; + sha256 = "05zy6w9lwwh254wa8c6wysa67kk0flywcvipii9b1rmy47slflhs"; fetchSubmodules = true; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks"; - homepage = http://qgroundcontrol.org/; + homepage = "http://qgroundcontrol.org/"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ pxc ]; - broken = true; }; } From 535c5a8a0497a24b4cd6022fd7ae8e02937b55b1 Mon Sep 17 00:00:00 2001 From: Marek Fajkus Date: Sun, 20 Oct 2019 17:16:31 +0200 Subject: [PATCH 058/142] cargo-generate: 0.3.0 -> 0.4.0 --- pkgs/development/tools/rust/cargo-generate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index 144e1d71a110..970c641fe494 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-generate"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "ashleygwilliams"; repo = "cargo-generate"; rev = "v${version}"; - sha256 = "0n6na6xq4bvs9hc7vc86qqmlrkv824qdmja27b21l2wz3l77r4jb"; + sha256 = "09276jrb0a735v6p06wz94kbk8bblwpca13vpvy8n0jjmqack2xb"; }; - cargoSha256 = "00fgzh1s63rr1vs3ahra604m81fc4imx3s09brw2y0n46syhwypi"; + cargoSha256 = "1gbxfmhwzpxm0gs3zwzs010j0ndi5aw6xsvvngg0h1lpwg9ypnbr"; nativeBuildInputs = [ pkgconfig ]; From 6f6331dbb38ae8fffbaeba3897cfd8ef09dc4d9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 20 Oct 2019 19:36:35 +0200 Subject: [PATCH 059/142] softmaker-office: fix product unlock error SoftMaker/FreeOffice collects some system information upon unlocking the product. But in doing so, it attempts to execute /bin/ls. If the execve syscall fails, the whole unlock procedure fails. This works around that by rewriting /bin/ls to the proper path. SoftMaker Office restarts itself upon some operations, such changing the theme and unlocking. Unfortunately, we do not have control over its environment then and it will fail with an error. Starting SoftMaker Office from scratch will then work. Fixes #71228 --- .../applications/office/softmaker/generic.nix | 30 ++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix index 9505271db14c..56dc6a5e4f7f 100644 --- a/pkgs/applications/office/softmaker/generic.nix +++ b/pkgs/applications/office/softmaker/generic.nix @@ -3,6 +3,10 @@ # Dynamic Libraries , curl, libGL, libX11, libXext, libXmu, libXrandr, libXrender + # For fixing up execution of /bin/ls, which is necessary for + # product unlocking. +, coreutils, libredirect + , pname, version, edition, suiteName, src, archive , ... @@ -45,7 +49,22 @@ in stdenv.mkDerivation rec { runHook postUnpack ''; - installPhase = '' + installPhase = let + # SoftMaker/FreeOffice collects some system information upon + # unlocking the product. But in doing so, it attempts to execute + # /bin/ls. If the execve syscall fails, the whole unlock + # procedure fails. This works around that by rewriting /bin/ls + # to the proper path. + # + # SoftMaker Office restarts itself upon some operations, such + # changing the theme and unlocking. Unfortunately, we do not + # have control over its environment then and it will fail + # with an error. + lsIntercept = '' + --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ + --set NIX_REDIRECTS "/bin/ls=${coreutils}/bin/ls" + ''; + in '' runHook preInstall mkdir -p $out/share @@ -54,9 +73,12 @@ in stdenv.mkDerivation rec { # Wrap rather than symlinking, so that the programs can determine # their resource path. mkdir -p $out/bin - makeWrapper $out/share/${pname}${edition}/planmaker $out/bin/${pname}-planmaker - makeWrapper $out/share/${pname}${edition}/presentations $out/bin/${pname}-presentations - makeWrapper $out/share/${pname}${edition}/textmaker $out/bin/${pname}-textmaker + makeWrapper $out/share/${pname}${edition}/planmaker $out/bin/${pname}-planmaker \ + ${lsIntercept} + makeWrapper $out/share/${pname}${edition}/presentations $out/bin/${pname}-presentations \ + ${lsIntercept} + makeWrapper $out/share/${pname}${edition}/textmaker $out/bin/${pname}-textmaker \ + ${lsIntercept} for size in 16 32 48 64 96 128 256 512 1024; do mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps From 4b8c297d52336cf483ec85c6a7a78b563d3d19fc Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sun, 20 Oct 2019 20:19:25 +0200 Subject: [PATCH 060/142] perlPackages.Starlet: disable checks on Darwin Failing on Hydra for some months --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ed74e032e135..e60b9b273fe7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15771,6 +15771,7 @@ let }; buildInputs = [ LWP TestSharedFork TestTCP ]; propagatedBuildInputs = [ ParallelPrefork Plack ServerStarter ]; + doCheck = !stdenv.isDarwin; meta = { description = "A simple, high-performance PSGI/Plack HTTP server"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From f82d733d77126faaddd6b2eedc274ea9d35777c2 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Tue, 15 Oct 2019 00:45:13 +0200 Subject: [PATCH 061/142] perlPackages.MojoliciousPluginOpenAPI: init at 2.17 --- pkgs/top-level/perl-packages.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 04007a1016e4..5f6c3b965124 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11509,6 +11509,22 @@ let }; }; + MojoliciousPluginOpenAPI = buildPerlPackage { + pname = "Mojolicious-Plugin-OpenAPI"; + version = "2.17"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-OpenAPI-2.17.tar.gz"; + sha256 = "c20f8b07fb8582fdbf0b540f4cfc5fe95f262743522a160526024342a7f0a1f0"; + }; + propagatedBuildInputs = [ JSONValidator ]; + meta = { + homepage = "https://github.com/jhthorsen/mojolicious-plugin-openapi"; + description = "OpenAPI / Swagger plugin for Mojolicious"; + license = stdenv.lib.licenses.artistic2; + maintainers = [ maintainers.sgo ]; + }; + }; + MojoliciousPluginStatus = buildPerlPackage { pname = "Mojolicious-Plugin-Status"; version = "1.0"; @@ -12897,6 +12913,7 @@ let sha256 = "1aiy7adirk3wpwlczd8sldi9k1dray0jrg1lbcrcw97zwcrkciam"; }; buildInputs = [ TestNoWarnings ]; + perlPreHook = "export LD=$CC"; meta = { description = "Internationalizing Domain Names in Applications (IDNA)"; }; From 642bed5ba32d5fbe6907d65651133a5b080499ea Mon Sep 17 00:00:00 2001 From: Maciek Starzyk Date: Mon, 2 Sep 2019 22:31:50 +0200 Subject: [PATCH 062/142] tab: init at 7.2 --- pkgs/tools/text/tab/default.nix | 36 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/tools/text/tab/default.nix diff --git a/pkgs/tools/text/tab/default.nix b/pkgs/tools/text/tab/default.nix new file mode 100644 index 000000000000..b7855bc75325 --- /dev/null +++ b/pkgs/tools/text/tab/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromBitbucket, python2 }: + +stdenv.mkDerivation rec { + version = "7.2"; + pname = "tab"; + + src = fetchFromBitbucket { + owner = "tkatchev"; + repo = pname; + rev = version; + sha256 = "1bm15lw0vp901dj2vsqx6yixmn7ls3brrzh1w6zgd1ksjzlm5aax"; + }; + + nativeBuildInputs = [ python2 ]; + + doCheck = true; + + checkTarget = "test"; + + installPhase = '' + runHook preInstall + + install -Dm555 -t $out/bin tab + install -Dm444 -t $out/share/doc/tab docs/*.html + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Programming language/shell calculator"; + homepage = https://tkatchev.bitbucket.io/tab/; + license = licenses.boost; + maintainers = with maintainers; [ mstarzyk ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 562ffa3c743b..d4a8b1d9cae1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5589,6 +5589,8 @@ in plex = callPackage ../servers/plex { }; plexRaw = callPackage ../servers/plex/raw.nix { }; + tab = callPackage ../tools/text/tab { }; + tautulli = callPackage ../servers/tautulli { python = python2; }; ploticus = callPackage ../tools/graphics/ploticus { From b09794c3b269eec37ea28ba53ee3bc3ac745fccd Mon Sep 17 00:00:00 2001 From: Thilo Uttendorfer Date: Sun, 20 Oct 2019 22:40:18 +0200 Subject: [PATCH 063/142] openxcom: 1.0.0.2018.10.08 -> 1.0.0.2019.10.18 - Updated repo owner --- pkgs/games/openxcom/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index 9b3d92a350d3..2958a162bbcb 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -1,15 +1,15 @@ {stdenv, fetchFromGitHub, cmake, libGLU_combined, zlib, openssl, libyamlcpp, boost , SDL, SDL_image, SDL_mixer, SDL_gfx }: -let version = "1.0.0.2018.10.08"; in +let version = "1.0.0.2019.10.18"; in stdenv.mkDerivation { pname = "openxcom"; inherit version; src = fetchFromGitHub { - owner = "SupSuper"; + owner = "OpenXcom"; repo = "OpenXcom"; - rev = "13049d617fe762b91893faaf7c14ddefa49e2f1d"; - sha256 = "0vpcfk3g1bnwwmrln14jkj2wvw2z8igxw2mdb7c3y66466wm93ig"; + rev = "f9853b2cb8c8f741ac58707487ef493416d890a3"; + sha256 = "0kbfawj5wsp1mwfcm5mwpkq6s3d13pailjm5w268gqpxjksziyq0"; }; nativeBuildInputs = [ cmake ]; From 8298ecc8a02f72c6db3f3ae7c415ff8224cc6881 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 20 Oct 2019 09:50:27 -0700 Subject: [PATCH 064/142] kustomize: 3.1.0 -> 3.3.1 --- pkgs/development/tools/kustomize/default.nix | 26 ++++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index 07d2357a50b6..e60181e9bc4c 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -1,29 +1,29 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, tree }: buildGoModule rec { pname = "kustomize"; - version = "3.1.0"; - # rev is the 3.1.0 commit, mainly for kustomize version command output - rev = "95f3303493fdea243ae83b767978092396169baf"; + version = "3.3.1"; + # rev is the 3.3.1 commit, mainly for kustomize version command output + rev = "f2ac5a2d0df13c047fb20cbc12ef1a3b41ce2dad"; - goPackagePath = "sigs.k8s.io/kustomize"; - subPackages = [ "cmd/kustomize" ]; - - buildFlagsArray = let t = "${goPackagePath}/v3/pkg/commands/misc"; in '' + buildFlagsArray = let t = "sigs.k8s.io/kustomize/v3/provenance"; in '' -ldflags= - -s -X ${t}.kustomizeVersion=${version} + -s -X ${t}.version=${version} -X ${t}.gitCommit=${rev} -X ${t}.buildDate=unknown ''; src = fetchFromGitHub { - sha256 = "0kigcirkjvnj3xi1p28p9yp3s0lff24q5qcvf8ahjwvpbwka14sh"; - rev = "v${version}"; - repo = pname; owner = "kubernetes-sigs"; + repo = pname; + rev = "v${version}"; + sha256 = "0yxxz0b56r18w178y32s619zy8ci6l93c6vlzx11hhxhbw43f6v6"; }; - modSha256 = "0w8sp73pmj2wqrg7x7z8diglyfq6c6gn9mmck0k1gk90nv7s8rf1"; + # avoid finding test and development commands + sourceRoot = "source/kustomize"; + + modSha256 = "1bas6al14ck0d2ccb4235426a5hldqsm0nf8vi76chz4nahzb71g"; meta = with lib; { description = "Customization of kubernetes YAML configurations"; From 67aa40139ba02c088f4c2b1ce15dd52306458fd5 Mon Sep 17 00:00:00 2001 From: Renaud Date: Mon, 21 Oct 2019 00:24:59 +0200 Subject: [PATCH 065/142] libcutl: 1.9.0 -> 1.10.0 --- .../development/libraries/libcutl/default.nix | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/libcutl/default.nix b/pkgs/development/libraries/libcutl/default.nix index 81122a6eb520..9abd3b7ccc1c 100644 --- a/pkgs/development/libraries/libcutl/default.nix +++ b/pkgs/development/libraries/libcutl/default.nix @@ -1,23 +1,29 @@ { stdenv, fetchurl, xercesc }: -let - major = "1.9"; - minor = "0"; -in -with stdenv; with lib; -mkDerivation rec { - name = "libcutl-${major}.${minor}"; - meta = { - description = "A collection of generic and independent components such as meta-programming tests, smart pointers, containers, compiler building blocks" ; +stdenv.mkDerivation rec { + pname = "libcutl"; + version = "1.10.0"; + + meta = with stdenv.lib; { + description = "C++ utility library from Code Synthesis"; + longDescription = '' + libcutl is a C++ utility library. + It contains a collection of generic and independent components such as + meta-programming tests, smart pointers, containers, compiler building blocks, etc. + ''; + homepage = "https://codesynthesis.com/projects/libcutl/"; + changelog = "https://git.codesynthesis.com/cgit/libcutl/libcutl/plain/NEWS?h=${version}"; platforms = platforms.all; maintainers = with maintainers; [ ]; license = licenses.mit; }; + majmin = builtins.head ( builtins.match "([[:digit:]]\.[[:digit:]]*+)\.*" "${version}" ); src = fetchurl { - url = "https://codesynthesis.com/download/libcutl/1.9/${name}.tar.bz2"; - sha1 = "0e8d255145afbc339a3284ef85a43f4baf3fec43"; + url = "https://codesynthesis.com/download/${pname}/${majmin}/${pname}-${version}.tar.bz2"; + sha256 = "070j2x02m4gm1fn7gnymrkbdxflgzxwl7m96aryv8wp3f3366l8j"; }; buildInputs = [ xercesc ]; + enableParallelBuilding = true; } From 73ae8fbb6492362e438cf09cd5c0599e338ebe30 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 16 Oct 2019 21:24:00 -0700 Subject: [PATCH 066/142] pythonPackages.praw: freeze at 6.3.1 --- pkgs/development/python-modules/praw/6.3.nix | 53 +++++++++++++++++++ .../python-modules/praw/default.nix | 1 - pkgs/top-level/python-packages.nix | 3 +- 3 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/praw/6.3.nix diff --git a/pkgs/development/python-modules/praw/6.3.nix b/pkgs/development/python-modules/praw/6.3.nix new file mode 100644 index 000000000000..6c2201d1f1d2 --- /dev/null +++ b/pkgs/development/python-modules/praw/6.3.nix @@ -0,0 +1,53 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub +, betamax +, betamax-serializers +, betamax-matchers +, mock +, six +, pytestrunner +, prawcore +, pytest +, requests-toolbelt +, update_checker +, websocket_client +}: + +buildPythonPackage rec { + pname = "praw"; + version = "6.3.1"; + + src = fetchFromGitHub { + owner = "praw-dev"; + repo = "praw"; + rev = "v${version}"; + sha256 = "0by89aw7m803dvjcc33m9390msjm6v5v8g3k8ink9gfm421lw8ky"; + }; + + nativeBuildInputs = [ + pytestrunner + ]; + + propagatedBuildInputs = [ + mock + prawcore + update_checker + websocket_client + ]; + + checkInputs = [ + betamax + betamax-serializers + betamax-matchers + mock + pytest + requests-toolbelt + six + ]; + + meta = with stdenv.lib; { + description = "Python Reddit API wrapper"; + homepage = "https://praw.readthedocs.org/"; + license = licenses.bsd2; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index 2a3d85c2b35b..6c2201d1f1d2 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -48,7 +48,6 @@ buildPythonPackage rec { description = "Python Reddit API wrapper"; homepage = "https://praw.readthedocs.org/"; license = licenses.bsd2; - platforms = platforms.all; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8de4b638a06d..416cffbbc936 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4324,7 +4324,8 @@ in { ppft = callPackage ../development/python-modules/ppft { }; - praw = callPackage ../development/python-modules/praw { }; + praw = if isPy3k then callPackage ../development/python-modules/praw { } + else callPackage ../development/python-modules/praw/6.3.nix { }; prawcore = callPackage ../development/python-modules/prawcore { }; From 6f89c01006ce2e093c5ef3f41d82fcc10cb36257 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 16 Oct 2019 21:26:13 -0700 Subject: [PATCH 067/142] python3Packages.praw: 6.3.1 -> 6.4.0 --- pkgs/development/python-modules/praw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index 6c2201d1f1d2..14166b4f43cb 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "praw"; - version = "6.3.1"; + version = "6.4.0"; src = fetchFromGitHub { owner = "praw-dev"; repo = "praw"; rev = "v${version}"; - sha256 = "0by89aw7m803dvjcc33m9390msjm6v5v8g3k8ink9gfm421lw8ky"; + sha256 = "0j92wqyppif2k80zhzq30b04r8ljwjviply400kn4rjn54hxd4hb"; }; nativeBuildInputs = [ From a16de399a169dde964d53e570e936def639ebdc2 Mon Sep 17 00:00:00 2001 From: Dima Date: Sat, 19 Oct 2019 19:26:44 +0200 Subject: [PATCH 068/142] release-notes 19.09: removal of non-LTS kernel attrs Even though the release obviously already happened, I think it might still make sense to add a short note about the attributes not being supported any longer (and going forward). (cherry picked from commit 7163d3a9df35904d0c9acc9f643fd70ee3108539) (cherry picked from commit a64b8c3c191af1317cfdc1ea4f4e5f881c4cf503) --- nixos/doc/manual/release-notes/rl-1909.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 1b7ca76c2f05..422b219698eb 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -563,6 +563,18 @@ earlier version of NixOS. + + + Due to the short lifetime of non-LTS kernel releases package attributes like linux_5_1, + linux_5_2 and linux_5_3 have been removed to discourage dependence + on specific non-LTS kernel versions in stable NixOS releases. + + Going forward, versioned attributes like linux_4_9 will exist for LTS versions only. + Please use linux_latest or linux_testing if you depend on non-LTS + releases. Keep in mind that linux_latest and linux_testing will + change versions under the hood during the lifetime of a stable release and might include breaking changes. + + From 18ea428e76f1d127f40aa54c283183719edb523a Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 20 Oct 2019 00:21:32 -0400 Subject: [PATCH 069/142] rl-1909: add note for blueman --- nixos/doc/manual/release-notes/rl-1909.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 422b219698eb..359350953d2f 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -190,6 +190,13 @@ + + + has been added. + If you previously had blueman installed via please + migrate to using the NixOS module, as this would result in an insufficiently configured blueman. + + From 47f47b46bc463ee14d816ce4f3ef2bb022fb14f9 Mon Sep 17 00:00:00 2001 From: Karol Chmist Date: Mon, 21 Oct 2019 02:10:52 +0200 Subject: [PATCH 070/142] devilutionx: unstable-2019-07-28 -> 0.5.0 (#70971) devilutionx: unstable-2019-07-28 -> 0.5.0 --- pkgs/games/devilutionx/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix index 117ebcc1ac18..3241e6dd387f 100644 --- a/pkgs/games/devilutionx/default.nix +++ b/pkgs/games/devilutionx/default.nix @@ -1,28 +1,30 @@ { stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, SDL2_ttf, libsodium, pkg-config }: -stdenv.mkDerivation { - version = "unstable-2019-07-28"; +stdenv.mkDerivation rec { + version = "0.5.0"; pname = "devilutionx"; src = fetchFromGitHub { owner = "diasurgical"; repo = "devilutionX"; - rev = "b2f358874705598ec139f290b21e340c73d250f6"; - sha256 = "0s812km118qq5pzlzvzfndvag0mp6yzvm69ykc97frdiq608zw4f"; + rev = version; + sha256 = "010hxj129zmsynvizk89vm2y29dcxsfi585czh3f03wfr38rxa6b"; }; NIX_CFLAGS_COMPILE = "-I${SDL2_ttf}/include/SDL2"; - # compilation will fail due to -Werror=format-security - hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ libsodium SDL2 SDL2_mixer SDL2_ttf ]; installPhase = '' runHook preInstall + '' + (if stdenv.isDarwin then '' + mkdir -p $out/Applications + mv devilutionx.app $out/Applications + '' else '' mkdir -p $out/bin cp devilutionx $out/bin + '') + '' runHook postInstall ''; @@ -30,6 +32,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "https://github.com/diasurgical/devilutionX"; description = "Diablo build for modern operating systems"; + longDescription = "In order to play this game a copy of diabdat.mpq is required. Place a copy of diabdat.mpq in ~/.local/share/diasurgical/devilution before executing the game."; license = licenses.unlicense; maintainers = [ maintainers.karolchmist ]; platforms = platforms.linux ++ platforms.darwin ++ platforms.windows; From 9a54d17799de20328170dedbd0acfc7a6aa4a938 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 20 Oct 2019 19:04:03 +0200 Subject: [PATCH 071/142] nixos release notes: interfaces might get renamed Fixes #71086. --- nixos/doc/manual/release-notes/rl-1909.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 359350953d2f..8bd353a34304 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -582,6 +582,15 @@ change versions under the hood during the lifetime of a stable release and might include breaking changes. + + + Because of the systemd upgrade, + some network interfaces might change their name. For details see + + upstream docs or + our ticket. + + From 9a91679b7ab5a5df6135c85192ff1f66cb8226f1 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Tue, 17 Sep 2019 21:14:50 -0400 Subject: [PATCH 072/142] nixos/httpd: remove deprecated extraSubservices option --- .../web-servers/apache-httpd/default.nix | 127 ++++-------------- .../apache-httpd/per-server-options.nix | 6 - 2 files changed, 24 insertions(+), 109 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index b0374d949fc5..99304d0e48ae 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -31,70 +31,8 @@ let extraForeignModules = filter isAttrs extraModules; extraApacheModules = filter isString extraModules; - - makeServerInfo = cfg: { - # Canonical name must not include a trailing slash. - canonicalNames = - let defaultPort = (head (defaultListen cfg)).port; in - map (port: - (if cfg.enableSSL then "https" else "http") + "://" + - cfg.hostName + - (if port != defaultPort then ":${toString port}" else "") - ) (map (x: x.port) (getListen cfg)); - - # Admin address: inherit from the main server if not specified for - # a virtual host. - adminAddr = if cfg.adminAddr != null then cfg.adminAddr else mainCfg.adminAddr; - - vhostConfig = cfg; - serverConfig = mainCfg; - fullConfig = config; # machine config - }; - - allHosts = [mainCfg] ++ mainCfg.virtualHosts; - - callSubservices = serverInfo: defs: - let f = svc: - let - svcFunction = - if svc ? function then svc.function - # instead of using serviceType="mediawiki"; you can copy mediawiki.nix to any location outside nixpkgs, modify it at will, and use serviceExpression=./mediawiki.nix; - else if svc ? serviceExpression then import (toString svc.serviceExpression) - else import (toString "${toString ./.}/${if svc ? serviceType then svc.serviceType else svc.serviceName}.nix"); - config = (evalModules - { modules = [ { options = res.options; config = svc.config or svc; } ]; - check = false; - }).config; - defaults = { - extraConfig = ""; - extraModules = []; - extraModulesPre = []; - extraPath = []; - extraServerPath = []; - globalEnvVars = []; - robotsEntries = ""; - startupScript = ""; - enablePHP = false; - enablePerl = false; - phpOptions = ""; - options = {}; - documentRoot = null; - }; - res = defaults // svcFunction { inherit config lib pkgs serverInfo php; }; - in res; - in map f defs; - - - # !!! callSubservices is expensive - subservicesFor = cfg: callSubservices (makeServerInfo cfg) cfg.extraSubservices; - - mainSubservices = subservicesFor mainCfg; - - allSubservices = mainSubservices ++ concatMap subservicesFor mainCfg.virtualHosts; - - enableSSL = any (vhost: vhost.enableSSL) allHosts; @@ -188,13 +126,18 @@ let perServerConf = isMainServer: cfg: let - serverInfo = makeServerInfo cfg; - - subservices = callSubservices serverInfo cfg.extraSubservices; + # Canonical name must not include a trailing slash. + canonicalNames = + let defaultPort = (head (defaultListen cfg)).port; in + map (port: + (if cfg.enableSSL then "https" else "http") + "://" + + cfg.hostName + + (if port != defaultPort then ":${toString port}" else "") + ) (map (x: x.port) (getListen cfg)); maybeDocumentRoot = fold (svc: acc: if acc == null then svc.documentRoot else assert svc.documentRoot == null; acc - ) null ([ cfg ] ++ subservices); + ) null ([ cfg ]); documentRoot = if maybeDocumentRoot != null then maybeDocumentRoot else pkgs.runCommand "empty" { preferLocalBuild = true; } "mkdir -p $out"; @@ -209,15 +152,11 @@ let ''; - robotsTxt = - concatStringsSep "\n" (filter (x: x != "") ( - # If this is a vhost, the include the entries for the main server as well. - (if isMainServer then [] else [mainCfg.robotsEntries] ++ map (svc: svc.robotsEntries) mainSubservices) - ++ [cfg.robotsEntries] - ++ (map (svc: svc.robotsEntries) subservices))); + # If this is a vhost, the include the entries for the main server as well. + robotsTxt = concatStringsSep "\n" (filter (x: x != "") ([ cfg.robotsEntries ] ++ lib.optional (!isMainServer) mainCfg.robotsEntries)); in '' - ${concatStringsSep "\n" (map (n: "ServerName ${n}") serverInfo.canonicalNames)} + ${concatStringsSep "\n" (map (n: "ServerName ${n}") canonicalNames)} ${concatMapStrings (alias: "ServerAlias ${alias}\n") cfg.serverAliases} @@ -292,8 +231,6 @@ let in concatMapStrings makeDirConf cfg.servedDirs } - ${concatMapStrings (svc: svc.extraConfig) subservices} - ${cfg.extraConfig} ''; @@ -328,13 +265,10 @@ let ${let load = {name, path}: "LoadModule ${name}_module ${path}\n"; - allModules = - concatMap (svc: svc.extraModulesPre) allSubservices - ++ map (name: {inherit name; path = "${httpd}/modules/mod_${name}.so";}) apacheModules + allModules = map (name: {inherit name; path = "${httpd}/modules/mod_${name}.so";}) apacheModules ++ optional mainCfg.enableMellon { name = "auth_mellon"; path = "${pkgs.apacheHttpdPackages.mod_auth_mellon}/modules/mod_auth_mellon.so"; } - ++ optional enablePHP { name = "php${phpMajorVersion}"; path = "${php}/modules/libphp${phpMajorVersion}.so"; } - ++ optional enablePerl { name = "perl"; path = "${mod_perl}/modules/mod_perl.so"; } - ++ concatMap (svc: svc.extraModules) allSubservices + ++ optional mainCfg.enablePHP { name = "php${phpMajorVersion}"; path = "${php}/modules/libphp${phpMajorVersion}.so"; } + ++ optional mainCfg.enablePerl { name = "perl"; path = "${mod_perl}/modules/mod_perl.so"; } ++ extraForeignModules; in concatMapStrings load (unique allModules) } @@ -385,17 +319,10 @@ let } ''; - - enablePHP = mainCfg.enablePHP || any (svc: svc.enablePHP) allSubservices; - - enablePerl = mainCfg.enablePerl || any (svc: svc.enablePerl) allSubservices; - - # Generate the PHP configuration file. Should probably be factored # out into a separate module. phpIni = pkgs.runCommand "php.ini" - { options = concatStringsSep "\n" - ([ mainCfg.phpOptions ] ++ (map (svc: svc.phpOptions) allSubservices)); + { options = mainCfg.phpOptions; preferLocalBuild = true; } '' @@ -408,6 +335,10 @@ in { + imports = [ + (mkRemovedOptionModule [ "services" "httpd" "extraSubservices" ] "Most existing subservices have been ported to the NixOS module system. Please update your configuration accordingly.") + ]; + ###### interface options = { @@ -637,8 +568,6 @@ in message = "SSL is enabled for httpd, but sslServerCert and/or sslServerKey haven't been specified."; } ]; - warnings = map (cfg: "apache-httpd's extraSubservices option is deprecated. Most existing subservices have been ported to the NixOS module system. Please update your configuration accordingly.") (lib.filter (cfg: cfg.extraSubservices != []) allHosts); - users.users = optionalAttrs (mainCfg.user == "wwwrun") (singleton { name = "wwwrun"; group = mainCfg.group; @@ -651,7 +580,7 @@ in gid = config.ids.gids.wwwrun; }); - environment.systemPackages = [httpd] ++ concatMap (svc: svc.extraPath) allSubservices; + environment.systemPackages = [httpd]; services.httpd.phpOptions = '' @@ -674,13 +603,11 @@ in path = [ httpd pkgs.coreutils pkgs.gnugrep ] - ++ optional enablePHP pkgs.system-sendmail # Needed for PHP's mail() function. - ++ concatMap (svc: svc.extraServerPath) allSubservices; + ++ optional mainCfg.enablePHP pkgs.system-sendmail; # Needed for PHP's mail() function. environment = - optionalAttrs enablePHP { PHPRC = phpIni; } - // optionalAttrs mainCfg.enableMellon { LD_LIBRARY_PATH = "${pkgs.xmlsec}/lib"; } - // (listToAttrs (concatMap (svc: svc.globalEnvVars) allSubservices)); + optionalAttrs mainCfg.enablePHP { PHPRC = phpIni; } + // optionalAttrs mainCfg.enableMellon { LD_LIBRARY_PATH = "${pkgs.xmlsec}/lib"; }; preStart = '' @@ -698,12 +625,6 @@ in for i in $(${pkgs.utillinux}/bin/ipcs -s | grep ' ${mainCfg.user} ' | cut -f2 -d ' '); do ${pkgs.utillinux}/bin/ipcrm -s $i done - - # Run the startup hooks for the subservices. - for i in ${toString (map (svn: svn.startupScript) allSubservices)}; do - echo Running Apache startup hook $i... - $i - done ''; serviceConfig.ExecStart = "@${httpd}/bin/httpd httpd -f ${httpdConf}"; diff --git a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix index 9d747549c274..c36207d54607 100644 --- a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix +++ b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix @@ -133,12 +133,6 @@ with lib; ''; }; - extraSubservices = mkOption { - type = types.listOf types.unspecified; - default = []; - description = "Extra subservices to enable in the webserver."; - }; - enableUserDir = mkOption { type = types.bool; default = false; From 9100741ce12ef72d43beb37b94848017acc81aa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 14 Oct 2019 23:41:28 -0300 Subject: [PATCH 073/142] lxqt.qps: 1.10.20 -> 2.0.0 --- pkgs/desktops/lxqt/qps/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix index 942c9257c25d..985d702b0b41 100644 --- a/pkgs/desktops/lxqt/qps/default.nix +++ b/pkgs/desktops/lxqt/qps/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "qps"; - version = "1.10.20"; + version = "2.0.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1g8j4cjy5x33jzjkx6vwyl5qbf9i2z2w01ipgk7nrik5drf9crbf"; + sha256 = "03rl59yk3b24j0y0k8dpdpb3yi4f1l642zn5pp5br3s2vwx1vzkg"; }; nativeBuildInputs = [ cmake lxqt-build-tools ]; @@ -17,10 +17,10 @@ mkDerivation rec { buildInputs = [ qtbase qtx11extras qttools ]; meta = with lib; { - description = "The Qt process manager"; + description = "Qt based process manager"; homepage = https://github.com/lxqt/qps; license = licenses.gpl2; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } From ea1c52a58c926fc4f08b0c207bdba56d1170d1fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 20 Oct 2019 22:11:16 -0300 Subject: [PATCH 074/142] lxqt.qps: restrict platform to linux --- pkgs/desktops/lxqt/qps/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix index 985d702b0b41..cb8e5b2569c5 100644 --- a/pkgs/desktops/lxqt/qps/default.nix +++ b/pkgs/desktops/lxqt/qps/default.nix @@ -20,7 +20,7 @@ mkDerivation rec { description = "Qt based process manager"; homepage = https://github.com/lxqt/qps; license = licenses.gpl2; - platforms = with platforms; unix; + platforms = with platforms; linux; # does not build on darwin maintainers = with maintainers; [ romildo ]; }; } From 91d5b3f07d27622ff620ff31fa5edce15a5822fa Mon Sep 17 00:00:00 2001 From: Melanie Sigl Date: Wed, 16 Oct 2019 22:09:44 +0200 Subject: [PATCH 075/142] pythonPackages.phik: init at 0.9.8 --- .../python-modules/phik/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/phik/default.nix diff --git a/pkgs/development/python-modules/phik/default.nix b/pkgs/development/python-modules/phik/default.nix new file mode 100644 index 000000000000..cef6173af3d9 --- /dev/null +++ b/pkgs/development/python-modules/phik/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, pytest +, pytest-pylint +, nbconvert +, jupyter_client +, numpy +, scipy +, pandas +, matplotlib +, numba +}: + +buildPythonPackage rec { + pname = "phik"; + version = "0.9.8"; + format = "wheel"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version format; + python = "py3"; + sha256 = "c398452c5c1eea153905666b289c6a153712cf3d58811fa41e2bbbd27a65d678"; + }; + + checkInputs = [ + pytest + pytest-pylint + nbconvert + jupyter_client + ]; + + propagatedBuildInputs = [ + numpy + scipy + pandas + matplotlib + numba + ]; + + postInstall = '' + rm -r $out/bin + ''; + + meta = with lib; { + description = "Phi_K correlation analyzer library"; + longDescription = "Phi_K is a new and practical correlation coefficient based on several refinements to Pearson’s hypothesis test of independence of two variables."; + homepage = https://phik.readthedocs.io/en/latest/; + maintainers = with maintainers; [ melsigl ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 416cffbbc936..e577d40486ff 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -848,6 +848,8 @@ in { phonopy = callPackage ../development/python-modules/phonopy { }; + phik = callPackage ../development/python-modules/phik {}; + piccata = callPackage ../development/python-modules/piccata {}; pims = callPackage ../development/python-modules/pims { }; From d46de732538c1ebb2d30d2319e1fb613b97c42ff Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Wed, 16 Oct 2019 23:39:24 +0200 Subject: [PATCH 076/142] suricata: 4.1.5 -> 5.0.0 Additional Changes: - Disabled AFL build configuration - Enabled eBPF support --- .../ids/suricata/bpf_stubs_workaround.patch | 19 +++++++ .../networking/ids/suricata/default.nix | 49 +++++++++++++++---- pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 62 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/networking/ids/suricata/bpf_stubs_workaround.patch diff --git a/pkgs/applications/networking/ids/suricata/bpf_stubs_workaround.patch b/pkgs/applications/networking/ids/suricata/bpf_stubs_workaround.patch new file mode 100644 index 000000000000..d4e8c95fea22 --- /dev/null +++ b/pkgs/applications/networking/ids/suricata/bpf_stubs_workaround.patch @@ -0,0 +1,19 @@ +*** suricata-5.0.0/ebpf/Makefile.in 2019-10-16 22:39:13.174649416 +0200 +--- suricata-5.0.0/ebpf/Makefile.in.fixed 2019-10-16 22:38:41.822201802 +0200 +*************** +*** 527,533 **** + @BUILD_EBPF_TRUE@$(BPF_TARGETS): %.bpf: %.c + # From C-code to LLVM-IR format suffix .ll (clang -S -emit-llvm) + @BUILD_EBPF_TRUE@ ${CLANG} -Wall $(BPF_CFLAGS) -O2 \ +! @BUILD_EBPF_TRUE@ -I/usr/include/$(build_cpu)-$(build_os)/ \ + @BUILD_EBPF_TRUE@ -D__KERNEL__ -D__ASM_SYSREG_H \ + @BUILD_EBPF_TRUE@ -target bpf -S -emit-llvm $< -o ${@:.bpf=.ll} + # From LLVM-IR to BPF-bytecode in ELF-obj file +--- 527,533 ---- + @BUILD_EBPF_TRUE@$(BPF_TARGETS): %.bpf: %.c + # From C-code to LLVM-IR format suffix .ll (clang -S -emit-llvm) + @BUILD_EBPF_TRUE@ ${CLANG} -Wall $(BPF_CFLAGS) -O2 \ +! @BUILD_EBPF_TRUE@ -idirafter ../bpf_stubs_workaround \ + @BUILD_EBPF_TRUE@ -D__KERNEL__ -D__ASM_SYSREG_H \ + @BUILD_EBPF_TRUE@ -target bpf -S -emit-llvm $< -o ${@:.bpf=.ll} + # From LLVM-IR to BPF-bytecode in ELF-obj file diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index 62f755c4d7c7..7f2a9d71fe51 100644 --- a/pkgs/applications/networking/ids/suricata/default.nix +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -1,14 +1,18 @@ { stdenv , lib , fetchurl +, clang +, llvm , pkgconfig , makeWrapper , file -, geoip , hyperscan , jansson +, libbpf , libcap_ng +, libelf , libevent +, libmaxminddb , libnet , libnetfilter_log , libnetfilter_queue @@ -30,24 +34,30 @@ in stdenv.mkDerivation rec { pname = "suricata"; - version = "4.1.5"; + version = "5.0.0"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - sha256 = "0jy738rs3ds1gbn8hv26ck23z9k6pjrjxdpavkyn7znpbi9zdrff"; + sha256 = "0qwav4qpvx3i5khkyvdvx42n8b9mza8c4cpxvrf7m4lnf51cqgba"; }; nativeBuildInputs = [ + clang + llvm makeWrapper pkgconfig - ]; + ] + ++ lib.optionals rustSupport [ rustc cargo ] + ; buildInputs = [ - geoip jansson + libbpf libcap_ng + libelf libevent libmagic + libmaxminddb libnet libnetfilter_log libnetfilter_queue @@ -62,17 +72,29 @@ stdenv.mkDerivation rec { python zlib ] - ++ lib.optional hyperscanSupport [ hyperscan ] - ++ lib.optional redisSupport [ redis hiredis ] - ++ lib.optional rustSupport [ rustc cargo ] + ++ lib.optional hyperscanSupport hyperscan + ++ lib.optionals redisSupport [ redis hiredis ] ; enableParallelBuilding = true; + patches = lib.optional stdenv.is64bit ./bpf_stubs_workaround.patch; + + postPatch = '' + substituteInPlace ./configure \ + --replace "/usr/bin/file" "${file}/bin/file" + substituteInPlace ./libhtp/configure \ + --replace "/usr/bin/file" "${file}/bin/file" + + mkdir -p bpf_stubs_workaround/gnu + touch bpf_stubs_workaround/gnu/stubs-32.h + ''; + configureFlags = [ "--disable-gccmarch-native" - "--enable-afl" "--enable-af-packet" + "--enable-ebpf" + "--enable-ebpf-build" "--enable-gccprotect" "--enable-geoip" "--enable-luajit" @@ -97,6 +119,13 @@ stdenv.mkDerivation rec { "--enable-rust-experimental" ]; + postConfigure = '' + # Avoid unintended clousure growth. + sed -i 's|/nix/store/\(.\{8\}\)[^-]*-|/nix/store/\1...-|g' ./src/build-info.h + ''; + + hardeningDisable = [ "stackprotector" ]; + installFlags = [ "e_localstatedir=\${TMPDIR}" "e_logdir=\${TMPDIR}" @@ -115,6 +144,8 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/suricatasc" \ --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") + substituteInPlace "$out/etc/suricata/suricata.yaml" \ + --replace "/etc/suricata" "$out/etc/suricata" ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db96c53dac1e..bb4abbfc270d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6252,7 +6252,9 @@ in sshguard = callPackage ../tools/security/sshguard {}; - suricata = callPackage ../applications/networking/ids/suricata { }; + suricata = callPackage ../applications/networking/ids/suricata { + python = python3; + }; softhsm = callPackage ../tools/security/softhsm { inherit (darwin) libobjc; From 0060782d8ea6d2cb6e2f0edf05701ecd56719542 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 Oct 2019 21:13:12 -0700 Subject: [PATCH 077/142] bind: 9.14.6 -> 9.14.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/bind/versions --- pkgs/servers/dns/bind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 0f551f489a6f..40a116f56658 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -10,11 +10,11 @@ assert enablePython -> python3 != null; stdenv.mkDerivation rec { pname = "bind"; - version = "9.14.6"; + version = "9.14.7"; src = fetchurl { url = "https://ftp.isc.org/isc/bind9/${version}/${pname}-${version}.tar.gz"; - sha256 = "1zpd47ckn5lf4qbscfkj7krngwn2gwsp961v5401h3lhxm0a0rw9"; + sha256 = "07998nx0yv3xy8c62b1ira9qygsgvpljwcgb47ypzxq8b57gb86f"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; From bbce011c13035ad7b4317e91c768eac27eb783a6 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 7 Oct 2019 06:24:04 +0000 Subject: [PATCH 078/142] ocamlPackages.duff: init at 0.2 --- .../ocaml-modules/duff/default.nix | 26 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/ocaml-modules/duff/default.nix diff --git a/pkgs/development/ocaml-modules/duff/default.nix b/pkgs/development/ocaml-modules/duff/default.nix new file mode 100644 index 000000000000..1c6b59961ef2 --- /dev/null +++ b/pkgs/development/ocaml-modules/duff/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchurl, buildDunePackage +, cstruct, fmt +, bos, cmdliner, fpath, logs +, alcotest +}: + +buildDunePackage rec { + pname = "duff"; + version = "0.2"; + src = fetchurl { + url = "https://github.com/mirage/duff/releases/download/v${version}/duff-v${version}.tbz"; + sha256 = "0bi081w4349cqc1n9jsjh1lrcqlnv3nycmvh9fniscv8lz1c0gjq"; + }; + + buildInputs = [ bos cmdliner fpath logs ] ++ lib.optional doCheck alcotest; + propagatedBuildInputs = [ cstruct fmt ]; + + doCheck = true; + + meta = { + description = "Pure OCaml implementation of libXdiff (Rabin’s fingerprint)"; + homepage = "https://github.com/mirage/duff"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ffe6a215e9db..d463a4046498 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -219,6 +219,8 @@ let dtoa = callPackage ../development/ocaml-modules/dtoa { }; + duff = callPackage ../development/ocaml-modules/duff { }; + dune = callPackage ../development/tools/ocaml/dune { }; earley = callPackage ../development/ocaml-modules/earley { }; From ca1cce367ebb44913bdeeef19726aa66138e7f23 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 Oct 2019 23:17:27 -0700 Subject: [PATCH 079/142] checkstyle: 8.24 -> 8.25 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/checkstyle/versions --- pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 3fdf6e9e3d00..8f55bf951276 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.24"; + version = "8.25"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "01h1xv6lqf1fhmzbghdj2dbygdspcb6dxk0fil16s2ggs3w62fmm"; + sha256 = "04asn3cqh0f78c4b0968ic2fxgijf47paw3zgh9dh96x1165yhkf"; }; nativeBuildInputs = [ makeWrapper ]; From 51efea72cd398b04d83b998523eef4bd7ad7426d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 Oct 2019 23:08:30 -0700 Subject: [PATCH 080/142] bitwarden: 1.16.4 -> 1.16.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/bitwarden/versions --- pkgs/tools/security/bitwarden/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index f96501ddf779..fbef98df82d7 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -16,11 +16,11 @@ let pname = "bitwarden"; version = { - x86_64-linux = "1.16.4"; + x86_64-linux = "1.16.6"; }.${system} or ""; sha256 = { - x86_64-linux = "1g9ljxjqs7mx509lkfd7db7xvm9srzypbgv0qfzrr2flqbsfl06m"; + x86_64-linux = "074hqm4gjljc82nhn7h6wsd74567390018fi3v38g7jh7aph10jj"; }.${system} or ""; meta = with stdenv.lib; { From db5433a56b768281eaec97f024cfc07467957e27 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 Oct 2019 22:55:00 -0700 Subject: [PATCH 081/142] bitwarden_rs-vault: 2.11.0 -> 2.12.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/bitwarden_rs-vault/versions --- pkgs/tools/security/bitwarden_rs/vault.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/bitwarden_rs/vault.nix b/pkgs/tools/security/bitwarden_rs/vault.nix index 76b9f24224c1..51dde99bcf19 100644 --- a/pkgs/tools/security/bitwarden_rs/vault.nix +++ b/pkgs/tools/security/bitwarden_rs/vault.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bitwarden_rs-vault"; - version = "2.11.0"; + version = "2.12.0"; src = fetchurl { url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; - sha256 = "06f0rcpqhz5qjm01jbxx2czhnj9ng29rgsrilm5r5xx31s9dnhg7"; + sha256 = "064dxfplqn67grpx03ryzshwmr7s00w4mll0hk0anddviwvd8r1n"; }; buildCommand = '' From 43e64eb5454ec144d1821915be94e10f196296fc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 Oct 2019 22:51:53 -0700 Subject: [PATCH 082/142] mod_wsgi: 4.6.7 -> 4.6.8 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mod_wsgi/versions --- pkgs/servers/http/apache-modules/mod_wsgi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index 0e17cc40efe3..461ab1e297e0 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mod_wsgi"; - version = "4.6.7"; + version = "4.6.8"; src = fetchurl { url = "https://github.com/GrahamDumpleton/mod_wsgi/archive/${version}.tar.gz"; - sha256 = "1j8pqn0xhd502ardlmkqx8y85s1npmk9nifqps60wjh29nny03f2"; + sha256 = "0xym7i3iaxqi23dayacv2llhi0klxcb4ldll5cjxv6lg9v5r88x2"; }; buildInputs = [ apacheHttpd python ncurses ]; From fef4ba0e5a502b73bf570be639e5f0be48bbc1ef Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 Oct 2019 22:31:18 -0700 Subject: [PATCH 083/142] buck: 2019.09.12.01 -> 2019.10.17.01 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/buck/versions --- pkgs/development/tools/build-managers/buck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix index 5f3a090fef77..41fc0940b9d0 100644 --- a/pkgs/development/tools/build-managers/buck/default.nix +++ b/pkgs/development/tools/build-managers/buck/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "buck"; - version = "2019.09.12.01"; + version = "2019.10.17.01"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "02rid0r0swxa6n6hl89lcll7hgxn1wjh2kjzxcj4arm7d34243bw"; + sha256 = "1irgp8yq1z11bq3b83yxvj35wqqq7y7b8q4d4y0hc05ac19ja0vj"; }; patches = [ ./pex-mtime.patch ]; From 5f994b9330caa4db1b33820e096ef397090f5666 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 Oct 2019 22:17:46 -0700 Subject: [PATCH 084/142] airsonic: 10.4.0 -> 10.4.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/airsonic/versions --- pkgs/servers/misc/airsonic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/servers/misc/airsonic/default.nix index 1afe1e8b9462..9b39723f8434 100644 --- a/pkgs/servers/misc/airsonic/default.nix +++ b/pkgs/servers/misc/airsonic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "airsonic"; - version = "10.4.0"; + version = "10.4.1"; src = fetchurl { url = "https://github.com/airsonic/airsonic/releases/download/v${version}/airsonic.war"; - sha256 = "1m4l10hp5m010ljsvn2ba4bbh8i26d04xffw81gfgjw08gya2hh8"; + sha256 = "18vm59x8pcgsyf3kl8ndvdszwf62df9vsqzv5jgbzayb3s0yjghx"; }; buildCommand = '' From fd28a0abb04ae569eb83024711cfc17805b73ff1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 Oct 2019 22:07:54 -0700 Subject: [PATCH 085/142] bird2: 2.0.6 -> 2.0.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/bird/versions --- pkgs/servers/bird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 13b5a19a7515..7ac7bc8e918e 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -58,7 +58,7 @@ in }; bird2 = generic { - version = "2.0.6"; - sha256 = "1ankpxvmn12kzgv5vh7awnkj34jzjciy5baq3smkj079db74r4wh"; + version = "2.0.7"; + sha256 = "0rhhbfmfw2d93rvhglv03rdzxsq2disw6s1wm8d6bgdxmrc2n7b3"; }; } From 2c7366e3e832e54a7ac49aab66635dc887e5ae59 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 Oct 2019 21:26:02 -0700 Subject: [PATCH 086/142] birdfont: 2.27.0 -> 2.28.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/birdfont/versions --- pkgs/tools/misc/birdfont/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix index 9dc3eb86e79d..8cc21158e8a9 100644 --- a/pkgs/tools/misc/birdfont/default.nix +++ b/pkgs/tools/misc/birdfont/default.nix @@ -4,11 +4,11 @@ gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "birdfont"; - version = "2.27.0"; + version = "2.28.0"; src = fetchurl { url = "https://birdfont.org/releases/${pname}-${version}.tar.xz"; - sha256 = "0dr2cnvq30wak0j2k8089is7fvhw0ppwkfrrw1m649s2b95wav3q"; + sha256 = "19i7wzngi695dp4w0235wmfcnagdw3i40mzf89sddr1mqzvipfrz"; }; nativeBuildInputs = [ python3 pkgconfig vala_0_44 gobject-introspection wrapGAppsHook ]; From e592c3d36c232530fbc2c63d6774488bc10b34d5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 Oct 2019 20:50:33 -0700 Subject: [PATCH 087/142] avro-tools: 1.9.0 -> 1.9.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/avro-tools/versions --- pkgs/development/tools/avro-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/avro-tools/default.nix b/pkgs/development/tools/avro-tools/default.nix index 678988480ece..6b51e2c482cf 100644 --- a/pkgs/development/tools/avro-tools/default.nix +++ b/pkgs/development/tools/avro-tools/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "avro-tools"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { url = "https://repo1.maven.org/maven2/org/apache/avro/avro-tools/${version}/${pname}-${version}.jar"; - sha256 = "164mcz7ljd2ikwsq9ba98galcjar4g4n6ag7kkh466nwrpbmd2zi"; + sha256 = "0d73qbfx59pa4mgsjwgl5dvc4895rm90pdwr4sbd77biscjad94s"; }; dontUnpack = true; From 9d54ea9b2d5a4fab5d6702081ad8ceacb71360d1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 21 Oct 2019 10:57:56 +0200 Subject: [PATCH 088/142] doc: move image builders into new images chapter --- doc/builders/images.xml | 12 ++++++++++++ doc/{functions => builders/images}/appimagetools.xml | 0 doc/{functions => builders/images}/dockertools.xml | 0 doc/{functions => builders/images}/ocitools.xml | 0 .../images}/snap/example-firefox.nix | 0 .../images}/snap/example-hello.nix | 0 doc/{functions => builders/images}/snaptools.xml | 0 doc/functions.xml | 4 ---- doc/manual.xml | 1 + 9 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 doc/builders/images.xml rename doc/{functions => builders/images}/appimagetools.xml (100%) rename doc/{functions => builders/images}/dockertools.xml (100%) rename doc/{functions => builders/images}/ocitools.xml (100%) rename doc/{functions => builders/images}/snap/example-firefox.nix (100%) rename doc/{functions => builders/images}/snap/example-hello.nix (100%) rename doc/{functions => builders/images}/snaptools.xml (100%) diff --git a/doc/builders/images.xml b/doc/builders/images.xml new file mode 100644 index 000000000000..5e042a8ada80 --- /dev/null +++ b/doc/builders/images.xml @@ -0,0 +1,12 @@ + + Images + + This chapter describes tools for creating various types of images. + + + + + + diff --git a/doc/functions/appimagetools.xml b/doc/builders/images/appimagetools.xml similarity index 100% rename from doc/functions/appimagetools.xml rename to doc/builders/images/appimagetools.xml diff --git a/doc/functions/dockertools.xml b/doc/builders/images/dockertools.xml similarity index 100% rename from doc/functions/dockertools.xml rename to doc/builders/images/dockertools.xml diff --git a/doc/functions/ocitools.xml b/doc/builders/images/ocitools.xml similarity index 100% rename from doc/functions/ocitools.xml rename to doc/builders/images/ocitools.xml diff --git a/doc/functions/snap/example-firefox.nix b/doc/builders/images/snap/example-firefox.nix similarity index 100% rename from doc/functions/snap/example-firefox.nix rename to doc/builders/images/snap/example-firefox.nix diff --git a/doc/functions/snap/example-hello.nix b/doc/builders/images/snap/example-hello.nix similarity index 100% rename from doc/functions/snap/example-hello.nix rename to doc/builders/images/snap/example-hello.nix diff --git a/doc/functions/snaptools.xml b/doc/builders/images/snaptools.xml similarity index 100% rename from doc/functions/snaptools.xml rename to doc/builders/images/snaptools.xml diff --git a/doc/functions.xml b/doc/functions.xml index 81aef5f3a830..29b27d7d0dea 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -12,10 +12,6 @@ - - - - diff --git a/doc/manual.xml b/doc/manual.xml index d0ded1e2e167..525373a34272 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -24,6 +24,7 @@ Builders + From 24b1ef51337cc8267955eedda818cfccb222f2ea Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 21 Oct 2019 11:19:46 +0200 Subject: [PATCH 089/142] doc: move overrides into separate chapter --- doc/functions.xml | 1 - doc/manual.xml | 1 + doc/{functions => }/overrides.xml | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-) rename doc/{functions => }/overrides.xml (98%) diff --git a/doc/functions.xml b/doc/functions.xml index 29b27d7d0dea..970367870eed 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -7,7 +7,6 @@ The nixpkgs repository has several utility functions to manipulate Nix expressions. - diff --git a/doc/manual.xml b/doc/manual.xml index 525373a34272..31c507178a8a 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -10,6 +10,7 @@ Using Nixpkgs + diff --git a/doc/functions/overrides.xml b/doc/overrides.xml similarity index 98% rename from doc/functions/overrides.xml rename to doc/overrides.xml index 4ba4283c6094..991e13a1b828 100644 --- a/doc/functions/overrides.xml +++ b/doc/overrides.xml @@ -1,7 +1,7 @@ -
+ xml:id="chap-overrides"> Overriding @@ -148,4 +148,4 @@ c = lib.makeOverridable f { a = 1; b = 2; }; The variable c however also has some additional functions, like c.override which can be used to override the default arguments. In this example the value of (c.override { a = 4; }).result is 6.
- + From 7673965e300337de052c5afdb5edae8a56a19540 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 21 Oct 2019 04:20:00 -0500 Subject: [PATCH 090/142] nodejs-12_x: 12.12.0 -> 12.13.0 Changelog: https://github.com/nodejs/node/releases/tag/v12.13.0 --- pkgs/development/web/nodejs/v12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index a4e5edd77a4d..37a69eb4ddd7 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -5,8 +5,8 @@ let in buildNodejs { inherit enableNpm; - version = "12.12.0"; - sha256 = "1hcc9arbc6vpzjvf3sd6alm2rc18x3ay2p0i36wz2r4pp9d8gynr"; + version = "12.13.0"; + sha256 = "1xmy73q3qjmy68glqxmfrk6baqk655py0cic22h1h0v7rx0iaax8"; patches = stdenv.lib.optionals stdenv.isDarwin [ ./disable-libatomic-darwin.patch ]; } From 5feacc97108f073c840b89beb6139dc77be9b0bd Mon Sep 17 00:00:00 2001 From: chessai Date: Mon, 21 Oct 2019 01:01:14 -0400 Subject: [PATCH 091/142] clfft: init at 2.21.2 --- pkgs/development/libraries/clfft/default.nix | 34 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/libraries/clfft/default.nix diff --git a/pkgs/development/libraries/clfft/default.nix b/pkgs/development/libraries/clfft/default.nix new file mode 100644 index 000000000000..5eb5b842ecfa --- /dev/null +++ b/pkgs/development/libraries/clfft/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, fftw, fftwFloat, boost166, opencl-clhpp, ocl-icd }: + +let + version = "2.12.2"; +in stdenv.mkDerivation { + pname = "clfft"; + inherit version; + + src = fetchFromGitHub { + owner = "clMathLibraries"; + repo = "clFFT"; + rev = "refs/tags/v${version}"; + sha256 = "134vb6214hn00qy84m4djg4hqs6hw19gkp8d0wlq8gb9m3mfx7na"; + }; + + sourceRoot = "source/src"; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ fftw fftwFloat boost166 opencl-clhpp ocl-icd ]; + + meta = with stdenv.lib; { + description = "Library containing FFT functions written in OpenCL"; + longDescription = '' + clFFT is a software library containing FFT functions written in OpenCL. + In addition to GPU devices, the library also supports running on CPU devices to facilitate debugging and heterogeneous programming. + ''; + license = licenses.asl20; + homepage = "http://clmathlibraries.github.io/clFFT/"; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ chessai ]; + inherit version; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb4abbfc270d..568168a798ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10607,6 +10607,8 @@ in clearsilver = callPackage ../development/libraries/clearsilver { }; + clfft = callPackage ../development/libraries/clfft { }; + clipp = callPackage ../development/libraries/clipp { }; clipper = callPackage ../development/libraries/clipper { }; From 2b9713c2815aafaa410acca8600da5dbf7ca6821 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 21 Oct 2019 11:39:46 +0200 Subject: [PATCH 092/142] doc: move fhs and mkShell under builders/special In my opinion Functions should only contain pure functions. These are both meant to provide derivations so I put them under Builders. Don't know exactly *where* to put them so "special" it is... --- doc/builders/special.xml | 12 ++++++++++++ .../special}/fhs-environments.xml | 0 .../shell.xml => builders/special/mkshell.xml} | 0 doc/functions.xml | 2 -- doc/manual.xml | 1 + 5 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 doc/builders/special.xml rename doc/{functions => builders/special}/fhs-environments.xml (100%) rename doc/{functions/shell.xml => builders/special/mkshell.xml} (100%) diff --git a/doc/builders/special.xml b/doc/builders/special.xml new file mode 100644 index 000000000000..56d98f025278 --- /dev/null +++ b/doc/builders/special.xml @@ -0,0 +1,12 @@ + + Special builders + + This chapter describes several special builders. + + + + + + diff --git a/doc/functions/fhs-environments.xml b/doc/builders/special/fhs-environments.xml similarity index 100% rename from doc/functions/fhs-environments.xml rename to doc/builders/special/fhs-environments.xml diff --git a/doc/functions/shell.xml b/doc/builders/special/mkshell.xml similarity index 100% rename from doc/functions/shell.xml rename to doc/builders/special/mkshell.xml diff --git a/doc/functions.xml b/doc/functions.xml index 970367870eed..5a9240ec800e 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -9,8 +9,6 @@ - - diff --git a/doc/manual.xml b/doc/manual.xml index 31c507178a8a..de2c70eaf352 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -25,6 +25,7 @@ Builders + From bf2f1c8e007aed50800672f5dec184bace758cb7 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 21 Oct 2019 12:47:44 +0200 Subject: [PATCH 093/142] Revert "mbedtls: 2.16.0 -> 2.17.0" This reverts commit ba3b9c0eb8430093069ed319cbfcd7ad48e69edb. cc #60625 #71452 --- pkgs/development/libraries/mbedtls/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index a06d082b2269..047e71f388ed 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -11,13 +11,14 @@ stdenv.mkDerivation rec { pname = "mbedtls"; - version = "2.17.0"; + name = "mbedtls-${version}"; + version = "2.16.0"; src = fetchFromGitHub { owner = "ARMmbed"; repo = "mbedtls"; rev = "${pname}-${version}"; - sha256 = "1mk3xv61wvqqrzd6jnrz8csyfnwwwwpjzywj3fsfy99p51d7wqgw"; + sha256 = "14gw3rga9qr6j8ssfjy7k4l8spz37gamqxh9qcwas7w48303897l"; }; nativeBuildInputs = [ cmake ninja perl python ]; From 360e57a567a7cb8fbe3d1f41dbb09238eccddefa Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 21 Oct 2019 12:48:22 +0200 Subject: [PATCH 094/142] mbedtls: 2.16.0 -> 2.16.3 Fixes CVE-2019-16910. Fixes #71452. --- pkgs/development/libraries/mbedtls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index 047e71f388ed..4d833bb1848f 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mbedtls"; name = "mbedtls-${version}"; - version = "2.16.0"; + version = "2.16.3"; src = fetchFromGitHub { owner = "ARMmbed"; repo = "mbedtls"; rev = "${pname}-${version}"; - sha256 = "14gw3rga9qr6j8ssfjy7k4l8spz37gamqxh9qcwas7w48303897l"; + sha256 = "1mzh92yyz93099a1gb2wvwc76jv12d1k1wg9k3dimbgczxgrkirc"; }; nativeBuildInputs = [ cmake ninja perl python ]; From 1d4f48d730c6d73532f8c1f4ef92c438f4a856b2 Mon Sep 17 00:00:00 2001 From: Brian Hicks Date: Mon, 21 Oct 2019 06:04:05 -0500 Subject: [PATCH 095/142] elmPackages.*: update to latest versions elm-language-server: 1.4.1 -> 1.4.2 downstream updates in others --- .../compilers/elm/packages/node-packages.nix | 274 ++++++++++++++---- 1 file changed, 218 insertions(+), 56 deletions(-) diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix index 91e027990d66..44afd4ca3cb1 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/pkgs/development/compilers/elm/packages/node-packages.nix @@ -76,13 +76,13 @@ let sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; }; }; - "@types/node-12.7.12" = { + "@types/node-12.11.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.7.12"; + version = "12.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.7.12.tgz"; - sha512 = "KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.11.1.tgz"; + sha512 = "TJtwsqZ39pqcljJpajeoofYRfeZ7/I/OMUQ5pR4q5wOKf2ocrUvBAZUMhWsOvKx3dVc/aaV5GluBivt0sWqA5A=="; }; }; "accepts-1.3.7" = { @@ -382,13 +382,13 @@ let sha512 = "Y+Wvypk3JhH5GPZAvlwJAWOVH/OsOhQMSj37vySuWHwQivoALplPxfBA8b973rFJI7OS+O+1YmmYXIiEXVMAcw=="; }; }; - "bluebird-3.7.0" = { + "bluebird-3.7.1" = { name = "bluebird"; packageName = "bluebird"; - version = "3.7.0"; + version = "3.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.0.tgz"; - sha512 = "aBQ1FxIa7kSWCcmKHlcHFlT2jt6J/l4FzC7KcPELkOJOsPOb/bccdhmIrKDfXhwFrmc7vDoDrrepFvGqjyXGJg=="; + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.1.tgz"; + sha512 = "DdmyoGCleJnkbp3nkbxTLJ18rjDsE4yCggEwKNXkeV123sPNfOCYeDoeuOY+F2FrSjO1YXcTU+dsy96KMy+gcg=="; }; }; "body-parser-1.18.2" = { @@ -787,22 +787,22 @@ let sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; }; }; - "core-js-2.6.9" = { + "core-js-2.6.10" = { name = "core-js"; packageName = "core-js"; - version = "2.6.9"; + version = "2.6.10"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz"; - sha512 = "HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A=="; + url = "https://registry.npmjs.org/core-js/-/core-js-2.6.10.tgz"; + sha512 = "I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA=="; }; }; - "core-js-3.2.1" = { + "core-js-3.3.2" = { name = "core-js"; packageName = "core-js"; - version = "3.2.1"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.2.1.tgz"; - sha512 = "Qa5XSVefSVPRxy2XfUC13WbvqkxhkwB3ve+pgCQveNgYzbM/UxZeu1dcOX/xr4UmfUd+muuvsaxilQzCyUurMw=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.3.2.tgz"; + sha512 = "S1FfZpeBchkhyoY76YAdFzKS4zz9aOK7EeFaNA2aJlyXyA+sgqz6xdxmLPGXEAf0nF44MVN1kSjrA9Kt3ATDQg=="; }; }; "core-util-is-1.0.2" = { @@ -1121,13 +1121,22 @@ let sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; }; }; - "es-abstract-1.15.0" = { + "error-ex-1.3.2" = { + name = "error-ex"; + packageName = "error-ex"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"; + sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; + }; + }; + "es-abstract-1.16.0" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.15.0"; + version = "1.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.15.0.tgz"; - sha512 = "bhkEqWJ2t2lMeaJDuk7okMkJWI/yqgH/EoGwpcvv0XW9RWQsRspI4wt6xuyuvMvvQE3gg/D9HXppgk21w78GyQ=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.16.0.tgz"; + sha512 = "xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg=="; }; }; "es-to-primitive-1.2.0" = { @@ -1202,13 +1211,13 @@ let sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; }; }; - "execa-2.1.0" = { + "execa-3.2.0" = { name = "execa"; packageName = "execa"; - version = "2.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-2.1.0.tgz"; - sha512 = "Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw=="; + url = "https://registry.npmjs.org/execa/-/execa-3.2.0.tgz"; + sha512 = "kJJfVbI/lZE1PZYDI5VPxp8zXPO9rtxOkhpZ0jMKha56AI9y2gGVC6bkukStQf0ka5Rh15BA5m7cCCH4jmHqkw=="; }; }; "expand-brackets-2.1.4" = { @@ -1598,13 +1607,13 @@ let sha512 = "oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw=="; }; }; - "fsevents-2.1.0" = { + "fsevents-2.1.1" = { name = "fsevents"; packageName = "fsevents"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.0.tgz"; - sha512 = "+iXhW3LuDQsno8dOIrCIT/CBjeBWuP7PXe8w9shnj9Lebny/Gx1ZjVBYwexLz36Ri2jKuXMNpV6CYNh8lHHgrQ=="; + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.1.tgz"; + sha512 = "4FRPXWETxtigtJW/gxzEDsX1LVbPAM93VleB83kZB+ellqbHMkyt2aJfuzNLRvFPnGi6bcE5SvfxgbXPeKteJw=="; }; }; "function-bind-1.1.1" = { @@ -1868,6 +1877,15 @@ let sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; }; }; + "hosted-git-info-2.8.5" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "2.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz"; + sha512 = "kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg=="; + }; + }; "http-cache-semantics-3.8.1" = { name = "http-cache-semantics"; packageName = "http-cache-semantics"; @@ -1931,6 +1949,15 @@ let sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; + "human-signals-1.1.1" = { + name = "human-signals"; + packageName = "human-signals"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz"; + sha512 = "SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw=="; + }; + }; "iconv-lite-0.4.19" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -2057,6 +2084,15 @@ let sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; }; }; + "is-arrayish-0.2.1" = { + name = "is-arrayish"; + packageName = "is-arrayish"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + }; "is-binary-path-1.0.1" = { name = "is-binary-path"; packageName = "is-binary-path"; @@ -2390,6 +2426,15 @@ let sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"; }; }; + "json-parse-better-errors-1.0.2" = { + name = "json-parse-better-errors"; + packageName = "json-parse-better-errors"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; + sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="; + }; + }; "json-schema-0.2.3" = { name = "json-schema"; packageName = "json-schema"; @@ -2903,6 +2948,15 @@ let sha512 = "z9xN2ibI6P0UylFadN7oMcIMsoTeCENC0rZyRM5MVK9AqzSPx+uGqKG6KMPeC/laOV4wOGZq/GH0PTstRNSqOA=="; }; }; + "normalize-package-data-2.5.0" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; + }; + }; "normalize-path-2.1.1" = { name = "normalize-path"; packageName = "normalize-path"; @@ -2948,13 +3002,13 @@ let sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; }; }; - "npm-run-path-3.1.0" = { + "npm-run-path-4.0.0" = { name = "npm-run-path"; packageName = "npm-run-path"; - version = "3.1.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-3.1.0.tgz"; - sha512 = "Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg=="; + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.0.tgz"; + sha512 = "8eyAOAH+bYXFPSnNnKr3J+yoybe8O87Is5rtAQ8qRczJz1ajcsjg8l2oZqP+Ppx15Ii3S1vUTjQN2h4YO2tWWQ=="; }; }; "npx-10.2.0" = { @@ -3200,6 +3254,15 @@ let sha512 = "EeHQFFTlEmLrkIQoxbE9w0FuAWHoc1XpthDqnZ/i9keOt701cteyXwAxQFLpVqVjj3feh2TodkihjLaRUtIgLg=="; }; }; + "parse-json-4.0.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz"; + sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; + }; + }; "parseurl-1.3.3" = { name = "parseurl"; packageName = "parseurl"; @@ -3263,6 +3326,15 @@ let sha512 = "8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg=="; }; }; + "path-parse-1.0.6" = { + name = "path-parse"; + packageName = "path-parse"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; + sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; + }; + }; "path-to-regexp-0.1.7" = { name = "path-to-regexp"; packageName = "path-to-regexp"; @@ -3362,6 +3434,15 @@ let sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; }; + "project-version-1.2.0" = { + name = "project-version"; + packageName = "project-version"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/project-version/-/project-version-1.2.0.tgz"; + sha512 = "o94hj3Ld7/7jeFPZEPuZxsbpeOsPqZMXh5iYIDS7rjhjj4UcYHDlb4pYi43qjXMYM3LUcD6qJhQq9siEzg1KIA=="; + }; + }; "proto-list-1.2.4" = { name = "proto-list"; packageName = "proto-list"; @@ -3497,6 +3578,15 @@ let sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; }; }; + "read-pkg-4.0.1" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-4.0.1.tgz"; + sha1 = "963625378f3e1c4d48c85872b5a6ec7d5d093237"; + }; + }; "readable-stream-2.0.6" = { name = "readable-stream"; packageName = "readable-stream"; @@ -3524,13 +3614,13 @@ let sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; }; }; - "readdirp-3.1.3" = { + "readdirp-3.2.0" = { name = "readdirp"; packageName = "readdirp"; - version = "3.1.3"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.1.3.tgz"; - sha512 = "ZOsfTGkjO2kqeR5Mzr5RYDbTGYneSkdNKX2fOX2P5jF7vMrd/GNnIAUtDldeHHumHUCQ3V05YfWUdxMPAsRu9Q=="; + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz"; + sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ=="; }; }; "regenerator-runtime-0.9.6" = { @@ -3650,6 +3740,15 @@ let sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; }; }; + "resolve-1.12.0" = { + name = "resolve"; + packageName = "resolve"; + version = "1.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz"; + sha512 = "B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w=="; + }; + }; "resolve-url-0.2.1" = { name = "resolve-url"; packageName = "resolve-url"; @@ -4028,6 +4127,42 @@ let sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; }; }; + "spdx-correct-3.1.0" = { + name = "spdx-correct"; + packageName = "spdx-correct"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz"; + sha512 = "lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q=="; + }; + }; + "spdx-exceptions-2.2.0" = { + name = "spdx-exceptions"; + packageName = "spdx-exceptions"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; + sha512 = "2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="; + }; + }; + "spdx-expression-parse-3.0.0" = { + name = "spdx-expression-parse"; + packageName = "spdx-expression-parse"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; + sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg=="; + }; + }; + "spdx-license-ids-3.0.5" = { + name = "spdx-license-ids"; + packageName = "spdx-license-ids"; + version = "3.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; + sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="; + }; + }; "split-1.0.1" = { name = "split"; packageName = "split"; @@ -4604,6 +4739,15 @@ let sha512 = "pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="; }; }; + "validate-npm-package-license-3.0.4" = { + name = "validate-npm-package-license"; + packageName = "validate-npm-package-license"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; + }; + }; "vary-1.1.2" = { name = "vary"; packageName = "vary"; @@ -4784,13 +4928,13 @@ let sha512 = "o41D/WmDeca0BqYhsr3nJzQyg9NF5X8l/UdnFNux9cS3lwB+swm8qGWX5rn+aD6xfBU3rGmtHij7g7x6LxFU3A=="; }; }; - "ws-7.1.2" = { + "ws-7.2.0" = { name = "ws"; packageName = "ws"; - version = "7.1.2"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.1.2.tgz"; - sha512 = "gftXq3XI81cJCgkUiAVixA0raD9IVmXqsylCrjRygw4+UOOGzPoxnQ6r/CnVL9i+mDncJo94tSkyrtuuQVBmrg=="; + url = "https://registry.npmjs.org/ws/-/ws-7.2.0.tgz"; + sha512 = "+SqNqFbwTm/0DC18KYzIsMTnEWpLwJsiasW/O17la4iDRRIO9uaHbvKiAS3AHgTiuuWerK/brj4O6MYZkei9xg=="; }; }; "xmlbuilder-8.2.2" = { @@ -4906,7 +5050,7 @@ in sources."binary-0.3.0" sources."binary-extensions-1.13.1" sources."binwrap-0.2.2" - sources."bluebird-3.7.0" + sources."bluebird-3.7.1" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -5299,7 +5443,7 @@ in sources."binary-0.3.0" sources."binary-extensions-1.13.1" sources."binwrap-0.2.2" - sources."bluebird-3.7.0" + sources."bluebird-3.7.1" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -5762,7 +5906,7 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-3.2.1" + sources."core-js-3.3.2" sources."core-util-is-1.0.2" sources."cross-spawn-6.0.5" sources."debug-2.6.9" @@ -5777,7 +5921,7 @@ in sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - sources."es-abstract-1.15.0" + sources."es-abstract-1.16.0" sources."es-to-primitive-1.2.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" @@ -6204,7 +6348,7 @@ in sources."content-type-1.0.4" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."core-js-2.6.9" + sources."core-js-2.6.10" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."debug-2.6.9" @@ -6388,7 +6532,7 @@ in ]; }) sources."fresh-0.5.2" - sources."fsevents-2.1.0" + sources."fsevents-2.1.1" sources."get-stream-4.1.0" sources."glob-parent-5.1.0" sources."has-ansi-2.0.0" @@ -6425,7 +6569,7 @@ in sources."pseudomap-1.0.2" sources."pump-3.0.0" sources."range-parser-1.2.1" - sources."readdirp-3.1.3" + sources."readdirp-3.2.0" sources."requires-port-1.0.0" sources."semver-5.7.1" (sources."send-0.17.1" // { @@ -6470,7 +6614,7 @@ in sha512 = "9AjXLkznJBVLHHO+KErcgFMKeXe3tcudjj3PYIH6gWXG6W3PT+HF+t2zCflvgFPlhJO5H/wQCCo4rfCApltBzg=="; }; dependencies = [ - sources."bluebird-3.7.0" + sources."bluebird-3.7.1" sources."core-util-is-1.0.2" sources."fs-extra-6.0.1" sources."graceful-fs-4.2.2" @@ -6504,10 +6648,10 @@ in "@elm-tooling/elm-language-server" = nodeEnv.buildNodePackage { name = "_at_elm-tooling_slash_elm-language-server"; packageName = "@elm-tooling/elm-language-server"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.4.1.tgz"; - sha512 = "gzN/ee5JfQmg/+2xFq49zRN62ZFeMTu5A0unwQpOf3qLZa8Rz7no6OIaCnl6nEkNsaoAjvZxv1aFJOd2TtNtFw=="; + url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.4.2.tgz"; + sha512 = "66FzEfP1Pan3Hw417rRVTXFtYcKV6EB8HwEQ6uQcnP1ggpTqV/7D8Mp90Y3JzsDHyIwm7BlsksxY6K+dEOgXqg=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.3" @@ -6516,7 +6660,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-12.7.12" + sources."@types/node-12.11.1" sources."accepts-1.3.7" sources."ajv-6.10.2" sources."array-flatten-1.1.1" @@ -6542,7 +6686,7 @@ in sources."content-type-1.0.4" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."core-js-2.6.9" + sources."core-js-2.6.10" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.1" sources."dashdash-1.14.1" @@ -6561,9 +6705,10 @@ in }) sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" + sources."error-ex-1.3.2" sources."escape-html-1.0.3" sources."etag-1.8.1" - (sources."execa-2.1.0" // { + (sources."execa-3.2.0" // { dependencies = [ sources."is-stream-2.0.0" ]; @@ -6598,13 +6743,16 @@ in sources."graceful-fs-4.2.2" sources."har-schema-2.0.0" sources."har-validator-5.1.3" + sources."hosted-git-info-2.8.5" sources."http-errors-1.6.3" sources."http-signature-1.2.0" + sources."human-signals-1.1.1" sources."iconv-lite-0.4.19" sources."ignore-5.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ipaddr.js-1.9.0" + sources."is-arrayish-0.2.1" sources."is-extglob-2.1.1" sources."is-glob-4.0.1" sources."is-number-7.0.0" @@ -6615,6 +6763,7 @@ in sources."isexe-2.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" + sources."json-parse-better-errors-1.0.2" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" @@ -6636,7 +6785,8 @@ in sources."ms-2.0.0" sources."negotiator-0.6.2" sources."node-watch-0.5.5" - sources."npm-run-path-3.1.0" + sources."normalize-package-data-2.5.0" + sources."npm-run-path-4.0.0" sources."oauth-sign-0.9.0" sources."on-finished-2.3.0" sources."once-1.4.0" @@ -6646,14 +6796,18 @@ in sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."p-finally-2.0.1" + sources."parse-json-4.0.0" sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."path-key-3.1.0" + sources."path-parse-1.0.6" sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" sources."performance-now-2.1.0" sources."picomatch-2.0.7" + sources."pify-3.0.0" sources."process-nextick-args-1.0.7" + sources."project-version-1.2.0" sources."proxy-addr-2.0.5" sources."psl-1.4.0" sources."pump-3.0.0" @@ -6667,6 +6821,7 @@ in sources."setprototypeof-1.0.3" ]; }) + sources."read-pkg-4.0.1" sources."readable-stream-2.0.6" sources."regenerator-runtime-0.9.6" (sources."request-2.88.0" // { @@ -6675,11 +6830,13 @@ in sources."safe-buffer-5.2.0" ]; }) + sources."resolve-1.12.0" sources."reusify-1.0.4" sources."run-parallel-1.1.9" sources."rxjs-6.5.3" sources."safe-buffer-5.1.1" sources."safer-buffer-2.1.2" + sources."semver-5.7.1" sources."send-0.16.2" sources."serve-static-1.13.2" sources."setprototypeof-1.1.0" @@ -6687,6 +6844,10 @@ in sources."shebang-regex-3.0.0" sources."signal-exit-3.0.2" sources."slash-3.0.0" + sources."spdx-correct-3.1.0" + sources."spdx-exceptions-2.2.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.5" sources."sshpk-1.16.1" sources."statuses-1.4.0" sources."string_decoder-0.10.31" @@ -6712,6 +6873,7 @@ in sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.3.3" + sources."validate-npm-package-license-3.0.4" sources."vary-1.1.2" sources."verror-1.10.0" sources."vscode-jsonrpc-4.0.0" @@ -6726,7 +6888,7 @@ in sources."web-tree-sitter-0.15.9" sources."which-2.0.1" sources."wrappy-1.0.2" - sources."ws-7.1.2" + sources."ws-7.2.0" sources."xtend-4.0.2" ]; buildInputs = globalBuildInputs; From 8252861507ef85b45f739c63f27d4e9a80b31b31 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Fri, 18 Oct 2019 17:57:33 +0200 Subject: [PATCH 096/142] lib/trivial: add `pipe` function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `pipe` is a useful operator for creating pipelines of functions. It works around the usual problem of e.g. string operations becoming deeply nested functions. In principle, there are four different ways this function could be written: pipe val [ f1 .. fn ] pipe val [ fn .. f1 ] compose [ f1 .. fn ] val compose [ fn .. f1 ] val The third and fourth form mirror composition of functions, they would be the same as e.g. `(f1 << f2 << f3 .. << fn) val`. However, it is not clear which direction the list should have (as one can see in the second form, which is the most absurd. In order not to confuse users, we decide for the most “intuitive” form, which mirrors the way unix pipes work (thus the name `pipe`). The flow of data goes from left to right. Co-Authored-By: Silvan Mosberger --- lib/default.nix | 4 ++-- lib/tests/misc.nix | 25 +++++++++++++++++++++++++ lib/trivial.nix | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 2 deletions(-) diff --git a/lib/default.nix b/lib/default.nix index f293a1defb11..74d508ec1d6e 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -57,8 +57,8 @@ let hasAttr head isAttrs isBool isInt isList isString length lessThan listToAttrs pathExists readFile replaceStrings seq stringLength sub substring tail; - inherit (trivial) id const concat or and bitAnd bitOr bitXor bitNot - boolToString mergeAttrs flip mapNullable inNixShell min max + inherit (trivial) id const pipe concat or and bitAnd bitOr bitXor + bitNot boolToString mergeAttrs flip mapNullable inNixShell min max importJSON warn info showWarnings nixpkgsVersion version mod compare splitByAndCompare functionArgs setFunctionArgs isFunction; inherit (fixedPoints) fix fix' converge extends composeExtensions diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index e5d76d4e57b7..b064faa1e1ba 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -18,6 +18,31 @@ runTests { expected = 2; }; + testPipe = { + expr = pipe 2 [ + (x: x + 2) # 2 + 2 = 4 + (x: x * 2) # 4 * 2 = 8 + ]; + expected = 8; + }; + + testPipeEmpty = { + expr = pipe 2 []; + expected = 2; + }; + + testPipeStrings = { + expr = pipe [ 3 4 ] [ + (map toString) + (map (s: s + "\n")) + concatStrings + ]; + expected = '' + 3 + 4 + ''; + }; + /* testOr = { expr = or true false; diff --git a/lib/trivial.nix b/lib/trivial.nix index 54c66cfce7b9..3a25e31fb052 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -29,6 +29,43 @@ rec { # Value to ignore y: x; + /* Pipes a value through a list of functions, left to right. + + Type: pipe :: a -> [] -> + Example: + pipe 2 [ + (x: x + 2) # 2 + 2 = 4 + (x: x * 2) # 4 * 2 = 8 + ] + => 8 + + # ideal to do text transformations + pipe [ "a/b" "a/c" ] [ + + # create the cp command + (map (file: ''cp "${src}/${file}" $out\n'')) + + # concatenate all commands into one string + lib.concatStrings + + # make that string into a nix derivation + (pkgs.runCommand "copy-to-out" {}) + + ] + => + + The output type of each function has to be the input type + of the next function, and the last function returns the + final value. + */ + pipe = val: functions: + let reverseApply = x: f: f x; + in builtins.foldl' reverseApply val functions; + /* note please don’t add a function like `compose = flip pipe`. + This would confuse users, because the order of the functions + in the list is not clear. With pipe, it’s obvious that it + goes first-to-last. With `compose`, not so much. + */ ## Named versions corresponding to some builtin operators. From b1c21ad6f0cb54ab047798ad6c955f62e382d0a1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 21 Oct 2019 07:32:23 -0400 Subject: [PATCH 097/142] zoom-us: 3.0.303290.1010 -> 3.0.306796.1020 --- .../networking/instant-messengers/zoom-us/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 9c06a737598b..277f10691f01 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -14,11 +14,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "3.0.303290.1010"; + version = "3.0.306796.1020"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "0rs18csmwb8r5n0fc1ka1zjz3f0rydm6fxiy1pa1c2k5bmya56f9"; + sha256 = "0nh93pyincwfmx3z5x4s0ym3n0ff492nwd9wh3xkcl518pslxpxy"; }; }; From ad5994f18214aa5a8dfdb51f70d2c8e55f47288f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 21 Oct 2019 07:34:51 -0400 Subject: [PATCH 098/142] oh-my-zsh: 2019-10-19 -> 2019-10-20 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 6ebe81dc9f8d..3850ef2ca59d 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 = "2019-10-19"; + version = "2019-10-20"; pname = "oh-my-zsh"; - rev = "05dfd0ae8520e58e852c574f55c83fe6f49fb189"; + rev = "a7c740b1d7d0033c6de118439c7935962b2a5c2a"; src = fetchgit { inherit rev; url = "https://github.com/robbyrussell/oh-my-zsh"; - sha256 = "1ky926ih9b56xgh8xp8dsnzjliwzd8rr0cqn4wjf74z42bg2cnw0"; + sha256 = "1kwmjizldfsvxppf8xmgqh0644gnfvcns4l9cjpcvd0nk616yg0f"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From cfe3c8930000a1c6aaafbfa6d7f32040d92ff36f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 21 Oct 2019 08:00:49 -0400 Subject: [PATCH 099/142] sbt-extras: 2019-09-30 -> 2019-10-21 --- .../development/tools/build-managers/sbt-extras/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index a07cbab285ca..33e8e7cad5d8 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk }: let - rev = "aa4425cc96aee5119fb9fee9138b3d3bdb6482f7"; - version = "2019-09-30"; + rev = "f0669e9b6745b65fae3ec58c2d6a2bef133db456"; + version = "2019-10-21"; in stdenv.mkDerivation { name = "sbt-extras-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "15xkd1l0ka1fl77g7p498krvk0mcn25jq6jp4zyq5r8dla5rn832"; + sha256 = "1pc8l78qp51ixa26z0n1djwmazpxw1p4j4w4njil7ywxl9xvr92i"; }; dontBuild = true; From 9d281cc9fe6b0febad5ed48b51c6c3eaecf545f4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 Oct 2019 05:52:35 -0700 Subject: [PATCH 100/142] cutelyst: 2.8.0 -> 2.9.0 (#71519) --- pkgs/development/libraries/cutelyst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix index e84fbe89aa95..6cd464e55390 100644 --- a/pkgs/development/libraries/cutelyst/default.nix +++ b/pkgs/development/libraries/cutelyst/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "cutelyst"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "cutelyst"; repo = "cutelyst"; rev = "v${version}"; - sha256 = "02jys32qkyksa2dmanyg4x0y5lh4ra0xbn2mfr2k84slrxbgjs1g"; + sha256 = "13h2sj131s31qdzdwa3hx7ildmvlk8mv9s0j99kvx1ijaq49z79f"; }; nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; From 49945b95d02a6a3bc692a486d3701055657e3e68 Mon Sep 17 00:00:00 2001 From: davidak Date: Mon, 21 Oct 2019 14:57:35 +0200 Subject: [PATCH 101/142] xzoom: fix version --- pkgs/tools/X11/xzoom/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/X11/xzoom/default.nix b/pkgs/tools/X11/xzoom/default.nix index d1867e3b077b..e414576b5230 100644 --- a/pkgs/tools/X11/xzoom/default.nix +++ b/pkgs/tools/X11/xzoom/default.nix @@ -1,19 +1,21 @@ { stdenv, fetchurl, libX11, libXext, libXt, imake, gccmakedep}: stdenv.mkDerivation rec { - name = "${pname}-${version}.${patchlevel}"; + name = "${pname}-${version}"; pname = "xzoom"; - version = "0.3"; - patchlevel = "24"; + major = "0"; + minor = "3"; + patch = "24"; + version = "${major}.${minor}.${patch}"; # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) src = fetchurl { - url = "http://www.ibiblio.org/pub/linux/libs/X/${pname}-${version}.tgz"; + url = "http://www.ibiblio.org/pub/linux/libs/X/${pname}-${major}.${minor}.tgz"; sha256 = "0jzl5py4ny4n4i58lxx2hdwq9zphqf7h3m14spl3079y5mlzssxj"; }; patches = [ (fetchurl { - url = "http://http.debian.net/debian/pool/main/x/xzoom/xzoom_${version}-${patchlevel}.diff.gz"; + url = "http://http.debian.net/debian/pool/main/x/xzoom/xzoom_${major}.${minor}-${patch}.diff.gz"; sha256 = "0zhc06whbvaz987bzzzi2bz6h9jp6rv812qs7b71drivvd820qbh"; }) ]; From b0e4d7b9ea970c13e0509d7b4fbe1729d016abe9 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 21 Oct 2019 09:14:35 -0400 Subject: [PATCH 102/142] ammonite: 1.7.1 -> 1.7.4 --- pkgs/development/tools/ammonite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index d44a6666ee9f..ad33edf004f0 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -8,7 +8,7 @@ let common = { scalaVersion, sha256 }: stdenv.mkDerivation rec { pname = "ammonite"; - version = "1.7.1"; + version = "1.7.4"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { }; }; in { - ammonite_2_12 = common { scalaVersion = "2.12"; sha256 = "0isg9flnzc2ldbx6q0lg0xyg9lnvqkd8qhgfln8p1hbzdq0n6jd0"; }; - ammonite_2_13 = common { scalaVersion = "2.13"; sha256 = "01dyc6bilhcr1mwrpmhjc8nhzfqgjh44bx36gd3gk9mkvlbys5mp"; }; + ammonite_2_12 = common { scalaVersion = "2.12"; sha256 = "0d2xjhxrly4cv5fpjv1i0a74ayij7c2x5sb6lsgzxpq7jj0bk1m6"; }; + ammonite_2_13 = common { scalaVersion = "2.13"; sha256 = "0hmdizzf8l8i07vdfik24iby39xg1vjfp1cwgjpbcmxv8klf50b0"; }; } From a7077637f91bdccc6548e944f24292ccf3927de4 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 6 Oct 2019 11:07:04 +0300 Subject: [PATCH 103/142] snzip: init at 1.0.4 --- pkgs/tools/archivers/snzip/default.nix | 31 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/archivers/snzip/default.nix diff --git a/pkgs/tools/archivers/snzip/default.nix b/pkgs/tools/archivers/snzip/default.nix new file mode 100644 index 000000000000..031cac64b759 --- /dev/null +++ b/pkgs/tools/archivers/snzip/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub +, autoreconfHook +, pkgconfig +, snappy +}: + +stdenv.mkDerivation rec { + pname = "snzip"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "kubo"; + repo = "snzip"; + rev = version; + sha256 = "1v8li1zv9f2g31iyi9y9zx42rjvwkaw221g60pmkbv53y667i325"; + }; + + buildInputs = [ snappy ]; + # We don't use a release tarball so we don't have a `./configure` script to + # run. That's why we generate it. + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + meta = with stdenv.lib; { + description = "A compression/decompression tool based on snappy"; + homepage = "https://github.com/kubo/snzip"; + maintainers = with maintainers; [ doronbehar ]; + license = licenses.bsd2; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be06f08f9657..d70ba57c531d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10169,6 +10169,8 @@ in snore = callPackage ../tools/misc/snore { }; + snzip = callPackage ../tools/archivers/snzip { }; + snowman = qt5.callPackage ../development/tools/analysis/snowman { }; sparse = callPackage ../development/tools/analysis/sparse { }; From 6f8c6d29c811f49380a251278931498cbcd4899f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 Oct 2019 07:38:31 -0700 Subject: [PATCH 104/142] drawio: 11.3.0 -> 12.1.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/drawio/versions --- pkgs/applications/graphics/drawio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 88cff0035c73..f29f2a927059 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "11.3.0"; + version = "12.1.0"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "00xq2pi84nbdnlbsaj4k9i93skz1nknxvhd2f2cgdm0b3sp86qbk"; + sha256 = "02gwhnbl9fzgf1z8c9bkm3rxzyncp7v57yqc322r85vg0wxir3f8"; }; nativeBuildInputs = [ From a2255300db9064c76926c2b92c6bea2f398714f2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 Oct 2019 07:52:17 -0700 Subject: [PATCH 105/142] diffoscope: 125 -> 126 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/diffoscope/versions --- pkgs/tools/misc/diffoscope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 9cb76b2ce37c..cf2a01faf1c2 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -9,11 +9,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "125"; + version = "126"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "0qwib44f43hinidbdjqnr2zanj678mgckx34x48jyywppvbj8yq4"; + sha256 = "0jbmpxj3y1gnmd00pj9x3jrx0hnjlkrzvk1m9miswgfq0ac1ws3p"; }; patches = [ From 0ee02a9d42b5fe1825b0f7cee7a9986bb4ba975d Mon Sep 17 00:00:00 2001 From: Renaud Date: Mon, 21 Oct 2019 16:52:41 +0200 Subject: [PATCH 106/142] mbedtls: disable auto updates Repology indicates dev releases as newer version so disable @r-ryantm automatic updates. cc @fpletz --- pkgs/development/libraries/mbedtls/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index 4d833bb1848f..603b9be610a1 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "mbedtls"; name = "mbedtls-${version}"; - version = "2.16.3"; + version = "2.16.3"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "ARMmbed"; From 58ddd8f16a6799b2463b7d27ccad36c74a93ebfe Mon Sep 17 00:00:00 2001 From: Renaud Date: Mon, 21 Oct 2019 17:45:53 +0200 Subject: [PATCH 107/142] libechonest: 2.3.0 -> 2.3.1 (#71525) Just a package revamp + one less sha1 hash in nixpkgs --- .../libraries/libechonest/default.nix | 30 ++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libechonest/default.nix b/pkgs/development/libraries/libechonest/default.nix index 855386114c1c..cde046bf1327 100644 --- a/pkgs/development/libraries/libechonest/default.nix +++ b/pkgs/development/libraries/libechonest/default.nix @@ -1,20 +1,36 @@ -{ stdenv, fetchurl, cmake, qt4, qjson, doxygen, boost }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, doxygen, qt4, qjson }: stdenv.mkDerivation rec { pname = "libechonest"; - version = "2.3.0"; + version = "2.3.1"; - src = fetchurl { - url = "http://files.lfranchi.com/${pname}-${version}.tar.bz2"; - sha1 = "cf1b279c96f15c87c36fdeb23b569a60cdfb01db"; + src = fetchFromGitHub { + owner = "lfranchi"; + repo = pname; + rev = version; + sha256 = "0xbavf9f355dl1d3qv59x4ryypqrdanh9xdvw2d0q66l008crdkq"; }; - buildInputs = [ cmake qt4 qjson doxygen boost ]; + patches = [ + (fetchpatch { + url = "https://github.com/lfranchi/libechonest/commit/009514f65044823ef29045397d4b58dd04d09977.patch"; + sha256 = "0dmmpi7hixdngwiv045ilqrzyzkf56xpfyihcsx5i3xya2m0mynx"; + }) + (fetchpatch { + url = "https://github.com/lfranchi/libechonest/commit/3ce779536d56a163656e8098913f923e6cda2b5c.patch"; + sha256 = "1vasd3sgqah562vxk71jibyws5cbihjjfnffd50qvdm2xqgvbx94"; + }) + ]; + + nativeBuildInputs = [ cmake doxygen ]; + buildInputs = [ qt4 qjson ]; + enableParallelBuilding = true; + doCheck = false; # requires network access meta = { description = "A C++/Qt wrapper around the Echo Nest API"; - homepage = http://projects.kde.org/projects/playground/libs/libechonest; + homepage = "https://projects.kde.org/projects/playground/libs/libechonest"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; From db32ff033369349b55bbcd346139fade76dd99e7 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 21 Oct 2019 11:46:17 -0400 Subject: [PATCH 108/142] linux: 5.4-rc3 -> 5.4-rc4 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 23201f1c1b38..10a000217543 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4-rc3"; + version = "5.4-rc4"; extraMeta.branch = "5.4"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1hp9b71ip8a9mlgnwhr8x7mhy5qkgz57hd5xqskfx3axbsh2j3f5"; + sha256 = "0f0qnk9x1drd0vgawfr1nyr77pm8j00fqjij8qs45b69c1l8bx5i"; }; # Should the testing kernels ever be built on Hydra? From aa910d164d478dfb871bc6a8db416ca887cfc8f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 21 Oct 2019 17:01:44 +0200 Subject: [PATCH 109/142] nixos/seahorse: use seahorse's askpass by default --- nixos/modules/programs/seahorse.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/programs/seahorse.nix b/nixos/modules/programs/seahorse.nix index c08b0a85374c..b229d2a2c0db 100644 --- a/nixos/modules/programs/seahorse.nix +++ b/nixos/modules/programs/seahorse.nix @@ -31,6 +31,8 @@ with lib; config = mkIf config.programs.seahorse.enable { + programs.ssh.askPassword = mkDefault "${pkgs.gnome3.seahorse}/libexec/seahorse/ssh-askpass"; + environment.systemPackages = [ pkgs.gnome3.seahorse ]; From 6c4114c99a8b9e82f27472188add1cd1727c0113 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 Oct 2019 04:45:13 -0700 Subject: [PATCH 110/142] calcurse: 4.5.0 -> 4.5.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/calcurse/versions --- pkgs/applications/misc/calcurse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix index 402198a97322..8f8934cb084b 100644 --- a/pkgs/applications/misc/calcurse/default.nix +++ b/pkgs/applications/misc/calcurse/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "calcurse"; - version = "4.5.0"; + version = "4.5.1"; src = fetchurl { url = "https://calcurse.org/files/${pname}-${version}.tar.gz"; - sha256 = "1vjwcmp51h7dsvwn0qx93w9chp3wp970v7d9mjhk7jyamcbfywn3"; + sha256 = "0cgkd285x5pk62lmdx9fjxl46c5lj8wj2cqbxq7d99yb4il5fdjk"; }; buildInputs = [ ncurses gettext python3 python3Packages.wrapPython ]; From 64dbf3a22ddeb258c979abad9744796d80241921 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Mon, 21 Oct 2019 09:23:32 +0200 Subject: [PATCH 111/142] podman: 1.6.1 -> 1.6.2 Signed-off-by: Sascha Grunert --- pkgs/applications/virtualization/podman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 35a89f3f989c..59a0f00e7c6f 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "podman"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "containers"; repo = "libpod"; rev = "v${version}"; - sha256 = "0s9jxcjx9bkml606rn29358pfavd85m6zshra4qkpbc1iwa6hgr9"; + sha256 = "0cwyrzjjgxclnzc1yx6vm2bvq73mldwxfwalkprzlg8vpqbxji8y"; }; goPackagePath = "github.com/containers/libpod"; From 45ffe82c43cb69a57622935220bb0950dade7934 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Mon, 21 Oct 2019 10:00:53 +0200 Subject: [PATCH 112/142] dbeaver: 6.2.2 -> 6.2.3 --- pkgs/applications/misc/dbeaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 179dc85b2a92..191c6a31972b 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.2.2"; + version = "6.2.3"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "0qpa0wh5lr5lxk9cdv5p1cmbdk1kw1lfqmsfgqxvgfysc1mgjgp1"; + sha256 = "1v4sllzvaz4fj8s14ddzw11wczlghbdppv8fl5jg6xglg687sgaj"; }; installPhase = '' From 8e5de3a0cdb3cea91c9f0276d84f656e619c0ab2 Mon Sep 17 00:00:00 2001 From: Renaud Date: Mon, 21 Oct 2019 18:25:40 +0200 Subject: [PATCH 113/142] libcutl: fix regex Attempt to fix #71544 --- pkgs/development/libraries/libcutl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libcutl/default.nix b/pkgs/development/libraries/libcutl/default.nix index 9abd3b7ccc1c..b13805aa37aa 100644 --- a/pkgs/development/libraries/libcutl/default.nix +++ b/pkgs/development/libraries/libcutl/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { license = licenses.mit; }; - majmin = builtins.head ( builtins.match "([[:digit:]]\.[[:digit:]]*+)\.*" "${version}" ); + majmin = builtins.head ( builtins.match "([[:digit:]]\.[[:digit:]]+)\.*" "${version}" ); src = fetchurl { url = "https://codesynthesis.com/download/${pname}/${majmin}/${pname}-${version}.tar.bz2"; sha256 = "070j2x02m4gm1fn7gnymrkbdxflgzxwl7m96aryv8wp3f3366l8j"; From 6a2a395241ea222bc8617806e9e63c133492317f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20P=C3=A4tzel?= Date: Wed, 16 Oct 2019 19:45:26 +0200 Subject: [PATCH 114/142] pythonPackages.mesa: init at 0.8.6 --- .../python-modules/mesa/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/mesa/default.nix diff --git a/pkgs/development/python-modules/mesa/default.nix b/pkgs/development/python-modules/mesa/default.nix new file mode 100644 index 000000000000..cab480f84fd7 --- /dev/null +++ b/pkgs/development/python-modules/mesa/default.nix @@ -0,0 +1,34 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, isPy27 +, cookiecutter, networkx , pandas, tornado, tqdm +, pytest }: + +buildPythonPackage rec { + pname = "mesa"; + version = "0.8.6"; + + # According to their docs, this library is for Python 3+. + disabled = isPy27; + + src = fetchFromGitHub { + owner = "projectmesa"; + repo = "mesa"; + rev = "v${version}"; + sha256 = "0d8c636zhswxd91ldlmdxxlyym2fj3bk1iqmpc1jp3hg7vvc7w03"; + }; + + checkInputs = [ pytest ]; + + # Ignore test which tries to mkdir in unreachable location. + checkPhase = '' + pytest tests -k "not scaffold" + ''; + + propagatedBuildInputs = [ cookiecutter networkx pandas tornado tqdm ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/projectmesa/mesa"; + description = "An agent-based modeling (or ABM) framework in Python"; + license = licenses.asl20; + maintainers = [ maintainers.dpaetzel ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e577d40486ff..6e81ca4e2c53 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3798,6 +3798,8 @@ in { memory_profiler = callPackage ../development/python-modules/memory_profiler { }; + mesa = callPackage ../development/python-modules/mesa { }; + metaphone = callPackage ../development/python-modules/metaphone { }; mezzanine = callPackage ../development/python-modules/mezzanine { }; From 3db3c787d50f37536ab1fe6603759bd8db580aa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20P=C3=A4tzel?= Date: Mon, 21 Oct 2019 08:09:02 +0200 Subject: [PATCH 115/142] pythonPackages.pyside: inherit mesa from pkgs --- pkgs/top-level/python-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6e81ca4e2c53..36c5c36ddc71 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1039,7 +1039,9 @@ in { pyschedule = callPackage ../development/python-modules/pyschedule { }; - pyside = callPackage ../development/python-modules/pyside { }; + pyside = callPackage ../development/python-modules/pyside { + inherit (pkgs) mesa; + }; pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { inherit (pkgs) libxml2 libxslt; # Do not need the Python bindings. From a2a6f1be179fe345a5ce20b299770f5d8c45e2e2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 Oct 2019 10:37:18 -0700 Subject: [PATCH 116/142] pantheon.elementary-wallpapers: 5.3 -> 5.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/elementary-wallpapers/versions --- .../pantheon/artwork/elementary-wallpapers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix index 30145541750f..c48dd761e081 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "elementary-wallpapers"; - version = "5.3"; + version = "5.4"; repoName = "wallpapers"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1i0zf9gzhwm8hgq5cp1xnxipqjvgzd9wfiicz612hgp6ivc0z0ag"; + sha256 = "1ihvv9v8m5f2n2v3bgg769l52wbg241zgp3d45q6phk7p8s1gz3s"; }; passthru = { From b73b9399ba6e9aa7f17ed6e5cea0dbff363a31d0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 Oct 2019 11:24:52 -0700 Subject: [PATCH 117/142] golly: 3.2 -> 3.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/golly/versions --- pkgs/applications/science/misc/golly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix index 74fa4cc02ed5..4af233a6d55f 100644 --- a/pkgs/applications/science/misc/golly/default.nix +++ b/pkgs/applications/science/misc/golly/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, wxGTK, perl, python2, zlib, libGLU_combined, libX11}: stdenv.mkDerivation rec { pname = "golly"; - version = "3.2"; + version = "3.3"; src = fetchurl { - sha256 = "0cg9mbwmf4q6qxhqlnzrxh9y047banxdb8pd3hgj3smmja2zf0jd"; + sha256 = "1j3ksnar4rdam4xiyspgyrs1pifbvxfxkrn65brkwxpx39mpgzc8"; url="mirror://sourceforge/project/golly/golly/golly-${version}/golly-${version}-src.tar.gz"; }; From 5955b96940c999bed5cb813b8bd2b2dc30189fcc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 Oct 2019 08:48:38 -0700 Subject: [PATCH 118/142] ffmpegthumbnailer: 2.2.1 -> 2.2.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ffmpegthumbnailer/versions --- pkgs/development/libraries/ffmpegthumbnailer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix index 4e6a987eb716..6f5b1840c249 100644 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ffmpegthumbnailer"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "dirkvdb"; repo = "ffmpegthumbnailer"; rev = version; - sha256 = "0mcdvyzny3yrdx23f3ww0i6lgkh68nzfcdla9d4vkc8l2b1kla1j"; + sha256 = "1bakbr714j7yxdal1f5iq0gcl4cxggbbgj227ihdh5kvygqlwich"; }; nativeBuildInputs = [ cmake pkgconfig ]; From 417834eb7aa5852ea5d447cc53e03886673968a0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 Oct 2019 11:45:35 -0700 Subject: [PATCH 119/142] iosevka-bin: 2.3.0 -> 2.3.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/iosevka-bin/versions --- pkgs/data/fonts/iosevka/bin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 962769b81445..d6d986c699ad 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - version = "2.3.0"; + version = "2.3.2"; in fetchzip { name = "iosevka-bin-${version}"; @@ -12,7 +12,7 @@ in fetchzip { unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka ''; - sha256 = "0nry6zsmvcj44rijhbvrry84rh5hrixzb4n1mx9c27vvpy33a56w"; + sha256 = "1dkfh354scjgzq7kgy4cn70z030wmfgxixqp8p9m6i0ps8gccjgs"; meta = with stdenv.lib; { homepage = https://be5invis.github.io/Iosevka/; From 18ad0a8028c48625527a790c5c2f09e7847a7840 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Mon, 21 Oct 2019 15:04:11 -0400 Subject: [PATCH 120/142] unixODBCDrivers.msodbcsql17: add missing openssl dependency --- pkgs/development/libraries/unixODBCDrivers/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 44e7ed17f0c6..c1810443bdb3 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, libmysqlclient, sqlite, zlib, libxml2, dpkg, lib, openssl, kerberos, curl, libuuid, autoPatchelfHook }: +{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, libmysqlclient, sqlite, zlib, libxml2, dpkg, lib, openssl, kerberos, libuuid, patchelf }: # I haven't done any parameter tweaking.. So the defaults provided here might be bad @@ -138,8 +138,7 @@ sha256 = "0jb16irr7qlgd2zshg0vyia7zqipd0pcvwfcr6z807pss1mnzj8w"; }; - nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ unixODBC dpkg kerberos libuuid stdenv.cc.cc ]; + nativeBuildInputs = [ dpkg patchelf ]; unpackPhase = "dpkg -x $src ./"; buildPhase = ""; @@ -150,6 +149,11 @@ cp -r opt/microsoft/msodbcsql${versionMajor}/lib64 opt/microsoft/msodbcsql${versionMajor}/share $out/ ''; + postFixup = '' + patchelf --set-rpath ${lib.makeLibraryPath [ unixODBC openssl.out kerberos libuuid stdenv.cc.cc ]} \ + $out/lib/libmsodbcsql-${versionMajor}.${versionMinor}.so.${versionAdditional} + ''; + passthru = { fancyName = "ODBC Driver 17 for SQL Server"; driver = "lib/libmsodbcsql-${versionMajor}.${versionMinor}.so.${versionAdditional}"; From 5235b190459f0fb55ebf0a05887fc89b7f1fb5de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 21 Oct 2019 16:31:02 +0200 Subject: [PATCH 121/142] Elm: 0.19.0 -> 0.19.1 --- pkgs/development/compilers/elm/default.nix | 21 +++++----- .../compilers/elm/fetchElmDeps.nix | 6 +-- pkgs/development/compilers/elm/makeDotElm.nix | 10 ++--- .../compilers/elm/packages/elm-srcs.nix | 38 +++++++++++------- .../compilers/elm/packages/elm.nix | 24 +++++------ .../compilers/elm/packages/elmi-to-json.nix | 22 +++++----- pkgs/development/compilers/elm/registry.dat | Bin 0 -> 86479 bytes pkgs/development/compilers/elm/update.sh | 7 ++-- pkgs/development/compilers/elm/versions.dat | Bin 94810 -> 0 bytes .../configuration-ghc-8.8.x.nix | 10 +++++ 10 files changed, 80 insertions(+), 58 deletions(-) create mode 100644 pkgs/development/compilers/elm/registry.dat delete mode 100644 pkgs/development/compilers/elm/versions.dat diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 6949f6e3b2ad..9dbde319f0a0 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -4,7 +4,7 @@ let fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; }; - hsPkgs = haskell.packages.ghc865.override { + hsPkgs = haskell.packages.ghc881.override { overrides = self: super: with haskell.lib; let elmPkgs = rec { elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (drv: { @@ -12,14 +12,9 @@ let enableParallelBuilding = false; preConfigure = self.fetchElmDeps { elmPackages = (import ./packages/elm-srcs.nix); - versionsDat = ./versions.dat; + elmVersion = drv.version; + registryDat = ./registry.dat; }; - patches = [ - (fetchpatch { - url = "https://github.com/elm/compiler/pull/1886/commits/39d86a735e28da514be185d4c3256142c37c2a8a.patch"; - sha256 = "0nni5qx1523rjz1ja42z6z9pijxvi3fgbw1dhq5qi11mh1nb9ay7"; - }) - ]; buildTools = drv.buildTools or [] ++ [ makeWrapper ]; jailbreak = true; postInstall = '' @@ -32,8 +27,14 @@ let The elm-format expression is updated via a script in the https://github.com/avh4/elm-format repo: `package/nix/build.sh` */ - elm-format = justStaticExecutables (doJailbreak (self.callPackage ./packages/elm-format.nix {})); - elmi-to-json = justStaticExecutables (self.callPackage ./packages/elmi-to-json.nix {}); + #elm-format = justStaticExecutables (doJailbreak (self.callPackage ./packages/elm-format.nix {})); + elmi-to-json = justStaticExecutables (overrideCabal (self.callPackage ./packages/elmi-to-json.nix {}) (drv: { + prePatch = '' + substituteInPlace package.yaml --replace "- -Werror" "" + hpack + ''; + jailbreak = true; + })); inherit fetchElmDeps; elmVersion = elmPkgs.elm.version; diff --git a/pkgs/development/compilers/elm/fetchElmDeps.nix b/pkgs/development/compilers/elm/fetchElmDeps.nix index 3da2445e0c52..05dffaa9e2eb 100644 --- a/pkgs/development/compilers/elm/fetchElmDeps.nix +++ b/pkgs/development/compilers/elm/fetchElmDeps.nix @@ -1,11 +1,11 @@ {stdenv, lib, fetchurl}: -{elmPackages, versionsDat}: +{elmPackages, registryDat, elmVersion}: let - makeDotElm = import ./makeDotElm.nix {inherit stdenv lib fetchurl versionsDat;}; + makeDotElm = import ./makeDotElm.nix {inherit stdenv lib fetchurl registryDat;}; in '' export ELM_HOME=`pwd`/.elm -'' + (makeDotElm "0.19.0" elmPackages) +'' + (makeDotElm elmVersion elmPackages) diff --git a/pkgs/development/compilers/elm/makeDotElm.nix b/pkgs/development/compilers/elm/makeDotElm.nix index 1bc8e61d27ca..3ceaae450f01 100644 --- a/pkgs/development/compilers/elm/makeDotElm.nix +++ b/pkgs/development/compilers/elm/makeDotElm.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchurl, versionsDat}: +{stdenv, lib, fetchurl, registryDat}: ver: deps: let cmds = lib.mapAttrsToList (name: info: let @@ -20,11 +20,11 @@ ver: deps: }; in '' - mkdir -p .elm/${ver}/package/${name} - cp -R ${pkg} .elm/${ver}/package/${name}/${info.version} + mkdir -p .elm/${ver}/packages/${name} + cp -R ${pkg} .elm/${ver}/packages/${name}/${info.version} '') deps; in (lib.concatStrings cmds) + '' - mkdir -p .elm/${ver}/package; - cp ${versionsDat} .elm/${ver}/package/versions.dat; + mkdir -p .elm/${ver}/packages; + cp ${registryDat} .elm/${ver}/packages/registry.dat; chmod -R +w .elm '' diff --git a/pkgs/development/compilers/elm/packages/elm-srcs.nix b/pkgs/development/compilers/elm/packages/elm-srcs.nix index e1f941626dd7..0d4523b8b098 100644 --- a/pkgs/development/compilers/elm/packages/elm-srcs.nix +++ b/pkgs/development/compilers/elm/packages/elm-srcs.nix @@ -6,8 +6,8 @@ }; "elm/json" = { - sha256 = "1g0hafkqf2q633r7ir9wxpb1lnlzskhpsyi0h5bkzj0gl072zfnb"; - version = "1.0.0"; + sha256 = "1a107nmm905dih4w4mjjkkpdcjbgaf5qjvr7fl30kkpkckfjjnrw"; + version = "1.1.2"; }; "elm/html" = { @@ -16,8 +16,8 @@ }; "elm/svg" = { - sha256 = "08x0v8p9wm699jjmsnbq69pxv3jh60j4f6fg7y6hyr7xxj85y390"; - version = "1.0.0"; + sha256 = "1cwcj73p61q45wqwgqvrvz3aypjyy3fw732xyxdyj6s256hwkn0k"; + version = "1.0.1"; }; "elm/project-metadata-utils" = { @@ -26,23 +26,33 @@ }; "elm/browser" = { - sha256 = "1apmvyax93nvmagwj00y16zx10kfv640cxpi64xgqbgy7d2wphy4"; - version = "1.0.0"; + sha256 = "1zlmx672glg7fdgkvh5jm47y85pv7pdfr5mkhg6x7ar6k000vyka"; + version = "1.0.1"; }; "elm/core" = { - sha256 = "10kr86h4v5h4p0586q406a5wbl8xvr1jyrf6097zp2wb8sv21ylw"; - version = "1.0.0"; + sha256 = "1l0qdbczw91kzz8sx5d5zwz9x662bspy7p21dsr3f2rigxiix2as"; + version = "1.0.2"; }; "elm/http" = { - sha256 = "1igmm89ialzrjib1j8xagkxalq1x2gj4l0hfxcd66mpwmvg7psl8"; - version = "1.0.0"; + sha256 = "008bs76mnp48b4dw8qwjj4fyvzbxvlrl4xpa2qh1gg2kfwyw56v1"; + version = "2.0.0"; + }; + + "elm/bytes" = { + sha256 = "040d7irrawcbnq9jxhzx8p9qacdlw5bncy6lgndd6inm53rvvwbp"; + version = "1.0.7"; + }; + + "elm/file" = { + sha256 = "15vw1ilbg0msimq2k9magwigp8lwqrgvz3vk6qia6b3ldahvw8jr"; + version = "1.0.1"; }; "elm/parser" = { - sha256 = "0k4zlq30lrvawqvzwbvsl0hrmwf9s832mb41z7fdspm4549dj7wc"; - version = "1.0.0"; + sha256 = "0a3cxrvbm7mwg9ykynhp7vjid58zsw03r63qxipxp3z09qks7512"; + version = "1.1.0"; }; "elm/url" = { @@ -56,7 +66,7 @@ }; "elm/virtual-dom" = { - sha256 = "0hm8g92h7z39km325dlnhk8n00nlyjkqp3r3jppr37k2k13md6aq"; - version = "1.0.0"; + sha256 = "0q1v5gi4g336bzz1lgwpn5b1639lrn63d8y6k6pimcyismp2i1yg"; + version = "1.0.2"; }; } diff --git a/pkgs/development/compilers/elm/packages/elm.nix b/pkgs/development/compilers/elm/packages/elm.nix index 4edd9bebbc6b..644a53fd6190 100644 --- a/pkgs/development/compilers/elm/packages/elm.nix +++ b/pkgs/development/compilers/elm/packages/elm.nix @@ -1,29 +1,29 @@ { mkDerivation, ansi-terminal, ansi-wl-pprint, base, binary , bytestring, containers, directory, edit-distance, fetchgit -, file-embed, filepath, ghc-prim, haskeline, HTTP, http-client -, http-client-tls, http-types, language-glsl, logict, mtl, network -, parsec, process, raw-strings-qq, scientific, SHA, snap-core -, snap-server, stdenv, template-haskell, text, time +, file-embed, filelock, filepath, ghc-prim, haskeline, HTTP +, http-client, http-client-tls, http-types, language-glsl, mtl +, network, parsec, process, raw-strings-qq, scientific, SHA +, snap-core, snap-server, stdenv, template-haskell, time , unordered-containers, utf8-string, vector, zip-archive }: mkDerivation { pname = "elm"; - version = "0.19.0"; + version = "0.19.1"; src = fetchgit { url = "https://github.com/elm/compiler"; - sha256 = "13jks6c6i80z71mjjfg46ri570g5ini0k3xw3857v6z66zcl56x4"; - rev = "d5cbc41aac23da463236bbc250933d037da4055a"; + sha256 = "1rdg3xp3js9xadclk3cdypkscm5wahgsfmm4ldcw3xswzhw6ri8w"; + rev = "c9aefb6230f5e0bda03205ab0499f6e4af924495"; fetchSubmodules = true; }; isLibrary = false; isExecutable = true; executableHaskellDepends = [ ansi-terminal ansi-wl-pprint base binary bytestring containers - directory edit-distance file-embed filepath ghc-prim haskeline HTTP - http-client http-client-tls http-types language-glsl logict mtl - network parsec process raw-strings-qq scientific SHA snap-core - snap-server template-haskell text time unordered-containers - utf8-string vector zip-archive + directory edit-distance file-embed filelock filepath ghc-prim + haskeline HTTP http-client http-client-tls http-types language-glsl + mtl network parsec process raw-strings-qq scientific SHA snap-core + snap-server template-haskell time unordered-containers utf8-string + vector zip-archive ]; homepage = "https://elm-lang.org"; description = "The `elm` command line interface"; diff --git a/pkgs/development/compilers/elm/packages/elmi-to-json.nix b/pkgs/development/compilers/elm/packages/elmi-to-json.nix index f6a0b9e24263..87b02f013f85 100644 --- a/pkgs/development/compilers/elm/packages/elmi-to-json.nix +++ b/pkgs/development/compilers/elm/packages/elmi-to-json.nix @@ -1,27 +1,27 @@ -{ mkDerivation, aeson, async, base, binary, bytestring, containers -, directory, filepath, hpack, optparse-applicative, safe-exceptions -, stdenv, text, fetchgit +{ mkDerivation, aeson, base, binary, bytestring, containers +, directory, fetchgit, filepath, ghc-prim, hpack +, optparse-applicative, stdenv, text, unliftio +, unordered-containers }: mkDerivation { pname = "elmi-to-json"; - version = "0.19.4"; + version = "1.2.0"; src = fetchgit { url = "https://github.com/stoeffel/elmi-to-json.git"; - rev = "357ad96f05e4c68023b036f27f6f65c4377c7427"; - sha256 = "0vj9fdqgg2zd1nxpll6v02fk6bcyhx00xhp3s8sd7ycvirwsim9n"; + sha256 = "1kxai87h2g0749yq0fkxwk3xaavydraaivhnavbwr62q2hw4wrj7"; + rev = "af08ceafe742a252f1f1f3c229b0ce3b3e00084d"; + fetchSubmodules = true; }; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async base binary bytestring containers directory filepath - optparse-applicative safe-exceptions text + aeson base binary bytestring containers directory filepath ghc-prim + optparse-applicative text unliftio unordered-containers ]; libraryToolDepends = [ hpack ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; - preConfigure = "hpack"; + prePatch = "hpack"; homepage = "https://github.com/stoeffel/elmi-to-json#readme"; - description = "Translates elmi binary files to JSON representation"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ turbomack ]; } diff --git a/pkgs/development/compilers/elm/registry.dat b/pkgs/development/compilers/elm/registry.dat new file mode 100644 index 0000000000000000000000000000000000000000..14fcb12a74600af0db57c591206c9d18b3bf2207 GIT binary patch literal 86479 zcmbTf>60VJk?5H~70#;a>gIjS@!sy+XSQYwGd3wwW!CM?>G56-|yy&T&KP)cl*(LTI>~l+Oh%mQpVVovvs~46>s<3ywh_dWdGLb zW}QyfxomYVv(81hWWlRlY2?`_aB!72DB@ zUCn1jz5k@a2hw26)YdbIWwoi+#d;65yP@KOdcUe>(|o<@=?J@hKf87?|Ju*4`q{9b z4f&JJZeD-K^EkYy;SrOYnc0wcTdOS-E5j7~HVv zN7N(A+{Wd)V1wMKH*TXqi#wdInUWP4GRn$)FE3=?LWi4jvM9EkY1dJglPEi$oNV9b zTH4Htbpe8)U)MmWq|vz^$DaAslE2a~;Vci4|d2aGO|vMe9~Ur+X%yj<@`i{iNJW&?+q_q$oYoAtU`7jD_j zF1y)9{gB!XmeQpo{Lu4@X|Z9hFpbe39-OQpf(UJmtI9EH&b#{t$;}$*xH*7Q4me=@ z%V{LHenM__qW1{;NQNy}8#%n?LowP^P@h~};R`d=^RcWdw!qU&a*BM1N?I!zY zI)UmF?C3ofdNrEgRu4h~ev4Ebh#RB)dRr{r-5?AqALl!mjc?HP2Rw3wFv4fD#KVp& z8U8fN$K!4BP-<7ZNS#bkSQqpV4rb^;sqdkfa05juLLLcJ6ldC*->robJ^pI+)h?&7 zZuea|;Rn>%UFrrugVM`YUM`>Mv%}R|a4~vRpWo&8xA}Tntwx*4Y_usi#ga?HPm%eA zmEL-|0ORNDcu0WkZj1e43-@~mDO~Ljn`JR7*LUSxAz1rF{yW9-)nQ$7HH<`_VGlj5 ziWGp$zYKqvZ~3*_%>SlbqkR4Cn#1H*4nT5C_-ig<^htXqW#i0#CwEc$CUS^vMw9kMI7-L{w1KkT+IyX}i^yWMTK zAoXqwIYWgE5%exQ88SV)#jaYHj!H!jScK6kWp2Unk9^rSWf0*t&$dsW$L{Mg)Pl57Eh_w%ULy$;iRfX1mF@ zS}r4RL*i26x@>U`)zv$b4`hGR`G2Cf$gcYKn=f9g_~`VXR8>mhb@Z9#U3P16B3x z4)!q0ADP(-CDqdscc$J+jTY|-vhNP-iHM)3(#69_8@t5nqv#bjJD~nFE~naDlnmD# z;^lEv{3KJg&oTcRtZw1@utIeeahOwIOi%dPX$z2q?2lAtO~VC_QlqVHuWRje?snbu z!jx`QRXP#Gf@XRabK28xv*oCSjvB}{R>jwwmCt)9Hmmcy@@bpvT?849c1^p0 z{r;g)P`+m)#%Nlj@u6I*5aBzL;S5qo5{(y=#uu-D=>ft>_20k!ncu&wW5W}mxBU;J)a!E*ky82^DI`1a*wnWF}*b2PwBJ}J<9 ze1musG};U%E2b)@p?FP3?Y#lq|LKr}sJo-@mf18wu6D&tF7^>*7SZmm^6u{r<@A?d z_nyj)Y-b%g!{2}Zm(llcem(m2KVEQ5D^BWhgjjeeWVQBTgK`&I0)4UFB}cC&1owWA zou?QdFA=y_z7x9g|Nio@UHT(1+AI$+NKavmB*XT8UoBUM-J;8Ss{8U8VcSF9?jG~m z46ZmWCL%&6LtfF*@yDWAY^$+x@r3V>zK+bWX}fy=59=NJ(Hm@5yT9Jul@kc{s@zQ{ zg5uGEDTS~9NA8`;Q?YoJZzpp&-2^$kK4l%-&vsivyz`l0Jf5ZtOcB@%Ju9brn!zqW^Uv6~=i*6BF_ zU2_%}a)gn&DnA-?4gdpA-+CwNMIdygy}=)IM4cahyFKbS7zj*6u0!4Yu|T>x{;F6m z**+C10whOu5ODhfqeiqgf+jIInyFE7F0^lyk#+u970dsnSLPJyFi#2DepBYZuV%Al zA)NMvHC@xg@i!uNt*7OSe7nt$BZT06IW5zJSOe3I*&nf%VB|hIi8avvF26&Qg|0mX zdUdM~7JCbD!#`H@^{);yY?i9ejPuz^Ckafje8dw3tA;=ws(OE{)_<=a3+?OvF}3du z{)lLK{IRM`ww$0fEX=kViOO-t2&#zPKrYKFhl9KWQfKzlp?r$UVa-u;`^Uo)>*b%; zWwDu8cXzgBqRAS+4;aaYe>})}{B!kSdguNT>-&6!kj*9Nz=on9UWolUYKe&zM7ucb zzMtkRofkp_QoSDne+K#l9)nb{&pLm?;8y8{x{$vG-$XWuN@{RLcvYtVr)~b0JMpcO z3sUyBd^^hH7K#Dfcz5Sd+@1f_6S1ziwn~(BF=2-D6F~=mLisM%ufP22gT=@zmvARE zcg!Uz`S<>WdcNI1VFcmMO{`YYe9--KLBmolSE2=ALtZ9^b&pYy;~-7&l%4V9;SncO z9sIf2EsNuy^HMP@R=!#n<#>EpDTh$=u`Dq-lGv|=m3IHEuxhEr#WG&Pn6LyF*up#w zp-aK%Jb6QX%G8E`u4X05Ir!A=QtNg=qcW?jA74-Ad9nNlyi6q=<(@xby9(cnAM?o% z-@p0mfid&Re5erR1YtJH_OE(bOBhqlNFhdhcQFJe#V-1N9{z}Iyk6%&=6j{_U9sfm z8|@#fAkJk2^=T=e3#;=iK-VA(W(@-S=FPr<4)(fp za@9{p<0JQMvRY=f-=i=V%i{<8?eT7lSO!JG5=!`6l~9iK`%<9i#iKB%-;1+VSAvd? zG$C6QiPp(}bpKRfc>QOw)q{Y`#>_1N-ORPrE%^b@(C*7`m7R;}^xLnSYpTI1C&OZx ztfkSDLae3@yJQ1M2}LL}MM@I}%imrt7s+4)rj1J!Lzv1*YDy9mjKsJR`C+_{uYN2S zP~MOE5xbXDi$Z^b+|FM(_$%G3$7+j@f}<;Ung#GRE!m) zrF}i6Lv@TgZX`eT|5E+EnEqkCcp=U+@jo>kXnk)lhI=Nb3%8$d`eD84Xj#ni31YS% zxi*fX1?CJjId>!n*nc%h-2*)DlSN>~OhB*JbmDqmr85kVu_s4pVUGWY$V4b>2l0ch z_n3`#BQA50sTkSP3yVeM!~#5zHwnZA$@YjU^&2< z+QOgO=ECWTGqv4mVcV3;M~qpCTqz?phf&>8A{|6%=0ZZQYAPuK8BT;3fB(Lis%M9Y z2)7CSbCD6Um!Y}JvSv{B%}1}l^O&QX0Qv8N^#-H}^rLyP6r;j3G@@2HJvt4fpBqCj zk7fRJG!wihCFSd3B1$9(5)uz_t`qwm7wR($F~LTD$Hy!F_V9%vlw7wsJa*pymSyid z*SIrWi&(F$98KY@gIvWjMM~&aB>?B$P|@d{LK&cSXC1V8w$nQ-fSF$k)0cCt(6I;v z>D3%yt;@T~*WZ2nt+U%iKISCA0IYZvo9sAG?g%-wtSUe$s&@H<4Cql=JNjnt!fUc# zL`O}t7sbpD7a+EhyTj8H9LFqW! zV6UkC9?zxrA~(|Lu!mq}iuN_x<|}b4j1C*5ooRtfqNe`@+}@hUgtKmuQhpn-{fW>V zgt!x{ROsP_Isi=e5h*vI@zSHQ#(}QZl|h5(iF1p@j23PL2TS$bx z)+OEu;i;__qMFEO|DJXKE$jYktNX86_g}K^=UMl&R`;{4`)Stwq}BZ->wetse%$JQ zoOM6Sx*ulU4_e(1vhMq>?)zEyy{!8x>%Ppow^{c^*1c(UZ?f)n*1c+Vud?ni>kf#I zX%QmR?csO7=yu!PZVLx|x07+|iAGT`7XQ}iwl2G^3mm}RR!c?3taFuhhFNFO>I{gm zX?OZ9;%ta|(rBlPPN&`Jv^4C=VxBxZxy>$LWS2MD<#l#>)w;aOE{ECWpmjNr7@fl!Ewb18@7m|&@iN~sO+!3<{wd1=B=E~-Qx!Iz6a#{`>kuyA{ zriXSQo)7#Gn}!E0lGkp3gi9b=i+K-$!}rqUUqd|<#%JA;;E&;7ms4WGkkkw1ObDhb z8T!*D%#9vYca1Pl7%Ch$hz2&w#Ig7G6i>?>~LT(Pb2X@@F*%tQoF zti65-wV|E*T5e@5H?RsOtT^rQYE!-i8|xVgA_VEa|LMpu^{P6pnavH6T%sDc+Z^pd zyWMZMd*YmJ<7GfyBchTo9C^%j4XKeE5IHpA&wtC&JLzmb4p) zoC_AZfB)UD#?|p9-jSX01+2bY({)^3|2<#c{RLDK#%50Hr%GfUBsh<^G@SGH@6{Ne z_Ky>cIuO^fD-IZ4-V$|*rxe<@Z^#a7R? z^OwsW#8c-an;}DPmdC&3fBn63)gAr9&c)xx)sXtduili~^00fu)v{HMXM=wV4SXu> z2hNF!Fw7DRHh|TKHN|JYL8(^5-FaXWg*UK)q_^H1Op2`O1-=Ne28jeZTF>H+I12D^ z&bc6F>LkFEfM_=+Qc#@@>tXS&bqdo0Z&e^_yDQu*EO10z-%01s`I1~4<1cff>72iu zI~V?--z%6zJG*HUhA$jq2q$P~1pF~euArTwm%ij0ZTO9~( z*?z^~Ze~p7U6bg%+2n5vRdJR(4gHS3A0$q*&w)DQv@&gLF))w!em;#x18?kBOb_4e zt9<`A4Dn{we_TKfULUVrmoMHtmUsKzU&KqAFN)jZfT?F%5VfiVS34P51Na(62?HAX z_yk{JI2n;CHQ;Z#g;3JPd8C{vM3xXIzQW}S$Wc`nM@#}p4(3@5h_)O{!9rDwgB46c)ul0bM zAuOz6$hN7duEJPqm{amgS}S**?^jsyy4X#y=kAs!tZw;~Xbz1Z)GH~* z-NDU_4rT7mmU?280BxxHVQxa(RZG+q0ThD%{YZ=p?{1?vIlz(;vnLXLUv75c*oiKC zZdxxqUo!#t-6OnsEZM@x5i%g&&6Luv|1n20-2G=!B8LjAxhuEe+#4m%yYp*}ghHf| zpNHqOb;kdXk|4nO@z)X^Q*QN6UggIzap4={QE(1QmQna#{RbjbzWmMG4Q61qV5wmX zIhlWzd))tXBuI?S90<7=^q6IX|ES0io6HZ3{v3jtamM3@Bf;B-gIqg2i5l{sNK8jL z^XON`a^fhCmkj=M4qN}n_Ha;1VYebYU=F>C>9D>N!~gei%)cjG^)bIzBa!4%a4prL zy8pz#S5B0R&xk8({>m|)m3rxXIUR{64RYPr=MtC8+w307#%RsY-G6E;C45!B!I=hN zCL)D$CGU!J4fMp%^WA(Tj1ivi1_IVlm2|FLq#ECIs7%rFGG0VyI*q1f*DoUJ@j26O zJP&>ziX+#%B2KO=-y?H&Kj{?Fwq{GHUxZ$7vBX%=;kK-4^EpyFanoORP#i@Kc_-`` z&HD9s-wjo-b^(EBiNBva(1w!=`;o)#hYX~ab@Ok*kDkfAdM>`kkMN$?*Gzyz6y;#)h$FUB0rB{RVe4ept)S-ts?2vse>CsOk8{}gQ)WjKl z*)Y_^V~&7sv|*+MC#1xN%7?^N75sx(yxaizYSOmJa5uFU@vMV$CsV``4A$EqL7nTJ zgc_f@AQu0|jtObRKCX1UyRukHJaqU3;JC=|mz8ak^3jtG9TK;2*e{5MFfly{a2oPf z-=hTf;{?vTY)4RjG%<2@z%d~O(|jPZX?~a;3iE+;VWG^b+N{!)pSP@R2-m}Gk*_wp zD}3^bdx+knM%l94st(-ZuJt@SgQ@WG%9Ul;=z2n(WWc2lZhP^DMxptyrpxtjk;4 zJ)v~-Ifezxtk&6&G$NKj*f2j;8r=<*Ie6t33z7=BZ6%f?0K>qoN9FCy!#vG5aX;zZ zw%e_J8nU=vLI?78YS7+V#-FsdOAgTM+TIm|~6_q1Q!Nc_PMTJPP%vF65Q@UuDB*uaa-=8!JaE6g; zhRMxSS|Bp)Epz1sB0Ec@1)jP^de*x9`=;8ck9t;B#1M`o5O+7n+9fg*#*G}?hbR8tXev1hJL|wnCUS3Clh4c$Z93qV!MES>48}h z2b?cA^IW*AeKmhyy-CwY=$mBOE7vvFHc}M!MSf6?AYaZ3?gbPfRfv+goHkIBz_>@O zv0r}8V>6T?78T<2x_3a_)_fEX8HuM{KPhXmq{}Z;*3u)df#A@M3gT&S1Ch&%Vtq!o zmYFn!a;CAYuv9`P-ATT#Hfc0_@}t@8L_yC9!t#-M0R!=RO4?|;X+gTFxzvRkj?UE* zE_|;{CCxf_LX_wH5h>83DjyEbU?gub^9NZ_w6E41WhN-74@AGmTZ~CVW_FO5geB*B zt_M{lHe5YoW}YM_%$i_I&-?q`VW*pe{?zpU``?8On!k0Z=W#e_OEtobYNmSF!9)2_ z+Rv!dSaEVs7m}1HH=~=j1J%=x@~O6Dv&8$2k;OSE<&4B;ON5O8#XcS9b#RKS$8tI= zV7x)xxvG10716@%l%$j^4lpe(*y`%R8FNIJJdRViiAcey{P z1Ryst@lEw9z7WHQP)mV>hbT@F;HjT7uE_KC{6zlNfYamTlrKp|-WIchI3nNVObf+< zYvG{1mHF8q|Hhyu%00}+)!5@k2ud_nhoeS=_nbqI+fO8SECM?@GxqiUU6CqALYTLT zl1IW@F^1zpaPEL*o@B~ml&7bl>t{FC<{sBAQr1hX*Erav2!Kz6^`ja=ucyb|w@Rq9 zq7uzmlm`1?2_`fOWItceSLI>;a3dn4uoX$J$7tpejcm-{-RgS+Gn<$F>DrEncXuFG zCf;hf;u~t}KoWs4SXU37LV`Gb_e^Pk2 zVl)hp3>&U+1;z%?v{RX{lT$|Kpg+2bNXZ=SM?E;0Baq@`n=lBuRpa9qvQ?(l4;gkV4F+6r<-r$on%W?=dm|A2w(A|YByU|dgE zyOcX75URv^YrH=RSSH+2I5SD*(b_E36pDh%m6x(bOND;?7DYy3V=JkuwyhLuQKFPA zis+HQB@1^(Tcikq@&~|!=zX9d5=iS+w{x4JC<(Hbz0gwK9aDw0rat|kexIC~Z@1@q_TGK@Q%^xVb1Ha)nyT|`2t zC10XnPGNL-jg7(BFCc+J^@<%5`*h%6$r;vtB}uBH>Q7)5;@lOBR}$R?Q4(H;#tUf% zdy!zg2a`c>8!Ij*KS@BaA1p9=ZkBca_6n&U64NSC@jg(IP?0c1+(7;#+iRhl5%O{) zEt!iplw*RNWC}?`Js${?SoDx6HLp!w_i;S#K^pO$Ha3Ps*&%U_#Lzg+Jc`z%hH)ny zUCE!k+wBqDIg04VxR}_7{F=<#oF8&gXmqYfRA2h`bdx|TV)k>1=>f_kT2_Qykw46T zaXY3miiWLBT!dSoO#NL?Jdqd#jgtP0brQQxTAYqxKEsXMJZ+@wau%j~cgoc2G5KP8 zw6B&{Z?h9&jeBlEB^B{{B#YGFm58S0-QCZfKZQ274;>@>d5#2gkPVJBYG_f=I}&U# z=bs()u9VzJufx_Dh>oR*pTQ&#&(ek3yIL{gq(XZ`UHb15FQ*Z%T}N}AgQFYX)# zxGSlDH1dbjlWn|6Uyi8-B6U1a1}Aeop|@1>K>wfOUX&_OskNXt&KC<(Ty<;-G}01j z=SWeQw7cMYAfKIe9Gl)sWwql2^SB9{!rdGtp$}1^bGb&aa z6c)|wjYPpDO@gwUDsXy6hcQyBa$oc$#%?LKPWFUJakKU6A1eywU?PiQXCO z;4w^$$<)plrj}~qJ3oCu24q!|2M!7Ri);{j-bz($yGBhH7wfV}bNWT1jZNRjb6bt1 zy(S5%lEP2N-FIo2u9=3*V3$rTUZaGtL3f zEyf0{g$F&aqGULu$}>~m9ZKpZrzuR2KlRr-D=3!nTaSF|kg2Zq;ch#oA!EM}#UZzH?lXO3mSv zYD*Y98nm2(oA`zX7>$@$&buk?yxqXvtM25d9Vmt-+ao!;qg<{*??L&QvIuD(riNM{ zrfM(+M+?-2LO(zVMWZ!`gr8GlO-Vab(S$HLqVl0f%^HX{>b?rHX|P1POAdv)B={Ny znIz3B-rBF~zG-EPk_^Ftgli!shhrJZGo6}lruQZI1qvmlK#GiMiOfN`2NsMx6kKX(QAG=_YvwA>L?6aW^Uu7GFt0m881ANYyL~r zqZow^QZ0daw0Mn0=9=PFk3oPYS?n&Yl$1hhTEZ@sZPQb#9P7`;Sm}VCcB^?XU1I&X)~RBBjGP>VgJ8!()0*R?5-KC;t?kPRV8iEcS16% zL|Sz4s8+b)ynb*pWA;VjwYdK+?#)m63^gbr1!{9{KC}<_4b*lL^xeSmn$)W^j@@Xk zzuc`if#rX6leJt%N66*i%13A*b~?@9kb|YQ7}asFSTb6!F{gi%8~)6I9COL!coAfj ze|^zvzi72yNJ>d7W|eTWTN;TakTl9rr}=d5pu=%YCOD|E|&1trodJ zF)TJxNp+`@%qnO!sA4!qdf%awFOTY%Rt@1E5vCZ6D;#oa`hPoP3gWK%D7EG%2vbC< zOg#jKF-LsX$jK>IMb)sxyEJFD2SQ|L z;E?K$>sfC+)e;7zXFB}-;q$EXd3O1EcJX=E{yb}ao@J7_+3I}Oy8Ntl@mZ_=S*!I~ zEBh>KeU@dPwz5yN?2|0}ILkh2Wglg&kFxB;R`y}m{xEBOm}MW3pq;he&$9Pgt@m2l zd+4C8>=orKTG>mc)4I5AwQpOk+m@s*2>G?zH?7u9%d(qDY$UZwBo!Cwbz#S$qd_$dNeuTKE^DclaYIjgNslD zK}SPUd8}EEk8>t8#}O%VpXu*7Y)}^eK7jmNAqDOvLLmCM!`A z42+H*b3&fhJ3YSY&6%PGB=~rtV0eSj@$kbdoH$&yEJPF`ITXtCMN`_Av-y5H?(gJy z*PPCRz{~OW@T8_PcWLQCcT%(;SO9xtl0|pbvV#dq?qdJRZ+&Ky^B;3VCF;3fX_TC9 z#!uyn&}Wzm@@8M+Um9h0I+J{oA5}_!5SzIlh+!sVkq{fZSJtww5z3X6iIvPFY;Cx( zHY0NkC9P8kRs5x{hh&V`DJlhfM=?`oxw@a2xlqiH_#E9t(Xqqrl^K{WM(Rh2Henxk zI?Ve_R4U`Iu@p?H|5s?c`D8Lak#&buK@)MAtyi&+j0{a|h~+$69^v=&&nNonyY5?q15?Z)t6JUUPV5hdHl>d~}0!r-{z-S_Vr#!5yz$>=1Mrx8I~j5$QL zwg^F>V2Q;uK2znwn4V0^T`O)}6B5<1;MG5Pu@9gNAxQNB%{}CJpDfRHX68+KPk^V_k4~D>^cw1xA;aBq;S~#3V z@t)9I>`KY)4n0Xi5rm7|hfZj!a?}GGZIn$(8{Z_Ipqf1JNl60XSpYLkN^N;FC`L~S z?(-lrg@bo)7D~%%{$=)5g^F`$Yxy5ul97#xbGKG%<1$-fn0|yYCzNLV8~(g?9kwZ) zI6mOwxN>aT(F8ZoJ7f~%AW!h%E{`zOS@GXR{0y-Q*l^)BB#wyw#vc~09A=a@G|Ny- z$voN8zQhC&xAay?ndlS#%JVa>Gg7vgc9OLv?e)^u16prP9P1{BQ~RA04EAsaN{Htr z`<_z?!u9*I)4G&O4ipQD58zln!+GI|}+2mv= zk})+DP^{{f1yN#^<7OALH0TXq(m*F!FYPT?rG3|a6mDpO9M0Oh($Q7nS8AeyodwoP zv{~G(QzR)%NgUte$J37zDpp|x4N!zn&ymvcbn@C*gLq{u1bg>=q5?j(R4%B`gSP7E)!C|}L`~c=%x0+Kg)po{;)#qmLAZ9I{NJqP;l})k zdGan31#h^ev3VsGUXq}5NFs93U=&rNs1brvw+>?uae1`DRnIKR07*w{s1(V(wL?o> z(}~O7YhN$fsk7UpcdAuicQwW0Y|i3H?-0}<0(;!q43`MlNvYwKptP--kx8xA6?r}$ z#~MuTrxgE2y1Wv%IwiY_AWlz6Z*sqq@Ns2(KA=1~L4(Oc)1kk#w-%&g7eZ%TmYY|H z>Z|wn)(MUYlkR;tb~CIvDL_$-WI{?hVFQ$d$=6Cq=8|&N2@=R51`|SBn4i`0nd~H6Qm|m3(S3l? zMNkEFq&1njQ9Pi)_32AYfz=iI47aJ2C?dx@1-Y6aXde-wc*#hm1`4lFrM{-8HcBD{ z5zLW8mo{4$LQk<>3H2qsd-Bkz14BC9FVn8h~r}w zogSf{8Pk`wbtgLsgZGlo{J@(Q{*&K(lLH|EmA$N0Lw3BqUTG~XIB9q}j_OwRM_uC8 z<>b8KgyW1}48lGh=VJ&`#5oKGxV%SHK?fam3?~irVoBo%eVJmUD8S`>1TnM~fm z+yVbz{`&P7%HG85A24;a1Nhk$Y#~2BVJLzXrTn5RwLQ8jm|5C&$tY; z`k_g|bw(DJgV}tKxao$taely1n_1*y6WLN>tF}XWR-~Z7qTCA+*!Lj%*VQ~qJC8p!61*Tgf9ZUfIMn-HUdnKj*f4?{7MN)0yUqo zDMhkXl=?wyuq*7sBFsmP|4MOD*A5(~bF=mxsC7sSo5;!4FJ$=zI(Kd0X2i?ruG`u0 zrjW1%gSaBlzgX|)`$Cv^`0Phl6giSgwD7{59xxiZBGMRl_tp47_+R*-3^E8dgqRjj z%D^N-y`0p^hh83wIm}eILm2>OW@_gJn6Ju?L)Mi@*3w)*Qr9}*fx?l9@M#o64VHTzM}+%6 z?n~iCc?weNV_I=c0?t*BkrQ$5ZAiODlBfwc73J=PPVaeY(tlL9Opg=9o(&0b=Pnax zrXI?)%7JgjX+s8Gz?`uSs1cRSoY9>;{}Seo-vuDDbr#zKy0u5>$Uvfmk?%(Sb~T-E z4-e(~%kN%)p^Tn;KHv)Wl5E=blwcY)fKblOWP&C3SPDppwcCQi)271x9YxogDtmAt zYZwpRY+k4l(X#SAPUs=3p;5W1^`@s7zOc}z;lkpOI0TzDP$lI`(-Qos3|<3qn>4E- zvJMgKHPJ%)v06wo>R@TDz6=+=+DVmoq?BqP81Lwnb0I<^_|jWa=3N`+MHq%Czf}eA zba?7J9vTS8T>x2cN7I^Cc>_itUe8!#?X&>3ebahlAzg*qft8Nla zUqAH%qnv4jq(;R>tv?aF;Y^yKmwh;`V6%JT@MqkrL;=nh%WBcztx0|&?$IxYRSkKf znQ#vIZ@Y#>Z=~mS;V)o>9FMM4(_(`KEnObT%C{DsO z|2pviulUfQK5c|f;~RMiFiH%ekrSp-n=}+TInG=(awvL;(gjX;HQm6xeKnx-tPwaRDQ1Bz= z<)r+;p~k7|fbV0my(`BQIhah!Q$(J9awKps-GXZ&m(Kn`0JWb<5+N)cSt7H z{Kn1;98WHVWEK1_u{(-sg5Pz}C0r0J(N5={awR2 zD3;c&M%N?}6GhyE1PQRx)R@#|l{)G(zT zq0w+~E1c_*C%cIBS?0SXiqTL+CL&E6Uh43Brx_r3ffa@@AAQWPe#go$9rsYt&*st# z@TJ&RPp(4!#fpl0v5Zquv*#&@5VT(tSa$!`d}LYwS=mO=%xaNM^849medLFaP+29{ z8Vph{T9cLaIfg($I%?M<$QyI%xT*pHRyw>OTJ;oZmkp+`kdhW1+Uhu057fmV>WpA5 zT(}L&Q;v=7CslQN?oZf}>)}S7VfDyQ7#YmVh1)y!rzc@tO>xBQ%dHSHZw0L})A->i zIpbex5C?+ni)a_7i%Nerp4IG6ZvgLx^pj(bO*k#1<>nB1Z_{wzZ1ss))m*DlT4u;k z-n5TqvsY;|stfE-%MK~~z>mc9-~Z~;4T#(0e!wV1GSq=A41JL`y=#*;H}xmO9UIXGS=Zt5V1nB~puxAg{MSrr$odg>yc{43jThlBeta2;U*^`3?*>Y2AQbo3(e zLF!fDF1Ir`TfMiJ6oNvC4{u2)8FNv9tv6A9Sj!JYwpTNd)xjH5SPut#ur&w5F3Rn*9T2X0x*#K2FR9dRGqaN zl{A{a46@yb=VCFG{#=4}ee@o>haCSfasHprgyR7~2y@L}VG@tI5rVF?1Ze%9^s2$R zZl8@jr~@}$1mWg8 zD(zrfYSxaaPl2GU7|an>X(^DJ2nG%6?ON^cIM*n2H+pyB9`3gD^Su?^*o@CBU&gx6 zvLmhh?-;l5?{rTFmhX$~h9K&`8+XJRJ3Xe69iJbMfO0D|9uFJs&z|aza-sN01oT>0 zIK51uJeVMeCGXa%iChwPCp@eo!OMQavZ@on#_>}2tLuxm^huk3FoAnioay*d6itq$ z1E~cip7dx7m0hwg?!SsqrXx$J#)g15c$-B941MvPf8jvhMPagI$OO9y)PnD@^4oO~P!-0|83w!*~RR1DgIUVfx_2nXytx&jX?6-y_qR|mmpJ_N;^lE>eXD;&)TxF%o74ZRy0^-ni2iI#09i{VbX=U8@;iA6zw*9T7Pg z-KHuGVE?I^KJ6cII`3|H72=?!Fof>v{X{6IT}DBwCe}u{SI&ASb@C}|LpV~{1za{L zk0e$ema>7D6J7v%?#JF8K{NZ;jYPTIf@*za+mOFc0nUASBk%cQ1#?9i19EF>cC(Ql z$73!MfXAt_E@nsXN9wZe$Z!d&UH*^$eZRV&?p=qUHG=p?FKr_7`jypNjS@b@;z>OY@{z%7 zuGMxV8L(ERRqjFkBLDV7xF+IXx3&5vu0`zpm35AviR3ib?+MTqq65B5O$Mpcf*O z-Fxlny+c2C&6FsD}kP#z4mEtZ?{kgU4aXmiyTHoXWe#%(S6bz z3Tt0;b_$_{A!Y!N0uFYPRuWZkH>!i*Z}4R~q@}waNA=P^y1aw)m1CUzg)ohI3`WPX z7seN7t?ZNXBE()*=silK+DF)G9Y!~xQ3oPSid|A5^{8;s`ICq3*$IFRbXsy5m!_L7 z_ova9og(dQpebdwNtYBDKz)XMsM5KxAR# z+ike>V|SmNgT!}=i!FQ+I+-H#PQZ+#5T@iiV|S9D zwU@<;8d%Q&s3;`@Ta###PIL_3hy3#V7{;?CmpWpgCOIWt={}IydK95U)kk3w`b9HF z0`Fvyg1GtAVv|680?Q&XiUKPeT(dYzkO*;LtoN9lT+h66=F{2ho`R&C^lc^CGX2Du z#nl9@ob2PZXofoCba(n7Ptx(L04QXOCllv~|Ki5qU|2)_!ZcmIG5!O0Q}R5|O+$w29q?I{3#_ma#eLYQ;^@_-U`#{7n6yVFFi`n3g5WGc+u|sEY=822$EXS<#FbI{A>mv<#g$HKC!t}gAYj6k-y!*5`ed-e- z$Ro5+++eXIc)+RGaplAkQwlnbT{09nS*|yO|Ly1dn*5;RuipmqOc?$3W~3wCI~m|y zXz*YL)z8VHvM_O8bUqDbxSbWe7DNep;*4`%>(=u%sVL|_9mheHXUU@))M0@t6)89f z$SJAA+yFyGGOPGynNJ9Q%S2|7p6XC;L`Ov)#SI|ik|hNr-!-6Kp5~uxRKKhbskej% zR9XCL*x2UW^kDhu)HKMh-kHx0{w_@-MXU-$T zoz9EdY^<2ldRBsJ`y#^<2wfB<`Q?O3Eh#I{fS&$lR?5D%JgIqJO+hS=Cbd7 zioLWb7DwJb88EIUy+u%hN%%0l*ccJhIo~tEQ`2Lxt}t!4*CN!g+#AB{2m{_zMTsJ7 zUCX_WNOn|u4OFp1W=22Qf2hZmdk(`51~u+Dx%Cp%btOW5QQZi&1{=Cqz3fZX3eXJ8 zM|7Vki6^|>0n0`>2qgtk&7>q4Nwkr!oHZaoYF}HKnLIz_$EC-?jQ6Nf1sdv};bEnD$)C#My@P`uH4y_|3im~qEVeP6;iGz-sEC`1%}rg>(VE3v?F`hm zYe-H!qOF8FrnH>QstJMMzdY2Q%S#~aI&Lu3i@El2n4^TwFJnqrlbZiwV zsc3C)u$>4O5n88B7&6yQ8kpCe@hIyrzwSMu37{*UbZ|5OVtFKP=L-VN=PSFVG%7P$ z`t_U#^44OiMaU7Ri(d(2uRo4d}<-0*lCC@ z^j_MLDMF?(rq?>lMS~>UkEip{MHH3lyup5Zj{Ek>ouA74$hs-{bTsCy_({m2V0nb) zRb(1s-BpQCgUz(hUA_2G4OFim3PRWSuLkmw-#%`5A>>n2iDdR~kEHEj2KU!GVidZS zx0E$GOWMM?v%Zlm{imlW1yjLqj+y2-B9M<`>6gz=T+Z{yw~9obPLW)rL=qS5bmqlm zdw;9Wt)1FEgayD2-7bqv9T&eMHHzv3DC84+@6Fp*>hzd`Ssc4>rtXH6)4!reByOqsDm9t#MYhXE z@jNhh{IeA$myM%Hm?Vez-2;OIib5?!Y1-&1bvIDZVhn#(v3%NAx<6te@(a@g>>!q_ z!)|dUcMhfJd3Ofo+<$KUz4>-Ioor0B7OPa`1=QqHJ`E2{b;bE%R*ePo#zCmQ!6M^L z#=}L))m{^yoO;lq(!Z;wN-i;0CwM^&JHD!g9XIO>2#H@~Fys*(Zs(`6P-=KRGZjtNaMAcYD!z^go}`?kce7{%1>EHqSi!F7n-2XM~pl(NR6*Y=ySMG zT$j6Q^!kghzWB<|0phDoL7|XGHu~JdJLalq4$~Q;28KuqyP-j!Fr-@7db3D~^iCup z`|P=sAZ^s=qPL7TFr@3%!leJ3`O)3HkH)0a6qsjYIWHG8a!n4kCa% z*L7V0i-Mn=s2+i8l8$wja12R2Tk2!AFsc*dpdlerB zAK3$YCwtz9w@s*Jvh5ZKOLF}EVjWcmfR2Wa_+L%13qSV7c_HNv<&LrsBN;njJWJLb zU^|<#m?UpwMGY>3n2{@pW7tYUUnld@2t1@MH?HPnMYEFpd+Zl4)GT4*1C*FVd9lg5 z0j|o`eO1h<3ta4Oc+Z+(iPztJEh32@i2;Y?-BI#~ll4}4on;>ComStHF6s*`R!=~_ zqpa~AzOb`Nru}lgI6R>#XopEoQFI5s=WiBJ=Lx>%4kRi4OwCtg)6a6zZGL=Oh;!M_fS#E!E)Bz_4B-BQly#A^upBFSE z#<6aMyBxO1d@c_%p$vz5So>jCF^r#E}tkw~}{*V*O9Aqi0<{uu?`Z=Aq$01^;U zxM6DXNI7=hzsEp{AZA4|(twRqlm^%vDGMOSTC&$0VoUE{;#qc^U|Edej7+K6&SYEk zM}2G9F(UpL+@p)|Mg!4kB1fy0Ti-7AH68rolw=~bGGx^nM0b$XvvXuKxWB{g!UOT{ zi7f0xIbqy>c!yS?utCp?&#d;4#IbJ zN+P{`>IY*eQ)7U6J}^@TkJxF0;XPsJ+nLl>sY}FaHxK)RDdoPTcAc@;y6DrrFW2{# zFAxQtzumKm2fuAtS=i@P^K}hW1d0)!b?iA9y$ikJ*3VwzkD|>}4xNKG6Hrm~SoyGmt6heZdv>9!z;R2u-4BSD zBjUPJVFbf-M1%1zm9e~$F*(=CZ<5YQ~~JRbJ@9yH5G+MF=%4j70=8WFt^*2 zhR@OZuv-jc^FA$kHoRZ)YVSd6nq#o84%9qVyK%CLD(68AZEY#Xcr@IvH)49vaMU0J z60hfFT+v7ZJF@N4K6HAg)o6$45_cs*ZR^rBJ@I3Nr;Niy0GqEV|KcC5VIk;MS_sdi zUc!c&$PF!&m?YK+X0U^U`d-sG2T|{sH;CouWHg<&G>bAXOAa!xK);l^5lg|VAdIoC zRznLMYvA$(>}3S=Rv^CwSi4CiVKzMKb1aM}!9HsVxV}-;7j^#DLbr|wnCph%1V9C6 zP49|Zo4zg&RvMG&sC*l+=+I@u_0S{5*OC1C>K?)s>_`nx!rIoa)xeD1+v!<5n3DTm zV6Rg}8k~0PP3q#d?F5th%abaxiRaMVL(w22D?RO4QG|y} zL>iB5M=8$$tAH8tNjjH^j!I%@`qw?;c>9SPJC9UhKCIa{bMl5*lhP2%%r~>kOhhtyK!_L9ebcDoc~Ir!t17h~ z_@5N#&bBK`|$9v9iK2Cy?6Fh6GD0s^;Vg+cPc<@5!=3d9UIG! z#Mt{~pE0*^lCT{R{FYC(8Z@>Z6>EGGgiPK~$e;4Hu9F(H9uq)>-)wrsU}7R9YDk>C z*woy2jlh5kARcfbqlDKQ`8olV3={f~dl^yPvCA=(1PMNl?E` zuI?+g9fnK*n~EC}39%>bEX+s8OTn~Db5uLnWQ_pgIu#4+y%m7=b%8yM>|OU>68YXL z&aoVeUn6|(H{EWl!F>ATSy|14$pD>u%9oS2BNp*(c`A1DA`yOPb{pe%r9-Kwyb=D< zzZcgFoLI-JTZ0WW^*$l@3$1J^3-a#*Grj(GBoryXENESC8@6{bK=4 zjj#d&3}z-Kx?tY=_FB%o)T!NFsj5vg0=Z6jNCIbn#jqv5L_Y0H_m-w*R|{F6m`(^+lO(O{J+7uBOl8DAUIruR zH9Aq$h1_+aH?)&QWQ6{`bW&9dbJ+)#BX4uO{p2Q`x?b`!iig z0v4nezIqq>t54?=TAI$rtVrz z!G|iho9WnN$qQ;JoQA+iRbz2_=7d`LwbwJ8yj|FFu>@uNr!wW6!~2Kn!xFAhtUru7 z6%t(LBGtoW#3sgDX*2S4B@4oQp5i*KAD23i@w)sVkI*z$Uk6mCwZfwjO+=XT8z!R0 z43q(o&j=4+o(e6U`$w`1cp*q1Gh)XareH9R_D2T z-cSRCz^t>u4i!j@uvC)vpT5o%sL^lg;QkRmDsKuc)#`APO#f`K#QmdOHOc|iW}`Jk zV}P@WZ{fR2fUV?-`j`@k;r-jU`gmHkMqph(RJ?H%6cfLOn&^-cfyW3KO7fweye)B?ig!ByvIOK|s7r4QftNZM&C_ z+?k7_#J;)}iNKc%qRIF-IA(bO+SPkz&92EuXVxwSnJG(v%a@!k$cAnkyy7{U9rFCl zngX9#ta<^@uX-6eLa&#deb5hER(MEE>_uRJl_xVFh+RXwY!g^%-z%wi(<1kjyAFAs z5XBTxo-i(7v~Bda)B^6B?X=rf$TOEpb_$jHz@iJ*k_Sj^7SM=Begu=nO>O&^p!_)L##JFKlf((DTSdA_0 z5%S0Go0KN-TEJpmJTjp6w!NEt{oS|U2E(Zz)%Dh0tP!qf*VG}Ikj2E45Cr51UFZi} zF*!7lYPCJ=-`c4-G_<?YlOIXfhv{$k-PbSe#v5%WcuD0+Z$-2YB|Cb( zkf#mrd1(jJw(TV}PNKa(5yQkl-{8h4?R6THX_Cb@Op5tRD6X(Z4uQ?R*{fnWM|9<@ZGW+}@`@Eff-pb@n?N0XDW%k)c_F0?vwe3Oe z?9-d<)9dWhtL)QZ_URz|wBP!)pMBcn1;X~H-PWhw?9)#6>1FomMfPdip5AWB>)RLE zC++N$mOjIMk$v25ecaAIZt0WUJjQKra9?KcUu5sMv-exP$DKaL-E!}7Q@}H8=^Nbs z75J;{dYD}gvg>|EGX8ZpyY6Jym)Z42i{g~mZK=%Xp6Bjo!(KM*X4C~3UbcAIba-(w zylC?n=kS7iwL5HghV9E?`+~Rk*wXm)!DYr%=-ey=djsK81OT{$d)>SC7=nMk${BS0 zp;NacXU5J-Z5K$6lUPo9-V)kz-{;DhVV>t6&c#S1%s#Q5^7^1?$+G(#poAI&o30aa z&quikf$8VYXnkfe&?*L6e(XeC_tMS9D-pyc*cf*P7eR=x<{?ob|Y{{XEzt;W6a;GUSWRg&=y zXcr)3gq*0o5s@*t+Oc@aT%ZZQ$G zPpF-SZ6zJ`sDMUHeU*A1^63;iZd|iUugcavwDNV)kk8m6fuZ_!m1DxHh=U@xz>D!W z7cJg2<61L6QV^}p^kPnBzX^^0l~R-jp1YWQuX@}p^w}02C=0wf zp6+3FC$@xT!Pg8p*jAZzx?IqDAPM3yvx`TxzqQhGIBoi@GIW^ru!%|3^*zD#tt+u^I{nM5=R z^h`fJ<^lMCj6Z5nk_fDdlvE|)IEH?NgbsI@jLq4CqRQhs;`jCt(#LRlSnxR9Za+T$ zw|oMjQl}D>sH;q4$t0RzvWP~nzw_;wX3|V?uf_;p1>Y}3-XZUi5o|D(^-=v}5!GZ)a6M2P+ zyI<+SZC3)0vDTYrBKvSGGXWbcw+Bm2I^og@)U`{}6Sr&n)Mo&kP7KuzWKQ_+JhCZ_s9{o z5KMnZhgl0bc2{3~@l&zTvoCcABtRcel3y6}a1h4bHg|zgptAZwzm)i2;%}!KU8p?~ z=dEVaq&tQBpa~`CB#OFdSqKLHt_|{^(6G%pU-)1=|5$^m;Bj)MnzXt^v;wO1B%3C6 zZz2$U%5_QAVDMDk-RUyxg7aXNSIFXors{o4>Wbt8`TdM`?g*!>PAbBY5>&YGtiVj= zfGT(LW7BTSL&uZJD)`V`&X1!5{^%LZTzj^lMIG)4ALNuZ|wMS%}GgDSl?6 zMm4}r?+Zbseuk;6*}^0YG2xwY#nC&e=Lr9YS%F0T*>2E}!Y5^z0jW%utd~zyy;dPP zH{md3uE}np*PA%(U>%2vJVBcT8o1LBLUy~udgdSJ530wiOKl1+HYYo$-Zgk_2qo-rOlE_NQBj6RSZ0HhxQ*xf4) za>j{!Sl80u5<1xL@5z?7iZYmxcN9Y_D=5r;Q31G?ZjsN$UpLhY0Z)WHNk+L?F=6^9 zvdh4}rFP|#FstK2VNFyW9rUpn4{G-;usbYnJc7n^N8u-j^o!Mas~yyz6gkVU`lJ#p z*+6^JR7rMTETN`T-)3hu`Q;biDDm?I9XyjX<+6>T#J&&Oed_kNPD=OV(J>=|UT~QA zU`VwTCBedQg@QXpH2lRcUBHEA$dCL+=uN5PaPQR^?r=3FEQErj`?(Ti^f}4};U`Da z1W=KqVZkG^so7@{`RqeaW4;tBcsDk-cABhzm5(sF$c+@`v#3fMl*+BbF8%I<1^Y#B3XF`Jz^R%I z_DF}Lm(FbCJZ5^Tq$~^*ln~WZ=3`wdV~frL%&xvauj;U8X9K3wd`lsXWQwl8ofh3X zS%uy;R!*`cM#P^^yuV-~+_-MbtyiTEc;jA7RuX8SMHl^49cXtoCxhN9X<&z#EJQQ3 zk8mOj%Jl?jdWYUB*Q+xB4T)sA2)HUl&E|wf`=+K`4Y}+VH# zM?4ViwG*q7eNhVzO>`|HgG~Y+n43SL=>>Jz8vl#>9Y3>}*T#T=x* zfV{Zphh^{prpJxKW7Qo>WP>LLpesA8M!cbyx=)pv)Mxop%_^#Z`g8)fY!N;eT%eQP zFuGntw<0N_;ZPX;u2ALN5vG*x$DWCZp*9`gS1O!g*gJmx?d#WyL_ty!@uLS;XNd9E z!CjeW!ORVTZ_7o}TVdrdw@0;xM$3&^E*psvL!Rk)N<$)D;l5~huH~;L;3_|GH}See zPI53&EUXQWj{81V&yMlr3k(~HK_f&(adoIp-3)NB-LN|`OfMNv65uTLF>)hvEzD)2 zJwlvf22BJa!Cs@sM0OJ_{;lF(5Z0j_3LQ`3X|!USrt z+CHEGLrkV;QwR{NweJVW2%uC850ronPXmri_E)4f@R0XWuNf&ntCXw**<9T3x>m_C z)WY5(F4o98^rLf@ShPok<7TGMa0M^e&AIPN9S?4p&bTk?pGF{Jr7py*ULS&0%C z!xV?2O?Y3nM+@>u1Q01rLj=<(l>|WV9nsu~MrhP*N}zN(Dw2$3QGyctXQ14jm6jxx;3t*x4-%tqJp&7X~+)3s_GSndn7hYiz?R> z=&HPjTA}sndeEz%4qRW}y5tv>`JcORL$W#Xwz}`Sd0cCni&=`ZflHF9-llePGZvpv z-AeXFcf|$BMah9V2}N^<=%hOl3YcBMpy(8G@>pG8symT9Y$YQ|HX^M-EQcpJ z>Jm`?Ccjha3LC27nEnVWr*c!cUKfWgkBw?ka-|kkoYhtv;So!jLo@@uKz-I%FNltZ z2WY!|JaIuQb?RxrD#j#|SiDbc-Z#HcuBkYCb^ul7z%l9Z0lfqo2!2DPBNKFM>M=Wn zjGVJhR$4CG{4x;8|M^lPC9)R;FJELgZJsD>-H`u?38B@#Znb<+M4O_B^8QS#MWiTU zL>fNi0~?$^V!D(mQb{bZgdq4!Pz=kW=PLfP%XK-gUTVCMr5~sy7FXmXCI!0{GXfr} zrT3V4vcfaDE~$AzK{vRnvO|68EB=1N?R(-lI^d%}Fhg@J99kTHA-i7&inoT|6G z62674g7P~%aa-6&Oirk6fUY8!m0zB0dw;#Ca1P`a4J0c~!=|oC8Ja)M#8}~LQphVo zF0#mzo7=?{SZ^xn4J9#pK?qJs#er1pm${@J=q=Xj56%Jh2PZVD^kf zLtBO5IFIQ_EE#hdLjOW1DgGjAbNE&uE&TqTNQ<@)Qp`+*#srL!#WAhAqrALK!d8wQ z?fH2Mv??@WBl&tHargXJwZRSO_UdKb9hewQqH(r%XSg}&aaJlte8Nr>a3EOiAr-#< z=8G?NwZ7WE8&FqErT-<${Xpb79w@8UQMmEZ4$fHPHoCudO-LkjO%hvZgE!^MdK zC(OwKyg*FUig9)dBU<2&3Bd@0;ZC9f`s40)&-K$0XE(R0AE*B7Z48*w(--lmsSs)J zipri?av^^uvQ>^JahtlSy44zT->E5@Sk*d#4v-C{(oH!HG4AmcE6b4K(v`$5iESI1 zqv!6Z2>cO#l_WJ8uNo3;T4YYhFoIuNwKY!|^&jQUzIbBbI;IZjd}W~yv9Y(ICNUEw zFVWZM`+P5g__=vND5qa-h$_JKbCIvMqP*H?6z(k@DueWhCf$uni|7_KmlXf2DC#@m zp-I=w)7O=hL%{4Xoi1Mw$z{df!n+i2IiU`)My|u^5qly6^=_|wuGX2Kl9zNWHQR5T z5=qiVITo%WY>GIfQp-mZ$knL=(yx>0bgC!Nry{iop3V3SMXSN+K(P;m54W1|zN$=( zf9zIIM@roOn`jet&(KH>5L?~`sfAVXL?PCJb$2i2sg4nySl&!hu5s!cfv)Dfm2!8u zFU_(dijCN5R7E{!T(37$E+W#Vy?hc(%S|?lpi~=7WwD>|=1qC7$}gXwQZMq<^mCiK zquF{trg$8YN#2g;KYO}yU#OfLC_lSGG$j^E6g^jxtavLgxdhTvvH*&B1LQsw z9^_kMB8)U@F5n8Nxk!9H4reDF&PA(R|#`J#^xs z6fN)sLMV9>C2B0BOqqbA6pX!TRZYC}G4dpKMtPDldq?dCt4CMG%_%GOOuk0AU4zuM zNOhhaGK*w&dSG=>$SqE??{XCWEW2wTxE40s|NARY3& z0d$1_<*Cx6kZ*bV0sa%MUH`M+y6CrX(zVp=)#+!K{p=z-IwUs1o4_QU;3DyRc=w7k z7)$<_)NTcfF-gmAcz>-b+el|+m|uZO&objhmBQ)lC9`*1RVxpQj^{49`cjousBEXk z(8jwyX}8Mi(6^=7Hoi*KCingEw%xvMw{F`~JH`i{XE&YRO{aU)>D+WKZ#ow@o%T(q z#S6`t@Kn)isjh{h)e>DRllt?7*YY&HQ?w+|JOr1U(nVN#%SD!7w4RSF_nsjhoa<(n z6rYy}?Dpkli}Dld?ecp;1!a+l!Hm6ED0r=z6CMAEgrU67ibzGo5)hm!ox%fCyh)j- zB3O_-ix8**g)R|fzWd@kXX=2X97B;kk6wZ7QOiI?Z@rQvJwIg}{>RHZo}}{q)0zSZ zYfJU0yXUVqWwqZ<596{}>d6;h7m*E{w3K#dQ#}@z%|*Bg4l2`<2tgK zD0v|+#gF@ud^yVcVIkpEI@}UECUJ|M)6lWBSITQi8C62?ApWGZoQkT%2vj7gG=>)g+`#=dH)v1FP09to{c6Vc+Pc-MwjF-n1`n+U=XR9T#t!$S$t4 zwmUQ!B_Jilwgxu}tSCBPVZlDn!VB|tE_lX;>8HpeelvUdl=OrZ4_8VO zl9wN_uE6l!eHc$1dQaVT<~h7{2&Okf^TA5luyv--y5P3upb^%_C>!$t?dwm=gsA`HQv~yO$m8Zk}MXGZm5J zlkm<^Cc>9~SY=V>O~e+u>}{SlufO~5mqP?#-XT`kj|1h8&UUmIjeEwPD7Y3r`$44$ zoeE-bw5?cSp-5E*{6b39K@|sayfj@uLoIzo4S-^+_{P$XHS$dM$~LEQoGn#N3p@rACVrM`#bf)E$+Q zRYX7mt659^k2>!S4sWrTl7Ne#5SEcGx=b!NDZ12Y_i}Zjc){AUx?|Bk+Pi2&1tD+u85_B9X z{z?7(WT4@8u|3%9FS=lk0-krvi8`5jj|XlEz?|8oCyp21z4AMhutpE3Otf5^i0=Wt z)Z+Tm*=dnvj0e27B=HFzlpr}h_w}w1cxNs0I}-gM?EU{mhz!@spnWlDw+GZdklfI= zm*X}4n!*a*cE8)ABuKy0>UT2A5qjZ1=vowUpi+W8x?;K7D!93{35yA+%kGIQ0tDzR zb@N1^AhL__<9Q5(;|>+|)XOALc97_wTk=3s&k)5Yix}KQHyYoDra=^4T8$|Lb~_Yi zeoog?4rWL6z(k7UpP^|F*uyeG)Cn*ixwZSxgK^ggp-U)=Ji+%f(3b$S!~P`IOmLko zz7Jz(so)a`tns_W*NO^jUyK|w!1t7Q5`hriP9Bs7gKhPu1Pj~Uby}{X&Kj?`JdCp4 z-}7YA*h-IylY=K3@s5ae`VMG4O`15vQ_GUNb`I6jKe>d}qS~%49+|*oLfQ{l?E{Xm z8z3AQRS3ttqR}IlJXNH(>V63^@a%*XGY$x=fhsK?$mbExBwq3WCY@f=si|(obRF(@ z$e;U6ggLw8-Pr|q5@SXoNmU~V4a1h{`*Sci7+l42g5LsRM>z((NSv;9q}Ab+E2@Y% zp2|eYW8$$DH`8lz{GFOPI7Q~7){g7_sZ1gL$(9k<=z8j?g5cX>U#v}5dAV;il1!nw zkE!+@NKc(DuKYr;Ah8hA`eVg+jvlwFUaw1=9mS2X(1X=>MDW1#$zsF(GF0gt;t51Bd8pR2&t;A{ zjoh1tl#?JpV^>N5!s&9>w6)w6NO45*TkPRO|;_3X?g;^ zp3koSzrN1ox3MG1!<5A3QCpSEXpCX>oaQW`Ty{5V&eO+kpn(DUHU~Om)``JL{tPFv~p><#C78&h4B_o@i`Co1%(URP? zJZ6us%cXTpn$6YnP1}YIfl4AM^zyF7L!yGzi$*^C5`m98WhZb({ruN2zujoACRCWK z#Svg{y1MlBWw>zq&n-LrjPpQBw6hpfUONH;uq%+0_=FOup{B$XwzcR|Ou33j zOw**t7c>-O9p1_O?nw^#v_Wfw8+AojoKKL`?JkLMWug~&B}sB3xtA%hR7t7YgDXnt zZMQrRzm1muu7PHj+!Q&}8D3KuP5vmNp;LDw6fx3kZ(NWm)QE?4s&1p96Up)LS)HBM zVFy~nN~Fm?4&1~0+L54!ES?a8iiyCBjGCH^Q?5e8gJNlF`J(1N!fwIXt=AM*>-*VO zvM^|S(!B+jcJu&bl!XmQ31QMP+7G1ryUp`#4l>43*dpm3b2%uO5tFf^7cV!OWG)NCI>m*ty zWXwbPJwm-cdE9Y@^Ve*qzpZ~={N{PVp2?j|U`O=ddaMA60%ksWQdhwN+g*|SfrB4D zEXGN3mdEMzH&cuk-zC2j)A{^_TLYBdZc=-fEleIyLJ~o{w+WUN<5d3fM$OMg&L*w$ z15HpYV_roEfM} zRShmrcrrDK+@B6D>QsG5v>_(Aq)7i{S<;ZR$+dWXZjpy2=Du=vblJaB5mbHZo|-bl zP}pjL9H_poMM_CrXq6a52s}~89hr(^BMi~4rrLb8b*7`*Y8gRI4zz2LffSBUrs{jk z(d!QbJPc|iyRvAzy^*c$R6B>r`;ZtyK3d5wHKf*JmL>?*Gx^}`G-Hx>Ir>DVu9v@R zj>>{x-SLe6^ZoBs7@mAA`q?AQ9OBfwLGko7yTxm*at-Hlr9ByN6VeMR%Xlb%H;di+ zarP$CVK?(m23`+zDHuUpVT2ZVxnYDkHSMPEcgQ11B;O+RW3)i)3Rd!J1xvs%)m6Fo zX@Z$xmXQWxC||!`@_3pf86n05G>vX>XHfbe^MZF31kUMqWT@bf{y?SCZli-Fgc;FN zDe($|pd_#5-&12bE3r3f`%K$Ih|*Zj#aHl=d!H8TUdV8VkdhL`JQ&EI)|TmBYGT*^ zq%ICO;A%R1-k=_uV0I7cmnG!(q^=U_)8u1Hab*3C?cd5ddS#i+aE7)5aV~7{JM=@f z@SlFy+H)n}P)H%TAh5C(T*7!%r3ShO9;0Q7A^-kd^ld+M&Odg}Kb)O^=$zkn&Tp`8 z;(p!1>-zk%b3U|K(ujp7)2e$<*bcMp34sp=ydaerKHcg2PdW@w1AGk5bWF-`!P()9_!jBjx~o!+r)qP?6#!tK3cAe!_!SLguafbA0B@N%Hw;u0U_@nkM$gn1jAN$k}j$dMwtpkQc( z%X9LedtF1xqmkVq8kc7ZVIs4q-xd-gMix3j0=P_Vnnc*rJIJUM|7fe!$`NrwMYXlL z7{wwg2**6Rl@(t0U#Iiwx#I*&bqZfUQqA)tX*|Dt{qjY| z2p22j79?(vwt<-Hl>cFT7m-f~kPWoJin%@A+SA86i_OhPm_Zr~{xo91^+>-;c@?)M z18SR)FnP!nNw*i0t`ly!Y8n|M71Fs=$m0_&U;rhKmLHxd5NiUFPHOd<0$FTHz8pwN znlWOJ=`;D`B_)5YVjmj1LlPB4=s+mS@JBj{!bdm(L&xjQZf(v7EbPfI#{G`)o4%og zK5};U`e$9J9E%9;XXLRodo+s71I@oI6NO+DtZxmbE7sO~ry+5Ts%Iqyuc<7{=9s*l zNZUQr?QL4GpZVQhz^-}~tPK9$~$L=2Uh@oytoU*_nYvW|FQYqj>&R2j#zFmnWsfiD9()h=*IYEPbC42*UCfo<`0vl7LVi z>VDImg~Y_AYqB2iRJa8KlD-_nD-IP1-Tam8o8g$DOj5h?(Z*jb&WFV@W022b+DZY^X0# zC%3yb*N{j^*kT45MC-|Ui}N9XU1|LpQj(~Mi;!B&u(Qbk>Iy}QVMdjvsRbi$_S|x$ z!o50e2_6W@9-#1njMnNw#Gs@KjABMd?{hnn&%WPk0dn|1#^QSPQG?3DA`&cv6^X+%Pf7y4pmRW10A-TmRqCc&%6 zNBnE{e+)WM;MVA=PjT@n{+wA{xmI?toMnrrM{rtW3kln!b(ca~q-l?HETU)tknC~x zv|W|m0TmDWz<(X@#pT`VSt%cKZ`fmiJd`}6<7?N}m_O>~z_TVm21e74Tu2(cHownj zV|T*CA#{tYFdJnlj8mE&i@MbJf!YDYcA$en0Ye&@qoh)`)c_2(3XU^(q5Hx#BwUNQ$)M&Bx0NTab}L^UB{FP4VxV!{$zq!LPh3T9tWh(|agse&6Xa<1XeU zt_%}PEiE0`a#KqYepAXLz2%Wj^?2e!`dA`uW-E?)26p(*TCM!laY-yhywHnk#v;LA z%43@{AozoP+4`li)Dx_tI0}u zFctO?XyQ8>;ZG9SL{O{bWn9wKqMeICxL?NT;s1VO{)6pKv9rQVyBu86_N}>8VL+ah z>xqa)`J*RQW$)7X>C*Rh_B!zQ`cW|Y?QTnruFZ75o5P+w^%P{tGJZuj^fr9?*NpNe z>wo?|(WwW#)8W{tsyvz@V08o;Sh6`qbz ze_NR=2#ua9clW|mZ-HlgG&7dDZ*^%-OLFk2r3yOT!lp)|*EsMOhs8M3&J8EL96b;% zu_gjZa=)c%b~lu`A-EX`Cv9V|aNDL!rE6Eerqf|%==aD29Q~I2-hG+P);BV!;$ns5 zIC;rXwrqq33SS7PQ;pM&kstp)p(#(+-sI2ZPf01{5>ISjS)oews^v&8kU}8x$N?dN zynd&(QLT9)1@n?hKWTnw_>S_90JB*c4vMl^8Ac-|`Z!^(bv!TwPKY?+{EqG}d$nEZ zXT;+ff=KG;XN#&c=bS3WH)ZU169JK>r?|x7TP@x5!OH^FdUAc9zgu{o9EPh8iC@?) z(ESlM1h!9*+oZIt{flZC_-QS(#@r1jy04$tZdZAp?l+_>q5frB8r7VtnAan!r{LDj}IC0JsQ z(5SS~D2jD+4apH`kFc+?V=g?gnrZ(Px-eM}#w60jQ@PO8LV{SZfs7{M7oYNS=5Hw=duagQKE~9NWP{-9uG*Mu}0#js4#t zs16)obTnguY>ck%4?%m+drJ(IkMjST%T6=wG|hR_oHY#vH@nT?ycwKPc~j9Ly{6Y~ zdKXRa{3uf7x;eXQ&Mup?p*1}lG-v(htk;}%+cEo*lepg*^g5&mMUaH-C31J!=?^>o zh7zA=RQc@pF++6wy^DVDyx%*+B!M3Txej3MV(B6QP98sXx<7QfA3NO-o$hU?dvn&k z>2$9<-K$RbveO+}U~YHN>khiz!9{m)-W{BEEjS%h67lH-ryoV8yACr8>v$M!UnWoP z6Jw@>?Vahs^2T*8kps3Ate=gh5=x;mq*6FSy9!JcI6^W!AR_v+Q@wiqKAw(nJE69i zSg)`dnIL%CDa>qMEgXq_FkK7OYGYLMO5S`j_`HcXOOrGjn`=h9AXo-N@4y<`eRN;R zjNh^#WDM)Qjn*$yJ*L7fK^{i2Cbr5!B;OcAd>)O1U+^2tp|8v|99Baq_^OI#Cbr3q zdMB=zH`DExf@Li2xG^IC(mimnpSUC_r=IYtv?{`-tV=-CrvJvX=XshbF=^hA5OaT$ zJQIxTBM-Pi>`xLQ``k*Z$=wiPwlt>kfZ`HSHh<0A>}k0|N7*$e0njr2a@!7Pstn>T zzYEd)jt@;GG9TTg`UB~ePFCD|i?fKaYz6)O=PCdG|8YTA`!PPK%L$ggHF}J1leb6% zaM;;myLo?AdL2^25Xo)9kz?@X&d`jq40w%Il&c6z{k>ZHTMiRjOQWBD6!}vy0xA`>XPopo(_;s0?L+fkUi|H4=0T4*vsosjfKBrA0nqd8WmV3B`J}m)EBG0WACHcm{1dAr?OC*ck98iI*4CdF#mp42ORX@ zN2b#H**Zw3h-U;xy-`iy-g-(5-k}g=b>$^QItFKXaWTXWh5L5T!x;Xqi)Si+twmKjS-((*OxO~X=XmpeeU{Nm#?{2av>fRudAxyMdtS4e7 zMpd#L&I7zGr```O{`3JX#p12MfHH2@5?PiRm%}2dhD|q8KEwav`YVLX?2#-oeyQxi(bk!gt5ErBYvs!-42i packages/elm.nix -elm2nix snapshot > versions.dat -pushd "$(nix-build -A elmPackages.elm.src --no-out-link ../../../..)/ui/browser" +cabal2nix https://github.com/elm/compiler --revision c9aefb6230f5e0bda03205ab0499f6e4af924495 > packages/elm.nix +echo "need to manually copy registry.dat from an existing elm project" +#elm2nix snapshot > registry.dat +pushd "$(nix-build -A elmPackages.elm.src --no-out-link ../../../..)/reactor" elm2nix convert > $OLDPWD/packages/elm-srcs.nix popd diff --git a/pkgs/development/compilers/elm/versions.dat b/pkgs/development/compilers/elm/versions.dat deleted file mode 100644 index 9dcfd8a2808f666b0cff1a54b79a6543e46451d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 94810 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 h`vNhQvx0E8DGhOLqR%vKw;#_;!UYW diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 792107472606..5c54a90ce7e7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -66,6 +66,7 @@ self: super: { th-expand-syns = doJailbreak super.th-expand-syns; # TODO: remove when upstream accepts https://github.com/snapframework/io-streams-haproxy/pull/17 io-streams-haproxy = doJailbreak super.io-streams-haproxy; # base >=4.5 && <4.13 + snap-server = doJailbreak super.snap-server; # use latest version to fix the build generics-sop = self.generics-sop_0_5_0_0; @@ -106,6 +107,15 @@ self: super: { url = "https://github.com/simonmar/alex/commit/deaae6eddef5186bfd0e42e2c3ced39e26afa4d6.patch"; sha256 = "1v40gmnw4lqyk271wngdwz8whpfdhmza58srbkka8icwwwrck3l5"; }); + # https://github.com/snapframework/snap-core/issues/288 + snap-core = overrideCabal super.snap-core (drv: { prePatch = "substituteInPlace src/Snap/Internal/Core.hs --replace 'fail = Fail.fail' ''"; }); + # needs a release + json = overrideCabal super.json (drv: { prePatch = "substituteInPlace json.cabal --replace '4.13' '4.14'"; patches = [( + pkgs.fetchpatch { + url = "https://github.com/GaloisInc/json/commit/9d36ca5d865be7e4b2126b68a444b901941d2492.patch"; + sha256 = "0vyi5nbivkqg6zngq7rb3wwcj9043m4hmyk155nrcddl8j2smfzv"; + } + )]; }); # Upstream ships a broken Setup.hs file. csv = overrideCabal super.csv (drv: { prePatch = "rm Setup.hs"; }); From fe143bac5b8dbdbdc9332abc3f2acdf839652c9e Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Mon, 21 Oct 2019 22:36:27 +0200 Subject: [PATCH 122/142] nixos/redis: Disable hugepages for redis via sysctl and not via a systemd-oneshot --- nixos/modules/services/databases/redis.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index 9c389d80a6df..5861323e5ea0 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -186,9 +186,9 @@ in config = mkIf config.services.redis.enable { - boot.kernel.sysctl = mkIf cfg.vmOverCommit { - "vm.overcommit_memory" = "1"; - }; + boot.kernel.sysctl = { + "vm.nr_hugepages" = "0"; + } // mkIf cfg.vmOverCommit { "vm.overcommit_memory" = "1"; }; networking.firewall = mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.port ]; @@ -198,14 +198,6 @@ in environment.systemPackages = [ cfg.package ]; - systemd.services.disable-transparent-huge-pages = { - description = "Disable Transparent Huge Pages (required by Redis)"; - before = [ "redis.service" ]; - wantedBy = [ "redis.service" ]; - script = "echo never > /sys/kernel/mm/transparent_hugepage/enabled"; - serviceConfig.Type = "oneshot"; - }; - systemd.services.redis = { description = "Redis Server"; From 2e71b42edc5fd8521f3d207fa9754a4c08b4447e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 Oct 2019 10:11:44 -0700 Subject: [PATCH 123/142] fanficfare: 3.11.0 -> 3.12.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fanficfare/versions --- pkgs/tools/text/fanficfare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index 556b868e161b..b0d66dfd93ed 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "FanFicFare"; - version = "3.11.0"; + version = "3.12.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1w1crc32p5rnbah6x9km6yvjiy5qrmpmvzb4ignsprfxjq803r3a"; + sha256 = "1hzb668fga9y422670iw22ggfn8a9jp2jdxs2xhzbqxnfrw08wq0"; }; propagatedBuildInputs = with python3Packages; [ From f2d81e480f12f9fb762ad3817c8837e9200dd0fe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 Oct 2019 09:13:07 -0700 Subject: [PATCH 124/142] tridactyl-native: 1.16.3 -> 1.17.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/tridactyl-native/versions --- pkgs/tools/networking/tridactyl-native/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/tridactyl-native/default.nix b/pkgs/tools/networking/tridactyl-native/default.nix index 9667f1a74c5a..665d988f48e4 100644 --- a/pkgs/tools/networking/tridactyl-native/default.nix +++ b/pkgs/tools/networking/tridactyl-native/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "tridactyl-native"; # this is actually the version of tridactyl itself; the native messenger will # probably not change with every tridactyl version - version = "1.16.3"; + version = "1.17.0"; src = fetchFromGitHub { owner = "tridactyl"; repo = "tridactyl"; rev = version; - sha256 = "1cp2iaa9fhlxmbml41wnq984jp2r75n6w0qxz38rd24jxsj5vz06"; + sha256 = "0dpd4jdym644rqm9h83lb8cwfccnwrnqm1g91nl913pj4k5x4hqr"; }; sourceRoot = "source/native"; From bf30d5d6f60f902f74d307cafbed674ee6bd495e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 Oct 2019 15:21:33 -0700 Subject: [PATCH 125/142] ginac: 1.7.7 -> 1.7.8 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ginac/versions --- pkgs/applications/science/math/ginac/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index 541ed548f884..79f20f06b295 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cln, pkgconfig, readline, gmp, python }: stdenv.mkDerivation rec { - name = "ginac-1.7.7"; + name = "ginac-1.7.8"; src = fetchurl { url = "${meta.homepage}/${name}.tar.bz2"; - sha256 = "1jsf74cym5v6nq70aij3l7axq8vf7rrc1lnb9siyb9lsfbnnxzqf"; + sha256 = "0rvhdagmrs8ynnylwnxnmmfz1j9zk1g2rr7w6xczsbn7lqd511hc"; }; propagatedBuildInputs = [ cln ]; From b09fbccbafa340d3898dc3cb4a8b4bffd6d1fe9b Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 21 Oct 2019 19:20:47 -0500 Subject: [PATCH 126/142] libinjection: init at 3.10.0 Signed-off-by: Austin Seipp --- .../libraries/libinjection/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/libraries/libinjection/default.nix diff --git a/pkgs/development/libraries/libinjection/default.nix b/pkgs/development/libraries/libinjection/default.nix new file mode 100644 index 000000000000..b3bdbb41588a --- /dev/null +++ b/pkgs/development/libraries/libinjection/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub +, python +}: + +stdenv.mkDerivation rec { + pname = "libinjection"; + version = "3.10.0"; + + src = fetchFromGitHub { + owner = "client9"; + repo = pname; + rev = "refs/tags/v${version}"; + sha256 = "0chsgam5dqr9vjfhdcp8cgk7la6nf3lq44zs6z6si98cq743550g"; + }; + + nativeBuildInputs = [ python ]; + + patchPhase = '' + patchShebangs src + substituteInPlace src/Makefile \ + --replace /usr/local $out + ''; + + configurePhase = "cd src"; + buildPhase = "make all"; + + # no binaries, so out = library, dev = headers + outputs = [ "out" "dev" ]; + + meta = with stdenv.lib; { + description = "SQL / SQLI tokenizer parser analyzer"; + homepage = "https://github.com/client9/libinjection"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 96a4f7d98784..f51bcb00eee6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12001,6 +12001,8 @@ in libiio = callPackage ../development/libraries/libiio { }; + libinjection = callPackage ../development/libraries/libinjection { }; + liburing = callPackage ../development/libraries/liburing { }; librseq = callPackage ../development/libraries/librseq { }; From c2eed8b9b08b0c435b6674bf052433de946fefe4 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 21 Oct 2019 19:56:20 -0400 Subject: [PATCH 127/142] deepin.qt5xcb-plugin: 1.2.2 -> 5.0.1, fix build --- .../deepin/qt5dxcb-plugin/default.nix | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix index 4d0240c426ba..76eac2e0ebb2 100644 --- a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix +++ b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix @@ -3,14 +3,19 @@ mkDerivation rec { pname = "qt5dxcb-plugin"; - version = "1.2.2"; + version = "5.0.1"; - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1zvab6qxdr49pmk6mbk7s0md7bx585p32lca0xbg8mrkajz7g8rq"; - }; + srcs = [ + (fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "1pkhbx4hzjv7n4mscv7dng9ymjcc1csdc82iy62yxshhq32bcfja"; + }) + qtbase.src + ]; + + sourceRoot = "source"; nativeBuildInputs = [ pkgconfig @@ -22,8 +27,16 @@ mkDerivation rec { libSM mtdev cairo + qtbase ]; + postPatch = '' + # The Qt5 platforms plugin is vendored in the package, however what's there is not always up-to-date with what's in nixpkgs. + # We simply copy the headers from qtbase's source tarball. + mkdir -p platformplugin/libqt5xcbqpa-dev/${qtbase.version} + cp -r ../qtbase-everywhere-src-5.12.4/src/plugins/platforms/xcb/*.h platformplugin/libqt5xcbqpa-dev/${qtbase.version}/ + ''; + qmakeFlags = [ "INSTALL_PATH=${placeholder "out"}/${qtbase.qtPluginPrefix}/platforms" ]; From 2c858f06aa99830f50b5caa60e006a3198e3815c Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 21 Oct 2019 19:31:20 -0500 Subject: [PATCH 128/142] geoip: spruce it up a bit Update metadata (dead URL), add myself as a maintainer, and do some minor touchups, including moving to `pname+version`. Signed-off-by: Austin Seipp --- pkgs/development/libraries/geoip/default.nix | 42 ++++++++++++-------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix index 1b1f7373709f..4525f9232862 100644 --- a/pkgs/development/libraries/geoip/default.nix +++ b/pkgs/development/libraries/geoip/default.nix @@ -1,37 +1,45 @@ -# in geoipDatabase, you can insert a package defining ${geoipDatabase}/share/GeoIP -# e.g. geolite-legacy { stdenv, fetchFromGitHub, autoreconfHook -, drvName ? "geoip", geoipDatabase ? "/var/lib/geoip-databases" }: +, drvName ? "geoip" -let version = "1.6.12"; - dataDir = if (stdenv.lib.isDerivation geoipDatabase) then "${toString geoipDatabase}/share/GeoIP" else geoipDatabase; -in stdenv.mkDerivation { - name = "${drvName}-${version}"; +# in geoipDatabase, you can insert a package defining +# "${geoipDatabase}/share/GeoIP" e.g. geolite-legacy +, geoipDatabase ? "/var/lib/geoip-databases" +}: + +let + dataDir = if stdenv.lib.isDerivation geoipDatabase + then "${toString geoipDatabase}/share/GeoIP" + else geoipDatabase; +in +stdenv.mkDerivation rec { + pname = drvName; + version = "1.6.12"; src = fetchFromGitHub { - owner = "maxmind"; - repo = "geoip-api-c"; - rev = "v${version}"; + owner = "maxmind"; + repo = "geoip-api-c"; + rev = "v${version}"; sha256 = "0ixyp3h51alnncr17hqp1p0rlqz9w69nlhm60rbzjjz3vjx52ajv"; }; nativeBuildInputs = [ autoreconfHook ]; + # Cross compilation shenanigans configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" ]; + # Fix up the default data directory postConfigure = '' find . -name Makefile.in -exec sed -i -r 's#^pkgdatadir\s*=.+$#pkgdatadir = ${dataDir}#' {} \; ''; - meta = { - description = "Geolocation API"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.unix; - homepage = http://geolite.maxmind.com/; - downloadPage = "http://geolite.maxmind.com/download/"; + meta = with stdenv.lib; { + description = "An API for GeoIP/Geolocation databases"; + maintainers = with maintainers; [ thoughtpolice raskin ]; + license = licenses.lgpl21; + platforms = platforms.unix; + homepage = "http://maxmind.com"; }; } From 2202b9f7746eb71893b13802a4ac499b48aad435 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 Oct 2019 16:17:04 -0700 Subject: [PATCH 129/142] git-secret: 0.3.1 -> 0.3.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/git-secret/versions --- .../version-management/git-and-tools/git-secret/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix index 494c0a3421f8..8477dfac5856 100644 --- a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, git, gnupg, gawk }: let - version = "0.3.1"; + version = "0.3.2"; repo = "git-secret"; in stdenv.mkDerivation { @@ -11,7 +11,7 @@ in stdenv.mkDerivation { inherit repo; owner = "sobolevn"; rev = "v${version}"; - sha256 = "0234a2507as242wlybg32f7nd27ffjs50r4p1p95j6vs5s8g413l"; + sha256 = "0n268xlsd9p5f083sqwzpvsqg99fdk876mf8gihkydakrismc45b"; }; buildInputs = [ makeWrapper ]; From 62e827d1fb5a6946416aaee44607d29061408298 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 Oct 2019 13:41:46 -0700 Subject: [PATCH 130/142] gallery-dl: 1.10.3 -> 1.10.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gallery_dl/versions --- pkgs/applications/misc/gallery-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 169c5c11b8ce..b1cd6a36e085 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "gallery_dl"; - version = "1.10.3"; + version = "1.10.6"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1ippn0zbjy69n178vh4wgyzy6723ynvj2w23mzqw7v2mzcvkhmdz"; + sha256 = "0jbfp072rnb3pkqp10xds57bnlcn87vqjaz68nhpzkwvwhs3hr4w"; }; doCheck = false; From 92cf9bef861d6e500706986e96d5617b0409860f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 Oct 2019 11:48:13 -0700 Subject: [PATCH 131/142] git-quick-stats: 2.0.9 -> 2.0.10 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/git-quick-stats/versions --- pkgs/development/tools/git-quick-stats/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/development/tools/git-quick-stats/default.nix index 6bcbf7cf9bf2..78ea0177efdc 100644 --- a/pkgs/development/tools/git-quick-stats/default.nix +++ b/pkgs/development/tools/git-quick-stats/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.0.9"; + version = "2.0.10"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "0y8rzm2jizsh65sxc3jlqp4nfv558rfhr77s9hz4qy4i24z44bgq"; + sha256 = "09wqrrwcilm8ffsj7lkq0vxdnk6yrq0xnl788hpln15q75brsbq6"; }; PREFIX = builtins.placeholder "out"; meta = with stdenv.lib; { From e0675e9693964b7efc73ff188fc9a2bb21cfe9a5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 Oct 2019 11:32:10 -0700 Subject: [PATCH 132/142] fstrm: 0.5.0 -> 0.6.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fstrm/versions --- pkgs/development/libraries/fstrm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fstrm/default.nix b/pkgs/development/libraries/fstrm/default.nix index 380f64cf523f..40ffe6918a4f 100644 --- a/pkgs/development/libraries/fstrm/default.nix +++ b/pkgs/development/libraries/fstrm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fstrm"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "farsightsec"; repo = "fstrm"; rev = "v${version}"; - sha256 = "1vm880h6vpnxqh7v0x17yfim6f2fbxwkm03ms58s2h9akmph9xm5"; + sha256 = "0b6x9wgyn92vykkmd3ynhnpbdl77zb4wf4rm7p0h8p9pwq953hdm"; }; outputs = [ "bin" "out" "dev" ]; From 49ddf90e8b9e2ccd9613aba9190523a14f5075b5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 Oct 2019 09:52:53 -0700 Subject: [PATCH 133/142] drumgizmo: 0.9.17 -> 0.9.18 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/drumgizmo/versions --- pkgs/applications/audio/drumgizmo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix index 11b214f6bb38..86de7df101d1 100644 --- a/pkgs/applications/audio/drumgizmo/default.nix +++ b/pkgs/applications/audio/drumgizmo/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "0.9.17"; + version = "0.9.18"; pname = "drumgizmo"; src = fetchurl { url = "https://www.drumgizmo.org/releases/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "177c27kz9srds7a659zz9yhp58z0zsk0ydwww7l3jkjlylm1p8x1"; + sha256 = "1vig9pm0dakpk8wa62m9ajj3bz536h0170r8vb98hxbm4wyys8yj"; }; configureFlags = [ "--enable-lv2" ]; From 89c236fe817224c0c48468890b8b08901e8193b5 Mon Sep 17 00:00:00 2001 From: davidak Date: Mon, 21 Oct 2019 16:42:17 +0200 Subject: [PATCH 134/142] reuse: add homepage --- pkgs/tools/package-management/reuse/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/package-management/reuse/default.nix b/pkgs/tools/package-management/reuse/default.nix index d77398610fb0..58987f3965cd 100644 --- a/pkgs/tools/package-management/reuse/default.nix +++ b/pkgs/tools/package-management/reuse/default.nix @@ -27,6 +27,7 @@ buildPythonApplication rec { meta = with lib; { description = "A tool for compliance with the REUSE Initiative recommendations"; + homepage = "https://github.com/fsfe/reuse-tool"; license = with licenses; [ asl20 cc-by-sa-40 cc0 gpl3 ]; maintainers = [ maintainers.FlorianFranzen ]; }; From 7ae9f72a48d2e1e1ae164d6cda5e965922ebfcdf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 Oct 2019 07:33:22 -0700 Subject: [PATCH 135/142] flexget: 2.21.19 -> 2.21.25 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/flexget/versions --- pkgs/applications/networking/flexget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 6e8ec45a36d9..d735c06a5319 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -24,11 +24,11 @@ with python'.pkgs; buildPythonApplication rec { pname = "FlexGet"; - version = "2.21.19"; + version = "2.21.25"; src = fetchPypi { inherit pname version; - sha256 = "1xkxd5p4ps0dnwns64zzlvs252wx0f9fy5b6000gyql7y5cma3kj"; + sha256 = "0l77fgg0w5dca1bwk4fcc1yz1g7njb0x07yx4bazyg821gl15rc9"; }; postPatch = '' From 01c2033572b0d5adb03733ec01009bc648a17c9f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 Oct 2019 07:17:32 -0700 Subject: [PATCH 136/142] cfr: 0.146 -> 0.147 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cfr/versions --- pkgs/development/tools/java/cfr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix index 382ef28c0147..8a7bb005a8cc 100644 --- a/pkgs/development/tools/java/cfr/default.nix +++ b/pkgs/development/tools/java/cfr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cfr"; - version = "0.146"; + version = "0.147"; src = fetchurl { url = "http://www.benf.org/other/cfr/cfr_${version}.jar"; - sha256 = "16pmn3shhb00x3ba2zazbkprwvc34a6dds8ghc53winbf371xi3c"; + sha256 = "1xafxvxil0k7rwvfia2a67sh18pk8xb2y6qz6cpr31i2i0pwl8ls"; }; nativeBuildInputs = [ makeWrapper ]; From 2f28107251f36892e490902b05fbb4cc48f8410d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 Oct 2019 07:57:16 -0700 Subject: [PATCH 137/142] folly: 2019.09.16.00 -> 2019.10.14.00 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/folly/versions --- pkgs/development/libraries/folly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index fe48eda192de..557c9aaa2393 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "folly"; - version = "2019.09.16.00"; + version = "2019.10.14.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "14vdc1rh6z2yhwncpmgyq9c8c0rddhd9l1mnmj9pjhl5hfj45kf6"; + sha256 = "0d32cwwza3hqsr0z4kcrk1cj26ipbwkqm6nz5335rw4k9y5kyz16"; }; nativeBuildInputs = [ cmake ]; From 750c16645564ba477275cd27ec3f17d881b85e07 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 Oct 2019 06:33:49 -0700 Subject: [PATCH 138/142] cimg: 2.7.1 -> 2.7.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cimg/versions --- pkgs/development/libraries/cimg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 6181122aa7f1..e0f72f13df91 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "2.7.1"; + version = "2.7.4"; src = fetchurl { url = "http://cimg.eu/files/CImg_${version}.zip"; - sha256 = "1lw1hjk65zyd5x9w113yrqyy8db45jdzzkqslkipaiskl9f81y9z"; + sha256 = "1csqac8z2q8dp95sdjn4am8icnxclz28yx3ih5izxxp4s5dpjbjb"; }; nativeBuildInputs = [ unzip ]; From 15dd224a5560605f3b148c789edcd0227d75f2a7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 Oct 2019 06:51:19 -0700 Subject: [PATCH 139/142] bvi: 1.4.0 -> 1.4.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/bvi/versions --- pkgs/applications/editors/bvi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/bvi/default.nix b/pkgs/applications/editors/bvi/default.nix index 3237c543ee69..2e79b80d6105 100644 --- a/pkgs/applications/editors/bvi/default.nix +++ b/pkgs/applications/editors/bvi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bvi"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { url = "mirror://sourceforge/bvi/${pname}-${version}.src.tar.gz"; - sha256 = "00pq9rv7s8inqxq2m3xshxi58691i3pxw9smibcrgh6768l3qnh1"; + sha256 = "0a0yl0dcyff31k3dr4dpgqmlwygp8iaslnr5gmb6814ylxf2ad9h"; }; buildInputs = [ ncurses ]; From 36ffad1d7e7b71696548cfddf37120d18cbb3972 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 Oct 2019 07:08:23 -0700 Subject: [PATCH 140/142] catch2: 2.9.2 -> 2.10.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/catch2/versions --- pkgs/development/libraries/catch2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix index f8097599f4fb..42e331f65748 100644 --- a/pkgs/development/libraries/catch2/default.nix +++ b/pkgs/development/libraries/catch2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "catch2"; - version = "2.9.2"; + version = "2.10.0"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - sha256="0wn0vm9mdl4iv3scihdwfbg40appnllzbq4ik3jpr1jdf6ik7par"; + sha256="1mc6zix3hk3ggpihmdd4y0xvq3qvdw9c1arwnmi4nf3g4693k97r"; }; nativeBuildInputs = [ cmake ]; From 9addfc003fb1df07bc77c278399655b50b19400a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 Oct 2019 05:03:51 -0700 Subject: [PATCH 141/142] chirp: 20190905 -> 20190925 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/chirp-daily/versions --- pkgs/applications/radio/chirp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index 1a9328bb4550..c088cefd8618 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "chirp-daily"; - version = "20190905"; + version = "20190925"; src = fetchurl { url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz"; - sha256 = "01xglzzl94wzkd2d8zmyv6s1xqsfc7biph15k0ap8rlf98874rlf"; + sha256 = "0immgss7nj7395r3csiypksnbn1r2f3j45c5v8qpybz65lpbplps"; }; nativeBuildInputs = [ makeWrapper ]; From 3ca78c1a12a89c5e59fd39589a1092625a2e8e5a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 Oct 2019 15:16:29 -0700 Subject: [PATCH 142/142] grails: 4.0.0 -> 4.0.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/grails/versions --- pkgs/development/web/grails/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index 5427f66478f3..1c5557f76243 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "grails"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "13y0q3gcdpfwib3ahrgh36rhr4smbrq2g4xgvnk8c0a6wvmz85sx"; + sha256 = "0igkzxqfm6lvp4s8w6kavdvjriq59q42jmj9ynbc669dvy6y6725"; }; buildInputs = [ unzip ];