diff options
Diffstat (limited to 'pkgs')
97 files changed, 1316 insertions, 914 deletions
diff --git a/pkgs/applications/altcoins/clightning.nix b/pkgs/applications/altcoins/clightning.nix index 5f81dc76ecf..481e19c66cd 100644 --- a/pkgs/applications/altcoins/clightning.nix +++ b/pkgs/applications/altcoins/clightning.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "clightning-${version}"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "448022c2433cbf19bbd0f726344b0500c0c21ee5cc2291edf6b622f094cb3a15"; + sha256 = "557be34410f27a8d55d9f31a40717a8f5e99829f2bd114c24e7ca1dd5f6b7d85"; }; enableParallelBuilding = true; @@ -18,15 +18,6 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out) VERSION=v${version}" ]; - patches = [ - # remove after 0.7.0 - (fetchpatch { - name = "fix-0.7.0-build.patch"; - url = "https://github.com/ElementsProject/lightning/commit/ffc03d2bc84dc42f745959fbb6c8007cf0a6f701.patch"; - sha256 = "1m5fiz3m8k3nk09nldii8ij94bg6fqllqgdbiwj3sy12vihs8c4v"; - }) - ]; - configurePhase = '' ./configure --prefix=$out --disable-developer --disable-valgrind ''; diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 91d82d686d0..c0186a146be 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -39,14 +39,14 @@ let pythonInputs = with python2.pkgs; [ python2 lxml ]; in stdenv.mkDerivation rec { - name = "radiotray-ng-${version}"; - version = "0.2.5"; + pname = "radiotray-ng"; + version = "0.2.6"; src = fetchFromGitHub { owner = "ebruck"; repo = "radiotray-ng"; rev = "v${version}"; - sha256 = "1crvpn1mgrv7bd2k683mpgs59785mkrjvmp1f14iyq4qrr0f9zzi"; + sha256 = "0khrfxjas2ldh0kksq7l811srqy16ahjxchvz0hhykx5hykymxlb"; }; nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ]; @@ -64,9 +64,10 @@ stdenv.mkDerivation rec { patches = [ ./no-dl-googletest.patch ]; postPatch = '' - for x in debian/CMakeLists.txt include/radiotray-ng/common.hpp data/*.desktop; do + for x in package/CMakeLists.txt include/radiotray-ng/common.hpp data/*.desktop; do substituteInPlace $x --replace /usr $out done + substituteInPlace package/CMakeLists.txt --replace /etc/xdg/autostart $out/etc/xdg/autostart # We don't find the radiotray-ng-notification icon otherwise substituteInPlace data/radiotray-ng.desktop \ diff --git a/pkgs/applications/audio/radiotray-ng/no-dl-googletest.patch b/pkgs/applications/audio/radiotray-ng/no-dl-googletest.patch index 3578d2d72b0..3aee9751656 100644 --- a/pkgs/applications/audio/radiotray-ng/no-dl-googletest.patch +++ b/pkgs/applications/audio/radiotray-ng/no-dl-googletest.patch @@ -1,4 +1,4 @@ -From 2ce91cd2244e61d54e0c0a3b26851912240b0667 Mon Sep 17 00:00:00 2001 +From b6f7a9e2e0194c6baed63a33b7beff359080b8d9 Mon Sep 17 00:00:00 2001 From: Will Dietz <w@wdtz.org> Date: Sat, 16 Mar 2019 11:40:00 -0500 Subject: [PATCH] don't download googletest @@ -9,7 +9,7 @@ Subject: [PATCH] don't download googletest 2 files changed, 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index fc1b9de..301c266 100644 +index ddba1be..3396705 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,25 +70,7 @@ endif() @@ -51,5 +51,5 @@ index 859c048..58ab5c2 100644 target_include_directories(${target} PRIVATE ${JSONCPP_INCLUDE_DIRS}) gtest_discover_tests(${target}) -- -2.21.GIT +2.22.0 diff --git a/pkgs/applications/editors/jupyter/kernel.nix b/pkgs/applications/editors/jupyter/kernel.nix index 38c61dba751..4a079625d18 100644 --- a/pkgs/applications/editors/jupyter/kernel.nix +++ b/pkgs/applications/editors/jupyter/kernel.nix @@ -37,15 +37,15 @@ in installPhase = '' mkdir kernels - ${concatStringsSep "\n" (mapAttrsToList (kernelName: kernel: + ${concatStringsSep "\n" (mapAttrsToList (kernelName: unfilteredKernel: let - config = builtins.toJSON { - display_name = if (kernel.displayName != "") - then kernel.displayName - else kernelName; - argv = kernel.argv; - language = kernel.language; - }; + allowedKernelKeys = ["argv" "displayName" "language" "interruptMode" "env" "metadata" "logo32" "logo64"]; + kernel = filterAttrs (n: v: (any (x: x == n) allowedKernelKeys)) unfilteredKernel; + config = builtins.toJSON ( + kernel + // {display_name = if (kernel.displayName != "") then kernel.displayName else kernelName;} + // (optionalAttrs (kernel ? interruptMode) { interrupt_mode = kernel.interruptMode; }) + ); logo32 = if (kernel.logo32 != null) then "ln -s ${kernel.logo32} 'kernels/${kernelName}/logo-32x32.png';" diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index c8db515e47d..438292b7683 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,13 +11,13 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - "x86_64-linux" = "02h71b9m9w4nc8g9iy2kafg041brli4zwv7pv6i1qg6p5cf2jdfx"; - "x86_64-darwin" = "1awq0rwiizwbjqf7crv59qr7m7rmgpfba0b4qx2bpx1mn25fmq56"; + "x86_64-linux" = "1ck13xpnfklfc81jd8d5md09fcp0gjypacdqj276mzhr5mig29cd"; + "x86_64-darwin" = "0xpzm372swv0by22saxib16fvvvfjr7d68aj3l5dsl5c9a8v23qj"; }.${system}; in callPackage ./generic.nix rec { - version = "1.36.0"; + version = "1.36.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index f651ee0653d..fbcc6d0c737 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,13 +11,13 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - "x86_64-linux" = "09vmq87az0f91xwyfby85pnn4mg0rlf7pyvs5bkrxv0r8jxxfpq7"; - "x86_64-darwin" = "16yzzmlf3v9aj7dyglqjxdksabv0cc98w6kdv5rbfw865hj4bbck"; + "x86_64-linux" = "1ay4zvkbln2wf2j1d71mn13b6p2fqvzgz45mzrgaqwsszhbg4xzp"; + "x86_64-darwin" = "17r9krb1qd92ybx078hkw9zlyym6kbnmbl91vjdilsq77bkf9jmw"; }.${system}; in callPackage ./generic.nix rec { - version = "1.36.0"; + version = "1.36.1"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/misc/archiver/default.nix b/pkgs/applications/misc/archiver/default.nix index 25fafb604c3..03f534e1a4d 100644 --- a/pkgs/applications/misc/archiver/default.nix +++ b/pkgs/applications/misc/archiver/default.nix @@ -1,26 +1,24 @@ -{ buildGoPackage +{ buildGoModule , fetchFromGitHub , lib }: -buildGoPackage rec { - name = "archiver-${version}"; - version = "3.0.0"; - - goPackagePath = "github.com/mholt/archiver"; +buildGoModule rec { + pname = "archiver"; + version = "3.2.0"; src = fetchFromGitHub { owner = "mholt"; - repo = "archiver"; + repo = pname; rev = "v${version}"; - sha256 = "1wngv51333h907mp6nbzd9dq6r0x06mag2cij92912jcbzy0q8bk"; + sha256 = "1kq2cyhbniwdabk426j493cs8d4nj35vmznm9031rrdd9ln5h9gl"; }; - goDeps = ./deps.nix; + modSha256 = "13vwgqpw7ypq6mrvwmnl8n38x0h89ymryrrzkf7ya478fp00vclj"; meta = with lib; { - description = "Easily create and extract .zip, .tar, .tar.gz, .tar.bz2, .tar.xz, .tar.lz4, .tar.sz, and .rar (extract-only) files with Go"; - homepage = https://github.com/mholt/archiver; + description = "Easily create & extract archives, and compress & decompress files of various formats"; + homepage = "https://github.com/mholt/archiver"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/archiver/deps.nix b/pkgs/applications/misc/archiver/deps.nix deleted file mode 100644 index 4b14fd47711..00000000000 --- a/pkgs/applications/misc/archiver/deps.nix +++ /dev/null @@ -1,56 +0,0 @@ -[ - { - goPackagePath = "github.com/dsnet/compress"; - fetch = { - type = "git"; - url = "https://github.com/dsnet/compress"; - rev = "cc9eb1d7ad760af14e8f918698f745e80377af4f"; - sha256 = "159liclywmyb6zx88ga5gn42hfl4cpk1660zss87fkx31hdq9fgx"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "2e65f85255dbc3072edf28d6b5b8efc472979f5a"; - sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf"; - }; - } - { - goPackagePath = "github.com/nwaples/rardecode"; - fetch = { - type = "git"; - url = "https://github.com/nwaples/rardecode"; - rev = "197ef08ef68c4454ae5970a9c2692d6056ceb8d7"; - sha256 = "0vvijw7va283dbdvnf4bgkn7bjngxqzk1rzdpy8sl343r62bmh4g"; - }; - } - { - goPackagePath = "github.com/pierrec/lz4"; - fetch = { - type = "git"; - url = "https://github.com/pierrec/lz4"; - rev = "623b5a2f4d2a41e411730dcdfbfdaeb5c0c4564e"; - sha256 = "1hhf7vyz5irrqs7ixdmvsvzmy9izv3ha8jbyy0cs486h61nzqkki"; - }; - } - { - goPackagePath = "github.com/ulikunitz/xz"; - fetch = { - type = "git"; - url = "https://github.com/ulikunitz/xz"; - rev = "590df8077fbcb06ad62d7714da06c00e5dd2316d"; - sha256 = "07mivr4aiw3b8qzwajsxyjlpbkf3my4xx23lv0yryc4pciam5lhy"; - }; - } - { - goPackagePath = "github.com/xi2/xz"; - fetch = { - type = "git"; - url = "https://github.com/xi2/xz"; - rev = "48954b6210f8d154cb5f8484d3a3e1f83489309e"; - sha256 = "178r0fa2dpzxf0sabs7dn0c8fa7vs87zlxk6spkn374ls9pir7nq"; - }; - } -] diff --git a/pkgs/applications/misc/cdrtools/default.nix b/pkgs/applications/misc/cdrtools/default.nix index 3738fb83c70..1bbb7d61b01 100644 --- a/pkgs/applications/misc/cdrtools/default.nix +++ b/pkgs/applications/misc/cdrtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, acl, libcap }: +{ stdenv, fetchurl, acl, libcap, Carbon, IOKit }: stdenv.mkDerivation rec { name = "cdrtools-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./fix-paths.patch ]; - buildInputs = [ acl libcap ]; + buildInputs = if stdenv.isDarwin then [ Carbon IOKit ] else [ acl libcap ]; postPatch = '' sed "/\.mk3/d" -i libschily/Targets.man @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = https://sourceforge.net/projects/cdrtools/; description = "Highly portable CD/DVD/BluRay command line recording software"; license = with licenses; [ gpl2 lgpl2 cddl ]; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; # Licensing issues: This package contains code licensed under CDDL, GPL2 # and LGPL2. There is a debate regarding the legality of distributing this # package in binary form. diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 0de055df569..5233aaf8fcd 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, fetchFromGitHub, python3, python3Packages, zbar, secp256k1 +, enableQt ? !stdenv.isDarwin # for updater.nix @@ -14,14 +15,23 @@ }: let - version = "3.3.7"; + version = "3.3.8"; + + libsecp256k1_name = + if stdenv.isLinux then "libsecp256k1.so.0" + else if stdenv.isDarwin then "libsecp256k1.0.dylib" + else "libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}"; + + libzbar_name = + if stdenv.isLinux then "libzbar.so.0" + else "libzbar${stdenv.hostPlatform.extensions.sharedLibrary}"; # Not provided in official source releases, which are what upstream signs. tests = fetchFromGitHub { owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "1g2kbbsi6k105q6s0la20h12gz8dzka5kdcjbdhs12jqsjfx3lr0"; + sha256 = "1di8ba77kgapcys0d7h5nx1qqakv3s60c6sp8skw8p69ramsl73c"; extraPostFetch = '' mv $out ./all @@ -36,7 +46,7 @@ python3Packages.buildPythonApplication rec { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "13ahc4zqpgzmck2r663sqqgz86xsd83r5qqi26mh2vazy1i6pykz"; + sha256 = "1g00cj1pmckd4xis8r032wmraiv3vd3zc803hnyxa2bnhj8z3bg2"; }; postUnpack = '' @@ -56,9 +66,7 @@ python3Packages.buildPythonApplication rec { protobuf pyaes pycryptodomex - pyqt5 pysocks - qdarkstyle qrcode requests tlslite-ng @@ -70,15 +78,20 @@ python3Packages.buildPythonApplication rec { # TODO plugins # amodem - ]; + ] ++ stdenv.lib.optionals enableQt [ pyqt5 qdarkstyle ]; preBuild = '' sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py - sed -i "s|name = 'libzbar.*'|name='${zbar}/lib/libzbar.so'|" electrum/qrscanner.py - substituteInPlace ./electrum/ecc_fast.py --replace libsecp256k1.so.0 ${secp256k1}/lib/libsecp256k1.so.0 - ''; - - postInstall = '' + substituteInPlace ./electrum/ecc_fast.py \ + --replace ${libsecp256k1_name} ${secp256k1}/lib/libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary} + '' + (if enableQt then '' + substituteInPlace ./electrum/qrscanner.py \ + --replace ${libzbar_name} ${zbar}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary} + '' else '' + sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt + ''); + + postInstall = stdenv.lib.optionalString stdenv.isLinux '' # Despite setting usr_share above, these files are installed under # $out/nix ... mv $out/${python3.sitePackages}/nix/store"/"*/share $out @@ -123,6 +136,7 @@ python3Packages.buildPythonApplication rec { ''; homepage = https://electrum.org/; license = licenses.mit; + platforms = platforms.all; maintainers = with maintainers; [ ehmry joachifm np ]; }; } diff --git a/pkgs/applications/misc/mako/default.nix b/pkgs/applications/misc/mako/default.nix index f076a2838eb..32aa15b09e4 100644 --- a/pkgs/applications/misc/mako/default.nix +++ b/pkgs/applications/misc/mako/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, scdoc , systemd, pango, cairo, gdk_pixbuf -, wayland, wayland-protocols }: +, wayland, wayland-protocols +, fetchpatch }: stdenv.mkDerivation rec { pname = "mako"; @@ -13,6 +14,14 @@ stdenv.mkDerivation rec { sha256 = "17azdc37xsbmx13fkfp23vg9lznrv9fh6nhagn64wdq3nhsxm3b6"; }; + # to be removed with next release + patches = [ + (fetchpatch { + url = "https://github.com/emersion/mako/commit/ca8e763f06756136c534b1bbd2e5b536be6b1995.patch"; + sha256 = "09mi7nn2vwc69igxxc6y2m36n3snhsz0ady99yabhrzl17k4ryds"; + }) + ]; + nativeBuildInputs = [ meson ninja pkgconfig scdoc wayland-protocols ]; buildInputs = [ systemd pango cairo gdk_pixbuf wayland ]; diff --git a/pkgs/applications/misc/overmind/default.nix b/pkgs/applications/misc/overmind/default.nix index c1255b6152e..918924df0b9 100644 --- a/pkgs/applications/misc/overmind/default.nix +++ b/pkgs/applications/misc/overmind/default.nix @@ -1,25 +1,25 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, tmux, which, makeWrapper }: +{ lib, buildGoPackage, fetchFromGitHub, tmux, which, makeWrapper }: buildGoPackage rec { - name = "overmind-${version}"; - version = "2.0.1"; + pname = "overmind"; + version = "2.0.2"; goPackagePath = "github.com/DarthSim/overmind"; nativeBuildInputs = [ makeWrapper ]; postInstall = '' - wrapProgram "$bin/bin/overmind" --prefix PATH : "${stdenv.lib.makeBinPath [ tmux which ]}" + wrapProgram "$bin/bin/overmind" --prefix PATH : "${lib.makeBinPath [ tmux which ]}" ''; src = fetchFromGitHub { owner = "DarthSim"; - repo = "overmind"; + repo = pname; rev = "v${version}"; - sha256 = "1j3cpcfgacn5ic19sgrs1djn5jr4d7j7lxaz0vbaf414lrl76qz8"; + sha256 = "0cns19gqkfxsiiyfxhb05cjp1iv2fb40x47gp8djrwwzcd1r6zxh"; }; - meta = with stdenv.lib; { - homepage = https://github.com/DarthSim/overmind; + meta = with lib; { + homepage = "https://github.com/DarthSim/overmind"; description = "Process manager for Procfile-based applications and tmux"; license = with licenses; [ mit ]; maintainers = [ maintainers.adisbladis ]; diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index 98cfb4c6687..30ab053f923 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { name = "zathura-pdf-poppler-${version}"; src = fetchurl { - url = "https://pwmt.org/projects/zathura/plugins/download/${name}.tar.xz"; - sha256 = "1p4jcny0jniygns78mcf0nlm298dszh49qpmjmackrm6dq8hc25y"; + url = "https://git.pwmt.org/pwmt/zathura-pdf-poppler/-/archive/${version}/${name}.tar.gz"; + sha256 = "0c15rnwh42m3ybrhax01bl36w0iynaq8xg6l08riml3cyljypi9l"; }; nativeBuildInputs = [ meson ninja pkgconfig zathura_core ]; diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index f6eb283f76a..eca2bc0d99f 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -100,11 +100,11 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "32.0.0.207"; + version = "32.0.0.223"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "09bbrlnw343ygcibyjfa27r8gjdg1dcxx85d3v4v93wfi29nl789"; + sha256 = "0xm6jcdip4gki267ldw106l5j43im0ji2zjsarvi7n2nvvnwwgnl"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 1c8d60fc709..b4d0b91deac 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -74,7 +74,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "32.0.0.207"; + version = "32.0.0.223"; src = fetchurl { url = @@ -85,14 +85,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "0v5dlqaapr29qyb2pm57yafnmxdxin7shn1xqsx2sc9xwmvmaw7v" + "165zsh4dzzsy38kc8yxp0jdygk4qid5xd642gchlky7z6fwza223" else - "0ygxcvn6srjg9clayfri86c64inwidp9qk25hbsbyr8m8gghpwqb" + "1by2zqw9xgvpf1jnbf5qjl3kcjn5wxznl44f47f8h2gkgcnrf749" else if arch == "x86_64" then - "1y1c65vfsvapqsl2q6vm75m5jyksjwnfs6f6ijcpg0dmf5f4fypy" + "07hbg98pgpp81v2sr4vw8siava7wkg1r6hg8i6rg00w9mhvn9vcz" else - "1h9samf24l0ix6188p940h7l989nwkzlrvv7qdxczj3p62zzvqfy"; + "1z2nmznmwvg3crdj3gbz2bxvi8dq2jk5yiwk79y90h199nsan1n2"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 09e59b100f3..585c0be26d1 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "32.0.0.207"; + version = "32.0.0.223"; src = fetchurl { url = @@ -60,9 +60,9 @@ stdenv.mkDerivation rec { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "0z08da6xhjvsxn9xymcnpphap2h0ydj784ms1f950l84rdl4qrr4" + "1f3098vfznnx8d7rimgbalr2728jhzwca9val7pdi9b8yf9labwk" else - "0d2pxggrzamrg143bvic0qa2v70jpplnahihfa4q2rbvy0l3i2pq"; + "005iyajgp55ww25rcyxg5g0kbzddp6izfly9p4agahmzlzv18y4h"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix index 2a43c23e73a..a3cb55ce329 100644 --- a/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/pkgs/applications/networking/cluster/kube-router/default.nix @@ -1,17 +1,16 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "kube-router-${version}"; - version = "0.2.5"; - rev = "v${version}"; + pname = "kube-router"; + version = "0.3.1"; goPackagePath = "github.com/cloudnativelabs/kube-router"; src = fetchFromGitHub { - inherit rev; owner = "cloudnativelabs"; - repo = "kube-router"; - sha256 = "1j6q6kg4qj75v2mdy9ivvwq8mx9fpdf0w08959l8imrp5byd56wv"; + repo = pname; + rev = "v${version}"; + sha256 = "06azrghcxp6n4bvrqxpwhmg60qk4jqcrkl1lh1rardlzhl71lk1h"; }; buildFlagsArray = '' @@ -22,7 +21,7 @@ buildGoPackage rec { ${goPackagePath}/pkg/cmd.buildDate=Nix ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.kube-router.io/"; description = "All-in-one router, firewall and service proxy for Kubernetes"; license = licenses.asl20; diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index a3b2bbe90c1..ef4009b0e96 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -2,7 +2,7 @@ let stableVersion = "2.1.21"; - previewVersion = "2.2.0b3"; + previewVersion = "2.2.0b4"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; branch = if args.stable then "stable" else "preview"; @@ -18,7 +18,7 @@ in { }; guiPreview = mkGui { stable = false; - sha256Hash = "1bzy95zqinwrrga7qj6gvpzvz34w4ddhvgmpgq3p1lwzixpqg1w7"; + sha256Hash = "03jlg4ncs69gv1dn1zsdm0ipvlg6r0lwf8myxric6vv4ks7qqd3w"; }; serverStable = mkServer { @@ -27,6 +27,6 @@ in { }; serverPreview = mkServer { stable = false; - sha256Hash = "1bq4ww6qhhl0qw6yj7cf7yg54yb4y8mxlnwss6hgbyfv5fz9rxjp"; + sha256Hash = "0mzn62649hmmqq8z2vphqvi0w38jwq8ps4zzbl1dqygbf4gadnqa"; }; } diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 26dc45144d9..6da7320e953 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -7,7 +7,7 @@ , xvfb_run, dbus # Optional dependencies -, enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-ugly +, enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-ugly, libnice , enableE2E ? true , enableSecrets ? true, libsecret , enableRST ? true, docutils @@ -33,14 +33,14 @@ python3.pkgs.buildPythonApplication rec { ''; buildInputs = [ - gobject-introspection gtk3 gnome3.adwaita-icon-theme - ] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly ] + gobject-introspection gtk3 gnome3.adwaita-icon-theme wrapGAppsHook + ] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly libnice ] ++ lib.optional enableSecrets libsecret ++ lib.optional enableSpelling gspell ++ lib.optional enableUPnP gupnp-igd; nativeBuildInputs = [ - gettext wrapGAppsHook + gettext ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 56e98e880f7..9642c54a26a 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -139,15 +139,15 @@ let }; gitSource = rec { - version = "2018-07-01"; + version = "2019-07-10"; qtVersion = 5; # Needs submodules src = fetchFromGitHub { owner = "mumble-voip"; repo = "mumble"; - rev = "c19ac8c0b0f934d2ff206858d7cb66352d6eb418"; - sha256 = "1mzp1bgn49ycs16d6r8icqq35wq25198fs084vyq6j5f78ni7pvz"; + rev = "41b265584654c7ac216fd3ccb9c141734d3f839b"; + sha256 = "00irlzz5q4drmsfbwrkyy7p7w8a5fc1ip5vyicq3g3cy58dprpqr"; fetchSubmodules = true; }; }; diff --git a/pkgs/applications/science/machine-learning/fasttext/default.nix b/pkgs/applications/science/machine-learning/fasttext/default.nix index 0ae9a74d0d0..0de54572862 100644 --- a/pkgs/applications/science/machine-learning/fasttext/default.nix +++ b/pkgs/applications/science/machine-learning/fasttext/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fasttext"; - version = "0.2.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "facebookresearch"; repo = "fastText"; - rev = version; - sha256 = "1fcrz648r2s80bf7vc0l371xillz5jk3ldaiv9jb7wnsyri831b4"; + rev = "v${version}"; + sha256 = "1cbzz98qn8aypp4r5kwwwc9wiq5bwzv51kcsb15xjfs9lz8h3rii"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index 44e4b5de956..82d98b95966 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "hub"; - version = "2.12.1"; + version = "2.12.2"; goPackagePath = "github.com/github/hub"; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "github"; repo = pname; rev = "v${version}"; - sha256 = "0i9bqcgdidl5zawkpq2fjrimzbb37i1m2fisvj32d27fsp1824bk"; + sha256 = "0sxfmjg26s86m5xa9nbj8287kg12kygxw6gggahal6v7zjhwcvaz"; }; nativeBuildInputs = [ groff utillinux ]; diff --git a/pkgs/applications/virtualization/dynamips/default.nix b/pkgs/applications/virtualization/dynamips/default.nix index 9419939d1c7..cce5a674f7c 100644 --- a/pkgs/applications/virtualization/dynamips/default.nix +++ b/pkgs/applications/virtualization/dynamips/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dynamips"; - version = "0.2.20"; + version = "0.2.21"; src = fetchFromGitHub { owner = "GNS3"; repo = pname; rev = "v${version}"; - sha256 = "1841h0m0k0p3c3ify4imafjk7jigcj2zlr8rn3iyp7jnafkxqik7"; + sha256 = "0pvdqs6kjz0x0wqb5f1k3r25dg82wssm7wz4psm0m6bxsvf5l0i5"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 392517e3ab2..2a76cf487b0 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,13 +1,18 @@ { stdenv, fetchurl, python3Packages, intltool, file , wrapGAppsHook, gtk-vnc, vte, avahi, dconf , gobject-introspection, libvirt-glib, system-libvirt -, gsettings-desktop-schemas, glib, libosinfo, gnome3, gtk3 +, gsettings-desktop-schemas, glib, libosinfo, gnome3 +, gtksourceview4 , spiceSupport ? true, spice-gtk ? null , cpio, e2fsprogs, findutils, gzip }: with stdenv.lib; +# TODO: remove after there's support for setupPyDistFlags +let + setuppy = ../../../development/interpreters/python/run_setup.py; +in python3Packages.buildPythonApplication rec { name = "virt-manager-${version}"; version = "2.2.0"; @@ -19,13 +24,14 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ - wrapGAppsHook intltool file + intltool file gobject-introspection # for setup hook populating GI_TYPELIB_PATH ]; buildInputs = [ + wrapGAppsHook libvirt-glib vte dconf gtk-vnc gnome3.adwaita-icon-theme avahi - gsettings-desktop-schemas libosinfo gtk3 + gsettings-desktop-schemas libosinfo gtksourceview4 gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 ] ++ optional spiceSupport spice-gtk; @@ -43,8 +49,12 @@ python3Packages.buildPythonApplication rec { ${python3Packages.python.interpreter} setup.py configure --prefix=$out ''; - postInstall = '' - ${glib.dev}/bin/glib-compile-schemas "$out"/share/glib-2.0/schemas + # TODO: remove after there's support for setupPyDistFlags + buildPhase = '' + runHook preBuild + cp ${setuppy} nix_run_setup + ${python3Packages.python.pythonForBuild.interpreter} nix_run_setup --no-update-icon-cache build_ext bdist_wheel + runHook postBuild ''; preFixup = '' diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 7c90f9b3483..9c307d8e9ba 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { xen ] ++ optionals spiceSupport [ spice-gtk spice-protocol libcap gdbm - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; # Required for USB redirection PolicyKit rules file diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix index 0f3e2205bd9..c9daed461c5 100644 --- a/pkgs/applications/window-managers/sway/idle.nix +++ b/pkgs/applications/window-managers/sway/idle.nix @@ -5,19 +5,15 @@ stdenv.mkDerivation rec { name = "swayidle-${version}"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "swaywm"; repo = "swayidle"; rev = version; - sha256 = "1fpacy9jwfi3vd94sgsy8qgx5092rm3vsplj2zjbmxkak1gjn56n"; + sha256 = "05qi96j58xqxjiighay1d39rfanxcpn6vlynj23mb5dymxvlaq9n"; }; - postPatch = '' - sed -iE "s/version: '1\.3',/version: '${version}',/" meson.build - ''; - nativeBuildInputs = [ meson ninja pkgconfig scdoc ]; buildInputs = [ wayland wayland-protocols systemd ]; diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 3ce90cbeab3..6300587a7d1 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -49,8 +49,11 @@ in # first element of `urls'). name ? "" - # Different ways of specifying the hash. -, outputHash ? "" +, # SRI hash. + hash ? "" + +, # Legacy ways of specifying the hash. + outputHash ? "" , outputHashAlgo ? "" , md5 ? "" , sha1 ? "" @@ -103,7 +106,8 @@ let else throw "fetchurl requires either `url` or `urls` to be set"; hash_ = - if md5 != "" then throw "fetchurl does not support md5 anymore, please use sha256 or sha512" + if hash != "" then { outputHashAlgo = null; outputHash = hash; } + else if md5 != "" then throw "fetchurl does not support md5 anymore, please use sha256 or sha512" else if (outputHash != "" && outputHashAlgo != "") then { inherit outputHashAlgo outputHash; } else if sha512 != "" then { outputHashAlgo = "sha512"; outputHash = sha512; } else if sha256 != "" then { outputHashAlgo = "sha256"; outputHash = sha256; } diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index d9e44afb68d..f2336db8852 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -409,9 +409,10 @@ rec { # Alsa Project alsa = [ - ftp://ftp.alsa-project.org/pub/ - http://alsa.cybermirror.org/ - http://www.mirrorservice.org/sites/ftp.alsa-project.org/pub/ - http://alsa.mirror.fr/ + https://www.alsa-project.org/files/pub/ + ftp://ftp.alsa-project.org/pub/ + http://alsa.cybermirror.org/ + http://www.mirrorservice.org/sites/ftp.alsa-project.org/pub/ + http://alsa.mirror.fr/ ]; } diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix index 8e016fadfac..b3386aaf24b 100644 --- a/pkgs/development/go-packages/generic/default.nix +++ b/pkgs/development/go-packages/generic/default.nix @@ -72,14 +72,19 @@ let goPath = if goDeps != null then importGodeps { depsFile = goDeps; } ++ extraSrcs else extraSrcs; - package = go.stdenv.mkDerivation ( + package = stdenv.mkDerivation ( (builtins.removeAttrs args [ "goPackageAliases" "disabled" "extraSrcs"]) // { nativeBuildInputs = [ removeReferencesTo go ] ++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs; buildInputs = buildInputs; - inherit (go) GOOS GOARCH; + inherit (go) GOOS GOARCH GO386 CGO_ENABLED; + + GOHOSTARCH = go.GOHOSTARCH or null; + GOHOSTOS = go.GOHOSTOS or null; + + GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); configurePhase = args.configurePhase or '' runHook preConfigure diff --git a/pkgs/development/interpreters/python/build-python-package-wheel.nix b/pkgs/development/interpreters/python/build-python-package-wheel.nix index 7be0a4c304a..e3c4e13c0e2 100644 --- a/pkgs/development/interpreters/python/build-python-package-wheel.nix +++ b/pkgs/development/interpreters/python/build-python-package-wheel.nix @@ -8,7 +8,7 @@ attrs // { unpackPhase = '' mkdir dist - cp $src dist/"''${src#*-}" + cp "$src" "dist/$(stripHash "$src")" ''; # Wheels are pre-compiled diff --git a/pkgs/development/interpreters/python/fetchpypi.nix b/pkgs/development/interpreters/python/fetchpypi.nix new file mode 100644 index 00000000000..e60c9df1f8b --- /dev/null +++ b/pkgs/development/interpreters/python/fetchpypi.nix @@ -0,0 +1,28 @@ +# `fetchPypi` function for fetching artifacts from PyPI. +{ fetchurl +, makeOverridable +}: + +let + computeUrl = {format ? "setuptools", ... } @attrs: let + computeWheelUrl = {pname, version, python ? "py2.py3", abi ? "none", platform ? "any"}: + # Fetch a wheel. By default we fetch an universal wheel. + # See https://www.python.org/dev/peps/pep-0427/#file-name-convention for details regarding the optional arguments. + "https://files.pythonhosted.org/packages/${python}/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}-${python}-${abi}-${platform}.whl"; + + computeSourceUrl = {pname, version, extension ? "tar.gz"}: + # Fetch a source tarball. + "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.${extension}"; + + compute = (if format == "wheel" then computeWheelUrl + else if format == "setuptools" then computeSourceUrl + else throw "Unsupported format ${format}"); + + in compute (builtins.removeAttrs attrs ["format"]); + +in makeOverridable( {format ? "setuptools", sha256 ? "", hash ? "", ... } @attrs: + let + url = computeUrl (builtins.removeAttrs attrs ["sha256" "hash"]) ; + in fetchurl { + inherit url sha256 hash; + }) diff --git a/pkgs/development/libraries/SDL_gpu/default.nix b/pkgs/development/libraries/SDL_gpu/default.nix new file mode 100644 index 00000000000..dc88b7b12ef --- /dev/null +++ b/pkgs/development/libraries/SDL_gpu/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, cmake, SDL2, libGLU }: + +stdenv.mkDerivation rec { + pname = "SDL_gpu-unstable"; + version = "2019-01-24"; + + src = fetchFromGitHub { + owner = "grimfang4"; + repo = "sdl-gpu"; + rev = "e3d350b325a0e0d0b3007f69ede62313df46c6ef"; + sha256 = "0kibcaim01inb6xxn4mr6affn4hm50vz9kahb5k9iz8dmdsrhxy1"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ SDL2 libGLU ]; + + cmakeFlags = [ + "-DSDL_gpu_BUILD_DEMOS=OFF" + "-DSDL_gpu_BUILD_TOOLS=OFF" + "-DSDL_gpu_BUILD_VIDEO_TEST=OFF" + "-DSDL_gpu_BUILD_TESTS=OFF" + ]; + + patchPhase = '' + sed -ie '210s#''${OUTPUT_DIR}/lib#''${CMAKE_INSTALL_LIBDIR}#' src/CMakeLists.txt + sed -ie '213s#''${OUTPUT_DIR}/lib#''${CMAKE_INSTALL_LIBDIR}#' src/CMakeLists.txt + ''; + + meta = with stdenv.lib; { + description = "A library for high-performance, modern 2D graphics with SDL written in C"; + homepage = "https://github.com/grimfang4/sdl-gpu"; + license = licenses.mit; + maintainers = with maintainers; [ pmiddend ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/discord-rpc/default.nix b/pkgs/development/libraries/discord-rpc/default.nix new file mode 100644 index 00000000000..3a8290a6597 --- /dev/null +++ b/pkgs/development/libraries/discord-rpc/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, fetchFromGitHub +, cmake +, rapidjson +, AppKit +, buildExamples ? false +}: + +stdenv.mkDerivation rec { + pname = "discord-rpc"; + version = "3.4.0"; + + src = fetchFromGitHub { + owner = "discordapp"; + repo = pname; + rev = "v${version}"; + sha256 = "04cxhqdv5r92lrpnhxf8702a8iackdf3sfk1050z7pijbijiql2a"; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + rapidjson + ] ++ stdenv.lib.optional stdenv.isDarwin AppKit; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=true" + "-DBUILD_EXAMPLES=${stdenv.lib.boolToString buildExamples}" + ]; + + meta = with stdenv.lib; { + description = "Official library to interface with the Discord client"; + homepage = "https://github.com/discordapp/discord-rpc"; + license = licenses.mit; + maintainers = with maintainers; [ tadeokondrak ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch b/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch index 364330169bf..546e753144d 100644 --- a/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch +++ b/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch @@ -19,3 +19,15 @@ diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf } } else { skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.") +diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri +--- a/src/core/config/mac_osx.pri ++++ b/src/core/config/mac_osx.pri +@@ -5,8 +5,6 @@ load(functions) + # otherwise query for it. + QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion) + isEmpty(QMAKE_MAC_SDK_VERSION) { +- QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null") +- isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'") + } + + QMAKE_CLANG_DIR = "/usr" diff --git a/pkgs/development/libraries/qtpbfimageplugin/default.nix b/pkgs/development/libraries/qtpbfimageplugin/default.nix new file mode 100644 index 00000000000..8ad908013bd --- /dev/null +++ b/pkgs/development/libraries/qtpbfimageplugin/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, qmake, qtbase, protobuf }: + +stdenv.mkDerivation rec { + pname = "qtpbfimageplugin"; + version = "1.4"; + + src = fetchFromGitHub { + owner = "tumic0"; + repo = "QtPBFImagePlugin"; + rev = version; + sha256 = "0d39i7rmhrmm2df49gd47zm37gnz3fmyr6hfc6hhzvk08jb6956r"; + }; + + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtbase protobuf ]; + + postPatch = '' + # Fix plugin dir + substituteInPlace pbfplugin.pro \ + --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" + + # Fix darwin build + substituteInPlace pbfplugin.pro \ + --replace '$$PROTOBUF/lib/libprotobuf-lite.a' '${protobuf}/lib/libprotobuf-lite.dylib' + ''; + + meta = with stdenv.lib; { + description = "Qt image plugin for displaying Mapbox vector tiles"; + longDescription = '' + QtPBFImagePlugin is a Qt image plugin that enables applications capable of + displaying raster MBTiles maps or raster XYZ online maps to also display PBF + vector tiles without (almost) any application modifications. + ''; + homepage = https://github.com/tumic0/QtPBFImagePlugin; + license = licenses.lgpl3; + maintainers = [ maintainers.sikmir ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/soundtouch/default.nix b/pkgs/development/libraries/soundtouch/default.nix index 95a97f30b6e..71c7915c2ed 100644 --- a/pkgs/development/libraries/soundtouch/default.nix +++ b/pkgs/development/libraries/soundtouch/default.nix @@ -1,22 +1,24 @@ -{stdenv, fetchurl, autoconf, automake, libtool}: +{stdenv, lib, fetchFromGitLab, autoconf, automake, libtool}: stdenv.mkDerivation rec { - pName = "soundtouch"; - name = "${pName}-2.0.0"; - src = fetchurl { - url = "https://www.surina.net/soundtouch/${name}.tar.gz"; - sha256 = "09cxr02mfyj2bg731bj0i9hh565x8l9p91aclxs8wpqv8b8zf96j"; + pname = "soundtouch"; + version = "2.1.2"; + + src = fetchFromGitLab { + owner = pname; + repo = pname; + rev = version; + sha256 = "174wgm3s0inmbnkrlnspxjwm2014qhjhkbdqa5r8rbfi0nzqxzsz"; }; - buildInputs = [ autoconf automake libtool ]; + nativeBuildInputs = [ autoconf automake libtool ]; preConfigure = "./bootstrap"; - meta = { - description = "A program and library for changing the tempo, pitch and playback rate of audio"; - homepage = http://www.surina.net/soundtouch/; - downloadPage = http://www.surina.net/soundtouch/sourcecode.html; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.all; + meta = with lib; { + description = "A program and library for changing the tempo, pitch and playback rate of audio"; + homepage = "http://www.surina.net/soundtouch/"; + license = licenses.lgpl21; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 079d61ca3d5..8f92e0b64f6 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -87,10 +87,13 @@ stdenv.mkDerivation rec { vala ]; + propagatedBuildInputs = [ + gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + ]; + buildInputs = [ cyrus_sasl epoxy - gst_all_1.gst-plugins-base gtk3 json-glib libcacard diff --git a/pkgs/development/python-modules/aiorpcx/default.nix b/pkgs/development/python-modules/aiorpcx/default.nix index a5f54d8e96c..6350e3f0441 100644 --- a/pkgs/development/python-modules/aiorpcx/default.nix +++ b/pkgs/development/python-modules/aiorpcx/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "aiorpcx"; - version = "0.17.0"; + version = "0.18.3"; src = fetchPypi { inherit version; pname = "aiorpcX"; - sha256 = "14np5r75rs0v45vsv20vbzmnv3qisvm9mdllj1j9s1633cvcik0k"; + sha256 = "0k545hc7wl6sh1svydzbv6x7sx5pig2pqkl3yxs9riwmvzawx9xp"; }; propagatedBuildInputs = [ attrs ]; diff --git a/pkgs/development/python-modules/anonip/default.nix b/pkgs/development/python-modules/anonip/default.nix new file mode 100644 index 00000000000..de9048bde34 --- /dev/null +++ b/pkgs/development/python-modules/anonip/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, ipaddress, isPy27 }: + +buildPythonPackage rec { + pname = "anonip"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "DigitaleGesellschaft"; + repo = "Anonip"; + rev = "v${version}"; + sha256 = "0y5xqivcinp6pwx4whc8ca1n2wxrvff7a2lpbz2dhivilfanmljs"; + }; + + propagatedBuildInputs = lib.optionals isPy27 [ ipaddress ]; + + checkPhase = "python tests.py"; + + meta = with stdenv.lib; { + homepage = "https://github.com/DigitaleGesellschaft/Anonip"; + description = "A tool to anonymize IP-addresses in log-files"; + license = licenses.bsd3; + maintainers = [ maintainers.mmahut ]; + }; +} diff --git a/pkgs/development/python-modules/deap/default.nix b/pkgs/development/python-modules/deap/default.nix index fbc915c8eb0..e78a3f5eba0 100644 --- a/pkgs/development/python-modules/deap/default.nix +++ b/pkgs/development/python-modules/deap/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deap"; - version = "1.2.2"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "95c63e66d755ec206c80fdb2908851c0bef420ee8651ad7be4f0578e9e909bcf"; + sha256 = "102r11pxb36xkq5bjv1lpkss77v278f5xdv6lvkbjdvqryydf3yd"; }; propagatedBuildInputs = [ numpy matplotlib ]; @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "DEAP is a novel evolutionary computation framework for rapid prototyping and testing of ideas."; - homepage = https://github.com/DEAP/deap; + homepage = "https://github.com/DEAP/deap"; license = licenses.lgpl3; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/fasttext/default.nix b/pkgs/development/python-modules/fasttext/default.nix index 05034dc7526..9f1a8b18d7b 100644 --- a/pkgs/development/python-modules/fasttext/default.nix +++ b/pkgs/development/python-modules/fasttext/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "fasttext"; - version = "0.2.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "facebookresearch"; repo = "fastText"; - rev = version; - sha256 = "1fcrz648r2s80bf7vc0l371xillz5jk3ldaiv9jb7wnsyri831b4"; + rev = "v${version}"; + sha256 = "1cbzz98qn8aypp4r5kwwwc9wiq5bwzv51kcsb15xjfs9lz8h3rii"; }; buildInputs = [ pybind11 ]; diff --git a/pkgs/development/python-modules/flask-caching/default.nix b/pkgs/development/python-modules/flask-caching/default.nix index 84f549231ce..bd528af6bfa 100644 --- a/pkgs/development/python-modules/flask-caching/default.nix +++ b/pkgs/development/python-modules/flask-caching/default.nix @@ -1,28 +1,26 @@ -{ lib, buildPythonPackage, fetchPypi, flask, pytest, pytestcov }: +{ lib, buildPythonPackage, fetchPypi, flask, pytest, pytestcov, pytest-xprocess }: buildPythonPackage rec { pname = "Flask-Caching"; - version = "1.4.0"; + version = "1.7.2"; src = fetchPypi { inherit pname version; - sha256 = "e34f24631ba240e09fe6241e1bf652863e0cff06a1a94598e23be526bc2e4985"; + sha256 = "17jnnmnpdflv120yhsfbnpick06iias6f2hcxmf1mi1nr35kdqjj"; }; propagatedBuildInputs = [ flask ]; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytestcov pytest-xprocess ]; + # backend_cache relies on pytest-cache, which is a stale package from 2013 checkPhase = '' - py.test + pytest -k 'not backend_cache' ''; - # https://github.com/sh4nks/flask-caching/pull/74 - doCheck = false; - meta = with lib; { description = "Adds caching support to your Flask application"; - homepage = https://github.com/sh4nks/flask-caching; + homepage = "https://github.com/sh4nks/flask-caching"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix index 97ee57fac0c..cd9781dbc88 100644 --- a/pkgs/development/python-modules/m2crypto/default.nix +++ b/pkgs/development/python-modules/m2crypto/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { - version = "0.32.0"; + version = "0.35.2"; pname = "M2Crypto"; src = fetchPypi { inherit pname version; - sha256 = "09d3zs2ivyxbi0fa42mnan0fcplc08q2qd70p1b43sxxdbxcdj99"; + sha256 = "09yirf3w77w6f49q6nxhrjm9c3a4y9s30s1k09chqrw8zdgx8sjc"; }; patches = [ diff --git a/pkgs/development/python-modules/msrest/default.nix b/pkgs/development/python-modules/msrest/default.nix index 77a3e22f75c..ba3dd00bfe4 100644 --- a/pkgs/development/python-modules/msrest/default.nix +++ b/pkgs/development/python-modules/msrest/default.nix @@ -18,12 +18,12 @@ }: buildPythonPackage rec { - version = "0.6.7"; + version = "0.6.8"; pname = "msrest"; src = fetchPypi { inherit pname version; - sha256 = "07136g3j7zgcvkxki4v6q1p2dm1nzzc28181s8dwic0y4ml8qlq5"; + sha256 = "0yd43fnmfxkvk3idkyn67ziwjgkwkn261kicr3szjibpqjqcpsf9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-flask/default.nix b/pkgs/development/python-modules/pytest-flask/default.nix new file mode 100644 index 00000000000..b58b934dadc --- /dev/null +++ b/pkgs/development/python-modules/pytest-flask/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, flask, werkzeug, setuptools_scm }: + +buildPythonPackage rec { + pname = "pytest-flask"; + version = "0.15.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0jdzrib94vwfpl8524h34aqzqndh3h4xn706v32xh412c8dphx6q"; + }; + + doCheck = false; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + flask + werkzeug + ]; + + nativeBuildInputs = [ setuptools_scm ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/pytest-dev/pytest-flask/"; + license = licenses.mit; + description = "A set of py.test fixtures to test Flask applications"; + maintainers = with maintainers; [ vanschelven ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-xprocess/default.nix b/pkgs/development/python-modules/pytest-xprocess/default.nix new file mode 100644 index 00000000000..840a096a085 --- /dev/null +++ b/pkgs/development/python-modules/pytest-xprocess/default.nix @@ -0,0 +1,32 @@ +{ lib, buildPythonPackage, fetchPypi +, psutil +, pytest +}: + +buildPythonPackage rec { + pname = "pytest-xprocess"; + version = "0.12.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "06w2acg0shy0vxrmnxpqclimhgfjys5ql5kmmzr7r1lai46x1q2h"; + }; + + propagatedBuildInputs = [ psutil pytest ]; + + # Remove test QoL package from install_requires + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-cache', " "" + ''; + + # There's no tests in repo + doCheck = false; + + meta = with lib; { + description = "Pytest external process plugin"; + homepage = "https://github.com/pytest-dev"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/sklearn-deap/default.nix b/pkgs/development/python-modules/sklearn-deap/default.nix index 190692c4362..63a048abdb2 100644 --- a/pkgs/development/python-modules/sklearn-deap/default.nix +++ b/pkgs/development/python-modules/sklearn-deap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, deap, scikitlearn, python }: +{ stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, deap, scikitlearn, python, isPy3k }: buildPythonPackage rec { pname = "sklearn-deap"; @@ -23,6 +23,7 @@ buildPythonPackage rec { homepage = https://github.com/rsteca/sklearn-deap; license = licenses.lgpl3; maintainers = with maintainers; [ psyanticy ]; + broken = isPy3k; # https://github.com/rsteca/sklearn-deap/issues/65 }; } diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 80524154f67..178be8bd86a 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -34,7 +34,9 @@ buildPythonPackage rec { prePatch = '' substituteInPlace setup.py \ - --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" + --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" \ + --replace "regex==" "regex>=" \ + --replace "wheel>=0.32.0,<0.33.0" "wheel>=0.32.0" ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/suds-jurko/default.nix b/pkgs/development/python-modules/suds-jurko/default.nix index efb8383c8fd..25ff5fd1636 100644 --- a/pkgs/development/python-modules/suds-jurko/default.nix +++ b/pkgs/development/python-modules/suds-jurko/default.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , fetchPypi -, pytest_3 , isPyPy }: @@ -16,7 +15,7 @@ buildPythonPackage rec { sha256 = "1s4radwf38kdh3jrn5acbidqlr66sx786fkwi0rgq61hn4n2bdqw"; }; - checkInputs = [ pytest_3 ]; + doCheck = false; postPatch = '' # fails diff --git a/pkgs/development/python-modules/swagger-spec-validator/default.nix b/pkgs/development/python-modules/swagger-spec-validator/default.nix new file mode 100644 index 00000000000..dc4b99c40a7 --- /dev/null +++ b/pkgs/development/python-modules/swagger-spec-validator/default.nix @@ -0,0 +1,37 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pyyaml, jsonschema, six, pytest, mock }: + +buildPythonPackage rec { + pname = "swagger-spec-validator"; + version = "2.4.3"; + + src = fetchFromGitHub { + owner = "Yelp"; + repo = "swagger_spec_validator"; + rev = "v" + version; + sha256 = "02f8amc6iq2clxxmrz8hirbb57sizaxijp0higqy16shk63ibalw"; + }; + + checkInputs = [ + pytest + mock + ]; + + checkPhase = '' + pytest tests + ''; + + propagatedBuildInputs = [ + pyyaml + jsonschema + six + ]; + + meta = with lib; { + homepage = "https://github.com/Yelp/swagger_spec_validator"; + license = licenses.asl20; + description = "Validation of Swagger specifications"; + maintainers = with maintainers; [ vanschelven ]; + }; +} + + diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 9cb25af7a92..ebca1346dfb 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -28,11 +28,11 @@ buildPythonPackage rec { pname = "thinc"; - version = "7.0.4"; + version = "7.0.6"; src = fetchPypi { inherit pname version; - sha256 = "14v8ygjrkj63dwd4pi490ld6i2d8n8wzcf15hnacjjfwij93pa1q"; + sha256 = "12d0766z7ksqpqrvldi46mx0z4zsbgncda4fpvxra1d6vbchf8ba"; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ @@ -81,6 +81,6 @@ buildPythonPackage rec { description = "Practical Machine Learning for NLP in Python"; homepage = https://github.com/explosion/thinc; license = licenses.mit; - maintainers = with maintainers; [ aborsu sdll ]; + maintainers = with maintainers; [ aborsu danieldk sdll ]; }; } diff --git a/pkgs/development/tools/build-managers/mage/default.nix b/pkgs/development/tools/build-managers/mage/default.nix index bce8dedbf58..40ddf742ed5 100644 --- a/pkgs/development/tools/build-managers/mage/default.nix +++ b/pkgs/development/tools/build-managers/mage/default.nix @@ -1,32 +1,30 @@ -{ buildGoPackage, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib }: -with lib; - -buildGoPackage rec { - name = "mage-${version}"; - version = "1.7.1"; - - goPackagePath = "github.com/magefile/mage"; - subPackages = [ "." ]; +buildGoModule rec { + pname = "mage"; + version = "1.8.0"; src = fetchFromGitHub { owner = "magefile"; - repo = "mage"; + repo = pname; rev = "v${version}"; - sha256 = "0n4k5dy338rxwzj654smxzlanmd0zws6mdzv0wc4byqjhr7mqhg2"; + sha256 = "0vkzm2k2v3np30kdgz9kpwkhnshbjcn8j1y321djz2h3w23k5h7r"; }; - buildFlagsArray = [ + modSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + + buildFlagsArray = [ "-ldflags=" "-X github.com/magefile/mage/mage.commitHash=v${version}" "-X github.com/magefile/mage/mage.gitTag=v${version}" + "-X github.com/magefile/mage/mage.timestamp=1970-01-01T00:00:00Z" ]; - meta = { + meta = with lib; { description = "A Make/Rake-like Build Tool Using Go"; + homepage = "https://magefile.org/"; license = licenses.asl20; - maintainers = [ maintainers.swdunlop ]; - homepage = https://magefile.org/; + maintainers = with maintainers; [ swdunlop ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 07be22ae43f..a93b791f7e6 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "11.11.2"; + version = "12.0.2"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "0q5i9517jsz3mw7hglbnjih7q114350dfd9nyzv7xfk56kc0172w"; + sha256 = "0b1xkksd4rgqvjahp5bf53sk887z2fxwr7rf8vqs9j9aw54zm5cn"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "0q7g0ggaxg6akda06an867vbdqjrfcxf4c81b1cxfhbk7whxgxhv"; + sha256 = "1cjl64g3ymnrs9c3fl28aydfzf18ik4vnjcvijv28c3gm1i6chs0"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0bnn89z7p2mrjjlq7i9yfr6ra903vr278qhhy2i126w56dlac6vf"; + sha256 = "0cbh11libcyfdgrvnl1aa11x90ac7zgn1d9myc4dwmqzfdm4kdlb"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/distgen/default.nix b/pkgs/development/tools/distgen/default.nix new file mode 100644 index 00000000000..dd4cf4d8eb1 --- /dev/null +++ b/pkgs/development/tools/distgen/default.nix @@ -0,0 +1,32 @@ +{ lib, python3 }: + +python3.pkgs.buildPythonApplication rec { + pname = "distgen"; + version = "1.3"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "03jwy08wgp1lp6208vks1hv9g1f3aj45cml6k99mm3nw1jfnlbbq"; + }; + + checkInputs = with python3.pkgs; [ + pytest + mock + ]; + + propagatedBuildInputs = with python3.pkgs; [ + distro + jinja2 + six + pyyaml + ]; + + checkPhase = "make test-unit PYTHON=${python3.executable}"; + + meta = with lib; { + description = "Templating system/generator for distributions"; + license = licenses.gpl2Plus; + homepage = "https://distgen.readthedocs.io/"; + maintainers = with maintainers; [ bachp ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-xbuild/default.nix b/pkgs/development/tools/rust/cargo-xbuild/default.nix index 413e1c2debf..b349fbc6bd9 100644 --- a/pkgs/development/tools/rust/cargo-xbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-xbuild/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-xbuild"; - version = "0.5.12"; + version = "0.5.14"; src = fetchFromGitHub { owner = "rust-osdev"; repo = pname; - rev = "v${version}"; - sha256 = "1vjsss2zrja4kpr83vw6g0hf9xdx658wjhdiymzndbcf32qrx7x1"; + rev = version; + sha256 = "1f87rz17bdpdipc9x2j4gq1zq181gcshhn7vc9pnn6f487hz0bgq"; }; cargoSha256 = "1r9i79lymfwpbcx2lp509v435qpkl9bqly1ya369p41n5yprrcjv"; diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index cc91d867f1d..0210fdd055a 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -1,57 +1,34 @@ { stdenv, fetchurl, jre }: +stdenv.mkDerivation rec { + name = "minecraft-server-${version}"; + version = "1.14.3"; -let - common = { version, sha256, url }: - stdenv.mkDerivation (rec { - name = "minecraft-server-${version}"; - inherit version; - - src = fetchurl { - inherit url sha256; - }; - - preferLocalBuild = true; - - installPhase = '' - mkdir -p $out/bin $out/lib/minecraft - cp -v $src $out/lib/minecraft/server.jar - - cat > $out/bin/minecraft-server << EOF - #!/bin/sh - exec ${jre}/bin/java \$@ -jar $out/lib/minecraft/server.jar nogui - EOF + src = fetchurl { + url = "https://launcher.mojang.com/v1/objects/d0d0fe2b1dc6ab4c65554cb734270872b72dadd6/server.jar"; + sha256 = "0f0v0kqz2v5758551yji1vj6xf43lvbma30v3crz4h7cpzq5c8ll"; + }; - chmod +x $out/bin/minecraft-server - ''; + preferLocalBuild = true; - phases = "installPhase"; + installPhase = '' + mkdir -p $out/bin $out/lib/minecraft + cp -v $src $out/lib/minecraft/server.jar - meta = { - description = "Minecraft Server"; - homepage = "https://minecraft.net"; - license = stdenv.lib.licenses.unfreeRedistributable; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice tomberek costrouc]; - }; - }); + cat > $out/bin/minecraft-server << EOF + #!/bin/sh + exec ${jre}/bin/java \$@ -jar $out/lib/minecraft/server.jar nogui + EOF -in { - minecraft-server_1_14 = common { - version = "1.14"; - url = "https://launcher.mojang.com/v1/objects/f1a0073671057f01aa843443fef34330281333ce/server.jar"; - sha256 = "671e3d334dd601c520bf1aeb96e49038145172bef16bc6c418e969fd8bf8ff6c"; - }; + chmod +x $out/bin/minecraft-server + ''; - minecraft-server_1_13_2 = common { - version = "1.13.2"; - url = "https://launcher.mojang.com/v1/objects/3737db93722a9e39eeada7c27e7aca28b144ffa7/server.jar"; - sha256 = "13h8dxrrgqa1g6sd7aaw26779hcsqsyjm7xm0sknifn54lnamlzz"; - }; + phases = "installPhase"; - minecraft-server_1_12_2 = common { - version = "1.12.2"; - url = "https://s3.amazonaws.com/Minecraft.Download/versions/1.12.2/minecraft_server.1.12.2.jar"; - sha256 = "0zhnac6yvkdgdaag0gb0fgrkgizbwrpf7s76yqdiknfswrs947zy"; + meta = { + description = "Minecraft Server"; + homepage = "https://minecraft.net"; + license = stdenv.lib.licenses.unfreeRedistributable; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice tomberek costrouc]; }; - } diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/misc/screensavers/betterlockscreen/default.nix index ffa8934cd8b..cd5db3067f4 100644 --- a/pkgs/misc/screensavers/betterlockscreen/default.nix +++ b/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -1,6 +1,6 @@ { stdenv, makeWrapper, fetchFromGitHub, - imagemagick, i3lock-color, xdpyinfo, xrandr, bc, feh + imagemagick, i3lock-color, xdpyinfo, xrandr, bc, feh, procps, xrdb }: stdenv.mkDerivation rec { @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { patches = [ ./replace-i3lock.patch ]; - installPhase = - let - PATH = + installPhase = + let + PATH = stdenv.lib.makeBinPath - [imagemagick i3lock-color xdpyinfo xrandr bc feh]; + [imagemagick i3lock-color xdpyinfo xrandr bc feh procps xrdb]; in '' mkdir -p $out/bin cp betterlockscreen $out/bin/betterlockscreen diff --git a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch index d77053f5d39..4903eadef4b 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch @@ -1,36 +1,8 @@ -From 44887227f7f617cbf84713ec45685cb4999039ff Mon Sep 17 00:00:00 2001 -From: Jan Tojnar <jtojnar@gmail.com> -Date: Tue, 30 Oct 2018 22:26:30 +0100 -Subject: [PATCH] build: Add option for installation sysconfdir - -On NixOS, sysconfdir is read-only by default, and packages are not supposed to -install files there. Instead, NixOS has a concept of modules that declaratively -describe the system configuration. - -We still want to install the config files and certificates to fwupd prefix, -so that the modules can use them as they see fit, but at the same time, we -cannot set sysconfdir=${prefix}/etc because the daemon needs to read the -configuration from the directory created by the module. - -With autotools, we could easily solve this by passing a the sysconfdir inside -prefix only to `make install`, but Meson does not support anything like that. -Until we manage to convince Meson to support install flags, we need to create -our own install flag. ---- - data/meson.build | 4 ++-- - data/pki/meson.build | 8 ++++---- - data/remotes.d/meson.build | 6 +++--- - meson.build | 6 ++++++ - meson_options.txt | 1 + - plugins/redfish/meson.build | 2 +- - plugins/uefi/meson.build | 2 +- - 7 files changed, 18 insertions(+), 11 deletions(-) - diff --git a/data/meson.build b/data/meson.build -index 8dd2ac9a..d4ad1cbc 100644 +index 61664cd6..f10abbba 100644 --- a/data/meson.build +++ b/data/meson.build -@@ -9,7 +9,7 @@ if get_option('tests') and get_option('daemon') +@@ -11,7 +11,7 @@ if get_option('daemon') endif install_data(['daemon.conf'], @@ -39,7 +11,7 @@ index 8dd2ac9a..d4ad1cbc 100644 ) install_data(['org.freedesktop.fwupd.metainfo.xml'], -@@ -17,7 +17,7 @@ install_data(['org.freedesktop.fwupd.metainfo.xml'], +@@ -23,7 +23,7 @@ install_data(['org.freedesktop.fwupd.svg'], ) install_data(['org.freedesktop.fwupd.conf'], @@ -47,7 +19,7 @@ index 8dd2ac9a..d4ad1cbc 100644 + install_dir : join_paths(sysconfdir_install, 'dbus-1', 'system.d') ) - install_data(['metadata.xml'], + if get_option('daemon') diff --git a/data/pki/meson.build b/data/pki/meson.build index eefcc914..dc801fa1 100644 --- a/data/pki/meson.build @@ -85,7 +57,7 @@ index eefcc914..dc801fa1 100644 endif diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build -index 824291fc..d0599a00 100644 +index a27c31ef..374e09b6 100644 --- a/data/remotes.d/meson.build +++ b/data/remotes.d/meson.build @@ -3,7 +3,7 @@ if get_option('daemon') and get_option('lvfs') @@ -98,22 +70,22 @@ index 824291fc..d0599a00 100644 i18n.merge_file( input: 'lvfs.metainfo.xml', @@ -37,12 +37,12 @@ configure_file( - output : 'fwupd.conf', + output : 'vendor.conf', configuration : con2, install: true, - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) configure_file( - input : 'vendor.conf', - output : 'vendor.conf', + input : 'vendor-directory.conf', + output : 'vendor-directory.conf', configuration : con2, install: true, - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) diff --git a/meson.build b/meson.build -index b6df98b3..d672ee37 100644 +index a89f9b3f..736896eb 100644 --- a/meson.build +++ b/meson.build @@ -145,6 +145,12 @@ localstatedir = join_paths(prefix, get_option('localstatedir')) @@ -130,22 +102,33 @@ index b6df98b3..d672ee37 100644 if gio.version().version_compare ('>= 2.55.0') conf.set('HAVE_GIO_2_55_0', '1') diff --git a/meson_options.txt b/meson_options.txt -index 23ef8cdb..db8f93b6 100644 +index 5d4163e8..db81fd1f 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -17,6 +17,7 @@ option('plugin_uefi', type : 'boolean', value : true, description : 'enable UEFI - option('plugin_nvme', type : 'boolean', value : true, description : 'enable NVMe support') +@@ -21,6 +21,7 @@ option('plugin_modem_manager', type : 'boolean', value : false, description : 'e option('systemd', type : 'boolean', value : true, description : 'enable systemd support') option('systemdunitdir', type: 'string', value: '', description: 'Directory for systemd units') + option('elogind', type : 'boolean', value : false, description : 'enable elogind support') +option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation') option('tests', type : 'boolean', value : true, description : 'enable tests') option('udevdir', type: 'string', value: '', description: 'Directory for udev rules') option('efi-cc', type : 'string', value : 'gcc', description : 'the compiler to use for EFI modules') +diff --git a/plugins/dell-esrt/meson.build b/plugins/dell-esrt/meson.build +index cb9f4555..b972d7fb 100644 +--- a/plugins/dell-esrt/meson.build ++++ b/plugins/dell-esrt/meson.build +@@ -36,5 +36,5 @@ configure_file( + output : 'dell-esrt.conf', + configuration : con2, + install: true, +- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), ++ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), + ) diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build -index ef07bd81..d2c7e259 100644 +index 5c88504e..7706da71 100644 --- a/plugins/redfish/meson.build +++ b/plugins/redfish/meson.build -@@ -25,7 +25,7 @@ shared_module('fu_plugin_redfish', +@@ -26,7 +26,7 @@ shared_module('fu_plugin_redfish', ) install_data(['redfish.conf'], @@ -155,10 +138,10 @@ index ef07bd81..d2c7e259 100644 if get_option('tests') diff --git a/plugins/uefi/meson.build b/plugins/uefi/meson.build -index 09ebdf82..02fc0661 100644 +index ac9f5dd8..1ab51b5e 100644 --- a/plugins/uefi/meson.build +++ b/plugins/uefi/meson.build -@@ -73,7 +73,7 @@ executable( +@@ -79,7 +79,7 @@ executable( ) install_data(['uefi.conf'], @@ -167,5 +150,3 @@ index 09ebdf82..02fc0661 100644 ) if get_option('tests') --- -2.19.1 diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index cf6e2bf6040..a60417d8e23 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, substituteAll, gtk-doc, pkgconfig, gobject-introspection, intltool , libgudev, polkit, libxmlb, gusb, sqlite, libarchive, glib-networking -, libsoup, help2man, gpgme, libxslt, elfutils, libsmbios, efivar, glibcLocales -, gnu-efi, libyaml, valgrind, meson, libuuid, colord, docbook_xml_dtd_43, docbook_xsl +, libsoup, help2man, gpgme, libxslt, elfutils, libsmbios, efivar, gnu-efi +, libyaml, valgrind, meson, libuuid, colord, docbook_xml_dtd_43, docbook_xsl , ninja, gcab, gnutls, python3, wrapGAppsHook, json-glib, bash-completion , shared-mime-info, umockdev, vala, makeFontsConf, freefont_ttf , cairo, freetype, fontconfig, pango +, bubblewrap, efibootmgr, flashrom, tpm2-tools }: # Updating? Keep $out/etc synchronized with passthru.filesInstalledToEtc @@ -18,17 +19,17 @@ let }; in stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.2.3"; + version = "1.2.8"; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "11qpgincndahq96rbm2kgcy9kw5n9cmbbilsrqcqcyk7mvv464sl"; + sha256 = "0qbvq52c0scn1h99i1rf2la6rrhckin6gb02k7l0v3g07mxs20wc"; }; outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ]; nativeBuildInputs = [ - meson ninja gtk-doc pkgconfig gobject-introspection intltool glibcLocales shared-mime-info + meson ninja gtk-doc pkgconfig gobject-introspection intltool shared-mime-info valgrind gcab docbook_xml_dtd_43 docbook_xsl help2man libxslt python wrapGAppsHook vala ]; buildInputs = [ @@ -37,10 +38,13 @@ in stdenv.mkDerivation rec { bash-completion cairo freetype fontconfig pango ]; - LC_ALL = "en_US.UTF-8"; # For po/make-images - patches = [ - ./fix-paths.patch + (substituteAll { + src = ./fix-paths.patch; + inherit flashrom efibootmgr bubblewrap; + tpm2_tools = "${tpm2-tools}"; + }) + ./add-option-for-installation-sysconfdir.patch # installed tests are installed to different output @@ -63,6 +67,10 @@ in stdenv.mkDerivation rec { substituteInPlace meson.build \ --replace "plugin_dir = join_paths(libdir, 'fwupd-plugins-3')" \ "plugin_dir = join_paths('${placeholder "out"}', 'fwupd_plugins-3')" + + substituteInPlace data/meson.build --replace \ + "install_dir: systemd.get_pkgconfig_variable('systemdshutdowndir')" \ + "install_dir: '${placeholder "out"}/lib/systemd/system-shutdown'" ''; # /etc/os-release not available in sandbox @@ -114,10 +122,11 @@ in stdenv.mkDerivation rec { # /etc/fwupd/uefi.conf is created by the services.hardware.fwupd NixOS module passthru = { filesInstalledToEtc = [ - "fwupd/remotes.d/fwupd.conf" + "fwupd/remotes.d/dell-esrt.conf" "fwupd/remotes.d/lvfs-testing.conf" "fwupd/remotes.d/lvfs.conf" "fwupd/remotes.d/vendor.conf" + "fwupd/remotes.d/vendor-directory.conf" "pki/fwupd/GPG-KEY-Hughski-Limited" "pki/fwupd/GPG-KEY-Linux-Foundation-Firmware" "pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service" diff --git a/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch b/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch index d1024438d8a..51adef2e787 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch @@ -1,15 +1,71 @@ +diff --git a/data/builder/meson.build b/data/builder/meson.build +index c7a430c0..e69de29b 100644 --- a/data/builder/meson.build +++ b/data/builder/meson.build @@ -1,3 +0,0 @@ -install_data('README.md', - install_dir : join_paths(localstatedir, 'lib', 'fwupd', 'builder') -) +diff --git a/meson_post_install.sh b/meson_post_install.sh +index 0cbb6f41..d757a81a 100755 --- a/meson_post_install.sh +++ b/meson_post_install.sh -@@ -11,6 +11,4 @@ +@@ -11,6 +11,4 @@ LOCALSTATEDIR=$2 echo 'Updating systemd deps' mkdir -p ${DESTDIR}${SYSTEMDUNITDIR}/system-update.target.wants ln -sf ../fwupd-offline-update.service ${DESTDIR}${SYSTEMDUNITDIR}/system-update.target.wants/fwupd-offline-update.service - echo 'Creating stateful directory' - mkdir -p ${DESTDIR}${LOCALSTATEDIR}/lib/fwupd #fi +diff --git a/plugins/flashrom/fu-plugin-flashrom.c b/plugins/flashrom/fu-plugin-flashrom.c +index 598e0c42..a0a2c4a7 100644 +--- a/plugins/flashrom/fu-plugin-flashrom.c ++++ b/plugins/flashrom/fu-plugin-flashrom.c +@@ -52,7 +52,7 @@ fu_plugin_startup (FuPlugin *plugin, GError **error) + g_autoptr(GError) error_local = NULL; + + /* we need flashrom from the host system */ +- data->flashrom_fn = fu_common_find_program_in_path ("flashrom", &error_local); ++ data->flashrom_fn = fu_common_find_program_in_path ("@flashrom@/bin/flashrom", &error_local); + + /* search for devices */ + hwids = fu_plugin_get_hwids (plugin); +diff --git a/plugins/uefi/fu-plugin-uefi.c b/plugins/uefi/fu-plugin-uefi.c +index 9293715c..e2e77c58 100644 +--- a/plugins/uefi/fu-plugin-uefi.c ++++ b/plugins/uefi/fu-plugin-uefi.c +@@ -416,7 +416,7 @@ fu_plugin_update (FuPlugin *plugin, + fu_plugin_add_report_metadata (plugin, "MissingCapsuleHeader", str); + + /* record boot information to system log for future debugging */ +- efibootmgr_path = fu_common_find_program_in_path ("efibootmgr", NULL); ++ efibootmgr_path = fu_common_find_program_in_path ("@efibootmgr@/bin/efibootmgr", NULL); + if (efibootmgr_path != NULL) { + if (!g_spawn_command_line_sync ("efibootmgr -v", + &boot_variables, NULL, NULL, error)) +diff --git a/plugins/uefi/fu-uefi-pcrs.c b/plugins/uefi/fu-uefi-pcrs.c +index 5c7e5239..01acbf7f 100644 +--- a/plugins/uefi/fu-uefi-pcrs.c ++++ b/plugins/uefi/fu-uefi-pcrs.c +@@ -147,7 +147,7 @@ fu_uefi_pcrs_setup (FuUefiPcrs *self, GError **error) + /* old name, then new name */ + argv0 = fu_common_find_program_in_path ("tpm2_listpcrs", NULL); + if (argv0 == NULL) +- argv0 = fu_common_find_program_in_path ("tpm2_pcrlist", error); ++ argv0 = fu_common_find_program_in_path ("@tpm2_tools@/bin/tpm2_pcrlist", error); + if (argv0 == NULL) + return FALSE; + if (!fu_uefi_pcrs_setup_tpm20 (self, argv0, error)) +diff --git a/src/fu-common.c b/src/fu-common.c +index bd6faeef..45ba2a60 100644 +--- a/src/fu-common.c ++++ b/src/fu-common.c +@@ -436,7 +436,7 @@ fu_common_firmware_builder (GBytes *bytes, + g_return_val_if_fail (error == NULL || *error == NULL, NULL); + + /* find bwrap in the path */ +- bwrap_fn = fu_common_find_program_in_path ("bwrap", error); ++ bwrap_fn = fu_common_find_program_in_path ("@bubblewrap@/bin/bwrap", error); + if (bwrap_fn == NULL) + return NULL; + diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index d8b9fc2a61e..111b5a4cc90 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "5.0.2019.05.29"; - modDirVersion = "5.0.0"; + version = "5.1.2019.07.11"; + modDirVersion = "5.1.0"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs.git"; - rev = "7e42539c80470cb655bbc46cd0f144de6c644523"; - sha256 = "0f7z3awfzdg56rby6z8dh9v9bzyyfn53zgwxmk367mfi0wqk49d2"; + rev = "44dc1f269553f33cce43628444970efb85a7e802"; + sha256 = "1i32s15r0a844dnp3h9ac37xm9h69g0jn75pqz2gbfrafpk3pac1"; }; extraConfig = "BCACHEFS_FS m"; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index de6efdb0c2d..3a80f4aa1de 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -22,10 +22,10 @@ rec { beta = stable; stable_430 = generic { - version = "430.26"; - sha256_64bit = "1rnfxl4dxa3jjidfdvfjmg1a8nc787ss15cakrp2wwrn8jlr9av6"; - settingsSha256 = "0rjsj697s9jfls7iz1hs7aqp36ihf3l82yz1x1w9wdvlw94a3nym"; - persistencedSha256 = "1n554i4g37hs49bb631x692ygfncn7a5hzb6mh9kx7hmv69yzazh"; + version = "430.34"; + sha256_64bit = "0c3x25gilibbgazvp20d5sfmmgcf0gfqf024nzzqryxg4m05h39b"; + settingsSha256 = "1xpf9gbpq5xynxm6f401ab09aa243h1sk2vcxvzjwqgcil36zzad"; + persistencedSha256 = "00dd0m87nwqfv9i23bvbqgcz10x9mvfxg9249nvhp4y3ha65rms6"; }; # Last one supporting x86 diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index 5420a651c79..1867c1a133a 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -72,6 +72,17 @@ stdenv.mkDerivation rec { ${lib.optionalString (!withGtk3) '' rm -f $out/lib/libnvidia-gtk3.so.* ''} + + # Install the desktop file and icon. + # The template has substitution variables intended to be replaced resulting + # in absolute paths. Because absolute paths break after the desktop file is + # copied by a desktop environment, make Exec and Icon be just a name. + sed -i doc/nvidia-settings.desktop \ + -e "s|^Exec=.*$|Exec=nvidia-settings|" \ + -e "s|^Icon=.*$|Icon=nvidia-settings|" \ + -e "s|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|Settings|g" + install doc/nvidia-settings.desktop -D -t $out/share/applications/ + install doc/nvidia-settings.png -D -t $out/share/icons/hicolor/128x128/apps/ ''; binaryName = if withGtk3 then ".nvidia-settings-wrapped" else "nvidia-settings"; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index ce84bb7cb41..34791cfdd71 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -1,76 +1,77 @@ -{ stdenv, fetchurl, fetchpatch, runCommand, pkgconfig, hexdump, which -, knot-dns, luajit, libuv, lmdb, gnutls, nettle -, cmocka, systemd, dns-root-data, makeWrapper +{ stdenv, fetchurl +# native deps. +, runCommand, pkgconfig, meson, ninja, makeWrapper +# build+runtime deps. +, knot-dns, luajitPackages, libuv, gnutls, lmdb, systemd, dns-root-data +# test-only deps. +, cmocka, which, cacert , extraFeatures ? false /* catch-all if defaults aren't enough */ -, luajitPackages }: let # un-indented, over the whole file result = if extraFeatures then wrapped-full else unwrapped; -inherit (stdenv.lib) optional; +inherit (stdenv.lib) optional optionals concatStringsSep; +lua = luajitPackages; + +# FIXME: remove these usages once resolving +# https://github.com/NixOS/nixpkgs/pull/63108#issuecomment-508670438 +exportLuaPathsFor = luaPkgs: '' + export LUA_PATH='${ concatStringsSep ";" (map lua.getLuaPath luaPkgs)}' + export LUA_CPATH='${concatStringsSep ";" (map lua.getLuaCPath luaPkgs)}' +''; unwrapped = stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "3.2.1"; + version = "4.1.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "d1396888ec3a63f19dccdf2b7dbcb0d16a5d8642766824b47f4c21be90ce362b"; + sha256 = "2fe470f9bb1007667cdd448f758087244b7195a0234c2b100a9beeed0a2d3e68"; }; - patches = [ - (fetchpatch { - name = "support-libzscanner-2.8.diff"; - url = "https://gitlab.labs.nic.cz/knot/knot-resolver/commit/186f263.diff"; - sha256 = "19zqigvc7m2a4j6bk9whx7gj0v009568rz5qwk052z7pzfikr8mk"; - }) - ]; - - # Short-lived cross fix, as upstream is migrating to meson anyway. - postPatch = '' - substituteInPlace platform.mk --replace "objdump" "$OBJDUMP" - ''; - outputs = [ "out" "dev" ]; - configurePhase = "patchShebangs scripts/"; + preConfigure = '' + patchShebangs scripts/ + '' + + stdenv.lib.optionalString doInstallCheck (exportLuaPathsFor [ lua.cqueues lua.basexx ]); - nativeBuildInputs = [ pkgconfig which hexdump ]; + nativeBuildInputs = [ pkgconfig meson ninja ]; # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements - buildInputs = [ knot-dns luajit libuv gnutls nettle lmdb ] - ++ optional stdenv.isLinux systemd # sd_notify + buildInputs = [ knot-dns lua.lua libuv gnutls lmdb ] + ++ optional stdenv.isLinux systemd # passing sockets, sd_notify ## optional dependencies; TODO: libedit, dnstap ; - checkInputs = [ cmocka ]; - - makeFlags = [ - "PREFIX=$(out)" - "ROOTHINTS=${dns-root-data}/root.hints" - "KEYFILE_DEFAULT=${dns-root-data}/root.ds" - ]; - CFLAGS = [ "-O2" "-DNDEBUG" ]; + mesonFlags = [ + "-Dkeyfile_default=${dns-root-data}/root.ds" + "-Droot_hints=${dns-root-data}/root.hints" + "-Dinstall_kresd_conf=disabled" # not really useful; examples are inside share/doc/ + "--default-library=static" # not used by anyone + ] + ++ optional doInstallCheck "-Dunit_tests=enabled" + ++ optional (doInstallCheck && !stdenv.isDarwin) "-Dconfig_tests=enabled" + #"-Dextra_tests=enabled" # not suitable as in-distro tests; many deps, too. + ; - enableParallelBuilding = true; - - doCheck = true; - doInstallCheck = false; # FIXME - preInstallCheck = '' - patchShebangs tests/config/runtest.sh + postInstall = '' + rm "$out"/lib/libkres.a ''; - postInstall = '' - rm "$out"/etc/knot-resolver/root.hints # using system-wide instead + # aarch64: see https://github.com/wahern/cqueues/issues/223 + doInstallCheck = with stdenv; hostPlatform == buildPlatform && !hostPlatform.isAarch64; + installCheckInputs = [ cmocka which cacert ]; + installCheckPhase = '' + meson test --print-errorlogs ''; meta = with stdenv.lib; { description = "Caching validating DNS resolver, from .cz domain registry"; homepage = https://knot-resolver.cz; license = licenses.gpl3Plus; - # Platforms using negative pointers for stack won't work ATM due to LuaJIT impl. - platforms = filter (p: p != "aarch64-linux") platforms.unix; + platforms = platforms.unix; maintainers = [ maintainers.vcunat /* upstream developer */ ]; }; }; @@ -93,11 +94,12 @@ wrapped-full = preferLocalBuild = true; allowSubstitutes = false; } - '' + (exportLuaPathsFor luaPkgs + + '' mkdir -p "$out"/{bin,share} makeWrapper '${unwrapped}/bin/kresd' "$out"/bin/kresd \ - --set LUA_PATH '${concatStringsSep ";" (map getLuaPath luaPkgs)}' \ - --set LUA_CPATH '${concatStringsSep ";" (map getLuaCPath luaPkgs)}' + --set LUA_PATH "$LUA_PATH" \ + --set LUA_CPATH "$LUA_CPATH" ln -sr '${unwrapped}/share/man' "$out"/share/ ln -sr "$out"/{bin,sbin} @@ -105,6 +107,6 @@ wrapped-full = echo "Checking that 'http' module loads, i.e. lua search paths work:" echo "modules.load('http')" > test-http.lua echo -e 'quit()' | env -i "$out"/bin/kresd -a 127.0.0.1#53535 -c test-http.lua - ''; + ''); in result diff --git a/pkgs/servers/foswiki/default.nix b/pkgs/servers/foswiki/default.nix deleted file mode 100644 index 67d460809e1..00000000000 --- a/pkgs/servers/foswiki/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchurl, perlPackages }: - -perlPackages.buildPerlPackage rec { - pname = "foswiki"; - version = "2.1.0"; - - src = fetchurl { - url = "mirror://sourceforge/foswiki/${version}/Foswiki-${version}.tgz"; - sha256 = "03286pb966h99zgickm2f20rgnqwp9wga5wfkdvirv084kjdh8vp"; - }; - - outputs = [ "out" ]; - - buildInputs = with perlPackages; [ - # minimum requirements from INSTALL.html#System_Requirements - AlgorithmDiff ArchiveTar AuthenSASL CGI CGISession CryptPasswdMD5 - EmailMIME Encode Error FileCopyRecursive HTMLParser HTMLTree - IOSocketSSL JSON - LocaleMaketextLexicon LocaleMsgfmt - LWP URI perlPackages.Version - /*# optional dependencies - libapreq2 DBI DBDmysql DBDPg DBDSQLite FCGI FCGIProcManager - CryptSMIME CryptX509 ConvertPEM - */ - ]; - - preConfigure = '' - touch Makefile.PL - patchShebangs . - ''; - configureScript = "bin/configure"; - - # there's even no makefile - doCheck = false; - installPhase = ''cp -r . "$out" ''; - - meta = with stdenv.lib; { - description = "An open, programmable collaboration platform"; - homepage = http://foswiki.org; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} - diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index f6526ab1f71..824f8ea2025 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "mautrix-unstable-${version}"; - version = "2019-02-24"; + version = "2019-07-04"; goPackagePath = "maunium.net/go/mautrix-whatsapp"; src = fetchFromGitHub { owner = "tulir"; repo = "mautrix-whatsapp"; - rev = "485acf6de654b8fb70007876c074fb004eb9717b"; - sha256 = "1v7h3s8h0aiq6g06h9j1sidw8y5aiw24sgdh9knr1c90pvvc7pmv"; + rev = "29f5ae45c4b22f463003b23e355b951831f08b3e"; + sha256 = "12209m3x01i7bnnkg57ag1ivsk6n6pqaqfin7y02irgi3i3rm31r"; }; goDeps = ./deps.nix; diff --git a/pkgs/servers/mautrix-whatsapp/deps.nix b/pkgs/servers/mautrix-whatsapp/deps.nix index 8624889e346..2dd35846bf5 100644 --- a/pkgs/servers/mautrix-whatsapp/deps.nix +++ b/pkgs/servers/mautrix-whatsapp/deps.nix @@ -1,21 +1,22 @@ +# NOTE: this file isn't entirely generated, while performing the bump +# from 2019-02-24 to 2019-06-01, a lot of stuff broke during `vgo2nix` as the +# tool is unable to parse `replace` statements atm. +# +# The following sources were altered manually: +# * github.com/Rhymen/go-whatsapp -> github.com/tulir/go-whatsapp (at 36ed380bdc18) +# * github.com/golang/protobuf: v1.2.0 -> v1.3.1 +# * maunium.net/go/mautrix: v0.1.0-alpha3 -> ca5d9535b6cc +# * maunium.net/go/mautrix-appservice: v0.1.0-alpha3 -> 6e6c9bb47548 + # file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ { - goPackagePath = "github.com/Baozisoftware/qrcode-terminal-go"; - fetch = { - type = "git"; - url = "https://github.com/Baozisoftware/qrcode-terminal-go"; - rev = "c0650d8dff0f"; - sha256 = "166h9zy9y7ygayhybg7d080hpdcf1mvkf3rwnq5lqg8i3cg71s7b"; - }; - } - { goPackagePath = "github.com/Rhymen/go-whatsapp"; fetch = { type = "git"; - url = "https://github.com/Rhymen/go-whatsapp"; - rev = "c1173899de99"; - sha256 = "1f46zpbfgv3k38lgdrcwqf4cm34dgqxlfs9qzg380in61460lcri"; + url = "https://github.com/tulir/go-whatsapp"; + rev = "36ed380bdc188e35fe804d6dd4809ee170136670"; + sha256 = "1ida4j5hgqc5djwfsaqp8g6iynn150rwj42kqk9q2srwz5075n4p"; }; } { @@ -32,8 +33,8 @@ fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "v1.2.0"; - sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + rev = "v1.3.1"; + sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"; }; } { @@ -41,8 +42,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/mux"; - rev = "v1.7.0"; - sha256 = "09cn5v1gxrrrydzyllp1asbhgm5xsawb92as7cg9jqg6iyqajvlc"; + rev = "v1.6.2"; + sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2"; }; } { @@ -55,12 +56,21 @@ }; } { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "v1.1.1"; + sha256 = "0g64wlg1l1ybq4x44idksl4pgm055s58jxc6r6x4qhqm5q76h0km"; + }; + } + { goPackagePath = "github.com/mattn/go-colorable"; fetch = { type = "git"; url = "https://github.com/mattn/go-colorable"; - rev = "v0.1.1"; - sha256 = "0l640974j804c1yyjfgyxqlsivz0yrzmbql4mhcw2azryigkp08p"; + rev = "v0.0.9"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; }; } { @@ -68,8 +78,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.5"; - sha256 = "114d5xm8rfxplzd7nxz97gfngb4bhqy102szl084d1afcxsvm4aa"; + rev = "v0.0.4"; + sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; }; } { @@ -82,7 +92,16 @@ }; } { - goPackagePath = "github.com/russross/blackfriday"; + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.8.1"; + sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; + }; + } + { + goPackagePath = "gopkg.in/russross/blackfriday.v2"; fetch = { type = "git"; url = "https://github.com/russross/blackfriday"; @@ -113,8 +132,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "ffb98f73852f"; - sha256 = "0hil543q2zq8wxsz6ljrfnrhhxg5j0mrjfwskf2x6q0ppqizsa4h"; + rev = "b8fe1690c613"; + sha256 = "1mbfpbrirsz8fsdkibm9l4sccpm774p9201mpmfh4hxshz3girq3"; }; } { @@ -136,15 +155,6 @@ }; } { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "cd391775e71e"; - sha256 = "12wk5ylx0jjajipr68yn50wcd0c9shzhq9y4an40ldnv4bsdp2rj"; - }; - } - { goPackagePath = "gopkg.in/check.v1"; fetch = { type = "git"; @@ -185,8 +195,8 @@ fetch = { type = "git"; url = "https://github.com/tulir/mautrix-go.git"; - rev = "v0.1.0-alpha.3"; - sha256 = "12nlyij57ss2a5d1f1k1vsmjjvxp1fannlrbnp2jsj6rrsq0d2wr"; + rev = "ca5d9535b6ccee8fdf473f9cc935932ef3e53ae7"; + sha256 = "1qrh77c8vh2k6ffwf0cymjmhcp7d0rdad1ixqx5r1xig27f7v0qg"; }; } { @@ -194,8 +204,8 @@ fetch = { type = "git"; url = "https://github.com/tulir/mautrix-appservice-go.git"; - rev = "v0.1.0-alpha.3"; - sha256 = "17y11wgqbrafbq6bnn4rp2lzd50fjz9d6f8j3382jsara7ps95vr"; + rev = "6e6c9bb4754849443cb3c64d9510f8d2eb3e668d"; + sha256 = "1zwsfvgxs2zbc6yvgnk16w2wkh891kihrzar3qzz9cvsgjznlyvy"; }; } ] diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix deleted file mode 100644 index ce660fa6e88..00000000000 --- a/pkgs/servers/monitoring/zabbix/2.0.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib -, enableJabber ? false, minmay ? null }: - -assert enableJabber -> minmay != null; - -let - - version = "2.0.21"; - branch = "2.0"; - - src = fetchurl { - url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz"; - sha256 = "14g22x2zy5xqnh2xg23xy5gjd49d1i8pks7pkidwdwa9acwgfx71"; - }; - - preConfigure = - '' - substituteInPlace ./configure \ - --replace " -static" "" \ - ${stdenv.lib.optionalString (stdenv.cc.libc != null) '' - --replace /usr/include/iconv.h ${stdenv.lib.getDev stdenv.cc.libc}/include/iconv.h - ''} - ''; - -in - -{ - recurseForDerivations = true; - - server = stdenv.mkDerivation { - name = "zabbix-${version}"; - - inherit src preConfigure; - - configureFlags = [ - "--enable-agent" - "--enable-server" - "--with-postgresql" - "--with-libcurl" - "--with-gettext" - ] ++ stdenv.lib.optional enableJabber "--with-jabber=${minmay}"; - - postPatch = '' - sed -i -e 's/iksemel/minmay/g' configure src/libs/zbxmedia/jabber.c - sed -i \ - -e '/^static ikstransport/,/}/d' \ - -e 's/iks_connect_with\(.*\), &zbx_iks_transport/mmay_connect_via\1/' \ - -e 's/iks/mmay/g' -e 's/IKS/MMAY/g' src/libs/zbxmedia/jabber.c - ''; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ postgresql curl openssl zlib ]; - - postInstall = - '' - mkdir -p $out/share/zabbix - cp -prvd frontends/php $out/share/zabbix/php - mkdir -p $out/share/zabbix/db/data - cp -prvd database/postgresql/data.sql $out/share/zabbix/db/data/data.sql - cp -prvd database/postgresql/images.sql $out/share/zabbix/db/data/images_pgsql.sql - mkdir -p $out/share/zabbix/db/schema - cp -prvd database/postgresql/schema.sql $out/share/zabbix/db/schema/postgresql.sql - ''; - - meta = { - inherit branch; - description = "An enterprise-class open source distributed monitoring solution"; - homepage = https://www.zabbix.com/; - license = "GPL"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; - }; - }; - - agent = stdenv.mkDerivation { - name = "zabbix-agent-${version}"; - - inherit src preConfigure; - - configureFlags = [ "--enable-agent" ]; - - meta = with stdenv.lib; { - inherit branch; - description = "An enterprise-class open source distributed monitoring solution (client-side agent)"; - homepage = https://www.zabbix.com/; - license = licenses.gpl2; - maintainers = [ maintainers.eelco ]; - platforms = platforms.linux; - }; - }; - -} diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix deleted file mode 100644 index ac0e6bb81f8..00000000000 --- a/pkgs/servers/monitoring/zabbix/2.2.nix +++ /dev/null @@ -1,104 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib -, net_snmp , libssh2, openldap -, enableJabber ? false, minmay ? null -, enableSnmp ? false -, enableSsh ? false -, enableLdap ? false -}: - -assert enableJabber -> minmay != null; - -let - - version = "2.2.20"; - branch = "2.2"; - - src = fetchurl { - url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz"; - sha256 = "00pfpyj3vydwx9dn0bklh1p5j0bp2awi4hvv4kgliyav8l0416hk"; - }; - - preConfigure = - '' - substituteInPlace ./configure \ - --replace " -static" "" \ - ${stdenv.lib.optionalString (stdenv.cc.libc != null) '' - --replace /usr/include/iconv.h ${stdenv.lib.getDev stdenv.cc.libc}/include/iconv.h - ''} - ''; - -in - -{ - recurseForDerivations = true; - - server = stdenv.mkDerivation { - name = "zabbix-${version}"; - - inherit src preConfigure; - - configureFlags = [ - "--enable-agent" - "--enable-server" - "--with-postgresql" - "--with-libcurl" - "--with-gettext" - ] - ++ stdenv.lib.optional enableJabber "--with-jabber=${minmay}" - ++ stdenv.lib.optional enableSnmp "--with-net-snmp" - ++ stdenv.lib.optional enableSsh "--with-ssh2=${libssh2.dev}" - ++ stdenv.lib.optional enableLdap "--with-ldap=${openldap.dev}"; - - postPatch = '' - sed -i -e 's/iksemel/minmay/g' configure src/libs/zbxmedia/jabber.c - sed -i \ - -e '/^static ikstransport/,/}/d' \ - -e 's/iks_connect_with\(.*\), &zbx_iks_transport/mmay_connect_via\1/' \ - -e 's/iks/mmay/g' -e 's/IKS/MMAY/g' src/libs/zbxmedia/jabber.c - ''; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ postgresql curl openssl zlib ] - ++ stdenv.lib.optional enableSnmp net_snmp - ++ stdenv.lib.optional enableSsh libssh2 - ++ stdenv.lib.optional enableLdap openldap; - - postInstall = - '' - mkdir -p $out/share/zabbix - cp -prvd frontends/php $out/share/zabbix/php - mkdir -p $out/share/zabbix/db/data - cp -prvd database/postgresql/data.sql $out/share/zabbix/db/data/data.sql - cp -prvd database/postgresql/images.sql $out/share/zabbix/db/data/images_pgsql.sql - mkdir -p $out/share/zabbix/db/schema - cp -prvd database/postgresql/schema.sql $out/share/zabbix/db/schema/postgresql.sql - ''; - - meta = { - inherit branch; - description = "An enterprise-class open source distributed monitoring solution"; - homepage = https://www.zabbix.com/; - license = "GPL"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; - }; - }; - - agent = stdenv.mkDerivation { - name = "zabbix-agent-${version}"; - - inherit src preConfigure; - - configureFlags = [ "--enable-agent" ]; - - meta = with stdenv.lib; { - inherit branch; - description = "An enterprise-class open source distributed monitoring solution (client-side agent)"; - homepage = https://www.zabbix.com/; - license = licenses.gpl2; - maintainers = [ maintainers.eelco ]; - platforms = platforms.linux; - }; - }; - -} diff --git a/pkgs/servers/monitoring/zabbix/3.4.nix b/pkgs/servers/monitoring/zabbix/3.4.nix deleted file mode 100644 index 72e6fa55b00..00000000000 --- a/pkgs/servers/monitoring/zabbix/3.4.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, pcre, libiconv, openssl }: - - -let - - version = "3.4.8"; - branch = "3.4"; - - src = fetchurl { - url = "https://netix.dl.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz"; - sha256 = "cec14993d1ec2c9d8c51f6608c9408620f27174db92edc2347bafa7b841ccc07"; - }; - -in - -{ - agent = stdenv.mkDerivation { - name = "zabbix-agent-${version}"; - - inherit src; - - configureFlags = [ - "--enable-agent" - "--with-libpcre=${pcre.dev}" - "--with-iconv=${libiconv}" - "--with-openssl=${openssl.dev}" - ]; - buildInputs = [ pcre libiconv openssl ]; - - meta = with stdenv.lib; { - inherit branch; - description = "An enterprise-class open source distributed monitoring solution (client-side agent)"; - homepage = https://www.zabbix.com/; - license = licenses.gpl2; - maintainers = [ maintainers.eelco ]; - platforms = platforms.linux; - }; - }; - -} - diff --git a/pkgs/servers/monitoring/zabbix/agent.nix b/pkgs/servers/monitoring/zabbix/agent.nix new file mode 100644 index 00000000000..09f43c755f1 --- /dev/null +++ b/pkgs/servers/monitoring/zabbix/agent.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, pkgconfig, libiconv, openssl, pcre }: + +import ./versions.nix ({ version, sha256 }: + stdenv.mkDerivation { + pname = "zabbix-agent"; + inherit version; + + src = fetchurl { + url = "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz"; + inherit sha256; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + libiconv + openssl + pcre + ]; + + configureFlags = [ + "--enable-agent" + "--with-iconv" + "--with-libpcre" + "--with-openssl=${openssl.dev}" + ]; + + postInstall = '' + cp conf/zabbix_agentd/*.conf $out/etc/zabbix_agentd.conf.d/ + ''; + + meta = with stdenv.lib; { + description = "An enterprise-class open source distributed monitoring solution (client-side agent)"; + homepage = "https://www.zabbix.com/"; + license = licenses.gpl2; + maintainers = with maintainers; [ mmahut psyanticy ]; + platforms = platforms.linux; + }; + }) diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix deleted file mode 100644 index 4b6bd5e0b25..00000000000 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib }: - -let - - version = "1.8.22"; - - src = fetchurl { - url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz"; - sha256 = "0cjj3c4j4b9sl3hgh1fck330z9q0gz2k68g227y0paal6k6f54g7"; - }; - - preConfigure = - '' - substituteInPlace ./configure \ - --replace " -static" "" \ - ${stdenv.lib.optionalString (stdenv.cc.libc != null) '' - --replace /usr/include/iconv.h ${stdenv.lib.getDev stdenv.cc.libc}/include/iconv.h - ''} - ''; - -in - -{ - - server = stdenv.mkDerivation { - name = "zabbix-${version}"; - - inherit src preConfigure; - - configureFlags = [ - "--enable-agent" - "--enable-server" - "--with-pgsql" - "--with-libcurl" - ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ postgresql curl openssl zlib ]; - - postInstall = - '' - mkdir -p $out/share/zabbix - cp -prvd frontends/php $out/share/zabbix/php - mkdir -p $out/share/zabbix/db/data - cp -prvd create/data/*.sql $out/share/zabbix/db/data - mkdir -p $out/share/zabbix/db/schema - cp -prvd create/schema/*.sql $out/share/zabbix/db/schema - ''; - - meta = { - description = "An enterprise-class open source distributed monitoring solution"; - homepage = https://www.zabbix.com/; - license = "GPL"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; - }; - }; - - agent = stdenv.mkDerivation { - name = "zabbix-agent-${version}"; - - inherit src preConfigure; - - configureFlags = [ "--enable-agent" ]; - - meta = with stdenv.lib; { - description = "An enterprise-class open source distributed monitoring solution (client-side agent)"; - homepage = https://www.zabbix.com/; - license = licenses.gpl2; - maintainers = [ maintainers.eelco ]; - platforms = platforms.linux; - }; - }; - -} diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix new file mode 100644 index 00000000000..2062dc6659f --- /dev/null +++ b/pkgs/servers/monitoring/zabbix/proxy.nix @@ -0,0 +1,79 @@ +{ stdenv, fetchurl, pkgconfig, libevent, libiconv, openssl, pcre, zlib +, odbcSupport ? true, unixODBC +, snmpSupport ? true, net_snmp +, sshSupport ? true, libssh2 +, sqliteSupport ? false, sqlite +, mysqlSupport ? false, mysql +, postgresqlSupport ? false, postgresql +}: + +# ensure exactly one database type is selected +assert mysqlSupport -> !postgresqlSupport && !sqliteSupport; +assert postgresqlSupport -> !mysqlSupport && !sqliteSupport; +assert sqliteSupport -> !mysqlSupport && !postgresqlSupport; + +let + inherit (stdenv.lib) optional optionalString; +in + import ./versions.nix ({ version, sha256 }: + stdenv.mkDerivation { + pname = "zabbix-proxy"; + inherit version; + + src = fetchurl { + url = "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz"; + inherit sha256; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + libevent + libiconv + openssl + pcre + zlib + ] + ++ optional odbcSupport unixODBC + ++ optional snmpSupport net_snmp + ++ optional sqliteSupport sqlite + ++ optional sshSupport libssh2 + ++ optional mysqlSupport mysql.connector-c + ++ optional postgresqlSupport postgresql; + + configureFlags = [ + "--enable-proxy" + "--with-iconv" + "--with-libevent" + "--with-libpcre" + "--with-openssl=${openssl.dev}" + "--with-zlib=${zlib}" + ] + ++ optional odbcSupport "--with-unixodbc" + ++ optional snmpSupport "--with-net-snmp" + ++ optional sqliteSupport "--with-sqlite3=${sqlite.dev}" + ++ optional sshSupport "--with-ssh2=${libssh2.dev}" + ++ optional mysqlSupport "--with-mysql" + ++ optional postgresqlSupport "--with-postgresql"; + + prePatch = '' + find database -name data.sql -exec sed -i 's|/usr/bin/||g' {} + + ''; + + postInstall = '' + mkdir -p $out/share/zabbix/database/ + '' + optionalString sqliteSupport '' + mkdir -p $out/share/zabbix/database/sqlite3 + cp -prvd database/sqlite3/*.sql $out/share/zabbix/database/sqlite3/ + '' + optionalString postgresqlSupport '' + mkdir -p $out/share/zabbix/database/postgresql + cp -prvd database/postgresql/schema.sql $out/share/zabbix/database/postgresql/ + ''; + + meta = with stdenv.lib; { + description = "An enterprise-class open source distributed monitoring solution (client-server proxy)"; + homepage = "https://www.zabbix.com/"; + license = licenses.gpl2; + maintainers = [ maintainers.mmahut ]; + platforms = platforms.linux; + }; + }) diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix new file mode 100644 index 00000000000..51ca38e8cfc --- /dev/null +++ b/pkgs/servers/monitoring/zabbix/server.nix @@ -0,0 +1,86 @@ +{ stdenv, fetchurl, pkgconfig, curl, libevent, libiconv, libxml2, openssl, pcre, zlib +, jabberSupport ? true, iksemel +, ldapSupport ? true, openldap +, odbcSupport ? true, unixODBC +, snmpSupport ? true, net_snmp +, sshSupport ? true, libssh2 +, mysqlSupport ? false, mysql +, postgresqlSupport ? false, postgresql +}: + +# ensure exactly one primary database type is selected +assert mysqlSupport -> !postgresqlSupport; +assert postgresqlSupport -> !mysqlSupport; + +let + inherit (stdenv.lib) optional optionalString; +in + import ./versions.nix ({ version, sha256 }: + stdenv.mkDerivation { + pname = "zabbix-server"; + inherit version; + + src = fetchurl { + url = "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz"; + inherit sha256; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + curl + libevent + libiconv + libxml2 + openssl + pcre + zlib + ] + ++ optional odbcSupport unixODBC + ++ optional jabberSupport iksemel + ++ optional ldapSupport openldap + ++ optional snmpSupport net_snmp + ++ optional sshSupport libssh2 + ++ optional mysqlSupport mysql.connector-c + ++ optional postgresqlSupport postgresql; + + configureFlags = [ + "--enable-server" + "--with-iconv" + "--with-libcurl" + "--with-libevent" + "--with-libpcre" + "--with-libxml2" + "--with-openssl=${openssl.dev}" + "--with-zlib=${zlib}" + ] + ++ optional odbcSupport "--with-unixodbc" + ++ optional jabberSupport "--with-jabber" + ++ optional ldapSupport "--with-ldap=${openldap.dev}" + ++ optional snmpSupport "--with-net-snmp" + ++ optional sshSupport "--with-ssh2=${libssh2.dev}" + ++ optional mysqlSupport "--with-mysql" + ++ optional postgresqlSupport "--with-postgresql"; + + prePatch = '' + find database -name data.sql -exec sed -i 's|/usr/bin/||g' {} + + ''; + + postInstall = '' + mkdir -p $out/share/zabbix/database/ + cp -r include $out/ + '' + optionalString mysqlSupport '' + mkdir -p $out/share/zabbix/database/mysql + cp -prvd database/mysql/*.sql $out/share/zabbix/database/mysql/ + '' + optionalString postgresqlSupport '' + mkdir -p $out/share/zabbix/database/postgresql + cp -prvd database/postgresql/*.sql $out/share/zabbix/database/postgresql/ + ''; + + meta = with stdenv.lib; { + description = "An enterprise-class open source distributed monitoring solution"; + homepage = "https://www.zabbix.com/"; + license = licenses.gpl2; + maintainers = with maintainers; [ mmahut psyanticy ]; + platforms = platforms.linux; + }; + }) diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix new file mode 100644 index 00000000000..7b6b5d8fccc --- /dev/null +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -0,0 +1,16 @@ +generic: { + v42 = generic { + version = "4.2.3"; + sha256 = "0865c1a9vcgg4syhp5133rw9v1h65lp0g1y2f758jb9x9ybrr01s"; + }; + + v40 = generic { + version = "4.0.9"; + sha256 = "1lc4wx3cing5w2qa18yb6232qd70hrfjq7jmnx4ip3nawnswj2xa"; + }; + + v30 = generic { + version = "3.0.28"; + sha256 = "16966danf5ww4lhjg5gx5bnpid8abxh2ymdg6k5mymrman5bcdjj"; + }; +} diff --git a/pkgs/servers/monitoring/zabbix/web.nix b/pkgs/servers/monitoring/zabbix/web.nix new file mode 100644 index 00000000000..c4cf5d044da --- /dev/null +++ b/pkgs/servers/monitoring/zabbix/web.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, writeText }: + +import ./versions.nix ({ version, sha256 }: + stdenv.mkDerivation rec { + pname = "zabbix-web"; + inherit version; + + src = fetchurl { + url = "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz"; + inherit sha256; + }; + + phpConfig = writeText "zabbix.conf.php" '' + <?php + return require(getenv('ZABBIX_CONFIG')); + ?> + ''; + + installPhase = '' + mkdir -p $out/share/zabbix/ + cp -a frontends/php/. $out/share/zabbix/ + cp ${phpConfig} $out/share/zabbix/conf/zabbix.conf.php + ''; + + meta = with stdenv.lib; { + description = "An enterprise-class open source distributed monitoring solution (web frontend)"; + homepage = "https://www.zabbix.com/"; + license = licenses.gpl2; + maintainers = [ maintainers.mmahut ]; + platforms = platforms.linux; + }; + }) diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix new file mode 100644 index 00000000000..76e469fe6e0 --- /dev/null +++ b/pkgs/servers/routinator/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "routinator"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "NLnetLabs"; + repo = pname; + rev = "v${version}"; + sha256 = "0ldnak1jszfkwya0aci7ns3293y45jp7iirilnqypklsmmm108r4"; + }; + + cargoSha256 = "0yx5sanblalh5q06cn0mrf5bc5518y1awmvyi5yhh55cz6bg6h1m"; + + meta = with stdenv.lib; { + description = "An RPKI Validator written in Rust"; + homepage = "https://github.com/NLnetLabs/routinator"; + license = licenses.bsd3; + maintainers = [ maintainers."0x4A6F" ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix index 8f521ed36d0..a6d8a046907 100644 --- a/pkgs/tools/admin/clair/default.nix +++ b/pkgs/tools/admin/clair/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { pname = "clair"; - version = "2.0.7"; + version = "2.0.8"; goPackagePath = "github.com/coreos/clair"; src = fetchFromGitHub { owner = "coreos"; - repo = "clair"; + repo = pname; rev = "v${version}"; - sha256 = "0n4pxdw71hd1rxzgf422fvycpjkrxxnvcidys0hpjy7gs88zjz5x"; + sha256 = "1gwn533fdz8daz1db7w7g7mhls7d5a4vndn47blkpbx2yxdwdh62"; }; nativeBuildInputs = [ makeWrapper ]; @@ -22,8 +22,8 @@ buildGoPackage rec { meta = with lib; { description = "Vulnerability Static Analysis for Containers"; - homepage = https://github.com/coreos/clair; + homepage = "https://github.com/coreos/clair"; license = licenses.asl20; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam ]; }; } diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 48b3a91b971..c99221b36ba 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -1,17 +1,16 @@ -{ stdenv, fetchurl, perl, unzip }: +{ stdenv, fetchFromGitHub, perl, unzip }: + stdenv.mkDerivation rec { name = "zpaq-${version}"; - version = "715"; + version = "7.15"; - src = let - mungedVersion = with stdenv.lib; concatStrings (splitString "." version); - in fetchurl { - sha256 = "066l94yyladlfzri877nh2dhkvspagjn3m5bmv725fmhkr9c4pp8"; - url = "http://mattmahoney.net/dc/zpaq${mungedVersion}.zip"; + src = fetchFromGitHub { + owner = "zpaq"; + repo = "zpaq"; + rev = version; + sha256 = "0v44rlg9gvwc4ggr2lhcqll8ppal3dk7zsg5bqwcc5lg3ynk2pz4"; }; - sourceRoot = "."; - nativeBuildInputs = [ perl /* for pod2man */ ]; buildInputs = [ unzip ]; diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 48926a3aade..5e75346e46b 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "bcachefs-tools"; - version = "2019-05-29"; + version = "2019-07-11"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "34b93747051055c1076add36f4730c7715e27f07"; - sha256 = "1z6ih0mssa9y9yr3v0dzrflliqz8qfdkjb29p9nqbpg8iqi45fa8"; + rev = "33c91e2ff4e228cb618ca22d642a34ec1c2cf0ef"; + sha256 = "0glldbnda61xwf7309mk48qmxqnipjmcgsibab77nr6v3bg13ip1"; }; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 0a3ae5c28e9..ec594de0c34 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -14,14 +14,14 @@ let binPath = stdenv.lib.makeBinPath [ wget ]; in stdenv.mkDerivation rec { - name = "debootstrap-${version}"; - version = "1.0.114"; + pname = "debootstrap"; + version = "1.0.115"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) - url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz"; - sha256 = "14lw18bhxap1g15q0rhslacj1bcrl69wrqcx6azmbvd92rl4bqd8"; + url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.gz"; + sha256 = "1s6ln7r6y91f0xmzbf9x4yx53hzcpiaa76i9dbmpy0ibw1ji30g4"; }; nativeBuildInputs = [ makeWrapper ]; @@ -57,11 +57,11 @@ in stdenv.mkDerivation rec { runHook postInstall ''; - meta = { + meta = with stdenv.lib; { description = "Tool to create a Debian system in a chroot"; homepage = https://wiki.debian.org/Debootstrap; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ marcweber ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/lesspipe/default.nix b/pkgs/tools/misc/lesspipe/default.nix index d5352ec26dc..9bb46f113fd 100644 --- a/pkgs/tools/misc/lesspipe/default.nix +++ b/pkgs/tools/misc/lesspipe/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, substituteAll, perl, file, ncurses }: stdenv.mkDerivation rec { - name = "lesspipe-${version}"; - version = "1.82"; + pname = "lesspipe"; + version = "1.83"; buildInputs = [ perl ]; preConfigure = "patchShebangs ."; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "wofr06"; repo = "lesspipe"; rev = version; - sha256 = "0vb7bpap8vy003ha10hc7hxl17y47sgdnrjpihgqxkn8k0bfqbbq"; + sha256 = "1vqch6k4fz5pyf8szlnqm3qhlvgs9l4njd13yczjh4kpaxpn0rxb"; }; patches = [ diff --git a/pkgs/tools/misc/most/default.nix b/pkgs/tools/misc/most/default.nix index 3471016db5b..6baaa38f1bb 100644 --- a/pkgs/tools/misc/most/default.nix +++ b/pkgs/tools/misc/most/default.nix @@ -1,13 +1,20 @@ { stdenv, fetchurl, slang, ncurses }: -stdenv.mkDerivation { - name = "most-5.0.0a"; +stdenv.mkDerivation rec { + pname = "most"; + version = "5.1.0"; src = fetchurl { - url = ftp://space.mit.edu/pub/davis/most/most-5.0.0a.tar.bz2; - sha256 = "1aas904g8x48vsfh3wcr2k6mjzkm5808lfgl2qqhdfdnf4p5mjwl"; + url = "https://www.jedsoft.org/releases/${pname}/${pname}-${version}.tar.gz"; + sha256 = "008537ns659pw2aag15imwjrxj73j26aqq90h285is6kz8gmv06v"; }; + outputs = [ "out" "doc" ]; + + makeFlags = [ + "DOC_DIR=${placeholder ''doc''}/share/doc/most" + ]; + preConfigure = '' sed -i -e "s|-ltermcap|-lncurses|" configure sed -i autoconf/Makefile.in src/Makefile.in \ @@ -19,15 +26,15 @@ stdenv.mkDerivation { buildInputs = [ slang ncurses ]; - meta = { + meta = with stdenv.lib; { description = "A terminal pager similar to 'more' and 'less'"; longDescription = '' MOST is a powerful paging program for Unix, VMS, MSDOS, and win32 systems. Unlike other well-known paging programs most supports multiple windows and can scroll left and right. Why settle for less? ''; - homepage = http://www.jedsoft.org/most/index.html; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + homepage = "https://www.jedsoft.org/most/index.html"; + license = licenses.gpl2; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/oppai-ng/default.nix b/pkgs/tools/misc/oppai-ng/default.nix new file mode 100644 index 00000000000..46b2fd444ec --- /dev/null +++ b/pkgs/tools/misc/oppai-ng/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "oppai-ng"; + version = "3.2.3"; + + src = fetchFromGitHub { + owner = "Francesco149"; + repo = pname; + rev = version; + sha256 = "1wrnpnx1yl0pdzmla4knlpcwy7baamy2wpdypnbdqxrn0zkw7kzk"; + }; + + buildPhase = '' + ./build + ./libbuild + ''; + + installPhase = '' + install -D oppai $out/bin/oppai + install -D oppai.c $out/include/oppai.c + install -D liboppai.so $out/lib/liboppai.so + ''; + + meta = with stdenv.lib; { + description = "Difficulty and pp calculator for osu!"; + homepage = "https://github.com/Francesco149/oppai-ng"; + license = licenses.unlicense; + maintainers = with maintainers; [ tadeokondrak ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 8aaa8e22994..a5dcad2b119 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2019.07.02"; + version = "2019.07.12"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1ci09m2fg23vk92sk3wkg0b2jkph8d06spyn2s3fgr1rwzwazgir"; + sha256 = "1mf8nh972hjpxj01q37jghj32rv21y91fpbwwsqmbmh65dr4k1dn"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index fa435b6c66a..6aa357dacb6 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -1,15 +1,18 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, gettext, libssl }: +{ stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive +, pkgconfig, gettext, libssl }: stdenv.mkDerivation rec { - name = "axel-${version}"; - version = "2.17.1"; + pname = "axel"; + version = "2.17.3"; - src = fetchurl { - url = "https://github.com/axel-download-accelerator/axel/releases/download/v${version}/${name}.tar.xz"; - sha256 = "1mwyps6yvrjxp7mpzc0a2hwr2pw050c63fc9aqjzdzjjw123dfrn"; + src = fetchFromGitHub { + owner = "axel-download-accelerator"; + repo = pname; + rev = "v${version}"; + sha256 = "0kdd2y92plv240ba2j3xrm0f8xygvm1ijghnric4whsnxvmgym7h"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig autoconf-archive ]; buildInputs = [ gettext libssl ]; diff --git a/pkgs/tools/networking/grpcui/default.nix b/pkgs/tools/networking/grpcui/default.nix new file mode 100644 index 00000000000..b256b5b37d9 --- /dev/null +++ b/pkgs/tools/networking/grpcui/default.nix @@ -0,0 +1,23 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "grpcui"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "fullstorydev"; + repo = pname; + rev = "v${version}"; + sha256 = "0h4xpyd6phj3svjzxh6nd98ym81x4a2v6jxcnqj4psjinwd4p3md"; + }; + + modSha256 = "1hsq2gfhscl4wvld346xrp018sb1g3xvga3d8chlbgw93rmhhszb"; + + meta = with lib; { + description = "An interactive web UI for gRPC, along the lines of postman"; + homepage = "https://github.com/fullstorydev/grpcui"; + license = licenses.mit; + maintainers = with maintainers; [ pradyuman ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index 2745c8c1d84..7d709df75b6 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -27,10 +27,10 @@ let wrapper = stdenv.mkDerivation rec { in stdenv.mkDerivation rec { - name = "i2p-0.9.39"; + name = "i2p-0.9.41"; src = fetchurl { url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; - sha256 = "0d6g0ffv2b0ghjjp3ndal8n9maw5y0n36vqrylhh5zr1hffvxx9i"; + sha256 = "0adrj56i3pcc9ainj22akjrrvy73carz5jk29qa1h2b9q03di73b"; }; buildInputs = [ jdk ant gettext which ]; patches = [ ./i2p.patch ]; diff --git a/pkgs/tools/package-management/xbps/default.nix b/pkgs/tools/package-management/xbps/default.nix index d29b46b87be..6a96e5b43b5 100644 --- a/pkgs/tools/package-management/xbps/default.nix +++ b/pkgs/tools/package-management/xbps/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, pkgconfig, which, zlib, openssl, libarchive }: +{ stdenv, fetchFromGitHub, pkgconfig, which, zlib, openssl_1_1, libarchive }: stdenv.mkDerivation rec { - name = "xbps-${version}"; - version = "0.53"; + pname = "xbps"; + version = "0.56"; src = fetchFromGitHub { owner = "void-linux"; repo = "xbps"; rev = version; - sha256 = "1zicin2z5j7vg2ixzpd6nahjhrjwdcavm817wzgs9x013b596paa"; + sha256 = "0hqvq6fq62l5sgm4fy3zb0ks889d21mqz4f4my3iifs6c9f50na2"; }; nativeBuildInputs = [ pkgconfig which ]; - buildInputs = [ zlib openssl libarchive ]; + buildInputs = [ zlib openssl_1_1 libarchive ]; patches = [ ./cert-paths.patch ]; diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index ecb1df73e39..7a8fb5a3244 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -16,11 +16,11 @@ assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { name = "gnupg-${version}"; - version = "2.2.16"; + version = "2.2.17"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1jqlzp9b3kpfp1dkjqskm67jjrhvf9nh3lzf45321p7m9d2qvgkc"; + sha256 = "056mgy09lvsi03531a437qj58la1j2x1y1scvfi53diris3658mg"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 7ccb9efcdd5..888d3bb4018 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -2,7 +2,8 @@ buildGoPackage rec { name = "saml2aws-${version}"; - version = "2.10.0"; + pname = "saml2aws"; + version = "2.15.0"; goPackagePath = "github.com/versent/saml2aws"; goDeps = ./deps.nix; @@ -15,7 +16,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "Versent"; repo = "saml2aws"; - sha256 = "00m8x57fgry601w5f9dxnxdqbbqjiv7c0rsx47iv9qsp0w7l50c5"; + sha256 = "0pn4zdzisgan7vvgi7hp8716wsb2x33gq55c7fw1aa2qwy0bq3gp"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/saml2aws/deps.nix b/pkgs/tools/security/saml2aws/deps.nix index 6069f0b184a..08a26db91b1 100644 --- a/pkgs/tools/security/saml2aws/deps.nix +++ b/pkgs/tools/security/saml2aws/deps.nix @@ -1,6 +1,15 @@ # file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) [ { + goPackagePath = "github.com/99designs/keyring"; + fetch = { + type = "git"; + url = "https://github.com/99designs/keyring"; + rev = "82da6802f65f1ac7963cfc3b7c62ae12dab8ee5d"; + sha256 = "105ddy9vkjr6cmcm85qnxxlnsmkx2svm6bd80rzr9n6zyc5hhk7b"; + }; + } + { goPackagePath = "github.com/AlecAivazis/survey"; fetch = { type = "git"; @@ -64,6 +73,15 @@ }; } { + goPackagePath = "github.com/aulanov/go.dbus"; + fetch = { + type = "git"; + url = "https://github.com/aulanov/go.dbus"; + rev = "25c3068a42a0b50b877953fb249dbcffc6bd1bca"; + sha256 = "0jh4jyxqhsl1rkzabhln7chw1jkzhqw2nn0mw79cmn8fyafi0rgn"; + }; + } + { goPackagePath = "github.com/aws/aws-sdk-go"; fetch = { type = "git"; @@ -109,6 +127,15 @@ }; } { + goPackagePath = "github.com/dvsekhvalnov/jose2go"; + fetch = { + type = "git"; + url = "https://github.com/dvsekhvalnov/jose2go"; + rev = "f21a8cedbbae609f623613ec8f81125c243212e6"; + sha256 = "1nzwvk6nqi7nm2wq4mr2q6k5p0qzsl0kmwx7kgkqsg1zh53250ld"; + }; + } + { goPackagePath = "github.com/fatih/color"; fetch = { type = "git"; @@ -127,6 +154,33 @@ }; } { + goPackagePath = "github.com/godbus/dbus"; + fetch = { + type = "git"; + url = "https://github.com/godbus/dbus"; + rev = "2ff6f7ffd60f0f2410b3105864bdd12c7894f844"; + sha256 = "1c107893nbdfc297i9y0smljmqs167mw26i24509qd09dmvr998y"; + }; + } + { + goPackagePath = "github.com/gsterjov/go-libsecret"; + fetch = { + type = "git"; + url = "https://github.com/gsterjov/go-libsecret"; + rev = "a6f4afe4910cad8688db3e0e9b9ac92ad22d54e1"; + sha256 = "09zaiadnll83vs22ib89agg7anj0blw5fywvmckxllsgif6ak6v7"; + }; + } + { + goPackagePath = "github.com/headzoo/surf"; + fetch = { + type = "git"; + url = "https://github.com/headzoo/surf"; + rev = "a4a8c16c01dc47ef3a25326d21745806f3e6797a"; + sha256 = "1dzcp0wdh3qmm5s5hixk9vj2s2kcvkpbhjdwz7kh2crvnavdgwh6"; + }; + } + { goPackagePath = "github.com/jmespath/go-jmespath"; fetch = { type = "git"; @@ -136,6 +190,15 @@ }; } { + goPackagePath = "github.com/keybase/go-keychain"; + fetch = { + type = "git"; + url = "https://github.com/keybase/go-keychain"; + rev = "f1daa725cce4049b1715f1e97d6a51880e401e70"; + sha256 = "0wk2zc5f5i5mhdkbyzd60wzc64vybds6kxlmwc41k8mx6d1hxdm6"; + }; + } + { goPackagePath = "github.com/mattn/go-colorable"; fetch = { type = "git"; @@ -190,6 +253,15 @@ }; } { + goPackagePath = "github.com/robertkrimen/otto"; + fetch = { + type = "git"; + url = "https://github.com/robertkrimen/otto"; + rev = "15f95af6e78dcd2030d8195a138bd88d4f403546"; + sha256 = "07j7l340lmqwpfscwyb8llk3k37flvs20a4a8vzc85f16xyd9npf"; + }; + } + { goPackagePath = "github.com/sirupsen/logrus"; fetch = { type = "git"; @@ -288,4 +360,13 @@ sha256 = "0fx123601aiqqn0yr9vj6qp1bh8gp240w4qdm76irs73q8dxlk7a"; }; } + { + goPackagePath = "gopkg.in/sourcemap.v1"; + fetch = { + type = "git"; + url = "https://github.com/go-sourcemap/sourcemap"; + rev = "6e83acea0053641eff084973fee085f0c193c61a"; + sha256 = "08rf2dl13hbnm3fq2cm0nnsspy9fhf922ln23cz5463cv7h62as4"; + }; + } ] \ No newline at end of file diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix index 662b87f3e85..95fa1047fe5 100644 --- a/pkgs/tools/system/acpica-tools/default.nix +++ b/pkgs/tools/system/acpica-tools/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, bison, flex }: stdenv.mkDerivation rec { - name = "acpica-tools-${version}"; - version = "20190509"; + pname = "acpica-tools"; + version = "20190703"; src = fetchurl { url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "06k22kfnjzf3mpvrb7xl2pfnh28q3n8wcgdjchl1j2hik5pan97i"; + sha256 = "031m124a109vv6fx667h4ca2iav0xszrlvif9zcfxcaxbjsn6991"; }; NIX_CFLAGS_COMPILE = "-O3"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73079bbced9..17913fa63ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1430,6 +1430,8 @@ in dislocker = callPackage ../tools/filesystems/dislocker { }; + distgen = callPackage ../development/tools/distgen {}; + distrobuilder = callPackage ../tools/virtualization/distrobuilder { }; ditaa = callPackage ../tools/graphics/ditaa { }; @@ -1844,6 +1846,8 @@ in roundcubePlugins = dontRecurseIntoAttrs (callPackage ../servers/roundcube/plugins { }); + routinator = callPackage ../servers/routinator { }; + rsbep = callPackage ../tools/backup/rsbep { }; rsyslog = callPackage ../tools/system/rsyslog { @@ -3439,6 +3443,8 @@ in grpcurl = callPackage ../tools/networking/grpcurl { }; + grpcui = callPackage ../tools/networking/grpcui { }; + grub = pkgsi686Linux.callPackage ../tools/misc/grub ({ stdenv = overrideCC stdenv buildPackages.pkgsi686Linux.gcc6; } // (config.grub or {})); @@ -5076,6 +5082,8 @@ in stdenv = clangStdenv; }; + oppai-ng = callPackage ../tools/misc/oppai-ng { }; + update-resolv-conf = callPackage ../tools/networking/openvpn/update-resolv-conf.nix { }; opae = callPackage ../development/libraries/opae { }; @@ -10258,6 +10266,10 @@ in directfb = callPackage ../development/libraries/directfb { }; + discord-rpc = callPackage ../development/libraries/discord-rpc { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; + dlib = callPackage ../development/libraries/dlib { }; docopt_cpp = callPackage ../development/libraries/docopt_cpp { }; @@ -12963,6 +12975,8 @@ in qtkeychain = callPackage ../development/libraries/qtkeychain { }; + qtpbfimageplugin = libsForQt5.callPackage ../development/libraries/qtpbfimageplugin { }; + qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { }; quesoglc = callPackage ../development/libraries/quesoglc { }; @@ -13092,6 +13106,8 @@ in SDL_gfx = callPackage ../development/libraries/SDL_gfx { }; + SDL_gpu = callPackage ../development/libraries/SDL_gpu { }; + SDL_image = callPackage ../development/libraries/SDL_image { }; SDL_mixer = callPackage ../development/libraries/SDL_mixer { }; @@ -14252,8 +14268,6 @@ in firebird = callPackage ../servers/firebird { icu = null; stdenv = gcc5Stdenv; }; firebirdSuper = firebird.override { icu = icu58; superServer = true; stdenv = gcc5Stdenv; }; - foswiki = callPackage ../servers/foswiki { }; - frab = callPackage ../servers/web-apps/frab { }; freepops = callPackage ../servers/mail/freepops { }; @@ -14922,11 +14936,24 @@ in youtrack = callPackage ../servers/jetbrains/youtrack.nix { }; - zabbix = recurseIntoAttrs (callPackages ../servers/monitoring/zabbix {}); + zabbixFor = version: rec { + agent = (callPackages ../servers/monitoring/zabbix/agent.nix {}).${version}; + proxy-mysql = (callPackages ../servers/monitoring/zabbix/proxy.nix { mysqlSupport = true; }).${version}; + proxy-pgsql = (callPackages ../servers/monitoring/zabbix/proxy.nix { postgresqlSupport = true; }).${version}; + proxy-sqlite = (callPackages ../servers/monitoring/zabbix/proxy.nix { sqliteSupport = true; }).${version}; + server-mysql = (callPackages ../servers/monitoring/zabbix/server.nix { mysqlSupport = true; }).${version}; + server-pgsql = (callPackages ../servers/monitoring/zabbix/server.nix { postgresqlSupport = true; }).${version}; + web = (callPackages ../servers/monitoring/zabbix/web.nix {}).${version}; + + # backwards compatibility + server = server-pgsql; + }; + + zabbix42 = zabbixFor "v42"; + zabbix40 = zabbixFor "v40"; + zabbix30 = zabbixFor "v30"; - zabbix20 = callPackage ../servers/monitoring/zabbix/2.0.nix { }; - zabbix22 = callPackage ../servers/monitoring/zabbix/2.2.nix { }; - zabbix34 = callPackage ../servers/monitoring/zabbix/3.4.nix { }; + zabbix = zabbix42; zipkin = callPackage ../servers/monitoring/zipkin { }; @@ -17154,7 +17181,9 @@ in inherit (darwin.apple_sdk.frameworks) Carbon; }; - cdrtools = callPackage ../applications/misc/cdrtools { }; + cdrtools = callPackage ../applications/misc/cdrtools { + inherit (darwin.apple_sdk.frameworks) Carbon IOKit; + }; centerim = callPackage ../applications/networking/instant-messengers/centerim { }; @@ -18469,7 +18498,9 @@ in i3lock-pixeled = callPackage ../misc/screensavers/i3lock-pixeled { }; - betterlockscreen = callPackage ../misc/screensavers/betterlockscreen { }; + betterlockscreen = callPackage ../misc/screensavers/betterlockscreen { + inherit (xorg) xrdb; + }; i3minator = callPackage ../tools/misc/i3minator { }; @@ -21679,12 +21710,7 @@ in minecraft = callPackage ../games/minecraft { }; - minecraft-server = minecraft-server_1_14; - - inherit (callPackages ../games/minecraft-server { }) - minecraft-server_1_14 - minecraft-server_1_13_2 - minecraft-server_1_12_2; + minecraft-server = callPackage ../games/minecraft-server { }; moon-buggy = callPackage ../games/moon-buggy {}; diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index a0c99847274..6f30bd06a81 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -6,6 +6,7 @@ , officialRelease , pkgs ? import nixpkgs.outPath {} , nix ? pkgs.nix +, lib-tests ? import ../../lib/tests/release.nix { inherit pkgs; } }: with pkgs; @@ -18,7 +19,7 @@ releaseTools.sourceTarball rec { version = pkgs.lib.fileContents ../../.version; versionSuffix = "pre${toString nixpkgs.revCount}.${nixpkgs.shortRev}"; - buildInputs = [ nix.out jq ]; + buildInputs = [ nix.out jq lib-tests ]; configurePhase = '' eval "$preConfigure" @@ -60,20 +61,6 @@ releaseTools.sourceTarball rec { exit 1 fi - # Run the regression tests in `lib'. - if - # `set -e` doesn't work inside here, so need to && instead :( - res="$(nix-instantiate --eval --strict lib/tests/misc.nix --show-trace)" \ - && [[ "$res" == "[ ]" ]] \ - && res="$(nix-instantiate --eval --strict lib/tests/systems.nix --show-trace)" \ - && [[ "$res" == "[ ]" ]] - then - true - else - echo "regression tests for lib failed, got: $res" - exit 1 - fi - # Check that all-packages.nix evaluates on a number of platforms without any warnings. for platform in i686-linux x86_64-linux x86_64-darwin; do header "checking Nixpkgs on $platform" diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index eb389587c03..080754b4b1f 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -372,12 +372,12 @@ let }; phpstan = mkDerivation rec { - version = "0.11.8"; + version = "0.11.12"; pname = "phpstan"; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "0xdf0kq5jpbqs6dwyv2fggd3cxjjq16xk5nxz1hgh5d58x5yh14n"; + sha256 = "12k74108f7a3k7ms8n4c625vpxrq75qamw1k1q09ndzmbn3i7c9b"; }; phases = [ "installPhase" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5dac3b894f5..00e72246f09 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -58,23 +58,7 @@ let # See build-setupcfg/default.nix for documentation. buildSetupcfg = import ../build-support/build-setupcfg self; - fetchPypi = makeOverridable( {format ? "setuptools", ... } @attrs: - let - fetchWheel = {pname, version, sha256, python ? "py2.py3", abi ? "none", platform ? "any"}: - # Fetch a wheel. By default we fetch an universal wheel. - # See https://www.python.org/dev/peps/pep-0427/#file-name-convention for details regarding the optional arguments. - let - url = "https://files.pythonhosted.org/packages/${python}/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}-${python}-${abi}-${platform}.whl"; - in pkgs.fetchurl {inherit url sha256;}; - fetchSource = {pname, version, sha256, extension ? "tar.gz"}: - # Fetch a source tarball. - let - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.${extension}"; - in pkgs.fetchurl {inherit url sha256;}; - fetcher = (if format == "wheel" then fetchWheel - else if format == "setuptools" then fetchSource - else throw "Unsupported kind ${kind}"); - in fetcher (builtins.removeAttrs attrs ["format"]) ); + fetchPypi = callPackage ../development/interpreters/python/fetchpypi.nix {}; # Check whether a derivation provides a Python module. hasPythonModule = drv: drv?pythonModule && drv.pythonModule == python; @@ -644,8 +628,6 @@ in { pims = callPackage ../development/python-modules/pims { }; - plantuml = callPackage ../tools/misc/plantuml { }; - poetry = callPackage ../development/python-modules/poetry { }; pplpy = callPackage ../development/python-modules/pplpy { }; @@ -849,6 +831,8 @@ in { pytest-env = callPackage ../development/python-modules/pytest-env { }; + pytest-flask = callPackage ../development/python-modules/pytest-flask { }; + pytest-mypy = callPackage ../development/python-modules/pytest-mypy { }; pytest-pylint = callPackage ../development/python-modules/pytest-pylint { }; @@ -857,6 +841,8 @@ in { pytest-tornado = callPackage ../development/python-modules/pytest-tornado { }; + pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { }; + python-binance = callPackage ../development/python-modules/python-binance { }; python-dbusmock = callPackage ../development/python-modules/python-dbusmock { }; @@ -1106,6 +1092,8 @@ in { aniso8601 = callPackage ../development/python-modules/aniso8601 {}; + anonip = callPackage ../development/python-modules/anonip { }; + asgiref = callPackage ../development/python-modules/asgiref { }; python-editor = callPackage ../development/python-modules/python-editor { }; @@ -4414,11 +4402,11 @@ in { scipy = let scipy_ = callPackage ../development/python-modules/scipy { }; - scipy_1_2 = scipy_.overridePythonAttrs(oldAttrs: { + scipy_1_2 = scipy_.overridePythonAttrs(oldAttrs: rec { version = "1.2.1"; src = oldAttrs.src.override { inherit version; - sha256 = "e085d1babcb419bbe58e2e805ac61924dac4ca45a07c9fa081144739e500aa3c"; + sha256 = "0g5a03jkjiqlh6h9yz508p5c9ni43735m01fivjvn6dlpjxd31g0"; }; }); in if pythonOlder "3.5" then scipy_1_2 else scipy_; @@ -4876,7 +4864,9 @@ in { sphinxcontrib_newsfeed = callPackage ../development/python-modules/sphinxcontrib_newsfeed { }; - sphinxcontrib_plantuml = callPackage ../development/python-modules/sphinxcontrib_plantuml { }; + sphinxcontrib_plantuml = callPackage ../development/python-modules/sphinxcontrib_plantuml { + inherit (pkgs) plantuml; + }; sphinxcontrib-spelling = callPackage ../development/python-modules/sphinxcontrib-spelling { }; @@ -4900,6 +4890,8 @@ in { svgwrite = callPackage ../development/python-modules/svgwrite { }; + swagger-spec-validator = callPackage ../development/python-modules/swagger-spec-validator { }; + freezegun = callPackage ../development/python-modules/freezegun { }; taskw = callPackage ../development/python-modules/taskw { }; |