diff options
Diffstat (limited to 'pkgs')
71 files changed, 1367 insertions, 389 deletions
diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index a61f7dc0a905..680694aa403d 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fftw, qtbase, qtmultimedia, qmake +{ stdenv, mkDerivation, fetchFromGitHub, fftw, qtbase, qtmultimedia, qmake, itstool, wrapQtAppsHook , alsaSupport ? true, alsaLib ? null , jackSupport ? false, libjack2 ? null , portaudioSupport ? false, portaudio ? null }: @@ -9,18 +9,18 @@ assert portaudioSupport -> portaudio != null; with stdenv.lib; -stdenv.mkDerivation rec { - name = "fmit-${version}"; - version = "1.1.14"; +mkDerivation rec { + pname = "fmit"; + version = "1.2.6"; src = fetchFromGitHub { - sha256 = "18gvl8smcnigzldy1acs5h8rscf287b39xi4y2cl5armqbj0y38x"; - rev = "v${version}"; - repo = "fmit"; owner = "gillesdegottex"; + repo = "fmit"; + rev = "v${version}"; + sha256 = "03nzkig5mw2rqwhwmg0qvc5cnk9bwh2wp13jh0mdrr935w0587mz"; }; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ qmake itstool wrapQtAppsHook ]; buildInputs = [ fftw qtbase qtmultimedia ] ++ optionals alsaSupport [ alsaLib ] ++ optionals jackSupport [ libjack2 ] diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 464552584a45..e4d508b2a1f5 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -15,13 +15,12 @@ , gobject-introspection , wrapGAppsHook , lastFMSupport ? true -, wikipediaSupport ? true -, youtubeSupport ? true, youtube-dl +, youtubeSupport ? true }: python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.1.4.2"; + version = "1.1.4.14"; format = "other"; doCheck = false; @@ -30,7 +29,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "0rn3q7xslqq5hw4wb739ywg5dr99xpkbmyw80y84rsg0wfrwbjlc"; + sha256 = "004cwbnxss6vmdsc6i0y83h3xbc2bzc0ra4z99pkizkky2mz6swj"; }; nativeBuildInputs = [ @@ -64,7 +63,6 @@ python3.pkgs.buildPythonApplication rec { pygobject3 ] ++ lib.optional lastFMSupport pylast - ++ lib.optional wikipediaSupport wikipedia ++ lib.optional youtubeSupport youtube-dl ; diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix index 322a4e238461..7c4520967850 100644 --- a/pkgs/applications/audio/pamixer/default.nix +++ b/pkgs/applications/audio/pamixer/default.nix @@ -1,27 +1,20 @@ { stdenv, fetchFromGitHub, fetchpatch, boost, libpulseaudio }: stdenv.mkDerivation rec { - name = "pamixer-${version}"; - version = "1.3.1"; + pname = "pamixer"; + version = "1.4"; src = fetchFromGitHub { owner = "cdemoulins"; repo = "pamixer"; rev = version; - sha256 = "15zs2x4hnrpxphqn542b6qqm4ymvhkvbcfyffy69d6cki51chzzw"; + sha256 = "1i14550n8paijwwnhksv5izgfqm3s5q2773bdfp6vyqybkll55f7"; }; - # Remove after https://github.com/cdemoulins/pamixer/pull/16 gets fixed - patches = [(fetchpatch { - url = "https://github.com/oxij/pamixer/commit/dea1cd967aa837940e5c0b04ef7ebc47a7a93d63.patch"; - sha256 = "0s77xmsiwywyyp6f4bjxg1sqdgms1k5fiy7na6ws0aswshfnzfjb"; - })]; - buildInputs = [ boost libpulseaudio ]; installPhase = '' - mkdir -p $out/bin - cp pamixer $out/bin + install -Dm755 pamixer -t $out/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 97ea383c0c72..f57c1b71b13d 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -73,6 +73,23 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac propagatedUserEnvPkgs = old.propagatedUserEnvPkgs ++ [ external.elpy ]; }); + emacsql-sqlite = super.emacsql-sqlite.overrideAttrs(old: { + buildInputs = old.buildInputs ++ [ pkgs.sqlite ]; + + postBuild = '' + cd source/sqlite + make + cd - + ''; + + postInstall = '' + install -m=755 -D source/sqlite/emacsql-sqlite \ + $out/share/emacs/site-lisp/elpa/emacsql-sqlite-${old.version}/sqlite/emacsql-sqlite + ''; + + stripDebugList = [ "share" ]; + }); + evil-magit = super.evil-magit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 27c956dcd14e..f90e17a6065b 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { sha256 = "19x000m3jwnkqgi6ic81lkzyjvvxcfacw2j0vcfcaknvvagzhyhb"; }; - hunspellDictionaries = with stdenv.lib; filter isDerivation (attrValues hunspellDicts); + hunspellDictionaries = with stdenv.lib; filter isDerivation (unique (attrValues hunspellDicts)); mathJaxSrc = fetchurl { url = https://s3.amazonaws.com/rstudio-buildtools/mathjax-26.zip; diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 02af754a72c6..3f922530e73e 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "11.1.1"; + version = "11.1.4"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "1jibkxx00rma641c3xr7720qj9slqsvhbpi7nawi6f2f91gzyc10"; + sha256 = "0ca8wkkdr7kbb8il84nq05qgd5ykjq15fdv9432wr5p9xmqixz1q"; }; nativeBuildInputs = [ @@ -70,18 +70,18 @@ stdenv.mkDerivation rec { # Application icon mkdir -p $out/share/icons/hicolor - cp -r usr/share/icons/hicolor/0x0 $out/share/icons/hicolor/1024x1024 + cp -r usr/share/icons/hicolor/* $out/share/icons/hicolor/ # XDG desktop item cp -r usr/share/applications $out/share/applications # Symlink wrapper mkdir -p $out/bin - ln -s $out/share/draw.io/draw.io $out/bin/draw.io + ln -s $out/share/draw.io/drawio $out/bin/drawio # Update binary path - substituteInPlace $out/share/applications/draw.io.desktop \ - --replace /opt/draw.io/draw.io $out/bin/draw.io + substituteInPlace $out/share/applications/drawio.desktop \ + --replace /opt/draw.io/drawio $out/bin/drawio ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 02fc2f3a5758..07538f749e8f 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -1,20 +1,29 @@ -{ buildGoPackage +{ buildGoModule , fetchFromGitHub , lib }: -buildGoPackage rec { +buildGoModule rec { pname = "wtf"; - version = "0.17.1"; + version = "0.19.1"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "1qiwl6z5rraspjqry8dwnx8fgl9vv70sn5kgvh8074vl651yjq8c"; + sha256 = "19qzg5blqm5p7rrnaqh4f9aj53i743mawjnd1h9lfahbgmil1d24"; }; - goPackagePath = "github.com/wtfutil/wtf"; + modSha256 = "1q21pc4yyiq4dihsb9n7261ssj52nnik8dq6fg4gvlnnpgcjp570"; + + # As per https://github.com/wtfutil/wtf/issues/501, one of the + # dependencies can't be fetched, so vendored dependencies should + # be used instead + modBuildPhase = '' + runHook preBuild + make build -mod=vendor + runHook postBuild + ''; meta = with lib; { description = "The personal information dashboard for your terminal"; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 3e63389be02d..45c125985120 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -13,7 +13,7 @@ , bison, gperf , glib, gtk3, dbus-glib , glibc -, libXScrnSaver, libXcursor, libXtst, libGLU_combined +, libXScrnSaver, libXcursor, libXtst, libGLU_combined, libGL , protobuf, speechd, libXdamage, cups , ffmpeg, libxslt, libxml2, at-spi2-core , jdk @@ -309,6 +309,13 @@ let targets = extraAttrs.buildTargets or []; commands = map buildCommand targets; in concatStringsSep "\n" commands; + + postFixup = '' + # Make sure that libGLESv2 is found by dlopen (if using EGL). + chromiumBinary="$libExecPath/$packageName" + origRpath="$(patchelf --print-rpath "$chromiumBinary")" + patchelf --set-rpath "${libGL}/lib:$origRpath" "$chromiumBinary" + ''; }; # Remove some extraAttrs we supplied to the base attributes already. diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 6632b116fc35..1afe4dcea02e 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -300,7 +300,8 @@ stdenv.mkDerivation rec { # Clear out some files that tend to capture store references but are # easily generated by firefox at startup. - rm -f "\$HOME/TorBrowser/Data/Browser/profile.default"/{compatibility.ini,extensions.ini,extensions.json} + rm -f "\$HOME/TorBrowser/Data/Browser/profile.default"/{addonStartup.json.lz4,compatibility.ini,extensions.ini,extensions.json} + rm -f "\$HOME/TorBrowser/Data/Browser/profile.default"/startupCache/* # XDG : "\''${XDG_RUNTIME_DIR:=/run/user/\$(id -u)}" diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 2367c0a98553..b06edaf9dcbe 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -17,11 +17,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "2.6.1566.49-1"; + version = "2.6.1566.51-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "1hl7aqq3i6mkkg7sdcax26kn08p8mqwlq4xpg4v05ivdvyh5ac9d"; + sha256 = "0582f16saldgn482806f9igb97is4p3ayvh99j0wx9plxnyq5xmm"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/cluster/prow/13918-fix-go-sum.patch b/pkgs/applications/networking/cluster/prow/13918-fix-go-sum.patch new file mode 100644 index 000000000000..ae407727b9d4 --- /dev/null +++ b/pkgs/applications/networking/cluster/prow/13918-fix-go-sum.patch @@ -0,0 +1,22 @@ +From b0ab95b9664916618ebf5fe637b1bc4de4ba9a6e Mon Sep 17 00:00:00 2001 +From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com> +Date: Wed, 14 Aug 2019 23:07:51 -0700 +Subject: [PATCH] fix the hash of gomodules.xyz/jsonpatch/v2 + +--- + go.sum | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/go.sum b/go.sum +index 6bb130b4d9b..b3f48a85d4a 100644 +--- a/go.sum ++++ b/go.sum +@@ -452,7 +452,7 @@ golang.org/x/tools v0.0.0-20190312170243-e65039ee4138 h1:H3uGjxCR/6Ds0Mjgyp7LMK8 + golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= + golang.org/x/tools v0.0.0-20190404132500-923d25813098 h1:MtqjsZmyGRgMmLUgxnmMJ6RYdvd2ib8ipiayHhqSxs4= + golang.org/x/tools v0.0.0-20190404132500-923d25813098/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +-gomodules.xyz/jsonpatch/v2 v2.0.0 h1:lHNQverf0+Gm1TbSbVIDWVXOhZ2FpZopxRqpr2uIjs4= ++gomodules.xyz/jsonpatch/v2 v2.0.0 h1:OyHbl+7IOECpPKfVK42oFr6N7+Y2dR+Jsb/IiDV3hOo= + gomodules.xyz/jsonpatch/v2 v2.0.0/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU= + google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= + google.golang.org/api v0.0.0-20181021000519-a2651947f503/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= diff --git a/pkgs/applications/networking/cluster/prow/default.nix b/pkgs/applications/networking/cluster/prow/default.nix new file mode 100644 index 000000000000..1c802802c096 --- /dev/null +++ b/pkgs/applications/networking/cluster/prow/default.nix @@ -0,0 +1,71 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "prow-unstable"; + version = "2019-08-14"; + rev = "35a7744f5737bbc1c4e1256a9c9c5ad135c650e4"; + + src = fetchFromGitHub { + inherit rev; + + owner = "kubernetes"; + repo = "test-infra"; + sha256 = "07kdlzrj59xyaa73vlx4s50fpg0brrkb0h0cyjgx81a0hsc7s03k"; + }; + + patches = [ + # https://github.com/kubernetes/test-infra/pull/13918 + ./13918-fix-go-sum.patch + ]; + + modSha256 = "06q1zvhm78k64aj475k1xl38h7nk83mysd0bja0wknja048ymgsq"; + + subPackages = [ + "./prow/cmd/admission" + "./prow/cmd/artifact-uploader" + "./prow/cmd/branchprotector" + "./prow/cmd/build" + "./prow/cmd/checkconfig" + "./prow/cmd/clonerefs" + "./prow/cmd/config-bootstrapper" + "./prow/cmd/crier" + "./prow/cmd/deck" + "./prow/cmd/entrypoint" + "./prow/cmd/gcsupload" + "./prow/cmd/gerrit" + "./prow/cmd/hook" + "./prow/cmd/horologium" + "./prow/cmd/initupload" + "./prow/cmd/jenkins-operator" + "./prow/cmd/mkbuild-cluster" + "./prow/cmd/mkpj" + "./prow/cmd/mkpod" + "./prow/cmd/peribolos" + "./prow/cmd/phaino" + "./prow/cmd/phony" + "./prow/cmd/pipeline" + "./prow/cmd/plank" + "./prow/cmd/sidecar" + "./prow/cmd/sinker" + "./prow/cmd/status-reconciler" + "./prow/cmd/sub" + "./prow/cmd/tackle" + "./prow/cmd/tide" + "./prow/cmd/tot" + ]; + + meta = with lib; { + description = "Prow is a Kubernetes based CI/CD system"; + longDescription = '' + Prow is a Kubernetes based CI/CD system. Jobs can be triggered by various + types of events and report their status to many different services. In + addition to job execution, Prow provides GitHub automation in the form of + policy enforcement, chat-ops via /foo style commands, and automatic PR + merging. + ''; + homepage = "https://github.com/kubernetes/test-infra/tree/master/prow"; + license = licenses.asl20; + maintainers = with maintainers; [ kalbasit ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 381d66c678e2..7dbd06d1ddab 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -57,11 +57,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.26.0"; + version = "1.26.1"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "17g5yxr6ydc4rlbqc3r3876jis1x7mw496skc098n4q4f0m2ih24"; + sha256 = "1s48mgya1gvidk0fmm7pifhqj2k0dc9xdq3h5ifz9kivjp7h0z09"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix index 274afd5fc3d8..46a1d96d8d0f 100644 --- a/pkgs/applications/science/chemistry/molden/default.nix +++ b/pkgs/applications/science/chemistry/molden/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, which, gfortran, libGLU, xorg } : stdenv.mkDerivation rec { - version = "6.1"; + version = "6.2"; name = "molden-${version}"; src = fetchurl { url = "ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden${version}.tar.gz"; - sha256 = "0swbjnqlkwhy8lvjkbx8yklqj4zfphwdg6s3haawxi3dd65ij539"; + sha256 = "01m5p7v5pz1fi77var50sp1bzlvdckwr6kn4wanvic2jmvgp9q5n"; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index 24cddfb9a1c2..348c1e750867 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace Makefile \ - --replace 'all: check_include' 'all:' \ --replace '-install_name ''${LIBDIR}/libcalc''${LIB_EXT_VERSION}' '-install_name ''${T}''${LIBDIR}/libcalc''${LIB_EXT_VERSION}' \ --replace '-install_name ''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}' '-install_name ''${T}''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}' ''; @@ -25,7 +24,7 @@ stdenv.mkDerivation rec { makeFlags = [ "T=$(out)" - "INCDIR=${lib.getDev stdenv.cc.libc}/include" + "INCDIR=" "BINDIR=/bin" "LIBDIR=/lib" "CALC_SHAREDIR=/share/calc" diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 378a272dbf63..7352225c0176 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -8,13 +8,13 @@ with stdenv.lib; buildGoPackage rec { pname = "gitea"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "1z7rkhxkymv7rgc7blh9ps5sqrgl4sryf0rqcp16nh9n5snfm1rm"; + sha256 = "0sk877rp6zhch1b9c7zbmk8pnlyqjp4nws2gzq24qvw5f4chlprw"; # Required to generate the same checksum on MacOS due to unicode encoding differences # More information: https://github.com/NixOS/nixpkgs/pull/48128 extraPostFetch = '' diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index ae3d93ff3db3..83e21c8945dc 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -291,9 +291,10 @@ rec { # Files to add to the layer. closure, configJson, - # Docker has a 42-layer maximum, we pick 24 to ensure there is plenty - # of room for extension - maxLayers ? 24 + # Docker has a 125-layer maximum, we pick 100 to ensure there is + # plenty of room for extension. + # https://github.com/moby/moby/blob/b3e9f7b13b0f0c414fa6253e1f17a86b2cff68b5/layer/layer_store.go#L23-L26 + maxLayers ? 100 }: let storePathToLayer = substituteAll diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 6afe93c7e4c1..49adcb4d301d 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cacert, git, cargo, rustc, fetchcargo, buildPackages }: +{ stdenv, cacert, git, cargo, rustc, fetchcargo, buildPackages, windows }: { name ? "${args.pname}-${args.version}" , cargoSha256 ? "unset" @@ -41,18 +41,26 @@ let cargoDepsCopy="$sourceRoot/${cargoVendorDir}" ''; + hostConfig = stdenv.hostPlatform.config; + + rustHostConfig = { + "x86_64-pc-mingw32" = "x86_64-pc-windows-gnu"; + }."${hostConfig}" or hostConfig; + ccForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"; cxxForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++"; ccForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; cxxForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"; - releaseDir = "target/${stdenv.hostPlatform.config}/${buildType}"; -in stdenv.mkDerivation (args // { + releaseDir = "target/${rustHostConfig}/${buildType}"; +in + +stdenv.mkDerivation (args // { inherit cargoDeps; patchRegistryDeps = ./patch-registry-deps; - nativeBuildInputs = [ cargo rustc git cacert ] ++ nativeBuildInputs; - inherit buildInputs; + nativeBuildInputs = nativeBuildInputs ++ [ cacert git cargo rustc ]; + buildInputs = buildInputs ++ stdenv.lib.optional stdenv.hostPlatform.isMinGW windows.pthreads; patches = cargoPatches ++ patches; @@ -84,7 +92,7 @@ in stdenv.mkDerivation (args // { [target."${stdenv.buildPlatform.config}"] "linker" = "${ccForBuild}" ${stdenv.lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) '' - [target."${stdenv.hostPlatform.config}"] + [target."${rustHostConfig}"] "linker" = "${ccForHost}" ''} EOF @@ -104,7 +112,7 @@ in stdenv.mkDerivation (args // { "CXX_${stdenv.hostPlatform.config}"="${cxxForHost}" \ cargo build \ ${stdenv.lib.optionalString (buildType == "release") "--release"} \ - --target ${stdenv.hostPlatform.config} \ + --target ${rustHostConfig} \ --frozen ${concatStringsSep " " cargoBuildFlags} ) diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix index a3b32ceee0cf..74f711811907 100644 --- a/pkgs/development/compilers/chicken/5/chicken.nix +++ b/pkgs/development/compilers/chicken/5/chicken.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation { name = "chicken-${version}"; - binaryVersion = 9; + binaryVersion = 11; src = fetchurl { url = "https://code.call-cc.org/releases/${version}/chicken-${version}.tar.gz"; @@ -22,8 +22,8 @@ stdenv.mkDerivation { setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh; - buildFlags = "PLATFORM=${platform} PREFIX=$(out) VARDIR=$(out)/var/lib"; - installFlags = "PLATFORM=${platform} PREFIX=$(out) VARDIR=$(out)/var/lib"; + buildFlags = "PLATFORM=${platform} PREFIX=$(out)"; + installFlags = "PLATFORM=${platform} PREFIX=$(out)"; buildInputs = [ makeWrapper @@ -37,10 +37,6 @@ stdenv.mkDerivation { wrapProgram $f \ --prefix PATH : ${stdenv.cc}/bin done - - mv $out/var/lib/chicken $out/lib - rmdir $out/var/lib - rmdir $out/var ''; # TODO: Assert csi -R files -p '(pathname-file (repository-path))' == binaryVersion diff --git a/pkgs/development/compilers/chicken/5/eggs.nix b/pkgs/development/compilers/chicken/5/eggs.nix index 2d3324ceaca4..a8e3ee5976e8 100644 --- a/pkgs/development/compilers/chicken/5/eggs.nix +++ b/pkgs/development/compilers/chicken/5/eggs.nix @@ -1,4 +1,4 @@ -{ pkgs }: +{ pkgs, stdenv }: rec { inherit (pkgs) eggDerivation fetchegg; @@ -33,12 +33,12 @@ rec { }; srfi-1 = eggDerivation { - name = "srfi-1-0.5"; + name = "srfi-1-0.5.1"; src = fetchegg { name = "srfi-1"; - version = "0.5"; - sha256 = "0gh1h406xbxwm5gvc5znc93nxp9xjbhyqf7zzga08k5y6igxrlvk"; + version = "0.5.1"; + sha256 = "15x0ajdkw5gb3vgs8flzh5g0pzl3wmcpf11iimlm67mw6fxc8p7j"; }; buildInputs = [ @@ -47,12 +47,12 @@ rec { }; srfi-13 = eggDerivation { - name = "srfi-13-0.2"; + name = "srfi-13-0.2.1"; src = fetchegg { name = "srfi-13"; - version = "0.2"; - sha256 = "0jazbdnn9bjm7wwxqq7xzqxc9zfvaapq565rf1czj6ayl96yvk3n"; + version = "0.2.1"; + sha256 = "0204i7fhc4dy0l89lbi2lv9cjndrvwyrk68z3wy7x445jb4ky1gq"; }; buildInputs = [ @@ -61,12 +61,12 @@ rec { }; srfi-14 = eggDerivation { - name = "srfi-14-0.2"; + name = "srfi-14-0.2.1"; src = fetchegg { name = "srfi-14"; - version = "0.2"; - sha256 = "13nm4nn1d52nkvhjizy26z3s6q41x1ml4zm847xzf86x1zwvymni"; + version = "0.2.1"; + sha256 = "0gc33cx4xll9vsf7fm8jvn3gc0604kn3bbi6jfn6xscqp86kqb9p"; }; buildInputs = [ diff --git a/pkgs/development/compilers/chicken/5/setup-hook.sh b/pkgs/development/compilers/chicken/5/setup-hook.sh index 2447aeb0ceae..f5ebaaf638e3 100644 --- a/pkgs/development/compilers/chicken/5/setup-hook.sh +++ b/pkgs/development/compilers/chicken/5/setup-hook.sh @@ -1,5 +1,5 @@ addChickenRepositoryPath() { - addToSearchPathWithCustomDelimiter : CHICKEN_REPOSITORY_PATH "$1/lib/chicken/9/" + addToSearchPathWithCustomDelimiter : CHICKEN_REPOSITORY_PATH "$1/lib/chicken/11/" addToSearchPathWithCustomDelimiter : CHICKEN_INCLUDE_PATH "$1/share/" } diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix index 5788f0df1da9..d855b83f0afc 100644 --- a/pkgs/development/compilers/gambit/unstable.nix +++ b/pkgs/development/compilers/gambit/unstable.nix @@ -1,13 +1,13 @@ { stdenv, callPackage, fetchFromGitHub }: callPackage ./build.nix { - version = "unstable-2019-02-05"; -# git-version = "4.9.3"; + version = "unstable-2019-07-21"; +# git-version = "4.9.3-109-g3b5f74fa"; src = fetchFromGitHub { owner = "feeley"; repo = "gambit"; - rev = "baf7de67f6d800821412fe83a8d9e9e09faeb490"; - sha256 = "0ygm5y8fvq6dbb8mwq52v8rc8pdnwm4qpmxlnx5m9hzzbm1kzxxv"; + rev = "3b5f74fae74b2159e3bf6923f29a18b31cc15dcc"; + sha256 = "07cb0d8754dqhxawkp5dp4y0bsa9kfald4dkj60j5yfnsp81y5mi"; }; inherit stdenv; } diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix index 6e60ea6fea49..a9618a7e0667 100644 --- a/pkgs/development/compilers/gerbil/unstable.nix +++ b/pkgs/development/compilers/gerbil/unstable.nix @@ -1,14 +1,14 @@ { stdenv, callPackage, fetchFromGitHub, gambit-unstable }: callPackage ./build.nix { - version = "unstable-2019-02-09"; - git-version = "0.16-DEV-15-gafc20fc2"; + version = "unstable-2019-08-11"; + git-version = "0.16-DEV-132-gcb58f9a3"; gambit = gambit-unstable; src = fetchFromGitHub { owner = "vyzo"; repo = "gerbil"; - rev = "afc20fc21030e8445b46b8267cc4c52cfd662aad"; - sha256 = "02v16zya9zryjs4wallibp1kvnpba60aw15y4k7zhddc71qjfbhw"; + rev = "cb58f9a30630a6f3e85a55f2c1dcc654f517ffed"; + sha256 = "18jh64v1gi6z3pks9zf19f2wcjpv21cs270dnaq617kgwp53vysh"; }; inherit stdenv; } diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix index 81d1a6f9b8a5..423eaf02d8c4 100644 --- a/pkgs/development/compilers/ghc/8.8.1.nix +++ b/pkgs/development/compilers/ghc/8.8.1.nix @@ -86,12 +86,12 @@ let in stdenv.mkDerivation (rec { - version = "8.8.0.20190613"; + version = "8.8.0.20190721"; name = "${targetPrefix}ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/8.8.1-alpha2/ghc-${version}-src.tar.xz"; - sha256 = "17531jabkdmlhj57mkshjfwlri2g3jgal8fw9zpkl1kbplnrivyr"; + url = "https://downloads.haskell.org/ghc/8.8.1-rc1/ghc-${version}-src.tar.xz"; + sha256 = "1ih76zpxk8ay84xjyaflqc754002y8pdaainqfvb4cnhy6lpb1br"; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 35a1ee37b361..85641c351d49 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation ( rec { substituteInPlace packages/process/_test.pony \ --replace '=/bin' "${coreutils}/bin" + # Disabling the stdlib tests + substituteInPlace Makefile-ponyc \ + --replace 'test-ci: all check-version test-core test-stdlib-debug test-stdlib' 'test-ci: all check-version test-core' + # Remove impure system refs substituteInPlace src/libponyc/pkg/package.c \ --replace "/usr/local/lib" "" \ diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 779788785d02..14959546ee6f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1224,14 +1224,14 @@ self: super: { # The latest release version is ancient. You really need this tool from git. haskell-ci = generateOptparseApplicativeCompletion "haskell-ci" (addBuildDepend (overrideSrc (dontCheck super.haskell-ci) { - version = "20190625-git"; + version = "20190814-git"; src = pkgs.fetchFromGitHub { owner = "haskell-CI"; repo = "haskell-ci"; - rev = "260f967c6973dfb22ecc8061a1811a2ea4b79e01"; - sha256 = "1mvn6pqa6wfcm4jxhlhm4l54pwrlgnz7vdrmkwabliwz4q0bzgqk"; + rev = "70918d80b6fd43aca7e4d00ba0d2ea116b666556"; + sha256 = "0bzp959qy74zmqq75f60rcixpjbvvyrb5a8zp2nyql3nm9vxzy5k"; }; - }) (with self; [base-compat generic-lens microlens optparse-applicative ShellCheck exceptions temporary])); + }) (with self; [temporary lattices Cabal_3_0_0_0])); # Fix build with attr-2.4.48 (see #53716) xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index d6344717dfa2..89224e3c118d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5990,7 +5990,6 @@ broken-packages: - hp2any-core - hp2any-graph - hp2any-manager - - hpack - hpack-convert - hpack-dhall - hpaco @@ -6237,7 +6236,6 @@ broken-packages: - http-conduit-browser - http-directory - http-dispatch - - http-download - http-enumerator - http-grammar - http-kinder @@ -6579,7 +6577,6 @@ broken-packages: - join-api - joinlist - jonathanscard - - jose - jpeg - js-good-parts - jsaddle-hello @@ -7792,7 +7789,6 @@ broken-packages: - pang-a-lambda - pangraph - panpipe - - pantry - pantry-tmp - papa-export - papa-implement @@ -8767,7 +8763,6 @@ broken-packages: - servant-aeson-specs - servant-auth-cookie - servant-auth-hmac - - servant-auth-server - servant-auth-token - servant-auth-token-acid - servant-auth-token-api @@ -9413,11 +9408,9 @@ broken-packages: - task-distribution - taskell - tasty-auto - - tasty-discover - tasty-fail-fast - tasty-groundhog-converters - tasty-hedgehog-coverage - - tasty-hspec - tasty-integrate - tasty-jenkins-xml - tasty-laws diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index b5f1db71e317..e5bd0e26408e 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -95,6 +95,7 @@ self: super: builtins.intersectAttrs super { sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL"; cachix = enableSeparateBinOutput super.cachix; + ghcid = enableSeparateBinOutput super.ghcid; hzk = overrideCabal super.hzk (drv: { preConfigure = "sed -i -e /include-dirs/d hzk.cabal"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 62e2ff6c53bf..dabf82891e96 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -30354,8 +30354,8 @@ self: { }: mkDerivation { pname = "arbor-postgres"; - version = "0.0.3"; - sha256 = "18rqy2zyaf5cawn8dkn3xmjh19zzqgwj6mkk415x5a4p53dya46b"; + version = "0.0.4"; + sha256 = "0z3n2w9a57sl24i7h4yz8204drwkgr54pr2yrjam4xs3dyx6irf4"; libraryHaskellDepends = [ base bytestring generic-lens lens network-uri optparse-applicative postgresql-simple text @@ -30945,6 +30945,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "array-chunks" = callPackage + ({ mkDerivation, base, primitive, QuickCheck, quickcheck-classes + , tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "array-chunks"; + version = "0.1.0.0"; + sha256 = "15x8l8m953ws3253zvxg4q0q0qqcc34wawijnzmq87y39g9ghlag"; + libraryHaskellDepends = [ base primitive ]; + testHaskellDepends = [ + base primitive QuickCheck quickcheck-classes tasty tasty-hunit + tasty-quickcheck + ]; + description = "Lists of chunks"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "array-forth" = callPackage ({ mkDerivation, array, base, HUnit, mcmc-synthesis , modular-arithmetic, MonadRandom, OddWord, QuickCheck, split @@ -32670,8 +32687,8 @@ self: { pname = "attoparsec"; version = "0.13.2.2"; sha256 = "0j6qcwd146yzlkc9mcvzvnixsyl65n2a68l28322q5v9p4g4g4yx"; - revision = "3"; - editedCabalFile = "1birva836xdp92lf1v5yrs8lj3bgj9vnarrfh2ssfxxacqj1gjji"; + revision = "4"; + editedCabalFile = "1vz6jz7cwd80sryabpa99hccamgccjf2l7907wjblbs7dy66a8cb"; libraryHaskellDepends = [ array base bytestring containers deepseq scientific text transformers @@ -33311,6 +33328,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "autoexporter_1_1_14" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath }: + mkDerivation { + pname = "autoexporter"; + version = "1.1.14"; + sha256 = "0ijykr8qg7ijadlkn0gx3n06n14ihar8dvaddmmaab2awpmaa3l8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base Cabal directory filepath ]; + executableHaskellDepends = [ base Cabal directory filepath ]; + description = "Automatically re-export modules"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "autom" = callPackage ({ mkDerivation, base, bytestring, colour, ghc-prim, gloss , JuicyPixels, random, vector @@ -33660,6 +33692,8 @@ self: { pname = "avro"; version = "0.4.5.1"; sha256 = "1a7ykj2c8bk7y8iaac1076sp4c4qzxh37d97w0xv63srmy7l1r8s"; + revision = "1"; + editedCabalFile = "0a3rwzrk7zg428jqza3ghv2dvgl2iy7rz49yzxva0l9vj9abd1gb"; libraryHaskellDepends = [ aeson array base base16-bytestring bifunctors binary bytestring containers data-binary-ieee754 deepseq fail hashable mtl scientific @@ -33682,6 +33716,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "avro_0_4_5_2" = callPackage + ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors + , binary, bytestring, containers, data-binary-ieee754, deepseq + , directory, extra, fail, gauge, hashable, hspec, hspec-discover + , lens, lens-aeson, mtl, pure-zlib, QuickCheck, random + , raw-strings-qq, scientific, semigroups, tagged, template-haskell + , text, tf-random, transformers, unordered-containers, vector, zlib + }: + mkDerivation { + pname = "avro"; + version = "0.4.5.2"; + sha256 = "0cy2r8jrnyxwsxpd6mah4g56xh8n93f6gd613a4bwg8kqvykrpgq"; + libraryHaskellDepends = [ + aeson array base base16-bytestring bifunctors binary bytestring + containers data-binary-ieee754 deepseq fail hashable mtl scientific + semigroups tagged template-haskell text tf-random + unordered-containers vector zlib + ]; + testHaskellDepends = [ + aeson array base base16-bytestring bifunctors binary bytestring + containers directory extra fail hashable hspec lens lens-aeson mtl + pure-zlib QuickCheck raw-strings-qq scientific semigroups tagged + text tf-random transformers unordered-containers vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + aeson base bytestring containers gauge hashable mtl random + raw-strings-qq template-haskell text transformers + unordered-containers vector + ]; + description = "Avro serialization support for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "avwx" = callPackage ({ mkDerivation, attoparsec, base, HTTP, lens, optparse-applicative , parsers, pretty-show, text @@ -34829,6 +34898,29 @@ self: { broken = true; }) {}; + "backprop_0_2_6_3" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, directory + , hmatrix, microlens, microlens-th, mwc-random, primitive + , reflection, time, transformers, vector, vinyl + }: + mkDerivation { + pname = "backprop"; + version = "0.2.6.3"; + sha256 = "0zk3k20c100iwqcvg1xw2vdysn01w4h9jypz08xs849n1a3bp7di"; + libraryHaskellDepends = [ + base containers deepseq microlens primitive reflection transformers + vector vinyl + ]; + benchmarkHaskellDepends = [ + base criterion deepseq directory hmatrix microlens microlens-th + mwc-random time vector + ]; + description = "Heterogeneous automatic differentation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "backstop" = callPackage ({ mkDerivation, base, directory, filepath, HUnit, mtl, process , QuickCheck, unix @@ -39062,8 +39154,8 @@ self: { }: mkDerivation { pname = "birch-beer"; - version = "0.1.4.4"; - sha256 = "04pw1znsv7gm1qkdvb65kh4x0d8na590ks7437dymzy9h75m6mvj"; + version = "0.1.4.5"; + sha256 = "1yyb897yg2ipvz6jsc6np1jwlckyi41jq94dwxlpyj2sigawzvwh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41547,8 +41639,8 @@ self: { }: mkDerivation { pname = "boots-app"; - version = "0.1.0.3"; - sha256 = "0sgd5girr559plpd055xc8zixwmmfdlq2mrcm3vkwsr1djr5wi95"; + version = "0.1.0.5"; + sha256 = "0dx2nlbf86nbqfrxaacjskammx84bg4nrp5v075h76b9mky00i5l"; libraryHaskellDepends = [ base boots data-default exceptions fast-logger menshen microlens monad-logger mtl salak salak-yaml splitmix text unliftio-core vault @@ -43167,30 +43259,30 @@ self: { broken = true; }) {}; - "bulletproofs_1_0_0" = callPackage + "bulletproofs_1_0_1" = callPackage ({ mkDerivation, arithmoi, base, containers, criterion, cryptonite - , galois-field, memory, MonadRandom, pairing, protolude, QuickCheck + , galois-field, memory, MonadRandom, protolude, QuickCheck , random-shuffle, tasty, tasty-discover, tasty-hunit , tasty-quickcheck, text }: mkDerivation { pname = "bulletproofs"; - version = "1.0.0"; - sha256 = "1q1d8bj8hh2ik4arrgqrkhk4gwirvabfiw8mbazmpgvir8yv19s0"; + version = "1.0.1"; + sha256 = "1c23dppl851a1ga9x8axkl27bswb0hlwql0mfabsd9ydclmipzf0"; libraryHaskellDepends = [ arithmoi base containers cryptonite galois-field memory MonadRandom - pairing protolude QuickCheck random-shuffle text + protolude QuickCheck random-shuffle text ]; testHaskellDepends = [ arithmoi base containers cryptonite galois-field memory MonadRandom - pairing protolude QuickCheck random-shuffle tasty tasty-discover + protolude QuickCheck random-shuffle tasty tasty-discover tasty-hunit tasty-quickcheck text ]; testToolDepends = [ tasty-discover ]; benchmarkHaskellDepends = [ arithmoi base containers criterion cryptonite galois-field memory - MonadRandom pairing protolude QuickCheck random-shuffle tasty - tasty-hunit tasty-quickcheck text + MonadRandom protolude QuickCheck random-shuffle tasty tasty-hunit + tasty-quickcheck text ]; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -50768,30 +50860,31 @@ self: { }) {}; "classify-frog" = callPackage - ({ mkDerivation, array, audacity, base, bifunctors, Cabal, carray + ({ mkDerivation, array, audacity, base, bifunctors, carray , comfort-array, concurrent-split, containers, deepseq , explicit-exception, fft, filemanip, gnuplot, hmm-lapack, lapack , lazy-csv, llvm-extra, llvm-tf, non-empty, numeric-prelude , optparse-applicative, parallel, pathtype, pooled-io, semigroups - , soxlib, storable-record, storablevector, storablevector-carray - , synthesizer-core, synthesizer-llvm, tagchup, text, time - , transformers, utility-ht, xml-basic + , shell-utility, soxlib, storable-record, storablevector + , storablevector-carray, synthesizer-core, synthesizer-llvm + , tagchup, text, time, transformers, utility-ht, xml-basic }: mkDerivation { pname = "classify-frog"; - version = "0.2.4.2"; - sha256 = "1q1jr4q1a27wscznrkr04fxlaac2xp7l02rzspmf8bpkadfp3wfw"; + version = "0.2.4.3"; + sha256 = "0pba3a2vj9s5x8mm878q8vl0a57vrm2c4s79n0vc2pggbkb6dybc"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - array audacity base bifunctors Cabal carray comfort-array + array audacity base bifunctors carray comfort-array concurrent-split containers deepseq explicit-exception fft filemanip gnuplot hmm-lapack lapack lazy-csv llvm-extra llvm-tf non-empty numeric-prelude optparse-applicative parallel pathtype - pooled-io semigroups soxlib storable-record storablevector - storablevector-carray synthesizer-core synthesizer-llvm tagchup - text time transformers utility-ht xml-basic + pooled-io semigroups shell-utility soxlib storable-record + storablevector storablevector-carray synthesizer-core + synthesizer-llvm tagchup text time transformers utility-ht + xml-basic ]; description = "Classify sounds produced by Xenopus laevis"; license = stdenv.lib.licenses.bsd3; @@ -61355,12 +61448,12 @@ self: { }) {}; "cursor-brick" = callPackage - ({ mkDerivation, base, brick, cursor }: + ({ mkDerivation, base, brick, cursor, text }: mkDerivation { pname = "cursor-brick"; - version = "0.0.0.0"; - sha256 = "1cbby07x8d8pr3j07s9hl78xx8zd2va4g06xjb2qkjd2ffs705gb"; - libraryHaskellDepends = [ base brick cursor ]; + version = "0.1.0.0"; + sha256 = "018i8yrdcj69qf00vz1sx7is5cx1a7vn5b8kr9b226n7vxlr3nzd"; + libraryHaskellDepends = [ base brick cursor text ]; license = stdenv.lib.licenses.mit; }) {}; @@ -65426,6 +65519,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "decidable_0_2_0_0" = callPackage + ({ mkDerivation, base, functor-products, microlens, singletons + , vinyl + }: + mkDerivation { + pname = "decidable"; + version = "0.2.0.0"; + sha256 = "1b0mnkgk60qm84wim9lq6hlgm2ijxjx0s4gahvd5fjkccdryz2h2"; + libraryHaskellDepends = [ + base functor-products microlens singletons vinyl + ]; + description = "Combinators for manipulating dependently-typed predicates"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "decimal-arithmetic" = callPackage ({ mkDerivation, base, binary, binary-bits, deepseq, doctest, hspec , mtl, QuickCheck @@ -74419,23 +74528,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "either-both_0_1_1_0" = callPackage - ({ mkDerivation, base, either-prime, smallcheck, tasty - , tasty-smallcheck - }: + "either-both_0_1_1_1" = callPackage + ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck }: mkDerivation { pname = "either-both"; - version = "0.1.1.0"; - sha256 = "1dcr4pygk86rks764xcgfp8l6y3c11ycz0xaibxj00hy2zijzg8k"; + version = "0.1.1.1"; + sha256 = "1cm6g0wvwqlm405y8svv2fi49kpxqs7hffwd4gnsvlk2rfxng93f"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base either-prime smallcheck tasty tasty-smallcheck - ]; + testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; description = "Either or both"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {either-prime = null;}; + }) {}; "either-list-functions" = callPackage ({ mkDerivation, base, doctest }: @@ -74871,6 +74975,31 @@ self: { broken = true; }) {}; + "elliptic-curve" = callPackage + ({ mkDerivation, arithmoi, base, criterion, galois-field + , MonadRandom, protolude, tasty, tasty-hunit, tasty-quickcheck + , text, wl-pprint-text + }: + mkDerivation { + pname = "elliptic-curve"; + version = "0.2.1"; + sha256 = "18c00i2dgy0zdrnz9ym4wb4vcqrlflslqll4p4sfz8v07sa73z7g"; + libraryHaskellDepends = [ + base galois-field MonadRandom protolude tasty-quickcheck text + wl-pprint-text + ]; + testHaskellDepends = [ + arithmoi base galois-field MonadRandom protolude tasty tasty-hunit + tasty-quickcheck text wl-pprint-text + ]; + benchmarkHaskellDepends = [ + base criterion galois-field MonadRandom protolude tasty-quickcheck + text wl-pprint-text + ]; + description = "Elliptic curve library"; + license = stdenv.lib.licenses.mit; + }) {}; + "elm-bridge" = callPackage ({ mkDerivation, aeson, base, containers, hspec, QuickCheck , template-haskell, text @@ -76247,6 +76376,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "enumset_0_0_5" = callPackage + ({ mkDerivation, base, data-accessor, semigroups, storable-record + }: + mkDerivation { + pname = "enumset"; + version = "0.0.5"; + sha256 = "0d9lnl7mmcwydfhb4iazh6gcdbxvdh7b3gar3c9l1k5xmc4r8qii"; + libraryHaskellDepends = [ + base data-accessor semigroups storable-record + ]; + description = "Sets of enumeration values represented by machine words"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "env-locale" = callPackage ({ mkDerivation, base, old-locale, time }: mkDerivation { @@ -87255,6 +87399,17 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "functor-products" = callPackage + ({ mkDerivation, base, microlens, singletons, text, vinyl }: + mkDerivation { + pname = "functor-products"; + version = "0.1.0.0"; + sha256 = "18yxsqah4afyvhcgi9fp6zmn511kgnw8cx02ig2kaypl2j4bnsxp"; + libraryHaskellDepends = [ base microlens singletons text vinyl ]; + description = "General functor products for various Foldable instances"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "functor-utils" = callPackage ({ mkDerivation, base, ghc-prim, lens }: mkDerivation { @@ -87903,15 +88058,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "galois-field_0_4_0" = callPackage + "galois-field_0_4_1" = callPackage ({ mkDerivation, base, criterion, integer-gmp, MonadRandom, poly , protolude, semirings, tasty, tasty-quickcheck, vector , wl-pprint-text }: mkDerivation { pname = "galois-field"; - version = "0.4.0"; - sha256 = "087mvqbp18ak9wgih3sxjp210pjw7rka9x1vjmsivk15ppm17zsz"; + version = "0.4.1"; + sha256 = "1q577m518gb3q7z7l84pf2ghw786p86sjx7b5mr3xhrvplwdvhcl"; libraryHaskellDepends = [ base integer-gmp MonadRandom poly protolude semirings tasty-quickcheck vector wl-pprint-text @@ -99162,8 +99317,8 @@ self: { }: mkDerivation { pname = "graphql"; - version = "0.4.0.0"; - sha256 = "03y8wn0a1zbrsl3i5g5zy5awmlgsncnksskd4gcx8wzfl14120g0"; + version = "0.5.0.0"; + sha256 = "01466hfw3mkiz557r5ch3rn01w6wys38n580hdqmkhsqysgsqzqa"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base megaparsec text transformers unordered-containers @@ -109215,8 +109370,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.16.6"; - sha256 = "03214p8xqf062grgpkbfchrm4awm0zrq41j77z8s31iin9d0qzp9"; + version = "0.17.1"; + sha256 = "19vzwxy27xkkkx3lmq554kkyh6iclrxdhbp901vb0rh9v8l3cc74"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112348,21 +112503,21 @@ self: { }) {}; "hedgehog-classes" = callPackage - ({ mkDerivation, aeson, base, binary, containers, hedgehog + ({ mkDerivation, aeson, base, binary, comonad, containers, hedgehog , pretty-show, semirings, silently, transformers , wl-pprint-annotated }: mkDerivation { pname = "hedgehog-classes"; - version = "0.2.2"; - sha256 = "072w697nc7dv9yi700g5ap4h49ichpw1srzkq07sz637022l19wl"; - revision = "1"; - editedCabalFile = "03kz2y6k8p0ifhjmnpfmjmflz3v2qbjqccv3p87ffgpr5317m14k"; + version = "0.2.3"; + sha256 = "0ww1ll557iapbxg6rwhimf5fh8gngk15zlm4mlrh3p3j3xx9f22p"; libraryHaskellDepends = [ - aeson base binary containers hedgehog pretty-show semirings + aeson base binary comonad containers hedgehog pretty-show semirings silently transformers wl-pprint-annotated ]; - testHaskellDepends = [ aeson base binary containers hedgehog ]; + testHaskellDepends = [ + aeson base binary comonad containers hedgehog + ]; description = "Hedgehog will eat your typeclass bugs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -127885,6 +128040,35 @@ self: { broken = true; }) {}; + "hw-ip_2_3_4_1" = callPackage + ({ mkDerivation, appar, base, binary, bytestring, containers + , generic-lens, hedgehog, hspec, hspec-discover, hw-bits + , hw-hspec-hedgehog, iproute, lens, optparse-applicative, text + }: + mkDerivation { + pname = "hw-ip"; + version = "2.3.4.1"; + sha256 = "023wv7dvpyw2nnlrdqhp3nqrbbh9af074fz12y8510br2gfdyamd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + appar base containers generic-lens hw-bits iproute text + ]; + executableHaskellDepends = [ + appar base binary bytestring generic-lens lens optparse-applicative + text + ]; + testHaskellDepends = [ + appar base generic-lens hedgehog hspec hw-bits hw-hspec-hedgehog + text + ]; + testToolDepends = [ hspec-discover ]; + description = "Library for manipulating IP addresses and CIDR blocks"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hw-json" = callPackage ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base , bits-extra, bytestring, criterion, directory, dlist, generic-lens @@ -136655,8 +136839,6 @@ self: { ]; description = "Javascript Object Signing and Encryption and JSON Web Token library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "jose-jwt" = callPackage @@ -142930,6 +143112,33 @@ self: { broken = true; }) {}; + "lapack_0_3_1" = callPackage + ({ mkDerivation, base, blas-ffi, blaze-html, boxes, ChasingBottoms + , comfort-array, data-ref, deepseq, fixed-length + , guarded-allocation, hyper, lapack-ffi, lazyio, monoid-transformer + , netlib-ffi, non-empty, QuickCheck, quickcheck-transformer, random + , semigroups, text, tfp, transformers, unique-logic-tf, utility-ht + }: + mkDerivation { + pname = "lapack"; + version = "0.3.1"; + sha256 = "1w8nndh3gj6vrildxjn13lmi7aqjwbhpqkdj7d21fsfbmhjlgwvr"; + libraryHaskellDepends = [ + base blas-ffi blaze-html boxes comfort-array deepseq fixed-length + guarded-allocation hyper lapack-ffi lazyio netlib-ffi non-empty + semigroups text tfp transformers utility-ht + ]; + testHaskellDepends = [ + base ChasingBottoms comfort-array data-ref monoid-transformer + netlib-ffi non-empty QuickCheck quickcheck-transformer random + semigroups tfp transformers unique-logic-tf utility-ht + ]; + description = "Numerical Linear Algebra using LAPACK"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "lapack-carray" = callPackage ({ mkDerivation, base, carray, lapack-ffi, netlib-carray , netlib-ffi, storable-complex, transformers @@ -146578,6 +146787,29 @@ self: { broken = true; }) {}; + "linear-circuit_0_1_0_2" = callPackage + ({ mkDerivation, base, comfort-array, comfort-graph, containers + , lapack, netlib-ffi, non-empty, QuickCheck, transformers + , utility-ht + }: + mkDerivation { + pname = "linear-circuit"; + version = "0.1.0.2"; + sha256 = "0cf2lq8p2yppns8qn732drky8ghhd4ri9zxv7nbvas10ha0p19lm"; + libraryHaskellDepends = [ + base comfort-array comfort-graph containers lapack netlib-ffi + transformers utility-ht + ]; + testHaskellDepends = [ + base comfort-graph containers non-empty QuickCheck transformers + utility-ht + ]; + description = "Compute resistance of linear electrical circuits"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "linear-code" = callPackage ({ mkDerivation, base, containers, data-default , ghc-typelits-knownnat, ghc-typelits-natnormalise, HaskellForMaths @@ -147615,6 +147847,24 @@ self: { broken = true; }) {}; + "list-witnesses_0_1_2_0" = callPackage + ({ mkDerivation, base, decidable, functor-products, microlens + , profunctors, singletons, vinyl + }: + mkDerivation { + pname = "list-witnesses"; + version = "0.1.2.0"; + sha256 = "10bflmrj747xs2ga8s0vw7hb419wvrwnm0bakxw7x1l7bcaa7z7m"; + libraryHaskellDepends = [ + base decidable functor-products microlens profunctors singletons + vinyl + ]; + description = "Witnesses for working with type-level lists"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "list-zip-def" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -148152,8 +148402,8 @@ self: { }: mkDerivation { pname = "llvm-hs-pretty"; - version = "0.6.1.0"; - sha256 = "12w1rkkaf50jl2vdkyk4xpvjmsxzjbfkdyklaq5p6b8ykw872pda"; + version = "0.6.2.0"; + sha256 = "0inljys97b3vmb0006p75kzsm922w1r9721df2h7nfqp0in28c14"; libraryHaskellDepends = [ array base bytestring llvm-hs-pure prettyprinter text ]; @@ -153976,8 +154226,8 @@ self: { }: mkDerivation { pname = "med-module"; - version = "0.1.1"; - sha256 = "1qzffgcg29gjc6j0dl9ablgzad3lry28n9kv55kp5lgqm3xp92gp"; + version = "0.1.2.1"; + sha256 = "0f1yjdix89g6z2kigj08iq88jmi0x59la7764ixfha5sbjnwz0pp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -159357,6 +159607,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mono-traversable_1_0_12_0" = callPackage + ({ mkDerivation, base, bytestring, containers, foldl, gauge + , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split + , text, transformers, unordered-containers, vector + , vector-algorithms + }: + mkDerivation { + pname = "mono-traversable"; + version = "1.0.12.0"; + sha256 = "1h586myaayxg73lc1fx18axlq2bw761fypyy7mii1h0h75d8fyry"; + libraryHaskellDepends = [ + base bytestring containers hashable split text transformers + unordered-containers vector vector-algorithms + ]; + testHaskellDepends = [ + base bytestring containers foldl hspec HUnit QuickCheck semigroups + text transformers unordered-containers vector + ]; + benchmarkHaskellDepends = [ base gauge mwc-random vector ]; + description = "Type classes for mapping, folding, and traversing monomorphic containers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mono-traversable-instances" = callPackage ({ mkDerivation, base, comonad, containers, dlist, dlist-instances , mono-traversable, semigroupoids, semigroups, transformers @@ -167361,6 +167635,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "nonempty-lift" = callPackage + ({ mkDerivation, base, comonad, hedgehog, hedgehog-classes + , semigroupoids + }: + mkDerivation { + pname = "nonempty-lift"; + version = "0.1"; + sha256 = "0zz6kh0ihbpjsigs2ssqcif6i85y9ykpx739yzpqz0drqn4013g8"; + libraryHaskellDepends = [ base comonad semigroupoids ]; + testHaskellDepends = [ base hedgehog hedgehog-classes ]; + description = "nonempty structure"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "nonemptymap" = callPackage ({ mkDerivation, base, containers, semigroupoids }: mkDerivation { @@ -172342,6 +172630,41 @@ self: { broken = true; }) {}; + "pairing_0_4_2" = callPackage + ({ mkDerivation, arithmoi, base, binary, bytestring, criterion + , errors, galois-field, hexstring, integer-logarithms, memory + , MonadRandom, protolude, QuickCheck, quickcheck-instances, random + , tasty, tasty-discover, tasty-hunit, tasty-quickcheck + , wl-pprint-text + }: + mkDerivation { + pname = "pairing"; + version = "0.4.2"; + sha256 = "0qwxh7s5ycr4rcafqgj7lc1mgqjsvlp62klwmvnqq9rmrkim2lkg"; + libraryHaskellDepends = [ + arithmoi base binary bytestring errors galois-field + integer-logarithms memory MonadRandom protolude QuickCheck random + wl-pprint-text + ]; + testHaskellDepends = [ + arithmoi base binary bytestring errors galois-field hexstring + integer-logarithms memory MonadRandom protolude QuickCheck + quickcheck-instances random tasty tasty-discover tasty-hunit + tasty-quickcheck wl-pprint-text + ]; + testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + arithmoi base binary bytestring criterion errors galois-field + integer-logarithms memory MonadRandom protolude QuickCheck + quickcheck-instances random tasty tasty-hunit tasty-quickcheck + wl-pprint-text + ]; + description = "Bilinear pairings"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "palette" = callPackage ({ mkDerivation, array, base, colour, containers, MonadRandom }: mkDerivation { @@ -174839,8 +175162,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.8.2.3"; - sha256 = "0fkrm5zq2978qaqkxwibqj5dlmrrkpnlqv97ff436bf6ad5vpfw8"; + version = "0.8.2.5"; + sha256 = "1hss18gb71xrjgncjr4g5935k7kcwxpxxb6j52i32ans43xavhiv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -178955,6 +179278,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-cborg" = callPackage + ({ mkDerivation, base, bytestring, cborg, ghc-prim, pipes + , pipes-bytestring, pipes-parse, QuickCheck, serialise, tasty + , tasty-quickcheck, transformers + }: + mkDerivation { + pname = "pipes-cborg"; + version = "0.1"; + sha256 = "1ihngg2gvlyq40wnpajhbb7xpj028pk1k08xay19ir4n9mmx4jrn"; + libraryHaskellDepends = [ + base bytestring cborg ghc-prim pipes pipes-bytestring pipes-parse + serialise transformers + ]; + testHaskellDepends = [ + base bytestring cborg pipes pipes-bytestring QuickCheck serialise + tasty tasty-quickcheck transformers + ]; + description = "Encode and decode cborg streams using the pipes and cborg libraries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pipes-cellular" = callPackage ({ mkDerivation, base, bytestring, data-cell, pipes }: mkDerivation { @@ -189194,6 +189538,8 @@ self: { pname = "quickcheck-instances"; version = "0.3.22"; sha256 = "14asr9r7da3w7p4hjj51w2yb002nz8x0np8hdz9z4yjvi60vyrax"; + revision = "1"; + editedCabalFile = "1ln7zp6rx7ya7iwcbh8m1s1y1pdh28f64nga74f2lszmpmmd512w"; libraryHaskellDepends = [ array base base-compat bytestring case-insensitive containers hashable old-time QuickCheck scientific splitmix tagged text time @@ -190174,8 +190520,8 @@ self: { }: mkDerivation { pname = "raft"; - version = "0.3.11.0"; - sha256 = "0rc4gvhfcslwb01lxbwmd1j3hbcbkyflm0qg43ccdkf2pj2gibz8"; + version = "0.4.0.0"; + sha256 = "07lfjq2dz9vki7pvjg6p3mp2ifazhmidcx9pbsfxnhj1h8xb80bp"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring cereal containers data-default ghc-prim mtl parallel scientific split stm text time @@ -193284,6 +193630,24 @@ self: { broken = true; }) {}; + "refinery" = callPackage + ({ mkDerivation, base, containers, exceptions, mmorph, mtl, pipes + , semigroupoids + }: + mkDerivation { + pname = "refinery"; + version = "0.1.0.0"; + sha256 = "1g18ih1122h61jxgi72kxc9b4x7nvfxl807km46x150x1f3m7wvl"; + libraryHaskellDepends = [ + base containers exceptions mmorph mtl pipes semigroupoids + ]; + testHaskellDepends = [ + base containers exceptions mmorph mtl pipes semigroupoids + ]; + description = "Toolkit for building proof automation systems"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "reflection" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -196152,6 +196516,21 @@ self: { broken = true; }) {}; + "resistor-cube_0_0_1_2" = callPackage + ({ mkDerivation, base, comfort-array, lapack }: + mkDerivation { + pname = "resistor-cube"; + version = "0.0.1.2"; + sha256 = "1jdpyxpbqhlbd66gy1qlrjqm31mhvg636yp8nrm9qbksllzdi6n6"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base comfort-array lapack ]; + description = "Compute total resistance of a cube of resistors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "resolv" = callPackage ({ mkDerivation, base, base16-bytestring, binary, bytestring , containers, directory, filepath, tasty, tasty-hunit @@ -200374,26 +200753,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "salak_0_3_3_1" = callPackage + "salak_0_3_3_2" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers - , data-default, directory, exceptions, filepath, hashable, heaps - , hspec, menshen, mtl, QuickCheck, random, scientific, text, time - , unliftio-core, unordered-containers + , data-default, directory, dlist, exceptions, filepath, hashable + , heaps, hspec, hspec-discover, menshen, mtl, QuickCheck, random + , scientific, text, time, unliftio-core, unordered-containers }: mkDerivation { pname = "salak"; - version = "0.3.3.1"; - sha256 = "0gv7qjiwnr67s38g68y2aqjljihrlggmnz2jz79865bi2v34isd2"; + version = "0.3.3.2"; + sha256 = "16v93lnfaqh7pbvpd26gf20wq6nwi42gf9jhv9978qswynck98xd"; libraryHaskellDepends = [ - attoparsec base bytestring containers data-default directory + attoparsec base bytestring containers data-default directory dlist exceptions filepath hashable heaps menshen mtl scientific text time unliftio-core unordered-containers ]; testHaskellDepends = [ - attoparsec base bytestring containers data-default directory + attoparsec base bytestring containers data-default directory dlist exceptions filepath hashable heaps hspec menshen mtl QuickCheck random scientific text time unliftio-core unordered-containers ]; + testToolDepends = [ hspec-discover ]; description = "Configuration (re)Loader and Parser"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -200420,6 +200800,27 @@ self: { broken = true; }) {}; + "salak-toml_0_3_3_2" = callPackage + ({ mkDerivation, base, exceptions, hspec, mtl, QuickCheck, salak + , text, time, tomland, unordered-containers + }: + mkDerivation { + pname = "salak-toml"; + version = "0.3.3.2"; + sha256 = "11134ikw2y7h7cn0c23q454z5g6y85ij8qnzqhqm6jpiyhdp7d6z"; + libraryHaskellDepends = [ + base salak text time tomland unordered-containers + ]; + testHaskellDepends = [ + base exceptions hspec mtl QuickCheck salak text time tomland + unordered-containers + ]; + description = "Configuration Loader for toml"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "salak-yaml" = callPackage ({ mkDerivation, base, conduit, exceptions, hspec, libyaml, mtl , QuickCheck, salak, text @@ -200436,6 +200837,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "salak-yaml_0_3_3_2" = callPackage + ({ mkDerivation, base, conduit, exceptions, hspec, libyaml, mtl + , QuickCheck, salak, text + }: + mkDerivation { + pname = "salak-yaml"; + version = "0.3.3.2"; + sha256 = "1k4n97wayia13q247283m25fqarjdw5jj3k8fcv18kkkpsq4fv97"; + libraryHaskellDepends = [ base conduit libyaml salak text ]; + testHaskellDepends = [ + base conduit exceptions hspec libyaml mtl QuickCheck salak text + ]; + description = "Configuration Loader for yaml"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "saltine" = callPackage ({ mkDerivation, base, bytestring, libsodium, profunctors , QuickCheck, semigroups, test-framework @@ -204606,8 +205024,6 @@ self: { testToolDepends = [ hspec-discover markdown-unlit ]; description = "servant-server/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-auth-swagger" = callPackage @@ -207767,8 +208183,8 @@ self: { }: mkDerivation { pname = "shake-ats"; - version = "1.10.2.1"; - sha256 = "1y85rrrrcd7jz51ir6cwa3w23ldi4fkc215iqj1crbxfjzrphacn"; + version = "1.10.2.2"; + sha256 = "070vvzz0nmdal9ja43l8s4dll2iwxjzd3lmlynkdm1v9qzj0iw67"; libraryHaskellDepends = [ base binary dependency directory hs2ats language-ats microlens shake shake-c shake-cabal shake-ext text @@ -207904,8 +208320,8 @@ self: { ({ mkDerivation, base, cpphs, shake }: mkDerivation { pname = "shake-literate"; - version = "0.1.0.0"; - sha256 = "1kliv9i9libcyzm0bccxi226rd69kvjxi9hi3n4y7zjbbp40cqgd"; + version = "0.1.0.1"; + sha256 = "0wx3mh62b8kq20qw15zg35nl4l066i11mzgj0vxlvys5a6902ijn"; libraryHaskellDepends = [ base cpphs shake ]; description = "Rules for building literate programs in shake"; license = stdenv.lib.licenses.bsd3; @@ -208435,6 +208851,17 @@ self: { broken = true; }) {}; + "shell-utility" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "shell-utility"; + version = "0.0"; + sha256 = "1s3482vxllmmjbcqbwsrql9ka6zng7qbbqk3kfjs6dvkcs710hbs"; + libraryHaskellDepends = [ base ]; + description = "Utility functions for writing command-line programs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "shellish" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, mtl , process, strict, time, unix-compat @@ -208626,8 +209053,8 @@ self: { }: mkDerivation { pname = "shh"; - version = "0.7.0.0"; - sha256 = "0dgfjvxdli4z1i9qailq5mgrgynm1vvfcbjj9nsridypff0vf1qj"; + version = "0.7.0.2"; + sha256 = "0b9q4pg1gvnw18gxba8cd7b9crj8d822vivsvgagcjmhm6a8y3pk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -220749,8 +221176,8 @@ self: { }: mkDerivation { pname = "strongswan-sql"; - version = "1.3.0.0"; - sha256 = "0dxl6j73hmw9la2ivbgxm6wr12dd79nh2315k517zlgiq4q1yir7"; + version = "1.3.0.1"; + sha256 = "1n61xxgp4saljyq6zywi5x5nlcwzp3i9vhwlmib790wr19znnxky"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -221636,8 +222063,8 @@ self: { }: mkDerivation { pname = "super-user-spark"; - version = "0.4.0.1"; - sha256 = "0pxkvc1vjarh4p5rqnai6nlsqxv9as8jvqs2vpywl1525nsfyvy5"; + version = "0.4.0.3"; + sha256 = "0z2alc67p8nvvwaxxrgwhkwfki1iw7ycs3ay8kyfw0wh01d2cmgk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -221961,6 +222388,36 @@ self: { broken = true; }) {}; + "sv_1_4" = callPackage + ({ mkDerivation, attoparsec, base, bifunctors, bytestring, cassava + , contravariant, criterion, deepseq, hedgehog, hw-dsv, lens, Only + , parsers, semigroupoids, semigroups, sv-core, tasty + , tasty-hedgehog, tasty-hunit, text, transformers, trifecta + , utf8-string, validation, vector + }: + mkDerivation { + pname = "sv"; + version = "1.4"; + sha256 = "02ymnnknfppx59b922y62grkmarwsyy77iv6bmyp2bzm8vbvnvd5"; + libraryHaskellDepends = [ + attoparsec base bifunctors bytestring contravariant hw-dsv + semigroupoids sv-core transformers utf8-string validation + ]; + testHaskellDepends = [ + base bytestring cassava contravariant hedgehog lens Only parsers + semigroupoids semigroups tasty tasty-hedgehog tasty-hunit text + trifecta utf8-string validation vector + ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion deepseq hw-dsv lens text + vector + ]; + description = "Encode and decode separated values (CSV, PSV, ...)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "sv-cassava" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cassava, HUnit , sv-core, text, utf8-string, validation, vector @@ -221969,8 +222426,8 @@ self: { pname = "sv-cassava"; version = "0.3"; sha256 = "1c4wacp7k5sgr5fy73h9if98d08apmcs6p4p3f3fvpqkm8jmf71b"; - revision = "2"; - editedCabalFile = "14grn815r54480jqpfib6qi3ivbaw0asa5ys0rp93allsprk96xb"; + revision = "3"; + editedCabalFile = "13414sn9rllq842bz0lv8qzdy6fxv72jbhmk64krrxq2xmw7wkhb"; libraryHaskellDepends = [ attoparsec base bytestring cassava sv-core utf8-string validation vector @@ -222009,6 +222466,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sv-core_0_5" = callPackage + ({ mkDerivation, attoparsec, base, bifunctors, bytestring + , containers, contravariant, deepseq, double-conversion, lens, mtl + , parsec, profunctors, QuickCheck, readable, semigroupoids + , semigroups, tasty, tasty-quickcheck, text, transformers, trifecta + , utf8-string, validation, vector, void + }: + mkDerivation { + pname = "sv-core"; + version = "0.5"; + sha256 = "1x5gmv2pbn3hx1dhpkigivjkbg6n6xy7lc36wmccsw2qqn9r5qxa"; + libraryHaskellDepends = [ + attoparsec base bifunctors bytestring containers contravariant + deepseq double-conversion lens mtl parsec profunctors readable + semigroupoids semigroups text transformers trifecta utf8-string + validation vector void + ]; + testHaskellDepends = [ + base bytestring profunctors QuickCheck semigroupoids semigroups + tasty tasty-quickcheck text validation vector + ]; + description = "Encode and decode separated values (CSV, PSV, ...)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sv-svfactor" = callPackage ({ mkDerivation, base, bytestring, lens, profunctors, sv-core , svfactor, validation @@ -222017,8 +222500,8 @@ self: { pname = "sv-svfactor"; version = "0.2"; sha256 = "1fjgryypq6i4r3w9zdb282aq5lqp4577mzzycafklphc0d2ancgb"; - revision = "1"; - editedCabalFile = "0g0bswas1y06k1yg9lgzwm36pyxd05s3pji3nsiqff6bhfph3d37"; + revision = "2"; + editedCabalFile = "1igmg66d7zs8pcia4j7nhr7iivnbanqz34wcpfx967823vc2whpw"; libraryHaskellDepends = [ base bytestring lens profunctors sv-core svfactor validation ]; @@ -223381,21 +223864,21 @@ self: { "synthesizer-llvm" = callPackage ({ mkDerivation, base, containers, event-list, llvm-extra, llvm-tf , midi, non-empty, non-negative, numeric-prelude, pathtype - , QuickCheck, random, sox, storable-record, storable-tuple - , storablevector, synthesizer-core, synthesizer-midi, tfp - , transformers, unsafe, utility-ht, vault + , QuickCheck, random, semigroups, sox, storable-record + , storable-tuple, storablevector, synthesizer-core + , synthesizer-midi, tfp, transformers, unsafe, utility-ht, vault }: mkDerivation { pname = "synthesizer-llvm"; - version = "0.8.1.2"; - sha256 = "1rklmaibicc4fwcz22cw6vp5qm74b5vn5ymflwk4gi3knsn7mzi9"; + version = "0.8.2"; + sha256 = "0vf0p1ajs7k327cc1dwm6ja2qyby865g1bqc6mzrjn826dv2vric"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers event-list llvm-extra llvm-tf midi non-empty - non-negative numeric-prelude pathtype random sox storable-record - storable-tuple storablevector synthesizer-core synthesizer-midi tfp - transformers unsafe utility-ht vault + non-negative numeric-prelude pathtype random semigroups sox + storable-record storable-tuple storablevector synthesizer-core + synthesizer-midi tfp transformers unsafe utility-ht vault ]; testHaskellDepends = [ base llvm-extra llvm-tf numeric-prelude QuickCheck random @@ -225217,8 +225700,6 @@ self: { ]; description = "Test discovery for the tasty framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tasty-expected-failure" = callPackage @@ -225348,8 +225829,6 @@ self: { ]; description = "Hspec support for the Tasty test framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tasty-html" = callPackage @@ -229339,6 +229818,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-lift-instances_0_1_14" = callPackage + ({ mkDerivation, base, bytestring, containers, QuickCheck + , template-haskell, text, th-lift, transformers, vector + }: + mkDerivation { + pname = "th-lift-instances"; + version = "0.1.14"; + sha256 = "0r1b4jnvcj64wp4hfccwkl4a70n1p1q7qzyx6ax7cmd8k961jz78"; + libraryHaskellDepends = [ + base bytestring containers template-haskell text th-lift + transformers vector + ]; + testHaskellDepends = [ + base bytestring containers QuickCheck template-haskell text vector + ]; + description = "Lift instances for template-haskell for common data types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-nowq" = callPackage ({ mkDerivation, base, markdown-unlit, template-haskell, time }: mkDerivation { @@ -231974,6 +232473,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "to" = callPackage + ({ mkDerivation, base, bytestring, text, utf8-string }: + mkDerivation { + pname = "to"; + version = "1.0.0"; + sha256 = "0lkmxyn3g2blrq9nc1ih46f5qghnida2mdpsx6ixksy12cnxswja"; + libraryHaskellDepends = [ base bytestring text utf8-string ]; + description = "Simple, safe, boring type conversions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "to-haskell" = callPackage ({ mkDerivation, base, containers, haskell-src-exts, transformers }: @@ -237751,6 +238261,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unagi-chan_0_4_1_2" = callPackage + ({ mkDerivation, async, atomic-primops, base, containers, criterion + , ghc-prim, primitive + }: + mkDerivation { + pname = "unagi-chan"; + version = "0.4.1.2"; + sha256 = "1lnl5n4jnjmm4chp461glcwkrrw63rjz3fvprwxcy3lkpbkrqvgn"; + libraryHaskellDepends = [ atomic-primops base ghc-prim primitive ]; + testHaskellDepends = [ + atomic-primops base containers ghc-prim primitive + ]; + benchmarkHaskellDepends = [ async base criterion ]; + description = "Fast concurrent queues with a Chan-like API, and more"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unagi-streams" = callPackage ({ mkDerivation, base, io-streams, unagi-chan }: mkDerivation { @@ -244007,6 +244535,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-extra_3_0_28" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring + , bytestring, case-insensitive, containers, cookie + , data-default-class, deepseq, directory, fast-logger, hspec + , http-types, http2, HUnit, iproute, network, old-locale, resourcet + , streaming-commons, text, time, transformers, unix, unix-compat + , vault, void, wai, wai-logger, word8, zlib + }: + mkDerivation { + pname = "wai-extra"; + version = "3.0.28"; + sha256 = "0iky7k4kirngvk1p2nz19zgzffb5hppfaxdjan80v06ikc8w1wm7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base base64-bytestring bytestring + case-insensitive containers cookie data-default-class deepseq + directory fast-logger http-types http2 iproute network old-locale + resourcet streaming-commons text time transformers unix unix-compat + vault void wai wai-logger word8 zlib + ]; + testHaskellDepends = [ + base bytestring case-insensitive cookie fast-logger hspec + http-types http2 HUnit resourcet text time transformers wai zlib + ]; + description = "Provides some basic WAI handlers and middleware"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-frontend-monadcgi" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, cgi , containers, http-types, transformers, wai diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index e0d4ecbc95ac..25a3f662565c 100644 --- a/pkgs/development/interpreters/erlang/R19.nix +++ b/pkgs/development/interpreters/erlang/R19.nix @@ -14,6 +14,6 @@ mkDerivation rec { ]; prePatch = '' - substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' + substituteInPlace configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" ''; } diff --git a/pkgs/development/interpreters/erlang/R20.nix b/pkgs/development/interpreters/erlang/R20.nix index c408d21d9b31..016e175d6b56 100644 --- a/pkgs/development/interpreters/erlang/R20.nix +++ b/pkgs/development/interpreters/erlang/R20.nix @@ -5,6 +5,6 @@ mkDerivation rec { sha256 = "0v2iiyzss8hiih98wvj0gi2qzdmmhh7bvc9p025wlfm4k7r1109a"; prePatch = '' - substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' + substituteInPlace configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" ''; } diff --git a/pkgs/development/interpreters/erlang/R21.nix b/pkgs/development/interpreters/erlang/R21.nix index 60eb6c8a6a5e..e21bf6dafbff 100644 --- a/pkgs/development/interpreters/erlang/R21.nix +++ b/pkgs/development/interpreters/erlang/R21.nix @@ -5,6 +5,6 @@ mkDerivation rec { sha256 = "1szybirrcpqsl2nmlmpbkxjqnm6i7l7bma87m5cpwi0kpvlxwmcw"; prePatch = '' - substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' + substituteInPlace configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" ''; } diff --git a/pkgs/development/interpreters/erlang/R22.nix b/pkgs/development/interpreters/erlang/R22.nix index 1af047f43bd7..a8c05513c5a6 100644 --- a/pkgs/development/interpreters/erlang/R22.nix +++ b/pkgs/development/interpreters/erlang/R22.nix @@ -5,7 +5,7 @@ mkDerivation rec { sha256 = "1aqkhd6nwdn4xp5yz02zbymd4x8ij8fjw9ji8kh860n1a513k9ai"; prePatch = '' - substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' '10.10' + substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" substituteInPlace erts/configure.in --replace '-Wl,-no_weak_imports' "" ''; } diff --git a/pkgs/development/libraries/crc32c/default.nix b/pkgs/development/libraries/crc32c/default.nix new file mode 100644 index 000000000000..916ec5b703bb --- /dev/null +++ b/pkgs/development/libraries/crc32c/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, cmake, gflags }: +stdenv.mkDerivation rec { + pname = "crc32c"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "google"; + repo = "crc32c"; + rev = version; + sha256 = "1sazkis9rzbrklfrvk7jn1mqywnq4yghmzg94mxd153h8b1sb149"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ gflags ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.isAarch64 "-march=armv8-a+crc"; + + meta = with stdenv.lib; { + homepage = https://github.com/google/crc32c; + description = "CRC32C implementation with support for CPU-specific acceleration instructions"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ andir ]; + }; +} diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix new file mode 100644 index 000000000000..7dd075e440e5 --- /dev/null +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -0,0 +1,65 @@ +{ stdenv, grpc, curl, cmake, pkgconfig, fetchFromGitHub, doxygen, protobuf, crc32c, c-ares, nlohmann_json, fetchurl }: +let + googleapis_rev = "a8ee1416f4c588f2ab92da72e7c1f588c784d3e6"; + googleapis = fetchurl { + name = "${googleapis_rev}.tar.gz"; + url = "https://github.com/googleapis/googleapis/archive/${googleapis_rev}.tar.gz"; + sha256 = "1kxi27r034p7jfldhvgpbn6rqqqddycnja47m6jyjxj4rcmrp2kb"; + }; +in stdenv.mkDerivation rec { + pname = "google-cloud-cpp"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "googleapis"; + repo = "google-cloud-cpp"; + rev = "v${version}"; + sha256 = "1w942gzyv01ym1cv2a417x92zxra9s2v3xz5crcv84j919f616f8"; + }; + + buildInputs = [ curl grpc protobuf nlohmann_json crc32c c-ares c-ares.cmake-config ]; + nativeBuildInputs = [ cmake pkgconfig doxygen ]; + + outputs = [ "out" "dev" ]; + + postPatch = '' + NLOHMANN_SHA256=$(sha256sum ${nlohmann_json}/include/nlohmann/json.hpp | cut -f1 -d' ') + sed -e 's,https://github.com/nlohmann/json/releases/download/.*,file://${nlohmann_json}/include/nlohmann/json.hpp"),' \ + -e "s,JSON_SHA256 .*,JSON_SHA256 ''${NLOHMANN_SHA256}," \ + -i cmake/DownloadNlohmannJson.cmake + + sed -e 's,https://github.com/googleapis/googleapis/archive/${googleapis_rev}.tar.gz,file://${googleapis},' \ + -i cmake/external/googleapis.cmake + + # Fixup the library path. It would build a path like /build/external//nix/store/…-foo/lib/foo.so for each library instead of /build/external/lib64/foo.so + sed -e 's,''${CMAKE_INSTALL_LIBDIR},lib64,g' \ + -e 's,;lib64,lib,g' \ + -i cmake/ExternalProjectHelper.cmake + ''; + + preFixup = '' + mv --no-clobber $out/lib64/cmake/* $out/lib/cmake + mv --no-clobber $out/lib64/pkgconfig/* $out/lib/pkgconfig + rmdir $out/lib64/cmake $out/lib64/pkgconfig + find $out/lib64 + + for file in $out/lib/pkgconfig/*; do + sed -e 's,\''${prefix}//,/,g' -i $file + done + ''; + + cmakeFlags = [ + "-DGOOGLE_CLOUD_CPP_BIGTABLE_ENABLE_INSTALL=no" + "-DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package" + "-DGOOGLE_CLOUD_CPP_GOOGLEAPIS_PROVIDER=external" + "-DBUILD_SHARED_LIBS:BOOL=ON" + "-DGOOGLE_CLOUD_CPP_INSTALL_RPATH=$(out)/lib" + ]; + + meta = with stdenv.lib; { + license = with licenses; [ asl20 ]; + homepage = https://github.com/googleapis/google-cloud-cpp; + description = "C++ Idiomatic Clients for Google Cloud Platform services"; + maintainers = with maintainers; [ andir ]; + }; +} diff --git a/pkgs/development/libraries/hunspell/0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch b/pkgs/development/libraries/hunspell/0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch new file mode 100644 index 000000000000..4607f8b8ee09 --- /dev/null +++ b/pkgs/development/libraries/hunspell/0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch @@ -0,0 +1,37 @@ +From 8c67f314de2684d77315eecd99ef091d441f17dd Mon Sep 17 00:00:00 2001 +From: Matthew Bauer <mjbauer95@gmail.com> +Date: Wed, 24 Jul 2019 15:35:18 -0400 +Subject: [PATCH] Make hunspell look in XDG_DATA_DIRS for dictionaries + +Some dictionaries may exist but only show up under XDG_DATA_DIRS. For +instance, $HOME/.local/share/hunspell could contain some dictionaries. + +This patch adds each directory in the hunspell subdir of each +XDG_DATA_DIRS to the lookup path. + +Upstream pr is available at: https://github.com/hunspell/hunspell/pull/637 +--- + src/tools/hunspell.cxx | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/tools/hunspell.cxx b/src/tools/hunspell.cxx +index 690e34a..6cd127e 100644 +--- a/src/tools/hunspell.cxx ++++ b/src/tools/hunspell.cxx +@@ -2044,6 +2044,13 @@ int main(int argc, char** argv) { + if (getenv("DICPATH")) { + path_std_str.append(getenv("DICPATH")).append(PATHSEP); + } ++ if (getenv("XDG_DATA_DIRS")) { ++ char* dir = strtok(getenv("XDG_DATA_DIRS"), ":"); ++ while (dir != NULL) { ++ path_std_str.append(dir).append("/hunspell:"); ++ dir = strtok(NULL, ":"); ++ } ++ } + path_std_str.append(LIBDIR).append(PATHSEP); + if (HOME) { + const char * userooodir[] = USEROOODIR; +-- +2.22.0 + diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index 3728c05e516c..18e32585ce2a 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses readline ]; nativeBuildInputs = [ autoreconfHook ]; + patches = [ ./0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch ]; + postPatch = '' patchShebangs tests ''; diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index b8de133f5025..1c86830f2582 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -286,10 +286,11 @@ let }; }; -in { +in rec { /* ENGLISH */ + en_US = en-us; en-us = mkDictFromWordlist { shortName = "en-us"; shortDescription = "English (United States)"; @@ -300,6 +301,7 @@ in { }; }; + en_CA = en-ca; en-ca = mkDictFromWordlist { shortName = "en-ca"; shortDescription = "English (Canada)"; @@ -310,6 +312,7 @@ in { }; }; + en_GB-ise = en-gb-ise; en-gb-ise = mkDictFromWordlist { shortName = "en-gb-ise"; shortDescription = "English (United Kingdom, 'ise' ending)"; @@ -320,6 +323,7 @@ in { }; }; + en_GB-ize = en-gb-ize; en-gb-ize = mkDictFromWordlist { shortName = "en-gb-ize"; shortDescription = "English (United Kingdom, 'ize' ending)"; @@ -332,126 +336,147 @@ in { /* SPANISH */ + es_ANY = es-any; es-any = mkDictFromRla { shortName = "es-any"; shortDescription = "Spanish (any variant)"; dictFileName = "es_ANY"; }; + es_AR = es-ar; es-ar = mkDictFromRla { shortName = "es-ar"; shortDescription = "Spanish (Argentina)"; dictFileName = "es_AR"; }; + es_BO = es-bo; es-bo = mkDictFromRla { shortName = "es-bo"; shortDescription = "Spanish (Bolivia)"; dictFileName = "es_BO"; }; + es_CL = es-cl; es-cl = mkDictFromRla { shortName = "es-cl"; shortDescription = "Spanish (Chile)"; dictFileName = "es_CL"; }; + es_CO = es-co; es-co = mkDictFromRla { shortName = "es-co"; shortDescription = "Spanish (Colombia)"; dictFileName = "es_CO"; }; + es_CR = es-cr; es-cr = mkDictFromRla { shortName = "es-cr"; shortDescription = "Spanish (Costra Rica)"; dictFileName = "es_CR"; }; + es_CU = es-cu; es-cu = mkDictFromRla { shortName = "es-cu"; shortDescription = "Spanish (Cuba)"; dictFileName = "es_CU"; }; + es_DO = es-do; es-do = mkDictFromRla { shortName = "es-do"; shortDescription = "Spanish (Dominican Republic)"; dictFileName = "es_DO"; }; + es_EC = es-ec; es-ec = mkDictFromRla { shortName = "es-ec"; shortDescription = "Spanish (Ecuador)"; dictFileName = "es_EC"; }; + es_ES = es-es; es-es = mkDictFromRla { shortName = "es-es"; shortDescription = "Spanish (Spain)"; dictFileName = "es_ES"; }; + es_GT = es-gt; es-gt = mkDictFromRla { shortName = "es-gt"; shortDescription = "Spanish (Guatemala)"; dictFileName = "es_GT"; }; + es_HN = es-hn; es-hn = mkDictFromRla { shortName = "es-hn"; shortDescription = "Spanish (Honduras)"; dictFileName = "es_HN"; }; + es_MX = es-mx; es-mx = mkDictFromRla { shortName = "es-mx"; shortDescription = "Spanish (Mexico)"; dictFileName = "es_MX"; }; + es_NI = es-ni; es-ni = mkDictFromRla { shortName = "es-ni"; shortDescription = "Spanish (Nicaragua)"; dictFileName = "es_NI"; }; + es_PA = es-pa; es-pa = mkDictFromRla { shortName = "es-pa"; shortDescription = "Spanish (Panama)"; dictFileName = "es_PA"; }; + es_PE = es-pe; es-pe = mkDictFromRla { shortName = "es-pe"; shortDescription = "Spanish (Peru)"; dictFileName = "es_PE"; }; + es_PR = es-pr; es-pr = mkDictFromRla { shortName = "es-pr"; shortDescription = "Spanish (Puerto Rico)"; dictFileName = "es_PR"; }; + es_PY = es-py; es-py = mkDictFromRla { shortName = "es-py"; shortDescription = "Spanish (Paraguay)"; dictFileName = "es_PY"; }; + es_SV = es-sv; es-sv = mkDictFromRla { shortName = "es-sv"; shortDescription = "Spanish (El Salvador)"; dictFileName = "es_SV"; }; + es_UY = es-uy; es-uy = mkDictFromRla { shortName = "es-uy"; shortDescription = "Spanish (Uruguay)"; dictFileName = "es_UY"; }; + es_VE = es-ve; es-ve = mkDictFromRla { shortName = "es-ve"; shortDescription = "Spanish (Venezuela)"; @@ -505,6 +530,7 @@ in { /* ITALIAN */ + it_IT = it-it; it-it = mkDictFromLinguistico rec { shortName = "it-it"; dictFileName = "it_IT"; @@ -517,6 +543,7 @@ in { /* BASQUE */ + eu_ES = eu-es; eu-es = mkDictFromXuxen { shortName = "eu-es"; dictFileName = "eu_ES"; @@ -549,6 +576,7 @@ in { /* HUNGARIAN */ + hu_HU = hu-hu; hu-hu = mkDictFromLibreOffice { shortName = "hu-hu"; dictFileName = "hu_HU"; @@ -557,7 +585,8 @@ in { }; /* SWEDISH */ - + + sv_SE = sv-se; sv-se = mkDictFromDSSO rec { shortName = "sv-se"; dictFileName = "sv_SE"; @@ -565,26 +594,30 @@ in { }; # Finlandian Swedish (hello Linus Torvalds) + sv_FI = sv-fi; sv-fi = mkDictFromDSSO rec { shortName = "sv-fi"; dictFileName = "sv_FI"; shortDescription = "Swedish (Finland)"; }; - + /* GERMAN */ + de_DE = de-de; de-de = mkDictFromJ3e { shortName = "de-de"; shortDescription = "German (Germany)"; dictFileName = "de_DE"; }; + de_AT = de-at; de-at = mkDictFromJ3e { shortName = "de-at"; shortDescription = "German (Austria)"; dictFileName = "de_AT"; }; + de_CH = de-ch; de-ch = mkDictFromJ3e { shortName = "de-ch"; shortDescription = "German (Switzerland)"; @@ -593,6 +626,7 @@ in { /* UKRAINIAN */ + uk_UA = uk-ua; uk-ua = mkDict rec { name = "hunspell-dict-uk-ua-${version}"; version = "4.2.5"; diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 8616a0146755..cbedd97b2eec 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { owner = "gphoto"; repo = "libgphoto2"; rev = "${meta.tag}"; - sha256 = "0pbfg89817qkb35mmajsw2iz6j9nhkkj67m419f8x8yxpqkaa0wb"; + sha256 = "1sc2ycx11khf0qzp1cqxxx1qymv6bjfbkx3vvbwz6wnbyvsigxz2"; }; patches = []; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { MTP, and other vendor specific protocols for controlling and transferring data from digital cameras. ''; - version = "2.5.17"; - tag = "libgphoto2-2_5_17-release"; + version = "2.5.23"; + tag = "libgphoto2-2_5_23-release"; # XXX: the homepage claims LGPL, but several src files are lgpl21Plus license = stdenv.lib.licenses.lgpl21Plus; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index de6457db98b2..f833d130fbba 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -83,11 +83,13 @@ stdenv.mkDerivation rec { + "21b342d71c19e6d68b649947f913410fe6129ea4/debian/patches/kubuntu_39_fix_medium_font.diff"; sha256 = "0bli44chn03c2y70w1n8l7ss4ya0b40jqqav8yxrykayi01yf95j"; }) - (fetchpatch { - name = "qt4-gcc6.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qt4-gcc6.patch?h=packages/qt4&id=ca773a144f5abb244ac4f2749eeee9333cac001f"; - sha256 = "07lrva7bjh6i40p7b3ml26a2jlznri8bh7y7iyx5zmvb1gfxmj34"; - }) + # Patch is no longer available from here, so vendoring it for now. + #(fetchpatch { + # name = "qt4-gcc6.patch"; + # url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qt4-gcc6.patch?h=packages/qt4&id=ca773a144f5abb244ac4f2749eeee9333cac001f"; + # sha256 = "07lrva7bjh6i40p7b3ml26a2jlznri8bh7y7iyx5zmvb1gfxmj34"; + #}) + ./qt4-gcc6.patch ] ++ lib.optional gtkStyle (substituteAll ({ src = ./dlopen-gtkstyle.diff; diff --git a/pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch b/pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch new file mode 100644 index 000000000000..000e345cf132 --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch @@ -0,0 +1,33 @@ +--- qt-everywhere-opensource-src-4.8.7/configure.gcc6 2016-04-15 07:04:19.430268222 -0500 ++++ qt-everywhere-opensource-src-4.8.7/configure 2016-04-15 07:05:22.157568689 -0500 +@@ -7744,7 +7744,7 @@ + *-g++*) + # Check gcc's version + case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in +- 5*|4*|3.4*) ++ 8*|7*|6*|5*|4*|3.4*) + ;; + 3.3*) + canBuildWebKit="no" +@@ -8060,7 +8060,7 @@ + 3.*) + COMPILER_VERSION="3.*" + ;; +- 5*|4.*) ++ 8*|7*|6*|5*|4.*) + COMPILER_VERSION="4" + ;; + *) +--- qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.gcc6 2015-05-07 09:14:48.000000000 -0500 ++++ qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h 2016-04-15 07:04:19.431268227 -0500 +@@ -70,8 +70,8 @@ + ForegroundShift = 10, + BackgroundShift = 20, + SpecialShift = 20, +- ForegroundMask = ((1 << ForegroundShift) - 1) << ForegroundShift, +- BackgroundMask = ((1 << BackgroundShift) - 1) << BackgroundShift ++ ForegroundMask = 0x1f << ForegroundShift, ++ BackgroundMask = 0x7 << BackgroundShift + }; + + public: diff --git a/pkgs/development/ocaml-modules/mmap/default.nix b/pkgs/development/ocaml-modules/mmap/default.nix new file mode 100644 index 000000000000..8ae1f4a9d47c --- /dev/null +++ b/pkgs/development/ocaml-modules/mmap/default.nix @@ -0,0 +1,18 @@ +{ lib, buildDunePackage, fetchurl }: + +buildDunePackage rec { + pname = "mmap"; + version = "1.1.0"; + + src = fetchurl { + url = "https://github.com/mirage/mmap/releases/download/v${version}/mmap-v${version}.tbz"; + sha256 = "0l6waidal2n8mkdn74avbslvc10sf49f5d889n838z03pra5chsc"; + }; + + meta = { + homepage = "https://github.com/mirage/mmap"; + description = "Function for mapping files in memory"; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index 1d331090a44f..cb90c2005473 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildOcaml, fetchurl +{ stdenv, fetchurl , ocaml, findlib, pkgconfig, perl , gmp }: @@ -16,31 +16,27 @@ let source = }; in -buildOcaml rec { - name = "zarith"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-zarith-${version}"; inherit (source) version; src = fetchurl { inherit (source) url sha256; }; - minimumSupportedOcamlVersion = "3.12.1"; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ocaml findlib perl ]; propagatedBuildInputs = [ gmp ]; - # needed so setup-hook.sh sets CAML_LD_LIBRARY_PATH for dllzarith.so - hasSharedObjects = true; - patchPhase = "patchShebangs ./z_pp.pl"; configurePhase = '' ./configure -installdir $out/lib/ocaml/${ocaml.version}/site-lib ''; - preInstall = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib"; + + preInstall = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs"; meta = with stdenv.lib; { description = "Fast, arbitrary precision OCaml integers"; homepage = "http://forge.ocamlcore.org/projects/zarith"; license = licenses.lgpl2; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = with maintainers; [ thoughtpolice vbgl ]; }; } diff --git a/pkgs/development/python-modules/django-csp/default.nix b/pkgs/development/python-modules/django-csp/default.nix new file mode 100644 index 000000000000..1eed9578a8a2 --- /dev/null +++ b/pkgs/development/python-modules/django-csp/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchPypi, buildPythonPackage, django }: + +buildPythonPackage rec { + pname = "django-csp"; + version = "3.5"; + + src = fetchPypi { + inherit version; + pname = "django_csp"; + sha256 = "0ks4zszbjx5lyqlc34pjica8hfcjzw4i5m6pivvnyv8yf0vh4q04"; + }; + + # too complicated to setup - needs a running django instance + doCheck = false; + + propagatedBuildInputs = [ django ]; + + meta = with stdenv.lib; { + description = "Adds Content-Security-Policy headers to Django"; + homepage = "https://github.com/mozilla/django-csp"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/jsonmerge/default.nix b/pkgs/development/python-modules/jsonmerge/default.nix new file mode 100644 index 000000000000..44944c03500b --- /dev/null +++ b/pkgs/development/python-modules/jsonmerge/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +, jsonschema +}: + +buildPythonPackage rec { + pname = "jsonmerge"; + version = "1.6.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "03l2j1lrcwcp7af4x8agxnkib0ndybfrbhn2gi7mnk6gbxfw1aw3"; + }; + + propagatedBuildInputs = [ jsonschema ]; + + meta = with lib; { + description = "Merge a series of JSON documents"; + homepage = https://github.com/avian2/jsonmerge; + changelog = "https://github.com/avian2/jsonmerge/blob/jsonmerge-${version}/ChangeLog"; + license = licenses.mit; + maintainers = with maintainers; [ emily ]; + }; +} diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index d8609ca07766..974ac4499ac8 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -2,28 +2,15 @@ buildPythonPackage rec { pname = "pyslurm"; - version = "18-08-3"; + version = "19-05-0"; src = fetchFromGitHub { repo = "pyslurm"; owner = "PySlurm"; rev = version; - sha256 = "1rymx106xa99wd4n44s7jw0w41spg39y1ji4fgn01yk7wjfrdrwg"; + sha256 = "1lfb4q81y96syz5an1lzscfcvmfvlkf4cfl3i5zllw9r3gbarl2r"; }; - # Needed for patch below to apply - prePatch = '' - sed -i -e '/__max_slurm_hex_version__ = "0x1208/c__max_slurm_hex_version__ = "0x120804"' setup.py - ''; - - patches = [ - # Implements a less strict slurm version check - (fetchpatch { - url = "https://github.com/PySlurm/pyslurm/commit/d3703f2d58b5177d29092fe1aae1f7a96da61765.diff"; - sha256 = "1s41z9bhzhplgg08p1llc3i8zw20r1479s04y0l1vx0ak51b6w0k"; - }) - ]; - buildInputs = [ cython slurm ]; setupPyBuildFlags = [ "--slurm-lib=${slurm}/lib" "--slurm-inc=${slurm.dev}/include" ]; diff --git a/pkgs/development/python-modules/wikipedia/default.nix b/pkgs/development/python-modules/wikipedia/default.nix deleted file mode 100644 index 19b7c42558ec..000000000000 --- a/pkgs/development/python-modules/wikipedia/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, beautifulsoup4 -, requests -, python -}: - -buildPythonPackage rec { - pname = "wikipedia"; - version = "1.4.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "db0fad1829fdd441b1852306e9856398204dc0786d2996dd2e0c8bb8e26133b2"; - }; - - propagatedBuildInputs = [ - beautifulsoup4 - requests - ]; - - checkPhase = '' - runHook preCheck - - ${python.interpreter} -m unittest discover tests/ '*test.py' - - runHook postCheck - ''; - - meta = with lib; { - description = "Wikipedia API for Python"; - homepage = https://github.com/goldsmith/Wikipedia; - license = licenses.mit; - maintainers = [ maintainers.worldofpeace ]; - }; -} diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index e0cfe59b0516..cf19862b0056 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk }: let - rev = "a47a965e00ecd66793832e2a12a1972d25e6f734"; - version = "2019-04-05"; + rev = "53f1edc685d8f269ac551336809e34faf7cd29a6"; + version = "2019-08-14"; in stdenv.mkDerivation { name = "sbt-extras-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "1hrz7kg0k2iqq18bg6ll2bdj487p0987880dz0c0g35ah70ps2hj"; + sha256 = "1fyfwcnr30c0rgq6xfd2is9a8j1hsrl2p0xqicwqi4bzijy4r6gw"; }; dontBuild = true; diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix index 653d0d4505e7..1011f95cce7f 100644 --- a/pkgs/development/tools/castxml/default.nix +++ b/pkgs/development/tools/castxml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , pythonPackages , cmake , llvmPackages @@ -19,8 +19,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ] ++ stdenv.lib.optionals withMan [ pythonPackages.sphinx ]; + clangVersion = lib.getVersion llvmPackages.clang; + cmakeFlags = [ - "-DCLANG_RESOURCE_DIR=${llvmPackages.clang-unwrapped}" + "-DCLANG_RESOURCE_DIR=${llvmPackages.clang-unwrapped}/lib/clang/${clangVersion}/" "-DSPHINX_MAN=${if withMan then "ON" else "OFF"}" ]; diff --git a/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch b/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch index a5e4ac461b48..013ac5180afa 100644 --- a/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch +++ b/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch @@ -10,7 +10,7 @@ index f93e67a..2eb2db9 100644 + defaults.variables.STAT = "stat" defaults.variables.STATFLAG = "-f '%A'" - local version = util.popen_read("sw_vers -productVersion") -+ local version = "10.10" ++ local version = os.getenv("MACOSX_DEPLOYMENT_TARGET") or "10.12" version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3 if version >= 10 then version = 8 diff --git a/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch b/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch index 7ef1c7a319ca..4ba883f01130 100644 --- a/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch +++ b/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch @@ -7,7 +7,7 @@ index c5af5a2..1949fdc 100644 defaults.arch = "macosx-"..target_cpu defaults.variables.LIBFLAG = "-bundle -undefined dynamic_lookup -all_load" - local version = util.popen_read("sw_vers -productVersion") -+ local version = "10.10" ++ local version = os.getenv("MACOSX_DEPLOYMENT_TARGET") or "10.12" version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3 if version >= 10 then version = 8 diff --git a/pkgs/development/tools/misc/tinyprog/default.nix b/pkgs/development/tools/misc/tinyprog/default.nix new file mode 100644 index 000000000000..10d067e2c618 --- /dev/null +++ b/pkgs/development/tools/misc/tinyprog/default.nix @@ -0,0 +1,42 @@ +{ lib +, python3Packages +, fetchFromGitHub +}: + +with python3Packages; buildPythonApplication rec { + pname = "tinyprog"; + # `python setup.py --version` from repo checkout + version = "1.0.24.dev99+ga77f828"; + + src = fetchFromGitHub { + owner = "tinyfpga"; + repo = "TinyFPGA-Bootloader"; + rev = "a77f828d3d6ae077e323ec96fc3925efab5aa9d7"; + sha256 = "0jg47q0n1qkdrzri2q6n9a7czicj0qk58asz0xhzkajx1k9z3g5q"; + }; + + sourceRoot = "source/programmer"; + + propagatedBuildInputs = [ + pyserial + jsonmerge + intelhex + tqdm + six + packaging + pyusb + ]; + + nativeBuildInputs = [ setuptools_scm ]; + + preBuild = '' + export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" + ''; + + meta = with lib; { + homepage = https://github.com/tinyfpga/TinyFPGA-Bootloader/tree/master/programmer; + description = "Programmer for FPGA boards using the TinyFPGA USB Bootloader"; + maintainers = with maintainers; [ emily ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 32cd368fb04d..0a36efa79eb4 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -1,18 +1,22 @@ -{ stdenv, rustPlatform, fetchFromGitHub, darwin }: +{ stdenv, rustPlatform, fetchFromGitHub, llvmPackages, darwin }: rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "0.4.12"; + version = "0.4.13"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "0m57v7mh7wdl0rdbad7vkvcgy93p9gcb971wap8i5nzjvzmp4wlb"; + sha256 = "0s3xd9dr0n64j0m38gd4cafrdr5vnpl557ks4wr0jszyhldnlfkz"; }; - cargoSha256 = "1wvqxj2w02d6zhyw3z5v0w4bfmbmldh63ygmvfxa3ngfb36gcacz"; - buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + cargoSha256 = "13zz3n1p75267h3qrmvpmd8agnkbk8vfbr8s38wcyysck81pr4px"; + + buildInputs = [ llvmPackages.libclang ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; meta = with stdenv.lib; { description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 56f550e37a21..92e21bfc00e3 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.21.0"; + version = "0.22.0"; src = let @@ -10,11 +10,11 @@ rustPlatform.buildRustPackage rec { owner = "sagiegurari"; repo = pname; rev = version; - sha256 = "02hxf0mbk4nj9ja1z70k8fskh1kl3pixwy7gx0si5fbp9rmn04wk"; + sha256 = "13nl370immbhjarc0vfzrsflml3alh2f2zrh4znbks4yc3yp790z"; }; cargo-lock = fetchurl { - url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/b6017fd825b52987ac7c3b65620917e5d567312b/cargo-make-Cargo.lock"; - sha256 = "15ajxza58bbviwjxl98c0z89w4430902j0z46b594nbm02kv2ad9"; + url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/d31cfb3598d0a2886abd4d2ed43a02d493c8de8c/cargo-make-Cargo.lock"; + sha256 = "08fzl98d277n9xn3hrg9jahkqwdjfi5saajsppwzdbb3l7xw4jh2"; }; in runCommand "cargo-make-src" {} '' @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "1fsfjavad1cbq1xvck2j5vyppxck606cpmqrwbs4fjvdmlbgx3gp"; + cargoSha256 = "0gj4a15slxnp31mlfgh57h3cwv0lnw5gdmkrmmj79migi96i5i6y"; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 5b1032fb0312..fd7b208fc962 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -764,6 +764,17 @@ let }; }; + delimitMate = buildVimPluginFrom2Nix { + pname = "delimitMate"; + version = "2017-06-19"; + src = fetchFromGitHub { + owner = "Raimondi"; + repo = "delimitMate"; + rev = "728b57a6564c1d2bdfb9b9e0f2f8c5ba3d7e0c5c"; + sha256 = "0fskm9gz81dk8arcidrm71mv72a7isng1clssqkqn5wnygbiimsn"; + }; + }; + denite-extra = buildVimPluginFrom2Nix { pname = "denite-extra"; version = "2019-03-29"; @@ -2168,6 +2179,17 @@ let }; }; + seoul256-vim = buildVimPluginFrom2Nix { + pname = "seoul256-vim"; + version = "2017-09-05"; + src = fetchFromGitHub { + owner = "junegunn"; + repo = "seoul256.vim"; + rev = "1475b7610663c68aa90b6e565997c8792ce0d222"; + sha256 = "03gqw14f5cirivcg1p06g500ns066yv5rd0z3zikvn4ql7n278dk"; + }; + }; + shabadou-vim = buildVimPluginFrom2Nix { pname = "shabadou-vim"; version = "2016-07-19"; @@ -3015,6 +3037,17 @@ let }; }; + vim-cpp-enhanced-highlight = buildVimPluginFrom2Nix { + pname = "vim-cpp-enhanced-highlight"; + version = "2019-07-01"; + src = fetchFromGitHub { + owner = "octol"; + repo = "vim-cpp-enhanced-highlight"; + rev = "da1d86aaf42bd4e52272b5a2f62b098c3986c048"; + sha256 = "02cz8av85pjxpl9ggiy0y0z3gnjvd6ng1pafzv0c64xharg9l5aq"; + }; + }; + vim-csharp = buildVimPluginFrom2Nix { pname = "vim-csharp"; version = "2017-03-29"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 65c0d02bdfc2..59b450820c18 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -137,6 +137,7 @@ JuliaEditorSupport/julia-vim junegunn/fzf.vim junegunn/goyo.vim junegunn/limelight.vim +junegunn/seoul256.vim junegunn/vim-easy-align junegunn/vim-github-dashboard junegunn/vim-peekaboo @@ -282,6 +283,7 @@ noc7c9/vim-iced-coffee-script ntpeters/vim-better-whitespace numirias/semshi nvie/vim-flake8 +octol/vim-cpp-enhanced-highlight OrangeT/vim-csharp osyo-manga/shabadou.vim osyo-manga/vim-anzu @@ -306,6 +308,7 @@ rafaqz/ranger.vim rafi/awesome-vim-colorschemes raghur/vim-ghost raichoo/purescript-vim +Raimondi/delimitMate rakr/vim-one reedes/vim-pencil reedes/vim-wordy diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index 495cd49e3f48..9b5d82b9f7b3 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { - version = "2.0.2"; + version = "2.1.2"; name = "ena-${version}-${kernel.version}"; src = fetchFromGitHub { owner = "amzn"; repo = "amzn-drivers"; rev = "ena_linux_${version}"; - sha256 = "0vb8s0w7ddwajk5gj5nqqlqc63p8p556f9ccwviwda2zvgqmk2pb"; + sha256 = "1dp1q99m2x8hq99his6n62yw0v1lbzrlyv67w1ndc774m2k77r5w"; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/ixgbevf/default.nix b/pkgs/os-specific/linux/ixgbevf/default.nix index 6bcc548ba521..8a860cc14679 100644 --- a/pkgs/os-specific/linux/ixgbevf/default.nix +++ b/pkgs/os-specific/linux/ixgbevf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ixgbevf-${version}-${kernel.version}"; - version = "4.3.4"; + version = "4.6.1"; src = fetchurl { url = "mirror://sourceforge/e1000/ixgbevf-${version}.tar.gz"; - sha256 = "122zn9nd8f95bpidiiinc8xaizypkirqs8vlmsdy2iv3w65md9k3"; + sha256 = "0h8a2g4hm38wmr13gvi2188r7nlv2c5rx6cal9gkf1nh6sla181c"; }; nativeBuildInputs = kernel.moduleBuildDependencies; @@ -17,15 +17,18 @@ stdenv.mkDerivation rec { cd src makeFlagsArray+=(KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build INSTALL_MOD_PATH=$out MANDIR=/share/man) substituteInPlace common.mk --replace /sbin/depmod ${kmod}/bin/depmod + # prevent host system kernel introspection + substituteInPlace common.mk --replace /boot/System.map /not-exists ''; enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "Intel 82599 Virtual Function Driver"; homepage = https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; priority = 20; - broken = (stdenv.lib.versionOlder kernel.version "4.9"); + # kernels ship ixgbevf driver for a long time already, maybe switch to a newest kernel? + broken = versionAtLeast kernel.version "5.2"; }; } diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index 79ee27c52b50..156a4cf44234 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -83,6 +83,9 @@ optionalAttrs (stdenv.hostPlatform.platform.kernelArch == "x86_64") { SLAB_FREELIST_HARDENED = whenAtLeast "4.14" yes; + # Randomize page allocator when page_alloc.shuffle=1 + SHUFFLE_PAGE_ALLOCATOR = whenAtLeast "5.2" yes; + # Allow enabling slub/slab free poisoning with slub_debug=P SLUB_DEBUG = yes; diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix index 226bbfb16df1..de0f36dac5fa 100644 --- a/pkgs/os-specific/windows/pthread-w32/default.nix +++ b/pkgs/os-specific/windows/pthread-w32/default.nix @@ -1,61 +1,29 @@ -{ fetchurl, stdenv, mingwrt }: +{ stdenv, fetchzip }: -# This file is tweaked for cross-compilation only. -assert stdenv.hostPlatform != stdenv.buildPlatform; +stdenv.mkDerivation rec { + name = "pthreads-w32-${version}"; + version = "2.9.1"; -stdenv.mkDerivation { - name = "pthread-w32-1.10.0"; - - src = fetchurl { - url = "ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-1-10-0-release.tar.gz"; - sha256 = "1vllxxfa9a7mssb1x98a2r736vsv5ll3sjizbr7a8hw8j9p18j7n"; + src = fetchzip { + url = "https://sourceware.org/pub/pthreads-win32/pthreads-w32-2-9-1-release.tar.gz"; + sha256 = "1s8iny7g06z289ahdj0kzaxj0cd3wvjbd8j3bh9xlg7g444lhy9w"; }; - configurePhase = - '' sed -i GNUmakefile \ - -e 's/CC=gcc/CC=i686-pc-mingw32-gcc/g ; - s/windres/i686-pc-mingw32-windres/g ; - s/dlltool/i686-pc-mingw32-dlltool/g' - ''; - - buildInputs = [ mingwrt ]; - - buildPhase = "make GC"; # to build the GNU C dll with C cleanup code - - installPhase = - '' mkdir -p "$out" "$out/include" "$out/lib" - cp -v *pthread*{dll,a} "$out/lib" - cp -v pthread.h semaphore.h sched.h "$out/include" - ''; - - postFixup = - # By default `mingw_headers' is propagated. Prevent that, because - # otherwise MinGW headers appear twice in `-I', and thus the - # "#include_next <float.h>" in MinGW's <float.h> picks up itself instead - # of picking up GCC's (hence, FLT_RADIX is left undefined, for instance.) - '' rm -f "$out/nix-support/propagated-build-inputs" - ''; - - meta = { - description = "POSIX threads for Woe32"; + makeFlags = [ "CROSS=${stdenv.cc.targetPrefix}" "GC-static" ]; - longDescription = - '' The POSIX 1003.1-2001 standard defines an application programming - interface (API) for writing multithreaded applications. This - interface is known more commonly as pthreads. A good number of - modern operating systems include a threading library of some kind: - Solaris (UI) threads, Win32 threads, DCE threads, DECthreads, or any - of the draft revisions of the pthreads standard. The trend is that - most of these systems are slowly adopting the pthreads standard API, - with application developers following suit to reduce porting woes. + installPhase = '' + runHook preInstall - Woe32 does not, and is unlikely to ever, support pthreads natively. - This project seeks to provide a freely available and high-quality - solution to this problem. - ''; + install -D libpthreadGC2.a $out/lib/libpthread.a - homepage = http://sourceware.org/pthreads-win32/; + runHook postInstall + ''; - license = stdenv.lib.licenses.lgpl21Plus; + meta = with stdenv.lib; { + description = "POSIX threads library for Windows"; + homepage = "https://sourceware.org/pthreads-win32"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ yegortimoshenko ]; + platforms = platforms.windows; }; } diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index c18e71977d87..1b3e5466ec39 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "slurm-${version}"; - version = "19.05.1.2"; + version = "19.05.2.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${builtins.replaceStrings ["."] ["-"] name}"; - sha256 = "1r2hxfshz929fcys90rmnj8s7f204q364m6bazhiy8hhm3bsf42k"; + sha256 = "1k19z0qyjr6nwqxv93wbnnhy498788rc4fl9zyf0smc5yq1zbjir"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix index 3b4a0543e189..dcaa8d5e1fad 100644 --- a/pkgs/servers/sql/pgbouncer/default.nix +++ b/pkgs/servers/sql/pgbouncer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, libevent }: +{ stdenv, fetchurl, openssl, libevent, c-ares, pkg-config }: stdenv.mkDerivation rec { name = "pgbouncer-${version}"; @@ -9,12 +9,12 @@ stdenv.mkDerivation rec { sha256 = "1m8vsxyna5grs5p0vnxf3fxxnkk9aqjf3qmr2bbkpkhlzr11986q"; }; - buildInputs = [ libevent openssl ]; + buildInputs = [ libevent openssl c-ares pkg-config ]; meta = with stdenv.lib; { homepage = https://pgbouncer.github.io; description = "Lightweight connection pooler for PostgreSQL"; license = licenses.isc; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/tools/X11/xkbvalidate/default.nix b/pkgs/tools/X11/xkbvalidate/default.nix index f5a264108359..92a47aa65638 100644 --- a/pkgs/tools/X11/xkbvalidate/default.nix +++ b/pkgs/tools/X11/xkbvalidate/default.nix @@ -5,11 +5,11 @@ runCommandCC "xkbvalidate" { meta = { description = "NixOS tool to validate X keyboard configuration"; license = lib.licenses.mit; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = [ lib.maintainers.aszlig ]; }; } '' mkdir -p "$out/bin" - gcc -std=gnu11 -Wall -pedantic -lxkbcommon ${./xkbvalidate.c} \ - -o "$out/bin/validate" + $CC -std=c11 -Wall -pedantic -lxkbcommon ${./xkbvalidate.c} \ + -o "$out/bin/xkbvalidate" '' diff --git a/pkgs/tools/X11/xkbvalidate/xkbvalidate.c b/pkgs/tools/X11/xkbvalidate/xkbvalidate.c index d9c9042467c0..d25eef154b3c 100644 --- a/pkgs/tools/X11/xkbvalidate/xkbvalidate.c +++ b/pkgs/tools/X11/xkbvalidate/xkbvalidate.c @@ -1,4 +1,3 @@ -#define _GNU_SOURCE #include <stdarg.h> #include <stdbool.h> #include <stdio.h> @@ -14,6 +13,9 @@ static bool log_alloc_success = true; static void add_log(struct xkb_context *ctx, enum xkb_log_level level, const char *fmt, va_list args) { + size_t buflen; + va_list tmpargs; + log_buffer_size++; if (log_buffer == NULL) @@ -28,11 +30,24 @@ static void add_log(struct xkb_context *ctx, enum xkb_log_level level, return; } - if (vasprintf(&log_buffer[log_buffer_size - 1], fmt, args) == -1) { + /* Unfortunately, vasprintf() is a GNU extension and thus not very + * portable, so let's first get the required buffer size using a dummy + * vsnprintf and afterwards allocate the returned amount of bytes. + * + * We also need to make a copy of the args, because the value of the args + * will be indeterminate after the return. + */ + va_copy(tmpargs, args); + buflen = vsnprintf(NULL, 0, fmt, tmpargs); + va_end(tmpargs); + + log_buffer[log_buffer_size - 1] = malloc(++buflen); + + if (vsnprintf(log_buffer[log_buffer_size - 1], buflen, fmt, args) == -1) { perror("log line alloc"); log_alloc_success = false; - return; } + va_end(args); } static void print_logs(void) diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix index 1bd8ebfd44b6..b71f032bd7ae 100644 --- a/pkgs/tools/backup/s3ql/default.nix +++ b/pkgs/tools/backup/s3ql/default.nix @@ -1,33 +1,35 @@ -{ stdenv, fetchurl, python3Packages, sqlite, which }: +{ stdenv, fetchFromGitHub, python3Packages, sqlite, which }: python3Packages.buildPythonApplication rec { - name = "${pname}-${version}"; pname = "s3ql"; - version = "2.26"; + version = "3.2"; - src = fetchurl { - url = "https://bitbucket.org/nikratio/${pname}/downloads/${name}.tar.bz2"; - sha256 = "0xs1jbak51zwjrd6jmd96xl3a3jpw0p1s05f7sw5wipvvg0xnmfn"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "release-${version}"; + sha256 = "01ky0jc1s3w9dry5siz9b69jf2maiargz99axgxvyihap0d7qs52"; }; - buildInputs = [ which ]; # tests will fail without which + checkInputs = [ which ] ++ (with python3Packages; [ cython pytest ]); propagatedBuildInputs = with python3Packages; [ sqlite apsw pycrypto requests defusedxml dugong llfuse - cython pytest pytest-catchlog + cython pytest pytest-catchlog google_auth google-auth-oauthlib ]; preBuild = '' - # https://bitbucket.org/nikratio/s3ql/issues/118/no-module-named-s3qldeltadump-running#comment-16951851 ${python3Packages.python.interpreter} ./setup.py build_cython build_ext --inplace ''; checkPhase = '' + # Removing integration tests + rm tests/t{4,5,6}_* pytest tests ''; meta = with stdenv.lib; { description = "A full-featured file system for online data storage"; - homepage = https://bitbucket.org/nikratio/s3ql; + homepage = "https://github.com/s3ql/s3ql/"; license = licenses.gpl3; maintainers = with maintainers; [ rushmorem ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix index 23646abe7875..74b1f96fad8a 100644 --- a/pkgs/tools/misc/noti/default.nix +++ b/pkgs/tools/misc/noti/default.nix @@ -1,19 +1,20 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, Cocoa }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub +, Cocoa ? null }: buildGoPackage rec { - name = "noti-${version}"; - version = "3.1.0"; + pname = "noti"; + version = "3.2.0"; src = fetchFromGitHub { owner = "variadico"; repo = "noti"; - rev = "${version}"; - sha256 = "1chsqfqk0pnhx5k2nr4c16cpb8m6zv69l1jvv4v4903zgfzcm823"; + rev = version; + sha256 = "1lw1wmw2m83m0s5znb4gliywjpg74qrhrj6rwpcb5p352c4vbwxs"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = lib.optional stdenv.isDarwin Cocoa; # TODO: Remove this when we update apple_sdk - NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.isDarwin [ "-fno-objc-arc" ]; + NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-fno-objc-arc"; goPackagePath = "github.com/variadico/noti"; @@ -22,12 +23,11 @@ buildGoPackage rec { ''; postInstall = '' - mkdir -p $out/share/man/man{1,5}/ - cp $src/docs/man/noti.1 $out/share/man/man1/ - cp $src/docs/man/noti.yaml.5 $out/share/man/man5/ + install -Dm444 -t $out/share/man/man1 $src/docs/man/*.1 + install -Dm444 -t $out/share/man/man5 $src/docs/man/*.5 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Monitor a process and trigger a notification."; longDescription = '' Monitor a process and trigger a notification. @@ -36,7 +36,7 @@ buildGoPackage rec { ''; homepage = https://github.com/variadico/noti; license = licenses.mit; - maintainers = [ maintainers.stites ]; + maintainers = with maintainers; [ stites ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index 59242551f929..d00e37372378 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -30,7 +30,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ libcap ncurses ] ++ stdenv.lib.optional withGtk gtk2; + buildInputs = [ ncurses ] + ++ stdenv.lib.optional withGtk gtk2 + ++ stdenv.lib.optional stdenv.isLinux libcap; enableParallelBuilding = true; diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index c869c4b11a5c..ee9554cc09f9 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "inxi-${version}"; - version = "3.0.35-1"; + version = "3.0.36-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "1rvidz2b9zp3ikkcjf8zr5r8r9mxnw3zgly2pvlim11kkp76zdl9"; + sha256 = "04134l323vwd0g2bffj11rnpw2jgs9la6aqrmv8vh7w9mq5nd57y"; }; buildInputs = [ perl ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7f5ccb6dbe0..dcba04a43b6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -760,6 +760,8 @@ in crumbs = callPackage ../applications/misc/crumbs { }; + crc32c = callPackage ../development/libraries/crc32c { }; + cue = callPackage ../development/tools/cue { }; deskew = callPackage ../applications/graphics/deskew { }; @@ -3453,6 +3455,8 @@ in google-music-scripts = callPackage ../tools/audio/google-music-scripts { }; + google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { }; + gopro = callPackage ../tools/video/gopro { }; gource = callPackage ../applications/version-management/gource { }; @@ -6382,6 +6386,8 @@ in tinyemu = callPackage ../applications/virtualization/tinyemu { }; + tinyprog = callPackage ../development/tools/misc/tinyprog { }; + tinyproxy = callPackage ../tools/networking/tinyproxy {}; tio = callPackage ../tools/misc/tio { }; @@ -10768,6 +10774,8 @@ in ghp-import = callPackage ../development/tools/ghp-import { }; + ghcid = haskellPackages.ghcid.bin; + icon-lang = callPackage ../development/interpreters/icon-lang { }; libgit2 = callPackage ../development/libraries/git2 { @@ -24227,6 +24235,8 @@ in jx = callPackage ../applications/networking/cluster/jx {}; + prow = callPackage ../applications/networking/cluster/prow {}; + inherit (callPackage ../applications/networking/cluster/terraform {}) terraform_0_11 terraform_0_11-full diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index b5ec6ed335b2..f42b9fd2e33c 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -450,6 +450,8 @@ let mlgmpidl = callPackage ../development/ocaml-modules/mlgmpidl { }; + mmap = callPackage ../development/ocaml-modules/mmap { }; + mparser = callPackage ../development/ocaml-modules/mparser { }; mstruct = callPackage ../development/ocaml-modules/mstruct { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 152c5c26122b..4e0c9b498acd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2436,6 +2436,8 @@ in { jsmin = callPackage ../development/python-modules/jsmin { }; + jsonmerge = callPackage ../development/python-modules/jsonmerge { }; + jsonpatch = callPackage ../development/python-modules/jsonpatch { }; jsonpickle = callPackage ../development/python-modules/jsonpickle { }; @@ -2816,6 +2818,8 @@ in { django-cors-headers = callPackage ../development/python-modules/django-cors-headers { }; + django-csp = callPackage ../development/python-modules/django-csp { }; + django-discover-runner = callPackage ../development/python-modules/django-discover-runner { }; django_environ = callPackage ../development/python-modules/django_environ { }; @@ -5003,8 +5007,6 @@ in { wordfreq = callPackage ../development/python-modules/wordfreq { }; - wikipedia = callPackage ../development/python-modules/wikipedia { }; - magic-wormhole = callPackage ../development/python-modules/magic-wormhole { }; magic-wormhole-mailbox-server = callPackage ../development/python-modules/magic-wormhole-mailbox-server { }; |