diff options
Diffstat (limited to 'pkgs')
59 files changed, 676 insertions, 831 deletions
diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 8e0176797d2..99b014adb02 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -32,14 +32,14 @@ , wrapGAppsHook }: let - version = "3.30.2"; + version = "3.30.3"; pname = "gnome-builder"; in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "05yax7iv9g831xvw9xdc01qc0l7qpmh6rfd692x8cbg76hljxdrr"; + sha256 = "11h6apjyah91djf77m8xkl5rvdz7mwpp3bjc4yzzs9lm3pag764r"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 9adcea83773..4ca82f1adc3 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -14,11 +14,11 @@ in python3Packages.buildPythonApplication rec { name = "electrum-${version}"; - version = "3.2.3"; + version = "3.2.4"; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "139kzapas1l61w1in9f7c6ybricid4fzryfnvsrfhpaqh83ydn2c"; + sha256 = "0nwipn1alk3r54zpsv2bdwsqxw4f08bxnfmygnwakfkiaifmmhxg"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/gnuradio/osmosdr.nix b/pkgs/applications/misc/gnuradio/osmosdr.nix index 355ca0e9544..846afe0e95d 100644 --- a/pkgs/applications/misc/gnuradio/osmosdr.nix +++ b/pkgs/applications/misc/gnuradio/osmosdr.nix @@ -1,24 +1,33 @@ -{ stdenv, fetchgit, cmake, pkgconfig, boost, gnuradio, rtl-sdr, uhd -, makeWrapper, hackrf, airspy +{ stdenv, fetchgit, cmake, pkgconfig, makeWrapper +, boost , pythonSupport ? true, python, swig +, airspy +, gnuradio +, hackrf +, libbladeRF +, rtl-sdr +, soapysdr-with-plugins +, uhd }: assert pythonSupport -> python != null && swig != null; stdenv.mkDerivation rec { name = "gnuradio-osmosdr-${version}"; - version = "0.1.4"; + version = "2018-08-15"; src = fetchgit { url = "git://git.osmocom.org/gr-osmosdr"; - rev = "refs/tags/v${version}"; - sha256 = "0vyzr4fhkblf2v3d7m0ch5hws4c493jw3ydl4y6b2dfbfzchhsz8"; + rev = "4d83c6067f059b0c5015c3f59f8117bbd361e877"; + sha256 = "1d5nb47506qry52bg4cn02d3l4lwxwz44g2fz1ph0q93c7892j60"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake boost gnuradio rtl-sdr uhd makeWrapper hackrf airspy - ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; + cmake makeWrapper boost + airspy gnuradio hackrf libbladeRF rtl-sdr uhd + ] ++ stdenv.lib.optionals stdenv.isLinux [ soapysdr-with-plugins ] + ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' for prog in "$out"/bin/*; do diff --git a/pkgs/applications/misc/gnuradio/rds.nix b/pkgs/applications/misc/gnuradio/rds.nix index 5d9670ba307..2e5443227fd 100644 --- a/pkgs/applications/misc/gnuradio/rds.nix +++ b/pkgs/applications/misc/gnuradio/rds.nix @@ -6,13 +6,13 @@ assert pythonSupport -> python != null && swig != null; stdenv.mkDerivation rec { name = "gnuradio-rds-${version}"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "bastibl"; repo = "gr-rds"; rev = "v${version}"; - sha256 = "008284ya464q4h4fd0zvcn6g7bym231p8fl3kdxncz9ks4zsbsxs"; + sha256 = "0jkzchvw0ivcxsjhi1h0mf7k13araxf5m4wi5v9xdgqxvipjzqfy"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/xpad/default.nix b/pkgs/applications/misc/xpad/default.nix index 8588f0fb2fe..5db4a250839 100644 --- a/pkgs/applications/misc/xpad/default.nix +++ b/pkgs/applications/misc/xpad/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "xpad-${version}"; - version = "5.3.0"; + version = "5.4.0"; src = fetchurl { url = "https://launchpad.net/xpad/trunk/${version}/+download/xpad-${version}.tar.bz2"; - sha256 = "0gv9indihr2kbv9iqdqq4mfj6l6qgzwc06jm08gmg10f262sni34"; + sha256 = "1qpmlwn0bcw1q73ag0l0fdnlzmwawfvsy4g9y5b0vyrc58lcp5d3"; }; nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix index 8843c821ffb..d1fa28318d0 100644 --- a/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/pkgs/applications/misc/yubioath-desktop/default.nix @@ -1,41 +1,56 @@ -{ stdenv, fetchurl, python27Packages, pcsclite, yubikey-personalization }: +{ stdenv, fetchurl, fetchFromGitHub +, qmake, qtbase, qtquickcontrols, qtsvg +, python3, pyotherside, ncurses +, pcsclite, yubikey-personalization +, yubikey-manager, makeWrapper }: -python27Packages.buildPythonApplication rec { - namePrefix = ""; - name = "yubioath-desktop-${version}"; - version = "3.1.0"; +stdenv.mkDerivation rec { + pname = "yubioath-desktop"; + version = "4.3.4"; - src = fetchurl { - url = "https://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-${version}.tar.gz"; - sha256 = "0jfvllgh88g2vwd8sg6willlnn2hq05nd9d3xmv98lhl7gyy1akw"; - }; + src = fetchurl { + url = "https://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-${version}.tar.gz"; + sha256 = "0hb7j71032sigs8zd5r8yr0m59sjkb24vhs2l4jarpvj8q7hv30d"; + }; - doCheck = false; + doCheck = false; - buildInputs = [ stdenv ]; + buildInputs = [ stdenv qtbase qtquickcontrols pyotherside python3 ]; - propagatedBuildInputs = [ python27Packages.pycrypto python27Packages.click python27Packages.pyscard python27Packages.pyside ]; + nativeBuildInputs = [ qmake makeWrapper python3.pkgs.wrapPython ]; - # Need LD_PRELOAD for libykpers as the Nix cpython disables ctypes.cdll.LoadLibrary - # support that the yubicommon library uses to load libykpers - makeWrapperArgs = ''--prefix LD_LIBRARY_PATH : "${stdenv.lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" --prefix LD_PRELOAD : "${yubikey-personalization}/lib/libykpers-1.so"''; + postPatch = '' + substituteInPlace deployment.pri \ + --replace '/usr/bin' "$out/bin" + ''; + + pythonPath = [ yubikey-manager ]; + + # Need LD_PRELOAD for libykpers as the Nix cpython disables ctypes.cdll.LoadLibrary + # support that the yubicommon library uses to load libykpers + + postInstall = '' + buildPythonPath "$out $pythonPath" + wrapProgram $out/bin/yubioath-desktop \ + --prefix PYTHONPATH : "$program_PYTHONPATH" \ + --prefix LD_PRELOAD : "${yubikey-personalization}/lib/libykpers-1.so" \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" - postInstall = '' mkdir -p $out/share/applications - cp resources/yubioath.desktop $out/share/applications/yubioath.desktop + cp resources/yubioath-desktop.desktop \ + $out/share/applications/yubioath-desktop.desktop mkdir -p $out/share/yubioath/icons - cp resources/yubioath*.{icns,ico,png,xpm} $out/share/yubioath/icons - substituteInPlace $out/share/applications/yubioath.desktop \ - --replace 'Exec=yubioath-gui' "Exec=$out/bin/yubioath-gui" \ - --replace 'Icon=yubioath' "Icon=$out/share/yubioath/icons" - - ''; + cp resources/icons/*.{icns,ico,png,xpm} $out/share/yubioath/icons + substituteInPlace $out/share/applications/yubioath-desktop.desktop \ + --replace 'Exec=yubioath-desktop' "Exec=$out/bin/yubioath-desktop" \ + ''; - meta = { - description = "Yubikey Desktop Authenticator"; + meta = with stdenv.lib; { + description = "Yubikey Desktop Authenticator"; - homepage = https://www.yubico.com/support/knowledge-base/categories/articles/yubico-authenticator-download/; + homepage = https://www.yubico.com/support/knowledge-base/categories/articles/yubico-authenticator-download/; - license = stdenv.lib.licenses.gpl3; - }; + license = stdenv.lib.licenses.gpl3; + maintainers = with maintainers; [ mic92 ]; + }; } diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 38bde0bec2f..45fc67e9d0c 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -76,11 +76,11 @@ let rpath = lib.makeLibraryPath [ in stdenv.mkDerivation rec { pname = "brave"; - version = "0.58.18"; + version = "0.58.21"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "0xybcgsxjmd8bxi4x4midzw71s23j8icpspqf5sadskhldvshzr3"; + sha256 = "0mml8zjpm8gjw3krppr57y4p10ky975v0s4wyyx7ixr1lzk2qp11"; }; dontConfigure = true; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 1a9df69fa59..d39585ce8b4 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.13.1"; + version = "1.13.2"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "048ckirz7v1djari6l9ddkcd9i4yafcv57wk131dv0cs2zady9va"; + sha256 = "1j5yyzn3c481ba6bbyx6gsa41zhg3x35sdbajlnxmbnid0g21g8g"; }; buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 9dd9a0d3334..4bd92d56c29 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -56,11 +56,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.19.0"; + version = "1.20.0"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "19a585mylbwrxd2m75hgp77ys1r350xkvawq2ysp0cxzr04l46z7"; + sha256 = "1w75g7i7hf9b3yilnd6ivhd4xgp4z000x9wnrqcba2dgbr5pz7c7"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix index 7a78527c501..5ffae90f195 100644 --- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -8,7 +8,7 @@ with stdenv.lib; let bits = "x86_64"; - version = "4.5.9"; + version = "4.5.10"; desktopItem = makeDesktopItem rec { name = "Wavebox"; @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { name = "wavebox-${version}"; src = fetchurl { url = "https://github.com/wavebox/waveboxapp/releases/download/v${version}/${tarball}"; - sha256 = "158kj7r5p4p3xk5pwzvbd51h543panmgkr64knv418ksyqjdi16g"; + sha256 = "0863x3gyzzbm6qs26j821b4iy596cc2h7ppdj6hq5rgr7c01ac9k"; }; # don't remove runtime deps diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 6203ed0a819..85db4d8e32d 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "picard-tools-${version}"; - version = "2.18.21"; + version = "2.18.23"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "0p1na79p0kz1x1nd88100487s4f306p8k4m7dq5r4m2kdsc1dqin"; + sha256 = "13521lcblbcb4vshcrrw6qlqlzvm88grp4vm8d0b3hwbl3rr0py4"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index c689ae98b7a..576c88bc72c 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg , zlib, libGLU_combined, libGLU, xorg }: -let version = "4.0.7"; in +let version = "4.1.0"; in stdenv.mkDerivation { name = "gmsh-${version}"; src = fetchurl { url = "http://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "c6572320d0ffdf7d2488e113861bc4bd9c38a29f7fc5b67957f6fbcb63fbdbd5"; + sha256 = "0k53k6s4hmciakhrb3ka109vk06ckdbyms5ixizijlfh1dvh7iim"; }; buildInputs = [ cmake openblasCompat gmm fltk libjpeg zlib libGLU_combined 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 5c6c22ac9cc..0c5158e550c 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.2.4"; + version = "0.2.5"; repo = "git-secret"; in stdenv.mkDerivation { @@ -11,7 +11,7 @@ in stdenv.mkDerivation { inherit repo; owner = "sobolevn"; rev = "v${version}"; - sha256 = "0lx2rjyhy3xh6ik755lbbl40v7a7ayyqk68jj8mnv42f2vhd66xl"; + sha256 = "1caxdx1ps662vfa79f7l1bwgwgwf974ahzii0hzaqfnkxy45i520"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/data/icons/zafiro-icons/default.nix b/pkgs/data/icons/zafiro-icons/default.nix index 76c829c90c6..8dd76de04b4 100644 --- a/pkgs/data/icons/zafiro-icons/default.nix +++ b/pkgs/data/icons/zafiro-icons/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zafiro-icons"; - version = "0.8.1"; + version = "0.8.3"; src = fetchFromGitHub { owner = "zayronxio"; repo = pname; rev = "v${version}"; - sha256 = "121fpg74vra8kfvgxi3i7p09qxhck45kv270x6cv5dq1fp2hdm8k"; + sha256 = "1hflpnliww5fkk7bsgmi8hlrbqvkijjjmbzjqnnl991nqsqxqxpl"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index 7db869dc3b4..d2792304016 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -1,4 +1,4 @@ -{ stdenv, meson, ninja, gettext, fetchurl, evince, gjs +{ stdenv, meson, ninja, gettext, fetchurl, fetchpatch, evince, gjs , pkgconfig, gtk3, glib, tracker, tracker-miners , itstool, libxslt, webkitgtk, libgdata , gnome-desktop, libzapojit, libgepub @@ -31,6 +31,14 @@ stdenv.mkDerivation rec { gnome-desktop libzapojit libgepub ]; + patches = [ + # fix RPATH to libgd + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-documents/commit/d18a92e0a940073ac766f609937539e4fc6cdbb7.patch"; + sha256 = "0s3mk8vrl1gzk93yvgqbnz44i27qw1d9yvvmnck3fv23phrxkzk9"; + }) + ]; + postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py diff --git a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix index 7b88204c5ea..1f902dc9c80 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix @@ -1,16 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gobject-introspection, wrapGAppsHook, gjs, glib, gtk3, gdk_pixbuf, gst_all_1, gnome3 }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gobject-introspection, wrapGAppsHook, gjs, glib, gtk3, gdk_pixbuf, gst_all_1, gnome3 }: -let +stdenv.mkDerivation rec { pname = "gnome-sound-recorder"; - version = "3.28.1"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "3.28.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0y0srj1hvr1waa35p6dj1r1mlgcsscc0i99jni50ijp4zb36fjqy"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1k63xr3d16qbzi88md913ndaf2mzwmhmi6hipj0123sm7nsz1p94"; }; + patches = [ + # Fix crash when trying to play recordings + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gnome-sound-recorder/commit/2b311ef67909bc20d0e87f334fe37bf5c4e9f29f.patch; + sha256 = "0hqmk846bxma0p66cqp94zd02zc1if836ywjq3sv5dsfwnz7jv3f"; + }) + ]; + nativeBuildInputs = [ pkgconfig intltool gobject-introspection wrapGAppsHook ]; buildInputs = [ gjs glib gtk3 gdk_pixbuf ] ++ (with gst_all_1; [ gstreamer.dev gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]); diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index 679974f28f9..5b6281869cc 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -25,6 +25,15 @@ in stdenv.mkDerivation rec { patchShebangs meson_post_install.py ''; + preFixup = '' + gappsWrapperArgs+=( + # Thumbnailers + --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share" + --prefix XDG_DATA_DIRS : "${librsvg}/share" + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + ) + ''; + passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index 5efd50a006b..d244dc08ebe 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "evolution-data-server-${version}"; - version = "3.30.3"; + version = "3.30.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1q1wpsc3p6b1cacwgkgqbni7rdx3skvb2fm6fyjs2wjgq6zi5753"; + sha256 = "1j8lwl04zz59sg7k3hpkzp829z8xyd1isz8xavm9vzxfvw5w776y"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index 4d708de4304..c76ba218c9a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gnome-settings-daemon-${version}"; - version = "3.30.1.2"; + version = "3.30.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "079dh609rvpwfyzg4m898q8km9g7x04hg18rwwb1izj1dr7zdp2w"; + sha256 = "0c663csa3gnsr6wm0xfll6aani45snkdj7zjwjfzcwfh8w4a3z12"; }; patches = [ diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 757300f3479..27bee9ae231 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -39,7 +39,7 @@ core-packages: # Hack: The following package is a core package of GHCJS. If we don't declare # it, then hackage2nix will generate a Hackage database where all dependants - # of this library are maked as "broken". + # of this library are marked as "broken". - ghcjs-base-0 default-package-overrides: diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index ba66404062b..15536c6370a 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -10,6 +10,7 @@ , disableDocs ? false , CoreFoundation , gsettings-desktop-schemas +, wrapGAppsHook }: let @@ -59,7 +60,9 @@ stdenv.mkDerivation rec { (stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation") ]; - buildInputs = [ fontconfig libffi libtool makeWrapper sqlite gsettings-desktop-schemas gtk3 ] + nativeBuildInputs = [ wrapGAppsHook ]; + + buildInputs = [ fontconfig libffi libtool sqlite gsettings-desktop-schemas gtk3 ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ]; preConfigure = '' @@ -69,6 +72,8 @@ stdenv.mkDerivation rec { done mkdir src/build cd src/build + + gappsWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" $LD_LIBRARY_PATH) ''; shared = if stdenv.isDarwin then "dylib" else "shared"; @@ -80,13 +85,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; - postInstall = '' - for p in $(ls $out/bin/) ; do - wrapProgram $out/bin/$p \ - --prefix LD_LIBRARY_PATH ":" "${LD_LIBRARY_PATH}" \ - --prefix XDG_DATA_DIRS ":" "$GSETTINGS_SCHEMAS_PATH"; - done - ''; meta = with stdenv.lib; { description = "A programmable programming language"; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index b789d89c66b..b006cb40387 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: stdenv.mkDerivation rec { - version = "9.200.6"; + version = "9.200.7"; name = "armadillo-${version}"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "1gm8dysb29f3p96bzjgdb5r70dc6y5jq1avg18sdixz0hgnxqq14"; + sha256 = "1y3xrchykwddlrnzgf7xjdmbkf6c4gayz92vyrqdyvnlpi07sy72"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index b8f105fdaf5..102e7bfcc12 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "box2d-${version}"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { url = "https://github.com/erincatto/Box2D/archive/v${version}.tar.gz"; - sha256 = "1dmbswh4x2n5l3c9h0k72m0z4rdpzfy1xl8m8p3rf5rwkvk3bkg2"; + sha256 = "0llpcifl8zbjbpxdwz87drd01m3lwnv82xb4av6kca1xn4w2gmkm"; }; sourceRoot = "Box2D-${version}/Box2D"; diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index d9bf5bd2220..c02633d880c 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "capstone-${version}"; - version = "4.0"; + version = "4.0.1"; src = fetchurl { url = "https://github.com/aquynh/capstone/archive/${version}.tar.gz"; - sha256 = "0yp6y5m3v674i2pq6s804ikvz43gzgsjwq1maqhmj3b730b4dii6"; + sha256 = "1isxw2qwy1fi3m3w7igsr5klzczxc5cxndz0a78dfss6ps6ymfvr"; }; configurePhase = '' patchShebangs make.sh ''; diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index 780b00f9d9a..d1ba18739e9 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gtkd-${version}"; - version = "3.8.4"; + version = "3.8.5"; src = fetchzip { url = "https://gtkd.org/Downloads/sources/GtkD-${version}.zip"; - sha256 = "0q2kf1jwr89i8ajjzyf3b4bbla33djvnwrvljq17y206q7qknfyz"; + sha256 = "12n2njsaplra7x15nqwrj2hrf8a27pfjj2mck4mkzxv03qk6mqky"; stripRoot = false; }; diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix index 8af2a7aa368..bb621a3eda6 100644 --- a/pkgs/development/libraries/netcdf-fortran/default.nix +++ b/pkgs/development/libraries/netcdf-fortran/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, netcdf, hdf5, curl, gfortran }: stdenv.mkDerivation rec { name = "netcdf-fortran-${version}"; - version = "4.4.4"; + version = "4.4.5"; src = fetchurl { url = "https://github.com/Unidata/netcdf-fortran/archive/v${version}.tar.gz"; - sha256 = "0rwybszj1jjb25cx8vfyrd77x5qsdjzwspcjz56n12br89n9ica4"; + sha256 = "00qwg4v250yg8kxp68srrnvfbfim241fnlm071p9ila2mihk8r01"; }; buildInputs = [ netcdf hdf5 curl gfortran ]; diff --git a/pkgs/development/libraries/pyotherside/default.nix b/pkgs/development/libraries/pyotherside/default.nix new file mode 100644 index 00000000000..0c2d4fa2b28 --- /dev/null +++ b/pkgs/development/libraries/pyotherside/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub +, python3, qmake, qtbase, qtquickcontrols, qtsvg, ncurses }: + +stdenv.mkDerivation rec { + pname = "pyotherside"; + version = "1.5.3"; + + src = fetchFromGitHub { + owner = "thp"; + repo = "pyotherside"; + rev = version; + sha256 = "1xaw1aarj8gpgpm4z3lk8klbssadrsf3xdyzqx10zcwy16amka7k"; + }; + + nativeBuildInputs = [ qmake ]; + buildInputs = [ + python3 qtbase qtquickcontrols qtsvg ncurses + ]; + + patches = [ ./qml-path.patch ]; + installTargets = [ "sub-src-install_subtargets" ]; + + meta = with stdenv.lib; { + description = "Asynchronous Python 3 Bindings for Qt 5"; + homepage = https://thp.io/2011/pyotherside/; + license = licenses.isc; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/pkgs/development/libraries/pyotherside/qml-path.patch b/pkgs/development/libraries/pyotherside/qml-path.patch new file mode 100644 index 00000000000..9f720890997 --- /dev/null +++ b/pkgs/development/libraries/pyotherside/qml-path.patch @@ -0,0 +1,12 @@ +diff -Naur --strip-trailing-cr source.org/src/src.pro source/src/src.pro +--- source.org/src/src.pro 1970-01-01 01:00:01.000000000 +0100 ++++ source/src/src.pro 2019-01-17 19:14:46.256821852 +0000 +@@ -10,7 +10,7 @@ + CONFIG += qt plugin + QT += qml quick svg + +-target.path = $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH ++target.path = $$NIX_OUTPUT_QML/$$PLUGIN_IMPORT_PATH + INSTALLS += target + + qmldir.files += $$_PRO_FILE_PWD_/qmldir $$_PRO_FILE_PWD_/pyotherside.qmltypes diff --git a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix index f9b8cdc8cf0..7c1fa449ebb 100644 --- a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix +++ b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix @@ -1,10 +1,10 @@ -{ qtModule, lib, python2, qtbase, qtsvg, qtxmlpatterns }: +{ qtModule, lib, python2, qtbase, qtsvg }: with lib; qtModule { name = "qtdeclarative"; - qtInputs = [ qtbase qtsvg qtxmlpatterns ]; + qtInputs = [ qtbase qtsvg ]; nativeBuildInputs = [ python2 ]; outputs = [ "out" "dev" "bin" ]; preConfigure = '' diff --git a/pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix b/pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix index ee8ef617fc8..7ac922421f0 100644 --- a/pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix +++ b/pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix @@ -1,7 +1,7 @@ -{ qtModule, qtbase }: +{ qtModule, qtbase, qtdeclarative }: qtModule { name = "qtxmlpatterns"; - qtInputs = [ qtbase ]; + qtInputs = [ qtbase qtdeclarative ]; devTools = [ "bin/xmlpatterns" "bin/xmlpatternsvalidator" ]; } diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix index a44c7ac6568..a87e0c616fd 100644 --- a/pkgs/development/perl-modules/generic/default.nix +++ b/pkgs/development/perl-modules/generic/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation ( PERL_USE_UNSAFE_INC = "1"; meta.homepage = "https://metacpan.org/release/${(builtins.parseDrvName name).name}"; + meta.platforms = perl.meta.platforms; } attrs ) diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index e023c721b0e..0544819570c 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -4,14 +4,14 @@ , pytest, requests }: buildPythonPackage rec { - version = "2.1.3"; + version = "2.2.0"; pname = "beancount"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "4b7b0d3633c82ca88d3cb3d31ad2fd2e45a42401cfa94eaa1cb938ffece34f22"; + sha256 = "1j3fyyqnr5gq71rmkb9q3im8pqppa134zzhmmp4hk4b274g18w31"; }; # No tests in archive diff --git a/pkgs/development/python-modules/cfgv/default.nix b/pkgs/development/python-modules/cfgv/default.nix index 2212486978d..181d4e79b10 100644 --- a/pkgs/development/python-modules/cfgv/default.nix +++ b/pkgs/development/python-modules/cfgv/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cfgv"; - version = "1.1.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "1akm5xdbi5kckgnhhfj6qavjwakm44cwqzhfx2ycgh7mkym1qyfi"; + sha256 = "01mpw8kx0f2py2jwf0fv60k01p11gs0dbar5zq42k4z38xf0bn9r"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 019ab4e6cdd..81c38acfca3 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchPypi, buildPythonPackage, pythonOlder, isPy3k -, pyperclip, six, pyparsing, vim, wcwidth, colorama +, pyperclip, six, pyparsing, vim, wcwidth, colorama, attrs , contextlib2 ? null, typing ? null, setuptools_scm , pytest, mock ? null, pytest-mock , which, glibcLocales @@ -36,6 +36,7 @@ buildPythonPackage rec { six pyparsing wcwidth + attrs ] ++ stdenv.lib.optionals (pythonOlder "3.5") [contextlib2 typing] ; diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix index 99f8d19b350..672704249dc 100644 --- a/pkgs/development/python-modules/irc/default.nix +++ b/pkgs/development/python-modules/irc/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi +{ buildPythonPackage, fetchPypi, isPy3k , six, jaraco_logging, jaraco_text, jaraco_stream, pytz, jaraco_itertools , setuptools_scm }: @@ -6,6 +6,8 @@ buildPythonPackage rec { pname = "irc"; version = "17.0"; + disabled = !isPy3k; + src = fetchPypi { inherit pname version; sha256 = "f9c5fcb72dd230e1387fd4a0114a1935605e0f59ac09dec962313baed74e1365"; diff --git a/pkgs/development/python-modules/jaraco_logging/default.nix b/pkgs/development/python-modules/jaraco_logging/default.nix index 2aeb0dc3fa4..68fba6bfb5f 100644 --- a/pkgs/development/python-modules/jaraco_logging/default.nix +++ b/pkgs/development/python-modules/jaraco_logging/default.nix @@ -1,14 +1,26 @@ -{ buildPythonPackage, fetchPypi, setuptools_scm -, tempora, six }: +{ lib, buildPythonPackage, fetchPypi, setuptools_scm +, tempora, six, pytest, pytest-flake8 }: buildPythonPackage rec { pname = "jaraco.logging"; - version = "1.5.2"; + version = "2.0"; + src = fetchPypi { inherit pname version; - sha256 = "199pgwx9ziab3gxg6p0c24z8dp3bjpsvvshnmlph9zjsssq0xc93"; + sha256 = "1lb846j7qs1hgqwkyifv51nhl3f8jimbc4lk8yn9nkaynw0vyzcg"; }; - doCheck = false; + buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ tempora six ]; + checkInputs = [ pytest pytest-flake8 ]; + + checkPhase = '' + PYTHONPATH=".:$PYTHONPATH" pytest + ''; + + meta = with lib; { + description = "Support for Python logging facility"; + homepage = https://github.com/jaraco/jaraco.logging; + license = licenses.mit; + }; } diff --git a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix index 5e6d6ceab9b..4697fb0c113 100644 --- a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix +++ b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "jsonrpclib-pelix"; - version = "0.3.2"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "14d288d1b3d3273cf96a729dd21a2470851c4962be8509f3dd62f0137ff90339"; + sha256 = "1pimyq95w99ik5av96j0n9i6n12mr9kk0y28jnrq0555d7hmii8r"; }; doCheck = false; # test_suite="tests" in setup.py but no tests in pypi. diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 7fdf5c83901..fd841563005 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -297,13 +297,16 @@ in buildInputs = [ rainbow_rake ]; }; - rbnacl = spec: { - postInstall = '' - sed -i $(cat $out/nix-support/gem-meta/install-path)/lib/rbnacl.rb -e "2a \ - RBNACL_LIBSODIUM_GEM_LIB_PATH = '${libsodium.out}/lib/libsodium${stdenv.hostPlatform.extensions.sharedLibrary}' - " - ''; - }; + rbnacl = spec: + if lib.versionOlder spec.version "6.0.0" then { + postInstall = '' + sed -i $(cat $out/nix-support/gem-meta/install-path)/lib/rbnacl.rb -e "2a \ + RBNACL_LIBSODIUM_GEM_LIB_PATH = '${libsodium.out}/lib/libsodium${stdenv.hostPlatform.extensions.sharedLibrary}' + " + ''; + } else { + buildInputs = [ libsodium ]; + }; re2 = attrs: { buildInputs = [ re2 ]; diff --git a/pkgs/development/tools/analysis/brakeman/default.nix b/pkgs/development/tools/analysis/brakeman/default.nix index 542f53473c1..9c850c7606c 100644 --- a/pkgs/development/tools/analysis/brakeman/default.nix +++ b/pkgs/development/tools/analysis/brakeman/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "brakeman"; - version = "4.3.1"; - source.sha256 = "1y4i4vw7hawypvgg04s544fqx52ml67h9zxsaqm8w5hvxmb20wkh"; + version = "4.4.0"; + source.sha256 = "1fg37qknz1f10v4fgbn1s98gks0iimsgs1c8xra2jy16kpz4q86k"; meta = with lib; { description = "Static analysis security scanner for Ruby on Rails"; diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index 671498eec7c..8f3622e186c 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -2,7 +2,7 @@ let baseName = "bloop"; - version = "1.2.1"; + version = "1.2.3"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -16,14 +16,14 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1hr9d9fzp1vd60iqxbn316vzgayhsx9cffl1jclmdycqv0yzgfx3"; + outputHash = "0d0q4rzz21afzfclm3sjp940wk7p8cllbxsidr6rg3r1qqhzawlr"; }; in stdenv.mkDerivation rec { name = "${baseName}-${version}"; # Fetched from https://github.com/scalacenter/bloop/releases/download/v${version}/install.py - nailgunCommit = "933f482b"; + nailgunCommit = "0c325237"; buildInputs = [ jdk makeWrapper deps ]; diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index 530e80f4fae..1a9d83c1294 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -37,7 +37,7 @@ }: let - version = "1.0.1"; + version = "1.0.2"; in stdenv.mkDerivation rec { name = "flatpak-builder-${version}"; @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz"; - sha256 = "01p3j8ndk9bimnqibw3dyny0ysv6nw2f7z5im19s9jlhlzdqb48w"; + sha256 = "0z5aaw9zvgp26szbysa3059gqsivq5ah8b6l29mqxx6ryp1nhrc1"; }; nativeBuildInputs = [ diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix index 20921a61b8c..2cfddd1066b 100644 --- a/pkgs/games/0ad/data.nix +++ b/pkgs/games/0ad/data.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"; - sha256 = "1b6qcvd8yyyxavgdwpcs7asmln3xgnvjkglz6ggvwb956x37ggzx"; + sha256 = "04x7729hk6zw1xj3n4s4lvaviijsnbjf5rhzvjxlr5fygvg4l6z1"; }; installPhase = '' diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index 29513c88418..74bc52875d2 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -10,11 +10,11 @@ assert withEditor -> wxGTK != null; stdenv.mkDerivation rec { name = "0ad-${version}"; - version = "0.0.23"; + version = "0.0.23b"; src = fetchurl { url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-build.tar.xz"; - sha256 = "0qz1sg4n5y766qwgi63drrrx6k17kk0rcnn9a4a9crllk2vf78fg"; + sha256 = "0draa53xg69i5qhqym85658m45xhwkbiimaldj4sr3703rjgggq1"; }; nativeBuildInputs = [ python2 perl pkgconfig ]; diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index b428c1c0bf7..bfacdd4a2f4 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "android-udev-rules-${version}"; - version = "20181031"; + version = "20190114"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "175js0vimv6b92cxl0sc4ihdj1k8yq3jrpbjy0zsvrm2367z7xqp"; + sha256 = "1x3vaq8jpnfhxc2lzz5jnlz219w66sn151v5fkdgv68pya4nzhjj"; }; installPhase = '' diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix index 739342b77fd..5d002bf72ea 100644 --- a/pkgs/os-specific/linux/atop/default.nix +++ b/pkgs/os-specific/linux/atop/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, zlib, ncurses}: stdenv.mkDerivation rec { - version = "2.3.0"; + version = "2.4.0"; name = "atop-${version}"; src = fetchurl { url = "https://www.atoptool.nl/download/atop-${version}.tar.gz"; - sha256 = "0r5j9q89wpylmg0px5xymxi3jpihw9wq8bh37g3ciymsw1fp5r3k"; + sha256 = "0s9xlxlzz688a80zxld840zkrmzw998rdkkg6yc7ssq8fw50275y"; }; buildInputs = [zlib ncurses]; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 9d48ee01509..07bfc080864 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -158,7 +158,7 @@ in { # to be adapted zfsStable = common { # comment/uncomment if breaking kernel versions are known - # incompatibleKernelVersion = "4.19"; + incompatibleKernelVersion = "4.20"; # this package should point to the latest release. version = "0.7.12"; diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix index cc7493f9533..1ef624f2a41 100644 --- a/pkgs/servers/ftp/vsftpd/default.nix +++ b/pkgs/servers/ftp/vsftpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, sslEnable ? false, libcap, pam }: +{ stdenv, fetchurl, libcap, openssl, pam }: stdenv.mkDerivation rec { name = "vsftpd-3.0.3"; @@ -8,44 +8,29 @@ stdenv.mkDerivation rec { sha256 = "1xsyjn68k3fgm2incpb3lz2nikffl9by2safp994i272wvv2nkcx"; }; + buildInputs = [ libcap openssl pam ]; + patches = [ ./CVE-2015-1419.patch ]; - preConfigure = stdenv.lib.optionalString sslEnable '' - echo "Will enable SSL" + postPatch = '' sed -i "/VSF_BUILD_SSL/s/^#undef/#define/" builddefs.h - ''; - - # The gcc-wrappers use -idirafter for glibc, and vsftpd also, and - # their dummyinc come before those of glibc, then the build works bad. - prePatch = '' - sed -i -e 's/-idirafter.*//' Makefile - ''; - preBuild = - let - sslLibs = if sslEnable then "-lcrypt -lssl -lcrypto" else ""; - in '' - makeFlagsArray=( "LIBS=${sslLibs} -lpam -lcap -fstack-protector" ) - ''; + substituteInPlace Makefile \ + --replace -dirafter "" \ + --replace /usr $out \ + --replace /etc $out/etc - # It won't link without this flag, used in CFLAGS - - buildInputs = [ openssl libcap pam ]; - - installPhase = '' - mkdir -pv $out/sbin - install -v -m 755 vsftpd $out/sbin/vsftpd + mkdir -p $out/sbin $out/man/man{5,8} + ''; - mkdir -pv $out/share/man/man{5,8} - install -v -m 644 vsftpd.8 $out/share/man/man8/vsftpd.8 - install -v -m 644 vsftpd.conf.5 $out/share/man/man5/vsftpd.conf.5 + NIX_LDFLAGS = "-lcrypt -lssl -lcrypto -lpam -lcap"; - mkdir -pv $out/etc/xinetd.d - install -v -m 644 xinetd.d/vsftpd $out/etc/xinetd.d/vsftpd - ''; + enableParallelBuilding = true; - meta = { - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; + meta = with stdenv.lib; { + description = "A very secure FTP daemon"; + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.linux; }; } diff --git a/pkgs/servers/home-assistant/dont-import-platformio-esptool.patch b/pkgs/servers/home-assistant/dont-import-platformio-esptool.patch new file mode 100644 index 00000000000..21918764436 --- /dev/null +++ b/pkgs/servers/home-assistant/dont-import-platformio-esptool.patch @@ -0,0 +1,119 @@ +diff --git a/esphomeyaml/__main__.py b/esphomeyaml/__main__.py +index 26f42c1..529d2e0 100644 +--- a/esphomeyaml/__main__.py ++++ b/esphomeyaml/__main__.py +@@ -167,13 +167,10 @@ def compile_program(args, config): + + + def upload_using_esptool(config, port): +- import esptool +- + path = os.path.join(CORE.build_path, '.pioenvs', CORE.name, 'firmware.bin') +- cmd = ['esptool.py', '--before', 'default_reset', '--after', 'hard_reset', ++ cmd = ['@esptool@/bin/esptool.py', '--before', 'default_reset', '--after', 'hard_reset', + '--chip', 'esp8266', '--port', port, 'write_flash', '0x0', path] +- # pylint: disable=protected-access +- return run_external_command(esptool._main, *cmd) ++ return run_external_command(*cmd) + + + def upload_program(config, args, host): +diff --git a/esphomeyaml/platformio_api.py b/esphomeyaml/platformio_api.py +index df29491..f991701 100644 +--- a/esphomeyaml/platformio_api.py ++++ b/esphomeyaml/platformio_api.py +@@ -13,12 +13,9 @@ _LOGGER = logging.getLogger(__name__) + + + def run_platformio_cli(*args, **kwargs): +- import platformio.__main__ +- + os.environ["PLATFORMIO_FORCE_COLOR"] = "true" +- cmd = ['platformio'] + list(args) +- return run_external_command(platformio.__main__.main, +- *cmd, **kwargs) ++ cmd = ['@platformio@/bin/platformio'] + list(args) ++ return run_external_command(*cmd, **kwargs) + + + def run_platformio_cli_run(config, verbose, *args, **kwargs): +diff --git a/esphomeyaml/util.py b/esphomeyaml/util.py +index eebb4b7..9e9e58f 100644 +--- a/esphomeyaml/util.py ++++ b/esphomeyaml/util.py +@@ -4,6 +4,7 @@ import io + import logging + import re + import sys ++import subprocess + + _LOGGER = logging.getLogger(__name__) + +@@ -79,42 +80,25 @@ class RedirectText(object): + return True + + +-def run_external_command(func, *cmd, **kwargs): +- def mock_exit(return_code): +- raise SystemExit(return_code) +- +- orig_argv = sys.argv +- orig_exit = sys.exit # mock sys.exit ++def run_external_command(*cmd, **kwargs): + full_cmd = u' '.join(shlex_quote(x) for x in cmd) + _LOGGER.info(u"Running: %s", full_cmd) + +- orig_stdout = sys.stdout +- sys.stdout = RedirectText(sys.stdout) +- orig_stderr = sys.stderr +- sys.stderr = RedirectText(sys.stderr) +- + capture_stdout = kwargs.get('capture_stdout', False) + if capture_stdout: +- cap_stdout = sys.stdout = io.BytesIO() ++ cap_stdout = io.BytesIO() ++ else: ++ cap_stdout = sys.stdout + + try: +- sys.argv = list(cmd) +- sys.exit = mock_exit +- return func() or 0 +- except KeyboardInterrupt: +- return 1 +- except SystemExit as err: +- return err.args[0] ++ completed_process = subprocess.run(cmd, ++ stdout=RedirectText(cap_stdout), ++ stderr=RedirectText(sys.stderr)) ++ return completed_process.returncode + except Exception as err: # pylint: disable=broad-except + _LOGGER.error(u"Running command failed: %s", err) + _LOGGER.error(u"Please try running %s locally.", full_cmd) + finally: +- sys.argv = orig_argv +- sys.exit = orig_exit +- +- sys.stdout = orig_stdout +- sys.stderr = orig_stderr +- + if capture_stdout: + # pylint: disable=lost-exception + return cap_stdout.getvalue() +diff --git a/setup.py b/setup.py +index 78a5378..8ce80de 100755 +--- a/setup.py ++++ b/setup.py +@@ -23,12 +23,10 @@ DOWNLOAD_URL = '{}/archive/{}.zip'.format(GITHUB_URL, const.__version__) + + REQUIRES = [ + 'voluptuous>=0.11.1', +- 'platformio>=3.5.3', + 'pyyaml>=3.12', + 'paho-mqtt>=1.3.1', + 'colorlog>=3.1.2', + 'tornado>=5.0.0', +- 'esptool>=2.3.1', + 'typing>=3.0.0', + 'protobuf>=3.4', + 'tzlocal>=1.4', diff --git a/pkgs/servers/home-assistant/esphome.nix b/pkgs/servers/home-assistant/esphome.nix new file mode 100644 index 00000000000..e089c83239b --- /dev/null +++ b/pkgs/servers/home-assistant/esphome.nix @@ -0,0 +1,43 @@ +{ lib, python3, fetchpatch, substituteAll, platformio, esptool }: + +python3.pkgs.buildPythonApplication rec { + pname = "esphomeyaml"; + version = "1.10.1"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "426cd545b4e9505ce5b4f5c63d2d54cb038f93fe3ba9d4d56b6b6431b222485d"; + }; + + patches = [ + (substituteAll { + src = ./dont-import-platformio-esptool.patch; + inherit platformio esptool; + }) + ]; + + postPatch = '' + # typing is part of the standard library since Python 3.5 + substituteInPlace setup.py --replace "'typing>=3.0.0'," "" + ''; + + propagatedBuildInputs = with python3.pkgs; [ + voluptuous pyyaml paho-mqtt colorlog + tornado protobuf tzlocal pyserial + ]; + + checkPhase = '' + $out/bin/esphomeyaml tests/test1.yaml compile + $out/bin/esphomeyaml tests/test2.yaml compile + ''; + + # Platformio will try to access the network + doCheck = false; + + meta = with lib; { + description = "Make creating custom firmwares for ESP32/ESP8266 super easy"; + homepage = https://esphomelib.com/esphomeyaml; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/servers/zoneminder/default-to-http-1dot1.patch b/pkgs/servers/zoneminder/default-to-http-1dot1.patch new file mode 100644 index 00000000000..abd7ffccbb5 --- /dev/null +++ b/pkgs/servers/zoneminder/default-to-http-1dot1.patch @@ -0,0 +1,13 @@ +diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in +index fa7b86079..c9d3c6f6c 100644 +--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in ++++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in +@@ -877,7 +877,7 @@ our @options = ( + }, + { + name => 'ZM_HTTP_VERSION', +- default => '1.0', ++ default => '1.1', + description => 'The version of HTTP that ZoneMinder will use to connect', + help => q` + ZoneMinder can communicate with network cameras using either of diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix new file mode 100644 index 00000000000..d9fd7d27ee5 --- /dev/null +++ b/pkgs/servers/zoneminder/default.nix @@ -0,0 +1,192 @@ +{ stdenv, lib, fetchFromGitHub, fetchurl, cmake, makeWrapper, pkgconfig +, curl, ffmpeg, glib, libjpeg, libselinux, libsepol, mp4v2, mysql, nettools, pcre, perl, perlPackages +, polkit, utillinuxMinimal, x264, zlib +, avahi, dbus, gettext, git, gnutar, gzip, bzip2, libiconv, openssl, python +, coreutils, procps, psmisc }: + +# NOTES: +# +# 1. ZM_CONFIG_DIR is set to $out/etc/zoneminder as the .conf file distributed +# by upstream contains defaults and is not supposed to be edited so it is fine +# to keep it read-only. +# +# 2. ZM_CONFIG_SUBDIR is where we place our configuration from the NixOS module +# but as the installer will try to put files there, we patch Config.pm after the +# install. +# +# 3. ZoneMinder is run with -T passed to the perl interpreter which makes perl +# ignore PERL5LIB. We therefore have to do the substitution into -I parameters +# ourselves which results in ugly wrappers. +# +# 4. The makefile for the perl modules needs patching to put things into the +# right place. That also means we have to not run "make install" for them. +# +# 5. In principal the various ZM_xx variables should be overridable from the +# config file but some of them are baked into the perl scripts, so we *have* to +# set them here instead of in the configuration in the NixOS module. +# +# 6. I am no PolicyKit expert but the .policy file looks fishy: +# a. The user needs to be known at build-time so we should probably throw +# upstream's policy file away and generate it from the NixOS module +# b. I *think* we may have to substitute the store paths with +# /run/current-system/sw/bin paths for it to work. +# +# 7. we manually fix up the perl paths in the scripts as fixupPhase will only +# handle pkexec and not perl if both are present. +# +# 8. There are several perl modules needed at runtime which are not checked when +# building so if a new version stops working, check if there is a missing +# dependency by running the failing component manually. +# +# 9. Parts of the web UI has a hardcoded /zm path so we create a symlink to work +# around it. + +let + modules = [ + { + path = "web/api/app/Plugin/Crud"; + src = fetchFromGitHub { + owner = "ZoneMinder"; + repo = "crud"; + rev = "3.1.0-zm"; + sha256 = "061avzyml7mla4hlx057fm8a9yjh6m6qslgyzn74cv5p2y7f463l"; + }; + } + { + path = "web/api/app/Plugin/CakePHP-Enum-Behavior"; + src = fetchFromGitHub { + owner = "ZoneMinder"; + repo = "CakePHP-Enum-Behavior"; + rev = "1.0-zm"; + sha256 = "0zsi6s8xymb183kx3szspbrwfjqcgga7786zqvydy6hc8c909cgx"; + }; + } + ]; + + addons = [ + { + path = "scripts/ZoneMinder/lib/ZoneMinder/Control/Xiaomi.pm"; + src = fetchurl { + url = "https://gist.githubusercontent.com/joshstrange/73a2f24dfaf5cd5b470024096ce2680f/raw/e964270c5cdbf95e5b7f214f7f0fc6113791530e/Xiaomi.pm"; + sha256 = "04n1ap8fx66xfl9q9rypj48pzbgzikq0gisfsfm8wdsmflarz43v"; + }; + } + ]; + + user = "zoneminder"; + dirName = "zoneminder"; + perlBin = "${perl}/bin/perl"; + +in stdenv.mkDerivation rec { + name = "zoneminder-${version}"; + version = "1.32.3"; + + src = fetchFromGitHub { + owner = "ZoneMinder"; + repo = "zoneminder"; + rev = version; + sha256 = "1sx2fn99861zh0gp8g53ynr1q6yfmymxamn82y54jqj6nv475njz"; + }; + + patches = [ + ./default-to-http-1dot1.patch + ]; + + postPatch = '' + ${lib.concatStringsSep "\n" (map (e: '' + rm -rf ${e.path}/* + cp -r ${e.src}/* ${e.path}/ + '') modules)} + + rm -rf web/api/lib/Cake/Test + + ${lib.concatStringsSep "\n" (map (e: '' + cp ${e.src} ${e.path} + '') addons)} + + for d in scripts/ZoneMinder onvif/{modules,proxy} ; do + substituteInPlace $d/CMakeLists.txt \ + --replace 'DESTDIR="''${CMAKE_CURRENT_BINARY_DIR}/output"' "PREFIX=$out INSTALLDIRS=site" + sed -i '/^install/d' $d/CMakeLists.txt + done + + substituteInPlace misc/CMakeLists.txt \ + --replace '"''${PC_POLKIT_PREFIX}/''${CMAKE_INSTALL_DATAROOTDIR}' "\"$out/share" + + for f in misc/*.policy.in \ + scripts/*.pl* \ + scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in ; do + substituteInPlace $f \ + --replace '/usr/bin/perl' '${perlBin}' \ + --replace '/bin:/usr/bin' "$out/bin:${lib.makeBinPath [ coreutils procps psmisc ]}" + done + + substituteInPlace scripts/zmdbbackup.in \ + --replace /usr/bin/mysqldump ${mysql}/bin/mysqldump + + for f in scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in \ + scripts/zmupdate.pl.in \ + src/zm_config.h.in \ + web/api/app/Config/bootstrap.php.in \ + web/includes/config.php.in ; do + substituteInPlace $f --replace @ZM_CONFIG_SUBDIR@ /etc/zoneminder + done + + for f in includes/Event.php views/image.php skins/classic/views/image-ffmpeg.php ; do + substituteInPlace web/$f \ + --replace "'ffmpeg " "'${ffmpeg}/bin/ffmpeg " + done + ''; + + buildInputs = [ + curl ffmpeg glib libjpeg libselinux libsepol mp4v2 mysql pcre perl polkit x264 zlib + utillinuxMinimal # for libmount + ] ++ (with perlPackages; [ + DateManip DBI DBDmysql LWP SysMmap + # runtime dependencies not checked at build-time + JSONMaybeXS LWPProtocolHttps NumberBytesHuman SysCPU SysMemInfo TimeDate + ]); + + nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; + + enableParallelBuilding = true; + + cmakeFlags = [ + "-DWITH_SYSTEMD=ON" + "-DZM_LOGDIR=/var/log/${dirName}" + "-DZM_RUNDIR=/run/${dirName}" + "-DZM_SOCKDIR=/run/${dirName}" + "-DZM_TMPDIR=/tmp/${dirName}" + "-DZM_CONFIG_DIR=${placeholder "out"}/etc/zoneminder" + "-DZM_WEB_USER=${user}" + "-DZM_WEB_GROUP=${user}" + ]; + + passthru = { inherit dirName; }; + + postInstall = '' + PERL5LIB="$PERL5LIB''${PERL5LIB:+:}$out/${perl.libPrefix}" + + perlFlags="-wT" + for i in $(IFS=$'\n'; echo $PERL5LIB | tr ':' "\n" | sort -u); do + perlFlags="$perlFlags -I$i" + done + + for f in $out/bin/*.pl ; do + mv $f $out/libexec/ + makeWrapper ${perlBin} $f \ + --prefix PATH : $out/bin \ + --add-flags "$perlFlags $out/libexec/$(basename $f)" + done + + ln -s $out/share/zoneminder/www $out/share/zoneminder/www/zm + ''; + + meta = with stdenv.lib; { + description = "Video surveillance software system"; + homepage = https://zoneminder.com; + license = licenses.gpl3; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index e2e1980dad9..956f688bb0a 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl, autoPatchelfHook }: + +with lib; let - version = "0.16.7"; + version = "0.16.11"; # switch the dropdown to “manual” on https://pulumi.io/quickstart/install.html # TODO: update script pulumiArchPackage = { "x86_64-linux" = { url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-linux-x64.tar.gz"; - sha256 = "1l1cn8pk05vl7vpmhny9rlz1hj0iqclqjj1r2q12qip7f4qkgsfw"; + sha256 = "176nwqp1dd8vdpl4qajaq2w458f8pgavwvwd93lgnccqw3cznv75"; }; "x86_64-darwin" = { url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-darwin-x64.tar.gz"; - sha256 = "0p07jvgy0xl524fgb5d9wijxa91isv4h4mcn9qghycqj90yqnjhx"; + sha256 = "1mkz9bkkvpvbpzfnvwpx4892zd05bvjz5rbfwhwzm3wzfcjjs16i"; }; }; @@ -27,7 +29,9 @@ in stdenv.mkDerivation rec { cp * $out/bin/ ''; - meta = with stdenv.lib; { + buildInputs = optionals stdenv.isLinux [ autoPatchelfHook ]; + + meta = { homepage = https://pulumi.io/; description = "Pulumi is a cloud development platform that makes creating cloud programs easy and productive"; license = with licenses; [ asl20 ]; diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index e80eee2db3a..df07c291e26 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -1,17 +1,16 @@ -{ pythonPackages, fetchurl, lib, +{ python3Packages, fetchurl, lib, yubikey-personalization, libu2f-host, libusb1 }: -pythonPackages.buildPythonPackage rec { - name = "yubikey-manager-1.0.1"; +python3Packages.buildPythonPackage rec { + name = "yubikey-manager-2.0.0"; srcs = fetchurl { url = "https://developers.yubico.com/yubikey-manager/Releases/${name}.tar.gz"; - sha256 = "0i7w1f89hqlw7g800fjhbb6yvq9wjmj5d7w7p6v8bkyvk645v48z"; + sha256 = "1x36pyg9g3by2pa11j6d73d79sdlb7qy98lwwn05f43fjm74qnz9"; }; propagatedBuildInputs = - with pythonPackages; - lib.optional (!pythonPackages.pythonAtLeast "3.4") enum34 ++ [ + with python3Packages; [ click cryptography pyscard @@ -44,6 +43,6 @@ pythonPackages.buildPythonPackage rec { license = licenses.bsd2; platforms = platforms.unix; - maintainers = with maintainers; [ benley ]; + maintainers = with maintainers; [ benley mic92 ]; }; } diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix index 3e9210d5b35..234b40e0386 100644 --- a/pkgs/tools/system/bfs/default.nix +++ b/pkgs/tools/system/bfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "bfs-${version}"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { repo = "bfs"; owner = "tavianator"; rev = version; - sha256 = "0gv9hrcsz7miv40v6wmkmb1a58ji5d1dlgwq6gwczd8rzlmhddmc"; + sha256 = "0cyylqmq31if93zz0l1fnm454dsmcx34j4c2r0xprcggihdxbwk5"; }; buildInputs = stdenv.lib.optionals stdenv.isLinux [ libcap acl ]; diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index dc2e330e013..ba7d1a336a0 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "vale-${version}"; - version = "1.2.6"; + version = "1.3.0"; goPackagePath = "github.com/errata-ai/vale"; @@ -10,14 +10,14 @@ buildGoPackage rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "1mhynasikncwz9dkk9z27qvwk03j7q0vx0wjnqg69pd97lgrp7zp"; + sha256 = "1yfrn27z3ifdlvalgrnhdrkhxkh09xpyv681sr01wc2hxq6v3hqn"; }; - goDeps = ./deps.nix; + doCheck = true; meta = with stdenv.lib; { homepage = https://errata-ai.github.io/vale/; - description = "Vale is an open source linter for prose"; + description = "A syntax-aware linter for prose built with speed and extensibility in mind"; license = licenses.mit; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/tools/text/vale/deps.nix b/pkgs/tools/text/vale/deps.nix deleted file mode 100644 index c19af2cd4f0..00000000000 --- a/pkgs/tools/text/vale/deps.nix +++ /dev/null @@ -1,246 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/ValeLint/gospell"; - fetch = { - type = "git"; - url = "https://github.com/ValeLint/gospell"; - rev = "90dfc71015dfebd3a7274f1ad2756c1dbf09e250"; - sha256 = "0i2ha76q2xja8r4j72kqiarnylrbk4l1b29632skgzib6k4fh4g1"; - }; - } - { - goPackagePath = "github.com/client9/gospell"; - fetch = { - type = "git"; - url = "https://github.com/client9/gospell"; - rev = "90dfc71015dfebd3a7274f1ad2756c1dbf09e250"; - sha256 = "0i2ha76q2xja8r4j72kqiarnylrbk4l1b29632skgzib6k4fh4g1"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "570b54cabe6b8eb0bc2dfce68d964677d63b5260"; - sha256 = "1hw9hgkfzbzqjhy29pqpk20xggxaqjv45wx8yn69488mw5ph7khh"; - }; - } - { - goPackagePath = "github.com/gobwas/glob"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/glob"; - rev = "bea32b9cd2d6f55753d94a28e959b13f0244797a"; - sha256 = "0dx0f293v1a0d8qi7ik5hdl26dapd8xm0hj9a9gc620vhj7khi9q"; - }; - } - { - goPackagePath = "github.com/jdkato/prose"; - fetch = { - type = "git"; - url = "https://github.com/jdkato/prose"; - rev = "4d68d1b77f66e36b6897a79f59f434d558e5e0c2"; - sha256 = "1g2wwj6azpcjy6j7pk4dqx868v3hrqwjg5d737p4441a55026prj"; - }; - } - { - goPackagePath = "github.com/jdkato/regexp"; - fetch = { - type = "git"; - url = "https://github.com/jdkato/regexp"; - rev = "38ab2f7842bf2a539528aa7d0014b37421b886e1"; - sha256 = "11z21z2h2l8vlh4nwkcn7vbfdcmdjk9sc90kn8ji1923i3s7p3bw"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "941b50ebc6efddf4c41c8e4537a5f68a4e686b24"; - sha256 = "0dw492z5w0fzv1cxm3xx26n8qpqjaf2ybiwpmvimzyhv65n8nrf8"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "fc9e8d8ef48496124e79ae0df75490096eccf6fe"; - sha256 = "1r5f9gkavkb1w6sr0qs5kj16706xirl3qnlq3hqpszkw9w27x65a"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "9e777a8366cce605130a531d2cd6363d07ad7317"; - sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "b8bc1bf767474819792c23f32d8286a45736f1c6"; - sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "d0303fe809921458f417bcf828397a65db30a7e4"; - sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8"; - }; - } - { - goPackagePath = "github.com/montanaflynn/stats"; - fetch = { - type = "git"; - url = "https://github.com/montanaflynn/stats"; - rev = "eeaced052adbcfeea372c749c281099ed7fdaa38"; - sha256 = "0kamcla633692n81w0j0d423ws3qdds97r2c0i193ypsh9xknpq9"; - }; - } - { - goPackagePath = "github.com/olekukonko/tablewriter"; - fetch = { - type = "git"; - url = "https://github.com/olekukonko/tablewriter"; - rev = "be5337e7b39e64e5f91445ce7e721888dbab7387"; - sha256 = "04zg261i4bq29bc460nyx9r2j70mj0sbxlprn87ylk8y5j2m1d1w"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/remeh/sizedwaitgroup"; - fetch = { - type = "git"; - url = "https://github.com/remeh/sizedwaitgroup"; - rev = "4b44541c93591ee0e73747d6081e61bd8c58b5c7"; - sha256 = "1kz7h8r09c95r3hc8bngznc4lrnkz2vm50lrl96cqxja0pw8jl92"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "0b647d0506a698cca42caca173e55559b12a69f2"; - sha256 = "1bv6mvnrqrcrp5d45l5p07q855sval8l3jzw1cf2dajkpcpysqln"; - }; - } - { - goPackagePath = "github.com/shogo82148/go-shuffle"; - fetch = { - type = "git"; - url = "https://github.com/shogo82148/go-shuffle"; - rev = "4789c7c401f229b3ae1673acbccca451480660cd"; - sha256 = "1gaii1h51df8vr28ww5np8nhvfcy4plv0nja9b9h0cmcxa3jf1lp"; - }; - } - { - goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "541ff5ee47f1dddf6a5281af78307d921524bcb5"; - sha256 = "1fslblamqkd0yrvl1kbq95hnnji78bq9m33nnxiqs7y9w32zylv5"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "69483b4bd14f5845b5a1e55bca19e954e827f1d0"; - sha256 = "11lzrwkdzdd8yyag92akncc008h2f9d1bpc489mxiwp0jrmz4ivb"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "0bdeddeeb0f650497d603c4ad7b20cfe685682f6"; - sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg"; - }; - } - { - goPackagePath = "github.com/xrash/smetrics"; - fetch = { - type = "git"; - url = "https://github.com/xrash/smetrics"; - rev = "a3153f7040e90324c58c6287535e26a0ac5c1cc1"; - sha256 = "1phq5y6mcg741spq7snc6xsky1ybc7fllh2444sfr3p41sjq9hg6"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "ab5485076ff3407ad2d02db054635913f017b0ed"; - sha256 = "10805rk5rfgc3ivx35r9qmnps8hy3k3m57g0j6mz10w96k8i7pk7"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "14ac33bf8474b62c65cae263af2e4d3b543cc699"; - sha256 = "1453l5v5kizq142fiq3bg5hka7b0yvnf9fsq8y2ayj4bc9h5vqf3"; - }; - } - { - goPackagePath = "gopkg.in/ini.v1"; - fetch = { - type = "git"; - url = "https://github.com/go-ini/ini"; - rev = "d3de07a94d22b4a0972deb4b96d790c2c0ce8333"; - sha256 = "1lpwqhcfhaa6aighd2lpjfswbb6aw5d5bsmyr0vqaqg6g5kz0ikg"; - }; - } - { - goPackagePath = "gopkg.in/neurosnap/sentences.v1"; - fetch = { - type = "git"; - url = "https://github.com/neurosnap/sentences"; - rev = "a7f18ead1433a139742a8b42ce7a059cfb484d60"; - sha256 = "1b64xv5anfbnq6354jaygxapwgkdhbszzi604b96sm682brwl0p7"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "25c4ec802a7d637f88d584ab26798e94ad14c13b"; - sha256 = "053mknsl3xhjscmd552005xnwbfcg0z2iphvbvj3wi0w3pvmlw44"; - }; - } -] \ No newline at end of file diff --git a/pkgs/tools/video/bento4/default.nix b/pkgs/tools/video/bento4/default.nix index d1c6f310df9..4f5a348b144 100644 --- a/pkgs/tools/video/bento4/default.nix +++ b/pkgs/tools/video/bento4/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { name = "bento4-${version}"; - version = "1.5.1-627"; + version = "1.5.1-628"; src = fetchFromGitHub { owner = "axiomatic-systems"; repo = "Bento4"; rev = "v${version}"; - sha256 = "1nczv7vqgjryzdn9vkxz93awd7zyj5kwiz8llbb25nnqnqgfq170"; + sha256 = "1fv0k7f3ifwa0c0x22wblm6i8x9zbc13pg047a9i74n456p0mzp3"; }; patches = [ ./libap4.patch ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1f9ec2461c..25c0457c247 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1379,6 +1379,8 @@ in eschalot = callPackage ../tools/security/eschalot { }; + esphome = callPackage ../servers/home-assistant/esphome.nix { }; + esptool = callPackage ../tools/misc/esptool { }; esptool-ck = callPackage ../tools/misc/esptool-ck { }; @@ -12096,6 +12098,8 @@ in qtxmlpatterns = qt59.qtxmlpatterns; }; + pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside {}; + re2 = callPackage ../development/libraries/re2 { }; qbs = libsForQt5.callPackage ../development/tools/build-managers/qbs { }; @@ -13115,7 +13119,7 @@ in yojimbo = callPackage ../development/libraries/yojimbo { }; - yubioath-desktop = callPackage ../applications/misc/yubioath-desktop { }; + yubioath-desktop = libsForQt5.callPackage ../applications/misc/yubioath-desktop { }; yubico-piv-tool = callPackage ../tools/misc/yubico-piv-tool { }; @@ -23096,6 +23100,8 @@ in callPackage ../applications/networking/znc/modules.nix { } ); + zoneminder = callPackage ../servers/zoneminder { }; + zsnes = pkgsi686Linux.callPackage ../misc/emulators/zsnes { }; xcpc = callPackage ../misc/emulators/xcpc { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4885b243900..24ff673b8fa 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -64,7 +64,6 @@ let homepage = http://betterthangrep.com/; license = licenses.artistic2; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; }; # tests fails on nixos and hydra because of different purity issues doCheck = false; @@ -107,10 +106,6 @@ let sha256 = "1kqn13wd0lfjrf6h19b9kgdqqwp7k2d9yfq5i0wvii0xi8jqh1lw"; }; propagatedBuildInputs = [ AlgorithmDiff ]; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; }; AlienBuild = buildPerlPackage { @@ -342,8 +337,6 @@ let homepage = https://github.com/rjbs/App-Cmd; description = "Write command line apps with less suffering"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.all; }; }; @@ -381,7 +374,6 @@ let homepage = https://github.com/miyagawa/cpanminus; description = "Get, unpack, build and install modules from CPAN"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.all; }; }; @@ -519,7 +511,6 @@ let description = "Module for manipulations of cpio archives"; # See https://rt.cpan.org/Public/Bug/Display.html?id=43597#txn-569710 license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.linux; }; }; @@ -735,8 +726,6 @@ let homepage = http://www.aarontrevena.co.uk/opensource/autodia/; license = stdenv.lib.licenses.gpl2Plus; - - maintainers = [ ]; }; buildInputs = [ DBI ]; }; @@ -804,8 +793,6 @@ let meta = { description = "Wrap OP check callbacks"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -829,10 +816,6 @@ let sha256 = "09m96p8c0ipgz42li2ywdgy0vxb57mb5nf59j9gw7yzc3xkslv9w"; }; propagatedBuildInputs = [ CarpClan ]; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; }; BKeywords = buildPerlPackage rec { @@ -989,10 +972,6 @@ let sha256 = "1aa2mjn5767b13063nnsrwcikrnbspby7j1c5q007bzaq0gcbcri"; }; propagatedBuildInputs = [ StringCRC32 ]; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; }; CacheMemcachedFast = buildPerlPackage { @@ -1004,8 +983,6 @@ let meta = { description = "Perl client for B<memcached>, in C language"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -1017,10 +994,6 @@ let }; propagatedBuildInputs = [ DBFile FileNFSLock HeapFibonacci IOString TimeDate ]; doCheck = false; # can time out - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; }; CacheSimpleTimedExpiry = buildPerlPackage { @@ -1088,10 +1061,6 @@ let sha256 = "14j3lk6fhfzda5d3d7z6f373ng3fzxazzwpjyziysrhic1v3b4mq"; }; propagatedBuildInputs = [ HTMLTiny LWP ]; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; }; CaptureTiny = buildPerlPackage rec { @@ -1193,8 +1162,6 @@ let meta = { description = "HTTP Basic and Digest authentication"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -1218,7 +1185,6 @@ let meta = { description = "A storage class for Catalyst Authentication using DBIx::Class"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.linux; }; buildInputs = [ TestWarn ]; }; @@ -1277,7 +1243,6 @@ let homepage = http://dev.catalyst.perl.org/; description = "Catalyst Development Tools"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.all; }; }; @@ -1317,7 +1282,6 @@ let meta = { description = "DBIx::Class::Schema Model Class"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.linux; }; }; @@ -1333,7 +1297,6 @@ let homepage = http://dev.catalyst.perl.org/; description = "The Catalyst Framework Runtime"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.all; }; }; @@ -1385,7 +1348,6 @@ let meta = { description = "Role based authorization for Catalyst based on Catalyst::Plugin::Authentication"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.linux; }; }; @@ -1400,8 +1362,6 @@ let meta = { description = "Flexible caching support for Catalyst"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -1416,8 +1376,6 @@ let meta = { description = "HTTP/1.1 cache validators for Catalyst"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -1430,7 +1388,6 @@ let propagatedBuildInputs = [ CatalystPluginSession GDSecurityImage ]; meta = { description = "Create and validate Captcha for Catalyst"; - platforms = stdenv.lib.platforms.linux; }; }; @@ -1515,9 +1472,6 @@ let sha256 = "1rvxbfnpf9x2pc2zgpazlcgdlr2dijmxgmcs0m5nazs0w6xikssb"; }; propagatedBuildInputs = [ CatalystPluginSession ]; - meta = { - platforms = stdenv.lib.platforms.linux; - }; }; CatalystPluginSessionStoreFastMmap = buildPerlPackage rec { @@ -1527,9 +1481,6 @@ let sha256 = "0x3j6zv3wr41jlwr6yb2jpmcx019ibyn11y8653ffnwhpzbpzsxs"; }; propagatedBuildInputs = [ CacheFastMmap CatalystPluginSession ]; - meta = { - platforms = stdenv.lib.platforms.linux; - }; }; CatalystPluginSessionStoreFile = buildPerlPackage rec { @@ -1555,7 +1506,6 @@ let meta = { description = "Display a stack trace on the debug screen"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.linux; }; }; @@ -1609,7 +1559,6 @@ let buildInputs = [ CatalystRuntime TestLongString TestSimple13 TestWWWMechanize TestWWWMechanizeCatalyst TextCSV XMLSimple ]; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.linux; }; }; @@ -1624,7 +1573,6 @@ let meta = { description = "JSON view for your data"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.linux; }; }; @@ -1638,7 +1586,6 @@ let meta = { description = "Template View Class"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.linux; }; }; @@ -1671,7 +1618,6 @@ let meta = { description = "Replace request base with value passed by HTTP proxy"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.linux; }; }; @@ -1690,7 +1636,6 @@ let meta = { description = "Replace the development server with Starman"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.linux; }; }; @@ -1703,7 +1648,6 @@ let meta = { description = "Get the CDDB info for an audio cd"; license = stdenv.lib.licenses.artistic1; - platforms = stdenv.lib.platforms.linux; maintainers = [ maintainers.endgame ]; }; }; @@ -1768,8 +1712,6 @@ let }; meta = { description = "Convert flat hash to nested data using TT2's dot convention"; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; buildInputs = [ TestException ]; }; @@ -2645,10 +2587,6 @@ let sha256 = "1s8gxfg4xqp543aqanv5lbp64vqqyw6ic4x3fm4imkk1h3amjb6d"; }; propagatedBuildInputs = [ SymbolUtil ]; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; }; curry = buildPerlPackage rec { @@ -2963,8 +2901,6 @@ let meta = { description = "Get weak or strong random data from pluggable sources"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -3028,7 +2964,6 @@ let meta = with stdenv.lib; { description = "Perl wrapper around OpenSSL's AES library"; license = with licenses; [ artistic1 gpl1Plus ]; - platforms = platforms.unix; }; }; @@ -3137,7 +3072,6 @@ let propagatedBuildInputs = [ URI ]; meta = { description = "Compact many CSS files into one big file"; - license = "unknown"; }; }; @@ -3204,8 +3138,6 @@ let meta = { description = "Polymorphic data cloning"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -3307,7 +3239,7 @@ let }; meta = { description = "Hexadecimal Dumper"; - maintainers = with stdenv.lib.maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres ]; }; }; @@ -3515,8 +3447,6 @@ let meta = { description = "Fast random UUID generator using the Mersenne Twister algorithm"; license = stdenv.lib.licenses.asl20; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -3579,10 +3509,6 @@ let }; propagatedBuildInputs = [ BitVector ]; doCheck = false; # some of the checks rely on the year being <2015 - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; }; DateExtract = buildPerlPackage { @@ -3748,8 +3674,6 @@ let meta = { description = "Parses ISO8601 formats"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -3803,8 +3727,6 @@ let meta = { description = "Parse and format PostgreSQL dates and times"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; buildInputs = [ ModuleBuildTiny ]; }; @@ -4083,7 +4005,6 @@ let homepage = http://dbi.perl.org/; description = "Database independent interface for Perl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.all; }; }; @@ -4193,8 +4114,6 @@ let meta = { description = "Fast, safe DBI connection and transaction management"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.all; }; }; @@ -4205,10 +4124,6 @@ let sha256 = "7a2a978fb6d9feaa3e4b109c71c963b26a008a2d130c5876ecf24c5a72338a1d"; }; propagatedBuildInputs = [ DBI ]; - meta = { - description = "Unknown"; - license = "unknown"; - }; }; DBIxHTMLViewLATEST = buildPerlPackage { @@ -4243,8 +4158,6 @@ let propagatedBuildInputs = [ DBI ]; meta = { description = "Very complete easy-to-use OO interface to DBI"; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -4267,8 +4180,6 @@ let }; meta = { description = "Find memory cycles in objects"; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -4366,10 +4277,6 @@ let sha256 = "01yrsdpn9ns9iwwc92bhjn2605b7ys7i3198gjb935lsllzgzw5f"; }; propagatedBuildInputs = [ ClassTiny SubExporter namespaceclean ]; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; buildInputs = [ TestSimple13 TestWarnings ]; }; @@ -4463,8 +4370,6 @@ let propagatedBuildInputs = [ LWP ]; meta = { description = "Perl extension for getting MD5 sums for files and urls"; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -4926,8 +4831,6 @@ let meta = { description = "Generate world unique message-ids"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -5190,10 +5093,6 @@ let url = mirror://cpan/authors/id/D/DS/DSB/Env-Path-0.19.tar.gz; sha256 = "1qhmj15a66h90pjl2dgnxsb9jj3b1r5mpvnr87cafcl8g69z0jr4"; }; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; }; Error = buildPerlModule rec { @@ -5240,7 +5139,6 @@ let meta = { description = "Lightweight exceptions"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; }; }; @@ -5261,10 +5159,6 @@ let }; buildInputs = [ TestAssert TestUnitLite ]; propagatedBuildInputs = [ ExceptionBase constantboolean ]; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; }; ExceptionWarning = buildPerlModule { @@ -5275,10 +5169,6 @@ let }; buildInputs = [ TestAssert TestUnitLite ]; propagatedBuildInputs = [ ExceptionBase ]; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; }; ExporterDeclare = buildPerlModule { @@ -5293,8 +5183,6 @@ let homepage = http://open-exodus.net/projects/Exporter-Declare; description = "Exporting done right"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -5386,8 +5274,6 @@ let }; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -5541,10 +5427,6 @@ let }; buildInputs = [ ExceptionWarning TestAssert TestUnitLite ]; propagatedBuildInputs = [ ExceptionDied ]; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; }; FCGI = buildPerlPackage rec { @@ -5577,7 +5459,6 @@ let }; meta = { description = "A perl-based FastCGI process manager"; - license = "unknown"; }; }; @@ -5604,8 +5485,6 @@ let homepage = http://open-exodus.net/projects/Fennec-Lite; description = "Minimalist Fennec, the commonly used bits"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -5918,10 +5797,6 @@ let url = mirror://cpan/authors/id/B/BB/BBB/File-NFSLock-1.29.tar.gz; sha256 = "0dzssj15faz9cn1w3xi7jwm64gyjyazapv4bkgglw5l1njcibm31"; }; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; }; FilePath = buildPerlPackage rec { @@ -5959,8 +5834,6 @@ let meta = { description = "Change directory temporarily for a limited scope"; license = stdenv.lib.licenses.asl20; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -5995,8 +5868,6 @@ let homepage = https://github.com/ingydotnet/file-share-pm/tree; description = "Extend File::ShareDir to Local Libraries"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -6023,8 +5894,6 @@ let meta = { description = "Install shared files"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -6065,7 +5934,6 @@ let meta = { description = "Simple and Efficient Reading/Writing/Modifying of Complete Files"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; }; }; @@ -6143,7 +6011,6 @@ let meta = { description = "File::Type uses magic numbers (typically at the start of a file) to determine the MIME type of that file."; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; }; }; @@ -6243,7 +6110,6 @@ let meta = { description = "Extensions and convenience methods to manage background processes"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.linux; }; propagatedBuildInputs = [ URI ]; }; @@ -6498,10 +6364,6 @@ let sha256 = "af53f2d3f63297e046676eae14a76296afdd2910e09723b6b113708622b7989b"; }; buildInputs = [ pkgs.gnupg1orig ]; - meta = { - platforms = stdenv.lib.platforms.linux; - maintainers = with maintainers; [ ]; - }; }; GnuPGInterface = buildPerlPackage rec { @@ -6582,7 +6444,6 @@ let meta = with stdenv.lib; { description = "Perl interface to the GraphViz graphing tool"; license = licenses.artistic2; - maintainers = [ ]; }; }; @@ -6639,7 +6500,6 @@ let homepage = http://gtk2-perl.sourceforge.net/; description = "Perl interface to the 2.x series of the Gimp Toolkit library"; license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; }; }; @@ -6721,10 +6581,6 @@ let url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz"; sha256 = "34c4ddf91fc93d1090d86da14df706d175b1610c67372c01e12ce9555d4dd1dc"; }; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; }; HashDiff = buildPerlPackage rec { @@ -6809,10 +6665,6 @@ let url = mirror://cpan/authors/id/E/ET/ETHER/Hash-Util-FieldHash-Compat-0.11.tar.gz; sha256 = "06vlygjyk7rkkw0di3252mma141w801qn3xk40aa2yskbfklcbk4"; }; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; }; HeapFibonacci = buildPerlPackage { @@ -6821,10 +6673,6 @@ let url = mirror://cpan/authors/id/J/JM/JMM/Heap-0.80.tar.gz; sha256 = "1plv2djbyhvkdcw2ic54rdqb745cwksxckgzvw7ssxiir7rjknnc"; }; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; }; HookLexWrap = buildPerlPackage rec { @@ -6980,8 +6828,6 @@ let propagatedBuildInputs = [ CryptBlowfish CryptCBC DataClone DateTimeFormatStrptime EmailValid HTMLTree JSONMaybeXS MooseXGetopt MooseXTypesCommon MooseXTypesLoadableClass aliased ]; meta = { description = "HTML forms using Moose"; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7072,10 +6918,6 @@ let sha256 = "1qbad8ayffpx7wj76ip05p6rh9p1lkir6qknpl76zy679ghlsp8s"; }; buildInputs = [ TestBase ]; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; }; HTMLScrubber = buildPerlPackage rec { @@ -7174,8 +7016,6 @@ let meta = { description = "Add XPath support to HTML::TreeBuilder"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -7564,8 +7404,6 @@ let homepage = https://github.com/ingydotnet/io-all-pm/tree; description = "IO::All of it to Graham and Damian!"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -7603,7 +7441,6 @@ let meta = { description = "IO Interface to compressed data files/buffers"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.linux; }; # Same as CompressRawZlib doCheck = false && !stdenv.isDarwin; @@ -7783,8 +7620,6 @@ let homepage = https://github.com/rjbs/io-tiecombine; description = "Produce tied (and other) separate but combined variables"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -7832,7 +7667,6 @@ let meta = { description = "System() and background procs w/ piping, redirs, ptys (Unix, Win32)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; propagatedBuildInputs = [ IOTty ]; buildInputs = [ Readonly ]; @@ -7906,7 +7740,6 @@ let license = with licenses; [ gpl1Plus /* or */ artistic2 ]; maintainers = [ maintainers.kiloreux ]; - platforms = platforms.unix; }; }; @@ -7977,8 +7810,6 @@ let ''; license = stdenv.lib.licenses.artistic2; - - maintainers = [ ]; }; }; @@ -8103,9 +7934,6 @@ let sha256 = "0118yrzagwlcfj5yldn3h23zzqs2rx282jlm068nf7fjlvy4m7s7"; }; propagatedBuildInputs = [ TypesSerialiser ]; - meta = { - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - }; buildInputs = [ CanaryStability ]; }; @@ -8166,10 +7994,6 @@ let url = mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.31.tar.gz; sha256 = "1afandrl44mq9c32r57xr489gkfswdgc97h8x86k98dz1byv3l6a"; }; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; }; libnet = buildPerlPackage { @@ -8295,7 +8119,6 @@ let }; meta = { description = "Convert English text to numbers"; - license = "unknown"; }; }; @@ -8436,8 +8259,6 @@ let meta = { description = "Combines List::Util and List::MoreUtils in one bite-sized package"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -8512,10 +8333,6 @@ let url = mirror://cpan/authors/id/P/PE/PEVANS/List-UtilsBy-0.11.tar.gz; sha256 = "0nkpylkqccxanr8wc7j9wg6jdrizybjjd6p8q3jbh7f29cxz9pgs"; }; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; }; LocaleCodes = buildPerlPackage { @@ -8599,9 +8416,6 @@ let propagatedBuildInputs = [ FileSlurp ]; meta = { description = "Perl module for manipulating .po entries from GNU gettext"; - license = "unknown"; - platforms = stdenv.lib.platforms.linux; - maintainers = with maintainers; [ ]; }; }; @@ -8736,8 +8550,6 @@ let meta = { description = "Dispatches messages to one or more outputs"; license = stdenv.lib.licenses.artistic2; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; buildInputs = [ IPCRun3 TestFatal TestNeeds ]; }; @@ -8871,7 +8683,6 @@ let meta = with stdenv.lib; { description = "The World-Wide Web library for Perl"; license = with licenses; [ artistic1 gpl1Plus ]; - platforms = platforms.unix ++ platforms.windows; }; buildInputs = [ TestFatal TestNeeds TestRequiresInternet ]; }; @@ -8927,7 +8738,6 @@ let meta = { description = "Provide https support for LWP::UserAgent"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; }; buildInputs = [ TestRequiresInternet ]; }; @@ -8954,7 +8764,6 @@ let propagatedBuildInputs = [ LWP ]; meta = { description = "A virtual browser that retries errors"; - license = "unknown"; }; }; @@ -8965,10 +8774,6 @@ let sha256 = "0923ahl22c0gdzrihj7dqnrawia9hmcl462asf4ry8d5wd84z1i5"; }; propagatedBuildInputs = [ HookLexWrap LWP SafeIsa ]; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; # Tests require network connectivity # https://rt.cpan.org/Public/Bug/Display.html?id=63966 is the bug upstream, # which doesn't look like it will get fixed anytime soon. @@ -9305,8 +9110,6 @@ let meta = { description = "Perl interface to the ISAAC PRNG algorithm"; license = with stdenv.lib.licenses; [ publicDomain mit artistic2 gpl3 ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -9320,8 +9123,6 @@ let meta = { description = "Auto-seeded Mersenne Twister PRNGs"; license = "unrestricted"; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -9336,8 +9137,6 @@ let meta = { description = "Cryptographically-secure, cross-platform replacement for rand()"; license = stdenv.lib.licenses.artistic2; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -9388,8 +9187,6 @@ let meta = { description = "Tools for creating Meta objects to track custom metrics"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -9403,8 +9200,6 @@ let meta = { description = "Basic method declarations with signatures, without source filters"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -9424,7 +9219,6 @@ let description = "A mail-to-HTML converter"; maintainers = with maintainers; [ lovek323 ]; license = licenses.gpl2; - platforms = platforms.unix; }; }; @@ -9768,8 +9562,6 @@ let meta = { description = "Declare author-only dependencies"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -9783,8 +9575,6 @@ let meta = { description = "Designate tests only run by module authors"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -9927,10 +9717,6 @@ let sha256 = "0g7qs6vqg91xpwg1cdy91m3kh9m1zbkzyz1qsy453b572xdscf0d"; }; buildInputs = [ pkgs.unzip ]; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; }; ModuleVersionsReport = buildPerlPackage { @@ -10060,7 +9846,6 @@ let description = "A postmodern object system for Perl 5"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.eelco ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -10195,8 +9980,6 @@ let meta = { description = "Abstract base classes for Moose"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -10222,8 +10005,6 @@ let homepage = https://github.com/moose/MooseX-App-Cmd; description = "Mashes up MooseX::Getopt and App::Cmd"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.all; }; }; @@ -10372,8 +10153,6 @@ let meta = { description = "Extend your attribute interfaces (deprecated)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -10384,10 +10163,6 @@ let sha256 = "19wd74dihybnz1lbbsqn0clwxzb6y0aa0i25a8zhajz7p5fq5myb"; }; propagatedBuildInputs = [ DataVisitor HashUtilFieldHashCompat namespaceautoclean ]; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; buildInputs = [ ModuleBuildTiny ]; }; @@ -10403,7 +10178,6 @@ let homepage = https://github.com/moose/MooseX-ConfigFromFile; description = "An abstract Moose role for setting attributes from a configfile"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.all; }; }; @@ -10463,8 +10237,6 @@ let homepage = https://github.com/pshangov/moosex-has-options; description = "Succinct options for Moose"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -10617,8 +10389,6 @@ let homepage = https://github.com/moose/MooseX-Runnable; description = "Tag a class as a runnable application"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.all; }; }; @@ -10648,10 +10418,6 @@ let sha256 = "0hb5s1chsgbx2nlb0f112mdh2v1zwww8f4i3gvfvcghx3grv5135"; }; buildInputs = [ ModuleBuildTiny TestFatal TestRequires TestWarnings ]; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; propagatedBuildInputs = [ Moose ]; }; @@ -10763,8 +10529,6 @@ let buildInputs = [ ModuleBuildTiny TestFatal ]; propagatedBuildInputs = [ MooseXTypes ]; meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; homepage = https://github.com/moose/MooseX-Types-LoadableClass; description = "ClassName type constraint with coercion to load the class"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -10797,8 +10561,6 @@ let homepage = https://github.com/karenetheridge/moosex-types-path-tiny; description = "Path::Tiny types and coercions for Moose"; license = stdenv.lib.licenses.asl20; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -10826,8 +10588,6 @@ let homepage = https://github.com/dagolden/moosex-types-stringlike; description = "Moose type constraints for strings or string-like objects"; license = stdenv.lib.licenses.asl20; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -10842,8 +10602,6 @@ let meta = { description = "MooseX::Types::Structured - Structured Type Constraints for Moose"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -10859,8 +10617,6 @@ let homepage = https://github.com/moose/MooseX-Types-URI; description = "URI related types and coercions for Moose"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.all; }; }; @@ -11015,8 +10771,6 @@ let propagatedBuildInputs = [ URI ]; meta = { description = "Perl extension to create signatures for AWS requests"; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -11078,8 +10832,6 @@ let meta = { description = "Manage Amazon S3 policies for HTTP POST forms"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -11095,8 +10847,6 @@ let meta = { description = "Advanced Message Queue Protocol (de)serialization and representation"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -11109,7 +10859,6 @@ let meta = { description = "Manipulate IPv4/IPv6 netblocks in CIDR notation"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.unix; maintainers = [ maintainers.bjornfor ]; }; }; @@ -11122,7 +10871,6 @@ let }; meta = { description = "Perl extension for merging IPv4 or IPv6 CIDR addresses"; - license = "unknown"; }; }; @@ -11138,8 +10886,6 @@ let homepage = https://github.com/metabrainz/CoverArtArchive; description = "Query the coverartarchive.org"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -11283,9 +11029,6 @@ let sha256 = "70835a926e1c5a8d0324c72fffee82eeb7ec6c141dee04fd446820b64f71c552"; }; propagatedBuildInputs = [ NetCIDRLite Socket6 ]; - meta = { - license = "unknown"; - }; }; NetPing = buildPerlPackage { @@ -11497,6 +11240,14 @@ let }; }; + NumberBytesHuman = buildPerlPackage rec { + name = "Number-Bytes-Human-0.11"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FE/FERREIRA/${name}.tar.gz"; + sha256 = "0b3gprpbcrdwc2gqalpys5m2ngilh5injhww8y0gf3dln14rrisz"; + }; + }; + NumberCompare = buildPerlPackage rec { name = "Number-Compare-0.03"; src = fetchurl { @@ -11578,8 +11329,6 @@ let meta = { description = "Comprehensive inside-out object support module"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -11997,8 +11746,6 @@ let meta = { description = "File path utility"; license = stdenv.lib.licenses.asl20; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; preConfigure = '' @@ -12037,7 +11784,6 @@ let description = "Communicate with a smart card using PC/SC"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with maintainers; [ abbradar ]; - platforms = stdenv.lib.platforms.linux; }; }; @@ -12083,8 +11829,7 @@ let description = ''Collection of advanced command-line tools to perform a variety of MySQL and system tasks.''; homepage = http://www.percona.com/software/percona-toolkit; license = with stdenv.lib.licenses; [ gpl2 ]; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ izorkin ]; + maintainers = with maintainers; [ izorkin ]; }; }; @@ -12231,7 +11976,6 @@ let }; meta = { description = "Simple flexible means of converting the output of PHP's serialize() into the equivalent Perl memory structure, and vice versa"; - license = "unknown"; }; }; @@ -13094,7 +12838,6 @@ let homepage = https://github.com/PerlRedis/perl-redis; description = "Perl binding for Redis database"; license = stdenv.lib.licenses.artistic2; - platforms = stdenv.lib.platforms.unix; }; }; @@ -13160,9 +12903,6 @@ let url = mirror://cpan/authors/id/S/SA/SALVA/Regexp-IPv6-0.03.tar.gz; sha256 = "d542d17d75ce93631de8ba2156da0e0b58a755c409cd4a0d27a3873a26712ce2"; }; - meta = { - license = "unknown"; - }; }; RegexpParser = buildPerlPackage { @@ -13202,8 +12942,6 @@ let homepage = http://jaldhar.github.com/REST-Utils; description = "Utility functions for REST applications"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -13282,10 +13020,6 @@ let sha256 = "1fcmp4qp7q3xr2mw7clqqwph45icbvgfs2n41gp9zamim2y39p49"; }; propagatedBuildInputs = [ locallib ]; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; doCheck = false; /* creates files in HOME */ }; @@ -13472,8 +13206,6 @@ let }; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -13532,8 +13264,6 @@ let meta = { description = "Perl's Web Services Toolkit"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; buildInputs = [ TestWarn XMLParserLite ]; }; @@ -13698,9 +13428,6 @@ let }; buildInputs = [ TestException ]; propagatedBuildInputs = [ ClassAccessor ListMoreUtils RegexpCommon SQLTokenizer ]; - meta = { - platforms = stdenv.lib.platforms.linux; - }; }; SQLTokenizer = buildPerlPackage rec { @@ -13722,7 +13449,6 @@ let meta = { description = "SQL DDL transformations and more"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.linux; }; }; @@ -13788,8 +13514,6 @@ let propagatedBuildInputs = [ NumberFormat ]; meta = { license = "open_source"; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -13889,15 +13613,11 @@ let }; StringCRC32 = buildPerlPackage rec { - name = "String-CRC32-1.7"; - src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEEJO/String-CRC32-1.7.tar.gz; - sha256 = "1j1bwbxcgxfbgw708rfrni3spwnnmnf717vq9s64nd63jmc4w5lg"; - }; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; + name = "String-CRC32-1.7"; + src = fetchurl { + url = mirror://cpan/authors/id/L/LE/LEEJO/String-CRC32-1.7.tar.gz; + sha256 = "1j1bwbxcgxfbgw708rfrni3spwnnmnf717vq9s64nd63jmc4w5lg"; + }; }; StringErrf = buildPerlPackage { @@ -13920,10 +13640,6 @@ let url = mirror://cpan/authors/id/E/EV/EVO/String-Escape-2010.002.tar.gz; sha256 = "12ls7f7847i4qcikkp3skwraqvjphjiv2zxfhl5d49326f5myr7x"; }; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; }; StringFlogger = buildPerlPackage rec { @@ -13989,9 +13705,6 @@ let sha256 = "0dfxhr6hxc2majkkrm0qbx3qcbykzpphbj2ms93dc86f7183c1p6"; }; meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - # http://cpansearch.perl.org/src/ROSCH/String-ShellQuote-1.04/README license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -14038,8 +13751,6 @@ let meta = { description = "Use TT to interpolate lexical variables"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -14086,7 +13797,6 @@ let meta = with stdenv.lib; { description = "A Perl module for stripping bits of non-deterministic information"; license = licenses.gpl3; - platforms = platforms.all; maintainers = with maintainers; [ pSub ]; }; }; @@ -14283,10 +13993,6 @@ let url = mirror://cpan/authors/id/D/DE/DEXTER/Symbol-Util-0.0203.tar.gz; sha256 = "0cnwwrd5d6i80f33s7n2ak90rh4s53ss7q57wndrpkpr4bfn3djm"; }; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; }; syntax = buildPerlPackage { @@ -14318,6 +14024,19 @@ let }; }; + SysMmap = buildPerlPackage rec { + name = "Sys-Mmap-0.19"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SW/SWALTERS/${name}.tar.gz"; + sha256 = "1yh0170xfw3z7n3lynffcb6axv7wi6zb46cx03crj1cvrhjmwa89"; + }; + meta = with stdenv.lib; { + description = "Use mmap to map in a file as a Perl variable"; + maintainers = with maintainers; [ peterhoeg ]; + license = with licenses; [ gpl2Plus ]; + }; + }; + SysMemInfo = buildPerlPackage rec { name = "Sys-MemInfo-0.99"; src = fetchurl { @@ -14347,9 +14066,6 @@ let sha256 = "1jv5n8jv48c1p8svjsigyxndv1ygsq8wgwj9c7ypx1vaf3rns679"; }; doCheck = false; # no `hostname' in stdenv - meta = { - platforms = stdenv.lib.platforms.linux; - }; }; SysSigAction = buildPerlPackage { @@ -14386,9 +14102,6 @@ let }; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; - meta = { - platforms = stdenv.lib.platforms.linux; - }; }; TAPParserSourceHandlerpgTAP = buildPerlModule rec { @@ -14400,8 +14113,6 @@ let meta = { description = "Stream TAP from pgTAP test scripts"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.linux; - maintainers = with maintainers; [ ]; }; }; @@ -14490,10 +14201,6 @@ let sha256 = "1hq7jy6zg1iaslsyi05afz0i944y9jnv3nb4krkxjfmzwy5gw106"; }; propagatedBuildInputs = [ TemplateToolkit ]; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; }; TemplatePluginIOAll = buildPerlPackage { @@ -14517,10 +14224,6 @@ let sha256 = "1mqqqs0dhfr6bp1305j9ns05q4pq1n3f561l6p8848k5ml3dh87a"; }; propagatedBuildInputs = [ TemplateToolkit ]; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; }; TemplatePluginJSONEscape = buildPerlPackage { @@ -14530,10 +14233,6 @@ let sha256 = "051a8b1d3bc601d58fc51e246067d36450cfe970278a0456e8ab61940f13cd86"; }; propagatedBuildInputs = [ JSON TemplateToolkit ]; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; }; TemplateTimer = buildPerlPackage { @@ -14768,9 +14467,6 @@ let sha256 = "e1ded85ae3d76b59c03b8697f4a6cb01ae31bd62a9354f5bb7d18f9e927b485f"; }; propagatedBuildInputs = [ TermVT102 ]; - meta = { - license = "unknown"; - }; }; TermAnimation = buildPerlPackage rec { @@ -14835,10 +14531,6 @@ let }; buildInputs = [ ClassInspector TestUnitLite ]; propagatedBuildInputs = [ ExceptionBase constantboolean ]; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; }; TestAssertions = buildPerlPackage rec { @@ -15067,8 +14759,6 @@ let meta = { description = "Check the correct line endings in your project"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -15091,8 +14781,6 @@ let meta = { description = "Add test failures if warnings are caught"; license = stdenv.lib.licenses.asl20; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -15218,10 +14906,6 @@ let sha256 = "1cyp46w3q7dg89qkw31ik2h2a6mdx6pzdz2lmp8m0a61zjr8mh07"; }; propagatedBuildInputs = [ JSONAny ]; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; buildInputs = [ TestDifferences ]; }; @@ -15294,8 +14978,6 @@ let propagatedBuildInputs = [ DevelCycle PadWalker ]; meta = { description = "Verifies code hasn't left circular references"; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -15310,8 +14992,6 @@ let meta = with stdenv.lib; { description = "Simulating other classes"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ ]; - platforms = platforms.unix; }; }; @@ -15336,10 +15016,6 @@ let sha256 = "0pggwrlqj6k44qayhbpjqkzry1r626iy2vf30zlf2jdhbjbvlycz"; }; propagatedBuildInputs = [ SUPER ]; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; buildInputs = [ TestWarnings ]; }; @@ -15453,8 +15129,6 @@ let meta = { description = "Check the presence of tabs in your project"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -15630,8 +15304,6 @@ let homepage = https://github.com/rjbs/Test-Routine; description = "Composable units of assertion"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -15840,8 +15512,6 @@ let meta = { description = "Write tests, not scripts that run them"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -15918,8 +15588,6 @@ let meta = { description = "Unit testing without external dependencies"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -15959,8 +15627,6 @@ let meta = { description = "Test fallback behaviour in absence of modules"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -16001,10 +15667,6 @@ let sha256 = "0bwwdk0iai5dlvvfpja971qpgvmf6yq67iag4z4szl9v5sra0xm5"; }; propagatedBuildInputs = [ WWWMechanizeCGI ]; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; buildInputs = [ TestLongString TestWWWMechanize ]; }; @@ -16029,10 +15691,6 @@ let sha256 = "1wy0488yg15kahfafnlmlhppxik7d0z00wxwj9fszrsq2h6crz6y"; }; propagatedBuildInputs = [ XMLLibXML ]; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; }; TestYAML = buildPerlPackage rec { @@ -16279,8 +15937,6 @@ let meta = { description = "Micro template engine with Perl5 language"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -16413,7 +16069,6 @@ let homepage = http://www.shlomifish.org/open-source/projects/docmake/; description = "Organize Data in Tables"; license = stdenv.lib.licenses.isc; - platforms = stdenv.lib.platforms.linux; }; }; @@ -16431,10 +16086,6 @@ let url = mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.53.tar.gz; sha256 = "ae221cbba2b27967a12bda3f531547e897eb38ae0a92c084607fd5a6a8085bc4"; }; - meta = { - description = "Unknown"; - license = "unknown"; - }; buildInputs = [ TestMoreUTF8 TestWarnings ]; }; @@ -16490,8 +16141,6 @@ let meta = { description = "Remove leading and/or trailing whitespace from strings"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -16503,10 +16152,6 @@ let }; # https://rt.cpan.org/Public/Bug/Display.html?id=124815 NIX_CFLAGS_COMPILE = [ "-DHAS_VPRINTF" ]; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.linux; - }; }; TextUnidecode = buildPerlPackage rec { @@ -16550,10 +16195,6 @@ let sha256 = "0cxbgx879bsskmnhjzamgsa5862ddixyx4yr77lafmwimnaxjg74"; }; propagatedBuildInputs = [ URI ]; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; }; TextWrapI18N = buildPerlPackage { @@ -16794,7 +16435,6 @@ let doCheck = false; meta = { description = "Parse and format time values"; - license = "unknown"; }; }; @@ -16956,9 +16596,6 @@ let url = mirror://cpan/authors/id/B/BR/BRADFITZ/Unicode-CheckUTF8-1.03.tar.gz; sha256 = "97f84daf033eb9b49cd8fe31db221fef035a5c2ee1d757f3122c88cf9762414c"; }; - meta = { - license = "unknown"; - }; }; UnicodeLineBreak = buildPerlPackage rec { @@ -17040,8 +16677,6 @@ let meta = { description = "Build a URI from a set of named parameters"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; buildInputs = [ TestFatal ]; }; @@ -17255,10 +16890,6 @@ let substituteInPlace t/cgi-bin/script.cgi \ --replace '#!/usr/bin/perl' '#!${perl}/bin/perl' ''; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; }; WWWRobotRules = buildPerlPackage { @@ -17578,8 +17209,6 @@ let }; meta = { description = "A re-usable XPath engine for DOM-like trees"; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; }; }; @@ -17664,10 +17293,6 @@ let sha256 = "1xd00821y795fy2rag8aizb5wsbbzfxgmdf9qwpvdxn3pgpyzz85"; }; propagatedBuildInputs = [ XMLParser ]; - meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; }; XMLSimple = buildPerlPackage { |