diff options
Diffstat (limited to 'pkgs/development')
68 files changed, 1444 insertions, 594 deletions
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 96062a573004..efd68988c9b2 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -66,8 +66,9 @@ let # Remove old versions of elixir, when the supports fades out: # https://hexdocs.pm/elixir/compatibility-and-deprecations.html - lfe = lfe_1_2; + lfe = lfe_1_3; lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; }; + lfe_1_3 = lib.callLFE ../interpreters/lfe/1.3.nix { inherit erlang buildRebar3 buildHex; }; # Non hex packages. Examples how to build Rebar/Mix packages with and # without helper functions buildRebar3 and buildMix. diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 20286dcc43c9..ef27fc41b077 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -1,24 +1,23 @@ { stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune -, menhir, merlin-extend, ppx_tools_versioned, utop, cppo -, ocaml_lwt +, fix, menhir, merlin-extend, ppx_tools_versioned, utop, cppo }: stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-reason-${version}"; - version = "3.5.1"; + version = "3.5.4"; src = fetchFromGitHub { owner = "facebook"; repo = "reason"; - rev = "aea245a43eb44034d2fccac7028b640a437af239"; - sha256 = "0ff7rjxbsg9zkq6sxlm9bkx7yk8x2cvras7z8436msczgd1wmmyf"; + rev = "e3287476e5c3f0cbcd9dc7ab18d290f81f4afa0c"; + sha256 = "02p5d1x6lr7jp9mvgvsas3nnq3a97chxp5q6rl07n5qm61d5b4dl"; }; nativeBuildInputs = [ makeWrapper ]; propagatedBuildInputs = [ menhir merlin-extend ppx_tools_versioned ]; - buildInputs = [ ocaml findlib dune cppo utop menhir ]; + buildInputs = [ ocaml findlib dune cppo fix utop menhir ]; buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed @@ -27,8 +26,8 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/rtop \ --prefix PATH : "${utop}/bin" \ - --prefix CAML_LD_LIBRARY_PATH : "${ocaml_lwt}/lib/ocaml/${ocaml.version}/site-lib" \ - --prefix OCAMLPATH : "$out/lib/ocaml/${ocaml.version}/site-lib" + --prefix CAML_LD_LIBRARY_PATH : "$CAML_LD_LIBRARY_PATH" \ + --prefix OCAMLPATH : "$OCAMLPATH:$OCAMLFIND_DESTDIR" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/interpreters/elixir/1.10.nix b/pkgs/development/interpreters/elixir/1.10.nix index f9e1451354d6..7f4162cade8f 100644 --- a/pkgs/development/interpreters/elixir/1.10.nix +++ b/pkgs/development/interpreters/elixir/1.10.nix @@ -3,7 +3,7 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz mkDerivation { - version = "1.10.0"; - sha256 = "1fz22c2jqqm2jvzxar11bh1djg3kqdn5rbxdddlz0cv6mfz7hvgv"; + version = "1.10.1"; + sha256 = "07iccn90yp11ms58mwkwd9ixd9vma0025l9zm6l7y0jjzrj3vycy"; minimumOTPVersion = "21"; } diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index a11865571018..571f39203f8f 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -73,6 +73,6 @@ in license = licenses.epl10; platforms = platforms.unix; - maintainers = with maintainers; [ the-kenny havvy couchemar ankhers ]; + maintainers = with maintainers; [ the-kenny havvy couchemar ankhers filalex77 ]; }; }) diff --git a/pkgs/development/interpreters/lfe/1.3.nix b/pkgs/development/interpreters/lfe/1.3.nix new file mode 100644 index 000000000000..52df5c025447 --- /dev/null +++ b/pkgs/development/interpreters/lfe/1.3.nix @@ -0,0 +1,43 @@ +{ fetchpatch, mkDerivation }: + +let + _fetchpatch = + { rev, sha256 }: + fetchpatch { + url = "https://github.com/rvirding/lfe/commit/${rev}.patch"; + inherit sha256; + }; + fetchPatches = map _fetchpatch; +in + +mkDerivation { + version = "1.3"; + sha256 = "0pgwi0h0d34353m39jin8dxw4yykgfcg90k6pc4qkjyrg40hh4l6"; + maximumOTPVersion = "21"; + patches = fetchPatches [ + { + rev = "b457e5d521bb35008e6049fab31b4073cc10d583"; + sha256 = "1zrq1b3291xhb0jsirgb5s8hacq5xvz7xidsp29aqcnpazdvivdc"; + } + { + rev = "5fe9f37741b7d53bd43109fd3435e1437f124a0d"; + sha256 = "1anqlcbih52lc0wynf58r67w1jhn264lz49rczwgh19pqg92dvqf"; + } + { + rev = "b8f3e06511cb6805cf3a904c1589b27f33f3958d"; + sha256 = "1zqafc0asm9m6cq7r0brvfawv69fqggy1phif3zknjmpicf25pqf"; + } + { + rev = "40c239a608460e55563edb68c1b6faca57518b54"; + sha256 = "03av5115jwyammw337xzy50l6api5h0wbwwda5vzw0w10zwb2z8y"; + } + { + rev = "5faa7106419263689bfc0bc08a7451ccb1fba718"; + sha256 = "0ml5yh5b3rn4ympks4bpx409hkra0i79zvq80azk0kmbjd869fxp"; + } + { + rev = "9ff978693babcfd043d741b5c6940920b8315892"; + sha256 = "04968dmp527wbkdv7dqpaj3nsyjls93whc1b5hx73b39dvl3n3y1"; + } + ]; +} diff --git a/pkgs/development/interpreters/lfe/dedup-ebins.patch b/pkgs/development/interpreters/lfe/dedup-ebins.patch new file mode 100644 index 000000000000..44e3733c4165 --- /dev/null +++ b/pkgs/development/interpreters/lfe/dedup-ebins.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 59f2c06..5ee8f6e 100644 +--- a/Makefile ++++ b/Makefile +@@ -60,7 +60,7 @@ ESRCS = $(notdir $(wildcard $(SRCDIR)/*.erl)) + XSRCS = $(notdir $(wildcard $(SRCDIR)/*.xrl)) + YSRCS = $(notdir $(wildcard $(SRCDIR)/*.yrl)) + LSRCS = $(notdir $(wildcard $(LSRCDIR)/*.lfe)) +-EBINS = $(ESRCS:.erl=.beam) $(XSRCS:.xrl=.beam) $(YSRCS:.yrl=.beam) ++EBINS = $(sort $(ESRCS:.erl=.beam) $(XSRCS:.xrl=.beam) $(YSRCS:.yrl=.beam)) + LBINS = $(LSRCS:.lfe=.beam) + + CSRCS = $(notdir $(wildcard $(CSRCDIR)/*.c)) diff --git a/pkgs/development/interpreters/lfe/generic-builder.nix b/pkgs/development/interpreters/lfe/generic-builder.nix index 6e74229e1e88..ba42c2d59d56 100644 --- a/pkgs/development/interpreters/lfe/generic-builder.nix +++ b/pkgs/development/interpreters/lfe/generic-builder.nix @@ -6,10 +6,13 @@ , sha256 ? null , rev ? version , src ? fetchFromGitHub { inherit rev sha256; owner = "rvirding"; repo = "lfe"; } +, patches ? [] }: let - inherit (stdenv.lib) getVersion versionAtLeast versions; + inherit (stdenv.lib) + assertMsg makeBinPath optionalString + getVersion versionAtLeast versionOlder versions; mainVersion = versions.major (getVersion erlang); @@ -25,7 +28,9 @@ let }; in -assert versionAtLeast maximumOTPVersion mainVersion; +assert (assertMsg (versionAtLeast maximumOTPVersion mainVersion)) '' + LFE ${version} is supported on OTP <=${maximumOTPVersion}, not ${mainVersion}. +''; buildRebar3 { name = baseName; @@ -34,13 +39,15 @@ buildRebar3 { buildInputs = [ erlang makeWrapper ]; beamDeps = [ proper ]; - patches = [ ./no-test-deps.patch ]; + patches = [ ./no-test-deps.patch ./dedup-ebins.patch ] ++ patches; doCheck = true; checkTarget = "travis"; + makeFlags = [ "-e" "MANDB=''" "PREFIX=$$out"]; + # These installPhase tricks are based on Elixir's Makefile. # TODO: Make, upload, and apply a patch. - installPhase = '' + installPhase = optionalString (versionOlder version "1.3") '' local libdir=$out/lib/lfe local ebindir=$libdir/ebin local bindir=$libdir/bin @@ -63,7 +70,7 @@ buildRebar3 { # Add some stuff to PATH so the scripts can run without problems. for f in $out/bin/*; do wrapProgram $f \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ erlang coreutils bash ]}:$out/bin" + --prefix PATH ":" "${makeBinPath [ erlang coreutils bash ]}:$out/bin" substituteInPlace $f --replace "/usr/bin/env" "${coreutils}/bin/env" done ''; diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index ab5493e8a9d0..1f832efee89a 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -1,29 +1,29 @@ -{ stdenv, fetchurl, perl, icu, zlib, gmp, readline -, CoreServices, ApplicationServices }: +{ stdenv, fetchurl, perl, icu, zlib, gmp, lib, nqp }: stdenv.mkDerivation rec { - pname = "rakudo-star"; - version = "2017.01"; + pname = "rakudo"; + version = "2020.01"; src = fetchurl { - url = "http://rakudo.org/downloads/star/${pname}-${version}.tar.gz"; - sha256 = "07zjqdzxm30pmjqwlnr669d75bsbimy09sk0dvgm0pnn3zr92fjq"; + url = "https://github.com/rakudo/rakudo/releases/download/${version}/rakudo-${version}.tar.gz"; + sha256 = "1c63ns90zy13gyj0l27k63q7dv08w4589w605nywd7pplbygq0if"; }; - buildInputs = [ icu zlib gmp readline perl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; + buildInputs = [ icu zlib gmp perl ]; configureScript = "perl ./Configure.pl"; - configureFlags = - [ "--backends=moar" - "--gen-moar" - "--gen-nqp" - ]; + configureFlags = [ + "--backends=moar" + "--with-nqp=${nqp}/bin/nqp" + ]; + + # Some tests fail on Darwin + doCheck = !stdenv.isDarwin; meta = with stdenv.lib; { - description = "A Perl 6 implementation"; + description = "Raku implementation on top of Moar virtual machine"; homepage = https://www.rakudo.org; license = licenses.artistic2; platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice vrthra ]; + maintainers = with maintainers; [ thoughtpolice vrthra sgo ]; }; } diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix new file mode 100644 index 000000000000..48430ef548be --- /dev/null +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, perl +, CoreServices, ApplicationServices }: + +stdenv.mkDerivation rec { + pname = "moarvm"; + version = "2020.01.1"; + + src = fetchurl { + url = "https://github.com/MoarVM/MoarVM/releases/download/${version}/MoarVM-${version}.tar.gz"; + sha256 = "11rmlps6r3nqa9m2yyv9i2imahirsqmxbfay71f3gs4ql121xdnw"; + }; + + buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; + doCheck = false; # MoarVM does not come with its own test suite + + configureScript = "${perl}/bin/perl ./Configure.pl"; + + meta = with stdenv.lib; { + description = "VM with adaptive optimization and JIT compilation, built for Rakudo"; + homepage = "https://github.com/MoarVM/MoarVM"; + license = licenses.artistic2; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice vrthra sgo ]; + }; +} diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix new file mode 100644 index 000000000000..5a93a7f9dad9 --- /dev/null +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, perl, lib, moarvm }: + +stdenv.mkDerivation rec { + pname = "nqp"; + version = "2020.01"; + + src = fetchurl { + url = "https://github.com/perl6/nqp/releases/download/${version}/nqp-${version}.tar.gz"; + sha256 = "0nwn6a9i9akw1zmywhkn631gqy8l4dvy50d6id63zir28ccrrk2c"; + }; + + buildInputs = [ perl ]; + + configureScript = "${perl}/bin/perl ./Configure.pl"; + configureFlags = [ + "--backends=moar" + "--with-moar=${moarvm}/bin/moar" + ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Not Quite Perl -- a lightweight Raku-like environment for virtual machines"; + homepage = "https://github.com/perl6/nqp"; + license = licenses.artistic2; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice vrthra sgo ]; + }; +} diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix new file mode 100644 index 000000000000..5c3597cf289c --- /dev/null +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, rakudo, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "zef"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "ugexe"; + repo = "zef"; + rev = "v${version}"; + sha256 = "064nbl2hz55mpxdcy9zi39s2z6bad3bj73xsna966a7hzkls0a70"; + }; + + buildInputs = [ rakudo makeWrapper ]; + + installPhase = '' + mkdir -p "$out" + # TODO: Find better solution. zef stores cache stuff in $HOME with the + # default config. + env HOME=$TMPDIR ${rakudo}/bin/raku -I. ./bin/zef --/depends --/test-depends --/build-depends --install-to=$out install . + ''; + + postFixup ='' + wrapProgram $out/bin/zef --prefix RAKUDOLIB , "inst#$out" + ''; + + meta = with stdenv.lib; { + description = "Raku / Perl6 Module Management"; + homepage = "https://github.com/ugexe/zef"; + license = licenses.artistic2; + platforms = platforms.unix; + maintainers = with maintainers; [ sgo ]; + }; +} diff --git a/pkgs/development/libraries/abseil-cpp/default.nix b/pkgs/development/libraries/abseil-cpp/default.nix index b46963f4673e..bd896fb9c65d 100644 --- a/pkgs/development/libraries/abseil-cpp/default.nix +++ b/pkgs/development/libraries/abseil-cpp/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "abseil-cpp"; - date = "20190322"; - rev = "eab2078b53c9e3d9d240135c09d27e3393acb50a"; + date = "20191119"; + rev = "8ba96a8244bbe334d09542e92d566673a65c1f78"; version = "${date}-${rev}"; src = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; rev = rev; - sha256 = "1bpz44hxq5fpkv6jlgphzk7mxjiiah526jgb63ih5pd1hd2cfw1r"; + sha256 = "089bvlspgdgi40fham20qy1m97gr1jh5k5czz49dincpd18j6inb"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/alure2/default.nix b/pkgs/development/libraries/alure2/default.nix index 91919873fa63..6da95a772648 100644 --- a/pkgs/development/libraries/alure2/default.nix +++ b/pkgs/development/libraries/alure2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "alure2"; - version = "unstable-2020-01-09"; + version = "unstable-2020-02-06"; src = fetchFromGitHub { owner = "kcat"; repo = "alure"; - rev = "4b7b58d3f0de444d6f26aa705704deb59145f586"; - sha256 = "0ds18hhy2wpvx498z5hcpzfqz9i60ixsi0cjihyvk20rf4qy12vg"; + rev = "50f92fe528e77da82197fd947d1cf9b0a82a0c7d"; + sha256 = "1gmc1yfhwaj6lik0vn7zv8y23i05f4rw25v2jg34n856jcs02svx"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index 956fd74da585..b8d00984cd64 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -9,9 +9,23 @@ stdenv.mkDerivation rec { sha256 = "1isxw2qwy1fi3m3w7igsr5klzczxc5cxndz0a78dfss6ps6ymfvr"; }; + # replace faulty macos detection + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's/^IS_APPLE := .*$/IS_APPLE := 1/' Makefile + ''; + configurePhase = '' patchShebangs make.sh ''; - buildPhase = '' ./make.sh ''; - installPhase = '' env PREFIX=$out ./make.sh install ''; + buildPhase = "PREFIX=$out ./make.sh"; + + doCheck = true; + checkPhase = '' + # first remove fuzzing steps from check target + substituteInPlace Makefile --replace "fuzztest fuzzallcorp" "" + make check + ''; + + installPhase = (stdenv.lib.optionalString stdenv.isDarwin "HOMEBREW_CAPSTONE=1 ") + + "PREFIX=$out ./make.sh install"; nativeBuildInputs = [ pkgconfig @@ -23,7 +37,7 @@ stdenv.mkDerivation rec { description = "Advanced disassembly library"; homepage = "http://www.capstone-engine.org"; license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice ris ]; }; } diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index 2be8caaa1b12..d515d0c07ebf 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.01"; + version = "20.02"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "0gqwma3r216xgymjnagm6ndxfvdigzl46nlny4z085sgvydx3n8m"; + sha256 = "07f3n8qxjbrn7dhyi90l1zx5klsr3qiw14n0jdk589jgynhjgv5r"; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index c0a3d3718f34..2c44b045a2f7 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -1,56 +1,159 @@ -{ stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2 -, gobject-introspection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc, xdg-dbus-proxy, p11-kit -, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, hicolor-icon-theme, fuse, nixosTests -, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, dconf, gsettings-desktop-schemas, librsvg }: +{ stdenv +, fetchurl +, autoreconfHook +, docbook_xml_dtd_412 +, docbook_xml_dtd_42 +, docbook_xml_dtd_43 +, docbook_xsl +, which +, libxml2 +, gobject-introspection +, gtk-doc +, intltool +, libxslt +, pkgconfig +, xmlto +, appstream-glib +, substituteAll +, glibcLocales +, yacc +, xdg-dbus-proxy +, p11-kit +, bubblewrap +, bzip2 +, dbus +, glib +, gpgme +, json-glib +, libarchive +, libcap +, libseccomp +, coreutils +, socat +, gettext +, hicolor-icon-theme +, shared-mime-info +, desktop-file-utils +, gtk3 +, fuse +, malcontent +, nixosTests +, libsoup +, lzma +, ostree +, polkit +, python3 +, systemd +, xorg +, valgrind +, glib-networking +, wrapGAppsHook +, dconf +, gsettings-desktop-schemas +, librsvg +}: stdenv.mkDerivation rec { pname = "flatpak"; - version = "1.4.2"; + version = "1.6.1"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "man" "doc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "08nmpp26mgv0vp3mlwk97rnp0j7i108h4hr9nllja19sjxnrlygj"; + sha256 = "1x3zh2xashsq1nh4s85qq45hcnwfbnwzln2wlk10g7149nia6f7w"; }; patches = [ + # Hardcode paths used by tests and change test runtime generation to use files from Nix store. + # https://github.com/flatpak/flatpak/issues/1460 (substituteAll { src = ./fix-test-paths.patch; - inherit coreutils gettext glibcLocales; + inherit coreutils gettext glibcLocales socat gtk3; + smi = shared-mime-info; + dfu = desktop-file-utils; hicolorIconTheme = hicolor-icon-theme; }) + + # Hardcode paths used by Flatpak itself. (substituteAll { src = ./fix-paths.patch; p11 = p11-kit; }) + + # Adapt paths exposed to sandbox for NixOS. (substituteAll { src = ./bubblewrap-paths.patch; inherit (builtins) storeDir; }) - # patch taken from gtk_doc + + # Allow gtk-doc to find schemas using XML_CATALOG_FILES environment variable. + # Patch taken from gtk-doc expression. ./respect-xml-catalog-files-var.patch + + # Don’t hardcode flatpak binary path in launchers stored under user’s profile otherwise they will break after Flatpak update. + # https://github.com/NixOS/nixpkgs/issues/43581 ./use-flatpak-from-path.patch + + # Nix environment hacks should not leak into the apps. + # https://github.com/NixOS/nixpkgs/issues/53441 ./unset-env-vars.patch + + # But we want the GDK_PIXBUF_MODULE_FILE from the wrapper affect the icon validator. ./validate-icon-pixbuf.patch ]; nativeBuildInputs = [ - autoreconfHook libxml2 docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 docbook_xsl which gobject-introspection - gtk-doc intltool libxslt pkgconfig xmlto appstream-glib yacc wrapGAppsHook + autoreconfHook + libxml2 + docbook_xml_dtd_412 + docbook_xml_dtd_42 + docbook_xml_dtd_43 + docbook_xsl + which + gobject-introspection + gtk-doc + intltool + libxslt + pkgconfig + xmlto + appstream-glib + yacc + wrapGAppsHook ]; buildInputs = [ - bubblewrap bzip2 dbus dconf glib gpgme json-glib libarchive libcap libseccomp - libsoup lzma ostree polkit python3 systemd xorg.libXau fuse - gsettings-desktop-schemas glib-networking + bubblewrap + bzip2 + dbus + dconf + glib + gpgme + json-glib + libarchive + libcap + libseccomp + libsoup + lzma + ostree + polkit + python3 + systemd + xorg.libXau + fuse + malcontent + gsettings-desktop-schemas + glib-networking librsvg # for flatpak-validate-icon ]; - checkInputs = [ valgrind ]; + checkInputs = [ + valgrind + ]; - doCheck = false; # TODO: some issues with temporary files + # TODO: some issues with temporary files + doCheck = false; NIX_LDFLAGS = "-lpthread"; @@ -65,8 +168,8 @@ stdenv.mkDerivation rec { ]; makeFlags = [ - "installed_testdir=$(installedTests)/libexec/installed-tests/flatpak" - "installed_test_metadir=$(installedTests)/share/installed-tests/flatpak" + "installed_testdir=${placeholder "installedTests"}/libexec/installed-tests/flatpak" + "installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/flatpak" ]; postPatch = '' @@ -82,7 +185,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Linux application sandboxing and distribution framework"; - homepage = https://flatpak.org/; + homepage = "https://flatpak.org/"; license = licenses.lgpl21; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/flatpak/fix-test-paths.patch b/pkgs/development/libraries/flatpak/fix-test-paths.patch index 85b222152d0a..8ea2f0159a31 100644 --- a/pkgs/development/libraries/flatpak/fix-test-paths.patch +++ b/pkgs/development/libraries/flatpak/fix-test-paths.patch @@ -1,8 +1,21 @@ +diff --git a/app/flatpak-builtins-build-export.c b/app/flatpak-builtins-build-export.c +index 5de89d62..bf6bdb52 100644 +--- a/app/flatpak-builtins-build-export.c ++++ b/app/flatpak-builtins-build-export.c +@@ -458,7 +458,7 @@ validate_desktop_file (GFile *desktop_file, + subprocess = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_PIPE | + G_SUBPROCESS_FLAGS_STDERR_PIPE | + G_SUBPROCESS_FLAGS_STDERR_MERGE, +- &local_error, "desktop-file-validate", path, NULL); ++ &local_error, "@dfu@/bin/desktop-file-validate", path, NULL); + if (!subprocess) + { + if (!g_error_matches (local_error, G_SPAWN_ERROR, G_SPAWN_ERROR_NOENT)) diff --git a/tests/libtest.sh b/tests/libtest.sh -index 46bcefb3..0134425e 100644 +index e64be49f..a9a53e12 100644 --- a/tests/libtest.sh +++ b/tests/libtest.sh -@@ -352,7 +352,7 @@ if [ -z "${FLATPAK_BWRAP:-}" ]; then +@@ -367,7 +367,7 @@ if [ -z "${FLATPAK_BWRAP:-}" ]; then # running installed-tests: assume we know what we're doing _flatpak_bwrap_works=true elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \ @@ -11,7 +24,7 @@ index 46bcefb3..0134425e 100644 _flatpak_bwrap_works=false else _flatpak_bwrap_works=true -@@ -426,12 +426,12 @@ dbus-daemon --fork --config-file=session.conf --print-address=3 --print-pid=4 \ +@@ -440,7 +440,7 @@ dbus-daemon --fork --config-file=session.conf --print-address=3 --print-pid=4 \ export DBUS_SESSION_BUS_ADDRESS="$(cat dbus-session-bus-address)" DBUS_SESSION_BUS_PID="$(cat dbus-session-bus-pid)" @@ -20,17 +33,20 @@ index 46bcefb3..0134425e 100644 assert_not_reached "Failed to start dbus-daemon" fi +@@ -449,7 +449,7 @@ gdb_bt () { + } + cleanup () { -- /bin/kill -9 $DBUS_SESSION_BUS_PID ${FLATPAK_HTTP_PID:-} -+ @coreutils@/bin/kill -9 $DBUS_SESSION_BUS_PID ${FLATPAK_HTTP_PID:-} +- /bin/kill -9 $DBUS_SESSION_BUS_PID ++ @coreutils@/bin/kill -9 $DBUS_SESSION_BUS_PID gpg-connect-agent --homedir "${FL_GPG_HOMEDIR}" killagent /bye || true fusermount -u $XDG_RUNTIME_DIR/doc || : - if test -n "${TEST_SKIP_CLEANUP:-}"; then + kill $(jobs -p) &> /dev/null || true diff --git a/tests/make-test-app.sh b/tests/make-test-app.sh -index 0a0a28f1..16fd51fe 100755 +index e51e21a6..7d39efb5 100755 --- a/tests/make-test-app.sh +++ b/tests/make-test-app.sh -@@ -129,13 +129,13 @@ msgid "Hello world" +@@ -149,13 +149,13 @@ msgid "Hello world" msgstr "Hallo Welt" EOF mkdir -p ${DIR}/files/de/share/de/LC_MESSAGES @@ -47,18 +63,22 @@ index 0a0a28f1..16fd51fe 100755 flatpak build-finish ${DIR} mkdir -p repos diff --git a/tests/make-test-runtime.sh b/tests/make-test-runtime.sh -index 57899b75..9236996f 100755 +index 5d2c309b..cf61a3cf 100755 --- a/tests/make-test-runtime.sh +++ b/tests/make-test-runtime.sh -@@ -28,6 +28,7 @@ EOF - PATH="$PATH:/usr/sbin:/sbin" +@@ -25,9 +25,10 @@ EOF + + # On Debian derivatives, /usr/sbin and /sbin aren't in ordinary users' + # PATHs, but ldconfig is kept in /sbin +-PATH="$PATH:/usr/sbin:/sbin" ++PATH="$PATH:@socat@/bin:/usr/sbin:/sbin" # Add bash and dependencies +mkdir -p ${DIR}/nix/store mkdir -p ${DIR}/usr/bin mkdir -p ${DIR}/usr/lib ln -s ../lib ${DIR}/usr/lib64 -@@ -37,48 +38,23 @@ if test -f /sbin/ldconfig.real; then +@@ -37,48 +38,24 @@ if test -f /sbin/ldconfig.real; then else cp `which ldconfig` ${DIR}/usr/bin fi @@ -85,18 +105,19 @@ index 57899b75..9236996f 100755 - fi -} - - for i in $@ bash ls cat echo readlink; do + for i in $@ bash ls cat echo readlink socat; do - I=`which $i` - add_bin $I -done -for i in `cat $BINS`; do -- echo Adding binary $i 1>&2 +- #echo Adding binary $i 1>&2 - cp "$i" ${DIR}/usr/bin/ -done -for i in `cat $LIBS`; do -- echo Adding library $i 1>&2 +- #echo Adding library $i 1>&2 - cp "$i" ${DIR}/usr/lib/ + I=$(readlink -f $(which $i)) ++ [ -e ${DIR}/usr/bin/$i ] && continue + requisites=$(nix-store --query --requisites "$I") + for r in $requisites; do + # a single store item can be needed by multiple paths, no need to copy it again @@ -121,10 +142,10 @@ index 57899b75..9236996f 100755 if [ x$COLLECTION_ID != x ]; then collection_args=--collection-id=${COLLECTION_ID} diff --git a/tests/testlibrary.c b/tests/testlibrary.c -index f2773dc8..3af9026f 100644 +index 44ae28e3..76bf619f 100644 --- a/tests/testlibrary.c +++ b/tests/testlibrary.c -@@ -1053,7 +1053,7 @@ check_bwrap_support (void) +@@ -1343,7 +1343,7 @@ check_bwrap_support (void) { gint exit_code = 0; char *argv[] = { (char *) bwrap, "--unshare-ipc", "--unshare-net", @@ -133,16 +154,45 @@ index f2773dc8..3af9026f 100644 g_autofree char *argv_str = g_strjoinv (" ", argv); g_test_message ("Spawning %s", argv_str); g_spawn_sync (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL, &exit_code, &error); +diff --git a/triggers/desktop-database.trigger b/triggers/desktop-database.trigger +index 2188f535..d8283061 100755 +--- a/triggers/desktop-database.trigger ++++ b/triggers/desktop-database.trigger +@@ -1,5 +1,5 @@ + #!/bin/sh + +-if test \( -x "$(which update-desktop-database 2>/dev/null)" \) -a \( -d $1/exports/share/applications \); then +- exec update-desktop-database -q $1/exports/share/applications ++if test \( -d $1/exports/share/applications \); then ++ exec @dfu@/bin/update-desktop-database -q $1/exports/share/applications + fi diff --git a/triggers/gtk-icon-cache.trigger b/triggers/gtk-icon-cache.trigger -index 711cfab2..10c220ec 100755 +index 711cfab2..07baa2ac 100755 --- a/triggers/gtk-icon-cache.trigger +++ b/triggers/gtk-icon-cache.trigger -@@ -1,7 +1,7 @@ +@@ -1,10 +1,10 @@ #!/bin/sh - if test \( -x "$(which gtk-update-icon-cache 2>/dev/null)" \) -a \( -d $1/exports/share/icons/hicolor \); then +-if test \( -x "$(which gtk-update-icon-cache 2>/dev/null)" \) -a \( -d $1/exports/share/icons/hicolor \); then - cp /usr/share/icons/hicolor/index.theme $1/exports/share/icons/hicolor/ ++if test \( -d $1/exports/share/icons/hicolor \); then + cp @hicolorIconTheme@/share/icons/hicolor/index.theme $1/exports/share/icons/hicolor/ for dir in $1/exports/share/icons/*; do if test -f $dir/index.theme; then - if ! gtk-update-icon-cache --quiet $dir; then +- if ! gtk-update-icon-cache --quiet $dir; then ++ if ! @gtk3@/bin/gtk-update-icon-cache --quiet $dir; then + echo "Failed to run gtk-update-icon-cache for $dir" + exit 1 + fi +diff --git a/triggers/mime-database.trigger b/triggers/mime-database.trigger +index 2067d8ec..a49a8777 100755 +--- a/triggers/mime-database.trigger ++++ b/triggers/mime-database.trigger +@@ -1,5 +1,5 @@ + #!/bin/sh + +-if test \( -x "$(which update-mime-database 2>/dev/null)" \) -a \( -d $1/exports/share/mime/packages \); then +- exec update-mime-database $1/exports/share/mime ++if test \( -d $1/exports/share/mime/packages \); then ++ exec @smi@/bin/update-mime-database $1/exports/share/mime + fi diff --git a/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch b/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch index 01363ffb7b34..84534b7bc53a 100644 --- a/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch +++ b/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch @@ -1,8 +1,8 @@ diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c -index 8f9dc66c..d3ab6e5f 100644 +index 52b222ea..9489441f 100644 --- a/common/flatpak-dir.c +++ b/common/flatpak-dir.c -@@ -6701,7 +6701,7 @@ export_desktop_file (const char *app, +@@ -6956,7 +6956,7 @@ export_desktop_file (const char *app, new_exec = g_string_new (""); g_string_append_printf (new_exec, @@ -11,7 +11,7 @@ index 8f9dc66c..d3ab6e5f 100644 escaped_branch, escaped_arch); -@@ -7891,8 +7891,8 @@ flatpak_dir_deploy (FlatpakDir *self, +@@ -8290,8 +8290,8 @@ flatpak_dir_deploy (FlatpakDir *self, error)) return FALSE; @@ -23,10 +23,10 @@ index 8f9dc66c..d3ab6e5f 100644 G_FILE_CREATE_REPLACE_DESTINATION, NULL, cancellable, error)) return FALSE; diff --git a/tests/test-bundle.sh b/tests/test-bundle.sh -index dff17f33..a9857adc 100755 +index d1682344..5e2b9a97 100755 --- a/tests/test-bundle.sh +++ b/tests/test-bundle.sh -@@ -59,7 +59,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/files +@@ -67,7 +67,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/files assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/export assert_has_file $FL_DIR/exports/share/applications/org.test.Hello.desktop # Ensure Exec key is rewritten @@ -36,7 +36,7 @@ index dff17f33..a9857adc 100755 assert_has_file $FL_DIR/exports/share/icons/HighContrast/64x64/apps/org.test.Hello.png diff --git a/tests/test-run.sh b/tests/test-run.sh -index 233df9ad..76e0b23b 100644 +index fecb756e..64043281 100644 --- a/tests/test-run.sh +++ b/tests/test-run.sh @@ -45,7 +45,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/stable/active/files @@ -45,6 +45,6 @@ index 233df9ad..76e0b23b 100644 # Ensure Exec key is rewritten -assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=stable --arch=$ARCH --command=hello\.sh org\.test\.Hello$" +assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=stable --arch=$ARCH --command=hello\.sh org\.test\.Hello$" + assert_has_file $FL_DIR/exports/share/gnome-shell/search-providers/org.test.Hello.search-provider.ini + assert_file_has_content $FL_DIR/exports/share/gnome-shell/search-providers/org.test.Hello.search-provider.ini "^DefaultDisabled=true$" assert_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png - assert_not_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/dont-export.png - assert_has_file $FL_DIR/exports/share/icons/HighContrast/64x64/apps/org.test.Hello.png diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 3e79ebe15cff..0c50b069d394 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - version = "6.0.0"; + version = "6.1.1"; pname = "fmt"; src = fetchFromGitHub { owner = "fmtlib"; repo = "fmt"; rev = version; - sha256 = "0yfrw6by4h27k3psv9x1q7z2kdbz7pkwxidr494bpa6ppglij6ba"; + sha256 = "0arii4hs33lqlbfwilnxiq8mqcvdwz66b24qa7fdjiga02j8kl2n"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 16368ae21276..0dfe3cbea2e4 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "3.3.1"; + version = "3.3.2"; pname = "glfw"; src = fetchFromGitHub { owner = "glfw"; repo = "GLFW"; rev = version; - sha256 = "0c7nlrhq84gdq10diyv6nshjbv8410bmn0vging815pfvis208xc"; + sha256 = "0b5lsxz1xkzip7fvbicjkxvg5ig8gbhx1zrlhandqc0rpk56bvyw"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/glib-testing/default.nix b/pkgs/development/libraries/glib-testing/default.nix new file mode 100644 index 000000000000..085dfc7344f5 --- /dev/null +++ b/pkgs/development/libraries/glib-testing/default.nix @@ -0,0 +1,63 @@ +{ stdenv +, fetchFromGitLab +, meson +, ninja +, pkgconfig +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, glib +, nixosTests +}: + +stdenv.mkDerivation rec { + pname = "glib-testing"; + version = "0.1.0"; + + outputs = [ "out" "dev" "devdoc" "installedTests" ]; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "pwithnall"; + repo = "libglib-testing"; + rev = version; + sha256 = "0xmycsrlqyji6sc2i4wvp2gxf3897z65a57ygihfnpjpyl7zlwkr"; + }; + + patches = [ + # allow installing installed tests to a separate output + ./installed-tests-path.patch + ]; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + ]; + + propagatedBuildInputs = [ + glib + ]; + + mesonFlags = [ + "-Dinstalled_tests=true" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" + ]; + + passthru = { + tests = { + installedTests = nixosTests.installed-tests.glib-testing; + }; + }; + + meta = with stdenv.lib; { + description = "Test library providing test harnesses and mock classes complementing the classes provided by GLib"; + homepage = "https://gitlab.gnome.org/pwithnall/libglib-testing"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/glib-testing/installed-tests-path.patch b/pkgs/development/libraries/glib-testing/installed-tests-path.patch new file mode 100644 index 000000000000..37ee2a988899 --- /dev/null +++ b/pkgs/development/libraries/glib-testing/installed-tests-path.patch @@ -0,0 +1,32 @@ +diff --git a/libglib-testing/tests/meson.build b/libglib-testing/tests/meson.build +index 4789c63..2b8525d 100644 +--- a/libglib-testing/tests/meson.build ++++ b/libglib-testing/tests/meson.build +@@ -15,9 +15,9 @@ test_programs = [ + ['signal-logger', [], deps], + ] + +-installed_tests_metadir = join_paths(datadir, 'installed-tests', ++installed_tests_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', + 'libglib-testing-' + libglib_testing_api_version) +-installed_tests_execdir = join_paths(libexecdir, 'installed-tests', ++installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', + 'libglib-testing-' + libglib_testing_api_version) + + foreach program: test_programs +@@ -48,4 +48,4 @@ foreach program: test_programs + exe, + env: envs, + ) +-endforeach +\ No newline at end of file ++endforeach +diff --git a/meson_options.txt b/meson_options.txt +index e69263e..7cb1ee8 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -4,3 +4,4 @@ option( + value: false, + description: 'enable installed tests' + ) ++option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests') diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 9ea943816596..7ccba0072e28 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -111,6 +111,10 @@ stdenv.mkDerivation ({ # nscd needs libgcc, and we don't want it dynamically linked # because we don't want it to depend on bootstrap-tools libs. echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile + '' + # FIXME: find a solution for infinite recursion in cross builds. + # For now it's hopefully acceptable that IDN from libc doesn't reliably work. + + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' # Ensure that libidn2 is found. patch -p 1 <<EOF diff --git a/pkgs/development/libraries/libdigidoc/default.nix b/pkgs/development/libraries/libdigidoc/default.nix index 06ba10904a7d..36f6f023a8e0 100644 --- a/pkgs/development/libraries/libdigidoc/default.nix +++ b/pkgs/development/libraries/libdigidoc/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { - version = "3.10.4"; + version = "3.10.5"; pname = "libdigidoc"; src = fetchurl { url = "https://github.com/open-eid/libdigidoc/releases/download/v${version}/libdigidoc-${version}.tar.gz"; - sha256 = "0w5wsaj2a5wss1r9j39bfsrkp3xz0w3v1gnr190v6k7l74l453w1"; + sha256 = "0nw36a4i6rcq7z6jqz5h2ln9hmmsfhw65jga3rymlswk2k7bndgn"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libportal/default.nix b/pkgs/development/libraries/libportal/default.nix new file mode 100644 index 000000000000..0f31115f50f0 --- /dev/null +++ b/pkgs/development/libraries/libportal/default.nix @@ -0,0 +1,59 @@ +{ stdenv +, fetchFromGitHub +, fetchpatch +, meson +, ninja +, pkgconfig +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_45 +, glib +}: + +stdenv.mkDerivation rec { + pname = "libportal"; + version = "0.3"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchFromGitHub { + owner = "flatpak"; + repo = pname; + rev = version; + sha256 = "1s3g17zbbmq3m5jfs62fl94p4irln9hfhpybj7jb05z0p1939rk3"; + }; + + patches = [ + # Fix build and .pc file + # https://github.com/flatpak/libportal/pull/20 + (fetchpatch { + url = "https://github.com/flatpak/libportal/commit/7828be4ec8f05f8de7b129a1e35b5039d8baaee3.patch"; + sha256 = "04nadcxx69mbnzljwjrzm88cgapn14x3mghpkhr8b9yrjn7yj86h"; + }) + (fetchpatch { + url = "https://github.com/flatpak/libportal/commit/bf5de2f6fefec65f701b4ec8712b48b29a33fb71.patch"; + sha256 = "1v0b09diq49c01j5gg2bpvn5f5gfw1a5nm1l8grc4qg4z9jck1z8"; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_45 + ]; + + propagatedBuildInputs = [ + glib + ]; + + meta = with stdenv.lib; { + description = "Flatpak portal library"; + homepage = "https://github.com/flatpak/libportal"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libspiro/default.nix b/pkgs/development/libraries/libspiro/default.nix index 5f547a973707..67251f9430a8 100644 --- a/pkgs/development/libraries/libspiro/default.nix +++ b/pkgs/development/libraries/libspiro/default.nix @@ -1,18 +1,22 @@ -{stdenv, pkgconfig, fetchurl}: +{stdenv, pkgconfig, autoreconfHook, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "libspiro"; - version = "0.5.20150702"; - src = fetchurl { - url = "https://github.com/fontforge/libspiro/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "0z4zpxd3nwwchqdsbmmjbp13aw5jg8v5p1993190bpykkrjlh6nv"; + version = "20190731"; + + src = fetchFromGitHub { + owner = "fontforge"; + repo = pname; + rev = version; + sha256 = "sha256:1wc6ikjrvcq05jki0ligmxyplgb4nzx6qb5va277qiin8vad9b1v"; }; - nativeBuildInputs = [pkgconfig]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; meta = with stdenv.lib; { description = "A library that simplifies the drawing of beautiful curves"; homepage = https://github.com/fontforge/libspiro; license = licenses.gpl3Plus; + maintainers = [ maintainers.erictapen ]; }; } diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index 215d67dc0b10..d266817c5d77 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ texinfo perl ]; doCheck = true; + preCheck = if stdenv.isDarwin then + "export DYLD_LIBRARY_PATH=`pwd`/lib/.libs" + else + null; meta = with stdenv.lib; { homepage = https://www.gnu.org/software/libtasn1/; diff --git a/pkgs/development/libraries/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix new file mode 100644 index 000000000000..3a40be3c4edb --- /dev/null +++ b/pkgs/development/libraries/malcontent/default.nix @@ -0,0 +1,87 @@ +{ stdenv +, fetchFromGitLab +, meson +, ninja +, pkgconfig +, gobject-introspection +, wrapGAppsHook +, glib +, coreutils +, dbus +, polkit +, glib-testing +, python3 +, nixosTests +}: + +stdenv.mkDerivation rec { + pname = "malcontent"; + version = "0.4.0"; + + outputs = [ "bin" "out" "dev" "man" "installedTests" ]; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "pwithnall"; + repo = pname; + rev = version; + sha256 = "0d703r20djvrgy711jvn90i8dwbb0p7qj4j43z101afpkiizq810"; + }; + + patches = [ + # Allow installing installed tests to a separate output. + ./installed-tests-path.patch + + # This is unnecessary and breaks when submodules are not available. + # https://gitlab.freedesktop.org/pwithnall/malcontent/merge_requests/3 + ./use-system-dependencies.patch + ]; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + gobject-introspection + wrapGAppsHook + ]; + + buildInputs = [ + dbus + polkit + glib-testing + (python3.withPackages (pp: with pp; [ + pygobject3 + ])) + ]; + + propagatedBuildInputs = [ + glib + ]; + + mesonFlags = [ + "-Dinstalled_tests=true" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" + ]; + + postPatch = '' + substituteInPlace libmalcontent/tests/app-filter.c \ + --replace "/usr/bin/true" "${coreutils}/bin/true" \ + --replace "/bin/true" "${coreutils}/bin/true" \ + --replace "/usr/bin/false" "${coreutils}/bin/false" \ + --replace "/bin/false" "${coreutils}/bin/false" + ''; + + passthru = { + tests = { + installedTests = nixosTests.installed-tests.malcontent; + }; + }; + + meta = with stdenv.lib; { + description = "Parental controls library"; + homepage = "https://gitlab.freedesktop.org/pwithnall/malcontent"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/malcontent/installed-tests-path.patch b/pkgs/development/libraries/malcontent/installed-tests-path.patch new file mode 100644 index 000000000000..f2e75c2a8546 --- /dev/null +++ b/pkgs/development/libraries/malcontent/installed-tests-path.patch @@ -0,0 +1,35 @@ +diff --git a/libmalcontent/tests/meson.build b/libmalcontent/tests/meson.build +index a8a815a..0b1d242 100644 +--- a/libmalcontent/tests/meson.build ++++ b/libmalcontent/tests/meson.build +@@ -61,9 +61,9 @@ test_programs = [ + ], deps], + ] + +-installed_tests_metadir = join_paths(datadir, 'installed-tests', ++installed_tests_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', + 'libmalcontent-' + libmalcontent_api_version) +-installed_tests_execdir = join_paths(libexecdir, 'installed-tests', ++installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', + 'libmalcontent-' + libmalcontent_api_version) + + foreach program: test_programs +@@ -94,4 +94,4 @@ foreach program: test_programs + env: envs, + args: ['--tap'], + ) +-endforeach +\ No newline at end of file ++endforeach +diff --git a/meson_options.txt b/meson_options.txt +index 96a517d..7cb1ee8 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -3,4 +3,5 @@ option( + type: 'boolean', + value: false, + description: 'enable installed tests' +-) +\ No newline at end of file ++) ++option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests') diff --git a/pkgs/development/libraries/malcontent/use-system-dependencies.patch b/pkgs/development/libraries/malcontent/use-system-dependencies.patch new file mode 100644 index 000000000000..315bfe5ec109 --- /dev/null +++ b/pkgs/development/libraries/malcontent/use-system-dependencies.patch @@ -0,0 +1,22 @@ +diff --git a/meson.build b/meson.build +index f4a05ba..dd31537 100644 +--- a/meson.build ++++ b/meson.build +@@ -33,9 +33,8 @@ polkit_gobject = dependency('polkit-gobject-1') + polkitpolicydir = polkit_gobject.get_pkgconfig_variable('policydir', + define_variable: ['prefix', prefix]) + +-libglib_testing = subproject('libglib-testing') + libglib_testing_dep = dependency( +- 'libglib-testing', ++ 'glib-testing-0', + fallback: ['libglib-testing', 'libglib_testing_dep'], + ) + +@@ -120,4 +119,4 @@ test_env = [ + + subdir('accounts-service') + subdir('malcontent-client') +-subdir('libmalcontent') +\ No newline at end of file ++subdir('libmalcontent') diff --git a/pkgs/development/libraries/ngt/default.nix b/pkgs/development/libraries/ngt/default.nix new file mode 100644 index 000000000000..c66eceb5e7f0 --- /dev/null +++ b/pkgs/development/libraries/ngt/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, cmake }: +stdenv.mkDerivation rec { + pname = "NGT"; + version = "v1.8.4"; + nativeBuildInputs = [ cmake ]; + src = fetchFromGitHub { + owner = "yahoojapan"; + repo = "NGT"; + rev = version; + sha256 = "f2019e7916b81f8aeabc57d682904c8447776bf9ba94525d20265b329aa43eb5"; + }; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://github.com/yahoojapan/NGT; + description = "Nearest Neighbor Search with Neighborhood Graph and Tree for High-dimensional Data"; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.asl20; + maintainers = with maintainers; [ tomberek ]; + }; +} diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 63657cfc5e6e..9986c2217f7c 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -36,7 +36,9 @@ let outputs = [ "bin" "dev" "out" "man" ] ++ optional withDocs "doc"; setOutputFlags = false; - separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false) && stdenv.cc.isGNU; + separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false) + && stdenv.hostPlatform == stdenv.buildPlatform # unable to fix infinite recursion on stdenv.cc + && stdenv.cc.isGNU; nativeBuildInputs = [ perl ]; buildInputs = stdenv.lib.optional withCryptodev cryptodev; diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 331581294690..ba903d27ab7f 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -4,13 +4,13 @@ }: stdenv.mkDerivation rec { - name = "pcl-1.9.1"; + name = "pcl-1.10.0"; src = fetchFromGitHub { owner = "PointCloudLibrary"; repo = "pcl"; rev = name; - sha256 = "0g0am3bf14sadfw231l5nmf5d2g1p9i7yq12c6q8rl7nw501ny9j"; + sha256 = "1dbfkdk9mgwzadkw9jx3f5vzrcj88qcyv745kjxld7gcv8by9g6g"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/qtpbfimageplugin/default.nix b/pkgs/development/libraries/qtpbfimageplugin/default.nix index 5f3f8c4a66af..cc4a3ae84d90 100644 --- a/pkgs/development/libraries/qtpbfimageplugin/default.nix +++ b/pkgs/development/libraries/qtpbfimageplugin/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtpbfimageplugin"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "tumic0"; repo = "QtPBFImagePlugin"; rev = version; - sha256 = "16qsax1p09gldbg83df77ixaz7bkxl8wm806lc55y19pwnid9m7p"; + sha256 = "05l28xf7pf9mxm6crrdx5i7d2ri3hlg5iva0fqc8wxnj8pf2m38r"; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/development/libraries/science/math/or-tools/build.patch b/pkgs/development/libraries/science/math/or-tools/build.patch deleted file mode 100644 index a67e137ff4af..000000000000 --- a/pkgs/development/libraries/science/math/or-tools/build.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- a/makefiles/Makefile.python.mk -+++ b/makefiles/Makefile.python.mk -@@ -1070 +1070 @@ $(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools/data: $(PYDATA_LIBS) | $(PYPI_ARCHIVE_T --$(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools/util: $(PYUTIL_LIBS) | $(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools -+$(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools/util: $(PYSORTED_INTERVAL_LIST_LIBS) | $(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index 15aea5803bf1..688d14256819 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -1,24 +1,22 @@ { stdenv, fetchFromGitHub, cmake, abseil-cpp, gflags, which -, lsb-release, glog, protobuf, cbc, zlib -, ensureNewerSourcesForZipFilesHook, python, swig -, pythonProtobuf }: +, lsb-release, glog, protobuf3_11, cbc, zlib +, ensureNewerSourcesForZipFilesHook, python, swig }: -stdenv.mkDerivation rec { +let + protobuf = protobuf3_11; + pythonProtobuf = python.pkgs.protobuf.override { inherit protobuf; }; + +in stdenv.mkDerivation rec { pname = "or-tools"; - version = "7.3"; + version = "7.5"; src = fetchFromGitHub { owner = "google"; repo = "or-tools"; rev = "v${version}"; - sha256 = "0q06vxmds6nm3dpjw4y5jzr8j98qgfb9i8pbm9pfhmqigv791hwc"; + sha256 = "1p9jwdwzcsaa58ap912hdf2w27vna3xl9g4lh6kjskddwi8l3wac"; }; - patches = [ - ./build.patch # https://github.com/google/or-tools/pull/1619 - ./protobuf.patch # Otherwise it tries to install protobuf from pypi. - ]; - # The original build system uses cmake which does things like pull # in dependencies through git and Makefile creation time. We # obviously don't want to do this so instead we provide the @@ -69,7 +67,7 @@ stdenv.mkDerivation rec { description = '' Google's software suite for combinatorial optimization. ''; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ andersk ]; platforms = with platforms; linux; }; } diff --git a/pkgs/development/libraries/science/math/or-tools/protobuf.patch b/pkgs/development/libraries/science/math/or-tools/protobuf.patch deleted file mode 100644 index b0cce40434c6..000000000000 --- a/pkgs/development/libraries/science/math/or-tools/protobuf.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/makefiles/Makefile.third_party.unix.mk -+++ b/makefiles/Makefile.third_party.unix.mk -@@ -24,1 +24,1 @@ GLOG_TAG = 0.4.0 --PROTOBUF_TAG = 3.9.0 -+PROTOBUF_TAG = 3.7.0 ---- a/makefiles/Makefile.third_party.win.mk -+++ b/makefiles/Makefile.third_party.win.mk -@@ -40 +40 @@ GLOG_TAG = 0.4.0 --PROTOBUF_TAG = 3.9.0 -+PROTOBUF_TAG = 3.7.0 diff --git a/pkgs/development/libraries/xdg-dbus-proxy/default.nix b/pkgs/development/libraries/xdg-dbus-proxy/default.nix index d00b5398a19a..38d7d447e289 100644 --- a/pkgs/development/libraries/xdg-dbus-proxy/default.nix +++ b/pkgs/development/libraries/xdg-dbus-proxy/default.nix @@ -1,4 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, libxslt, docbook_xsl, docbook_xml_dtd_43, dbus, glib }: +{ stdenv +, fetchurl +, pkgconfig +, libxslt +, docbook_xsl +, docbook_xml_dtd_43 +, dbus +, glib +}: stdenv.mkDerivation rec { pname = "xdg-dbus-proxy"; @@ -9,9 +17,20 @@ stdenv.mkDerivation rec { sha256 = "03sj1h0c2l08xa8phw013fnxr4fgav7l2mkjhzf9xk3dykwxcj8p"; }; - nativeBuildInputs = [ pkgconfig libxslt docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ glib ]; - checkInputs = [ dbus ]; + nativeBuildInputs = [ + pkgconfig + libxslt + docbook_xsl + docbook_xml_dtd_43 + ]; + + buildInputs = [ + glib + ]; + + checkInputs = [ + dbus + ]; configureFlags = [ "--enable-man" @@ -22,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "DBus proxy for Flatpak and others"; - homepage = https://flatpak.org/; + homepage = "https://github.com/flatpak/xdg-dbus-proxy"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index 9b0316023710..994c2864e7f1 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -5,6 +5,7 @@ , libxml2 , xdg-desktop-portal , gtk3 +, gnome3 , glib , wrapGAppsHook , gsettings-desktop-schemas @@ -12,13 +13,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gtk"; - version = "1.4.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "flatpak"; repo = pname; rev = version; - sha256 = "1zryfg6232vz1pmv0zqcxvl4clnbb15kjf55b24cimkcnidklbap"; + sha256 = "1gpbjkfkrpk96krc1zbccrq7sih282mg303ifxaaxbnj6d8drm5h"; }; nativeBuildInputs = [ @@ -33,6 +34,7 @@ stdenv.mkDerivation rec { glib gsettings-desktop-schemas gtk3 + gnome3.gnome-desktop ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index d16c5d670e5e..1049ce3201a4 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -1,8 +1,27 @@ -{ stdenv, fetchFromGitHub, nixosTests, substituteAll, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, gsettings-desktop-schemas, acl, dbus, fuse, geoclue2, json-glib, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, nixosTests +, substituteAll +, autoreconfHook +, pkgconfig +, libxml2 +, glib +, pipewire +, fontconfig +, flatpak +, gsettings-desktop-schemas +, acl +, dbus +, fuse +, libportal +, geoclue2 +, json-glib +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "xdg-desktop-portal"; - version = "1.4.2"; + version = "1.6.0"; outputs = [ "out" "installedTests" ]; @@ -10,29 +29,49 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = pname; rev = version; - sha256 = "1rs3kmpczkr6nm08kb9njnl7n3rmhh0ral0xav6f0y70pyh8whx6"; + sha256 = "0fbsfpilwbv7j6cimsmmz6g0r96bw0ziwyk9z4zg2rd1mfkmmp9a"; }; patches = [ - ./respect-path-env-var.patch + # Hardcode paths used by x-d-p itself. (substituteAll { src = ./fix-paths.patch; inherit flatpak; }) ]; - nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 wrapGAppsHook ]; - buildInputs = [ glib pipewire fontconfig flatpak acl dbus geoclue2 fuse gsettings-desktop-schemas json-glib ]; + nativeBuildInputs = [ + autoreconfHook + pkgconfig + libxml2 + wrapGAppsHook + ]; + + buildInputs = [ + glib + pipewire + fontconfig + flatpak + acl + dbus + geoclue2 + fuse + libportal + gsettings-desktop-schemas + json-glib + ]; - doCheck = true; # XXX: investigate! + # Seems to get stuck after "PASS: test-portals 39 /portal/inhibit/monitor" + # TODO: investigate! + doCheck = false; configureFlags = [ "--enable-installed-tests" ]; makeFlags = [ - "installed_testdir=$(installedTests)/libexec/installed-tests/xdg-desktop-portal" - "installed_test_metadir=$(installedTests)/share/installed-tests/xdg-desktop-portal" + "installed_testdir=${placeholder "installedTests"}/libexec/installed-tests/xdg-desktop-portal" + "installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/xdg-desktop-portal" ]; passthru = { diff --git a/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch b/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch index f4b103eb38b1..98e26e88b5ce 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch +++ b/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch @@ -1,13 +1,13 @@ diff --git a/src/notification.c b/src/notification.c -index 1367114..72ba033 100644 +index 5412609..4243e98 100644 --- a/src/notification.c +++ b/src/notification.c -@@ -401,7 +401,7 @@ validate_icon_more (GVariant *v) +@@ -366,7 +366,7 @@ int status; g_autofree char *err = NULL; g_autoptr(GError) error = NULL; - const char *icon_validator = LIBEXECDIR "/flatpak-validate-icon"; + const char *icon_validator = "@flatpak@/libexec/flatpak-validate-icon"; const char *args[6]; - + if (G_IS_THEMED_ICON (icon)) diff --git a/pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch b/pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch deleted file mode 100644 index d970f5636ae4..000000000000 --- a/pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff --git a/src/portal-impl.c b/src/portal-impl.c -index 4fd48ff..346da7c 100644 ---- a/src/portal-impl.c -+++ b/src/portal-impl.c -@@ -116,38 +116,50 @@ sort_impl_by_name (gconstpointer a, - void - load_installed_portals (gboolean opt_verbose) - { -- const char *portal_dir = DATADIR "/xdg-desktop-portal/portals"; -- g_autoptr(GFile) dir = g_file_new_for_path (portal_dir); -- g_autoptr(GFileEnumerator) enumerator = NULL; - -- enumerator = g_file_enumerate_children (dir, "*", G_FILE_QUERY_INFO_NONE, NULL, NULL); -+ g_auto(GStrv) portal_dir_list; -+ int i; -+ const char *portal_dir = g_getenv ("XDG_DESKTOP_PORTAL_PATH"); -+ -+ if (portal_dir == NULL) -+ portal_dir = DATADIR "/portals"; - -- if (enumerator == NULL) -- return; -+ portal_dir_list = g_strsplit (portal_dir, G_SEARCHPATH_SEPARATOR_S, 0); - -- while (TRUE) -+ for (i = 0; portal_dir_list[i] != NULL; i++) - { -- g_autoptr(GFileInfo) info = g_file_enumerator_next_file (enumerator, NULL, NULL); -- g_autoptr(GFile) child = NULL; -- g_autofree char *path = NULL; -- const char *name; -- g_autoptr(GError) error = NULL; -+ portal_dir = portal_dir_list[i]; -+ g_autoptr(GFile) dir = g_file_new_for_path (portal_dir); -+ g_autoptr(GFileEnumerator) enumerator = NULL; -+ enumerator = g_file_enumerate_children (dir, "*", G_FILE_QUERY_INFO_NONE, NULL, NULL); - -- if (info == NULL) -- break; -+ if (enumerator == NULL) -+ continue; - -- name = g_file_info_get_name (info); -+ while (TRUE) -+ { -+ g_autoptr(GFileInfo) info = g_file_enumerator_next_file (enumerator, NULL, NULL); -+ g_autoptr(GFile) child = NULL; -+ g_autofree char *path = NULL; -+ const char *name; -+ g_autoptr(GError) error = NULL; - -- if (!g_str_has_suffix (name, ".portal")) -- continue; -+ if (info == NULL) -+ break; - -- child = g_file_enumerator_get_child (enumerator, info); -- path = g_file_get_path (child); -+ name = g_file_info_get_name (info); - -- if (!register_portal (path, opt_verbose, &error)) -- { -- g_warning ("Error loading %s: %s", path, error->message); -- continue; -+ if (!g_str_has_suffix (name, ".portal")) -+ continue; -+ -+ child = g_file_enumerator_get_child (enumerator, info); -+ path = g_file_get_path (child); -+ -+ if (!register_portal (path, opt_verbose, &error)) -+ { -+ g_warning ("Error loading %s: %s", path, error->message); -+ continue; -+ } - } - } - diff --git a/pkgs/development/libraries/zchunk/default.nix b/pkgs/development/libraries/zchunk/default.nix new file mode 100644 index 000000000000..ee07133b7aa0 --- /dev/null +++ b/pkgs/development/libraries/zchunk/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, fetchFromGitHub +, pkgconfig +, meson +, ninja +, zstd +, curl +}: + +stdenv.mkDerivation rec { + pname = "zchunk"; + version = "1.1.5"; + + outputs = [ "out" "lib" "dev" ]; + + src = fetchFromGitHub { + owner = "zchunk"; + repo = pname; + rev = version; + sha256 = "13sqjslk634mkklnmzdlzk9l9rc6g6migig5rln3irdnjrxvjf69"; + }; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + ]; + + buildInputs = [ + zstd + curl + ]; + + meta = with stdenv.lib; { + description = "File format designed for highly efficient deltas while maintaining good compression"; + homepage = "https://github.com/zchunk/zchunk"; + license = licenses.bsd2; + maintainers = with maintainers; []; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/node-packages/default-v10.nix b/pkgs/development/node-packages/default-v10.nix index f79696207d3d..65b537ad50f7 100644 --- a/pkgs/development/node-packages/default-v10.nix +++ b/pkgs/development/node-packages/default-v10.nix @@ -7,6 +7,11 @@ let }; in nodePackages // { + "@angular/cli" = nodePackages."@angular/cli".override { + prePatch = '' + export NG_CLI_ANALYTICS=false + ''; + }; bower2nix = nodePackages.bower2nix.override { buildInputs = [ pkgs.makeWrapper ]; postInstall = '' diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index e17bf7f009bc..c97f9d7ab49b 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -1345,13 +1345,13 @@ let sha512 = "1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA=="; }; }; - "@hapi/hoek-8.5.0" = { + "@hapi/hoek-8.5.1" = { name = "_at_hapi_slash_hoek"; packageName = "@hapi/hoek"; - version = "8.5.0"; + version = "8.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.0.tgz"; - sha512 = "7XYT10CZfPsH7j9F1Jmg1+d0ezOux2oM2GfArAzLwWe4mE2Dr3hVjsAL6+TFY49RRJlCdJDMw3nJsLFroTc8Kw=="; + url = "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz"; + sha512 = "yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow=="; }; }; "@hapi/joi-15.1.1" = { @@ -2830,13 +2830,13 @@ let sha512 = "i+UrSKZXs561g8LXsCBkgpNYkgBS3T3Pif2/+DraZmSKpQ2r2D1yCOdH82IGPWWpQ/GMSg6Z0qpLJpjnYz+bpg=="; }; }; - "@textlint/ast-traverse-2.1.6" = { + "@textlint/ast-traverse-2.1.7" = { name = "_at_textlint_slash_ast-traverse"; packageName = "@textlint/ast-traverse"; - version = "2.1.6"; + version = "2.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-2.1.6.tgz"; - sha512 = "qSPTUptR/C4YwoeVXRLUij6TpxbXT7U0P9S0No+p9Q+EYJeNvl1NUTrcpQmzrRydo6vCR0RzVkHmj+gEckH2Ug=="; + url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-2.1.7.tgz"; + sha512 = "73Nw0R4TaskPmF36Hop1DZ8AbH339WrGiLQjzbOLaXHaBHQ4hdNw28UMlw4glfPZb7/zvxPcJRtg9AB8F3ZW0g=="; }; }; "@textlint/feature-flag-3.1.6" = { @@ -2848,40 +2848,40 @@ let sha512 = "R2s027/WG3zhCMHZG79OhRFmkSL2ghwvFYg/W+2VUva5aYC8i9yeuwRyWt7m83tP1qlI+bq7j3S04fyn6yNheg=="; }; }; - "@textlint/fixer-formatter-3.1.12" = { + "@textlint/fixer-formatter-3.1.13" = { name = "_at_textlint_slash_fixer-formatter"; packageName = "@textlint/fixer-formatter"; - version = "3.1.12"; + version = "3.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-3.1.12.tgz"; - sha512 = "MQcVkr6WT4m31gG32IYoOJ+vMw+YI/hpO1S2gwfuQo7z+qBWoqByydbEn4H6dtJzWCX9RBgi8D1lAL2HPvASYw=="; + url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-3.1.13.tgz"; + sha512 = "FXqAJZ+5fLsOZjvFmn1JhCer8gQI4ZQk3R45bXizRJm6DASByPAGGh/MAQxxHSGeR5wR8miO/koxA2BrS8OhAw=="; }; }; - "@textlint/kernel-3.2.0" = { + "@textlint/kernel-3.2.1" = { name = "_at_textlint_slash_kernel"; packageName = "@textlint/kernel"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-3.2.0.tgz"; - sha512 = "1uir4V/fFSLl7vkbQUt4BYkXmwAwrT8En7RAv3o6t7EugCwyLlzCluFwCHrTLgVMTTZuS5NIqUQZREUMP7U/vg=="; + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-3.2.1.tgz"; + sha512 = "gMCgP/tAjCX8dGqgu7nhUwaDC/TzDKeRZb9qa50nqbnILRasKplj3lOWn2osZdkScVZPLQp+al1pDh9pU4D+Dw=="; }; }; - "@textlint/linter-formatter-3.1.11" = { + "@textlint/linter-formatter-3.1.12" = { name = "_at_textlint_slash_linter-formatter"; packageName = "@textlint/linter-formatter"; - version = "3.1.11"; + version = "3.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-3.1.11.tgz"; - sha512 = "tPFz8sGXWuDrhDRiHrLceasAN8AGM2ctt5uLvCxGVJ4Lmx6O7o+kDnHNGfIuF8rTRRQKWJ9jR/SCCH1SZulXmw=="; + url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-3.1.12.tgz"; + sha512 = "OEP4pklu01MEgBJrftD9vwe3HFx+jhiEe1JFIgf7GZ4a0fSer5vQWXBo5wHW6WtZtSa+iLBsLC3mI5VMeshzdA=="; }; }; - "@textlint/markdown-to-ast-6.1.6" = { + "@textlint/markdown-to-ast-6.1.7" = { name = "_at_textlint_slash_markdown-to-ast"; packageName = "@textlint/markdown-to-ast"; - version = "6.1.6"; + version = "6.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-6.1.6.tgz"; - sha512 = "xIaMn6gW1Ig+M+2Xcdbxt4cgOqWJSuB0pIO98KppQyqPzQ5k5deea7SBABqLZiKeNIxLl+2C1vfIfnBFFjxlmg=="; + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-6.1.7.tgz"; + sha512 = "B0QtokeQR4a9+4q0NQr8T9l7A1fFihTN5Ze57tVgqW+3ymzXEouh8DvPHeNQ4T6jEkAThvdjk95mxAMpGRJ79w=="; }; }; "@textlint/module-interop-1.0.2" = { @@ -2902,31 +2902,31 @@ let sha512 = "CBAEQmiEa2G/wonlLr1HgUtXfTSas6OGGvYGRIRMJweNh5Ilhbz2nM2/9XQMfLQbdn5pGYrAAAQRB2+/9fZ31A=="; }; }; - "@textlint/textlint-plugin-markdown-5.1.11" = { + "@textlint/textlint-plugin-markdown-5.1.12" = { name = "_at_textlint_slash_textlint-plugin-markdown"; packageName = "@textlint/textlint-plugin-markdown"; - version = "5.1.11"; + version = "5.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-5.1.11.tgz"; - sha512 = "DnCtNI10kejLPdEFu5pBHCDoBLJQTLnxwu76Mr/5iSEcYcytK2X72qiuvtg3c3s/8+at53TPQ6+5/AmpQKdvfg=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-5.1.12.tgz"; + sha512 = "CJWWTaomR22hQD3ogrZujMH1pNN7DqZadmx9CJXxgKwpI/cuD5d2kClwXO3MeLFckJr5HRso7SFN5ebqKu1ycw=="; }; }; - "@textlint/textlint-plugin-text-4.1.12" = { + "@textlint/textlint-plugin-text-4.1.13" = { name = "_at_textlint_slash_textlint-plugin-text"; packageName = "@textlint/textlint-plugin-text"; - version = "4.1.12"; + version = "4.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-4.1.12.tgz"; - sha512 = "WhCzAURZBokAzZ+ismEiS857F4YCRXROtwSiqk3gbgiZWVq47xX6g5xhVDPet3RvCMFzCUkrHVRJ+udORE6sFw=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-4.1.13.tgz"; + sha512 = "KQfSYNDt8HSX8ZL/r86N8OrAuQ9LEuevAtGomtfkw0h7Ed/pUfmuYXjht8wYRdysYBa4JyjrXcmqzRAUdkWrag=="; }; }; - "@textlint/types-1.3.0" = { + "@textlint/types-1.3.1" = { name = "_at_textlint_slash_types"; packageName = "@textlint/types"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/types/-/types-1.3.0.tgz"; - sha512 = "PJM3u0dnKyFCQJfhS+ft4OPse10P2PXz7bM2YJMyEs6kKOc2hDvZE7CH8F85GuSL9H5gToTqJ9/c3Yy4I3S+iA=="; + url = "https://registry.npmjs.org/@textlint/types/-/types-1.3.1.tgz"; + sha512 = "9MJ6PRPYWiFs2lfvp/Qhq72WrkZLL5ncBUXAVoj1Ug17ug8d7psmr/KJstMMocW3EWHSOuIDj7unh413c3jPqQ=="; }; }; "@textlint/utils-1.0.3" = { @@ -2974,15 +2974,6 @@ let sha512 = "xH2e58elpj1X4ynnKp9qSnWlsRTIs6n3tgLGNfwAGHwePw0mulHQllV34n0T25uYSu1k0hRKkWXF890B1yS47w=="; }; }; - "@types/bluebird-3.5.29" = { - name = "_at_types_slash_bluebird"; - packageName = "@types/bluebird"; - version = "3.5.29"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.29.tgz"; - sha512 = "kmVtnxTuUuhCET669irqQmPAez4KFnFVKvpleVRyfC3g+SHD1hIkFZcWLim9BVcwUBLO59o8VZE4yGCmTif8Yw=="; - }; - }; "@types/body-parser-1.17.1" = { name = "_at_types_slash_body-parser"; packageName = "@types/body-parser"; @@ -3397,40 +3388,40 @@ let sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="; }; }; - "@vue/cli-shared-utils-4.1.2" = { + "@vue/cli-shared-utils-4.2.2" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "4.1.2"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.1.2.tgz"; - sha512 = "uQAVqxCWdL5ipZ0TPu6SVsdokQp4yHt8SzzpUGhq8TkW4vwalGddJAAJrqZHMl91ZTIJ4p4ixofmCaaJo5rSRA=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.2.2.tgz"; + sha512 = "EK5wcxgjadqUpSzfh6Bnxd46Zx+SAaHusygqV11UZKHr4EObc/SjCpq7c7drmFkBjRqmVvrHs4jRnJJo5VgCgQ=="; }; }; - "@vue/cli-ui-4.1.2" = { + "@vue/cli-ui-4.2.2" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "4.1.2"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.1.2.tgz"; - sha512 = "fA9z8yDQqhD8QcHlWt6wX0t+7EVKFVRRzxPnZ8dEoYaoo+Y5wLAE0fJyyxjpzlwEStqBSDs6A7X+1wQq/FBICQ=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.2.2.tgz"; + sha512 = "JWbAWIxjMIL8Svgveqd7cxIpLGxX2vXizVtjoWNsxcnEGrWFOzbb2uKQwlf/3v4m4ERNP+eKGFagqWEn7SUFiw=="; }; }; - "@vue/cli-ui-addon-webpack-4.1.2" = { + "@vue/cli-ui-addon-webpack-4.2.2" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "4.1.2"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.1.2.tgz"; - sha512 = "zmb8cYHCxqEzrpQvlV5R8zMcDWJMo6KRTIn13i5FxBdezZkkni1tJunaoiDRjEFyuu01Lg8jcb8TNxuIaH5TKg=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.2.2.tgz"; + sha512 = "d5LpntzWGJGLD9EXEZPosCrgMosds9Mik/tSbs0tOrCkiBRgC2feUOeL87JnPWS2wEQA34Vujz7+2WeTM40GUw=="; }; }; - "@vue/cli-ui-addon-widgets-4.1.2" = { + "@vue/cli-ui-addon-widgets-4.2.2" = { name = "_at_vue_slash_cli-ui-addon-widgets"; packageName = "@vue/cli-ui-addon-widgets"; - version = "4.1.2"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.1.2.tgz"; - sha512 = "Y6/MLtfaiEfoEToSoSSbFi/EshpLmsBMfK7m98NbCTZgpnhJ7iSaHYkYsF4gg0D52C6Oa2cy0iLoJtaFA8zQbQ=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.2.2.tgz"; + sha512 = "c3NNO3eXU2H1ISk12UVXbRg0cKes2IxPiaT4URDTxUVTXzQJpCg2bQ3V8w11IcvC6rykonzrFsXRrhUPD+tD8A=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -6142,15 +6133,6 @@ let sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; }; }; - "ast-types-0.11.7" = { - name = "ast-types"; - packageName = "ast-types"; - version = "0.11.7"; - src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.11.7.tgz"; - sha512 = "2mP3TwtkY/aTv5X3ZsMpNAbOnyoC/aMJwJSoaELPkHId0nSQgFcnU4dRW3isxiz7+zBexk0ym3WNVjMiQBnJSw=="; - }; - }; "ast-types-0.13.2" = { name = "ast-types"; packageName = "ast-types"; @@ -6484,13 +6466,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.613.0" = { + "aws-sdk-2.614.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.613.0"; + version = "2.614.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.613.0.tgz"; - sha512 = "FYLaVtC/AlrcnjsPw1JhAsKd6yapr918Mk0jAcw3yFZp1sI2V0Um+2pmijLFsV+nNRxFlCVJRhhFWB5GK6yALA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.614.0.tgz"; + sha512 = "o7utaxDMo9ri1VyPKw8Kcmpy5uZOqMeok2cgur70iZ94zsLIRnHKrBv1wMBbyRGuUbfJRq76HGAS9QxdiSqQHw=="; }; }; "aws-sign2-0.6.0" = { @@ -14206,13 +14188,13 @@ let sha512 = "1N+eCCrepIeK1+qtWrMEO1CV68Hn+TLbiR9c70VB3xnut3DmUxT+3T7sRHhb0mpK2F/74IfP+loQDriU2W9lkA=="; }; }; - "e-prime-0.10.2" = { + "e-prime-0.10.3" = { name = "e-prime"; packageName = "e-prime"; - version = "0.10.2"; + version = "0.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/e-prime/-/e-prime-0.10.2.tgz"; - sha1 = "ea9375eb985636de88013c7a9fb129ad9e15eff8"; + url = "https://registry.npmjs.org/e-prime/-/e-prime-0.10.3.tgz"; + sha512 = "QGKWEWRVUfjUXSoio9AW43RzzMQzI23No8uyKQD9yZJm4Hbc+8ZRZhyEtWdnpAkY7dXFmTxtcFR4cM0T0U1jGw=="; }; }; "each-props-1.3.2" = { @@ -14359,13 +14341,13 @@ let sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; }; }; - "electron-to-chromium-1.3.345" = { + "electron-to-chromium-1.3.346" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.345"; + version = "1.3.346"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.345.tgz"; - sha512 = "f8nx53+Z9Y+SPWGg3YdHrbYYfIJAtbUjpFfW4X1RwTZ94iUG7geg9tV8HqzAXX7XTNgyWgAFvce4yce8ZKxKmg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.346.tgz"; + sha512 = "Yy4jF5hJd57BWmGPt0KjaXc25AmWZeQK75kdr4zIzksWVtiT6DwaNtvTb9dt+LkQKwUpvBfCyyPsXXtbY/5GYw=="; }; }; "elegant-spinner-1.0.1" = { @@ -21643,13 +21625,13 @@ let sha1 = "28a44cfbd9d3db193045f22b65fce8edf9620596"; }; }; - "is-finite-1.0.2" = { + "is-finite-1.1.0" = { name = "is-finite"; packageName = "is-finite"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; - sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; + url = "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz"; + sha512 = "cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w=="; }; }; "is-fullwidth-code-point-1.0.0" = { @@ -22642,13 +22624,13 @@ let sha1 = "dc5ebed10d04a5e0eaf49ef0009bec473d1a6b31"; }; }; - "jaeger-client-3.17.1" = { + "jaeger-client-3.17.2" = { name = "jaeger-client"; packageName = "jaeger-client"; - version = "3.17.1"; + version = "3.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.17.1.tgz"; - sha512 = "S3fS3vk7dcWTWUWGqMWD9fGa/diLhPIP9h0S8L+OQdz24+7hR7cdALk+AOZD1VzbvqUIQbj6uUELp31J4Frgcw=="; + url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.17.2.tgz"; + sha512 = "19YloSidmKbrXHgecLWod8eXo7rm2ieUnsfg0ripTFGRCW5v2OWE96Gte4/tOQG/8N+T39VoLU2nMBdjbdMUJg=="; }; }; "java-properties-1.0.2" = { @@ -22723,15 +22705,6 @@ let sha1 = "06d4912255093419477d425633606e0e90782967"; }; }; - "joplin-renderer-1.0.8" = { - name = "joplin-renderer"; - packageName = "joplin-renderer"; - version = "1.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/joplin-renderer/-/joplin-renderer-1.0.8.tgz"; - sha512 = "Q4SSYXl9ErcnUDTz7N4FjWcOOgfPEf5yyNRjU2J1fuxZ/1VbYt6MnfBB7OeiRW+XF+4Arhihk+/XVK++of4hEA=="; - }; - }; "joplin-turndown-4.0.19" = { name = "joplin-turndown"; packageName = "joplin-turndown"; @@ -22912,13 +22885,13 @@ let sha1 = "b01307cb29b618a1ed26ec79e911f803c4da0040"; }; }; - "jscodeshift-0.6.4" = { + "jscodeshift-0.7.0" = { name = "jscodeshift"; packageName = "jscodeshift"; - version = "0.6.4"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.6.4.tgz"; - sha512 = "+NF/tlNbc2WEhXUuc4WEJLsJumF84tnaMUZW2hyJw3jThKKRvsPX4sPJVgO1lPE28z0gNL+gwniLG9d8mYvQCQ=="; + url = "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.7.0.tgz"; + sha512 = "Kt6rpTa1HVhAWagD6J0y6qxxqRmDgkFvczerLgOsDNSGoUZSmq2CO1vFRcda9OV1BaZKSHCIh+VREPts5tB/Ig=="; }; }; "jsdom-11.12.0" = { @@ -25370,6 +25343,15 @@ let sha1 = "80d6492dc1470864bbf583533b651f42a9f52415"; }; }; + "lodash.repeat-4.1.0" = { + name = "lodash.repeat"; + packageName = "lodash.repeat"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-4.1.0.tgz"; + sha1 = "fc7de8131d8c8ac07e4b49f74ffe829d1f2bec44"; + }; + }; "lodash.rest-4.0.5" = { name = "lodash.rest"; packageName = "lodash.rest"; @@ -26315,6 +26297,15 @@ let sha1 = "9bee0e9a990a963ba96df6980c4fddb05dfb4dcc"; }; }; + "markdown-it-expand-tabs-1.0.13" = { + name = "markdown-it-expand-tabs"; + packageName = "markdown-it-expand-tabs"; + version = "1.0.13"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-it-expand-tabs/-/markdown-it-expand-tabs-1.0.13.tgz"; + sha512 = "ODpk98FWkGIq2vkwm2NOLt4G6TRgy3M9eTa9SFm06pUyOd0zjjYAwkhsjiCDU42pzKuz0ChiwBO0utuOj3LNOA=="; + }; + }; "markdown-it-footnote-3.0.2" = { name = "markdown-it-footnote"; packageName = "markdown-it-footnote"; @@ -29002,15 +28993,6 @@ let sha1 = "8d9dbe28964a4ac5712e9131642107c71e90ec40"; }; }; - "node-notifier-5.4.3" = { - name = "node-notifier"; - packageName = "node-notifier"; - version = "5.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.3.tgz"; - sha512 = "M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q=="; - }; - }; "node-notifier-6.0.0" = { name = "node-notifier"; packageName = "node-notifier"; @@ -30956,13 +30938,13 @@ let sha1 = "79b302fc144cdfbb4ab6feba7040e6a5d99c79c7"; }; }; - "pacote-10.3.1" = { + "pacote-10.3.2" = { name = "pacote"; packageName = "pacote"; - version = "10.3.1"; + version = "10.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-10.3.1.tgz"; - sha512 = "rCChFkLK9aqmk34ewjVmoUL3MD0yxzj3xkknS7MtDO5rx5z4d4bB+GxsAu4zoYc9r3ynQyEfc2GNtpL94yZaEw=="; + url = "https://registry.npmjs.org/pacote/-/pacote-10.3.2.tgz"; + sha512 = "Hem2RkLAHhNaJSbhjouhbCAXlinNsv9W75s6JNxv9GypIjFkHtxCBoV6+GYBPttVOpZqnTAHmYRLs8yc2X2Dnw=="; }; }; "pacote-9.5.8" = { @@ -34881,15 +34863,6 @@ let sha1 = "451fd3004ab1e4df9b4e4b66376b2a21912462d3"; }; }; - "recast-0.16.2" = { - name = "recast"; - packageName = "recast"; - version = "0.16.2"; - src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.16.2.tgz"; - sha512 = "O/7qXi51DPjRVdbrpNzoBQH5dnAPQNbfoOFyRiUwreTMJfIHYOEBzwuH+c0+/BTSJ3CQyKs6ILSWXhESH6Op3A=="; - }; - }; "recast-0.18.5" = { name = "recast"; packageName = "recast"; @@ -36087,13 +36060,13 @@ let sha512 = "NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg=="; }; }; - "rimraf-3.0.1" = { + "rimraf-3.0.2" = { name = "rimraf"; packageName = "rimraf"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.1.tgz"; - sha512 = "IQ4ikL8SjBiEDZfk+DFVwqRK8md24RWMEJkdSlgNLkyyAImcjf8SWvU1qFMDOb4igBClbTQ/ugPqXcRwdFTxZw=="; + url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"; + sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; }; }; "ripemd160-2.0.2" = { @@ -38796,13 +38769,13 @@ let sha1 = "9e857d170dff152c53a273eb9004a0a914a106e5"; }; }; - "ssb-keys-7.2.1" = { + "ssb-keys-7.2.2" = { name = "ssb-keys"; packageName = "ssb-keys"; - version = "7.2.1"; + version = "7.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-keys/-/ssb-keys-7.2.1.tgz"; - sha512 = "Xoer1wCyRh7LmzS5nWOK/WBvIXjuPxW4rBnvGgmNPYG5/EDizuK4lneacxk5eaxeU0GjZvRdhmauiwCBalcyRw=="; + url = "https://registry.npmjs.org/ssb-keys/-/ssb-keys-7.2.2.tgz"; + sha512 = "FPeyYU/3LpxcagnbmVWE+Q/qzg6keqeOBPbD7sEH9UKixUASeufPKiORDgh8nVX7J9Z+0vUaHt/WG999kGjvVQ=="; }; }; "ssb-links-3.0.8" = { @@ -47247,10 +47220,10 @@ in "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "4.1.2"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-4.1.2.tgz"; - sha512 = "CGBcPFvnWnZMV+7Q4FI8yBWkQKECXYQ2Sf8YWoqn5ZG3ZRODG8dXSejg1O0VktKtPl7IVYYXOOqvyerV11fYmw=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-4.2.2.tgz"; + sha512 = "9HNfmFG3WYcQVE5+bBOf+zDlMLk6cBwpXZYjqLZXBWWRxOcpRdCzXcJMoLQqJrMbpLnrD2QMkgncPNCZELqT5Q=="; }; dependencies = [ sources."@akryum/winattr-3.0.0" @@ -47393,7 +47366,7 @@ in sources."@endemolshinegroup/cosmiconfig-typescript-loader-1.0.1" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" - sources."@hapi/hoek-8.5.0" + sources."@hapi/hoek-8.5.1" sources."@hapi/joi-15.1.1" sources."@hapi/topo-3.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -47418,6 +47391,7 @@ in dependencies = [ sources."debug-3.2.6" sources."fs-extra-6.0.1" + sources."ms-2.1.2" ]; }) (sources."@oclif/plugin-help-2.2.3" // { @@ -47475,18 +47449,19 @@ in sources."@types/minimatch-3.0.3" sources."@types/node-13.7.0" sources."@types/node-fetch-2.5.4" + sources."@types/normalize-package-data-2.4.0" sources."@types/range-parser-1.2.3" sources."@types/serve-static-1.13.3" sources."@types/ws-6.0.4" sources."@types/zen-observable-0.8.0" - sources."@vue/cli-shared-utils-4.1.2" - (sources."@vue/cli-ui-4.1.2" // { + sources."@vue/cli-shared-utils-4.2.2" + (sources."@vue/cli-ui-4.2.2" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-4.1.2" - sources."@vue/cli-ui-addon-widgets-4.1.2" + sources."@vue/cli-ui-addon-webpack-4.2.2" + sources."@vue/cli-ui-addon-widgets-4.2.2" sources."@wry/context-0.4.4" sources."@wry/equality-0.1.9" sources."abbrev-1.1.1" @@ -47519,12 +47494,16 @@ in sources."apollo-codegen-scala-0.35.0" sources."apollo-codegen-swift-0.36.0" sources."apollo-codegen-typescript-0.36.0" - sources."apollo-datasource-0.6.4" + sources."apollo-datasource-0.7.0" sources."apollo-engine-reporting-1.5.0" sources."apollo-engine-reporting-protobuf-0.4.4" sources."apollo-env-0.6.1" sources."apollo-graphql-0.4.0" - sources."apollo-language-server-1.19.0" + (sources."apollo-language-server-1.19.0" // { + dependencies = [ + sources."apollo-datasource-0.6.4" + ]; + }) sources."apollo-link-1.2.13" sources."apollo-link-context-1.0.19" sources."apollo-link-error-1.1.12" @@ -47534,11 +47513,7 @@ in sources."apollo-link-state-0.4.2" sources."apollo-link-ws-1.0.19" sources."apollo-server-caching-0.5.1" - (sources."apollo-server-core-2.10.0" // { - dependencies = [ - sources."apollo-datasource-0.7.0" - ]; - }) + sources."apollo-server-core-2.10.0" sources."apollo-server-env-2.4.3" sources."apollo-server-errors-2.3.4" sources."apollo-server-express-2.10.0" @@ -47601,7 +47576,6 @@ in sources."debug-2.6.9" sources."http-errors-1.7.2" sources."inherits-2.0.3" - sources."ms-2.0.0" sources."qs-6.7.0" ]; }) @@ -47743,7 +47717,11 @@ in }) sources."core-util-is-1.0.2" sources."cors-2.8.5" - sources."cosmiconfig-5.2.1" + (sources."cosmiconfig-5.2.1" // { + dependencies = [ + sources."parse-json-4.0.0" + ]; + }) sources."create-error-class-3.0.2" (sources."cross-spawn-6.0.5" // { dependencies = [ @@ -47757,7 +47735,11 @@ in sources."dashdash-1.14.1" sources."date-fns-1.30.1" sources."de-indent-1.0.2" - sources."debug-4.1.1" + (sources."debug-4.1.1" // { + dependencies = [ + sources."ms-2.1.2" + ]; + }) sources."decode-uri-component-0.2.0" (sources."decompress-4.2.0" // { dependencies = [ @@ -47779,7 +47761,7 @@ in ]; }) sources."deep-extend-0.6.0" - sources."deepmerge-3.3.0" + sources."deepmerge-4.2.2" sources."defaults-1.0.3" sources."define-properties-1.1.3" sources."define-property-2.0.2" @@ -47812,7 +47794,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.345" + sources."electron-to-chromium-1.3.346" sources."elegant-spinner-1.0.1" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" @@ -47849,14 +47831,12 @@ in }) sources."is-descriptor-0.1.6" sources."kind-of-5.1.0" - sources."ms-2.0.0" ]; }) sources."expand-tilde-2.0.2" (sources."express-4.17.1" // { dependencies = [ sources."debug-2.6.9" - sources."ms-2.0.0" sources."qs-6.7.0" sources."safe-buffer-5.1.2" ]; @@ -47887,7 +47867,6 @@ in (sources."finalhandler-1.1.2" // { dependencies = [ sources."debug-2.6.9" - sources."ms-2.0.0" ]; }) (sources."find-cache-dir-2.1.0" // { @@ -47994,6 +47973,7 @@ in sources."he-1.2.0" sources."header-case-1.0.1" sources."homedir-polyfill-1.0.3" + sources."hosted-git-info-2.8.5" (sources."htmlparser2-3.10.1" // { dependencies = [ sources."readable-stream-3.5.0" @@ -48002,6 +47982,7 @@ in (sources."http-call-5.3.0" // { dependencies = [ sources."is-stream-2.0.0" + sources."parse-json-4.0.0" ]; }) sources."http-errors-1.7.3" @@ -48084,13 +48065,7 @@ in sources."js-tokens-4.0.0" sources."js-yaml-3.13.1" sources."jsbn-0.1.1" - (sources."jscodeshift-0.6.4" // { - dependencies = [ - sources."ast-types-0.11.7" - sources."recast-0.16.2" - sources."source-map-0.6.1" - ]; - }) + sources."jscodeshift-0.7.0" sources."jsesc-2.5.2" sources."json-parse-better-errors-1.0.2" sources."json-schema-0.2.3" @@ -48104,6 +48079,7 @@ in sources."launch-editor-2.2.1" sources."leven-3.1.0" sources."levenary-1.1.1" + sources."lines-and-columns-1.1.6" sources."listr-0.14.3" sources."listr-silent-renderer-1.1.1" (sources."listr-update-renderer-0.5.0" // { @@ -48124,7 +48100,9 @@ in }) (sources."load-json-file-5.3.0" // { dependencies = [ + sources."parse-json-4.0.0" sources."pify-4.0.1" + sources."type-fest-0.3.1" ]; }) sources."locate-path-3.0.0" @@ -48193,7 +48171,7 @@ in ]; }) sources."moment-2.24.0" - sources."ms-2.1.2" + sources."ms-2.0.0" sources."mute-stream-0.0.7" sources."nan-2.14.0" sources."nanoid-2.1.11" @@ -48218,19 +48196,25 @@ in sources."node-fetch-2.6.0" sources."node-ipc-9.1.1" sources."node-modules-regexp-1.0.0" - (sources."node-notifier-5.4.3" // { + (sources."node-notifier-6.0.0" // { dependencies = [ - sources."semver-5.7.1" + sources."is-wsl-2.1.1" ]; }) sources."node-releases-1.1.48" (sources."nodemon-1.19.4" // { dependencies = [ sources."debug-3.2.6" + sources."ms-2.1.2" sources."semver-5.7.1" ]; }) sources."nopt-1.0.10" + (sources."normalize-package-data-2.5.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."normalize-path-3.0.0" sources."npm-conf-1.1.3" sources."npm-run-path-2.0.2" @@ -48281,7 +48265,7 @@ in }) sources."param-case-2.1.1" sources."parse-git-config-2.0.3" - sources."parse-json-4.0.0" + sources."parse-json-5.0.0" sources."parse-passwd-1.0.0" sources."parse5-3.0.3" sources."parseurl-1.3.3" @@ -48315,6 +48299,7 @@ in (sources."portfinder-1.0.25" // { dependencies = [ sources."debug-3.2.6" + sources."ms-2.1.2" ]; }) sources."posix-character-classes-0.1.1" @@ -48340,6 +48325,7 @@ in ]; }) sources."rc-1.2.8" + sources."read-pkg-5.2.0" (sources."readable-stream-2.3.7" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -48446,7 +48432,6 @@ in }) sources."is-descriptor-0.1.6" sources."kind-of-5.1.0" - sources."ms-2.0.0" ]; }) (sources."snapdragon-node-2.1.1" // { @@ -48467,6 +48452,10 @@ in ]; }) sources."source-map-url-0.4.0" + sources."spdx-correct-3.1.0" + sources."spdx-exceptions-2.2.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.5" (sources."split-string-3.1.0" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -48611,14 +48600,13 @@ in sources."tty-1.0.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-fest-0.3.1" + sources."type-fest-0.6.0" sources."type-is-1.6.18" sources."typescript-3.7.5" sources."unbzip2-stream-1.3.3" (sources."undefsafe-2.0.2" // { dependencies = [ sources."debug-2.6.9" - sources."ms-2.0.0" ]; }) sources."unicode-canonical-property-names-ecmascript-1.0.4" @@ -48657,6 +48645,7 @@ in sources."util.promisify-1.0.1" sources."utils-merge-1.0.1" sources."uuid-3.4.0" + sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" sources."verror-1.10.0" @@ -48668,7 +48657,6 @@ in (sources."vue-cli-plugin-apollo-0.21.3" // { dependencies = [ sources."cross-spawn-7.0.1" - sources."deepmerge-4.2.2" sources."execa-3.4.0" sources."fs-extra-8.1.0" sources."get-stream-5.1.0" @@ -49293,7 +49281,7 @@ in sources."inherits-2.0.4" sources."intersect-1.0.1" sources."is-arrayish-0.2.1" - sources."is-finite-1.0.2" + sources."is-finite-1.1.0" sources."is-plain-obj-1.1.0" sources."is-utf8-0.2.1" (sources."jsonfile-2.4.0" // { @@ -49326,7 +49314,6 @@ in sources."ms-2.0.0" sources."natives-1.1.6" sources."normalize-package-data-2.5.0" - sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" sources."once-1.4.0" sources."os-tmpdir-1.0.2" @@ -49726,7 +49713,7 @@ in sources."ip-set-1.0.2" sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" - sources."is-finite-1.0.2" + sources."is-finite-1.1.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."isarray-0.0.1" @@ -49776,7 +49763,6 @@ in sources."mute-stream-0.0.4" sources."network-address-0.0.5" sources."normalize-package-data-2.5.0" - sources."number-is-nan-1.0.1" sources."numeral-1.5.6" sources."oauth-sign-0.9.0" sources."object-assign-1.0.0" @@ -52373,7 +52359,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.613.0" + sources."aws-sdk-2.614.0" sources."aws-sign2-0.7.0" sources."aws4-1.9.1" sources."base64-js-1.3.1" @@ -52612,7 +52598,7 @@ in sources."ink-text-input-1.1.1" sources."invariant-2.2.4" sources."is-arrayish-0.2.1" - sources."is-finite-1.0.2" + sources."is-finite-1.1.0" sources."is-fullwidth-code-point-2.0.0" sources."is-obj-1.0.1" sources."is-object-1.0.1" @@ -52656,7 +52642,6 @@ in sources."ms-2.0.0" sources."normalize-package-data-2.5.0" sources."npm-run-path-2.0.2" - sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" sources."onetime-2.0.1" sources."os-homedir-1.0.2" @@ -53160,7 +53145,7 @@ in sources."indent-string-2.1.0" sources."inherits-2.0.4" sources."is-arrayish-0.2.1" - sources."is-finite-1.0.2" + sources."is-finite-1.1.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" @@ -53200,7 +53185,6 @@ in sources."ms-2.0.0" sources."node-phantom-simple-2.2.4" sources."normalize-package-data-2.5.0" - sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."onetime-1.1.0" @@ -54076,7 +54060,7 @@ in sources."ssb-git-0.5.0" sources."ssb-git-repo-2.8.3" sources."ssb-issues-1.0.0" - sources."ssb-keys-7.2.1" + sources."ssb-keys-7.2.2" sources."ssb-marked-0.6.0" (sources."ssb-mentions-0.1.2" // { dependencies = [ @@ -56896,7 +56880,7 @@ in sources."raw-body-2.4.1" sources."readable-stream-3.5.0" sources."restore-cursor-2.0.0" - sources."rimraf-3.0.1" + sources."rimraf-3.0.2" sources."rsvp-3.6.2" sources."run-async-2.3.0" sources."rxjs-6.5.4" @@ -57491,7 +57475,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."iterare-1.2.0" - (sources."jaeger-client-3.17.1" // { + (sources."jaeger-client-3.17.2" // { dependencies = [ sources."opentracing-0.13.0" ]; @@ -57547,10 +57531,10 @@ in joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "1.0.153"; + version = "1.0.155"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-1.0.153.tgz"; - sha512 = "3uY8WevVQaMtbRp07LgLEk3BcRakQiPPE55EjDu2+UYhrMOCO6InA+Q5/lS5bsZMz4L6OjZinfMPwq0DGnWw+Q=="; + url = "https://registry.npmjs.org/joplin/-/joplin-1.0.155.tgz"; + sha512 = "KgaE+pkLK8ku98UmQ+mxt8Y/xXwby+FgUPRNsDu00NO2+4vLyZK9RCBej+OeGFSYj3Zia28ICojfZ+bU4unxsA=="; }; dependencies = [ sources."@cronvel/get-pixels-3.3.1" @@ -57780,13 +57764,6 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isstream-0.1.2" - (sources."joplin-renderer-1.0.8" // { - dependencies = [ - sources."entities-2.0.0" - sources."fs-extra-8.1.0" - sources."markdown-it-10.0.0" - ]; - }) sources."joplin-turndown-4.0.19" sources."joplin-turndown-plugin-gfm-1.0.12" sources."jpeg-js-0.1.2" @@ -57814,6 +57791,7 @@ in sources."lodash-4.17.15" sources."lodash-es-4.17.15" sources."lodash.padend-4.6.1" + sources."lodash.repeat-4.1.0" sources."lodash.sortby-4.7.0" sources."lodash.toarray-4.4.0" sources."loose-envify-1.4.0" @@ -57824,15 +57802,24 @@ in ]; }) sources."magicli-0.0.8" - sources."markdown-it-8.4.2" + (sources."markdown-it-10.0.0" // { + dependencies = [ + sources."entities-2.0.0" + ]; + }) sources."markdown-it-abbr-1.0.4" sources."markdown-it-anchor-5.2.5" sources."markdown-it-deflist-2.0.3" sources."markdown-it-emoji-1.4.0" + sources."markdown-it-expand-tabs-1.0.13" sources."markdown-it-footnote-3.0.2" sources."markdown-it-ins-3.0.0" sources."markdown-it-mark-3.0.0" - sources."markdown-it-multimd-table-4.0.1" + (sources."markdown-it-multimd-table-4.0.1" // { + dependencies = [ + sources."markdown-it-8.4.2" + ]; + }) sources."markdown-it-sub-1.0.0" sources."markdown-it-sup-1.0.0" sources."markdown-it-toc-done-right-4.1.0" @@ -59730,7 +59717,7 @@ in sources."is-directory-0.3.1" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" - sources."is-finite-1.0.2" + sources."is-finite-1.1.0" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" (sources."is-number-3.0.0" // { @@ -60198,10 +60185,10 @@ in less = nodeEnv.buildNodePackage { name = "less"; packageName = "less"; - version = "3.10.3"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-3.10.3.tgz"; - sha512 = "vz32vqfgmoxF1h3K4J+yKCtajH0PWmjkIFgbs5d78E/c/e+UQTnI+lWK+1eQRE95PXM2mC3rJlLSSP9VQHnaow=="; + url = "https://registry.npmjs.org/less/-/less-3.11.0.tgz"; + sha512 = "dAui5qzfxuWY7BIEt9/gy5EbDhwDb44rqaIUFYeu8wEE8huMZ/PzB+gNFONEG5DUPrOrOGcAjGeYVg6AFiA9KQ=="; }; dependencies = [ sources."ajv-6.11.0" @@ -61616,7 +61603,7 @@ in }) sources."duplexer3-0.1.4" sources."duplexify-3.7.1" - sources."electron-to-chromium-1.3.345" + sources."electron-to-chromium-1.3.346" sources."elliptic-6.5.2" sources."emoji-regex-7.0.3" sources."emojis-list-2.1.0" @@ -61877,7 +61864,7 @@ in sources."is-equal-shallow-0.1.3" sources."is-extendable-0.1.1" sources."is-extglob-1.0.0" - sources."is-finite-1.0.2" + sources."is-finite-1.1.0" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-2.0.1" sources."is-module-1.0.0" @@ -62011,7 +61998,6 @@ in ]; }) sources."npm-run-path-2.0.2" - sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { dependencies = [ @@ -62512,14 +62498,14 @@ in madoko = nodeEnv.buildNodePackage { name = "madoko"; packageName = "madoko"; - version = "1.1.7"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/madoko/-/madoko-1.1.7.tgz"; - sha512 = "6kR0neT2fvgpn7uhyo/tfcIZsXF78vG5WNXU9rV33EnARZ2iqIF0alWsagwLkDhBysvF5wf2gy7js2/S2DRl1Q=="; + url = "https://registry.npmjs.org/madoko/-/madoko-1.1.8.tgz"; + sha512 = "SYChn9LZ7X8hXFHe/y11cebSC4N1+F7LncYCunRX2IW4u5w2y0J2wWw+RicYm6+JZORI61EdzgJFWqQDjgsAEQ=="; }; dependencies = [ sources."amdefine-1.0.1" - sources."mkdirp-1.0.3" + sources."mkdirp-0.3.5" sources."requirejs-2.3.6" ]; buildInputs = globalBuildInputs; @@ -62623,14 +62609,14 @@ in mathjax = nodeEnv.buildNodePackage { name = "mathjax"; packageName = "mathjax"; - version = "2.7.7"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mathjax/-/mathjax-2.7.7.tgz"; - sha512 = "OOl0B2/0tSJAtAZarXnQuLDBLgTNRqiI9VqHTQzPsxf4okT2iIpDrvaklK9x2QEMD1sDj4yRn11Ygci41DxMAQ=="; + url = "https://registry.npmjs.org/mathjax/-/mathjax-3.0.1.tgz"; + sha512 = "hrwOeKm3b1X4zpvLRSX89y3MZLRJTq0bSGIbo5M6BANOeGlL2z8Y8mZaKRFJ/WY4qcIrHp3f+Q9RWIaldOCUVg=="; }; buildInputs = globalBuildInputs; meta = { - description = "Beautiful math in all browsers. MathJax is an open-source JavaScript display engine for LaTeX, MathML, and AsciiMath notation that works in all browsers."; + description = "Beautiful math in all browsers. MathJax is an open-source JavaScript display engine for LaTeX, MathML, and AsciiMath notation that works in all browsers. This package includes the packaged components (install mathjax-full to get the source code)."; homepage = "https://github.com/mathjax/MathJax#readme"; license = "Apache-2.0"; }; @@ -63933,7 +63919,7 @@ in sources."invert-kv-1.0.0" sources."ipaddr.js-1.9.0" sources."is-arrayish-0.2.1" - sources."is-finite-1.0.2" + sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" @@ -65282,7 +65268,7 @@ in sources."p-map-3.0.0" sources."p-try-2.2.0" sources."package-json-6.5.0" - (sources."pacote-10.3.1" // { + (sources."pacote-10.3.2" // { dependencies = [ sources."semver-7.1.2" ]; @@ -65963,7 +65949,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.345" + sources."electron-to-chromium-1.3.346" sources."elliptic-6.5.2" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" @@ -66727,7 +66713,7 @@ in sources."is-arrayish-0.2.1" sources."is-callable-1.1.5" sources."is-date-object-1.0.2" - sources."is-finite-1.0.2" + sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."is-promise-2.1.0" sources."is-regex-1.0.5" @@ -68122,7 +68108,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.613.0" // { + (sources."aws-sdk-2.614.0" // { dependencies = [ sources."buffer-4.9.1" sources."uuid-3.3.2" @@ -70741,7 +70727,7 @@ in sources."ssb-friends-4.1.4" sources."ssb-gossip-1.1.1" sources."ssb-invite-2.1.4" - sources."ssb-keys-7.2.1" + sources."ssb-keys-7.2.2" sources."ssb-links-3.0.8" sources."ssb-local-1.0.0" sources."ssb-logging-1.0.0" @@ -70962,7 +70948,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.613.0" // { + (sources."aws-sdk-2.614.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -72622,29 +72608,28 @@ in textlint = nodeEnv.buildNodePackage { name = "textlint"; packageName = "textlint"; - version = "11.6.2"; + version = "11.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-11.6.2.tgz"; - sha512 = "jNW+e4pJ4MJAVciuK1UdG96tl8sAgLPJty+dRdOzDlNA5725xSohn4SQ0Iewv13EgnpXIRxy1SGaBNbv8nYT5Q=="; + url = "https://registry.npmjs.org/textlint/-/textlint-11.6.3.tgz"; + sha512 = "tTLLgB49zkJgq6GYDJOT6F31kHLulFjzovCHpN6ycv8d/aPcYl9vv7f/luR33YBQZdnGLtn+j8+G4GJAZ6Uz6w=="; }; dependencies = [ sources."@azu/format-text-1.0.1" sources."@azu/style-format-1.0.0" sources."@textlint/ast-node-types-4.2.5" sources."@textlint/ast-tester-2.1.6" - sources."@textlint/ast-traverse-2.1.6" + sources."@textlint/ast-traverse-2.1.7" sources."@textlint/feature-flag-3.1.6" - sources."@textlint/fixer-formatter-3.1.12" - sources."@textlint/kernel-3.2.0" - sources."@textlint/linter-formatter-3.1.11" - sources."@textlint/markdown-to-ast-6.1.6" + sources."@textlint/fixer-formatter-3.1.13" + sources."@textlint/kernel-3.2.1" + sources."@textlint/linter-formatter-3.1.12" + sources."@textlint/markdown-to-ast-6.1.7" sources."@textlint/module-interop-1.0.2" sources."@textlint/text-to-ast-3.1.7" - sources."@textlint/textlint-plugin-markdown-5.1.11" - sources."@textlint/textlint-plugin-text-4.1.12" - sources."@textlint/types-1.3.0" + sources."@textlint/textlint-plugin-markdown-5.1.12" + sources."@textlint/textlint-plugin-text-4.1.13" + sources."@textlint/types-1.3.1" sources."@textlint/utils-1.0.3" - sources."@types/bluebird-3.5.29" sources."ajv-4.11.8" sources."ajv-keywords-1.5.1" sources."ansi-regex-2.1.1" @@ -72652,7 +72637,6 @@ in sources."argparse-1.0.10" sources."bail-1.0.5" sources."balanced-match-1.0.0" - sources."bluebird-3.7.2" sources."boundary-1.0.1" sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" @@ -72926,7 +72910,7 @@ in }; dependencies = [ sources."@textlint/ast-node-types-4.2.5" - sources."@textlint/types-1.3.0" + sources."@textlint/types-1.3.1" sources."alex-5.1.0" sources."ansi-align-2.0.0" sources."ansi-regex-3.0.0" @@ -73017,7 +73001,7 @@ in sources."is-ci-1.2.1" sources."is-decimal-1.0.4" sources."is-empty-1.2.0" - sources."is-finite-1.0.2" + sources."is-finite-1.1.0" sources."is-fullwidth-code-point-2.0.0" sources."is-hexadecimal-1.0.4" sources."is-hidden-1.1.3" @@ -73361,7 +73345,7 @@ in }; dependencies = [ sources."@textlint/ast-node-types-4.2.5" - sources."@textlint/types-1.3.0" + sources."@textlint/types-1.3.1" sources."boundary-1.0.1" sources."buffer-from-1.1.1" sources."concat-stream-2.0.0" @@ -73447,14 +73431,14 @@ in textlint-rule-stop-words = nodeEnv.buildNodePackage { name = "textlint-rule-stop-words"; packageName = "textlint-rule-stop-words"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-2.0.0.tgz"; - sha512 = "JG06DCJv7i7UjEdFC39eS8uGdY4295wf3SzVvSVhKplQPsLu1LZdMCSON3uziDrLv4B1EEN7lRI9QHMXYTv/6Q=="; + url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-2.0.1.tgz"; + sha512 = "TUnOIMXl850Px9bl3H522UeeStmh92EYwXXnkMZOBIerHwFLG2KaaH+qGN+FaL0EugKj6WY8QKG6jOufGAiJsQ=="; }; dependencies = [ sources."@textlint/ast-node-types-4.2.5" - sources."@textlint/types-1.3.0" + sources."@textlint/types-1.3.1" sources."boundary-1.0.1" sources."lodash-4.17.15" sources."split-lines-2.0.0" @@ -73477,14 +73461,14 @@ in textlint-rule-terminology = nodeEnv.buildNodePackage { name = "textlint-rule-terminology"; packageName = "textlint-rule-terminology"; - version = "2.0.3"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-2.0.3.tgz"; - sha512 = "ehBBoW8E3pCv2TnNTIcQtBiyBDH/9T1om+qEuPq5vhUHpkf5+eRsfPIa9mbf8IhEnecuej5EJbDLX1LxhpA4hA=="; + url = "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-2.1.1.tgz"; + sha512 = "955Q289wCubt67iar/U3jnsPvwHkRhWnOM0gqE3fQDBMJkFsoDnYNummU8CmAPXK7usnbwa2r48q0s4FtATWbw=="; }; dependencies = [ sources."@textlint/ast-node-types-4.2.5" - sources."@textlint/types-1.3.0" + sources."@textlint/types-1.3.1" sources."boundary-1.0.1" sources."lodash-4.17.15" sources."strip-json-comments-3.0.1" @@ -73552,11 +73536,11 @@ in }; dependencies = [ sources."@textlint/ast-node-types-4.2.5" - sources."@textlint/types-1.3.0" + sources."@textlint/types-1.3.1" sources."adverb-where-0.0.9" sources."boundary-1.0.1" sources."define-properties-1.1.3" - sources."e-prime-0.10.2" + sources."e-prime-0.10.3" sources."function-bind-1.1.1" sources."has-symbols-1.0.1" sources."no-cliches-0.1.1" @@ -78380,7 +78364,7 @@ in sources."ms-2.1.2" ]; }) - sources."rimraf-3.0.1" + sources."rimraf-3.0.2" sources."run-parallel-1.1.9" sources."run-parallel-limit-1.0.5" sources."run-series-1.1.8" @@ -78495,7 +78479,7 @@ in dependencies = [ sources."adverb-where-0.2.1" sources."commander-2.20.3" - sources."e-prime-0.10.2" + sources."e-prime-0.10.3" sources."no-cliches-0.2.2" sources."passive-voice-0.1.0" sources."too-wordy-0.2.2" @@ -78813,7 +78797,7 @@ in sources."is-docker-1.1.0" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" - sources."is-finite-1.0.2" + sources."is-finite-1.1.0" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" sources."is-installed-globally-0.1.0" diff --git a/pkgs/development/ocaml-modules/npy/default.nix b/pkgs/development/ocaml-modules/npy/default.nix new file mode 100644 index 000000000000..87fd72b7567a --- /dev/null +++ b/pkgs/development/ocaml-modules/npy/default.nix @@ -0,0 +1,27 @@ +{ lib, buildDunePackage, fetchFromGitHub, numpy, camlzip }: + +buildDunePackage rec { + pname = "npy"; + version = "unstable-2019-04-02"; + + minimumOCamlVersion = "4.06"; + + src = fetchFromGitHub { + owner = "LaurentMazare"; + repo = "${pname}-ocaml"; + rev = "c051086bfea6bee58208098bcf1c2f725a80a1fb"; + sha256 = "06mgrnm7xiw2lhqvbdv2zmd65sqfdnjd7j4qmcswanmplm17yhvb"; + }; + + propagatedBuildInputs = [ camlzip ]; + checkInputs = [ numpy ]; + + doCheck = true; + + meta = with lib; { + inherit (src.meta) homepage; + description = "OCaml implementation of the Npy format spec"; + maintainers = [ maintainers.bcdarwin ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix index ba941503548c..2bc3ed760934 100644 --- a/pkgs/development/python-modules/arviz/default.nix +++ b/pkgs/development/python-modules/arviz/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, bokeh , emcee , matplotlib , netcdf4 @@ -21,13 +22,13 @@ buildPythonPackage rec { pname = "arviz"; - version = "0.5.1"; + version = "0.6.1"; src = fetchFromGitHub { owner = "arviz-devs"; repo = "arviz"; rev = version; - sha256 = "0p600cakix24wz2ridnzy6sp3l1p2kr5s60qc7s82wpv7fw0i9ry"; + sha256 = "1qc4piz18hfik32gj4v65ckwv516mppq2ac0jyqs21lhqfwbgv9w"; }; propagatedBuildInputs = [ @@ -45,6 +46,7 @@ buildPythonPackage rec { ]; checkInputs = [ + bokeh emcee numba pytest diff --git a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix index 0a485f05f910..274cb181d2d2 100644 --- a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix @@ -28,8 +28,7 @@ buildPythonPackage rec { ]; postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py + rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py ''; # has no tests @@ -39,6 +38,6 @@ buildPythonPackage rec { description = "This is the Microsoft Azure Application Insights Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ mwilsoninsight ]; + maintainers = with maintainers; [ jonringer mwilsoninsight ]; }; } diff --git a/pkgs/development/python-modules/capstone/default.nix b/pkgs/development/python-modules/capstone/default.nix index 035632f9cf25..7fc0b16522ed 100644 --- a/pkgs/development/python-modules/capstone/default.nix +++ b/pkgs/development/python-modules/capstone/default.nix @@ -3,43 +3,33 @@ , fetchPypi , fetchpatch , setuptools +, capstone }: buildPythonPackage rec { pname = "capstone"; - version = "3.0.5.post1"; + version = stdenv.lib.getVersion capstone; - setupPyBuildFlags = [ - "--plat-name x86_64-linux" - ]; - - src = fetchPypi { - inherit pname version; - sha256 = "3c0f73db9f8392f7048c8a244809f154d7c39f354e2167f6c477630aa517ed04"; - }; - - propagatedBuildInputs = [ setuptools ]; - - patches = [ - (fetchpatch { - stripLen = 2; - url = "https://patch-diff.githubusercontent.com/raw/aquynh/capstone/pull/783/commits/23fe9f36622573c747e2bab6119ff245437bf276.patch"; - sha256 = "0yizqrdlxqxn16873593kdx2vrr7gvvilhgcf9xy6hr0603d3m5r"; - }) - ]; + src = capstone.src; + sourceRoot = "${capstone.name}/bindings/python"; postPatch = '' - patchShebangs src/make.sh + ln -s ${capstone}/lib/libcapstone${stdenv.targetPlatform.extensions.sharedLibrary} prebuilt/ + ln -s ${capstone}/lib/libcapstone.a prebuilt/ ''; - preCheck = '' - mv src/libcapstone.so capstone + propagatedBuildInputs = [ setuptools ]; + + checkPhase = '' + mv capstone capstone.hidden + patchShebangs test_* + make check ''; meta = with stdenv.lib; { homepage = "http://www.capstone-engine.org/"; license = licenses.bsdOriginal; - description = "Capstone disassembly engine"; - maintainers = with maintainers; [ bennofs ]; + description = "Python bindings for Capstone disassembly engine"; + maintainers = with maintainers; [ bennofs ris ]; }; } diff --git a/pkgs/development/python-modules/cfn-flip/default.nix b/pkgs/development/python-modules/cfn-flip/default.nix index ab6abc4cd6f6..da04ecf68897 100644 --- a/pkgs/development/python-modules/cfn-flip/default.nix +++ b/pkgs/development/python-modules/cfn-flip/default.nix @@ -1,25 +1,55 @@ -{ lib, buildPythonPackage, fetchPypi, six, pyyaml, click, pytestrunner }: +{ buildPythonPackage +, fetchFromGitHub +, lib + +# pythonPackages +, click +, pytest +, pytestcov +, pytestrunner +, pyyaml +, six +}: buildPythonPackage rec { pname = "cfn-flip"; - version = "1.1.0.post1"; + version = "1.2.2"; - src = fetchPypi { - pname = "cfn_flip"; - inherit version; - sha256 = "16r01ijjwnq06ax5xrv6mq9l00f6sgzw776kr43zjai09xsbwwck"; + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-cfn-template-flip"; + rev = version; + sha256 = "05fk725a1i3zl3idik2hxl3w6k1ln0j33j3jdq1gvy1sfyc79ifm"; }; - propagatedBuildInputs = [ six pyyaml click ]; - nativeBuildInputs = [ pytestrunner ]; + propagatedBuildInputs = [ + click + pyyaml + six + ]; + + checkInputs = [ + pytest + pytestcov + pytestrunner + ]; - # No tests in Pypi - doCheck = false; + checkPhase = '' + py.test \ + --cov=cfn_clean \ + --cov=cfn_flip \ + --cov=cfn_tools \ + --cov-report term-missing \ + --cov-report html + ''; meta = with lib; { description = "Tool for converting AWS CloudFormation templates between JSON and YAML formats"; - homepage = https://github.com/awslabs/aws-cfn-template-flip; + homepage = "https://github.com/awslabs/aws-cfn-template-flip"; license = licenses.asl20; - maintainers = with maintainers; [ psyanticy ]; + maintainers = with maintainers; [ + kamadorueda + psyanticy + ]; }; } diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 5426a609449d..443d96b097a1 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage , fetchPypi, isPy3k, linuxPackages -, fastrlock, numpy, six, wheel, pytest, mock +, fastrlock, numpy, six, wheel, pytest, mock, setuptools , cudatoolkit, cudnn, nccl }: @@ -18,6 +18,10 @@ buildPythonPackage rec { mock ]; + preConfigure = '' + export CUDA_PATH=${cudatoolkit} + ''; + propagatedBuildInputs = [ cudatoolkit cudnn @@ -26,12 +30,15 @@ buildPythonPackage rec { fastrlock numpy six + setuptools wheel ]; # In python3, test was failed... doCheck = !isPy3k; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "A NumPy-compatible matrix library accelerated by CUDA"; homepage = https://cupy.chainer.org/; diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index 093a30d29dab..7d293edba35a 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -1,19 +1,28 @@ -{ lib, buildPythonPackage, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 }: buildPythonPackage rec { - version = "1.3.3"; + version = "1.4.0"; pname = "elementpath"; + disabled = isPy27; # uses incompatible class syntax src = fetchFromGitHub { owner = "sissaschool"; repo = "elementpath"; rev = "v${version}"; - sha256 = "05wplh836ffwhncf5rpdnz4g1b3mqw7jiy83352nw4x3aak4ifbr"; + sha256 = "1fmwy7plcgxam09cx3z11068k0c98wcsgclmxdq8chsd6id3632y"; }; # avoid circular dependency with xmlschema which directly depends on this doCheck = false; + pythonImportsCheck = [ + "elementpath.xpath1_parser" + "elementpath.xpath2_parser" + "elementpath.xpath2_functions" + "elementpath.xpath_context" + "elementpath.xpath_selectors" + ]; + meta = with lib; { description = "XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"; homepage = "https://github.com/sissaschool/elementpath"; diff --git a/pkgs/development/python-modules/fluidasserts/default.nix b/pkgs/development/python-modules/fluidasserts/default.nix index 78405ed8a660..f1f5397c0a82 100644 --- a/pkgs/development/python-modules/fluidasserts/default.nix +++ b/pkgs/development/python-modules/fluidasserts/default.nix @@ -75,7 +75,6 @@ buildPythonPackage rec { substituteInPlace ./setup.py \ --replace 'tlslite-ng==0.8.0-alpha36' 'tlslite-ng==0.7.5' \ --replace 'boto3==1.11.7' 'boto3==1.10.1' \ - --replace 'cfn-flip==1.2.2' 'cfn-flip==1.1.0.post1' \ --replace 'typed-ast==1.4.1' 'typed-ast==1.4.0' \ --replace 'pillow==7.0.0' 'pillow==6.2.1' \ diff --git a/pkgs/development/python-modules/gunicorn/19.nix b/pkgs/development/python-modules/gunicorn/19.nix new file mode 100644 index 000000000000..f9681eef97e3 --- /dev/null +++ b/pkgs/development/python-modules/gunicorn/19.nix @@ -0,0 +1,39 @@ +{ stdenv, buildPythonPackage, fetchPypi +, coverage +, mock +, pytest +, pytestcov +, setuptools +}: + +buildPythonPackage rec { + pname = "gunicorn"; + version = "19.10.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1080jk1ly8j0rc6lv8i33sj94rxjaskd1732cdq5chdqb3ij9ppr"; + }; + + propagatedBuildInputs = [ setuptools ]; + + checkInputs = [ pytest mock pytestcov coverage ]; + + prePatch = '' + substituteInPlace requirements_test.txt --replace "==" ">=" \ + --replace "coverage>=4.0,<4.4" "coverage" + ''; + + # better than no tests + checkPhase = '' + $out/bin/gunicorn --help > /dev/null + ''; + + pythonImportsCheck = [ "gunicorn" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/benoitc/gunicorn"; + description = "WSGI HTTP Server for UNIX"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix index 75a3d745a3f5..8bdc42969032 100644 --- a/pkgs/development/python-modules/gunicorn/default.nix +++ b/pkgs/development/python-modules/gunicorn/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "gunicorn" ]; meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/gunicorn; + homepage = "https://github.com/benoitc/gunicorn"; description = "WSGI HTTP Server for UNIX"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 9f5a086f2ee5..c7631f0c5b25 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -1,23 +1,34 @@ -{ lib, buildPythonPackage, fetchFromGitHub, git, - attrs, future, peewee, h11, h2, atomicwrites, pycryptodome, sphinx, Logbook, jsonschema, - python-olm, unpaddedbase64, aiohttp, cachetools }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, git +, attrs +, future +, aiohttp +, aiofiles +, h11 +, h2 +, Logbook +, jsonschema +, unpaddedbase64 +, pycryptodome +, python-olm +, peewee +, cachetools +, atomicwrites +}: buildPythonPackage rec { pname = "nio"; - version = "0.6"; + version = "0.7.1"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - sha256 = "0pq5i6ks3pck2kq9m4p3pw9hbvkzs27xkyv68mjnfc6chp2g2mg9"; + sha256 = "05cggfhsfa0irvzc7x3fndv6n0zszxxhmlv89r5rkrl5wvrhbb2h"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace 'python-olm>=3.1.0' "" - ''; - nativeBuildInputs = [ git ]; @@ -25,18 +36,18 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs future - peewee + aiohttp + aiofiles h11 h2 - atomicwrites - pycryptodome - sphinx Logbook jsonschema - python-olm unpaddedbase64 - aiohttp + pycryptodome + python-olm + peewee cachetools + atomicwrites ]; doCheck = false; @@ -45,6 +56,6 @@ buildPythonPackage rec { description = "A Python Matrix client library, designed according to sans I/O principles"; homepage = "https://github.com/poljar/matrix-nio"; license = licenses.isc; - maintainers = [ maintainers.tilpner ]; + maintainers = with maintainers; [ tilpner emily ]; }; } diff --git a/pkgs/development/python-modules/msrest/default.nix b/pkgs/development/python-modules/msrest/default.nix index 70fa6f361ca6..6f53314bd287 100644 --- a/pkgs/development/python-modules/msrest/default.nix +++ b/pkgs/development/python-modules/msrest/default.nix @@ -18,7 +18,7 @@ }: buildPythonPackage rec { - version = "0.6.10"; + version = "0.6.11"; pname = "msrest"; # no tests in PyPI tarball @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Azure"; repo = "msrest-for-python"; rev = "v${version}"; - sha256 = "1l08daq748lk8rwiv4jdlnmfl9mi7g1ln46gibhnd9xvrrjp0sdx"; + sha256 = "1lq3bf7kzs9h9sk6ahpf0vidklv0ahx3bm4wpv3qka3jb64yqdmi"; }; propagatedBuildInputs = [ @@ -46,7 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "The runtime library 'msrest' for AutoRest generated Python clients."; - homepage = https://github.com/Azure/msrest-for-python; + homepage = "https://github.com/Azure/msrest-for-python"; license = licenses.mit; maintainers = with maintainers; [ bendlas jonringer mwilsoninsight ]; }; diff --git a/pkgs/development/python-modules/pytest-black/black-version.patch b/pkgs/development/python-modules/pytest-black/black-version.patch deleted file mode 100644 index 93bb4180930c..000000000000 --- a/pkgs/development/python-modules/pytest-black/black-version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index 5c9ce5f..84b148a 100644 ---- a/setup.py -+++ b/setup.py -@@ -26,6 +26,6 @@ setup( - python_requires=">=2.7", - install_requires=[ - "pytest>=3.5.0", -- 'black==19.3b0; python_version >= "3.6"', -+ 'black; python_version >= "3.6"', - "toml", - ], - use_scm_version=True, \ No newline at end of file diff --git a/pkgs/development/python-modules/pytest-black/default.nix b/pkgs/development/python-modules/pytest-black/default.nix index b129f9eec4b3..1f01e7fb65fd 100644 --- a/pkgs/development/python-modules/pytest-black/default.nix +++ b/pkgs/development/python-modules/pytest-black/default.nix @@ -7,14 +7,13 @@ buildPythonPackage rec { pname = "pytest-black"; - version = "0.3.7"; + version = "0.3.8"; src = fetchPypi { inherit pname version; - sha256 = "03gwwy1h3qnfh6vpfhgsa5ag53a9sw1g42sc2s8a2hilwb7yrfvm"; + sha256 = "04lppqydxm0f3f3x0l8hj7v0j6d8syj34jc37yzqwqcyqsnaga81"; }; - patches = [ ./black-version.patch ]; nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ black pytest toml ]; diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix index ec126e963b01..a1b9eae398df 100644 --- a/pkgs/development/python-modules/sparse/default.nix +++ b/pkgs/development/python-modules/sparse/default.nix @@ -35,6 +35,5 @@ buildPythonPackage rec { homepage = https://github.com/pydata/sparse/; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; - broken = true; }; } diff --git a/pkgs/development/python-modules/tensorly/default.nix b/pkgs/development/python-modules/tensorly/default.nix new file mode 100644 index 000000000000..33aca636f45f --- /dev/null +++ b/pkgs/development/python-modules/tensorly/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest +, nose +, isPy27 +, numpy +, scipy +, sparse +, pytorch +}: + +buildPythonPackage rec { + pname = "tensorly"; + version = "0.4.5"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "1ml91yaxwx4msisxbm92yf22qfrscvk58f3z2r1jhi96pw2k4i7x"; + }; + + propagatedBuildInputs = [ numpy scipy sparse ]; + checkInputs = [ pytest nose pytorch ]; + # also has a cupy backend, but the tests are currently broken + # (e.g. attempts to access cupy.qr instead of cupy.linalg.qr) + # and this backend also adds a non-optional CUDA dependence, + # as well as tensorflow and mxnet backends, but the tests don't + # seem to exercise these backend by default + + checkPhase = '' + runHook preCheck + nosetests -e "test_cupy" + runHook postCheck + ''; + + meta = with lib; { + description = "Tensor learning in Python"; + homepage = https://tensorly.org/; + license = licenses.bsd3; + maintainers = [ maintainers.bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/wordcloud/default.nix b/pkgs/development/python-modules/wordcloud/default.nix new file mode 100644 index 000000000000..759e48eb997e --- /dev/null +++ b/pkgs/development/python-modules/wordcloud/default.nix @@ -0,0 +1,43 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub +, codecov, coverage +, flake8 +, matplotlib +, mock +, numpy +, pillow +, pytest +, pytestcov +, pytest-sugar +, setuptools +, twine +, wheel +}: + +buildPythonPackage rec { + pname = "word_cloud"; + version = "1.6.0"; + + # tests are not included in pypi tarball + src = fetchFromGitHub { + owner = "amueller"; + repo = pname; + rev = version; + sha256 = "1ncjr90m3w3b4zi23kw6ai11gxahdyah96x8jb2yn2x4573022x2"; + }; + + propagatedBuildInputs = [ matplotlib numpy pillow ]; + + # Tests require extra dependencies + checkInputs = [ codecov coverage flake8 mock pytest pytestcov pytest-sugar setuptools twine wheel ]; + # skip tests which make assumptions about installation + checkPhase = '' + pytest -k 'not cli_as_executable' + ''; + + meta = with stdenv.lib; { + description = "A little word cloud generator in Python"; + homepage = "https://github.com/amueller/word_cloud"; + license = licenses.mit; + maintainers = with maintainers; [ jm2dev ]; + }; +} diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index 788ccc0ed81b..d3db09bc022e 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -4,30 +4,33 @@ }: buildPythonPackage rec { - version = "1.0.18"; + version = "1.1.0"; pname = "xmlschema"; src = fetchFromGitHub { owner = "sissaschool"; repo = "xmlschema"; rev = "v${version}"; - sha256 = "1pwq2sfh7klcxismsqzgw80cp3cdkq9wv8x9g3h1zx1p66xpas9p"; + sha256 = "1h8321jb6q3dhlh3608y3f3sbbzfd3jg1psyirxkrm4w5xs3lbvy"; }; propagatedBuildInputs = [ elementpath ]; checkInputs = [ pytest ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "elementpath~=1.4.0" "elementpath~=1.4" + ''; + # Ignore broken fixtures, and tests for files which don't exist. # For darwin, we need to explicity say we can't reach network checkPhase = '' - substituteInPlace xmlschema/tests/__init__.py \ - --replace "SKIP_REMOTE_TESTS = " "SKIP_REMOTE_TESTS = True #" - pytest . \ - --ignore=xmlschema/tests/test_factory.py \ - --ignore=xmlschema/tests/test_memory.py \ - --ignore=xmlschema/tests/test_validators.py \ - --ignore=xmlschema/tests/test_schemas.py \ + pytest tests \ + --ignore=tests/test_factory.py \ + --ignore=tests/test_schemas.py \ + --ignore=tests/test_memory.py \ + --ignore=tests/test_validation.py \ -k 'not element_tree_import_script' ''; diff --git a/pkgs/development/tools/gnome-desktop-testing/default.nix b/pkgs/development/tools/gnome-desktop-testing/default.nix index 8f9b9ddf0b55..e0dc9ecda80a 100644 --- a/pkgs/development/tools/gnome-desktop-testing/default.nix +++ b/pkgs/development/tools/gnome-desktop-testing/default.nix @@ -1,25 +1,39 @@ -{ stdenv, glib, autoreconfHook, pkgconfig, systemd, fetchgit }: +{ stdenv +, glib +, autoreconfHook +, pkgconfig +, systemd +, fetchFromGitLab +}: stdenv.mkDerivation rec { - version = "2018.1"; pname = "gnome-desktop-testing"; + version = "unstable-2019-12-11"; - src = fetchgit { - url = https://gitlab.gnome.org/GNOME/gnome-desktop-testing.git; - rev = "v${version}"; - sha256 = "1bcd8v101ynsv2p5swh30hnajjf6z8dxzd89h9racp847hgjgyxc"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "gnome-desktop-testing"; + rev = "57239dc8ef49ba74d442603a07a3e132b0cfdc6a"; + sha256 = "01c4jhpk23kfcnw3l9kfwjw9v5kgqmfhhqypw4k2d2sdkf4mgfv4"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ + autoreconfHook + pkgconfig + ]; - buildInputs = [ glib systemd ]; + buildInputs = [ + glib + systemd + ]; enableParallelBuilding = true; meta = with stdenv.lib; { - description = "GNOME OSTree testing code"; - homepage = https://live.gnome.org/Initiatives/GnomeGoals/InstalledTests; - license = licenses.lgpl21; + description = "GNOME test runner for installed tests"; + homepage = "https://wiki.gnome.org/Initiatives/GnomeGoals/InstalledTests"; + license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.jtojnar ]; }; diff --git a/pkgs/development/tools/gofumpt/default.nix b/pkgs/development/tools/gofumpt/default.nix index 221058a461ef..5ca0d6cb1e03 100644 --- a/pkgs/development/tools/gofumpt/default.nix +++ b/pkgs/development/tools/gofumpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gofumpt"; - version = "2019-07-29"; + version = "2019-11-11"; src = fetchFromGitHub { owner = "mvdan"; repo = pname; - rev = "96300e3d49fbb3b7bc9c6dc74f8a5cc0ef46f84b"; - sha256 = "169hwggbhlr6ga045d6sa7xsan3mnj19qbh63i3h4rynqlppzvpf"; + rev = "eb442649d62000da5d11671f3beb1afa1b746fd7"; + sha256 = "1cw9mmavxz8gxzzwsllvf5lwb2wwi19jbc7hcwxsi4ywp7a84gh0"; }; - modSha256 = "1g7dkl60zwlk4q2gwx2780xys8rf2c4kqyy8gr99s5y342wsbx2g"; + modSha256 = "1ladpxhr90awnms2qmlm2lz91wyh92fl3rqbfr54qngrkpkpbhr2"; meta = with lib; { description = "A stricter gofmt"; diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index 59416f031346..430f17bfb5b0 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -40,9 +40,8 @@ buildGoModule rec { # Set GOTOOLDIR for derivations adding this to buildInputs postInstall = '' mkdir -p $out/nix-support - substituteAll ${../../go-modules/tools/setup-hook.sh} $out/nix-support/setup-hook.tmp - cat $out/nix-support/setup-hook.tmp >> $out/nix-support/setup-hook - rm $out/nix-support/setup-hook.tmp + substitute ${../../go-modules/tools/setup-hook.sh} $out/nix-support/setup-hook \ + --subst-var-by bin $out ''; # Do not copy this without a good reason for enabling diff --git a/pkgs/development/tools/nsis/default.nix b/pkgs/development/tools/nsis/default.nix index f8beae4d527a..683d07ed4964 100644 --- a/pkgs/development/tools/nsis/default.nix +++ b/pkgs/development/tools/nsis/default.nix @@ -2,23 +2,24 @@ stdenv.mkDerivation rec { pname = "nsis"; - version = "3.04"; + version = "3.05"; src = fetchurl { url = "mirror://sourceforge/project/nsis/NSIS%203/${version}/nsis-${version}-src.tar.bz2"; - sha256 = "1xgllk2mk36ll2509hd31mfq6blgncmdzmwxj3ymrwshdh23d5b0"; + sha256 = "1sbwx5vzpddharkb7nj4q5z3i5fbg4lan63ng738cw4hmc4v7qdn"; }; srcWinDistributable = fetchzip { url = "mirror://sourceforge/project/nsis/NSIS%203/${version}/nsis-${version}.zip"; - sha256 = "1g31vz73x4d3cmsw2wfk43qa06bpqp5815fb5qq9vmwms6hym6y2"; + sha256 = "0i3pzdilyy5g0r2c92pd2jl92ji9f75vv98mndzq8vw03a34yh3q"; }; postUnpack = '' mkdir -p $out/share/nsis cp -avr ${srcWinDistributable}/{Contrib,Include,Plugins,Stubs} \ $out/share/nsis + chmod -R u+w $out/share/nsis ''; nativeBuildInputs = [ scons ]; diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 00ffa9d1d62b..ae4302b74291 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -16,12 +16,12 @@ let ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "7.0.5"; + version = "7.0.6"; src = fetchurl { url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb"; - sha256 = "1zcxldfi4rxg7rr6r588blhihyh7ggcdy32vwzjklgq7ihsvx5bs"; + sha256 = "125g40micavq5js5l7lpv01yl8635dwg240vldz8i2riqj65inq8"; }; nativeBuildInputs = |