diff options
Diffstat (limited to 'pkgs')
74 files changed, 806 insertions, 617 deletions
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 542a1f85188c..73d310468138 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { description = "Sound editor with graphical UI"; homepage = "http://audacityteam.org/"; license = licenses.gpl2Plus; + maintainers = with maintainers; [ lheckemann ]; platforms = intersectLists platforms.linux platforms.x86; # fails on ARM }; } diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 475330a5fe57..0d54817c5340 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -6,6 +6,7 @@ # now defaults to false because some tests can be flaky (clipboard etc) , doCheck ? false +, nodejs ? null, fish ? null, python ? null }: with stdenv.lib; @@ -17,6 +18,8 @@ let nvim-client luv coxpcall busted luafilesystem penlight inspect ] )); + + pyEnv = python.withPackages(ps: [ ps.pynvim ps.msgpack ]); in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; @@ -67,6 +70,13 @@ in pkgconfig ]; + # extra programs test via `make functionaltest` + checkInputs = [ + fish + nodejs + pyEnv # for src/clint.py + ]; + # nvim --version output retains compilation flags and references to build tools postPatch = '' diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index e2ec64932ff2..d7752258df98 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -5,12 +5,12 @@ assert lib.versionAtLeast (lib.getVersion ocaml) "4.07"; stdenv.mkDerivation rec { pname = "llpp"; - version = "31"; + version = "32"; src = fetchgit { url = "git://repo.or.cz/llpp.git"; rev = "v${version}"; - sha256 = "14ibsm1zzxfidjajcj30b5m9in10q3817izahsjvkmryrvvn6qsg"; + sha256 = "1h1zysm5cz8laq8li49djl6929cnrjlflag9hw0c1dcr4zaxk32y"; fetchSubmodules = false; }; diff --git a/pkgs/applications/misc/llpp/fix-build-bash.patch b/pkgs/applications/misc/llpp/fix-build-bash.patch index 13dbdb926c8f..fbc341c8af78 100644 --- a/pkgs/applications/misc/llpp/fix-build-bash.patch +++ b/pkgs/applications/misc/llpp/fix-build-bash.patch @@ -17,48 +17,48 @@ index 7c278b6..41494c5 100755 -keycmd="(cd $mudir && make -q build=$mbt libs && echo); digest $mulibs" -isfresh "$mulibs" "$(eval $keycmd)" || ( - make -C "$mudir" build=$mbt -j $mjobs libs -- echo "k='$(eval $keycmd)'" >$mudir/build/$mbt/libmupdf.a.past +- eval $keycmd >$mudir/build/$mbt/libmupdf.a.past -) && vecho "fresh mupdf" - oincs() { local i= local incs1= -@@ -90,34 +83,6 @@ mflags() { +@@ -89,34 +82,6 @@ mflags() { } overs="$(ocamlc -vnum 2>/dev/null)" || overs="" --test "$overs" = "4.08" || { -- url=https://caml.inria.fr/pub/distrib/ocaml-4.08/ocaml-4.08.0.tar.xz +-test "$overs" = "4.10.0" || { +- url=https://caml.inria.fr/pub/distrib/ocaml-4.10/ocaml-4.10.0.tar.xz - txz=$outd/$(basename $url) -- isfresh $txz $url || { +- keycmd="printf $url; digest $txz;" +- isfresh $txz "$(eval $keycmd)" || { - executable_p() { command -v "$1" >/dev/null 2>&1; } - if executable_p wget; then dl() { wget -q "$1" -O "$2"; } - elif executable_p curl; then dl() { curl -L "$1" -o "$2"; } - else die "no program to fetch remote urls found" - fi - dl $url $txz -- echo "k=$url" >$txz.past +- eval $keycmd >$txz.past - } && vecho "fresh $txz" - absprefix=$(cd $outd &>/dev/null; pwd -P) - export PATH=$absprefix/bin:$PATH -- isfresh $absprefix/bin/ocamlc "$url" || ( +- ocamlc=$absprefix/bin/ocamlc +- keycmd="printf $url; digest $ocamlc;" +- isfresh $ocamlc "$(eval $keycmd)" || ( - tar xf $txz -C $outd - bn=$(basename $url) - cd $outd/${bn%.tar.xz} -- ./configure --disable-vmthreads --disable-graph-lib \ -- --disable-ocamldoc --enable-debugger=no \ -- --disable-flat-float-array \ -- --prefix=$absprefix +- ./configure --disable-ocamldoc --enable-debugger=no --prefix=$absprefix - make -j $mjobs world - make install -- echo "k='$url'" >$absprefix/bin/ocamlc.past +- eval $keycmd >$absprefix/bin/ocamlc.past - ) && vecho "fresh ocamlc" - overs=$(ocamlc -vnum 2>/dev/null) -} - bocaml1() { - grep -q "$3" $outd/ordered || { -@@ -227,7 +192,7 @@ bobjc() { + ccomp=${LLPP_CC-$(ocamlc -config | grep "^c_compiler: " | \ + { read _ c; echo $c; })} +@@ -230,7 +195,7 @@ bobjc() { } && vecho "fresh $o" } @@ -67,7 +67,7 @@ index 7c278b6..41494c5 100755 cmd="(. $srcd/genconfstr.sh >$outd/confstruct.ml)" keycmd="digest $srcd/genconfstr.sh $outd/confstruct.ml" -@@ -281,7 +246,7 @@ for m in ml_gl ml_glarray ml_raw; do +@@ -284,7 +249,7 @@ for m in ml_gl ml_glarray ml_raw; do done libs="str.cma unix.cma" diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 34ada062c717..61eb32bbd5cd 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -13,12 +13,12 @@ let in stdenv.mkDerivation rec { - version = "1.16.1"; + version = "1.17.0"; pname = "mupdf"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; - sha256 = "0iz4ickj52fxjp8crg573kjrl4viq279g589isdpgpckslysf7g7"; + sha256 = "13nl9nrcx2awz9l83mlv2psi1lmn3hdnfwxvwgwiwbxlkjl3zqq0"; }; patches = diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index 3882debd9980..a51cd75e7990 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "Nukesor"; repo = pname; rev = "v${version}"; - sha256 = "17v760mh5k5vb1h3xvaph5rfc5wdl6q42isil2k9n6y8bxr3yw84"; + sha256 = "1n85b41kvx7x7qdizdnq1p0zrkap4gkwnnvhh4pz6j9njxj8d9ir"; }; - cargoSha256 = "1m659i3v3b5hfn5vb5126izcy690bkmlyihz2w90h2d02ig7170p"; + cargoSha256 = "0hkkz74hllc5dzmgls6bgdxsdr871df2fn51sa3shv68ah0avxff"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 82c94d48068a..32a2ec420110 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, meson, ninja, fetchurl +{ stdenv, lib, meson, ninja, fetchurl, fetchpatch , pkgconfig, zathura_core, cairo , gtk-mac-integration, girara, mupdf }: stdenv.mkDerivation rec { @@ -10,6 +10,14 @@ stdenv.mkDerivation rec { sha256 = "1pjwsb7zwclxsvz229fl7y2saf1pv3ifwv3ay8viqxgrp9x3z9hq"; }; + patches = [ + # compatibility with MuPDF 1.17 + (fetchpatch { + url = "https://git.pwmt.org/pwmt/zathura-pdf-mupdf/-/commit/c7f341addb76d5e6fd8c24c666d8fe97c451a4cb.patch"; + sha256 = "12rikx2j7dpngfma9x4i504w58a8xx3rc0gmyz183v19hn54c075"; + }) + ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 8ce7c89bf780..34bac9716cc6 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -4,7 +4,7 @@ , bzip2, flac, speex, libopus , libevent, expat, libjpeg, snappy , libpng, libcap -, xdg_utils, yasm, minizip, libwebp +, xdg_utils, yasm, nasm, minizip, libwebp , libusb1, pciutils, nss, re2, zlib , python2Packages, perl, pkgconfig @@ -72,14 +72,14 @@ let in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); gnSystemLibraries = [ - "flac" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" + "flac" "libwebp" "libxslt" "opus" "snappy" "libpng" # "zlib" # version 77 reports unresolved dependency on //third_party/zlib:zlib_config # "libjpeg" # fails with multiple undefined references to chromium_jpeg_* # "re2" # fails with linker errors # "ffmpeg" # https://crbug.com/731766 # "harfbuzz-ng" # in versions over 63 harfbuzz and freetype are being built together # so we can't build with one from system and other from source - ]; + ] ++ optional (upstream-info.channel != "dev") "yasm"; opusWithCustomModes = libopus.override { withCustomModes = true; @@ -89,12 +89,12 @@ let bzip2 flac speex opusWithCustomModes libevent expat libjpeg snappy libpng libcap - xdg_utils yasm minizip libwebp + xdg_utils minizip libwebp libusb1 re2 zlib ffmpeg libxslt libxml2 # harfbuzz # in versions over 63 harfbuzz and freetype are being built together # so we can't build with one from system and other from source - ]; + ] ++ (if upstream-info.channel == "dev" then [ nasm ] else [ yasm ]); # build paths and release info packageName = extraAttrs.packageName or extraAttrs.name; @@ -224,8 +224,9 @@ let ln -s ${llvmPackages.llvm}/bin/llvm-ar third_party/llvm-build/Release+Asserts/bin/llvm-ar ''; - gnFlags = mkGnFlags ({ + gnFlags = mkGnFlags (optionalAttrs (upstream-info.channel != "dev") { linux_use_bundled_binutils = false; + } // { use_lld = false; use_gold = true; gold_path = "${stdenv.cc}/bin"; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index df1dcb413e15..9e46d061a308 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -43,6 +43,15 @@ let sha256 = "00y2d35wvqmx9glaqhfb62wdgbfpwr77v0934nnvh9ks71vnsjqy"; }; }); + } // lib.optionalAttrs (channel == "dev") { + gnChromium = gn.overrideAttrs (oldAttrs: { + version = "2020-05-19"; + src = fetchgit { + url = "https://gn.googlesource.com/gn"; + rev = "d0a6f072070988e7b038496c4e7d6c562b649732"; + sha256 = "0197msabskgfbxvhzq73gc3wlr3n9cr4bzrhy5z5irbvy05lxk17"; + }; + }); }); browser = callPackage ./browser.nix { inherit channel enableWideVine; }; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 099522dd23eb..ced9c2454b55 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,14 +1,14 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "1zy5174admqhb9phpnjb6a20llxbvzfh16cdgj8gh1xk1qjbdlhl"; + sha256 = "1di0fhhv6lljc2b50i0i8qx5y5xswgxz1bimpda790sb3b1xsdzx"; sha256bin64 = "1f5qwx4476l4fvbw9w2i22i080bahlf83dzzpnbny7hk831g7msw"; version = "84.0.4147.38"; }; dev = { - sha256 = "04jbh8bsvqkm8mdsgyv0465fq5lhz0nn0mcs07kj5hnmzx1g2f3a"; - sha256bin64 = "0d9knpqbps06wgfgp2s7z693dqiip0m771mv3j2856h5v9rv210l"; - version = "85.0.4158.4"; + sha256 = "07h3i4ab7yj05ndrqchzf3f9wr809qb3dj2gfc1653mkjmba8h07"; + sha256bin64 = "10jdq5mr7qby0m26l5lbsqcbh9bhjdpmpbkkcvv9wm2259rwjxr5"; + version = "85.0.4164.2"; }; stable = { sha256 = "10vg0fmwlkzpnixhhhcwccxshqdfq7rh0ribij7wgkw42bv0bi0j"; diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix index 1dd9baa628ab..d45a3c9f864a 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix @@ -45,11 +45,11 @@ let flash = stdenv.mkDerivation rec { pname = "flashplayer-ppapi"; - version = "32.0.0.363"; + version = "32.0.0.371"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "0znk8an892mykgbz56hyv3gz65vc9mhb3vn96c6bsvicwl1fn460"; + sha256 = "1nks2wx74b21hv0l7bnrzkxn7c6p6r8zgwbqvy3cqpi8famyr5v9"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix index f6f3c06e9376..c393f7fe28ec 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix @@ -1,6 +1,6 @@ { - "81.0.4044.122" = { - rev = "81.0.4044.122-2"; - sha256 = "0bbr4a2gkgm3ykdgpj8x58sd3dwam6qkifhzfs2997681g7b2v2q"; + "81.0.4044.138" = { + rev = "81.0.4044.138-1"; + sha256 = "1qa5lw2psaqxr2zklaldx4sm6by4gsw3mfrp01ijc4kkp9jmvg7r"; }; } diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix index 77505b47d857..defb58822a03 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "1s16wl101yabq0l7w0q50lxkr2gn090pcaj6l5sj6g5xvi9lhgbf"; - sha256bin64 = "0k6fsqlpiwp9vds83hb3cg9xf74hqgbfdm3ijyad2rmwc5rqk0ax"; - version = "83.0.4103.14"; + sha256 = "0z9p4v5mkinf7hbdagh4bz6ymqjxg3df3wjpvm201ilzzngmjqz1"; + sha256bin64 = "1srvlirhnynh0q2a17p8z13p7r54z0cchh1d1h07hqljnwmsf8qj"; + version = "83.0.4103.34"; }; dev = { - sha256 = "0djppzwzpfyyfjb1mhy5wws2379m3wpzyk2x3kw5nd0mdz35hbny"; - sha256bin64 = "1wg55qhfvd5zvigjl6496za81mh9b2c5da53zy07bk8wj91ly8pf"; - version = "84.0.4115.5"; + sha256 = "178fc112bsbrgj2hss78y8rhnz8hl85fr33gawk9fz88zk5qz7xd"; + sha256bin64 = "06qra245l2bbgxc3k04aabkgq1qnzybnrjhrjb25vriv31ji36b1"; + version = "84.0.4128.3"; }; stable = { - sha256 = "0ahqh3vmzbpai4xwn7qybgw9phc8ssjdvfc7384mxqk9swqgv7qg"; - sha256bin64 = "0gpgim244594m35qwf625blwdqgjbp4qr846wq75a9a9zqwqs05w"; - version = "81.0.4044.122"; + sha256 = "19kpzmqmld0m0nflx13w9flxfal19msnxhzl3lip1jqih65z4y7l"; + sha256bin64 = "0sl4wv7npc3rhi7jgn679hi7j5ykzwpx5dahy78h87yfg4fx84wx"; + version = "81.0.4044.138"; }; } diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index b6077b5c4d82..0152f80afbf3 100644 --- a/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/pkgs/applications/networking/cluster/atlantis/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "atlantis"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - sha256 = "16zz4xwpqipdmszbz93xxw31hbh7s8pfa9dm64ybyni7wc4lvdy6"; + sha256 = "1ymixbix9sxhzmixqm9yjm9181aqnwnllqnswr0fq0nljw4018dn"; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/pkgs/applications/networking/cluster/node-problem-detector/default.nix index f68d5f08e66e..652518d892a8 100644 --- a/pkgs/applications/networking/cluster/node-problem-detector/default.nix +++ b/pkgs/applications/networking/cluster/node-problem-detector/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "node-problem-detector"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "kubernetes"; repo = pname; rev = "v${version}"; - sha256 = "02avknglmkr9k933a64hkw0rjfxvyh4sc3x70p41b8q2g6vzv2gs"; + sha256 = "0cphlaf9k2va879jgqd6fzdgkscpwg29j1cpr677i3zj3hfgaw1g"; }; vendorSha256 = null; @@ -37,7 +37,8 @@ buildGoModule rec { meta = with stdenv.lib; { description = "Various problem detectors running on the Kubernetes nodes"; homepage = "https://github.com/kubernetes/node-problem-detector"; + changelog = "https://github.com/kubernetes/node-problem-detector/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ lbpdt ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/openbazaar/client.nix b/pkgs/applications/networking/openbazaar/client.nix index 5b9ddd8bab7d..8ee265743de5 100644 --- a/pkgs/applications/networking/openbazaar/client.nix +++ b/pkgs/applications/networking/openbazaar/client.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "openbazaar-client"; - version = "2.4.4"; + version = "2.4.5"; src = fetchurl { url = "https://github.com/OpenBazaar/openbazaar-desktop/releases/download/v${version}/openbazaar2client_${version}_amd64.deb"; - sha256 = "146vqwc1gv5zqcz60np8v9ps44m0d2yyjzqpmd4s0pcywvvwdvn6"; + sha256 = "0kahqqchalbyzy51gkxzmw91qignh8sprg57nbj1vmgm84w1z6kw"; }; dontBuild = true; diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix index 5e5df85a5279..0d7e81cd9dab 100644 --- a/pkgs/applications/science/chemistry/molden/default.nix +++ b/pkgs/applications/science/chemistry/molden/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, which, gfortran, libGLU, xorg } : stdenv.mkDerivation rec { - version = "6.2"; + version = "6.3"; pname = "molden"; src = fetchurl { url = "ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden${version}.tar.gz"; - sha256 = "01m5p7v5pz1fi77var50sp1bzlvdckwr6kn4wanvic2jmvgp9q5n"; + sha256 = "02qi16pz2wffn3cc47dpjqhfafzwfmb79waw4nnhfyir8a4h3cq1"; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 2f5943dfa9b5..451aab6c049a 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.14.0"; + version = "3.15.0"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "1dlzap3j26rh93ick1lqb7g3jkqjpd33gl4gqfcbx22v62258y5b"; + sha256 = "0fl8v8n53fr5qdnabici1mj3zpmjrkssx970y3q4m48s68q665v6"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 7db27888782a..87b4a5418cef 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { (enableFeature withGUI "qt") ]; - CXXFLAGS = optional stdenv.cc.isClang "-std=c++14"; + CXXFLAGS = optional stdenv.cc.isClang "-std=c++17"; dontWrapQtApps = true; postFixup = optionalString withGUI '' diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index a39a87206354..37bde66c3df4 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20200430"; + version = "20200602"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "1dgxf3fi4x5iy504xncj1jba8cd51axkn2j1cfb220rpc6mzv25l"; + sha256 = "0cms5dn8qfasi9xpfcq1hsdyvcb39vkh97mjvi7zrng4iyihq06y"; }; nativeBuildInputs = [ diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix index 45ff07b8efce..cc22606c0d69 100644 --- a/pkgs/data/misc/wireless-regdb/default.nix +++ b/pkgs/data/misc/wireless-regdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wireless-regdb"; - version = "2019.06.03"; + version = "2020.04.29"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1gslvh0aqdkv48jyr2ddq153mw28i7qz2ybrjj9qvkk3dgc7x4fd"; + sha256 = "0yicda474ygahv8da18h1p4yf42s6x2f208mlwcw4xsrxld07zc9"; }; dontBuild = true; diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix index 9d5334bc79b4..dce625de5e35 100644 --- a/pkgs/data/themes/adwaita-qt/default.nix +++ b/pkgs/data/themes/adwaita-qt/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "adwaita-qt"; - version = "1.1.1"; + version = "1.1.3"; src = fetchFromGitHub { owner = "FedoraQt"; repo = pname; rev = version; - sha256 = "1z1zl6b1190nffcdyjnwz2xy4s6cvgd98aas9z71l5iddwzy32fm"; + sha256 = "1zfah1ybfgi4dag3lxqap99giwwng9b3lgcick1ciylz6vwf2gwh"; }; nativeBuildInputs = [ diff --git a/pkgs/data/themes/amber/default.nix b/pkgs/data/themes/amber/default.nix index a004c0fb3e9b..589ce716f493 100644 --- a/pkgs/data/themes/amber/default.nix +++ b/pkgs/data/themes/amber/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "amber-theme"; - version = "3.34-2"; + version = "3.36-1"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "0809l4r1qrzs9z04kcs1j962dpsvgpwpksnxs09md5722mynn65l"; + sha256 = "0dn81ca3kyfz4ql15kl5108gw309cc0c1inmwlch1nq5dslmfjji"; }; nativeBuildInputs = [ meson ninja sassc ]; diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index 8973eda5d826..7bc0790f049a 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "20.05"; + version = "20.06"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "14i0s0m1n57wjwzy54v1czq0w38xplcdsfn4nz5v6fryaxzr5z60"; + sha256 = "1dyx9l7ldhlbb77ca3wk0l218589blvh78mdfyzpk9k1izk2yih1"; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/libjpeg-drop/default.nix b/pkgs/development/libraries/libjpeg-drop/default.nix deleted file mode 100644 index 22cb1b135897..000000000000 --- a/pkgs/development/libraries/libjpeg-drop/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, static ? true }: - -with stdenv.lib; - -stdenv.mkDerivation { - name = "libjpeg-drop-9b"; - - srcs = [ - (fetchurl { - url = "http://www.ijg.org/files/jpegsrc.v9b.tar.gz"; - sha256 = "0lnhpahgdwlrkd41lx6cr90r199f8mc6ydlh7jznj5klvacd63r4"; - }) - (fetchurl { - url = "http://jpegclub.org/droppatch.v9b.tar.gz"; - sha256 = "022bnvpird7w5pwbfqpq7j7pwja5kp6x9k3sdypcy3g2nwwy2wwk"; - }) - ]; - - postUnpack = '' - rm jpegtran - mv jpegtran.c jpeg-9b/jpegtran.c - mv transupp.c jpeg-9b/transupp.c - mv transupp.h jpeg-9b/transupp.h - ''; - - configureFlags = [] - ++ optionals static [ "--enable-static" "--disable-shared" ]; - - outputs = [ "bin" "dev" "out" "man" ]; - - meta = { - homepage = "http://jpegclub.org/jpegtran/"; - description = "Experimental lossless crop 'n' drop (cut & paste) patches for libjpeg"; - license = stdenv.lib.licenses.free; - }; -} diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 996613d5ffc0..6d170c798d0a 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -55,7 +55,7 @@ in { }; libtoxcore_0_2 = generic { - version = "0.2.10"; - sha256 = "0r5j2s5n8ikayvr1zylvv3ai3smbhm2m0yhpa9lfcsxhvyn9phcn"; + version = "0.2.12"; + sha256 = "0a6sqpm00d2rn0nviqfz4gh9ck1wzci6rxgmqmcyryl5ca19ffvp"; }; } diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix index a8e65aebc450..db644287d2e1 100644 --- a/pkgs/development/libraries/openfst/default.nix +++ b/pkgs/development/libraries/openfst/default.nix @@ -1,14 +1,31 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { pname = "openfst"; - version = "1.7.6"; + version = "1.7.7"; src = fetchurl { url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${pname}-${version}.tar.gz"; - sha256 = "03hs0196qbjfbviqn6nnb7igvv3cnpxyizlwlzmx88a6fhiq97bm"; + sha256 = "1gpkpkls78xlidqq241scdz9vagxl8c4ksc4lqj4ycwx6vzyliij"; }; - meta = { + + configureFlags = [ + "--enable-compact-fsts" + "--enable-compress" + "--enable-const-fsts" + "--enable-far" + "--enable-linear-fsts" + "--enable-lookahead-fsts" + "--enable-mpdt" + "--enable-ngram-fsts" + "--enable-pdt" + ]; + + enableParallelBuilding = true; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with stdenv.lib; { description = "Library for working with finite-state transducers"; longDescription = '' Library for constructing, combining, optimizing, and searching weighted finite-state transducers (FSTs). @@ -16,9 +33,8 @@ stdenv.mkDerivation rec { pattern matching, string processing, machine learning, information extraction and retrieval among others ''; homepage = "http://www.openfst.org/twiki/bin/view/FST/WebHome"; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.dfordivam ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.asl20; + maintainers = [ maintainers.dfordivam ]; + platforms = platforms.unix; }; } - diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index 6ecdb30c1f2b..47f9afe18619 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "0p5i4360hc5y8rqhgpvg1f1yaxl7kay471868vfzkp44g8dybkvm"; + sha256 = "0xm5bwbsv2qlx1mg9zr98q7rm5hginrff4z0ahv7jrqrzv24acp7"; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/libraries/pkger/default.nix b/pkgs/development/libraries/pkger/default.nix index 4a489127ca56..09c48ff8b0ab 100644 --- a/pkgs/development/libraries/pkger/default.nix +++ b/pkgs/development/libraries/pkger/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "pkger"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "markbates"; repo = "pkger"; rev = "v${version}"; - sha256 = "0fpvrgww5h40l2js7raarx6gpysafvj75x26ljx4qz925x8nb6zn"; + sha256 = "195ba1avkpm9ssgakngv8j72k7yq2xna3xmm5m8l6c5g7lf91kkp"; }; vendorSha256 = "1b9gpym6kb4hpdbrixphfh1qylmqr265jrmcd4vxb87ahvrsrvgp"; @@ -20,6 +20,7 @@ buildGoModule rec { meta = with stdenv.lib; { description = "Embed static files in Go binaries (replacement for gobuffalo/packr) "; homepage = "https://github.com/markbates/pkger"; + changelog = "https://github.com/markbates/pkger/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ flokli ]; }; diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 303689dce4a5..2dbda51bfe8b 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -15,7 +15,7 @@ alt-getopt = buildLuarocksPackage { version = "0.8.0-1"; src = fetchurl { - url = "https://luarocks.org/alt-getopt-0.8.0-1.src.rock"; + url = "mirror://luarocks/alt-getopt-0.8.0-1.src.rock"; sha256 = "1mi97dqb97sf47vb6wrk12yf1yxcaz0asr9gbgwyngr5n1adh5i3"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -25,9 +25,7 @@ alt-getopt = buildLuarocksPackage { homepage = "https://github.com/cheusov/lua-alt-getopt"; description = "Process application arguments the same way as getopt_long"; maintainers = with maintainers; [ arobyn ]; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; }; }; ansicolors = buildLuarocksPackage { @@ -35,7 +33,7 @@ ansicolors = buildLuarocksPackage { version = "1.0.2-3"; src = fetchurl { - url = "https://luarocks.org/ansicolors-1.0.2-3.src.rock"; + url = "mirror://luarocks/ansicolors-1.0.2-3.src.rock"; sha256 = "1mhmr090y5394x1j8p44ws17sdwixn5a0r4i052bkfgk3982cqfz"; }; disabled = (luaOlder "5.1"); @@ -44,28 +42,24 @@ ansicolors = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "https://github.com/kikito/ansicolors.lua"; description = "Library for color Manipulation."; - license = { - fullName = "MIT <http://opensource.org/licenses/MIT>"; - }; + license.fullName = "MIT <http://opensource.org/licenses/MIT>"; }; }; argparse = buildLuarocksPackage { pname = "argparse"; - version = "0.6.0-1"; + version = "0.7.0-1"; src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/argparse-0.6.0-1.src.rock"; - sha256 = "10ic5wppyghd1lmgwgl0lb40pv8z9fi9i87080axxg8wsr19y0p4"; + url = "mirror://luarocks/argparse-0.7.0-1.src.rock"; + sha256 = "1jvar543d21x7wq8rxxaaf7h1ricd7zvxc16xwjblwa9ffgcmcs7"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; meta = with stdenv.lib; { - homepage = "https://github.com/mpeterv/argparse"; + homepage = "https://github.com/luarocks/argparse"; description = "A feature-rich command-line argument parser"; - license = { - fullName = "MIT"; - }; + license.fullName = "MIT"; }; }; basexx = buildLuarocksPackage { @@ -73,7 +67,7 @@ basexx = buildLuarocksPackage { version = "0.4.1-1"; knownRockspec = (fetchurl { - url = "https://luarocks.org/basexx-0.4.1-1.rockspec"; + url = "mirror://luarocks/basexx-0.4.1-1.rockspec"; sha256 = "0kmydxm2wywl18cgj303apsx7hnfd68a9hx9yhq10fj7yfcxzv5f"; }).outPath; @@ -88,9 +82,7 @@ basexx = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "https://github.com/aiq/basexx"; description = "A base2, base16, base32, base64 and base85 library for Lua"; - license = { - fullName = "MIT"; - }; + license.fullName = "MIT"; }; }; binaryheap = buildLuarocksPackage { @@ -98,7 +90,7 @@ binaryheap = buildLuarocksPackage { version = "0.4-1"; src = fetchurl { - url = "https://luarocks.org/binaryheap-0.4-1.src.rock"; + url = "mirror://luarocks/binaryheap-0.4-1.src.rock"; sha256 = "11rd8r3bpinfla2965jgjdv1hilqdc1q6g1qla5978d7vzg19kpc"; }; disabled = (luaOlder "5.1"); @@ -108,9 +100,7 @@ binaryheap = buildLuarocksPackage { homepage = "https://github.com/Tieske/binaryheap.lua"; description = "Binary heap implementation in pure Lua"; maintainers = with maintainers; [ vcunat ]; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; }; }; bit32 = buildLuarocksPackage { @@ -118,7 +108,7 @@ bit32 = buildLuarocksPackage { version = "5.3.0-1"; src = fetchurl { - url = "https://luarocks.org/bit32-5.3.0-1.src.rock"; + url = "mirror://luarocks/bit32-5.3.0-1.src.rock"; sha256 = "19i7kc2pfg9hc6qjq4kka43q6qk71bkl2rzvrjaks6283q6wfyzy"; }; disabled = (luaOlder "5.1"); @@ -128,23 +118,21 @@ bit32 = buildLuarocksPackage { homepage = "http://www.lua.org/manual/5.2/manual.html#6.7"; description = "Lua 5.2 bit manipulation library"; maintainers = with maintainers; [ lblasc ]; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; }; }; busted = buildLuarocksPackage { pname = "busted"; - version = "2.0.rc13-0"; + version = "2.0.0-1"; knownRockspec = (fetchurl { - url = "https://luarocks.org/busted-2.0.rc13-0.rockspec"; - sha256 = "0hrvhg1324q5ra6cpjh1y3by6lrzs0ljah4jl48l8xlgw1z9z1q5"; + url = "mirror://luarocks/busted-2.0.0-1.rockspec"; + sha256 = "0cbw95bjxl667n9apcgng2kr5hq6bc7gp3vryw4dzixmfabxkcbw"; }).outPath; src = fetchurl { - url = "https://github.com/Olivine-Labs/busted/archive/v2.0.rc13-0.tar.gz"; - sha256 = "0m72bldn1r6j94ahcfmpaq1mmysrshf9qi9fjas7hpal0jp8ivvl"; + url = "https://github.com/Olivine-Labs/busted/archive/v2.0.0.tar.gz"; + sha256 = "1ps7b3f4diawfj637mibznaw4x08gn567pyni0m2s50hrnw4v8zx"; }; disabled = (luaOlder "5.1"); @@ -153,9 +141,7 @@ busted = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "http://olivinelabs.com/busted/"; description = "Elegant Lua unit testing."; - license = { - fullName = "MIT <http://opensource.org/licenses/MIT>"; - }; + license.fullName = "MIT <http://opensource.org/licenses/MIT>"; }; }; cassowary = buildLuarocksPackage { @@ -180,18 +166,16 @@ cjson = buildLuarocksPackage { version = "2.1.0.6-1"; src = fetchurl { - url = "https://luarocks.org/lua-cjson-2.1.0.6-1.src.rock"; + url = "mirror://luarocks/lua-cjson-2.1.0.6-1.src.rock"; sha256 = "0dqqkn0aygc780kiq2lbydb255r8is7raf7md0gxdjcagp8afps5"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = with stdenv.lib; { - homepage = "https://www.kyne.com.au/~mark/software/lua-cjson.php"; + homepage = "http://www.kyne.com.au/~mark/software/lua-cjson.php"; description = "A fast JSON encoding/parsing module"; - license = { - fullName = "MIT"; - }; + license.fullName = "MIT"; }; }; compat53 = buildLuarocksPackage { @@ -199,7 +183,7 @@ compat53 = buildLuarocksPackage { version = "0.7-1"; src = fetchurl { - url = "https://luarocks.org/compat53-0.7-1.src.rock"; + url = "mirror://luarocks/compat53-0.7-1.src.rock"; sha256 = "0kpaxbpgrwjn4jjlb17fn29a09w6lw732d21bi0302kqcaixqpyb"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -209,9 +193,7 @@ compat53 = buildLuarocksPackage { homepage = "https://github.com/keplerproject/lua-compat-5.3"; description = "Compatibility module providing Lua-5.3-style APIs for Lua 5.2 and 5.1"; maintainers = with maintainers; [ vcunat ]; - license = { - fullName = "MIT"; - }; + license.fullName = "MIT"; }; }; cosmo = buildLuarocksPackage { @@ -236,25 +218,23 @@ coxpcall = buildLuarocksPackage { version = "1.17.0-1"; src = fetchurl { - url = "https://luarocks.org/coxpcall-1.17.0-1.src.rock"; + url = "mirror://luarocks/coxpcall-1.17.0-1.src.rock"; sha256 = "0n1jmda4g7x06458596bamhzhcsly6x0p31yp6q3jz4j11zv1zhi"; }; meta = with stdenv.lib; { homepage = "http://keplerproject.github.io/coxpcall"; description = "Coroutine safe xpcall and pcall"; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; }; }; cqueues = buildLuarocksPackage { pname = "cqueues"; - version = "20190731.52-0"; + version = "20190813.52-0"; src = fetchurl { - url = "https://luarocks.org/cqueues-20190731.52-0.src.rock"; - sha256 = "07rs34amsxf2bc5ccqdad0c63c70737r54316cbd9qh1a2wbvz8s"; + url = "mirror://luarocks/cqueues-20190813.52-0.src.rock"; + sha256 = "1mfhana4xdfddzxmr7vkvm65679hx549f9k1rmsrz6is2gji5wvi"; }; disabled = (lua.luaversion != "5.2"); propagatedBuildInputs = [ lua ]; @@ -263,9 +243,7 @@ cqueues = buildLuarocksPackage { homepage = "http://25thandclement.com/~william/projects/cqueues.html"; description = "Continuation Queues: Embeddable asynchronous networking, threading, and notification framework for Lua on Unix."; maintainers = with maintainers; [ vcunat ]; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; }; }; cyrussasl = buildLuarocksPackage { @@ -273,7 +251,7 @@ cyrussasl = buildLuarocksPackage { version = "1.1.0-1"; knownRockspec = (fetchurl { - url = "https://luarocks.org/cyrussasl-1.1.0-1.rockspec"; + url = "mirror://luarocks/cyrussasl-1.1.0-1.rockspec"; sha256 = "0zy9l00l7kr3sq8phdm52jqhlqy35vdv6rdmm8mhjihcbx1fsplc"; }).outPath; @@ -290,12 +268,10 @@ cyrussasl = buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = with stdenv.lib; { - homepage = "https://github.com/JorjBauer/lua-cyrussasl"; + homepage = "http://github.com/JorjBauer/lua-cyrussasl"; description = "Cyrus SASL library for Lua 5.1+"; maintainers = with maintainers; [ vcunat ]; - license = { - fullName = "BSD"; - }; + license.fullName = "BSD"; }; }; digestif = buildLuarocksPackage { @@ -312,9 +288,7 @@ digestif = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "https://github.com/astoff/digestif/"; description = "A code analyzer for TeX"; - license = { - fullName = "MIT"; - }; + license.fullName = "MIT"; }; }; dkjson = buildLuarocksPackage { @@ -322,7 +296,7 @@ dkjson = buildLuarocksPackage { version = "2.5-2"; src = fetchurl { - url = "https://luarocks.org/dkjson-2.5-2.src.rock"; + url = "mirror://luarocks/dkjson-2.5-2.src.rock"; sha256 = "1qy9bzqnb9pf9d48hik4iq8h68aw3270kmax7mmpvvpw7kkyp483"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -331,9 +305,7 @@ dkjson = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "http://dkolf.de/src/dkjson-lua.fsl/"; description = "David Kolf's JSON module for Lua"; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; }; }; fifo = buildLuarocksPackage { @@ -341,7 +313,7 @@ fifo = buildLuarocksPackage { version = "0.2-0"; src = fetchurl { - url = "https://luarocks.org/fifo-0.2-0.src.rock"; + url = "mirror://luarocks/fifo-0.2-0.src.rock"; sha256 = "082c5g1m8brnsqj5gnjs65bm7z50l6b05cfwah14lqaqsr5a5pjk"; }; propagatedBuildInputs = [ lua ]; @@ -349,9 +321,7 @@ fifo = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "https://github.com/daurnimator/fifo.lua"; description = "A lua library/'class' that implements a FIFO"; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; }; }; http = buildLuarocksPackage { @@ -359,7 +329,7 @@ http = buildLuarocksPackage { version = "0.3-0"; src = fetchurl { - url = "https://luarocks.org/http-0.3-0.src.rock"; + url = "mirror://luarocks/http-0.3-0.src.rock"; sha256 = "0vvl687bh3cvjjwbyp9cphqqccm3slv4g7y3h03scp3vpq9q4ccq"; }; disabled = (luaOlder "5.1"); @@ -369,9 +339,7 @@ http = buildLuarocksPackage { homepage = "https://github.com/daurnimator/lua-http"; description = "HTTP library for Lua"; maintainers = with maintainers; [ vcunat ]; - license = { - fullName = "MIT"; - }; + license.fullName = "MIT"; }; }; inspect = buildLuarocksPackage { @@ -379,7 +347,7 @@ inspect = buildLuarocksPackage { version = "3.1.1-0"; src = fetchurl { - url = "https://luarocks.org/inspect-3.1.1-0.src.rock"; + url = "mirror://luarocks/inspect-3.1.1-0.src.rock"; sha256 = "0k4g9ahql83l4r2bykfs6sacf9l1wdpisav2i0z55fyfcdv387za"; }; disabled = (luaOlder "5.1"); @@ -388,9 +356,7 @@ inspect = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "https://github.com/kikito/inspect.lua"; description = "Lua table visualizer, ideal for debugging"; - license = { - fullName = "MIT <http://opensource.org/licenses/MIT>"; - }; + license.fullName = "MIT <http://opensource.org/licenses/MIT>"; }; }; ldoc = buildLuarocksPackage { @@ -398,7 +364,7 @@ ldoc = buildLuarocksPackage { version = "1.4.6-2"; knownRockspec = (fetchurl { - url = "https://luarocks.org/ldoc-1.4.6-2.rockspec"; + url = "mirror://luarocks/ldoc-1.4.6-2.rockspec"; sha256 = "14yb0qihizby8ja0fa82vx72vk903mv6m7izn39mzfrgb8mha0pm"; }).outPath; @@ -412,9 +378,7 @@ ldoc = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "http://stevedonovan.github.com/ldoc"; description = "A Lua Documentation Tool"; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; }; }; lgi = buildLuarocksPackage { @@ -422,18 +386,16 @@ lgi = buildLuarocksPackage { version = "0.9.2-1"; src = fetchurl { - url = "https://luarocks.org/lgi-0.9.2-1.src.rock"; + url = "mirror://luarocks/lgi-0.9.2-1.src.rock"; sha256 = "07ajc5pdavp785mdyy82n0w6d592n96g95cvq025d6i0bcm2cypa"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = with stdenv.lib; { - homepage = "https://github.com/pavouk/lgi"; + homepage = "http://github.com/pavouk/lgi"; description = "Lua bindings to GObject libraries"; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; }; }; linenoise = buildLuarocksPackage { @@ -456,9 +418,7 @@ linenoise = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "https://github.com/hoelzro/lua-linenoise"; description = "A binding for the linenoise command line library"; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; }; }; ljsyscall = buildLuarocksPackage { @@ -466,7 +426,7 @@ ljsyscall = buildLuarocksPackage { version = "0.12-1"; src = fetchurl { - url = "https://luarocks.org/ljsyscall-0.12-1.src.rock"; + url = "mirror://luarocks/ljsyscall-0.12-1.src.rock"; sha256 = "12gs81lnzpxi5d409lbrvjfflld5l2xsdkfhkz93xg7v65sfhh2j"; }; disabled = (lua.luaversion != "5.1"); @@ -476,9 +436,7 @@ ljsyscall = buildLuarocksPackage { homepage = "http://www.myriabit.com/ljsyscall/"; description = "LuaJIT Linux syscall FFI"; maintainers = with maintainers; [ lblasc ]; - license = { - fullName = "MIT"; - }; + license.fullName = "MIT"; }; }; lpeg = buildLuarocksPackage { @@ -486,7 +444,7 @@ lpeg = buildLuarocksPackage { version = "1.0.2-1"; src = fetchurl { - url = "https://luarocks.org/lpeg-1.0.2-1.src.rock"; + url = "mirror://luarocks/lpeg-1.0.2-1.src.rock"; sha256 = "1g5zmfh0x7drc6mg2n0vvlga2hdc08cyp3hnb22mh1kzi63xdl70"; }; disabled = (luaOlder "5.1"); @@ -496,9 +454,7 @@ lpeg = buildLuarocksPackage { homepage = "http://www.inf.puc-rio.br/~roberto/lpeg.html"; description = "Parsing Expression Grammars For Lua"; maintainers = with maintainers; [ vyp ]; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; }; }; lpeg_patterns = buildLuarocksPackage { @@ -506,7 +462,7 @@ lpeg_patterns = buildLuarocksPackage { version = "0.5-0"; src = fetchurl { - url = "https://luarocks.org/lpeg_patterns-0.5-0.src.rock"; + url = "mirror://luarocks/lpeg_patterns-0.5-0.src.rock"; sha256 = "0mlw4nayrsdxrh98i26avz5i4170a9brciybw88kks496ra36v8f"; }; propagatedBuildInputs = [ lua lpeg ]; @@ -514,18 +470,16 @@ lpeg_patterns = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "https://github.com/daurnimator/lpeg_patterns/archive/v0.5.zip"; description = "a collection of LPEG patterns"; - license = { - fullName = "MIT"; - }; + license.fullName = "MIT"; }; }; lpeglabel = buildLuarocksPackage { pname = "lpeglabel"; - version = "1.5.0-1"; + version = "1.6.0-1"; src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lpeglabel-1.5.0-1.src.rock"; - sha256 = "068mwvwwn5n69pdm04qnk354391w9mk34jsczxql0xi5qgmz6w8j"; + url = "mirror://luarocks/lpeglabel-1.6.0-1.src.rock"; + sha256 = "0mihrs0gcj40gsjbh4x9b5pm92w2vdwwd1f3fyibyd4a8r1h93r9"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -533,9 +487,7 @@ lpeglabel = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "https://github.com/sqmedeiros/lpeglabel/"; description = "Parsing Expression Grammars For Lua with Labeled Failures"; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; }; }; lpty = buildLuarocksPackage { @@ -543,7 +495,7 @@ lpty = buildLuarocksPackage { version = "1.2.2-1"; src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lpty-1.2.2-1.src.rock"; + url = "mirror://luarocks/lpty-1.2.2-1.src.rock"; sha256 = "1vxvsjgjfirl6ranz6k4q4y2dnxqh72bndbk400if22x8lqbkxzm"; }; disabled = (luaOlder "5.1"); @@ -552,9 +504,7 @@ lpty = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "http://www.tset.de/lpty/"; description = "A simple facility for lua to control other programs via PTYs."; - license = { - fullName = "MIT"; - }; + license.fullName = "MIT"; }; }; lrexlib-gnu = buildLuarocksPackage { @@ -562,18 +512,16 @@ lrexlib-gnu = buildLuarocksPackage { version = "2.9.0-1"; src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lrexlib-gnu-2.9.0-1.src.rock"; + url = "mirror://luarocks/lrexlib-gnu-2.9.0-1.src.rock"; sha256 = "036rda4rji1pbnbxk1nzjy5zmigdsiacqbzrbvciwq3lrxa2j5s2"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = with stdenv.lib; { - homepage = "https://github.com/rrthomas/lrexlib"; + homepage = "http://github.com/rrthomas/lrexlib"; description = "Regular expression library binding (GNU flavour)."; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; }; }; lrexlib-pcre = buildLuarocksPackage { @@ -581,19 +529,17 @@ lrexlib-pcre = buildLuarocksPackage { version = "2.9.0-1"; src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lrexlib-pcre-2.9.0-1.src.rock"; + url = "mirror://luarocks/lrexlib-pcre-2.9.0-1.src.rock"; sha256 = "1nqai27lbd85mcjf5cb05dbdfg460vmp8cr0lmb8dd63ivk8cbvx"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = with stdenv.lib; { - homepage = "https://github.com/rrthomas/lrexlib"; + homepage = "http://github.com/rrthomas/lrexlib"; description = "Regular expression library binding (PCRE flavour)."; maintainers = with maintainers; [ vyp ]; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; }; }; lrexlib-posix = buildLuarocksPackage { @@ -601,18 +547,16 @@ lrexlib-posix = buildLuarocksPackage { version = "2.9.0-1"; src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lrexlib-posix-2.9.0-1.src.rock"; + url = "mirror://luarocks/lrexlib-posix-2.9.0-1.src.rock"; sha256 = "0ifpybf4m94g1nk70l0f5m45gph0rbp5wrxrl1hnw8ibv3mc1b1r"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = with stdenv.lib; { - homepage = "https://github.com/rrthomas/lrexlib"; + homepage = "http://github.com/rrthomas/lrexlib"; description = "Regular expression library binding (POSIX flavour)."; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; }; }; ltermbox = buildLuarocksPackage { @@ -620,7 +564,7 @@ ltermbox = buildLuarocksPackage { version = "0.2-1"; src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/ltermbox-0.2-1.src.rock"; + url = "mirror://luarocks/ltermbox-0.2-1.src.rock"; sha256 = "08jqlmmskbi1ml1i34dlmg6hxcs60nlm32dahpxhcrgjnfihmyn8"; }; disabled = (luaOlder "5.1"); @@ -629,9 +573,7 @@ ltermbox = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "http://code.google.com/p/termbox"; description = "A termbox library package"; - license = { - fullName = "New BSD License"; - }; + license.fullName = "New BSD License"; }; }; lua-cmsgpack = buildLuarocksPackage { @@ -639,7 +581,7 @@ lua-cmsgpack = buildLuarocksPackage { version = "0.4.0-0"; knownRockspec = (fetchurl { - url = "https://luarocks.org/lua-cmsgpack-0.4.0-0.rockspec"; + url = "mirror://luarocks/lua-cmsgpack-0.4.0-0.rockspec"; sha256 = "10cvr6knx3qvjcw1q9v05f2qy607mai7lbq321nx682aa0n1fzin"; }).outPath; @@ -656,11 +598,9 @@ lua-cmsgpack = buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = with stdenv.lib; { - homepage = "https://github.com/antirez/lua-cmsgpack"; + homepage = "http://github.com/antirez/lua-cmsgpack"; description = "MessagePack C implementation and bindings for Lua 5.1/5.2/5.3"; - license = { - fullName = "Two-clause BSD"; - }; + license.fullName = "Two-clause BSD"; }; }; lua-iconv = buildLuarocksPackage { @@ -668,7 +608,7 @@ lua-iconv = buildLuarocksPackage { version = "7-3"; src = fetchurl { - url = "https://luarocks.org/lua-iconv-7-3.src.rock"; + url = "mirror://luarocks/lua-iconv-7-3.src.rock"; sha256 = "03xibhcqwihyjhxnzv367q4bfmzmffxl49lmjsq77g0prw8v0q83"; }; disabled = (luaOlder "5.1"); @@ -677,9 +617,7 @@ lua-iconv = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "http://ittner.github.com/lua-iconv/"; description = "Lua binding to the iconv"; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; }; }; lua-lsp = buildLuarocksPackage { @@ -687,15 +625,15 @@ lua-lsp = buildLuarocksPackage { version = "scm-2"; knownRockspec = (fetchurl { - url = "http://luarocks.org/dev/lua-lsp-scm-2.rockspec"; + url = "mirror://luarocks/lua-lsp-scm-2.rockspec"; sha256 = "0qk3i6j0km4d1fs61fxhkmnbxmgpq24nygr8wknl6hbj2kya25rb"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "git://github.com/Alloyed/lua-lsp", - "rev": "0de511803ed616214333210a2d003cf05a64dc18", - "date": "2018-09-08T10:11:54-04:00", - "sha256": "15dnsyh5664vi7qn73y2r114rhs5l9lfi84pwqkq5cafkiiy49qa", + "rev": "905e71f9a97ea6366deb386503f9d976c87d9bab", + "date": "2019-09-22T09:46:00-04:00", + "sha256": "1mlgb2dp1ah76hjkbkwz0dp2y5mn491v5wf81nm086rb2fa3rzcg", "fetchSubmodules": true } '') ["date"]) ; @@ -706,28 +644,24 @@ lua-lsp = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "https://github.com/Alloyed/lua-lsp"; description = "No summary"; - license = { - fullName = "MIT"; - }; + license.fullName = "MIT"; }; }; lua-messagepack = buildLuarocksPackage { pname = "lua-messagepack"; - version = "0.5.1-2"; + version = "0.5.2-1"; src = fetchurl { - url = "https://luarocks.org/lua-messagepack-0.5.1-2.src.rock"; - sha256 = "0bsdzdd24p9z3j4z1avw7qaqx87baa1pm58v275pw4h6n72z492g"; + url = "mirror://luarocks/lua-messagepack-0.5.2-1.src.rock"; + sha256 = "0hqahc84ncl8g4miif14sdkzyvnpqip48886sagz9drl52qvgcfb"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = with stdenv.lib; { - homepage = "http://fperrad.frama.io/lua-MessagePack/"; + homepage = "https://fperrad.frama.io/lua-MessagePack/"; description = "a pure Lua implementation of the MessagePack serialization format"; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; }; }; lua-term = buildLuarocksPackage { @@ -735,7 +669,7 @@ lua-term = buildLuarocksPackage { version = "0.7-1"; knownRockspec = (fetchurl { - url = "https://luarocks.org/lua-term-0.7-1.rockspec"; + url = "mirror://luarocks/lua-term-0.7-1.rockspec"; sha256 = "0r9g5jw7pqr1dyj6w58dqlr7y7l0jp077n8nnji4phf10biyrvg2"; }).outPath; @@ -748,9 +682,7 @@ lua-term = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "https://github.com/hoelzro/lua-term"; description = "Terminal functions for Lua"; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; }; }; lua-toml = buildLuarocksPackage { @@ -758,7 +690,7 @@ lua-toml = buildLuarocksPackage { version = "2.0-1"; src = fetchurl { - url = "https://luarocks.org/lua-toml-2.0-1.src.rock"; + url = "mirror://luarocks/lua-toml-2.0-1.src.rock"; sha256 = "0lyqlnydqbplq82brw9ipqy9gijin6hj1wc46plz994pg4i2c74m"; }; disabled = (luaOlder "5.1"); @@ -767,9 +699,7 @@ lua-toml = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "https://github.com/jonstoler/lua-toml"; description = "toml decoder/encoder for Lua"; - license = { - fullName = "MIT"; - }; + license.fullName = "MIT"; }; }; lua-zlib = buildLuarocksPackage { @@ -777,7 +707,7 @@ lua-zlib = buildLuarocksPackage { version = "1.2-0"; src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua-zlib-1.2-0.src.rock"; + url = "mirror://luarocks/lua-zlib-1.2-0.src.rock"; sha256 = "0qa0vnx45nxdj6fqag6fr627zsnd2bmrr9bdbm8jv6lcnyi6nhs2"; }; disabled = (luaOlder "5.1"); @@ -787,9 +717,7 @@ lua-zlib = buildLuarocksPackage { homepage = "https://github.com/brimworks/lua-zlib"; description = "Simple streaming interface to zlib for Lua."; maintainers = with maintainers; [ koral ]; - license = { - fullName = "MIT"; - }; + license.fullName = "MIT"; }; }; lua_cliargs = buildLuarocksPackage { @@ -797,7 +725,7 @@ lua_cliargs = buildLuarocksPackage { version = "3.0-2"; src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua_cliargs-3.0-2.src.rock"; + url = "mirror://luarocks/lua_cliargs-3.0-2.src.rock"; sha256 = "0qqdnw00r16xbyqn4w1xwwpg9i9ppc3c1dcypazjvdxaj899hy9w"; }; disabled = (luaOlder "5.1"); @@ -806,9 +734,7 @@ lua_cliargs = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "https://github.com/amireh/lua_cliargs"; description = "A command-line argument parser."; - license = { - fullName = "MIT <http://opensource.org/licenses/MIT>"; - }; + license.fullName = "MIT <http://opensource.org/licenses/MIT>"; }; }; luabitop = buildLuarocksPackage { @@ -816,7 +742,7 @@ luabitop = buildLuarocksPackage { version = "1.0.2-3"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luabitop-1.0.2-3.rockspec"; + url = "mirror://luarocks/luabitop-1.0.2-3.rockspec"; sha256 = "07y2h11hbxmby7kyhy3mda64w83p4a6p7y7rzrjqgc0r56yjxhcc"; }).outPath; @@ -835,9 +761,7 @@ luabitop = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "http://bitop.luajit.org/"; description = "Lua Bit Operations Module"; - license = { - fullName = "MIT/X license"; - }; + license.fullName = "MIT/X license"; }; }; luacheck = buildLuarocksPackage { @@ -845,7 +769,7 @@ luacheck = buildLuarocksPackage { version = "0.23.0-1"; src = fetchurl { - url = "https://luarocks.org/luacheck-0.23.0-1.src.rock"; + url = "mirror://luarocks/luacheck-0.23.0-1.src.rock"; sha256 = "0akj61c7k1na2mggsckvfn9a3ljfp4agnmr9gp3mac4vin99a1cl"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -854,18 +778,16 @@ luacheck = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "https://github.com/mpeterv/luacheck"; description = "A static analyzer and a linter for Lua"; - license = { - fullName = "MIT"; - }; + license.fullName = "MIT"; }; }; luacov = buildLuarocksPackage { pname = "luacov"; - version = "0.13.0-1"; + version = "0.14.0-1"; src = fetchurl { - url = "mirror://luarocks/luacov-0.13.0-1.src.rock"; - sha256 = "16am0adzr4y64n94f64d4yrz65in8rwa8mmjz1p0k8afm5p5759i"; + url = "mirror://luarocks/luacov-0.14.0-1.src.rock"; + sha256 = "18wj4l55wxwvaimvmkg3g5c6amzz9czdpl57z56wmdb284454kca"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; @@ -873,9 +795,7 @@ luacov = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "https://keplerproject.github.io/luacov/"; description = "Coverage analysis tool for Lua scripts"; - license = { - fullName = "MIT"; - }; + license.fullName = "MIT"; }; }; luadbi = buildLuarocksPackage { @@ -883,7 +803,7 @@ luadbi = buildLuarocksPackage { version = "0.7.2-1"; src = fetchurl { - url = "https://luarocks.org/luadbi-0.7.2-1.src.rock"; + url = "mirror://luarocks/luadbi-0.7.2-1.src.rock"; sha256 = "0mj9ggyb05l03gs38ds508620mqaw4fkrzz9861n4j0zxbsbmfwy"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -892,9 +812,7 @@ luadbi = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "https://github.com/mwild1/luadbi"; description = "Database abstraction layer"; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; }; }; luadbi-mysql = buildLuarocksPackage { @@ -902,7 +820,7 @@ luadbi-mysql = buildLuarocksPackage { version = "0.7.2-1"; src = fetchurl { - url = "https://luarocks.org/luadbi-mysql-0.7.2-1.src.rock"; + url = "mirror://luarocks/luadbi-mysql-0.7.2-1.src.rock"; sha256 = "1f8i5p66halws8qsa7g09110hwzg7pv29yi22mkqd8sjgjv42iq4"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -911,9 +829,7 @@ luadbi-mysql = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "https://github.com/mwild1/luadbi"; description = "Database abstraction layer"; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; }; }; luadbi-postgresql = buildLuarocksPackage { @@ -921,7 +837,7 @@ luadbi-postgresql = buildLuarocksPackage { version = "0.7.2-1"; src = fetchurl { - url = "https://luarocks.org/luadbi-postgresql-0.7.2-1.src.rock"; + url = "mirror://luarocks/luadbi-postgresql-0.7.2-1.src.rock"; sha256 = "0nmm1hdzl77wk8p6r6al6mpkh2n332a8r3iqsdi6v4nxamykdh28"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -930,9 +846,7 @@ luadbi-postgresql = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "https://github.com/mwild1/luadbi"; description = "Database abstraction layer"; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; }; }; luadbi-sqlite3 = buildLuarocksPackage { @@ -940,7 +854,7 @@ luadbi-sqlite3 = buildLuarocksPackage { version = "0.7.2-1"; src = fetchurl { - url = "https://luarocks.org/luadbi-sqlite3-0.7.2-1.src.rock"; + url = "mirror://luarocks/luadbi-sqlite3-0.7.2-1.src.rock"; sha256 = "17wd2djzk5x4l4pv2k3c7b8dcvl46s96kqyk8dp3q6ll8gdl7c65"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -949,9 +863,7 @@ luadbi-sqlite3 = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "https://github.com/mwild1/luadbi"; description = "Database abstraction layer"; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; }; }; luadoc = buildLuarocksPackage { @@ -992,7 +904,7 @@ luaevent = buildLuarocksPackage { version = "0.4.6-1"; src = fetchurl { - url = "https://luarocks.org/luaevent-0.4.6-1.src.rock"; + url = "mirror://luarocks/luaevent-0.4.6-1.src.rock"; sha256 = "0chq09nawiz00lxd6pkdqcb8v426gdifjw6js3ql0lx5vqdkb6dz"; }; disabled = (luaOlder "5.1"); @@ -1001,9 +913,7 @@ luaevent = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "https://github.com/harningt/luaevent"; description = "libevent binding for Lua"; - license = { - fullName = "MIT"; - }; + license.fullName = "MIT"; }; }; luaexpat = buildLuarocksPackage { @@ -1011,7 +921,7 @@ luaexpat = buildLuarocksPackage { version = "1.3.0-1"; src = fetchurl { - url = "https://luarocks.org/luaexpat-1.3.0-1.src.rock"; + url = "mirror://luarocks/luaexpat-1.3.0-1.src.rock"; sha256 = "15jqz5q12i9zvjyagzwz2lrpzya64mih8v1hxwr0wl2gsjh86y5a"; }; disabled = (luaOlder "5.1"); @@ -1021,9 +931,7 @@ luaexpat = buildLuarocksPackage { homepage = "http://www.keplerproject.org/luaexpat/"; description = "XML Expat parsing"; maintainers = with maintainers; [ arobyn flosse ]; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; }; }; luaffi = buildLuarocksPackage { @@ -1031,7 +939,7 @@ luaffi = buildLuarocksPackage { version = "scm-1"; src = fetchurl { - url = "http://luarocks.org/dev/luaffi-scm-1.src.rock"; + url = "mirror://luarocks/luaffi-scm-1.src.rock"; sha256 = "0dia66w8sgzw26bwy36gzyb2hyv7kh9n95lh5dl0158rqa6fsf26"; }; disabled = (luaOlder "5.1"); @@ -1040,9 +948,7 @@ luaffi = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "https://github.com/facebook/luaffifb"; description = "FFI library for calling C functions from lua"; - license = { - fullName = "BSD"; - }; + license.fullName = "BSD"; }; }; luafilesystem = buildLuarocksPackage { @@ -1050,7 +956,7 @@ luafilesystem = buildLuarocksPackage { version = "1.7.0-2"; src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luafilesystem-1.7.0-2.src.rock"; + url = "mirror://luarocks/luafilesystem-1.7.0-2.src.rock"; sha256 = "0xhmd08zklsgpnpjr9rjipah35fbs8jd4v4va36xd8bpwlvx9rk5"; }; disabled = (luaOlder "5.1"); @@ -1060,9 +966,7 @@ luafilesystem = buildLuarocksPackage { homepage = "git://github.com/keplerproject/luafilesystem"; description = "File System Library for the Lua Programming Language"; maintainers = with maintainers; [ flosse vcunat ]; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; }; }; lualogging = buildLuarocksPackage { @@ -1078,9 +982,7 @@ lualogging = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "https://github.com/Neopallium/lualogging"; description = "A simple API to use logging features"; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; }; }; luaossl = buildLuarocksPackage { @@ -1088,7 +990,7 @@ luaossl = buildLuarocksPackage { version = "20190731-0"; src = fetchurl { - url = "https://luarocks.org/luaossl-20190731-0.src.rock"; + url = "mirror://luarocks/luaossl-20190731-0.src.rock"; sha256 = "0gardlh547hah5w4kfsdg05jmxzrxr21macqigcmp5hw1l67jn5m"; }; propagatedBuildInputs = [ lua ]; @@ -1097,24 +999,22 @@ luaossl = buildLuarocksPackage { homepage = "http://25thandclement.com/~william/projects/luaossl.html"; description = "Most comprehensive OpenSSL module in the Lua universe."; maintainers = with maintainers; [ vcunat ]; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; }; }; luaposix = buildLuarocksPackage { pname = "luaposix"; - version = "34.0.4-1"; + version = "34.1.1-1"; src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luaposix-34.0.4-1.src.rock"; - sha256 = "0yrm5cn2iyd0zjd4liyj27srphvy0gjrjx572swar6zqr4dwjqp2"; + url = "mirror://luarocks/luaposix-34.1.1-1.src.rock"; + sha256 = "1l9pkn3g0nzlbmmfj12rhfwvkqb06c21ydqxqgmnmd3w9z4ck53w"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ bit32 lua std_normalize ]; + propagatedBuildInputs = [ bit32 lua ]; meta = with stdenv.lib; { - homepage = "https://github.com/luaposix/luaposix/"; + homepage = "http://github.com/luaposix/luaposix/"; description = "Lua bindings for POSIX"; maintainers = with maintainers; [ vyp lblasc ]; license.fullName = "MIT/X11"; @@ -1145,11 +1045,11 @@ luarepl = buildLuarocksPackage { }; luasec = buildLuarocksPackage { pname = "luasec"; - version = "0.8-1"; + version = "0.9-1"; src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luasec-0.8-1.src.rock"; - sha256 = "063rgz0zdmaizirsm6jbcfijgkpdcrb8a2fvhvg3y2s8ixbaff13"; + url = "mirror://luarocks/luasec-0.9-1.src.rock"; + sha256 = "00npxdwr3s4638i1jzmhyvss796rhbqk43zrzkb5lzzhqlxpsz5q"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua luasocket ]; @@ -1158,9 +1058,7 @@ luasec = buildLuarocksPackage { homepage = "https://github.com/brunoos/luasec/wiki"; description = "A binding for OpenSSL library to provide TLS/SSL communication over LuaSocket."; maintainers = with maintainers; [ flosse ]; - license = { - fullName = "MIT"; - }; + license.fullName = "MIT"; }; }; luasocket = buildLuarocksPackage { @@ -1168,7 +1066,7 @@ luasocket = buildLuarocksPackage { version = "3.0rc1-2"; src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luasocket-3.0rc1-2.src.rock"; + url = "mirror://luarocks/luasocket-3.0rc1-2.src.rock"; sha256 = "1isin9m40ixpqng6ds47skwa4zxrc6w8blza8gmmq566w6hz50iq"; }; disabled = (luaOlder "5.1"); @@ -1177,19 +1075,27 @@ luasocket = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "http://luaforge.net/projects/luasocket/"; description = "Network support for the Lua language"; - license = { - fullName = "MIT"; - }; + license.fullName = "MIT"; }; }; luasql-sqlite3 = buildLuarocksPackage { pname = "luasql-sqlite3"; - version = "2.4.0-1"; + version = "2.5.0-1"; + + knownRockspec = (fetchurl { + url = "mirror://luarocks/luasql-sqlite3-2.5.0-1.rockspec"; + sha256 = "1r0x21i6n18x6915iaj9n309lqqqk1b30bg9h2a6y8jzk839hk09"; + }).outPath; + + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "git://github.com/keplerproject/luasql.git", + "rev": "5496d60185db0c4578e8abe0c74343e99b799311", + "date": "2019-06-14T10:54:41-03:00", + "sha256": "1jdm1abj2ngklg7syq1ijj142ai9nmdl9370dk2bgamzlxc41pqm", + "fetchSubmodules": true +} + '') ["date"]) ; - src = fetchurl { - url = "https://luarocks.org/luasql-sqlite3-2.4.0-1.src.rock"; - sha256 = "0pdk8c9iw0625imf5wdrhq60484jn475b85rvp0xgh86bsyalbsh"; - }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1197,23 +1103,21 @@ luasql-sqlite3 = buildLuarocksPackage { homepage = "http://www.keplerproject.org/luasql/"; description = "Database connectivity for Lua (SQLite3 driver)"; maintainers = with maintainers; [ vyp ]; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; }; }; luassert = buildLuarocksPackage { pname = "luassert"; - version = "1.7.11-0"; + version = "1.8.0-0"; knownRockspec = (fetchurl { - url = "https://luarocks.org/luassert-1.7.11-0.rockspec"; - sha256 = "12zgybcv8acjzvjdbxd1764s1vxbksxdv9fkvsymcsdmppxkbd0s"; + url = "mirror://luarocks/luassert-1.8.0-0.rockspec"; + sha256 = "1194y81nlkq4qmrrgl7z82i6vgvhqvp1p673kq0arjix8mv3zyz1"; }).outPath; src = fetchurl { - url = "https://github.com/Olivine-Labs/luassert/archive/v1.7.11.tar.gz"; - sha256 = "1vwq3wqj9cjyz9lnf1n38yhpcglr2h40v3n9096i8vcpmyvdb3ka"; + url = "https://github.com/Olivine-Labs/luassert/archive/v1.8.0.tar.gz"; + sha256 = "0xlwlb32215524bg33svp1ci8mdvh9wykchl8dkhihpxcd526mar"; }; disabled = (luaOlder "5.1"); @@ -1222,9 +1126,7 @@ luassert = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "http://olivinelabs.com/busted/"; description = "Lua Assertions Extension"; - license = { - fullName = "MIT <http://opensource.org/licenses/MIT>"; - }; + license.fullName = "MIT <http://opensource.org/licenses/MIT>"; }; }; luasystem = buildLuarocksPackage { @@ -1232,7 +1134,7 @@ luasystem = buildLuarocksPackage { version = "0.2.1-0"; src = fetchurl { - url = "https://luarocks.org/luasystem-0.2.1-0.src.rock"; + url = "mirror://luarocks/luasystem-0.2.1-0.src.rock"; sha256 = "091xmp8cijgj0yzfsjrn7vljwznjnjn278ay7z9pjwpwiva0diyi"; }; disabled = (luaOlder "5.1"); @@ -1241,29 +1143,25 @@ luasystem = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "http://olivinelabs.com/luasystem/"; description = "Platform independent system calls for Lua."; - license = { - fullName = "MIT <http://opensource.org/licenses/MIT>"; - }; + license.fullName = "MIT <http://opensource.org/licenses/MIT>"; }; }; luautf8 = buildLuarocksPackage { pname = "luautf8"; - version = "0.1.1-1"; + version = "0.1.2-2"; src = fetchurl { - url = "https://luarocks.org/luautf8-0.1.1-1.src.rock"; - sha256 = "1832ilrlddh4h7ayx4l9j7z1p8c2hk5yr96cpxjjrmirkld23aji"; + url = "mirror://luarocks/luautf8-0.1.2-2.src.rock"; + sha256 = "1q0qpr87alfzwwx5x0v9cggnz5fqi20jlqdh1a3i5cijjaj6xwdn"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = with stdenv.lib; { - homepage = "https://github.com/starwing/luautf8"; + homepage = "http://github.com/starwing/luautf8"; description = "A UTF-8 support module for Lua"; maintainers = with maintainers; [ pstn ]; - license = { - fullName = "MIT"; - }; + license.fullName = "MIT"; }; }; luazip = buildLuarocksPackage { @@ -1271,7 +1169,7 @@ luazip = buildLuarocksPackage { version = "1.2.7-1"; src = fetchurl { - url = "https://luarocks.org/luazip-1.2.7-1.src.rock"; + url = "mirror://luarocks/luazip-1.2.7-1.src.rock"; sha256 = "1yprlr1ap6bhshhy88qfphmmyg9zp1py2hj2158iw6vsva0fk03l"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -1280,9 +1178,7 @@ luazip = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "https://github.com/mpeterv/luazip"; description = "Library for reading files inside zip files"; - license = { - fullName = "MIT"; - }; + license.fullName = "MIT"; }; }; lua-yajl = buildLuarocksPackage { @@ -1290,19 +1186,17 @@ lua-yajl = buildLuarocksPackage { version = "2.0-1"; src = fetchurl { - url = "https://luarocks.org/lua-yajl-2.0-1.src.rock"; + url = "mirror://luarocks/lua-yajl-2.0-1.src.rock"; sha256 = "0bsm519vs53rchcdf8g96ygzdx2bz6pa4vffqlvc7ap49bg5np4f"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = with stdenv.lib; { - homepage = "https://github.com/brimworks/lua-yajl"; + homepage = "http://github.com/brimworks/lua-yajl"; description = "Integrate the yajl JSON library with Lua."; maintainers = with maintainers; [ pstn ]; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; }; }; luuid = buildLuarocksPackage { @@ -1310,7 +1204,7 @@ luuid = buildLuarocksPackage { version = "20120509-2"; src = fetchurl { - url = "https://luarocks.org/luuid-20120509-2.src.rock"; + url = "mirror://luarocks/luuid-20120509-2.src.rock"; sha256 = "08q54x0m51w89np3n117h2a153wsgv3qayabd8cz6i55qm544hkg"; }; disabled = (luaOlder "5.2") || (luaAtLeast "5.4"); @@ -1319,9 +1213,7 @@ luuid = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#luuid"; description = "A library for UUID generation"; - license = { - fullName = "Public domain"; - }; + license.fullName = "Public domain"; }; }; luv = buildLuarocksPackage { @@ -1338,9 +1230,25 @@ luv = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "https://github.com/luvit/luv"; description = "Bare libuv bindings for lua"; - license = { - fullName = "Apache 2.0"; - }; + license.fullName = "Apache 2.0"; + }; +}; +lyaml = buildLuarocksPackage { + pname = "lyaml"; + version = "6.2.5-1"; + + src = fetchurl { + url = "mirror://luarocks/lyaml-6.2.5-1.src.rock"; + sha256 = "00pnz27sqi84arwkzjabz9v7w37h7xvwb5njk690cfmaknb1dfz6"; + }; + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); + propagatedBuildInputs = [ lua ]; + + meta = with stdenv.lib; { + homepage = "http://github.com/gvvaughan/lyaml"; + description = "libYAML binding for Lua"; + maintainers = with maintainers; [ lblasc ]; + license.fullName = "MIT/X11"; }; }; markdown = buildLuarocksPackage { @@ -1348,7 +1256,7 @@ markdown = buildLuarocksPackage { version = "0.33-1"; src = fetchurl { - url = "https://luarocks.org/markdown-0.33-1.src.rock"; + url = "mirror://luarocks/markdown-0.33-1.src.rock"; sha256 = "01xw4b4jvmrv1hz2gya02g3nphsj3hc94hsbc672ycj8pcql5n5y"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -1357,9 +1265,7 @@ markdown = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "https://github.com/mpeterv/markdown"; description = "Markdown text-to-html markup system."; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; }; }; mediator_lua = buildLuarocksPackage { @@ -1367,7 +1273,7 @@ mediator_lua = buildLuarocksPackage { version = "1.1.2-0"; knownRockspec = (fetchurl { - url = "https://luarocks.org/mediator_lua-1.1.2-0.rockspec"; + url = "mirror://luarocks/mediator_lua-1.1.2-0.rockspec"; sha256 = "0frzvf7i256260a1s8xh92crwa2m42972qxfq29zl05aw3pyn7bm"; }).outPath; @@ -1382,32 +1288,28 @@ mediator_lua = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "http://olivinelabs.com/mediator_lua/"; description = "Event handling through channels"; - license = { - fullName = "MIT <http://opensource.org/licenses/MIT>"; - }; + license.fullName = "MIT <http://opensource.org/licenses/MIT>"; }; }; mpack = buildLuarocksPackage { pname = "mpack"; - version = "1.0.7-0"; + version = "1.0.8-0"; knownRockspec = (fetchurl { - url = "https://luarocks.org/mpack-1.0.7-0.rockspec"; - sha256 = "1sdw8qsni3g3fx9jnc5g64nxfw6v3n1rrw1xa3bkwc9wk815lqnz"; + url = "mirror://luarocks/mpack-1.0.8-0.rockspec"; + sha256 = "0hhpamw2bydnfrild274faaan6v48918nhslnw3kvi9y36b4i5ha"; }).outPath; src = fetchurl { - url = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.7/libmpack-lua-1.0.7.tar.gz"; - sha256 = "1s4712ig3l4ds65pmlyg3r5zids2snn1rv8vsmmk27a4lf258mk8"; + url = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.8/libmpack-lua-1.0.8.tar.gz"; + sha256 = "1sf93ffx7a3y1waknc4994l2yrxilrlf3hcp2cj2cvxmpm5inszd"; }; meta = with stdenv.lib; { - homepage = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.7/libmpack-lua-1.0.7.tar.gz"; + homepage = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.8/libmpack-lua-1.0.8.tar.gz"; description = "Lua binding to libmpack"; - license = { - fullName = "MIT"; - }; + license.fullName = "MIT"; }; }; moonscript = buildLuarocksPackage { @@ -1415,7 +1317,7 @@ moonscript = buildLuarocksPackage { version = "0.5.0-1"; src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/moonscript-0.5.0-1.src.rock"; + url = "mirror://luarocks/moonscript-0.5.0-1.src.rock"; sha256 = "09vv3ayzg94bjnzv5fw50r683ma0x3lb7sym297145zig9aqb9q9"; }; disabled = (luaOlder "5.1"); @@ -1425,9 +1327,7 @@ moonscript = buildLuarocksPackage { homepage = "http://moonscript.org"; description = "A programmer friendly language that compiles to Lua"; maintainers = with maintainers; [ arobyn ]; - license = { - fullName = "MIT"; - }; + license.fullName = "MIT"; }; }; nvim-client = buildLuarocksPackage { @@ -1435,51 +1335,41 @@ nvim-client = buildLuarocksPackage { version = "0.2.2-1"; src = fetchurl { - url = "https://luarocks.org/nvim-client-0.2.2-1.src.rock"; + url = "mirror://luarocks/nvim-client-0.2.2-1.src.rock"; sha256 = "0bgx94ziiq0004zw9lz2zb349xaqs5pminqd8bwdrfdnfjnbp8x0"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua mpack luv coxpcall ]; meta = with stdenv.lib; { - homepage = "https://github.com/neovim/lua-client/archive/0.2.2-1.tar.gz"; + homepage = "https://github.com/neovim/lua-client"; description = "Lua client to Nvim"; - license = { - fullName = "Apache"; - }; + license.fullName = "Apache"; }; }; penlight = buildLuarocksPackage { pname = "penlight"; - version = "1.5.4-1"; - - knownRockspec = (fetchurl { - url = "https://luarocks.org/penlight-1.5.4-1.rockspec"; - sha256 = "07mhsk9kmdxg4i2w4mrnnd2zs34bgggi9gigfplakxin96sa6c0p"; - }).outPath; + version = "1.7.0-1"; src = fetchurl { - url = "http://stevedonovan.github.io/files/penlight-1.5.4.zip"; - sha256 = "138f921p6kdqkmf4pz115phhj0jsqf28g33avws80d2vq2ixqm8q"; + url = "mirror://luarocks/penlight-1.7.0-1.src.rock"; + sha256 = "0rr56vc33b2knr5qmfdjrb1wk98lyp3zmlyzz6m15v2s1s5yxgah"; }; - propagatedBuildInputs = [ luafilesystem ]; meta = with stdenv.lib; { - homepage = "http://stevedonovan.github.com/Penlight"; + homepage = "http://tieske.github.io/Penlight"; description = "Lua utility libraries loosely based on the Python standard libraries"; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; }; }; rapidjson = buildLuarocksPackage { pname = "rapidjson"; - version = "0.5.2-1"; + version = "0.6.1-1"; src = fetchurl { - url = "https://luarocks.org/rapidjson-0.5.2-1.src.rock"; - sha256 = "17lgbzv9kairx49kwa0m8xwyly95mg6fw60jan2dpqwnnkf2m8y6"; + url = "mirror://luarocks/rapidjson-0.6.1-1.src.rock"; + sha256 = "106zdkmqspwjw6ywzi7ya9zss52p9zggh53rg0i36sk19z0xmp6j"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1487,9 +1377,7 @@ rapidjson = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "https://github.com/xpol/lua-rapidjson"; description = "Json module based on the very fast RapidJSON."; - license = { - fullName = "MIT"; - }; + license.fullName = "MIT"; }; }; say = buildLuarocksPackage { @@ -1497,7 +1385,7 @@ say = buildLuarocksPackage { version = "1.3-1"; knownRockspec = (fetchurl { - url = "https://luarocks.org/say-1.3-1.rockspec"; + url = "mirror://luarocks/say-1.3-1.rockspec"; sha256 = "0bknglb0qwd6r703wp3hcb6z2xxd14kq4md3sg9al3b28fzxbhdv"; }).outPath; @@ -1512,9 +1400,7 @@ say = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "http://olivinelabs.com/busted/"; description = "Lua String Hashing/Indexing Library"; - license = { - fullName = "MIT <http://opensource.org/licenses/MIT>"; - }; + license.fullName = "MIT <http://opensource.org/licenses/MIT>"; }; }; std__debug = buildLuarocksPackage { @@ -1522,7 +1408,7 @@ std__debug = buildLuarocksPackage { version = "1.0.1-1"; src = fetchurl { - url = "https://luarocks.org/std._debug-1.0.1-1.src.rock"; + url = "mirror://luarocks/std._debug-1.0.1-1.src.rock"; sha256 = "1qkcc5rph3ns9mzrfsa1671pb3hzbzfnaxvyw7zdly2b7ll88svz"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); @@ -1531,28 +1417,24 @@ std__debug = buildLuarocksPackage { meta = with stdenv.lib; { homepage = "http://lua-stdlib.github.io/_debug"; description = "Debug Hints Library"; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; }; }; std_normalize = buildLuarocksPackage { pname = "std.normalize"; - version = "2.0.2-1"; + version = "2.0.3-1"; src = fetchurl { - url = "https://luarocks.org/std.normalize-2.0.2-1.src.rock"; - sha256 = "0yn60zqnxflhhlv6xk6w0ifdfxk1qcg8gq1wnrrbwsxwpipsrfjh"; + url = "mirror://luarocks/std.normalize-2.0.3-1.src.rock"; + sha256 = "00pq2y5w8i052gxmyhgri5ibijksnfmc24kya9y3d5rjlin0n11s"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua std__debug ]; meta = with stdenv.lib; { homepage = "https://lua-stdlib.github.io/normalize"; description = "Normalized Lua Functions"; - license = { - fullName = "MIT/X11"; - }; + license.fullName = "MIT/X11"; }; }; stdlib = buildLuarocksPackage { @@ -1560,7 +1442,7 @@ stdlib = buildLuarocksPackage { version = "41.2.2-1"; src = fetchurl { - url = "https://luarocks.org/stdlib-41.2.2-1.src.rock"; + url = "mirror://luarocks/stdlib-41.2.2-1.src.rock"; sha256 = "1kricll40xy75j72lrbp2jpyxsj9v8b9d7qjf3m3fq1bpg6dmsk7"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); @@ -1573,6 +1455,24 @@ stdlib = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; +pulseaudio = buildLuarocksPackage { + pname = "pulseaudio"; + version = "0.2-1"; + + src = fetchurl { + url = "mirror://luarocks/pulseaudio-0.2-1.src.rock"; + sha256 = "06w8fmwddrpm02yam818yi30gghw4ckb18zljjncy3x0zfijyhz7"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/doronbehar/lua-pulseaudio"; + description = "Bindings to libpulse"; + maintainers = with maintainers; [ doronbehar ]; + license.fullName = "Apache v2.0"; + }; +}; vstruct = buildLuarocksPackage { pname = "vstruct"; version = "2.0.2-1"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 84a15e8a674b..30be2c197a5d 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -40,11 +40,6 @@ with super; { name = "CRYPTO"; dep = pkgs.openssl; } { name = "OPENSSL"; dep = pkgs.openssl; } ]; - - # https://github.com/wahern/cqueues/issues/227 - NIX_CFLAGS_COMPILE = with pkgs.stdenv; lib.optionalString hostPlatform.isDarwin - "-DCLOCK_MONOTONIC -DCLOCK_REALTIME"; - disabled = luaOlder "5.1" || luaAtLeast "5.4"; # Upstream rockspec is pointlessly broken into separate rockspecs, per Lua # version, which doesn't work well for us, so modify it @@ -145,6 +140,14 @@ with super; ]; }); + lua-lsp = super.lua-lsp.override({ + # until Alloyed/lua-lsp#28 + postConfigure = '' + substituteInPlace ''${rockspecFilename} \ + --replace '"lpeglabel ~> 1.5",' '"lpeglabel >= 1.5",' + ''; + }); + lua-zlib = super.lua-zlib.override({ buildInputs = [ pkgs.zlib.dev @@ -294,6 +297,12 @@ with super; }; }); + lyaml = super.lyaml.override({ + buildInputs = [ + pkgs.libyaml + ]; + }); + mpack = super.mpack.override({ buildInputs = [ pkgs.libmpack ]; # the rockspec doesn't use the makefile so you may need to export more flags @@ -307,4 +316,13 @@ with super; sed -i '/set(CMAKE_C_FLAGS/d' CMakeLists.txt ''; }); + + pulseaudio = super.pulseaudio.override({ + buildInputs = [ + pkgs.libpulseaudio + ]; + nativeBuildInputs = [ + pkgs.pulseaudio pkgs.pkgconfig + ]; + }); } diff --git a/pkgs/development/ocaml-modules/pa_test/default.nix b/pkgs/development/ocaml-modules/pa_test/default.nix deleted file mode 100644 index 6a90561c6826..000000000000 --- a/pkgs/development/ocaml-modules/pa_test/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{stdenv, buildOcaml, fetchurl, type_conv, pa_ounit, sexplib_p4, herelib}: - -buildOcaml rec { - name = "pa_test"; - version = "112.24.00"; - - minimumSupportedOcamlVersion = "4.00"; - - src = fetchurl { - url = "https://github.com/janestreet/pa_test/archive/${version}.tar.gz"; - sha256 = "b03d13c2bc9fa9a4b1c507d7108d965202160f83e9781d430d3b53a1993e30d6"; - }; - - buildInputs = [ pa_ounit ]; - propagatedBuildInputs = [ type_conv sexplib_p4 herelib ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/janestreet/pa_test"; - description = "Syntax to reduce boiler plate in testing"; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/development/python-modules/pillow/6.nix b/pkgs/development/python-modules/pillow/6.nix new file mode 100644 index 000000000000..ad69f4f23450 --- /dev/null +++ b/pkgs/development/python-modules/pillow/6.nix @@ -0,0 +1,82 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPyPy +, olefile +, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 +, openjpeg, libimagequant +, pytest, pytestrunner, pyroma, numpy +}: + +buildPythonPackage rec { + pname = "Pillow"; + version = "6.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0l5rv8jkdrb5q846v60v03mcq64yrhklidjkgwv6s1pda71g17yv"; + }; + + # Disable imagefont tests, because they don't work well with infinality: + # https://github.com/python-pillow/Pillow/issues/1259 + postPatch = '' + rm Tests/test_imagefont.py + ''; + + checkPhase = '' + runHook preCheck + python -m pytest -v -x -W always + runHook postCheck + ''; + + propagatedBuildInputs = [ olefile ]; + + checkInputs = [ pytest pytestrunner pyroma numpy ]; + + buildInputs = [ + freetype libjpeg openjpeg libimagequant zlib libtiff libwebp tcl lcms2 ] + ++ stdenv.lib.optionals (isPyPy) [ tk libX11 ]; + + # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. + # NOTE: The Pillow install script will, by default, add paths like /usr/lib + # and /usr/include to the search paths. This can break things when building + # on a non-NixOS system that has some libraries installed that are not + # installed in Nix (for example, Arch Linux has jpeg2000 but Nix doesn't + # build Pillow with this support). We patch the `disable_platform_guessing` + # setting here, instead of passing the `--disable-platform-guessing` + # command-line option, since the command-line option doesn't work when we run + # tests. + preConfigure = let + libinclude' = pkg: ''"${pkg.out}/lib", "${pkg.out}/include"''; + libinclude = pkg: ''"${pkg.out}/lib", "${pkg.dev}/include"''; + in '' + sed -i "setup.py" \ + -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude freetype}|g ; + s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude libjpeg}|g ; + s|^JPEG2K_ROOT =.*$|JPEG2K_ROOT = ${libinclude openjpeg}|g ; + s|^IMAGEQUANT_ROOT =.*$|IMAGEQUANT_ROOT = ${libinclude' libimagequant}|g ; + s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude zlib}|g ; + s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude lcms2}|g ; + s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude libtiff}|g ; + s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude' tcl}|g ; + s|self\.disable_platform_guessing = None|self.disable_platform_guessing = True|g ;' + export LDFLAGS="-L${libwebp}/lib" + export CFLAGS="-I${libwebp}/include" + '' + # Remove impurities + + stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace setup.py \ + --replace '"/Library/Frameworks",' "" \ + --replace '"/System/Library/Frameworks"' "" + ''; + + meta = with stdenv.lib; { + homepage = "https://python-pillow.github.io/"; + description = "Fork of The Python Imaging Library (PIL)"; + longDescription = '' + The Python Imaging Library (PIL) adds image processing + capabilities to your Python interpreter. This library + supports many file formats, and provides powerful image + processing and graphics capabilities. + ''; + license = "http://www.pythonware.com/products/pil/license.htm"; + maintainers = with maintainers; [ goibhniu prikhi ]; + }; +} diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 2f9fac6c3d17..cc9a77be7827 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -2,7 +2,7 @@ , olefile , freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 , openjpeg, libimagequant -, pytest, pytestrunner, pyroma, numpy +, pyroma, numpy, pytestCheckHook , isPy3k }: @@ -23,15 +23,12 @@ buildPythonPackage rec { rm Tests/test_imagefont.py ''; - checkPhase = '' - runHook preCheck - python -m pytest -v -x -W always - runHook postCheck - ''; + # Disable darwin tests which require executables: `iconutil` and `screencapture` + disabledTests = stdenv.lib.optionals stdenv.isDarwin [ "test_save" "test_grab" "test_grabclipboard" ]; propagatedBuildInputs = [ olefile ]; - checkInputs = [ pytest pytestrunner pyroma numpy ]; + checkInputs = [ pytestCheckHook pyroma numpy ]; buildInputs = [ freetype libjpeg openjpeg libimagequant zlib libtiff libwebp tcl lcms2 ] @@ -71,8 +68,8 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = "https://python-pillow.github.io/"; - description = "Fork of The Python Imaging Library (PIL)"; + homepage = "https://python-pillow.org/"; + description = "The friendly PIL fork (Python Imaging Library)"; longDescription = '' The Python Imaging Library (PIL) adds image processing capabilities to your Python interpreter. This library diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index 1625b15f2ee9..c91892585d60 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, mupdf, swig }: buildPythonPackage rec { pname = "PyMuPDF"; - version = "1.16.18"; + version = "1.17.0"; src = fetchPypi { inherit pname version; - sha256 = "0gpcmmcjgwc6x4rn6nm3akiijdkpa9nahsw2x8a0i7z7kzj4firk"; + sha256 = "0de92a8fb65db6e661594cc5865a340a2daac3cb9bb58e030820769ece1343c1"; }; patchPhase = '' diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 3367588bb3b9..288482ab6f7d 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.32"; + version = "8.33"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "18ahdphxfcfi2vghl11kmj089hyh9iawll3cwxrqsdqak0748ijs"; + sha256 = "03innxi9f44z2c785a94n3i0adm6mn3jjgqlvgx46nmigvw41mz6"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 8cd0246c62f5..8df10222a88e 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.125.1"; + version = "0.126.1"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "0c6ai2fcssys8xd445xxc0zdn3jz6kcy85mac1p89mnlqd1r1xk4"; + sha256 = "1acmhyhbl4s2c907nj8jwgg9fjjrfr306vagwkcx2lza4clb2aan"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 189365008aa1..d4d09f7ae26d 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.16.1"; + version = "0.16.2"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "1sh34zrk90sfi3x48d583izzw2bijnpsv6yqslzjpvsgkg8d96vz"; + sha256 = "09s4a7xgzr6qr268j3bqjj18s9gn9xcssfvm6w918m7wd39zgqy0"; }; - vendorSha256 = "0xgv4jsrh8rfas7577xqv609pac05rvyshfm8vjx0kv38rnx3hfv"; + vendorSha256 = "1w833lx52m61dv4aq25946bnfwj8yd2g7w989d66ih39simxsvzr"; subPackages = [ "." ]; diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index d59e409b5ddf..05776712b32f 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.4.0"; + version = "1.5.0"; patches = [ ./gomod.patch ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "14zp0bi0p1rfbx1pxi5y28ndxwbqbvfx0pvy3jh1mnx5qsii1gcq"; + sha256 = "06vimiklcprsxq7l6rmxshv8l0kjr7aanpm206qgx3wvw4shibmw"; }; - vendorSha256 = "10156k90ky3znb9rxhy7zasskxmlcs5cn9f3xk25ana1c66vxszr"; + vendorSha256 = "11iwgrnid0f8sq9f23m1a3s55sc7lpl60phykmd9ss4xs39bapl5"; buildFlagsArray = [ "-ldflags=-s -w -X main.BazeliskVersion=${version}" ]; @@ -26,4 +26,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ elasticdog ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/bazelisk/gomod.patch b/pkgs/development/tools/bazelisk/gomod.patch index e5ff46bfa7bf..d41d81e7ede5 100644 --- a/pkgs/development/tools/bazelisk/gomod.patch +++ b/pkgs/development/tools/bazelisk/gomod.patch @@ -6,7 +6,7 @@ index 8eef134..54382cb 100644 go 1.14 require ( -+ github.com/bazelbuild/rules_go v0.22.4 ++ github.com/bazelbuild/rules_go v0.23.3 github.com/hashicorp/go-version v1.2.0 github.com/mitchellh/go-homedir v1.1.0 ) diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 9bbeb3c24a3e..5fe7ca69b036 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.43.0"; + version = "1.45.0"; vendorSha256 = null; @@ -30,7 +30,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "1x8rr3707mmbfnjn3ck0953xkkrfq5r8zflbxpkqlfz9k978z835"; + sha256 = "1wnrvswysms8p26d8hnxpimx12bhi3sa9k4kwd2dbxg74569gq6d"; }; meta = with lib; { diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index e2897135cd08..19e51fa998cf 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.36.0"; + version = "0.37.0"; src = fetchurl { url = "https://github.com/shyiko/ktlint/releases/download/${version}/ktlint"; - sha256 = "0pjxd4z0byqrr5qbk3k38vr1ln052m5vhlrky4agmhg5zhn38mm6"; + sha256 = "1z2hvhcrz1rj9g8749x640axrf529wk361pckwb4ihn43c19ajpf"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/packet-cli/default.nix b/pkgs/development/tools/packet-cli/default.nix index a484098f0c60..546b441db4bb 100644 --- a/pkgs/development/tools/packet-cli/default.nix +++ b/pkgs/development/tools/packet-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "packet-cli"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "packethost"; repo = pname; rev = version; - sha256 = "17f3ax7pjm5k93cxj7fd8hwr4id1lbzz9pkl2xflpxydi89bwdfz"; + sha256 = "1ixdqq0xwy2l2m1w93rzqw5gfrzw7w03r42qab3n733m4jkf4ni1"; }; vendorSha256 = "10praxaiscxq4v3zknrabldxl7rpklkr5wdlwa5lxsx0if8mrvp7"; diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index deba6cc674c1..70fee45a873c 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.6.7"; + version = "0.6.8"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "1d7zd2wpvfz1vq5ik67m6s1mscivh8b3kz4bfckw3cazk68vn9q1"; + sha256 = "0nv3min7jyrv4scn7bhizc9vmqhmv6sg0nvfnr0m59pm5806vdpi"; }; - cargoSha256 = "0jy10yfd9d5r0ildyxszs1ppzyd4ninl7lihdnwjqm6qifr1m5rp"; + cargoSha256 = "1vywm3iqs3qnkrvi7i70sv21hznn3y3hza1i9gvcxfmh03wzhwx0"; nativeBuildInputs = [ perl pkgconfig ]; diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index a6089ffeac2d..e724f26f7823 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.11"; + version = "0.1.12"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "1drz0slv33p4spm52sb5lnmpb83q8l7k3cvp0zcsinbjv8glvvnv"; + sha256 = "1hf2zkv3yd72kkvdwigms3wzchmh4i56ym3swpx35dij2h8g08mx"; }; - cargoSha256 = "13ynab3s563n2xwkls7nmksis0ngx5klw9wc9bpnxgc5na9k84ll"; + cargoSha256 = "0xb9fmcrsm47zkb26jw5rsi9wfz3jh19fbc74gnsrffdmfsd7mm2"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index 35c0b9530eba..ac0eeff2c09c 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-watch"; - version = "7.3.0"; + version = "7.4.0"; src = fetchFromGitHub { owner = "passcod"; repo = pname; rev = "v${version}"; - sha256 = "0l1aalb8ans7scljrza7akhi821jbpqgn6sa8kgd8sys83r93fkj"; + sha256 = "0yg6im7hzwzl84gxcg7wbix5h0ciq4l4ql6ili7k0k7j8bhrxn82"; }; - cargoSha256 = "07zkfpw0zyakpsm1mg525ibpsfs9swwmijb0xfsk3nbv66caqd04"; + cargoSha256 = "1y299mvg9k568f16d2r92y0bgwfrng6idw21wcsd5mnsd28fsww1"; buildInputs = lib.optional stdenv.isDarwin CoreServices; diff --git a/pkgs/games/tuxpaint/default.nix b/pkgs/games/tuxpaint/default.nix index b9d7f1b8c286..ea37ded6b6cd 100644 --- a/pkgs/games/tuxpaint/default.nix +++ b/pkgs/games/tuxpaint/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, SDL, SDL_image, SDL_ttf, SDL_mixer, libpng, - cairo, librsvg, gettext, libpaper, fribidi, pkgconfig, gperf }: + cairo, librsvg, gettext, libpaper, fribidi, pkgconfig, gperf, imagemagick }: stdenv.mkDerivation rec { - version = "0.9.22"; + version = "0.9.24"; pname = "tuxpaint"; src = fetchurl { url = "mirror://sourceforge/tuxpaint/${version}/${pname}-${version}.tar.gz"; - sha256 = "1qrbrdck9yxpcg3si6jb9i11w8lw9h4hqad0pfaxgyiniqpr7gca"; + sha256 = "06m1lg2pikfkmassfvvrbwqffwgixcmjh1li6akaldgkalpmfql7"; }; nativeBuildInputs = [ SDL SDL_image SDL_ttf SDL_mixer libpng cairo - librsvg gettext libpaper fribidi pkgconfig gperf ]; + librsvg gettext libpaper fribidi pkgconfig gperf imagemagick ]; hardeningDisable = [ "format" ]; makeFlags = [ "GPERF=${gperf}/bin/gperf" "PREFIX=$$out" diff --git a/pkgs/misc/drivers/hplip/3.18.5.nix b/pkgs/misc/drivers/hplip/3.18.5.nix index 80cd39b92334..f9064720fb64 100644 --- a/pkgs/misc/drivers/hplip/3.18.5.nix +++ b/pkgs/misc/drivers/hplip/3.18.5.nix @@ -199,6 +199,11 @@ python2Packages.buildPythonApplication { done ''; + # There are some binaries there, which reference gcc-unwrapped otherwise. + stripDebugList = [ + "share/hplip" + ]; + postFixup = '' substituteInPlace $out/etc/hp/hplip.conf --replace /usr $out # Patch udev rules: diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index b1853e28589c..7c9eb35b9af4 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -4,6 +4,8 @@ , dbus, file, ghostscript, usbutils , net-snmp, openssl, perl, nettools , bash, coreutils, utillinux +# To remove references to gcc-unwrapped +, removeReferencesTo , withQt5 ? true , withPlugin ? false , withStaticPPDInstall ? false @@ -65,7 +67,7 @@ python3Packages.buildPythonApplication { zlib ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig removeReferencesTo ]; pythonPath = with python3Packages; [ dbus @@ -216,8 +218,14 @@ python3Packages.buildPythonApplication { --replace /usr/bin/nohup "" \ --replace {,${utillinux}/bin/}logger \ --replace {/usr,$out}/bin + remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/lib/*.so) ''; + # There are some binaries there, which reference gcc-unwrapped otherwise. + stripDebugList = [ + "share/hplip" "lib/cups/backend" "lib/cups/filter" "lib/python3.7/site-packages" "lib/sane" + ]; + meta = with stdenv.lib; { description = "Print, scan and fax HP drivers for Linux"; homepage = "https://developers.hp.com/hp-linux-imaging-and-printing"; diff --git a/pkgs/misc/emulators/np2kai/default.nix b/pkgs/misc/emulators/np2kai/default.nix new file mode 100644 index 000000000000..245bad1d535f --- /dev/null +++ b/pkgs/misc/emulators/np2kai/default.nix @@ -0,0 +1,196 @@ +{ stdenv +, lib +, fetchFromGitHub +, enable16Bit ? true +, enable32Bit ? true + +, enableSDL ? true +, withSDLVersion ? "2" +, SDL +, SDL_ttf +, SDL_mixer +, SDL2 +, SDL2_ttf +, SDL2_mixer + +, enableX11 ? stdenv.hostPlatform.isLinux +, automake +, autoconf +, autoconf-archive +, libtool +, pkg-config +, unzip +, gtk2 +, libusb1 +, libXxf86vm +, nasm +, libICE +, libSM + + # HAXM build succeeds but the binary segfaults, seemingly due to the missing HAXM kernel module + # Enable once there is a HAXM kernel module option in NixOS? Or somehow bind it to the system kernel having HAXM? + # Or leave it disabled by default? + # https://github.com/intel/haxm/blob/master/docs/manual-linux.md +, enableHAXM ? false +}: + +assert lib.assertMsg (enable16Bit || enable32Bit) + "Must enable 16-Bit and/or 32-Bit system variant."; +assert lib.assertMsg (enableSDL || enableX11) + "Must enable SDL and/or X11 graphics interfaces."; +assert lib.assertOneOf "withSDLVersion" withSDLVersion [ "1" "2" ]; +assert enableHAXM -> (lib.assertMsg enableX11 + "Must enable X11 graphics interface for HAXM build."); +let + inherit (lib) optional optionals optionalString; + inherit (lib.strings) concatStringsSep concatMapStringsSep; + isSDL2 = (withSDLVersion == "2"); + sdlInfix = optionalString isSDL2 "2"; + sdlDeps1 = [ + SDL + SDL_ttf + SDL_mixer + ]; + sdlDeps2 = [ + SDL2 + SDL2_ttf + SDL2_mixer + ]; + sdlDepsBuildonly = if isSDL2 then sdlDeps1 else sdlDeps2; + sdlDepsTarget = if isSDL2 then sdlDeps2 else sdlDeps1; + sdlMakefileSuffix = + if stdenv.hostPlatform.isWindows then "win" + else if stdenv.hostPlatform.isDarwin then "mac" + else "unix"; + sdlMakefiles = concatMapStringsSep " " (x: x + "." + sdlMakefileSuffix) + (optionals enable16Bit [ + "Makefile" + ] ++ optionals enable32Bit [ + "Makefile21" + ]); + sdlBuildFlags = concatStringsSep " " + (optionals enableSDL [ + "SDL_VERSION=${withSDLVersion}" + ]); + sdlBins = concatStringsSep " " + (optionals enable16Bit [ + "np2kai" + ] ++ optionals enable32Bit [ + "np21kai" + ]); + x11ConfigureFlags = concatStringsSep " " + (( + if ((enableHAXM && (enable16Bit || enable32Bit)) || (enable16Bit && enable32Bit)) then [ + "--enable-build-all" + ] else if enableHAXM then [ + "--enable-haxm" + ] else if enable32Bit then [ + "--enable-ia32" + ] else [ ] + ) ++ optionals (!isSDL2) [ + "--enable-sdl" + "--enable-sdlmixer" + "--enable-sdlttf" + + "--enable-sdl2=no" + "--enable-sdl2mixer=no" + "--enable-sdl2ttf=no" + ]); + x11BuildFlags = concatStringsSep " " [ + "SDL2_CONFIG=sdl2-config" + "SDL_CONFIG=sdl-config" + "SDL_CFLAGS=\"$(sdl${sdlInfix}-config --cflags)\"" + "SDL_LIBS=\"$(sdl${sdlInfix}-config --libs) -lSDL${sdlInfix}_mixer -lSDL${sdlInfix}_ttf\"" + ]; + x11Bins = concatStringsSep " " + (optionals enable16Bit [ + "xnp2kai" + ] ++ optionals enable32Bit [ + "xnp21kai" + ] ++ optionals enableHAXM [ + "xnp21kai_haxm" + ]); +in +stdenv.mkDerivation rec { + pname = "np2kai"; + version = "0.86rev22"; #update src.rev to commit rev accordingly + + src = fetchFromGitHub rec { + owner = "AZO234"; + repo = "NP2kai"; + rev = "4a317747724669343e4c33ebdd34783fb7043221"; + sha256 = "0kxysxhx6jyk82mx30ni0ydzmwdcbnlxlnarrlq018rsnwb4md72"; + }; + + configurePhase = '' + export GIT_VERSION=${builtins.substring 0 7 src.rev} + buildFlags="$buildFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES}" + '' + optionalString enableX11 '' + cd x11 + substituteInPlace Makefile.am \ + --replace 'GIT_VERSION :=' 'GIT_VERSION ?=' + ./autogen.sh ${x11ConfigureFlags} + ./configure ${x11ConfigureFlags} + cd .. + ''; + + nativeBuildInputs = sdlDepsBuildonly + ++ optionals enableX11 [ + automake + autoconf + autoconf-archive + libtool + pkg-config + unzip + nasm + ]; + + buildInputs = sdlDepsTarget + ++ optionals enableX11 [ + gtk2 + libICE + libSM + libusb1 + libXxf86vm + ]; + + enableParallelBuilding = true; + + buildPhase = optionalString enableSDL '' + cd sdl2 + for mkfile in ${sdlMakefiles}; do + substituteInPlace $mkfile \ + --replace 'GIT_VERSION :=' 'GIT_VERSION ?=' + echo make -f $mkfile $buildFlags ${sdlBuildFlags} clean + make -f $mkfile $buildFlags ${sdlBuildFlags} clean + make -f $mkfile $buildFlags ${sdlBuildFlags} + done + cd .. + '' + optionalString enableX11 '' + cd x11 + make $buildFlags ${x11BuildFlags} + cd .. + ''; + + installPhase = optionalString enableSDL '' + cd sdl2 + for emu in ${sdlBins}; do + install -D -m 755 $emu $out/bin/$emu + done + cd .. + '' + optionalString enableX11 '' + cd x11 + for emu in ${x11Bins}; do + install -D -m 755 $emu $out/bin/$emu + done + cd .. + ''; + + meta = with lib; { + description = "A PC-9801 series emulator."; + homepage = "https://github.com/AZO234/NP2kai"; + license = licenses.mit; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.x86; + }; +} diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 0ebd2b82a9a9..735814296132 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -718,6 +718,25 @@ in with stdenv.lib.licenses; preBuild = "cd libretro"; }; + np2kai = mkLibRetroCore rec { + core = "np2kai"; + src = fetchFromGitHub rec { + owner = "AZO234"; + repo = "NP2kai"; + rev = "4a317747724669343e4c33ebdd34783fb7043221"; + sha256 = "0kxysxhx6jyk82mx30ni0ydzmwdcbnlxlnarrlq018rsnwb4md72"; + }; + description = "Neko Project II kai libretro port"; + license = mit; + makefile = "Makefile.libretro"; + preBuild = '' + cd sdl2 + substituteInPlace ${makefile} \ + --replace 'GIT_VERSION :=' 'GIT_VERSION ?=' + export GIT_VERSION=${builtins.substring 0 7 src.rev} + ''; + }; + o2em = mkLibRetroCore rec { core = "o2em"; src = fetchRetro { diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 74df3c164728..c67606785e5b 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.18.0"; - sha256 = "16azscl74ym1far0s0p6xsjin1k1cm4wk80i9x5d74dznmx3wdsc"; + version = "1.19.0"; + sha256 = "1j1n3rlvan6l9j3vw8axbbdm96w7s0x6ygmgqvbplzfd3wbid9j4"; } diff --git a/pkgs/servers/kapow/default.nix b/pkgs/servers/kapow/default.nix index 1990dba381da..4f0e8cb4ec7a 100644 --- a/pkgs/servers/kapow/default.nix +++ b/pkgs/servers/kapow/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kapow"; - version = "0.5.3"; + version = "0.5.4"; goPackagePath = "github.com/BBVA/kapow"; @@ -12,7 +12,7 @@ buildGoModule rec { owner = "BBVA"; repo = pname; rev = "v${version}"; - sha256 = "0m5b9lvg5d908d27khyx9p3567pap1b2mxl8fk7cxhb51r89jypj"; + sha256 = "09qr631vzlgibz6q64f35lqzz9h1g3gxqfbapkrci5i0n3h04yr4"; }; vendorSha256 = "159s46rhg67mgglaxgddx3k8kssl0cqiq8yjdqgjhhxppf16r7dy"; diff --git a/pkgs/servers/tegola/default.nix b/pkgs/servers/tegola/default.nix index 7dc32972fe47..24e25f0c1377 100644 --- a/pkgs/servers/tegola/default.nix +++ b/pkgs/servers/tegola/default.nix @@ -2,16 +2,15 @@ buildGoPackage rec { pname = "tegola"; - version = "0.8.1"; - rev = "8b2675a63624ad1d69a8d2c84a6a3f3933e25ca1"; + version = "0.11.2"; goPackagePath = "github.com/go-spatial/tegola"; src = fetchFromGitHub { owner = "go-spatial"; - repo = "tegola"; - inherit rev; - sha256 = "1f70vsrj3i1d0kg76a8s741nps71hrglgyyrz2xm6a8b31w833pi"; + repo = pname; + rev = "v${version}"; + sha256 = "0xrjs0py08q9i31rl0cxi6idncrrgqwcspqks3c5vd9i65yqc6fv"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix index 22e490979bc9..77e0638d0d3e 100644 --- a/pkgs/tools/admin/clair/default.nix +++ b/pkgs/tools/admin/clair/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "clair"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "quay"; repo = pname; rev = "v${version}"; - sha256 = "0wkljfq9lnadzkg1ki3wkimlqd6j405nxcl35npzrxjglkvsdjym"; + sha256 = "1bvwh3ghxb3ynq8a07ka9i0rzaqg1aikxvqxmpjkwjvhwk63lwqd"; }; vendorSha256 = "0x31n50vd8660z816as6kms5dkv87b0mhblccpkvd9cbvcv2n37a"; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index f270576e684a..43cd243561b5 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -10,13 +10,13 @@ buildGoPackage rec { pname = "lxd"; - version = "4.1"; + version = "4.2"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0svzj57wwm43d2gnx0myr2p9pzjmkivwhgg0dww6zl169bx32liz"; + sha256 = "0pv84ywnigrp94kh54fz689i15yv01lhrnkxpk8dg9wypxara9m4"; }; postPatch = '' diff --git a/pkgs/tools/backup/monolith/default.nix b/pkgs/tools/backup/monolith/default.nix index 261267b809a1..36d90fb8066c 100644 --- a/pkgs/tools/backup/monolith/default.nix +++ b/pkgs/tools/backup/monolith/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "monolith"; - version = "2.2.6"; + version = "2.2.7"; src = fetchFromGitHub { owner = "Y2Z"; repo = pname; rev = "v${version}"; - sha256 = "0ifv1h16xrs40gw5wx7kwj7hirnzpgfrznskz2igsslk7ycjlbr1"; + sha256 = "1ww5q7pk269l2s7d2svkkyd7hb7g4hqmwjn09b287pmjcirnmqn9"; }; - cargoSha256 = "1plx9p265jcc6wg3bhcdk1f77md8ann08kkv3g2706d82kxy2c1i"; + cargoSha256 = "0jdbxshvm9hdxdjr3sy1kgszhfs9v4r6gp0nwvv2n92m3z8zri9y"; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] diff --git a/pkgs/tools/compression/hactool/default.nix b/pkgs/tools/compression/hactool/default.nix index 77382d980e54..d34ca73556bb 100644 --- a/pkgs/tools/compression/hactool/default.nix +++ b/pkgs/tools/compression/hactool/default.nix @@ -1,20 +1,22 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "hactool"; - version = "1.3.3"; + version = "1.4.0"; src = fetchFromGitHub { owner = "SciresM"; repo = "hactool"; - rev = "1.3.3"; - sha256 = "1qb51fck7liqc1ridms8wdlzgbdbvp6iv4an8jvmzhcj5p5xq631"; + rev = version; + sha256 = "0305ngsnwm8npzgyhyifasi4l802xnfz19r0kbzzniirmcn4082d"; }; preBuild = '' mv config.mk.template config.mk ''; + makeFlags = stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ]; + installPhase = '' install -D hactool $out/bin/hactool ''; diff --git a/pkgs/tools/graphics/yafaray-core/default.nix b/pkgs/tools/graphics/yafaray-core/default.nix index 8e15cd0d3280..a02a97739bad 100644 --- a/pkgs/tools/graphics/yafaray-core/default.nix +++ b/pkgs/tools/graphics/yafaray-core/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, opencv, zlib , libxml2, freetype, libjpeg, libtiff, swig, openexr , ilmbase, boost165 -, withPython ? true, python35 +, withPython ? true, python3 }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake pkgconfig boost165 opencv zlib libxml2 freetype libjpeg libtiff swig openexr ilmbase - ] ++ stdenv.lib.optional withPython python35; + ] ++ stdenv.lib.optional withPython python3; meta = with stdenv.lib; { description = "A free, open source raytracer"; diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index e961a5b06950..b4806b6b4a07 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -10,8 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "1pjdvhldmjpy8ymb7r91y18hj5dx1iygszsfwkd66v9rncjigd07"; - fetchSubmodules = true; + sha256 = "0pjdba2c6p7ldgx2yfffxqlpasrcfrlkw63m1ma34zdq0f287w3p"; }; cargoSha256 = "0myz06hjv4hwzmyqa9l36i9j9d213a0mnq8rvx6wyff7mr9zk99i"; diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index cb000b294723..a79059dff071 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "1697z9j0xd4il01bcvz1xwzkcg5mbkpp207mshb9csdhwi9a50wg"; + sha256 = "0wq6cqznbpkiy9vz3slpcnxlsxff6gx5x7fsbd67q6jv5zhkn881"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "1rczq41jpds7kfyf31nxj4v8rk9rccijjixpznhlriam6xhgm90b"; + cargoSha256 = "096c6i1hqyygaifnm2kg53x22a8hhfxfz22qlssh1rw79bj82q0x"; doCheck = false; diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/tools/misc/mutagen/default.nix index 50f8ffc25d7d..1271c4948515 100644 --- a/pkgs/tools/misc/mutagen/default.nix +++ b/pkgs/tools/misc/mutagen/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mutagen"; - version = "0.11.4"; + version = "0.11.5"; src = fetchFromGitHub { owner = "mutagen-io"; repo = pname; rev = "v${version}"; - sha256 = "15bknyk6mkrwlm18ypncsf9az8l1nv67n0lf0zav867z0r46cc6x"; + sha256 = "0z2bf412zfap91ygp7v06vif87d1cxj2jlc0jvfv7fm61801piij"; }; vendorSha256 = "0szs9yc49fyh55ra1wf8zj76kdah0x49d45cgivk3gqh2hl17j6l"; diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix index c78aa6a53156..da2e1a9cbe31 100644 --- a/pkgs/tools/misc/pgmetrics/default.nix +++ b/pkgs/tools/misc/pgmetrics/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pgmetrics"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "rapidloop"; repo = pname; rev = "v${version}"; - sha256 = "0f7pjagr3zcqmbhmk446j6n7nanyhvyq4rn68f5wljl9g68ni7sj"; + sha256 = "03c4v24ql9p38m0hmgq5ya9cnvhmdhv2zjxxrxpb2338cxajs4mh"; }; vendorSha256 = "16x33fmh4q993rw0jr65337yimska4fwgyyw3kmq84q0x28a3zg5"; diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index cbe1f7d407ce..4dd440850120 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "rmlint"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "sahib"; repo = "rmlint"; rev = "v${version}"; - sha256 = "1b5cziam14h80xrfb285fmfrzz2rligxcpsq1xsig14xf4l2875i"; + sha256 = "1r7j1bmm83p6wdw0jhvkm4sa568r534zsy45bvas7qq4433jl019"; }; CFLAGS="-I${stdenv.lib.getDev utillinux}/include"; diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index a4eb50d0c773..bbdb98ae4950 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "corerad"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "mdlayher"; repo = "corerad"; rev = "v${version}"; - sha256 = "0fi9wgv5aj3ds3r5qjyi4pxnd56psrpdy2sz84jd0sz2w48x4k4p"; + sha256 = "16rwydvqkzi0jlgwpl3d4f8zd35y4lv4h5xa30ybqmwwp1k5ymf0"; }; - vendorSha256 = "11r3vpimhik7y09gwb3p6pl0yf53hpaw24ry4a833fw8060rqp3q"; + vendorSha256 = "1431fvi9b0id3zhgkxhiampc5avvp998lncyd5l2gn5py3qz6sdl"; buildFlagsArray = '' -ldflags= - -X github.com/mdlayher/corerad/internal/build.linkTimestamp=1590182656 + -X github.com/mdlayher/corerad/internal/build.linkTimestamp=1591474872 -X github.com/mdlayher/corerad/internal/build.linkVersion=v${version} ''; diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index b868f075b9b5..8c98f316aae1 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.28.1"; + version = "0.29.0"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "1pa4skrhdcblqs8r1kik5g8h9p6pcin5pd7b1dh7xk2n86xs8j22"; + sha256 = "164l97x1g20a61jkb2dwwmf63md3np9x2m59dri3qf22k4rl4l0d"; }; vendorSha256 = null; diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 49efeac02a97..9ce1183d060c 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ primeos lheckemann ]; }; } diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 430607a0c3ba..cf2a01b3bb27 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.4.7"; + version = "1.4.9"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "0inn720prhgxxc1napzd3xyzqgsvv70gqddsyzaa84h6946iz6v5"; + sha256 = "1l8c72f3yd2vypc11frsmjnkr87h1q4gb6k3armpypwv6a6zl8z4"; }; postPatch = stdenv.lib.optionalString (batchSize != null) '' @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { description = "A collection of utilties for indexing and searching Maildirs"; license = licenses.gpl3Plus; homepage = "https://www.djcbsoftware.nl/code/mu/"; + changelog = "https://github.com/djcb/mu/releases/tag/${version}"; maintainers = with maintainers; [ antono peterhoeg ]; platforms = platforms.mesaPlatforms; }; diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index ba90a7cacb77..875ba7c988a6 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.8.11"; + version = "1.8.12"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - sha256 = "0imnvx3v0msk9qf72zy1qg5q52dmc8xfs9iwdwa2q13scjslgmwn"; + sha256 = "0c9mdy22pjnjq5l2ji2whrfz64azx6yi6m76j17pbhnjf6f4jx9b"; }; - cargoSha256 = "1aqqx0pdq3vp5c06pjwsrbrqfkz5dhxnpvv3vnr3pqfm62xrffgg"; + cargoSha256 = "03gf26d7rz4v2v5fypcp5icsqqnb4m5dwil9ad5a98q3ssx80iwq"; SODIUM_USE_PKG_CONFIG = 1; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1004a444469e..03b03ff2a842 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -247,6 +247,7 @@ mapAliases ({ libgumbo = gumbo; # added 2018-01-21 libGL_driver = mesa.drivers; libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14 + libjpeg_drop = libjpeg_original; # added 2020-06-05 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 liblapackWithoutAtlas = lapack-reference; # added 2018-11-05 liblrdf = lrdf; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd298ce24ea2..5004ef6dba73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4853,6 +4853,8 @@ in now-cli = callPackage ../development/web/now-cli {}; + np2kai = callPackage ../misc/emulators/np2kai { }; + file-rename = callPackage ../tools/filesystems/file-rename { }; kea = callPackage ../tools/networking/kea { }; @@ -13184,7 +13186,6 @@ in libjpeg_original = callPackage ../development/libraries/libjpeg { }; # also known as libturbojpeg libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { }; - libjpeg_drop = callPackage ../development/libraries/libjpeg-drop { }; libjpeg = libjpeg_turbo; libjreen = callPackage ../development/libraries/libjreen { }; @@ -19815,6 +19816,8 @@ in git-review = callPackage ../applications/version-management/git-review { }; + github-cli = gitAndTools.gh; + gitolite = callPackage ../applications/version-management/gitolite { }; inherit (gnome3) gitg; @@ -22866,6 +22869,7 @@ in ++ optional (cfg.enableMupen64Plus or false) mupen64plus ++ optional (cfg.enableNeoCD or false) neocd ++ optional (cfg.enableNestopia or false) nestopia + ++ optional (cfg.enableNP2kai or false) np2kai ++ optional (cfg.enableO2EM or false) o2em ++ optional (cfg.enableOpera or false) opera ++ optional (cfg.enableParallelN64 or false) parallel-n64 diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 7cf47c26c6fc..d120e9f7a7f2 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -132,39 +132,6 @@ with self; { }; }; - pulseaudio = buildLuaPackage rec { - pname = "pulseaudio"; - version = "0.2"; - name = "pulseaudio-${version}"; - - src = fetchFromGitHub { - owner = "doronbehar"; - repo = "lua-pulseaudio"; - rev = "v${version}"; - sha256 = "140y1m6k798c4w7xfl0zb0a4ffjz6i1722bgkdcdg8g76hr5r8ys"; - }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); - buildInputs = [ pkgs.libpulseaudio ]; - propagatedBuildInputs = [ lua ]; - nativeBuildInputs = [ pkgs.pulseaudio pkgconfig ]; - - makeFlags = [ - "INST_LIBDIR=${placeholder "out"}/lib/lua/${lua.luaversion}" - "INST_LUADIR=${placeholder "out"}/share/lua/${lua.luaversion}" - "LUA_BINDIR=${placeholder "out"}/bin" - ]; - preBuild = '' - mkdir -p ${placeholder "out"}/lib/lua/${lua.luaversion} - ''; - - meta = with stdenv.lib; { - homepage = "https://github.com/doronbehar/lua-pulseaudio"; - description = "Libpulse Lua bindings"; - maintainers = with maintainers; [ doronbehar ]; - license = licenses.lgpl21; - }; - }; - vicious = toLuaModule(stdenv.mkDerivation rec { pname = "vicious"; version = "2.3.1"; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index cca067557d20..e0ac6f08b9d4 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -795,8 +795,6 @@ let pa_bench = callPackage ../development/ocaml-modules/pa_bench { }; - pa_test = callPackage ../development/ocaml-modules/pa_test { }; - parany = callPackage ../development/ocaml-modules/parany { }; pipebang = callPackage ../development/ocaml-modules/pipebang { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 00960b457252..8a376a5abcbb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5086,9 +5086,14 @@ in { pyviz-comms = callPackage ../development/python-modules/pyviz-comms { }; - pillow = callPackage ../development/python-modules/pillow { - inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; - inherit (pkgs.xorg) libX11; + pillow = if isPy27 then + callPackage ../development/python-modules/pillow/6.nix { + inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; + inherit (pkgs.xorg) libX11; + } else + callPackage ../development/python-modules/pillow { + inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; + inherit (pkgs.xorg) libX11; }; pkgconfig = callPackage ../development/python-modules/pkgconfig { |