diff options
Diffstat (limited to 'pkgs')
181 files changed, 1570 insertions, 586 deletions
diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index c5754a199baef..0affe5dc89d4e 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -2,7 +2,7 @@ , python3Packages, gnome3, gtk3, gobjectIntrospection}: let - inherit (python3Packages) buildPythonApplication python isPy3k dbus-python pygobject3 mpd2; + inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2; in buildPythonApplication rec { pname = "sonata"; version = "1.7b1"; diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix index f357972c44918..04de4f564c338 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -2,7 +2,7 @@ , coreutils, gnugrep, which, git, unzip, libsecret }: -{ name, product, version, src, wmClass, jdk, meta } @ attrs: +{ name, product, version, src, wmClass, jdk, meta }: with stdenv.lib; diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index ec92638f85590..836a78ce058bd 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -10,11 +10,11 @@ mkDerivation rec { name = "krita-${version}"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz"; - sha256 = "1mbyybc7h3sblbaklvz0cci3ys4zcyi616fgdn06p62v2vw2sybq"; + sha256 = "1qz9bjvnwa5gc2b0063i2p72jq6y1b6kgqdj39599acp7ws11asw"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index 50862a4583b4d..05d047f722750 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -17,12 +17,12 @@ }: stdenv.mkDerivation rec { - version = "3.10.0"; + version = "3.10.2"; src = fetchFromGitHub { owner = "nomacs"; repo = "nomacs"; rev = version; - sha256 = "07k921r4m6p5kicyb55zdfp58m8mlc94g2csq354d7v20m71zwrv"; + sha256 = "0v2gsdc8caswf2b5aa023d8kil1fqf4r9mlg15180h3c92f8jzvh"; }; name = "nomacs-${version}"; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 8e553af52505d..0fa859ac84bbc 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.27.1"; + version = "3.28.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "0hmdlnwrfql2b675xmjf50hnnrrkv5jbky0ssdpyfjfa5vxya2bh"; + sha256 = "0b3vv03c6m6972sk8zj3zc5sq6b9837irnfgjlqhv9z5i75m0414"; }; patches = [ diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix index 57dc68263ac4e..8bf779185b36b 100644 --- a/pkgs/applications/misc/guake/default.nix +++ b/pkgs/applications/misc/guake/default.nix @@ -2,7 +2,7 @@ , gtk3, keybinder3, libnotify, libutempter, vte }: let - version = "3.3.0"; + version = "3.3.2"; in python3.pkgs.buildPythonApplication rec { name = "guake-${version}"; format = "other"; @@ -11,7 +11,7 @@ in python3.pkgs.buildPythonApplication rec { owner = "Guake"; repo = "guake"; rev = version; - sha256 = "1wckzz18rpgacnkynh4rknhhki52agd76i2p80kk9rlrdifqs788"; + sha256 = "0cz58wfsa66j01sqpka7908ilj5ch3jdxaxzqdi8yspqwzz5iwc7"; }; nativeBuildInputs = [ gettext gobjectIntrospection wrapGAppsHook python3.pkgs.pip glibcLocales ]; diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index ee3cb9cd8ed4d..5f12bdb4dfcdb 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -1,7 +1,6 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, xlibsWrapper, libX11, libXi, libXtst, libXrandr -, xinput, curl, openssl, unzip }: - -with stdenv.lib; +{ stdenv, lib, fetchFromGitHub, fetchpatch, fetchurl, cmake, xlibsWrapper +, ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver +, libX11, libXi, libXtst, libXrandr, xinput, curl, openssl, unzip }: stdenv.mkDerivation rec { name = "synergy-${version}"; @@ -14,17 +13,33 @@ stdenv.mkDerivation rec { sha256 = "0ksgr9hkf09h54572p7k7b9zkfhcdb2g2d5x7ixxn028y8i3jyp3"; }; - patches = [ ./openssl-1.1.patch ]; + patches = [./openssl-1.1.patch ./update_gtest_gmock.patch + ] ++ lib.optional stdenv.isDarwin ./respect_macos_arch.patch; patch_gcc6 = fetchpatch { url = https://raw.githubusercontent.com/gentoo/gentoo/20e2bff3697ebf5f291e9907b34aae3074a36b53/dev-cpp/gmock/files/gmock-1.7.0-gcc6.patch; sha256 = "0j3f381x1lf8qci9pfv6mliggl8qs2w05v5lw3rs3gn7aibg174d"; }; + # Due to the included gtest and gmock not supporting clang + # we replace it with 1.7.0 for synergy-1.8.8. This should + # become unnecessary when we update to a newer version of Synergy. + gmock_zip = fetchurl { + url = https://github.com/google/googlemock/archive/release-1.7.0.zip; + sha256 = "11bd04098rzamv7f9y01zaf9c8zrmzdk6g1qrlwq780pxzlr4ya0"; + }; + + gtest_zip = fetchurl { + url = https://github.com/google/googletest/archive/release-1.7.0.zip; + sha256 = "1l5n6kzdypjzjrz2jh14ylzrx735lccfx2p3s4ccgci8g9abg35m"; + }; + postPatch = '' - ${unzip}/bin/unzip -d ext/gmock-1.6.0 ext/gmock-1.6.0.zip - ${unzip}/bin/unzip -d ext/gtest-1.6.0 ext/gtest-1.6.0.zip - patch -d ext/gmock-1.6.0 -p1 -i ${patch_gcc6} + ${unzip}/bin/unzip -d ext/ ${gmock_zip} + ${unzip}/bin/unzip -d ext/ ${gtest_zip} + mv ext/googlemock-release-1.7.0 ext/gmock-1.7.0 + mv ext/googletest-release-1.7.0 ext/gtest-1.7.0 + patch -d ext/gmock-1.7.0 -p1 -i ${patch_gcc6} '' # We have XRRNotifyEvent (libXrandr), but with the upstream CMakeLists.txt # it's not able to find it (it's trying to search the store path of libX11 @@ -38,15 +53,19 @@ stdenv.mkDerivation rec { # Looking for XRRNotifyEvent - not found # # So let's force it: - + optionalString stdenv.isLinux '' + + lib.optionalString stdenv.isLinux '' sed -i -e '/HAVE_X11_EXTENSIONS_XRANDR_H/c \ set(HAVE_X11_EXTENSIONS_XRANDR_H true) ' CMakeLists.txt ''; + cmakeFlags = lib.optionals stdenv.isDarwin [ "-DOSX_TARGET_MAJOR=10" "-DOSX_TARGET_MINOR=7" ]; + buildInputs = [ - cmake xlibsWrapper libX11 libXi libXtst libXrandr xinput curl openssl - ]; + cmake curl openssl + ] ++ lib.optionals stdenv.isDarwin [ + ApplicationServices Carbon Cocoa CoreServices ScreenSaver + ] ++ lib.optionals stdenv.isLinux [ xlibsWrapper libX11 libXi libXtst libXrandr xinput ]; installPhase = '' mkdir -p $out/bin @@ -58,12 +77,11 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = "../bin/unittests"; - meta = { + meta = with lib; { description = "Share one mouse and keyboard between multiple computers"; homepage = http://synergy-project.org/; license = licenses.gpl2; - maintainers = [ maintainers.aszlig ]; + maintainers = with maintainers; [ aszlig enzime ]; platforms = platforms.all; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/misc/synergy/respect_macos_arch.patch b/pkgs/applications/misc/synergy/respect_macos_arch.patch new file mode 100644 index 0000000000000..003d7d22421a1 --- /dev/null +++ b/pkgs/applications/misc/synergy/respect_macos_arch.patch @@ -0,0 +1,61 @@ +From 944177c76d4c7ff5ef3460eab28286a45344a0e7 Mon Sep 17 00:00:00 2001 +From: Michael Hoang <enzime@users.noreply.github.com> +Date: Sat, 14 Jul 2018 21:56:59 +1000 +Subject: [PATCH 2/2] Make sure CMake respects the current arch on macOS + +Only set the macOS architecture if not defined by the user. Use the +OpenSSL libraries and headers from Nix on macOS to prevent architecture +mismatches. +--- + CMakeLists.txt | 2 +- + src/CMakeLists.txt | 14 +------------- + 2 files changed, 2 insertions(+), 14 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2f37424d..c7217e28 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -172,7 +172,7 @@ if (UNIX) + # <= 10.5: 32-bit Intel and PowerPC + set(CMAKE_OSX_ARCHITECTURES "ppc;i386" + CACHE STRING "" FORCE) +- else() ++ elseif (NOT CMAKE_OSX_ARCHITECTURES) + # >= 10.6: Intel only + set(CMAKE_OSX_ARCHITECTURES "i386" + CACHE STRING "" FORCE) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 237ba484..04428636 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -23,11 +23,6 @@ if (WIN32) + set(OPENSSL_INCLUDE ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/inc32) + endif() + +-if (APPLE) +- set(OPENSSL_PLAT_DIR openssl-osx) +- set(OPENSSL_INCLUDE ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/include) +-endif() +- + if (WIN32) + set(OPENSSL_LIBS + ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/out32dll/libeay32.lib +@@ -36,14 +31,7 @@ if (WIN32) + endif() + + if (UNIX) +- if (APPLE) +- set(OPENSSL_LIBS +- ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/libssl.a +- ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/libcrypto.a +- ) +- else() +- set(OPENSSL_LIBS ssl crypto) +- endif() ++ set(OPENSSL_LIBS ssl crypto) + endif() + + add_subdirectory(lib) +-- +2.17.1 + diff --git a/pkgs/applications/misc/synergy/update_gtest_gmock.patch b/pkgs/applications/misc/synergy/update_gtest_gmock.patch new file mode 100644 index 0000000000000..87b53e78585b9 --- /dev/null +++ b/pkgs/applications/misc/synergy/update_gtest_gmock.patch @@ -0,0 +1,158 @@ +From eea85dbf4bbde545d8cb07d7ee9fbdca3dcf48fd Mon Sep 17 00:00:00 2001 +From: Michael Hoang <enzime@users.noreply.github.com> +Date: Sat, 14 Jul 2018 22:07:39 +1000 +Subject: [PATCH 1/2] Update gtest and gmock to version 1.7.0 + +Fixes compilation under clang on macOS as <tr1/tuple> is now found under +<tuple>. +--- + CMakeLists.txt | 2 +- + ext/toolchain/commands1.py | 4 ++-- + src/lib/platform/CMakeLists.txt | 2 +- + src/lib/server/CMakeLists.txt | 2 +- + src/lib/shared/CMakeLists.txt | 2 +- + src/lib/synergy/CMakeLists.txt | 2 +- + src/test/CMakeLists.txt | 12 ++++++------ + src/test/integtests/CMakeLists.txt | 4 ++-- + src/test/unittests/CMakeLists.txt | 4 ++-- + 9 files changed, 17 insertions(+), 17 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 94c474e8..2f37424d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -178,7 +178,7 @@ if (UNIX) + CACHE STRING "" FORCE) + endif() + +- set(CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS} -DGTEST_USE_OWN_TR1_TUPLE=1") ++ set(CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS}") + + find_library(lib_ScreenSaver ScreenSaver) + find_library(lib_IOKit IOKit) +diff --git a/ext/toolchain/commands1.py b/ext/toolchain/commands1.py +index f32ec483..bf997cf6 100644 +--- a/ext/toolchain/commands1.py ++++ b/ext/toolchain/commands1.py +@@ -251,10 +251,10 @@ class InternalCommands: + macIdentity = None + + # gtest dir with version number +- gtestDir = 'gtest-1.6.0' ++ gtestDir = 'gtest-1.7.0' + + # gmock dir with version number +- gmockDir = 'gmock-1.6.0' ++ gmockDir = 'gmock-1.7.0' + + win32_generators = { + 1 : VisualStudioGenerator('10'), +diff --git a/src/lib/platform/CMakeLists.txt b/src/lib/platform/CMakeLists.txt +index 481d8ef9..1ce67eca 100644 +--- a/src/lib/platform/CMakeLists.txt ++++ b/src/lib/platform/CMakeLists.txt +@@ -31,7 +31,7 @@ endif() + + include_directories( + ../ +- ../../../ext/gtest-1.6.0/include ++ ../../../ext/gtest-1.7.0/include + ) + + if (UNIX) +diff --git a/src/lib/server/CMakeLists.txt b/src/lib/server/CMakeLists.txt +index 3cb582ec..0525d627 100644 +--- a/src/lib/server/CMakeLists.txt ++++ b/src/lib/server/CMakeLists.txt +@@ -24,7 +24,7 @@ endif() + include_directories( + ../ + ../../../ext +- ../../../ext/gtest-1.6.0/include ++ ../../../ext/gtest-1.7.0/include + ) + + if (UNIX) +diff --git a/src/lib/shared/CMakeLists.txt b/src/lib/shared/CMakeLists.txt +index 891f4aa7..16c8b04a 100644 +--- a/src/lib/shared/CMakeLists.txt ++++ b/src/lib/shared/CMakeLists.txt +@@ -25,7 +25,7 @@ add_library(shared STATIC ${sources}) + include_directories( + ../ + ../../../ext +- ../../../ext/gtest-1.6.0/include ++ ../../../ext/gtest-1.7.0/include + ) + + target_link_libraries(shared arch base) +diff --git a/src/lib/synergy/CMakeLists.txt b/src/lib/synergy/CMakeLists.txt +index 0972be8c..e19fcce5 100644 +--- a/src/lib/synergy/CMakeLists.txt ++++ b/src/lib/synergy/CMakeLists.txt +@@ -36,7 +36,7 @@ endif() + include_directories( + ../ + ../../../ext +- ../../../ext/gtest-1.6.0/include ++ ../../../ext/gtest-1.7.0/include + ) + + if (UNIX) +diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt +index 8812150a..04cdfc50 100644 +--- a/src/test/CMakeLists.txt ++++ b/src/test/CMakeLists.txt +@@ -15,13 +15,13 @@ + # along with this program. If not, see <http://www.gnu.org/licenses/>. + + include_directories( +- ../../ext/gtest-1.6.0 +- ../../ext/gtest-1.6.0/include +- ../../ext/gmock-1.6.0 +- ../../ext/gmock-1.6.0/include) ++ ../../ext/gtest-1.7.0 ++ ../../ext/gtest-1.7.0/include ++ ../../ext/gmock-1.7.0 ++ ../../ext/gmock-1.7.0/include) + +-add_library(gtest STATIC ../../ext/gtest-1.6.0/src/gtest-all.cc) +-add_library(gmock STATIC ../../ext/gmock-1.6.0/src/gmock-all.cc) ++add_library(gtest STATIC ../../ext/gtest-1.7.0/src/gtest-all.cc) ++add_library(gmock STATIC ../../ext/gmock-1.7.0/src/gmock-all.cc) + + if (UNIX) + # ignore warnings in gtest and gmock +diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt +index 2f1ca7f3..6ddbd29a 100644 +--- a/src/test/integtests/CMakeLists.txt ++++ b/src/test/integtests/CMakeLists.txt +@@ -56,8 +56,8 @@ endif() + include_directories( + ../../ + ../../lib/ +- ../../../ext/gtest-1.6.0/include +- ../../../ext/gmock-1.6.0/include ++ ../../../ext/gtest-1.7.0/include ++ ../../../ext/gmock-1.7.0/include + ) + + if (UNIX) +diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt +index 3e49dc3c..5f6c4fac 100644 +--- a/src/test/unittests/CMakeLists.txt ++++ b/src/test/unittests/CMakeLists.txt +@@ -51,8 +51,8 @@ list(APPEND headers ${platform_sources}) + include_directories( + ../../ + ../../lib/ +- ../../../ext/gtest-1.6.0/include +- ../../../ext/gmock-1.6.0/include ++ ../../../ext/gtest-1.7.0/include ++ ../../../ext/gmock-1.7.0/include + ../../../ext + ) + +-- +2.17.1 + diff --git a/pkgs/applications/networking/bittorrentsync/generic.nix b/pkgs/applications/networking/bittorrentsync/generic.nix index eb988471c8c73..dae540ba4260f 100644 --- a/pkgs/applications/networking/bittorrentsync/generic.nix +++ b/pkgs/applications/networking/bittorrentsync/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, version, sha256s, ... } @ args: +{ stdenv, fetchurl, version, sha256s, ... }: let arch = { diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index d2bb04251705f..51618a479d423 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -64,8 +64,6 @@ let version = chromium.browser.version; - inherit (stdenv.lib) versionAtLeast; - in stdenv.mkDerivation { name = "chromium${suffix}-${version}"; inherit version; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index a857468018601..f38d0d53c6f03 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -40,11 +40,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.14.3"; + version = "1.14.4"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1z8z32d7ic28zg4mgk3cjmzb6kpism7xzym2ng25b0ndf72g1vfi"; + sha256 = "0590r7748kv6g7zygq95v8qxf7vi2n5ypj6734x9yshrn8z6p8lr"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 196cbb70b4e19..72812563b099b 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -11,8 +11,7 @@ assert pulseaudioSupport -> libpulseaudio != null; let - inherit (stdenv.lib) concatStringsSep makeBinPath makeLibraryPath - makeSearchPath optional optionalString; + inherit (stdenv.lib) concatStringsSep makeBinPath optional; version = "2.2.128200.0702"; srcs = { diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index dcd16c7c5b2be..16162435e09ab 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -15,7 +15,7 @@ , runCommand }: let - inherit (pythonPackages) python pycrypto pync; + inherit (pythonPackages) python; plugins = [ { name = "perl"; enabled = perlSupport; cmakeFlag = "ENABLE_PERL"; buildInputs = [ perl ]; } { name = "tcl"; enabled = tclSupport; cmakeFlag = "ENABLE_TCL"; buildInputs = [ tcl ]; } diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 81cf4541222f8..f2c097a43752a 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mutt-${version}"; - version = "1.10.0"; + version = "1.10.1"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz"; - sha256 = "0nskymwr2cdapxlfv0ysz3bjwhb4kcvl5a3c39237k7r1vwva582"; + sha256 = "182lkbkpd3q3l1x6bvyds90ycp38gyyxhf35ry0d3hwf2n1khjkk"; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 33ccec355117d..f082c241a64c1 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -15,14 +15,14 @@ let ''; in stdenv.mkDerivation rec { - version = "20180622"; + version = "20180716"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "0rwrxghsxbkbkdyi0544nglip8ri2xi8fn15m0wg5hg52xzcq40i"; + sha256 = "0im2kkahkr04q04irvcimfawxi531ld6wrsa92r2m7l10gmijkl8"; }; buildInputs = [ @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { --replace /etc/mime.types ${mime-types}/etc/mime.types # The string conversion tests all fail with the first version of neomutt - # that has tests (20180223) as well as 20180622 so we disable them for now. + # that has tests (20180223) as well as 20180716 so we disable them for now. # I don't know if that is related to the tests or our build environment. # Try again with a later release. sed -i '/rfc2047/d' test/Makefile.autosetup test/main.c diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix index 9e6243c54980a..b787a4e7a01ce 100644 --- a/pkgs/applications/science/logic/acgtk/default.nix +++ b/pkgs/applications/science/logic/acgtk/default.nix @@ -4,8 +4,7 @@ installExamples ? true, installEmacsMode ? true }: -let inherit (stdenv.lib) versionAtLeast - optionals optionalString; in +let inherit (stdenv.lib) versionAtLeast optionalString; in let inherit (ocamlPackages) ocaml camlp4; in diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 1f540cc2b287a..63b751b814ee1 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -3,7 +3,7 @@ }: let - inherit (nixpkgs) fetchpatch fetchurl symlinkJoin fetchFromGitHub callPackage nodePackages_8_x; + inherit (nixpkgs) fetchpatch fetchurl symlinkJoin callPackage nodePackages_8_x; # https://trac.sagemath.org/ticket/15980 for tracking of python3 support python = nixpkgs.python2.override { diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index 9bccbdb5049ba..63894cc3dcdb5 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, gettext, git }: let - inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify python mock; + inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify; in buildPythonApplication rec { name = "git-cola-${version}"; version = "3.1"; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 3fb9b9492af2d..9a7609684b582 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "3.6.4"; + version = "3.6.6"; src = fetchurl { url = "https://release.gitkraken.com/linux/v${version}.deb"; - sha256 = "0n14lwmga0hhi4m4pwgpzpxmsmfy6an7b2pk59afsydhxjj88z4x"; + sha256 = "01ir325ls1fb6ml79c02c7dyi910lxw0avlwc0nzv8fy4aqavl6p"; }; libPath = makeLibraryPath [ diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index d786e93967528..a4cb1f5b63bbf 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -56,8 +56,8 @@ in python2Packages.buildPythonApplication { meta = { inherit version; description = "A fast, lightweight SCM system for very large distributed projects"; - homepage = http://mercurial.selenic.com/; - downloadPage = "http://mercurial.selenic.com/release/"; + homepage = https://www.mercurial-scm.org; + downloadPage = https://www.mercurial-scm.org/release/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.eelco ]; updateWalker = true; diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index 4235ebb802ed4..090afde819949 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -7,23 +7,10 @@ , fontconfig, intltool }: stdenv.mkDerivation { - name = "cinelerra-git"; - - # # REGION AUTO UPDATE: { name="cinelerra"; type="git"; url="git://git.cinelerra.org/j6t/cinelerra.git"; } - # src= sourceFromHead "cinelerra-9f9adf2ad5472886d5bc43a05c6aa8077cabd967.tar.gz" - # (fetchurl { url = "http://mawercer.de/~nix/repos/cinelerra-9f9adf2ad5472886d5bc43a05c6aa8077cabd967.tar.gz"; sha256 = "0b264e2a770d2257550c9a23883a060afcaff12293fe43828954e7373f5f4fb4"; }); - # # END + name = "cinelerra-unstable-2016-01-12"; src = fetchgit { url = "git://git.cinelerra-cv.org/j6t/cinelerra.git"; - # 2.3 - #rev = "58ef118e63bf2fac8c99add372c584e93b008bae"; - #sha256 = "1wx8c9rvh4y7fgg39lb02cy3sanms8a4fayr70jbhcb4rp691lph"; - # master 22 nov 2016 - #rev = "dbc22e0f35a9e8c274b06d4075b51dc9bace34aa"; - #sha256 = "0c76j98ws1x2s5hzcdlykxm2bi7987d9nanka428xj62id0grla5"; - - # j6t/cinelerra.git rev = "454be60e201c18c1fc3f1f253a6d2184fcfc94c4"; sha256 = "1n4kshqhgnr7aivsi8dgx48phyd2nzvv4szbc82mndklvs9jfb7r"; }; diff --git a/pkgs/build-support/build-maven.nix b/pkgs/build-support/build-maven.nix index ba85428ba8c49..30df3e8e7336d 100644 --- a/pkgs/build-support/build-maven.nix +++ b/pkgs/build-support/build-maven.nix @@ -17,7 +17,7 @@ infoFile: let ${lib.concatStrings (map (dep: let inherit (dep) url sha1 groupId artifactId version - authenticated metadata extension repository-id; + authenticated metadata repository-id; versionDir = dep.unresolved-version or version; diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 8d9ba54c95005..a8af8f791a926 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/e6e8a920e43237ccd2f66d6a349b5932a5eba1f5.tar.gz"; - sha256 = "0xyw1a5fp6swyxsj79hihivq9fpzzvl4apv34399a1n4ch6qhbf3"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/92b4fe519b988dee70e2ef8f2f1d05edf610ba8a.tar.gz"; + sha256 = "15sh85v57k635q5ir8pwa605cchj12h4sflss8zd1xshy7ywi673"; } diff --git a/pkgs/data/misc/nixos-artwork/wallpapers.nix b/pkgs/data/misc/nixos-artwork/wallpapers.nix index 2eebe61b142ee..3a65a9626d141 100644 --- a/pkgs/data/misc/nixos-artwork/wallpapers.nix +++ b/pkgs/data/misc/nixos-artwork/wallpapers.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: let - mkNixBackground = { name, src, description } @ attrs: + mkNixBackground = { name, src, description }: stdenv.mkDerivation { inherit name src; diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index c0c3cd48376e0..92da012ca7dab 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-panel-${version}"; - version = "1.21.0"; + version = "1.21.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0vn523jscmxhyv80fmrnvk1wmyp4kdzr4g7yypqnsg4kg2gmr7x0"; + sha256 = "0093pimqkx5db2nciksgrmq02hldg08p7hghafky3njl0kzv8l5z"; }; nativeBuildInputs = [ diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 83de6f9e56975..f10c8ec86ff90 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -1,7 +1,7 @@ { stdenv, pkgs, erlang }: let - inherit (stdenv.lib) getVersion versionAtLeast makeExtensible; + inherit (stdenv.lib) makeExtensible; lib = pkgs.callPackage ./lib.nix {}; diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix index d6b83cb1af04e..db40c47794fa3 100644 --- a/pkgs/development/beam-modules/lib.nix +++ b/pkgs/development/beam-modules/lib.nix @@ -49,7 +49,6 @@ rec { */ callElixir = drv: args: let - inherit (stdenv.lib) versionAtLeast; builder = callPackage ../interpreters/elixir/generic-builder.nix args; in callPackage drv { @@ -71,7 +70,6 @@ rec { */ callLFE = drv: args: let - inherit (stdenv.lib) versionAtLeast; builder = callPackage ../interpreters/lfe/generic-builder.nix args; in callPackage drv { diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index 272c953af7a12..513d0307f6bf4 100644 --- a/pkgs/development/compilers/go/1.10.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -6,7 +6,7 @@ let - inherit (stdenv.lib) optional optionals optionalString; + inherit (stdenv.lib) optionals optionalString; clangHack = writeScriptBin "clang" '' #!${stdenv.shell} diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index cbaa427c82774..d46e40f460b17 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -6,7 +6,7 @@ let - inherit (stdenv.lib) optional optionals optionalString; + inherit (stdenv.lib) optionals optionalString; clangHack = writeScriptBin "clang" '' #!${stdenv.shell} diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix index e084a2dcf94bc..e6c6889403685 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix @@ -2,7 +2,7 @@ let useX11 = stdenv.isi686 || stdenv.isx86_64; - inherit (stdenv.lib) optionals optionalString; + inherit (stdenv.lib) optionals; in stdenv.mkDerivation rec { diff --git a/pkgs/development/compilers/rust/binaryBuild.nix b/pkgs/development/compilers/rust/binaryBuild.nix index 3cf6d4efe2d5d..488d43a6fea4f 100644 --- a/pkgs/development/compilers/rust/binaryBuild.nix +++ b/pkgs/development/compilers/rust/binaryBuild.nix @@ -6,8 +6,7 @@ }: let - inherit (stdenv.lib) getLib optionalString; - inherit (darwin) libiconv; + inherit (stdenv.lib) optionalString; inherit (darwin.apple_sdk.frameworks) Security; bootstrapping = versionType == "bootstrap"; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index b0dae9d2042aa..f3f9e2f57b728 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -13,7 +13,7 @@ , doCheck ? true , broken ? false , buildPlatform, hostPlatform -} @ args: +}: let inherit (stdenv.lib) optional optionalString; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c8d4000f23494..0d9fb43be25ea 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -86,7 +86,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "0q9z5q7vrcqa831wni972kchcdivqp55x1z2fgmdp8jfq4pidvyb"; + sha256 = "1l6xgvn3l0kkly5jvg57msx09bf1jwdff7m61w8yf2pxsrh5ybxl"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index f73172e02d38e..825b4f349f0e8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -96,4 +96,83 @@ self: super: { haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1); })); +} // # All the following is needed to build tensorflow. +( +let + tensorflow-haskell = pkgs.fetchFromGitHub { + owner = "tensorflow"; + repo = "haskell"; + rev = "e40d2c44f0a861701cc90ec73c2bcee669ab5ba7"; + sha256 = "05pda34jfrlqmb8y9l8g87n4iq87v1z820vnd3cy41v5c5nrdpa8"; + fetchSubmodules = true; + }; +in +{ + proto-lens-descriptors = super.proto-lens-descriptors.override { + proto-lens = self.proto-lens_0_2_2_0; + lens-labels = self.lens-labels_0_1_0_2; + }; + proto-lens-protoc_0_2_2_3 = super.proto-lens-protoc_0_2_2_3.override { + haskell-src-exts = self.haskell-src-exts_1_19_1; + }; + proto-lens-protobuf-types_0_2_2_0 = super.proto-lens-protobuf-types_0_2_2_0.override { + proto-lens = self.proto-lens_0_2_2_0; + proto-lens-protoc = self.proto-lens-protoc_0_2_2_3; + }; + tensorflow-proto = (super.callPackage ( + { mkDerivation, base, Cabal, proto-lens, proto-lens-protobuf-types + , proto-lens-protoc, stdenv + }: + mkDerivation { + pname = "tensorflow-proto"; + version = "0.1.0.0"; + src = tensorflow-haskell; + setupHaskellDepends = [ base Cabal proto-lens-protoc ]; + libraryHaskellDepends = [ + base proto-lens proto-lens-protobuf-types proto-lens-protoc + ]; + libraryToolDepends = [ pkgs.protobuf ]; + homepage = "https://github.com/tensorflow/haskell#readme"; + description = "TensorFlow protocol buffers"; + license = stdenv.lib.licenses.asl20; + } + ) { + proto-lens = self.proto-lens_0_2_2_0; + proto-lens-protoc = self.proto-lens-protoc_0_2_2_3; + proto-lens-protobuf-types = self.proto-lens-protobuf-types_0_2_2_0; + }).overrideAttrs (_oldAttrs: { + sourceRoot = "source/tensorflow-proto"; + }); + tensorflow = (super.callPackage ( + { mkDerivation, async, attoparsec, base, bytestring, c2hs + , containers, data-default, exceptions, fgl, HUnit, lens-family + , mainland-pretty, mtl, proto-lens, semigroups, split, stdenv + , temporary, libtensorflow, tensorflow-proto, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + , transformers, vector + }: + mkDerivation { + pname = "tensorflow"; + version = "0.1.0.2"; + src = tensorflow-haskell; + libraryHaskellDepends = [ + async attoparsec base bytestring containers data-default exceptions + fgl lens-family mainland-pretty mtl proto-lens semigroups split + temporary tensorflow-proto text transformers vector + ]; + librarySystemDepends = [ libtensorflow ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ + attoparsec base bytestring HUnit lens-family proto-lens + tensorflow-proto test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + homepage = "https://github.com/tensorflow/haskell#readme"; + description = "TensorFlow bindings"; + license = stdenv.lib.licenses.asl20; + } + ) {}).overrideAttrs (_oldAttrs: { + sourceRoot = "source/tensorflow"; + }); } +) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index f50b02a7a9562..06508c2b7b8fc 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2392,6 +2392,7 @@ extra-packages: - http-conduit ^>= 2.2 # pre-lts-11.x versions neeed by git-annex 6.20180227 - inline-c < 0.6 # required on GHC 8.0.x - inline-c-cpp < 0.2 # required on GHC 8.0.x + - lens-labels == 0.1.* # required for proto-lens-descriptors - mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms - network == 2.6.3.1 # newer versions don't compile with GHC 7.4.x and below @@ -2399,6 +2400,9 @@ extra-packages: - persistent >=2.5 && <2.8 # pre-lts-11.x versions neeed by git-annex 6.20180227 - persistent-sqlite < 2.7 # pre-lts-11.x versions neeed by git-annex 6.20180227 - primitive == 0.5.1.* # required to build alex with GHC 6.12.3 + - proto-lens == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x + - proto-lens-protoc == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x + - proto-lens-protobuf-types == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x - QuickCheck < 2 # required by test-framework-quickcheck and its users - resourcet ==1.1.* # pre-lts-11.x versions neeed by git-annex 6.20180227 - seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x @@ -2581,6 +2585,7 @@ dont-distribute-packages: passman-core: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-dom-colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-dom-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] + reflex-dom-fragment-shader-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-dom-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-jsx: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 7b512e46da804..b8943a55394ab 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -11,7 +11,7 @@ let inherit (lib) extends makeExtensible; - inherit (haskellLib) overrideCabal makePackageSet; + inherit (haskellLib) makePackageSet; haskellPackages = pkgs.callPackage makePackageSet { package-set = initialPackages; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5816f295e0d67..1587e1df690c0 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -758,6 +758,50 @@ self: { maintainers = with stdenv.lib.maintainers; [ abbradar ]; }) {inherit (pkgs) emacs;}; + "Agda_2_5_4_1" = callPackage + ({ mkDerivation, alex, array, async, base, binary, blaze-html + , boxes, bytestring, Cabal, containers, cpphs, data-hash, deepseq + , directory, EdisonCore, edit-distance, emacs, equivalence + , filemanip, filepath, geniplate-mirror, gitrev, happy, hashable + , hashtables, haskeline, ieee754, mtl, murmur-hash, pretty, process + , regex-tdfa, stm, strict, template-haskell, text, time + , transformers, unordered-containers, uri-encode, zlib + }: + mkDerivation { + pname = "Agda"; + version = "2.5.4.1"; + sha256 = "0bxpibsk98n9xp42d92ma5vj2fam8rsnl61fbhr3askfjdvalnbp"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal filemanip filepath process ]; + libraryHaskellDepends = [ + array async base binary blaze-html boxes bytestring containers + data-hash deepseq directory EdisonCore edit-distance equivalence + filepath geniplate-mirror gitrev hashable hashtables haskeline + ieee754 mtl murmur-hash pretty process regex-tdfa stm strict + template-haskell text time transformers unordered-containers + uri-encode zlib + ]; + libraryToolDepends = [ alex cpphs happy ]; + executableHaskellDepends = [ base directory filepath process ]; + executableToolDepends = [ emacs ]; + postInstall = '' + files=("$data/share/ghc-"*"/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda}) + for f in "''${files[@]}" ; do + $out/bin/agda $f + done + for f in "''${files[@]}" ; do + $out/bin/agda -c --no-main $f + done + $out/bin/agda-mode compile + ''; + description = "A dependently typed functional programming language and proof assistant"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ abbradar ]; + }) {inherit (pkgs) emacs;}; + "Agda-executable" = callPackage ({ mkDerivation, Agda, base }: mkDerivation { @@ -10626,6 +10670,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "JuicyPixels-extra_0_4_0" = callPackage + ({ mkDerivation, base, criterion, hspec, hspec-discover + , JuicyPixels + }: + mkDerivation { + pname = "JuicyPixels-extra"; + version = "0.4.0"; + sha256 = "19lc2s80ww1pw2dy2vidrl14lhdvs3ji855l893p7p0sa23gkgqc"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base JuicyPixels ]; + testHaskellDepends = [ base hspec JuicyPixels ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion JuicyPixels ]; + description = "Efficiently scale, crop, flip images with JuicyPixels"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "JuicyPixels-repa" = callPackage ({ mkDerivation, base, bytestring, JuicyPixels, repa, vector }: mkDerivation { @@ -18744,12 +18806,15 @@ self: { }) {}; "Win32-errors" = callPackage - ({ mkDerivation, base, template-haskell, text, Win32 }: + ({ mkDerivation, base, hspec, QuickCheck, template-haskell, text + , Win32 + }: mkDerivation { pname = "Win32-errors"; - version = "0.2.2.1"; - sha256 = "1v7gm7vll1lq6d7d0y8vza7ilcw6i95jkprhy906awhqlhv3z031"; + version = "0.2.2.3"; + sha256 = "1glcaykk6ylmmsqxw4jfhrdnw5dg4syxc4v77q13wxsbzzrz3yn6"; libraryHaskellDepends = [ base template-haskell text Win32 ]; + testHaskellDepends = [ base hspec QuickCheck Win32 ]; description = "Alternative error handling for Win32 foreign calls"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -22025,6 +22090,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aeson-typescript_0_1_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, hspec, interpolate, mtl, process, template-haskell + , temporary, text, th-abstraction, unordered-containers + }: + mkDerivation { + pname = "aeson-typescript"; + version = "0.1.1.0"; + sha256 = "0sx4gavp0pvnxlxwix1di34vm2bfi5d02mzgzs402grqhh1v38vp"; + libraryHaskellDepends = [ + aeson base containers interpolate mtl template-haskell text + th-abstraction unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring containers directory filepath hspec + interpolate mtl process template-haskell temporary text + th-abstraction unordered-containers + ]; + description = "Generate TypeScript definition files from your ADTs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-utils" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, scientific , text @@ -29613,8 +29701,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "3.0.0.2"; - sha256 = "0sv7xgmipb9cqyiry5mp0fr6abr7r45167ifq7sa518gz7a2a7ax"; + version = "3.0.0.4"; + sha256 = "0ynh8f0fn7fhpvslb5y5hl6kwcdycm15b3qfcr4x98yz71hk373s"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -40604,10 +40692,8 @@ self: { }: mkDerivation { pname = "cabal-plan"; - version = "0.3.0.0"; - sha256 = "1axi3a60zq08d760w2x6akmszad599kij0r8zmlq8pin9mmmggls"; - revision = "1"; - editedCabalFile = "1xdmji5y2ssj8pgp0d78m8a5hd3swy2flhiaf1v9qb69502j8lwq"; + version = "0.4.0.0"; + sha256 = "0cbk0xhv189jv656x6a2s0bcnhkks4rlpkhvxbb215v5ldmrkpb1"; configureFlags = [ "-fexe" ]; isLibrary = true; isExecutable = true; @@ -40616,7 +40702,7 @@ self: { containers directory filepath text vector ]; executableHaskellDepends = [ - ansi-terminal base base-compat bytestring containers mtl + ansi-terminal base base-compat bytestring containers directory mtl optparse-applicative parsec text vector ]; doHaddock = false; @@ -40983,14 +41069,14 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "cabal2spec_2_2_0" = callPackage + "cabal2spec_2_2_1" = callPackage ({ mkDerivation, base, Cabal, filepath, optparse-applicative, tasty , tasty-golden, time }: mkDerivation { pname = "cabal2spec"; - version = "2.2.0"; - sha256 = "0pcai2ikp6gna1h60dihclq7apj9jczwz4n0lnfc9fr176gzsprp"; + version = "2.2.1"; + sha256 = "1j4y942r2v1s9cvvgnpjckl7s9bmpby1w4z4gffpbfirrc2h1nq6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal filepath time ]; @@ -43076,6 +43162,8 @@ self: { pname = "cborg"; version = "0.2.0.0"; sha256 = "1dvzqzk68ym1v1gxrx8kc59hj4jd2l0c8f2bqf67jgm5ld0bv340"; + revision = "2"; + editedCabalFile = "1fim6qbzimff8hpzv6bw558pzkh65cql8gdjinghc7w9c5my6y7l"; libraryHaskellDepends = [ array base bytestring containers ghc-prim half integer-gmp primitive text @@ -47342,15 +47430,16 @@ self: { "codeworld-api" = callPackage ({ mkDerivation, base, blank-canvas, cereal, cereal-text - , containers, hashable, mtl, random, random-shuffle, text, time + , containers, ghc-prim, hashable, mtl, random, random-shuffle, text + , time }: mkDerivation { pname = "codeworld-api"; - version = "0.2.4"; - sha256 = "17rpm9414fbwzxnpdvp67zlv6sl7ymkflgbbb50nhq7vv9z69dbc"; + version = "0.2.5"; + sha256 = "0gc1c0hc2sssiksii927kcg5rhalrw1fv3sr4zf4xvzj3nrd0k3m"; libraryHaskellDepends = [ - base blank-canvas cereal cereal-text containers hashable mtl random - random-shuffle text time + base blank-canvas cereal cereal-text containers ghc-prim hashable + mtl random random-shuffle text time ]; description = "Graphics library for CodeWorld"; license = stdenv.lib.licenses.asl20; @@ -50048,6 +50137,8 @@ self: { pname = "conduit-parse"; version = "0.2.1.0"; sha256 = "1qfs61qhbr5gc0ch0mmqcqdm4wvs5pkx2z6rki588fhy1kfdp1dm"; + revision = "1"; + editedCabalFile = "1bgxjn9lbx67584xpwl2k9jrwvlgyqf4vkv0s7vs1nnc1h6qk7qw"; libraryHaskellDepends = [ base conduit dlist mtl parsers safe safe-exceptions text transformers @@ -50163,10 +50254,8 @@ self: { }: mkDerivation { pname = "conf-json"; - version = "1.1"; - sha256 = "0jgyl56fgs506x4s28g14s08lcfnn6k4wh39j73cl576mlghr1rx"; - revision = "6"; - editedCabalFile = "1dyvz8jczzhr62s5cqr7gc4qd826nwgxkij0k41pfipw6jz0sc4f"; + version = "1.2"; + sha256 = "1j0m0zl1a7rkwczz58322kwsd9dzgwz2ia2q8l9h42ln239q0fbs"; libraryHaskellDepends = [ aeson base bytestring directory ]; testHaskellDepends = [ aeson base binary bytestring directory hspec QuickCheck @@ -52714,8 +52803,8 @@ self: { ({ mkDerivation, base, data-binary-ieee754, FloatingHex, ieee754 }: mkDerivation { pname = "crackNum"; - version = "2.0"; - sha256 = "1wi2k7yrm9z3n1b6vnw5zc3yj4k8drhap7fm2hk1z98wih4qppzp"; + version = "2.1"; + sha256 = "10z192nd9ik4ry0bjmkdpyvys75h3xz106588z8m1ix7caf1208a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56829,6 +56918,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-msgpack_0_0_12" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, criterion + , data-binary-ieee754, data-msgpack-types, deepseq, groom, hashable + , hspec, QuickCheck, text, unordered-containers, vector, void + }: + mkDerivation { + pname = "data-msgpack"; + version = "0.0.12"; + sha256 = "11zlw465lpa371y7cpz9r4gn1c4cw0rjrpl5l3h6h0y3zc28p7sw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring data-binary-ieee754 data-msgpack-types text + ]; + executableHaskellDepends = [ base bytestring groom ]; + testHaskellDepends = [ + base bytestring containers data-msgpack-types hashable hspec + QuickCheck text unordered-containers vector void + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq QuickCheck + ]; + description = "A Haskell implementation of MessagePack"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "data-msgpack-types" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, hashable , QuickCheck, text, unordered-containers, vector, void @@ -56845,6 +56961,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-msgpack-types_0_0_2" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, hashable + , hspec, QuickCheck, text, unordered-containers, vector, void + }: + mkDerivation { + pname = "data-msgpack-types"; + version = "0.0.2"; + sha256 = "19c7285mrs9d1afgpdq4cprv44fif76ahahg3xpzijc5lhgxmzal"; + libraryHaskellDepends = [ + base bytestring containers deepseq hashable QuickCheck text + unordered-containers vector void + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "A Haskell implementation of MessagePack"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "data-named" = callPackage ({ mkDerivation, attoparsec, base, binary, containers, text }: mkDerivation { @@ -58926,8 +59060,8 @@ self: { ({ mkDerivation, base, containers, foldl }: mkDerivation { pname = "deferred-folds"; - version = "0.6"; - sha256 = "1qp99fbx14y49lsh269jdc5mazz30rqwr1if3gc1qn4m5d8dsqir"; + version = "0.6.3"; + sha256 = "1b020879qdbh08pzgxwj5y7fk31n071crbcs9601j7fxj4a1i0hq"; libraryHaskellDepends = [ base containers foldl ]; description = "Abstractions over deferred folds"; license = stdenv.lib.licenses.mit; @@ -62830,8 +62964,8 @@ self: { }: mkDerivation { pname = "distribution-opensuse"; - version = "1.0.0"; - sha256 = "0zy0whx8badksaqqkswslrgrz57mpx3pfjjhrqrvn7088anwb7rr"; + version = "1.1.0"; + sha256 = "1spqr4ygxhdgmy17cmwx1z4r1czlf85hd6yk9zpwpj9py9v5b0g2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -62839,6 +62973,7 @@ self: { hashable hsemail mtl parsec-class pretty text time turtle ]; executableHaskellDepends = [ base containers text turtle ]; + testHaskellDepends = [ base ]; description = "Types, functions, and tools to manipulate the openSUSE distribution"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -64344,18 +64479,12 @@ self: { }) {}; "drinkery" = callPackage - ({ mkDerivation, base, conduit, conduit-combinators, exceptions - , gauge, list-t, ListT, machines, mtl, pipes, transformers - }: + ({ mkDerivation, base, exceptions, mtl, transformers }: mkDerivation { pname = "drinkery"; - version = "0.3"; - sha256 = "10iiffxnmc5hgsa4c5m59zxbz80b3cpddv6293jiw2vxpfq2f7w4"; + version = "0.4"; + sha256 = "1c5mv0klhdavbsaa1mng0q15vy0cz6x8ijfzgaf1f18yyxvb0q1q"; libraryHaskellDepends = [ base exceptions mtl transformers ]; - benchmarkHaskellDepends = [ - base conduit conduit-combinators exceptions gauge list-t ListT - machines mtl pipes transformers - ]; description = "Boozy streaming library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -64724,6 +64853,8 @@ self: { pname = "dublincore-xml-conduit"; version = "0.1.0.2"; sha256 = "17jzyj49j88xwsz54higi81a6v8kvb8i338n5416z1ni475qsynl"; + revision = "1"; + editedCabalFile = "1rljgmi4jb6yhigfy394jb64q5f5qx7i1g68pw6zgq9ziz91p321"; libraryHaskellDepends = [ base conduit conduit-combinators safe-exceptions text time timerep uri-bytestring xml-conduit xml-types @@ -65893,9 +66024,11 @@ self: { }: mkDerivation { pname = "edit"; - version = "0.0.1.1"; - sha256 = "0smxb6v4n83b09dyaj388hhi7kx1ca6axg60q3adnixy13a284lz"; - libraryHaskellDepends = [ base deepseq transformers ]; + version = "1.0.0.0"; + sha256 = "0p93j90f40ckg5n9d8hnsbd5qsi00c28cpdrczgihk81hjgflnkd"; + libraryHaskellDepends = [ + base comonad deepseq QuickCheck transformers + ]; testHaskellDepends = [ base comonad doctest QuickCheck tasty tasty-discover tasty-quickcheck uniplate @@ -67194,8 +67327,8 @@ self: { }: mkDerivation { pname = "email-header"; - version = "0.4.0"; - sha256 = "0lmdb8s29w5wbrwsfcn43z354ms3xblffprgvg22rb16ny1410hn"; + version = "0.4.1"; + sha256 = "14xs001ab0p2y6f9hl9lw8bwd4fcg23y5ia3wfcafn6893pbb5f6"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring case-insensitive containers exceptions text text-icu time @@ -69120,6 +69253,8 @@ self: { pname = "euler-tour-tree"; version = "0.1.0.1"; sha256 = "12fxs5992rlfg91xxh2sahm2vykcjcjc30iwzkfm894qrk4flbz4"; + revision = "1"; + editedCabalFile = "033v38mr81pr81gb5wksi7bgpm1wrvcgck893dk1ymq4w6ifa2m6"; libraryHaskellDepends = [ base containers fingertree mtl parser-combinators transformers Unique @@ -71856,6 +71991,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fcm-client" = callPackage + ({ mkDerivation, aeson, aeson-casing, async, base, bytestring + , conduit, conduit-extra, containers, data-default-class + , http-client, http-conduit, http-types, HUnit, lens + , optparse-applicative, QuickCheck, resourcet, retry, scientific + , stm-conduit, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, utf8-string + }: + mkDerivation { + pname = "fcm-client"; + version = "0.1.0.0"; + sha256 = "1qv43pfwgi7d7bx445z3q3zr7szv6y7ky9gb6g7f1chxs4q6mcdl"; + revision = "1"; + editedCabalFile = "1rvb99gh2m1j2bd9x6vc58kvkwdcxl5wwypvnj3c62zcqmdln03l"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-casing base bytestring containers data-default-class + http-client http-conduit http-types lens scientific text time + ]; + executableHaskellDepends = [ + aeson async base bytestring conduit conduit-extra + data-default-class http-client http-types lens optparse-applicative + resourcet retry stm-conduit text utf8-string + ]; + testHaskellDepends = [ + aeson base containers data-default-class HUnit lens QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 text + ]; + description = "Admin API for Firebase Cloud Messaging"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fdo-notify" = callPackage ({ mkDerivation, base, containers, dbus }: mkDerivation { @@ -75943,20 +76111,19 @@ self: { "fraxl" = callPackage ({ mkDerivation, async, base, dependent-map, dependent-sum - , exceptions, free, mtl, time, transformers, type-aligned - , vinyl-plus + , exceptions, free, mtl, time, transformers, type-aligned, vinyl }: mkDerivation { pname = "fraxl"; - version = "0.1.0.0"; - sha256 = "0q21g7ggdfrl7afkx9g2apx2nzh7fs7fpy63zhjylav16xhycc56"; - revision = "1"; - editedCabalFile = "1fjwfiydrw1dga0dy6cwwji4kjzichr6nx7hazkx11r08lqncxzi"; + version = "0.2.0.1"; + sha256 = "1k5fcl6d9yxc2773x0vv7z8q1pq3mf6l29icr4yc4wxsxw4l3r7k"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ async base dependent-map dependent-sum exceptions free mtl - transformers type-aligned vinyl-plus + transformers type-aligned vinyl ]; - testHaskellDepends = [ base mtl time transformers ]; + benchmarkHaskellDepends = [ base time ]; description = "Cached and parallel data fetching"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -76639,8 +76806,8 @@ self: { ({ mkDerivation, base, bytestring, process, text }: mkDerivation { pname = "fromhtml"; - version = "0.1.0.3"; - sha256 = "1zj811728g1hwpagq7jl1qxppn164vn4b27pxn20151iljipq1va"; + version = "0.1.0.4"; + sha256 = "1p1qkidh5wgfgrqqa59zi77rvgphh2wh8ldql4plxq5flh2zszkx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring process text ]; @@ -82374,8 +82541,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20180626"; - sha256 = "0vq3x9p4h3m266pcm2r3m9p51pz5z9zskh7z5nk0adh33j30xf7q"; + version = "6.20180719"; + sha256 = "13fbkdf461z4wqvjlzfjp3h17xyy8jb1av4s6jmlg1jl7656q96k"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-f-s3" @@ -82386,7 +82553,7 @@ self: { isExecutable = true; setupHaskellDepends = [ base bytestring Cabal data-default directory exceptions filepath - hslogger IfElse process split unix-compat utf8-string + hslogger IfElse process split transformers unix-compat utf8-string ]; executableHaskellDepends = [ aeson async base bloomfilter byteable bytestring case-insensitive @@ -83445,6 +83612,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "glabrous_0_4_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring + , cereal, cereal-text, directory, either, hspec, text + , unordered-containers + }: + mkDerivation { + pname = "glabrous"; + version = "0.4.0"; + sha256 = "0qja5mdnbgrsdiwqjfwrzzynbybwg5yksvnwgazak0wv2p86i5yh"; + libraryHaskellDepends = [ + aeson aeson-pretty attoparsec base bytestring cereal cereal-text + either text unordered-containers + ]; + testHaskellDepends = [ + base directory either hspec text unordered-containers + ]; + description = "A template DSL library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "glade" = callPackage ({ mkDerivation, base, Cabal, glib, gtk, gtk2hs-buildtools , libglade @@ -87491,23 +87679,26 @@ self: { }) {}; "greenclip" = callPackage - ({ mkDerivation, base, binary, classy-prelude, directory, microlens - , microlens-mtl, text, unix, utf8-string, vector, X11 + ({ mkDerivation, base, binary, bytestring, directory, exceptions + , hashable, libXau, microlens, microlens-mtl, protolude, text, unix + , vector, wordexp, X11, x11, xcb, xdmcp }: mkDerivation { pname = "greenclip"; - version = "2.0.1"; - sha256 = "05f146ff9ff4kyaxx92jwb5g0nj0bb2j41hx12b4vjk28vik1x5y"; + version = "3.0.2"; + sha256 = "1b1nx2jnwal1fhwh7cq0hv1nrwc2hzzh96yab6cpv0r8bm34qxs7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base binary classy-prelude directory microlens microlens-mtl text - unix utf8-string vector X11 + base binary bytestring directory exceptions hashable microlens + microlens-mtl protolude text unix vector wordexp X11 ]; + executablePkgconfigDepends = [ libXau x11 xcb xdmcp ]; description = "Simple clipboard manager to be integrated with rofi"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {inherit (pkgs.xorg) libXau; inherit (pkgs) x11; xcb = null; + xdmcp = null;}; "greg-client" = callPackage ({ mkDerivation, base, binary, bytestring, clock, hostname, network @@ -90640,8 +90831,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.10.3"; - sha256 = "00khz032sy78z5rr36d20zj4grbbqkf1rk1x8m0nf05ca6gfwjbj"; + version = "1.10.4"; + sha256 = "09sczm8l93lmkjz0c5l9al9jp8jpqcmk2zbxbbbq4g2jrsb3v30y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96656,8 +96847,8 @@ self: { }: mkDerivation { pname = "haskus-binary"; - version = "0.6.0.0"; - sha256 = "0r0np4kdvyfslgjqs983dzv4xi5s62splahn2ra55qjbm8lpmps0"; + version = "1.0"; + sha256 = "1gw08zx7mqhi6n0wx6s6n4fvw5ambbdxnahr3r3p22yfqnqcp4y2"; libraryHaskellDepends = [ base bytestring cereal haskus-utils mtl ]; @@ -96671,19 +96862,19 @@ self: { }) {}; "haskus-system-build" = callPackage - ({ mkDerivation, base, directory, filepath, hashable, haskus-utils - , optparse-applicative, optparse-simple, process, simple-download - , temporary, text, yaml + ({ mkDerivation, base, conduit, directory, filepath, hashable + , haskus-utils, http-conduit, optparse-applicative, optparse-simple + , process, temporary, text, yaml }: mkDerivation { pname = "haskus-system-build"; - version = "0.7.0.0"; - sha256 = "1wfl4n7manfwgwjccvrsfwjb3la7sjg1zpzgj8v6r5sv2zdyl86g"; + version = "1.0"; + sha256 = "1xzl5f8wilmdq9bg37zzdcv59cqp8kxnhbm6fd8pzqnj8w1pkwdk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base directory filepath hashable haskus-utils optparse-applicative - optparse-simple process simple-download temporary text yaml + base conduit directory filepath hashable haskus-utils http-conduit + optparse-applicative optparse-simple process temporary text yaml ]; description = "Haskus system build tool"; license = stdenv.lib.licenses.bsd3; @@ -96691,17 +96882,20 @@ self: { }) {}; "haskus-utils" = callPackage - ({ mkDerivation, base, containers, extra, file-embed, list-t, mtl - , stm, stm-containers, tasty, tasty-quickcheck, template-haskell - , transformers, vector + ({ mkDerivation, base, containers, extra, file-embed + , haskus-utils-data, haskus-utils-types, haskus-utils-variant + , list-t, mtl, recursion-schemes, stm, stm-containers, tasty + , tasty-quickcheck, template-haskell, transformers, vector }: mkDerivation { pname = "haskus-utils"; - version = "0.8.0.0"; - sha256 = "1r2r1198hhv75f4yqcy5crr764dvvj766bgp3v3b5sdl603q8cl3"; + version = "1.0"; + sha256 = "1pfjarir86c2sxjh8l0jc7z5acsz8slcwb7imjdxf3dsdiy8swwd"; libraryHaskellDepends = [ - base containers extra file-embed list-t mtl stm stm-containers - template-haskell transformers vector + base containers extra file-embed haskus-utils-data + haskus-utils-types haskus-utils-variant list-t mtl + recursion-schemes stm stm-containers template-haskell transformers + vector ]; testHaskellDepends = [ base tasty tasty-quickcheck ]; description = "Haskus utility modules"; @@ -96709,6 +96903,46 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskus-utils-data" = callPackage + ({ mkDerivation, base, containers, extra, haskus-utils-types, mtl + , recursion-schemes, transformers + }: + mkDerivation { + pname = "haskus-utils-data"; + version = "1.0"; + sha256 = "007ykjinkxr9kdrk7hl81zndpan60b5l51m32nlj2xv2pjm326z4"; + libraryHaskellDepends = [ + base containers extra haskus-utils-types mtl recursion-schemes + transformers + ]; + description = "Haskus utility modules"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "haskus-utils-types" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "haskus-utils-types"; + version = "1.0"; + sha256 = "1rxnaw53vfmi3gv8h7j6vw4y4xxnqzwaaasd6x22fm7fzc5q64vf"; + libraryHaskellDepends = [ base ]; + description = "Haskus utility modules"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "haskus-utils-variant" = callPackage + ({ mkDerivation, base, haskus-utils-data, haskus-utils-types }: + mkDerivation { + pname = "haskus-utils-variant"; + version = "1.0"; + sha256 = "1kkqngvzifxps0hhp49syh2w4an3y4s4nvp3qbh3p00h9dw3hmsn"; + libraryHaskellDepends = [ + base haskus-utils-data haskus-utils-types + ]; + description = "Haskus utility modules"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskyapi" = callPackage ({ mkDerivation, aeson, base, blaze-html, bytestring, containers , directory, http-conduit, markdown, mtl, network, parsec @@ -97917,6 +98151,8 @@ self: { pname = "hbro"; version = "1.7.0.0"; sha256 = "0vx3097g9q0bxyv1bwa4mc6aw152zkj3mawk5nrn5mh0zr60c3zh"; + revision = "1"; + editedCabalFile = "0slsd0f0qvlh4l6777b8iaskd4ij04193mcjwnq8p7szslxx40q1"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -97946,6 +98182,8 @@ self: { pname = "hbro-contrib"; version = "1.7.0.0"; sha256 = "024mclr0hrvxdbsw9d051v9dfls2n3amyxlqfzakf11vrkgqqfam"; + revision = "1"; + editedCabalFile = "1vfkwzd5rsv0065bldkd90fprp1qspfqg44ip5i4ihnbj4vawv9b"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -100605,34 +100843,38 @@ self: { }) {}; "hgeometry" = callPackage - ({ mkDerivation, array, base, bifunctors, bytestring, containers - , contravariant, criterion, data-clist, deepseq, deepseq-generics - , directory, doctest, fixed-vector, Frames, hexpat, hspec, lens - , linear, mtl, optparse-applicative, parsec, QuickCheck, random - , semigroupoids, semigroups, singletons, template-haskell, text - , time, vector, vinyl + ({ mkDerivation, aeson, approximate-equality, array, base + , bifunctors, bytestring, colour, containers, contravariant + , criterion, data-clist, deepseq, deepseq-generics, dlist, doctest + , fingertree, fixed-vector, hexpat, hspec, hspec-discover, lens + , linear, mtl, optparse-applicative, parsec, QuickCheck + , quickcheck-instances, random, reflection, semigroupoids + , semigroups, singletons, template-haskell, text, vector, vinyl + , yaml }: mkDerivation { pname = "hgeometry"; - version = "0.6.0.0"; - sha256 = "1pphbdl5sn6gvm4crshpnfjmf0c8kwfz68hv615hhadp7120x3ij"; - revision = "1"; - editedCabalFile = "19j3n0kf7n2n0spyr83gdjngxnfxvyr1sryvhq8jflsxq44d8rdg"; + version = "0.7.0.0"; + sha256 = "0c91n42l6pqkdw46snhplvzm8f05x0x5g3b7mgx13ndskcf9vmyz"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bifunctors bytestring containers contravariant data-clist - deepseq directory fixed-vector Frames hexpat lens linear mtl - optparse-applicative parsec random semigroupoids semigroups - singletons template-haskell text time vector vinyl + aeson base bifunctors bytestring colour containers contravariant + data-clist deepseq dlist fingertree fixed-vector hexpat lens linear + mtl parsec QuickCheck quickcheck-instances random reflection + semigroupoids semigroups singletons template-haskell text vector + vinyl yaml ]; testHaskellDepends = [ - array base bytestring containers data-clist doctest Frames hspec - lens linear QuickCheck random semigroups vector vinyl + approximate-equality array base bytestring colour containers + data-clist doctest hspec lens linear QuickCheck + quickcheck-instances random semigroups singletons vector vinyl ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ - base criterion deepseq deepseq-generics Frames lens QuickCheck - semigroups + base bytestring containers criterion deepseq deepseq-generics + fixed-vector lens linear optparse-applicative QuickCheck semigroups ]; description = "Geometric Algorithms, Data structures, and Data types"; license = stdenv.lib.licenses.bsd3; @@ -103500,21 +103742,19 @@ self: { , cryptohash-md5, cryptohash-sha1, cryptohash-sha256 , cryptohash-sha512, data-fix, deepseq, deriving-compat, Diff , directory, exceptions, filepath, generic-random, Glob, hashable - , hashing, haskeline, http-client, http-client-tls, http-types - , interpolate, lens-family, lens-family-core, lens-family-th - , logict, megaparsec, monadlist, mtl, optparse-applicative - , pretty-show, process, QuickCheck, quickcheck-instances - , regex-tdfa, regex-tdfa-text, repline, scientific, semigroups - , serialise, split, syb, tasty, tasty-hunit, tasty-quickcheck + , hashing, haskeline, hedgehog, hspec-discover, http-client + , http-client-tls, http-types, interpolate, lens-family + , lens-family-core, lens-family-th, logict, megaparsec, monadlist + , mtl, optparse-applicative, pretty-show, process, regex-tdfa + , regex-tdfa-text, repline, scientific, semigroups, serialise + , split, syb, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck , tasty-th, template-haskell, text, these, time, transformers, unix , unordered-containers, vector, xml }: mkDerivation { pname = "hnix"; - version = "0.5.1"; - sha256 = "1rhbx7ixzg4147j3pcqvfzn1k2b1xcn8428z98cq6ghnrmgss9al"; - revision = "1"; - editedCabalFile = "1l8h9zc9mrqvp8hvkfz1g2inq2b95x42gscyfn6qv0jcxwn4sbpr"; + version = "0.5.2"; + sha256 = "059l2zqbqi5826qq1dq00vl7f1kfyr0wrs9imsx36yfbr9ac9wqk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103522,7 +103762,7 @@ self: { containers cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 data-fix deepseq deriving-compat directory exceptions filepath hashable hashing haskeline http-client - http-client-tls http-types lens-family lens-family-core + http-client-tls http-types interpolate lens-family lens-family-core lens-family-th logict megaparsec monadlist mtl optparse-applicative pretty-show process regex-tdfa regex-tdfa-text scientific semigroups serialise split syb template-haskell text these time @@ -103539,11 +103779,12 @@ self: { ansi-wl-pprint base base16-bytestring bytestring containers cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 data-fix deepseq Diff directory exceptions filepath generic-random - Glob hashing interpolate megaparsec mtl optparse-applicative - pretty-show process QuickCheck quickcheck-instances serialise split - tasty tasty-hunit tasty-quickcheck tasty-th template-haskell text - time transformers unix unordered-containers + Glob hashing hedgehog interpolate megaparsec mtl + optparse-applicative pretty-show process serialise split tasty + tasty-hedgehog tasty-hunit tasty-quickcheck tasty-th + template-haskell text time transformers unix unordered-containers ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ ansi-wl-pprint base base16-bytestring bytestring containers criterion cryptohash-md5 cryptohash-sha1 cryptohash-sha256 @@ -109124,6 +109365,20 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "hspec-need-env" = callPackage + ({ mkDerivation, base, hspec, hspec-core, hspec-expectations + , setenv, transformers + }: + mkDerivation { + pname = "hspec-need-env"; + version = "0.1.0.0"; + sha256 = "0ny2qbj5ipa8nsigx70x4mhdv5611fis0dm4j9i82zkxc2l92b9d"; + libraryHaskellDepends = [ base hspec-core hspec-expectations ]; + testHaskellDepends = [ base hspec hspec-core setenv transformers ]; + description = "Read environment variables for hspec tests"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hspec-pg-transact" = callPackage ({ mkDerivation, base, bytestring, hspec, pg-transact , postgresql-simple, resource-pool, text, tmp-postgres @@ -110531,8 +110786,8 @@ self: { }: mkDerivation { pname = "html-parse"; - version = "0.2.0.1"; - sha256 = "1v6i9g4l0j8mvi12lqv40k30lpn8bv28pvf6ps0zgjgpb2khfxsw"; + version = "0.2.0.2"; + sha256 = "0dm771lrrqc87ygbr3dzyl1vsyi30jgr7l0isvsbqyah7s4zyg38"; libraryHaskellDepends = [ attoparsec base containers deepseq text ]; @@ -112548,6 +112803,8 @@ self: { pname = "hw-dsv"; version = "0.2.1"; sha256 = "1kb8dc05dfslpqnjw42qnnxg16xfd2jz17ag9vgmci88rnsanaxv"; + revision = "1"; + editedCabalFile = "1di1vdj6c0s0n2zjhjhy8iszlgk29gbh7a46pc4q0hp587avff04"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112652,10 +112909,25 @@ self: { pname = "hw-hedgehog"; version = "0.1.0.1"; sha256 = "0fngvmx60a3z1sl798ghvfzya5dgi1mfln8p1vkqapcgfjh7w5r6"; + revision = "1"; + editedCabalFile = "0a5qlh5dwsnv14ngimbsvpgxx4hf0c0wdi5yfv7afwj9h2afdpfz"; + libraryHaskellDepends = [ base hedgehog vector ]; + testHaskellDepends = [ base ]; + description = "Extra hedgehog functionality"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hw-hedgehog_0_1_0_2" = callPackage + ({ mkDerivation, base, hedgehog, vector }: + mkDerivation { + pname = "hw-hedgehog"; + version = "0.1.0.2"; + sha256 = "0fk5qgn011j7cb75xi434vk0vq4bl8w9lrs6hpf45c8mv4c48vby"; libraryHaskellDepends = [ base hedgehog vector ]; testHaskellDepends = [ base ]; description = "Extra hedgehog functionality"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-hspec-hedgehog" = callPackage @@ -112666,6 +112938,8 @@ self: { pname = "hw-hspec-hedgehog"; version = "0.1.0.5"; sha256 = "0kznqpliqnahyayi1q08mfz4qwhqvz54hb8cv6r2ps3lyjnpmlfk"; + revision = "1"; + editedCabalFile = "05fg0d89652yhsji35ckh9qiiy4y7c04i6zya9hrkgwl2jaq55fv"; libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit transformers ]; @@ -115727,6 +116001,8 @@ self: { pname = "imm"; version = "1.3.0.0"; sha256 = "1rkndzm0mmc0qpg4i08jkmp00w5jhh4az02y3vzwaaqjfd32jxar"; + revision = "1"; + editedCabalFile = "02g2cpwqp9fqggzjv5y2gyvxayqbrfjai133jn7y2laa9bxia3x4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118178,6 +118454,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ip_1_4_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion + , doctest, hashable, hspec, HUnit, primitive, QuickCheck + , quickcheck-classes, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, vector + }: + mkDerivation { + pname = "ip"; + version = "1.4.0"; + sha256 = "12y9ym7gjdwlixp727z4hf0hmi8x021shvrv6vhg4s4bgn3rvch5"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring hashable primitive text vector + ]; + testHaskellDepends = [ + attoparsec base bytestring doctest hspec HUnit QuickCheck + quickcheck-classes test-framework test-framework-hunit + test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion text + ]; + description = "Library for IP and MAC addresses"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ip-quoter" = callPackage ({ mkDerivation, base, cpu, network, tasty, tasty-hunit , template-haskell @@ -119344,10 +119646,8 @@ self: { }: mkDerivation { pname = "ivory-opts"; - version = "0.1.0.5"; - sha256 = "0h4k2fy8w2hcyglfgl1jzxr6as04lc4ks8wk4id8h4gpn6bgdfrn"; - revision = "1"; - editedCabalFile = "1mn1jrpwzm1pcmw942i0kg0na56zagxsqcqs9y32j1xnlkgljkpn"; + version = "0.1.0.6"; + sha256 = "014dnfflf09gfn6c47jjg25lq95bx9sl6nkj18zylyzy0f1qszrq"; libraryHaskellDepends = [ base base-compat containers data-reify dlist fgl filepath ivory monadLib pretty @@ -122658,15 +122958,15 @@ self: { ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite , gauge, HUnit, memory, parsec, QuickCheck, quickcheck-instances , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text + , text, vector }: mkDerivation { pname = "keccak"; - version = "0.1.2"; - sha256 = "0jrnx5w2nxxc47lmw71c57cqja3mynx8j3fr89rjwby6mym5yw4g"; + version = "0.2.0"; + sha256 = "1hkp6zn86bvn817vvxd2yqjgfh76n0ynvyqq2942frl1i0v19ymw"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base bytestring ]; + libraryHaskellDepends = [ base bytestring vector ]; executableHaskellDepends = [ base base16-bytestring bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring cryptonite HUnit memory parsec @@ -122676,7 +122976,7 @@ self: { benchmarkHaskellDepends = [ base bytestring cryptonite gauge memory ]; - description = "haskell keccak functions"; + description = "cryptographic functions based on the sponge construction"; license = stdenv.lib.licenses.mit; }) {}; @@ -124795,8 +125095,8 @@ self: { }: mkDerivation { pname = "language-ats"; - version = "1.2.0.14"; - sha256 = "13nafbk4h8z3vx12i6zs250795c3ipsgxq83bhgha2w0wjr49d18"; + version = "1.2.0.15"; + sha256 = "0ldjbsnspn55xbkwcjbyswiqlpf885si5xl2z0n5kvvwmlrgmfkx"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint array base composition-prelude containers deepseq @@ -124819,8 +125119,8 @@ self: { }: mkDerivation { pname = "language-bash"; - version = "0.7.0"; - sha256 = "0w7r5ngpz3ifahjfccz6ma9m2jdmn5nqimk5154hk35skcjwrswx"; + version = "0.7.1"; + sha256 = "1p8ikx9iq9ssvm8b99hly7pqqw09588xjkgf5397kg5xpv8ga4gp"; libraryHaskellDepends = [ base parsec pretty transformers ]; testHaskellDepends = [ base parsec process QuickCheck tasty tasty-expected-failure @@ -127125,6 +127425,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens-labels_0_1_0_2" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "lens-labels"; + version = "0.1.0.2"; + sha256 = "11pwdqnjd0gybjrfz79fbd9vdwcimkzqqr91zy6hswlylp42dvq1"; + libraryHaskellDepends = [ base ghc-prim ]; + description = "Integration of lenses with OverloadedLabels"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-labels" = callPackage ({ mkDerivation, base, ghc-prim, profunctors, tagged }: mkDerivation { @@ -145137,10 +145449,8 @@ self: { }: mkDerivation { pname = "network-msgpack-rpc"; - version = "0.0.4"; - sha256 = "0b9llxfgl2lcjlcz9ai6k6yhrlip6shd0wd56mfgbvv3lbd5n62r"; - revision = "2"; - editedCabalFile = "0nw2pgyw077ncbmiij99xyy414635vvdmb2das7dkzppsfx47rn3"; + version = "0.0.5"; + sha256 = "0lrlq5amcgg84ja2wjxkqm9llsbpsj6n0zrk7vvfjcra144b39rq"; libraryHaskellDepends = [ base binary binary-conduit bytestring conduit conduit-extra data-default-class data-default-instances-base data-msgpack @@ -146649,6 +146959,8 @@ self: { pname = "non-empty"; version = "0.3"; sha256 = "1q2vplh7pddf8cpjzs3yvy1dn7lqlg32ianr6j5qwwwl9hfnr43p"; + revision = "1"; + editedCabalFile = "0ivvxcfm3qhv7ynb3ql89wrybbda1s2p5nr0viw7nqrybjz5hfzh"; libraryHaskellDepends = [ base containers deepseq QuickCheck utility-ht ]; @@ -146656,6 +146968,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "non-empty_0_3_0_1" = callPackage + ({ mkDerivation, base, containers, deepseq, QuickCheck, utility-ht + }: + mkDerivation { + pname = "non-empty"; + version = "0.3.0.1"; + sha256 = "00zbnpcnmchbbdgyw19m1bl3bdhmw89pp9k0mq3z75nz0i40gg9z"; + libraryHaskellDepends = [ + base containers deepseq QuickCheck utility-ht + ]; + description = "List-like structures with static restrictions on the number of elements"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "non-empty-containers" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -149804,6 +150131,8 @@ self: { pname = "opml-conduit"; version = "0.6.0.4"; sha256 = "07axacfa0wik2cnpzcnjjp9w6ws8sjhinzxdc4vrxdxaj1v5a2s8"; + revision = "1"; + editedCabalFile = "160sazqsrmm2755642c5y5i38miiglqb66cy5k0hy4k2jkdmjfbi"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base case-insensitive conduit conduit-combinators containers @@ -151204,7 +151533,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_2_2_2" = callPackage + "pandoc_2_2_2_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring , binary, blaze-html, blaze-markup, bytestring, Cabal , case-insensitive, cmark-gfm, containers, criterion, data-default @@ -151219,8 +151548,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.2.2"; - sha256 = "0rbr6mjm7kfzxrjbglqj6bgz1l1zlbiiff3pi59nhqava3nindqc"; + version = "2.2.2.1"; + sha256 = "19d6cd8ry735ziazfkk6xhrjbvx5ywpbqmhxr3wbmp8kyp6c7x7m"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -161477,8 +161806,8 @@ self: { }: mkDerivation { pname = "primitive-extras"; - version = "0.3"; - sha256 = "1az9933jkf3891l6svzvg1fhprmcnjj1bklr0rglrljlj8m01laz"; + version = "0.3.0.1"; + sha256 = "0qipddb5065z6c7klbaz75d8jbx39k8qppv8d7xb6hnj28v62ab7"; libraryHaskellDepends = [ base cereal deferred-folds foldl primitive profunctors vector ]; @@ -162889,6 +163218,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) libpulseaudio;}; + "proto-lens_0_2_2_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , data-default-class, lens-family, parsec, pretty, text + , transformers, void + }: + mkDerivation { + pname = "proto-lens"; + version = "0.2.2.0"; + sha256 = "173sz83pw237qp037j6spy055ghayinfjg5m4p4mvgmjnnzpw1cj"; + libraryHaskellDepends = [ + attoparsec base bytestring containers data-default-class + lens-family parsec pretty text transformers void + ]; + description = "A lens-based implementation of protocol buffers in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "proto-lens" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , data-default-class, deepseq, lens-family, lens-labels, parsec @@ -162974,9 +163321,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "proto-lens-protobuf-types_0_2_2_0" = callPackage + ({ mkDerivation, base, Cabal, lens-family, proto-lens + , proto-lens-protoc, protobuf, text + }: + mkDerivation { + pname = "proto-lens-protobuf-types"; + version = "0.2.2.0"; + sha256 = "0b6n7qwyxql7966accdg0ms5mmxygjy1jx31j5bgdpkdayz4hf72"; + setupHaskellDepends = [ base Cabal proto-lens-protoc ]; + libraryHaskellDepends = [ + base lens-family proto-lens proto-lens-protoc text + ]; + libraryToolDepends = [ protobuf ]; + description = "Basic protocol buffer message types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) protobuf;}; + "proto-lens-protobuf-types" = callPackage ({ mkDerivation, base, Cabal, lens-family, proto-lens - , proto-lens-protoc, text + , proto-lens-protoc, protobuf, text }: mkDerivation { pname = "proto-lens-protobuf-types"; @@ -162986,16 +163351,44 @@ self: { libraryHaskellDepends = [ base lens-family proto-lens proto-lens-protoc text ]; + libraryToolDepends = [ protobuf ]; description = "Basic protocol buffer message types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {inherit (pkgs) protobuf;}; + + "proto-lens-protoc_0_2_2_3" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers + , data-default-class, directory, filepath, haskell-src-exts + , lens-family, lens-labels, process, proto-lens + , proto-lens-descriptors, protobuf, text + }: + mkDerivation { + pname = "proto-lens-protoc"; + version = "0.2.2.3"; + sha256 = "08s93h25l66z7w45jmy632lhhkddqarj94bpwn3wmv5kdpsp33pq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring Cabal containers data-default-class directory + filepath haskell-src-exts lens-family lens-labels process + proto-lens proto-lens-descriptors text + ]; + libraryToolDepends = [ protobuf ]; + executableHaskellDepends = [ + base bytestring containers data-default-class filepath + haskell-src-exts lens-family proto-lens proto-lens-descriptors text + ]; + description = "Protocol buffer compiler for the proto-lens library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) protobuf;}; "proto-lens-protoc" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers , data-default-class, deepseq, directory, filepath , haskell-src-exts, lens-family, lens-labels, pretty, process - , proto-lens, text + , proto-lens, protobuf, text }: mkDerivation { pname = "proto-lens-protoc"; @@ -163008,13 +163401,14 @@ self: { directory filepath haskell-src-exts lens-family lens-labels pretty process proto-lens text ]; + libraryToolDepends = [ protobuf ]; executableHaskellDepends = [ base bytestring containers data-default-class deepseq filepath haskell-src-exts lens-family proto-lens text ]; description = "Protocol buffer compiler for the proto-lens library"; license = stdenv.lib.licenses.bsd3; - }) {}; + }) {inherit (pkgs) protobuf;}; "protobuf" = callPackage ({ mkDerivation, base, base-orphans, bytestring, cereal, containers @@ -164319,30 +164713,30 @@ self: { "puzzle-draw" = callPackage ({ mkDerivation, aeson, base, blaze-svg, bytestring, containers - , deepseq, diagrams-lib, diagrams-svg, filepath, hashable, hspec - , linear, mtl, optparse-applicative, parsec, process, SVGFonts - , tasty, tasty-golden, tasty-hspec, tasty-hunit, text - , unordered-containers, vector-space, yaml + , deepseq, diagrams-lib, diagrams-rasterific, filepath, hashable + , hspec, linear, mtl, optparse-applicative, parsec, SVGFonts, tasty + , tasty-hspec, tasty-hunit, text, unordered-containers + , vector-space, yaml }: mkDerivation { pname = "puzzle-draw"; - version = "0.2.0.0"; - sha256 = "04sibf7rpr2dyxn943nbl8jzzy7zcf5ic0najgy1kmrl5n4v7p02"; + version = "0.3.0.0"; + sha256 = "0vnmq65khi1lcrf3rz4ym7lnv3178rvnb884rln0jspil6bs4cs7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base containers diagrams-lib diagrams-svg filepath hashable - linear mtl optparse-applicative parsec SVGFonts text + aeson base containers diagrams-lib diagrams-rasterific filepath + hashable linear mtl optparse-applicative parsec SVGFonts text unordered-containers vector-space yaml ]; executableHaskellDepends = [ - aeson base diagrams-lib diagrams-svg filepath optparse-applicative - process tasty tasty-golden yaml + aeson base containers diagrams-lib diagrams-rasterific filepath + optparse-applicative yaml ]; testHaskellDepends = [ - base blaze-svg bytestring containers deepseq diagrams-lib - diagrams-svg hspec tasty tasty-hspec tasty-hunit text yaml + base blaze-svg bytestring containers deepseq diagrams-lib hspec + tasty tasty-hspec tasty-hunit text yaml ]; description = "Creating graphics for pencil puzzles"; license = stdenv.lib.licenses.mit; @@ -165328,14 +165722,15 @@ self: { }: mkDerivation { pname = "quickcheck-classes"; - version = "0.4.12"; - sha256 = "1gnzaw5vvn5xk6h9zjvdjicxq35ppwvrs87fys1lk51c402npvz7"; + version = "0.4.13"; + sha256 = "19kndmc019dhz0b8iajplpiifl1x3ph39zwp2c2n3rp5v41syxrs"; libraryHaskellDepends = [ aeson base bifunctors containers primitive QuickCheck semigroupoids semigroups semirings tagged transformers ]; testHaskellDepends = [ - aeson base primitive QuickCheck tagged transformers vector + aeson base containers primitive QuickCheck semigroupoids tagged + transformers vector ]; description = "QuickCheck common typeclasses"; license = stdenv.lib.licenses.bsd3; @@ -165589,8 +165984,8 @@ self: { }: mkDerivation { pname = "quickcheck-string-random"; - version = "0.1.0.1"; - sha256 = "1yx1kyd6p58b7s10v0lkq1v162vnz90p6m9jlwbr4s6qxa0sm31r"; + version = "0.1.1.0"; + sha256 = "1dxazyn5h2njhjs41x2cb5nwydf87a29yxgy7wv40s6fq6ajj084"; libraryHaskellDepends = [ base QuickCheck string-random text ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck text @@ -168758,7 +169153,7 @@ self: { libraryPkgconfigDepends = [ raptor2 redland ]; description = "Redland RDF library bindings"; license = stdenv.lib.licenses.bsd3; - }) {raptor2 = null; inherit (pkgs) redland;}; + }) {raptor2 = null; redland = null;}; "redo" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath @@ -169163,6 +169558,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "reflex-dom-fragment-shader-canvas" = callPackage + ({ mkDerivation, base, containers, ghcjs-dom, jsaddle, lens + , reflex-dom, text, transformers + }: + mkDerivation { + pname = "reflex-dom-fragment-shader-canvas"; + version = "0.1"; + sha256 = "1zc8kgny3d467lxpwg5mm1amg6924m5ifkkafyh18nfzqffvc3bl"; + revision = "1"; + editedCabalFile = "1s08vdpwyyfrfw7hfbn2i2m9b3dszcdd7dmfyd0z1pbxy6wj1xmz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers ghcjs-dom jsaddle lens reflex-dom text transformers + ]; + executableHaskellDepends = [ base reflex-dom text ]; + description = "A reflex-dom widget to draw on a canvas with a fragment shader program"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "reflex-dom-helpers" = callPackage ({ mkDerivation, base, reflex, reflex-dom, template-haskell }: mkDerivation { @@ -171363,8 +171779,8 @@ self: { }: mkDerivation { pname = "reqcatcher"; - version = "0.1.0.1"; - sha256 = "1ywh83ydy48mlix7mglnkhsjj3b13jqs2gs52by6q1g438nb31in"; + version = "0.1.1.0"; + sha256 = "15qpd11ijbip88pf7sn1cmms369cv963l2xdp3wxg7qvlf362ns8"; libraryHaskellDepends = [ base http-types network text wai warp ]; testHaskellDepends = [ base http-client http-types HUnit lens tasty tasty-hunit wai wreq @@ -174100,6 +174516,37 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "rss-conduit_0_4_2_2" = callPackage + ({ mkDerivation, atom-conduit, base, blaze-builder, bytestring + , conduit, conduit-combinators, containers, data-default + , dublincore-xml-conduit, lens-simple, mono-traversable, QuickCheck + , quickcheck-instances, resourcet, safe, safe-exceptions + , singletons, tasty, tasty-hunit, tasty-quickcheck, text, time + , timerep, uri-bytestring, vinyl, xml-conduit, xml-types + }: + mkDerivation { + pname = "rss-conduit"; + version = "0.4.2.2"; + sha256 = "1qaz3a9fjq5dqky6jvnnk68xbarrqng7bas9r10qzdpy7g1v17ps"; + revision = "1"; + editedCabalFile = "1y5f1fvjjljk0rl8payxm9dsazzh2057nq9m9bi4gxwa8lkfz21d"; + libraryHaskellDepends = [ + atom-conduit base conduit conduit-combinators containers + dublincore-xml-conduit lens-simple safe safe-exceptions singletons + text time timerep uri-bytestring vinyl xml-conduit xml-types + ]; + testHaskellDepends = [ + atom-conduit base blaze-builder bytestring conduit + conduit-combinators data-default dublincore-xml-conduit lens-simple + mono-traversable QuickCheck quickcheck-instances resourcet + safe-exceptions singletons tasty tasty-hunit tasty-quickcheck text + time uri-bytestring vinyl xml-conduit xml-types + ]; + description = "Streaming parser/renderer for the RSS standard"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rss2irc" = callPackage ({ mkDerivation, base, bytestring, cmdargs, containers, deepseq , feed, http-client, http-conduit, http-types, io-storage, irc @@ -175657,8 +176104,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "7.9"; - sha256 = "0x57ppvlzvaqsd3aazx8gqcrqgjiqs06ch5rkkjsd0c9nifpb04m"; + version = "7.10"; + sha256 = "0bq3h0aidjdh7a9gp97mxfpng4x36mxyb4bgmj4pyjqdnbdgr05p"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers crackNum data-binary-ieee754 deepseq @@ -177591,8 +178038,8 @@ self: { }: mkDerivation { pname = "self-extract"; - version = "0.3.2"; - sha256 = "0w4pqh9bcdnkyjmy24am2b894627x9is33vbyw03r0br9pd7q82q"; + version = "0.3.3"; + sha256 = "0i2b4mxwa2m2p9xks18wna0p84732kbjvjiz3cy0pd9jfmc92vbm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178363,6 +178810,8 @@ self: { pname = "serialise"; version = "0.2.0.0"; sha256 = "1iqkawxy946dhldam30cc1k9h4g2w4cp34fg57ln9k7507mvcns0"; + revision = "2"; + editedCabalFile = "1wvqzrbf80ry5xc2s9va24024gfgwi6xj1yvm7578f7mq0k1zqvf"; libraryHaskellDepends = [ array base bytestring cborg containers ghc-prim half hashable primitive text time unordered-containers vector @@ -180436,7 +180885,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "serverless-haskell_0_7_0" = callPackage + "serverless-haskell_0_7_1" = callPackage ({ mkDerivation, aeson, aeson-casing, aeson-extra, amazonka-core , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive , hspec, hspec-discover, http-types, iproute, lens, raw-strings-qq @@ -180444,8 +180893,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.7.0"; - sha256 = "04z67q8g8qkksivvqw8dk8m883f3kicc98m16v17hpdv5kni8qcj"; + version = "0.7.1"; + sha256 = "1vjiv56w591vparjw3372fz2vsa5hcm5j3p90j00x882gm23wf22"; libraryHaskellDepends = [ aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-types iproute @@ -183950,8 +184399,8 @@ self: { }: mkDerivation { pname = "sitepipe"; - version = "0.3.0.0"; - sha256 = "0h1qcc9d721yczd1szylxpxc1nzi2np6xa5b1rlsck6yjr238bwz"; + version = "0.3.0.1"; + sha256 = "1iv0ndllixwn9vj7gqavv1ymfxfxqm4xqqzxqf1y8qiq240b3j6l"; libraryHaskellDepends = [ aeson base bytestring containers directory exceptions filepath Glob lens lens-aeson megaparsec MissingH mtl mustache @@ -184568,8 +185017,8 @@ self: { }: mkDerivation { pname = "slick"; - version = "0.1.0.0"; - sha256 = "0irp1d9z5l8jr33qgbnkq05lpkpll6dw84qyl0cd2xnqs1iklyds"; + version = "0.1.0.2"; + sha256 = "1s5ya5h253h599m3hkcilq7fya9ghgz4b5mlk8v1ywpdm1jab3dm"; libraryHaskellDepends = [ aeson base binary bytestring containers lens lens-aeson mustache pandoc shake text time @@ -185583,6 +186032,8 @@ self: { pname = "snap-templates"; version = "1.0.0.1"; sha256 = "1l6gc2ppsvbaf783namglpyzghhynlg97q3ajc2ralibs21vsn7c"; + revision = "1"; + editedCabalFile = "0m54p36hvwn3zaixalb5jiy9siq1ksf5da5d0407rys87wfy711b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -185774,8 +186225,8 @@ self: { }: mkDerivation { pname = "snaplet-customauth"; - version = "0.1.0"; - sha256 = "1xc45lvhr3psqhv87n75f5968q129fgz3cz6362qvcnbnyyiznz3"; + version = "0.1.1"; + sha256 = "0alh5jaygcxnjpm5r3qx2c6al1x73shzwqi67820rzqxix2np8pc"; libraryHaskellDepends = [ aeson base base64-bytestring binary binary-orphans bytestring configurator containers errors heist hoauth2 http-client @@ -189470,6 +189921,8 @@ self: { pname = "stack-prism"; version = "0.1.7"; sha256 = "0a09x8b78j08cn0l492hj6yx15fhs6bipaiwgjqsax37ynnrxhqz"; + revision = "1"; + editedCabalFile = "1xd0hcp003ijakpcjgcmllsa65i0924has9wllvsj8i0mnapcni3"; libraryHaskellDepends = [ base profunctors tagged template-haskell transformers ]; @@ -191676,6 +192129,8 @@ self: { pname = "streaming-base64"; version = "0.1.0.0"; sha256 = "0w6xj80z1z21pgxadwc48w15a08g94i4g7qkgv5gvq46kpl44bq6"; + revision = "1"; + editedCabalFile = "0mc71ncw2mw3yfryk0g2iq86wba7i3khy8fbsjaz5dr22hkkzh9r"; libraryHaskellDepends = [ base safe-exceptions streaming streaming-bytestring transformers ]; @@ -192482,16 +192937,19 @@ self: { "string-random" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers - , pcre-heavy, QuickCheck, random, tasty, tasty-hunit - , tasty-quickcheck, text, transformers + , optparse-applicative, pcre-heavy, QuickCheck, random, tasty + , tasty-hunit, tasty-quickcheck, text, transformers }: mkDerivation { pname = "string-random"; - version = "0.1.0.0"; - sha256 = "090lin4b0y7xccwpnw8q33kfdljjw6annbl2d1jldird7db086ah"; + version = "0.1.1.0"; + sha256 = "0gypx0lg9kz8s2aksj2qg238m41cnl49k4bxwz7sgf94h12nhil2"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ attoparsec base containers random text transformers ]; + executableHaskellDepends = [ base optparse-applicative text ]; testHaskellDepends = [ base bytestring pcre-heavy QuickCheck tasty tasty-hunit tasty-quickcheck text @@ -193859,24 +194317,22 @@ self: { }) {}; "sv" = callPackage - ({ mkDerivation, ansi-wl-pprint, attoparsec, base, bifunctors - , bytestring, charset, containers, contravariant, deepseq, hedgehog - , lens, mtl, parsec, parsers, profunctors, readable, semigroupoids - , semigroups, tasty, tasty-hedgehog, tasty-hunit, text - , transformers, trifecta, utf8-string, validation, vector, void + ({ mkDerivation, attoparsec, base, bifunctors, bytestring, cassava + , contravariant, 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 = "0.1"; - sha256 = "0rd4jf4qqfc66xxddvaa37fjmpmmjzb7n928gclds0xibzm9ls7s"; + version = "1.0"; + sha256 = "1sgyly9b6nrij5hpj3ffvwj6m3ygm43wbi8xkd2gxs2jh5zjzvw3"; libraryHaskellDepends = [ - ansi-wl-pprint attoparsec base bifunctors bytestring charset - containers contravariant deepseq lens mtl parsec parsers - profunctors readable semigroupoids semigroups text transformers - trifecta utf8-string validation vector void + attoparsec base bifunctors bytestring contravariant hw-dsv + semigroupoids sv-core transformers utf8-string validation ]; testHaskellDepends = [ - ansi-wl-pprint base bytestring contravariant hedgehog lens parsers + base bytestring cassava contravariant hedgehog lens Only parsers semigroupoids semigroups tasty tasty-hedgehog tasty-hunit text trifecta utf8-string validation vector ]; @@ -193886,24 +194342,88 @@ self: { }) {}; "sv-cassava" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, cassava, HUnit, sv - , text, utf8-string, validation, vector + ({ mkDerivation, attoparsec, base, bytestring, cassava, HUnit + , sv-core, text, utf8-string, validation, vector }: mkDerivation { pname = "sv-cassava"; - version = "0.1"; - sha256 = "050f2ji5zhispjqm66n6jbdq4x20dijzrkl20vpgx4i42z7fmn15"; + version = "0.2"; + sha256 = "01bhh3b85gsbgm3fb0ppb1ihcm2p0rkv6bsmw16l3b2jgj806zin"; libraryHaskellDepends = [ - attoparsec base bytestring cassava sv utf8-string vector + attoparsec base bytestring cassava sv-core utf8-string validation + vector ]; testHaskellDepends = [ - base bytestring cassava HUnit sv text validation vector + base bytestring cassava HUnit sv-core text validation vector ]; description = "Integration to use sv with cassava's parser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "sv-core" = callPackage + ({ mkDerivation, attoparsec, base, bifunctors, bytestring + , containers, contravariant, deepseq, 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.1"; + sha256 = "0zqzj6i4xbw7bjzn40mimn4rw1g88jndrdxzdmrbdigfdncxhyl3"; + libraryHaskellDepends = [ + attoparsec base bifunctors bytestring containers contravariant + deepseq 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; + }) {}; + + "sv-svfactor" = callPackage + ({ mkDerivation, base, bytestring, lens, profunctors, sv-core + , svfactor, validation + }: + mkDerivation { + pname = "sv-svfactor"; + version = "0.1"; + sha256 = "0j97va25p30x3q07084mbv4lsls6p2yky8y7zmf9w6i7i42r3bi0"; + libraryHaskellDepends = [ + base bytestring lens profunctors sv-core svfactor validation + ]; + description = "sv-core + svfactor"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "svfactor" = callPackage + ({ mkDerivation, attoparsec, base, bifunctors, bytestring, charset + , deepseq, hedgehog, lens, parsec, parsers, semigroupoids + , semigroups, tasty, tasty-hedgehog, tasty-hunit, text + , transformers, trifecta, utf8-string, vector + }: + mkDerivation { + pname = "svfactor"; + version = "0.1"; + sha256 = "1vjdv7xgd33z3iwwlh8xwp9za06jvqxpbssc4m5bmcx1wihsnn35"; + libraryHaskellDepends = [ + attoparsec base bifunctors bytestring charset deepseq lens parsec + parsers semigroupoids semigroups text transformers trifecta + utf8-string vector + ]; + testHaskellDepends = [ + base bytestring hedgehog lens parsers semigroups tasty + tasty-hedgehog tasty-hunit text trifecta utf8-string vector + ]; + description = "Syntax-preserving CSV manipulation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "svg-builder" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, hashable, text , unordered-containers @@ -198024,7 +198544,6 @@ self: { ]; description = "TensorFlow bindings"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {tensorflow = null;}; "tensorflow-core-ops" = callPackage @@ -198045,7 +198564,6 @@ self: { ]; description = "Haskell wrappers for Core Tensorflow Ops"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tensorflow-logging" = callPackage @@ -198073,7 +198591,6 @@ self: { ]; description = "TensorBoard related functionality"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tensorflow-opgen" = callPackage @@ -198091,7 +198608,6 @@ self: { ]; description = "Code generation for TensorFlow operations"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tensorflow-ops" = callPackage @@ -198121,21 +198637,22 @@ self: { ]; description = "Friendly layer around TensorFlow bindings"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tensorflow-proto" = callPackage - ({ mkDerivation, base, Cabal, proto-lens, proto-lens-protoc }: + ({ mkDerivation, base, Cabal, proto-lens, proto-lens-protoc + , protobuf + }: mkDerivation { pname = "tensorflow-proto"; version = "0.1.0.0"; sha256 = "06k87dvpsf8pnbb1qq5gjxpjc2sra95y1bwmsnpmlg1qn0ppi5mn"; setupHaskellDepends = [ base Cabal proto-lens-protoc ]; libraryHaskellDepends = [ base proto-lens proto-lens-protoc ]; + libraryToolDepends = [ protobuf ]; description = "TensorFlow protocol buffers"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {inherit (pkgs) protobuf;}; "tensorflow-records" = callPackage ({ mkDerivation, base, bytestring, cereal, snappy-framing @@ -198151,7 +198668,6 @@ self: { ]; description = "Encoder and decoder for the TensorFlow \"TFRecords\" format"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tensorflow-records-conduit" = callPackage @@ -198168,7 +198684,6 @@ self: { ]; description = "Conduit wrappers for TensorFlow.Records."; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tensorflow-test" = callPackage @@ -198200,6 +198715,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "termbox" = callPackage + ({ mkDerivation, array, base, c2hs }: + mkDerivation { + pname = "termbox"; + version = "0.1.0"; + sha256 = "1wylp818y65rwdrzmh596sn8csiwjma6gh6wm4fn9m9zb1nvzbsa"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ array base ]; + libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ base ]; + description = "termbox bindings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "termbox-bindings" = callPackage ({ mkDerivation, base, c2hs }: mkDerivation { @@ -202049,6 +202579,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "timer-wheel" = callPackage + ({ mkDerivation, atomic-primops, base, ghc-prim, primitive + , psqueues + }: + mkDerivation { + pname = "timer-wheel"; + version = "0.1.0"; + sha256 = "0wjm767yxf3hg3p80nd0hi0bfvdssq0f3lj9pzkmrsnsqafngs2j"; + libraryHaskellDepends = [ + atomic-primops base ghc-prim primitive psqueues + ]; + description = "A timer wheel"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "timerep" = callPackage ({ mkDerivation, attoparsec, base, monoid-subclasses, QuickCheck , tasty, tasty-hunit, tasty-quickcheck, text, time @@ -214798,8 +215343,8 @@ self: { }: mkDerivation { pname = "web-inv-route"; - version = "0.1.2"; - sha256 = "1qhs2gi1591bphdr1wxbn2za7kfskywndz4bcr741q825m2bakhd"; + version = "0.1.2.1"; + sha256 = "0pdbcc9mg2wrc3jm7g2dcsqgqv89dgjcnxs810gzw3d3rh418i5m"; libraryHaskellDepends = [ base bytestring case-insensitive containers happstack-server hashable http-types invertible network-uri snap-core text @@ -216257,35 +216802,35 @@ self: { "winery" = callPackage ({ mkDerivation, base, binary, bytestring, cassava, containers, cpu - , deepseq, fingertree, gauge, hashable, mtl, prettyprinter - , prettyprinter-ansi-terminal, serialise, text, transformers - , unordered-containers, vector + , deepseq, gauge, hashable, megaparsec, mtl, prettyprinter + , prettyprinter-ansi-terminal, scientific, serialise, text + , transformers, unordered-containers, vector }: mkDerivation { pname = "winery"; - version = "0.1.1"; - sha256 = "10f6il6vf7p6613xg9jk1s8rd0hppmirpazhibplsqscr6nnjaar"; + version = "0.1.2"; + sha256 = "0g18xgby2k5cgb1ymyv92ii9rqj07ng12v2qfsp8yk15fcrx0ky9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring containers cpu fingertree hashable mtl - prettyprinter prettyprinter-ansi-terminal text transformers - unordered-containers vector + base bytestring containers cpu hashable megaparsec mtl + prettyprinter prettyprinter-ansi-terminal scientific text + transformers unordered-containers vector ]; executableHaskellDepends = [ - base bytestring containers cpu fingertree hashable mtl - prettyprinter prettyprinter-ansi-terminal text transformers - unordered-containers vector + base bytestring containers cpu hashable megaparsec mtl + prettyprinter prettyprinter-ansi-terminal scientific text + transformers unordered-containers vector ]; testHaskellDepends = [ - base bytestring containers cpu fingertree hashable mtl - prettyprinter prettyprinter-ansi-terminal text transformers - unordered-containers vector + base bytestring containers cpu hashable megaparsec mtl + prettyprinter prettyprinter-ansi-terminal scientific text + transformers unordered-containers vector ]; benchmarkHaskellDepends = [ - base binary bytestring cassava containers cpu deepseq fingertree - gauge hashable mtl prettyprinter prettyprinter-ansi-terminal - serialise text transformers unordered-containers vector + base binary bytestring cassava containers cpu deepseq gauge + hashable megaparsec mtl prettyprinter prettyprinter-ansi-terminal + scientific serialise text transformers unordered-containers vector ]; description = "Sustainable serialisation library"; license = stdenv.lib.licenses.bsd3; @@ -218774,6 +219319,8 @@ self: { pname = "xml-conduit-parse"; version = "0.3.1.2"; sha256 = "0233jcpv7lzan2hh6siw2rrjkjp4f5i1kkpjpdfija01f8by3an1"; + revision = "1"; + editedCabalFile = "0jnnr4z3c6rq2dz0ldiic5zwkrp36igf6gip11qrm9ss2pk9khbl"; libraryHaskellDepends = [ base conduit conduit-parse containers exceptions parsers text xml-conduit xml-types @@ -225120,8 +225667,8 @@ self: { }: mkDerivation { pname = "ztar"; - version = "0.1.3"; - sha256 = "12pzskr90a724x3wh1dsbpbszh6a58lbp4sxl7sd7s1bk3m2kgq1"; + version = "0.2.0"; + sha256 = "1y6kkfwx3aw2fi46r7dg4q84mbhl54f2x4vpvwvzd9alz1nvv90i"; libraryHaskellDepends = [ base bytestring deepseq directory filepath path process text unix-compat zip zlib diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix index 7b3fe8fba0236..c7fbab6ab88c0 100644 --- a/pkgs/development/haskell-modules/hoogle.nix +++ b/pkgs/development/haskell-modules/hoogle.nix @@ -28,7 +28,6 @@ }: let - inherit (stdenv.lib) optional; wrapper = ./hoogle-local-wrapper.sh; isGhcjs = ghc.isGhcjs or false; opts = lib.optionalString; diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/development/interpreters/chibi/default.nix index c2ae87582df63..2ad0bc0285e5a 100644 --- a/pkgs/development/interpreters/chibi/default.nix +++ b/pkgs/development/interpreters/chibi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper }: let - version = "0.7.3"; + version = "0.8"; name = "chibi-scheme-${version}"; in stdenv.mkDerivation { @@ -18,7 +18,7 @@ stdenv.mkDerivation { owner = "ashinn"; repo = "chibi-scheme"; rev = version; - sha256 = "05b17flppkll1a2c2aq6lxh4iif4pjmpxmyrmiqzk0ls85gvai2x"; + sha256 = "0269d5fhaz7nqjb41vh7yz63mp5s4z08fn4sspwc06z32xksigw9"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix index 5ae9ead9ced41..503e4b0fa43b2 100644 --- a/pkgs/development/libraries/blitz/default.nix +++ b/pkgs/development/libraries/blitz/default.nix @@ -19,7 +19,7 @@ assert enableSerialization -> boost != null; let - inherit (stdenv.lib) optional optionals optionalString; + inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 3d9027db1602e..e763e5c1159ca 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -42,7 +42,7 @@ */ let - inherit (stdenv) icCygwin isDarwin isFreeBSD isLinux isAarch32; + inherit (stdenv) isDarwin isFreeBSD isLinux isAarch32; inherit (stdenv.lib) optional optionals enableFeature; cmpVer = builtins.compareVersions; diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index c678b46c0d213..fce052aeb223a 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -9,7 +9,7 @@ }: let - inherit (stdenv.lib) optional optionals optionalString; + inherit (stdenv.lib) optional optionalString; in stdenv.mkDerivation rec { name = "freetype-${version}"; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 11e0894df3c35..ad7309be04453 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -12,7 +12,7 @@ assert gtkSupport -> gtk3 != null; let - inherit (stdenv.lib) optional optionals optionalString; + inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { name = "gst-plugins-good-1.14.0"; diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix index eff57d6f2fd9e..cf9c554d57f4a 100644 --- a/pkgs/development/libraries/java/commons/compress/default.nix +++ b/pkgs/development/libraries/java/commons/compress/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.16.1"; + version = "1.17"; name = "commons-compress-${version}"; src = fetchurl { url = "mirror://apache/commons/compress/binaries/${name}-bin.tar.gz"; - sha256 = "0yz2m3qac1idg9346i64mjfrkq4kniajzx2manyybhj43v9dpx37"; + sha256 = "1ydm6mhy0kja47mns674iyrhz5mqlhhnh2l8rglzxnq5iawpi2m0"; }; installPhase = '' diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/pkgs/development/libraries/languagemachines/frog.nix index 853d23c974586..dcff8c2757e1f 100644 --- a/pkgs/development/libraries/languagemachines/frog.nix +++ b/pkgs/development/libraries/languagemachines/frog.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { name = "frog-${release.version}"; version = release.version; src = fetchurl { inherit (release) url sha256; - name = "frog-${release.version}.tar.gz"; }; + name = "frog-v${release.version}.tar.gz"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive libxml2 icu diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json index 1147322be6da8..6ea449387172b 100644 --- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json +++ b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json @@ -1,5 +1,5 @@ { - "version": "v0.13", + "version": "0.13", "url": "https://api.github.com/repos/LanguageMachines/frogdata/tarball/v0.13", "sha256": "13mhv8qacl0n20ddl1ay49xi6h2m0a149ya3rrsmaah3x4adb4sg" } diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index dfe1455759a67..5eb90aaf05c91 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -18,7 +18,7 @@ assert faacSupport -> enableUnfree; -let inherit (stdenv.lib) optional optionals hasPrefix enableFeature; in +let inherit (stdenv.lib) optional hasPrefix enableFeature; in /* ToDo: - more deps, inspiration: https://packages.ubuntu.com/raring/libav-tools diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index b0013d0f94912..90daf2ddf7434 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,8 +1,6 @@ { fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2 , python, perl, gdk_pixbuf, libiconv, libintl }: -let inherit (stdenv.lib) optionals; in - stdenv.mkDerivation rec { name = "libgsf-1.14.42"; diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix index aab0da90d394e..6eb8b6b1a8e9d 100644 --- a/pkgs/development/libraries/libsvm/default.nix +++ b/pkgs/development/libraries/libsvm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libsvm-${version}"; - version = "3.22"; + version = "3.23"; src = fetchurl { url = "https://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-${version}.tar.gz"; - sha256 = "0zd7s19y5vb7agczl6456bn45cj1y64739sslaskw1qk7dywd0bd"; + sha256 = "0jpaq0rr92x38p4nk3gjan79ip67m6p80anb28z1d8601miysyi5"; }; buildPhase = '' diff --git a/pkgs/development/libraries/libtensorflow/default.nix b/pkgs/development/libraries/libtensorflow/default.nix new file mode 100644 index 0000000000000..fce15b121b426 --- /dev/null +++ b/pkgs/development/libraries/libtensorflow/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, patchelf }: +stdenv.mkDerivation rec { + pname = "libtensorflow"; + version = "1.8.0"; + name = "${pname}-${version}"; + src = fetchurl { + url = "https://storage.googleapis.com/tensorflow/${pname}/${pname}-cpu-linux-x86_64-${version}.tar.gz"; + sha256 = "0qzy15rc3x961cyi3bqnygrcnw4x69r28xkwhpwrv1r0gi6k73ha"; + }; + + # Patch library to use our libc, libstdc++ and others + buildCommand = '' + . $stdenv/setup + mkdir -pv $out + tar -C $out -xzf $src + chmod +w $out/lib/libtensorflow.so + chmod +w $out/lib/libtensorflow_framework.so + ${patchelf}/bin/patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:$out/lib" $out/lib/libtensorflow.so + ${patchelf}/bin/patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/lib/libtensorflow_framework.so + chmod -w $out/lib/libtensorflow.so + chmod -w $out/lib/libtensorflow_framework.so + ''; + + meta = with stdenv.lib; { + inherit version; + description = "C API for TensorFlow"; + license = licenses.asl20; + maintainers = [maintainers.basvandijk]; + platforms = platforms.linux; + homepage = https://www.tensorflow.org/versions/master/install/install_c; + }; +} diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 4338a70907014..515aa25374434 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -40,7 +40,7 @@ }: let - inherit (stdenv) isi686 isx86_64 isAarch32 is64bit isMips isDarwin isCygwin; + inherit (stdenv) is64bit isMips isDarwin isCygwin; inherit (stdenv.lib) enableFeature optional optionals; in diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix index 20a62ef67f981..a073a29b507de 100644 --- a/pkgs/development/libraries/opendbx/default.nix +++ b/pkgs/development/libraries/opendbx/default.nix @@ -1,8 +1,5 @@ { stdenv, fetchurl, readline, mysql, postgresql, sqlite }: -let - inherit (stdenv.lib) getDev getLib; -in stdenv.mkDerivation rec { name = "opendbx-1.4.6"; diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index b10e4713019d0..51270427397d1 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "opensubdiv-${version}"; - version = "3.3.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = "PixarAnimationStudios"; repo = "OpenSubdiv"; rev = "v${lib.replaceChars ["."] ["_"] version}"; - sha256 = "1s96038yvf8wch5gv537iigqflxx7rh9wwn3wlrk8f9yfdwv1mk1"; + sha256 = "0j3vh52w1pnld2a2cm6z7iicni1f617qzg0d8xh3p7l0s2dxjibh"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index c68454fbe4a1d..e6af2251b1f18 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -11,8 +11,7 @@ let atlasMaybeShared = if atlas != null then atlas.override { inherit shared; } else null; usedLibExtension = if shared then ".so" else ".a"; - inherit (stdenv.lib) optional optionals concatStringsSep; - inherit (builtins) hasAttr attrNames; + inherit (stdenv.lib) optional optionals; version = "3.8.0"; in diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index 63dee2529fe29..ad1cc2efc8797 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -8,13 +8,13 @@ assert ncclSupport -> cudaSupport; stdenv.mkDerivation rec { name = "xgboost-${version}"; - version = "0.7"; + version = "0.72"; # needs submodules src = fetchgit { url = "https://github.com/dmlc/xgboost"; rev = "refs/tags/v${version}"; - sha256 = "1wxh020l4q037hc5z7vgxflb70l41a97anl8g6y4wxb74l5zv61l"; + sha256 = "1d4kw2jm7d12g8qwi7p9r3429y7sjks9xp9yhvfpx5jh7qakkxj6"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index f67964748dca1..9d00652771729 100644 --- a/pkgs/development/libraries/zimg/default.nix +++ b/pkgs/development/libraries/zimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec{ name = "zimg-${version}"; - version = "2.7.4"; + version = "2.7.5"; src = fetchFromGitHub { owner = "sekrit-twc"; repo = "zimg"; rev = "release-${version}"; - sha256 = "1gpmf6algpl1g1z891jfnsici84scg2cq1kj4v90glgik9z99mci"; + sha256 = "1f4iv99w1sn7kp8xlv2vr20m6qif7c8km1vqjfs9kf2305z5lxww"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix index 9b9486e9758c7..22aa818f8756d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''alexandria''; version = ''20170830-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix index 7c618a9fffb25..c90a9e091920e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''array-utils''; version = ''20180131-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix index f2125676e5a2a..68c8a7e087b54 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''asdf-finalizers''; version = ''20170403-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix index 65df45d95a50c..4612e6175b916 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''asdf-system-connections''; version = ''20170124-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix index a9808173b626c..c8f34e0fa17f2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''chipz''; version = ''20180328-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix index 531d429df244f..a420c22054f6e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''cl-aa''; version = ''cl-vectors-20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix index a413743eb8d54..42a7bd595853f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''cl-anonfun''; version = ''20111203-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix index 61a35f2b58c63..0321572e72a6d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''cl-html-parse''; version = ''20161031-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix index dfabda0428f09..825fea4eb9068 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''cl-l10n-cldr''; version = ''20120909-darcs''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix index 57c9c03ba42b9..d506acf876ee9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''cl-log''; version = ''cl-log.1.0.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix index 8967b0970c568..67468edbb6cb6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''cl-markup''; version = ''20131003-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix index e8034b11c2375..f546e4711acce 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''cl-paths''; version = ''cl-vectors-20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix index 6d284b7b01208..4434e711d9ded 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''cl-unification''; version = ''20171227-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix index 750da99d5d6a7..1b78d0d289839 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''cl-utilities''; version = ''1.2.4''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix index fe511ec40bdff..a4a66ecfa64ff 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''clack-socket''; version = ''clack-20180328-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix index 312d0eb10a44e..ec7599f2bd3fb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''closer-mop''; version = ''20180430-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix index e1fb59658528f..1ae6fa0f4ec42 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''command-line-arguments''; version = ''20151218-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix index f4941aa80cd63..bb5ab940638a8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''css-lite''; version = ''20120407-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix index ae8ed6de87760..7c69878900cd4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''db3''; version = ''cl-20150302-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix index 1568533d92af1..91b8db69a36b1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''eos''; version = ''20150608-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix index 11d5ac4491ebf..76e2a55620cb8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''garbage-pools''; version = ''20130720-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix index f276ec72736db..f85b128652d0c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''iterate''; version = ''20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix index e5cbad3e9e836..62a3ae2bb7d11 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''kmrcl''; version = ''20150923-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix index 4dfdce68bc8af..79f2d38ef10dd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''lack-component''; version = ''lack-20180430-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix index a3ddc2fd953eb..b44c0c8a9874b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''lift''; version = ''20151031-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix index db25e6ae53478..006361ed80c12 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''map-set''; version = ''20160628-hg''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix index 4f6842606b451..c34d79f3d13de 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''marshal''; version = ''cl-20180328-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix index 953dd0a58a4ac..c65d95d9ef7a3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''md5''; version = ''20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix index d72e0839d1e8b..5647b9a92707e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''metabang-bind''; version = ''20171130-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix index 1fc10b9c8db75..6bbdf5f911e03 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''metatilities-base''; version = ''20170403-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix index 6334804c4f708..3c289fefa9ab5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''misc-extensions''; version = ''20150608-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix index a8cfc070bf999..29460307e6983 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''mt19937''; version = ''1.1.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix index 82d06b1c93b2f..e1d6a1477a7b0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''named-readtables''; version = ''20180131-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix index 4e7c84566a0ac..67636d3f6cf3e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''net_dot_didierverna_dot_asdf-flv''; version = ''asdf-flv-version-2.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix index e636df0805e7d..5c1f90220eb3d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''parse-number''; version = ''v1.7''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix index 5edceaf4ad97e..cd0db041c5b22 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''plump-lexer''; version = ''plump-20170725-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix index ffa2e595c26a2..c90b252313bf9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''ptester''; version = ''20160929-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix index be2897d19a4a6..41ead034791a1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''rfc2388''; version = ''20130720-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix index d5be4be7daf43..8ed7c1a449936 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''rt''; version = ''20101006-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix index 9056cfbdcca8f..d55f7700092c8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''salza2''; version = ''2.0.9''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix index 7f5cc1e048de8..9cc6338c8b890 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''string-case''; version = ''20151218-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix index 1359e13b949ef..6819e4b25713e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''swank''; version = ''slime-v2.20''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix index 9a4afce3280f0..a772694b9830d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''trivial-backtrace''; version = ''20160531-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix index 1a562c2288bb9..5efc576695527 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''trivial-features''; version = ''20161204-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix index dd93a599d699e..9a285fea2f18b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''trivial-gray-streams''; version = ''20180328-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix index 4f4e1f812233d..e044f097701d3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''trivial-indent''; version = ''20180131-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix index 56bbb58383775..6946141f11213 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''trivial-mimes''; version = ''20180131-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix index 8cc04c2c64ac3..1af66736f30ff 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''trivial-types''; version = ''20120407-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix index c925382d81d44..753f21dbcb96a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''trivial-utf-8''; version = ''20111001-darcs''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix index 1986f7c88f7ac..0ac190993d80d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''uffi''; version = ''20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix index 39c2060af0275..afb8b3885681d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''uiop''; version = ''3.3.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix index 6c45649673203..3a4b05e052697 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''unit-test''; version = ''20120520-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix index 6a4751f799ea0..11b9351c03ada 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''vom''; version = ''20160825-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix index b9ab71744c3a1..c70c3f2e1e126 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''xsubseq''; version = ''20170830-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix index c7031f4aa3fc9..733185e2b26f1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''yacc''; version = ''cl-20101006-darcs''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix index 74e5d7e97e95a..090aa670ad9ef 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix @@ -1,4 +1,4 @@ -args @ { fetchurl, ... }: +{ fetchurl, ... }: rec { baseName = ''zpb-ttf''; version = ''1.0.3''; diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 720e0cc08503c..eee72cb9613d5 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -56,7 +56,7 @@ let ) dependencies); # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: + composePackage = { name, packageName, src, dependencies ? [], ... }: '' DIR=$(pwd) cd $TMPDIR @@ -176,7 +176,7 @@ let # dependencies in the package.json file to the versions that are actually # being used. - pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: + pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }: '' if [ -d "${packageName}" ] then diff --git a/pkgs/development/ocaml-modules/astring/default.nix b/pkgs/development/ocaml-modules/astring/default.nix index 97c59d8581fb1..827487be69bf5 100644 --- a/pkgs/development/ocaml-modules/astring/default.nix +++ b/pkgs/development/ocaml-modules/astring/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, buildOcaml, ocaml, findlib, ocamlbuild, topkg }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }: -buildOcaml rec { +stdenv.mkDerivation rec { version = "0.8.3"; - name = "astring"; + name = "ocaml${ocaml.version}-astring-${version}"; src = fetchurl { url = "http://erratique.ch/software/astring/releases/astring-${version}.tbz"; diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix index 20d558e37c1a5..2f0aa34299509 100644 --- a/pkgs/development/ocaml-modules/ipaddr/default.nix +++ b/pkgs/development/ocaml-modules/ipaddr/default.nix @@ -1,9 +1,9 @@ -{ stdenv, buildOcaml, fetchurl, ocamlbuild, findlib +{ stdenv, fetchurl, ocaml, ocamlbuild, findlib , jbuilder, sexplib, ppx_sexp_conv }: -buildOcaml rec { - name = "ipaddr"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-ipaddr-${version}"; version = "2.8.0"; src = fetchurl { @@ -11,7 +11,7 @@ buildOcaml rec { sha256 = "1amb1pbm9ybpxy6190qygpj6nmbzzs2r6vx4xh5r6v89szx9rfxw"; }; - buildInputs = [ findlib ocamlbuild jbuilder ]; + buildInputs = [ ocaml findlib ocamlbuild jbuilder ]; propagatedBuildInputs = [ ppx_sexp_conv sexplib ]; inherit (jbuilder) installPhase; diff --git a/pkgs/development/ocaml-modules/ppx_blob/default.nix b/pkgs/development/ocaml-modules/ppx_blob/default.nix index 9d5f4f4e669df..45dd73d4a3211 100644 --- a/pkgs/development/ocaml-modules/ppx_blob/default.nix +++ b/pkgs/development/ocaml-modules/ppx_blob/default.nix @@ -1,15 +1,26 @@ -{ stdenv, buildOcaml, fetchurl, ppx_tools }: +{ stdenv, fetchurl, ocaml, findlib, jbuilder, alcotest +, ocaml-migrate-parsetree +}: -buildOcaml rec { - name = "ppx_blob"; - version = "0.2"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-ppx_blob-${version}"; + version = "0.4.0"; src = fetchurl { - url = "https://github.com/johnwhitington/ppx_blob/archive/v${version}.tar.gz"; - sha256 = "0kvqfm47f4xbgz0cl7ayz29myyb24xskm35svqrgakjq12nkpsss"; + url = "https://github.com/johnwhitington/ppx_blob/releases/download/${version}/ppx_blob-${version}.tbz"; + sha256 = "1xmslk1mwdzhy1bydgsjlcb7h544c39hvxa8lywp8w72gaggjl16"; }; - buildInputs = [ ppx_tools ]; + unpackCmd = "tar xjf $curSrc"; + + buildInputs = [ ocaml findlib jbuilder alcotest ocaml-migrate-parsetree ]; + + buildPhase = "dune build -p ppx_blob"; + + doCheck = true; + checkPhase = "dune runtest -p ppx_blob"; + + inherit (jbuilder) installPhase; meta = with stdenv.lib; { homepage = https://github.com/johnwhitington/ppx_blob; diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix index 3afe4149fa343..24cfbcf5b7af0 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -1,7 +1,11 @@ -{ stdenv, buildOcaml, ocaml, fetchzip +{ stdenv, ocaml, findlib, ocamlbuild, fetchzip , cppo, ppx_tools, ppx_derivers, result, ounit, ocaml-migrate-parsetree }: +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +then throw "ppx_deriving is not available for OCaml ${ocaml.version}" +else + let param = if ocaml.version == "4.03.0" then { @@ -14,23 +18,21 @@ let param = extraPropagatedBuildInputs = [ ocaml-migrate-parsetree ppx_derivers ]; }; in -buildOcaml rec { - name = "ppx_deriving"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-ppx_deriving-${version}"; inherit (param) version; - minimumSupportedOcamlVersion = "4.02"; - src = fetchzip { - url = "https://github.com/whitequark/${name}/archive/v${version}.tar.gz"; + url = "https://github.com/ocaml-ppx/ppx_deriving/archive/v${version}.tar.gz"; inherit (param) sha256; }; - hasSharedObjects = true; - - buildInputs = [ cppo ounit ]; + buildInputs = [ ocaml findlib ocamlbuild cppo ounit ]; propagatedBuildInputs = param.extraPropagatedBuildInputs ++ [ ppx_tools result ]; + createFindlibDestdir = true; + installPhase = "OCAMLPATH=$OCAMLPATH:`ocamlfind printconf destdir` make install"; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index 53d7847acee6f..2aa74d751dbfe 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -17,6 +17,9 @@ let param = { "4.06" = { version = "5.1+4.06.0"; sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; }; + "4.07" = { + version = "5.1+4.06.0"; + sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; }; }."${ocaml.meta.branch}"; in stdenv.mkDerivation { diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix index a965d6ed11630..b34c9279c3070 100644 --- a/pkgs/development/ocaml-modules/tyxml/default.nix +++ b/pkgs/development/ocaml-modules/tyxml/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camlp4, uutf, markup, ppx_tools_versioned, re +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, uutf, markup, ppx_tools_versioned, re +, withP4 ? !stdenv.lib.versionAtLeast ocaml.version "4.07" +, camlp4 ? null }: assert stdenv.lib.versionAtLeast ocaml.version "4.02"; @@ -13,13 +15,14 @@ stdenv.mkDerivation rec { sha256 = "1zrkrmxyj5a2cdh4b9zr9anwfk320wv3x0ynxnyxl5za2ix8sld8"; }; - buildInputs = [ ocaml findlib ocamlbuild camlp4 ppx_tools_versioned markup ]; + buildInputs = [ ocaml findlib ocamlbuild ppx_tools_versioned markup ] + ++ stdenv.lib.optional withP4 camlp4; propagatedBuildInputs = [ uutf re ]; createFindlibDestdir = true; - configureFlags = "--enable-syntax"; + configureFlags = stdenv.lib.optional withP4 "--enable-syntax"; meta = with stdenv.lib; { homepage = http://ocsigen.org/tyxml/; diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix index b995e0e2540af..5178551df4538 100644 --- a/pkgs/development/pharo/vm/default.nix +++ b/pkgs/development/pharo/vm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, pkgsi686Linux, makeWrapper, ...} @pkgs: +{ stdenv, callPackage, pkgsi686Linux, makeWrapper, ...}: let i686 = pkgsi686Linux.callPackage ./vms.nix {}; diff --git a/pkgs/development/python-modules/dateutil/1_5.nix b/pkgs/development/python-modules/dateutil/1_5.nix deleted file mode 100644 index 0808cf4f20110..0000000000000 --- a/pkgs/development/python-modules/dateutil/1_5.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, six }: - -buildPythonPackage rec { - pname = "python-dateutil"; - version = "2.7.3"; - disabled = isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "e27001de32f627c22380a688bcc43ce83504a7bc5da472209b4c70f02829f0b8"; - }; - - propagatedBuildInputs = [ six ]; - - meta = with stdenv.lib; { - description = "Powerful extensions to the standard datetime module"; - homepage = https://pypi.python.org/pypi/python-dateutil; - license = "BSD-style"; - }; -} diff --git a/pkgs/development/python-modules/pandas/0.17.1.nix b/pkgs/development/python-modules/pandas/0.17.1.nix index e4973d0d6e39b..c481aa0dfea70 100644 --- a/pkgs/development/python-modules/pandas/0.17.1.nix +++ b/pkgs/development/python-modules/pandas/0.17.1.nix @@ -21,7 +21,7 @@ }: let - inherit (stdenv.lib) optional optionalString concatStringsSep; + inherit (stdenv.lib) optional optionalString; inherit (stdenv) isDarwin; in buildPythonPackage rec { pname = "pandas"; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index fc75e5803afcb..ef07f2a36e32a 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -23,7 +23,7 @@ }: let - inherit (stdenv.lib) optional optionals optionalString concatStringsSep; + inherit (stdenv.lib) optional optionals optionalString; inherit (stdenv) isDarwin; in buildPythonPackage rec { diff --git a/pkgs/development/python-modules/qasm2image/default.nix b/pkgs/development/python-modules/qasm2image/default.nix index 174e0871ca2f0..5f7cded86fda9 100644 --- a/pkgs/development/python-modules/qasm2image/default.nix +++ b/pkgs/development/python-modules/qasm2image/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "qasm2image"; - version = "0.5.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "nelimeee"; repo = "qasm2image"; - rev = "7f3c3e4d1701b8b284ef0352aa3a47722ebbbcaa"; - sha256 = "129xlpwp36h2czzw1wcl8df2864zg3if2gaad1v18ah1cf68b0f3"; + rev = "57a640621bbbc74244f07e2e068a26411b0d9b24"; + sha256 = "1ha5vfl4jfwcwbipsq07xlknkrvx79z5bwbzndybclyk9pa69dlz"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index dae43aa046243..0f02560c81f8d 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "qiskit"; - version = "0.5.4"; + version = "0.5.7"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "a86014da4ea8fe057ad3b953b44e2342f2bae3e1f9ac0d5f5d51dd659c33accf"; + sha256 = "a5a2c6c074f8479dc83d1d599dfebf2363402a182835b8fa5742804055148b17"; }; buildInputs = [ cmake ] @@ -48,13 +48,9 @@ buildPythonPackage rec { # Pypi's tarball doesn't contain tests doCheck = false; - patches = [ - ./setup.py.patch - ]; - meta = { description = "Quantum Software Development Kit for writing quantum computing experiments, programs, and applications"; - homepage = https://github.com/QISKit/qiskit-sdk-py; + homepage = https://github.com/QISKit/qiskit-terra; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ pandaman diff --git a/pkgs/development/python-modules/qiskit/setup.py.patch b/pkgs/development/python-modules/qiskit/setup.py.patch deleted file mode 100644 index 9c4224ce64c68..0000000000000 --- a/pkgs/development/python-modules/qiskit/setup.py.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -18,13 +18,13 @@ from setuptools.dist import Distribution - - requirements = [ - "IBMQuantumExperience>=1.9.2", -- "matplotlib>=2.1,<2.2", -- "networkx>=2.0,<2.1", -- "numpy>=1.13,<1.15", -- "ply==3.10", -- "scipy>=0.19,<1.2", -- "sympy>=1.0,<1.2", -- "pillow>=4.2.1,<5.2" -+ "matplotlib>=2.1", -+ "networkx>=2.0", -+ "numpy>=1.13", -+ "ply>=3.10", -+ "scipy>=0.19", -+ "sympy>=1.0", -+ "pillow>=4.2.1" - ] diff --git a/pkgs/development/python-modules/xgboost/default.nix b/pkgs/development/python-modules/xgboost/default.nix index 9b53c180397df..d9b8fc892c165 100644 --- a/pkgs/development/python-modules/xgboost/default.nix +++ b/pkgs/development/python-modules/xgboost/default.nix @@ -3,30 +3,28 @@ , nose , scipy , xgboost +, substituteAll }: buildPythonPackage rec { pname = "xgboost"; inherit (xgboost) version src meta; - propagatedBuildInputs = [ scipy ]; - checkInputs = [ nose ]; - - postPatch = let - libname = "libxgboost.${stdenv.hostPlatform.extensions.sharedLibrary}"; + patches = [ + (substituteAll { + src = ./lib-path-for-python.patch; + libpath = "${xgboost}/lib"; + }) + ]; - in '' - cd python-package + postPatch = "cd python-package"; - sed "s/CURRENT_DIR = os.path.dirname(__file__)/CURRENT_DIR = os.path.abspath(os.path.dirname(__file__))/g" -i setup.py - sed "/^LIB_PATH.*/a LIB_PATH = [os.path.relpath(LIB_PATH[0], CURRENT_DIR)]" -i setup.py - cat <<EOF >xgboost/libpath.py - def find_lib_path(): - return ["${xgboost}/lib/${libname}"] - EOF - ''; + propagatedBuildInputs = [ scipy ]; + buildInputs = [ xgboost ]; + checkInputs = [ nose ]; - postInstall = '' - rm -rf $out/xgboost + checkPhase = '' + ln -sf ../demo . + nosetests ../tests/python ''; } diff --git a/pkgs/development/python-modules/xgboost/lib-path-for-python.patch b/pkgs/development/python-modules/xgboost/lib-path-for-python.patch new file mode 100644 index 0000000000000..68b39dee53e98 --- /dev/null +++ b/pkgs/development/python-modules/xgboost/lib-path-for-python.patch @@ -0,0 +1,59 @@ +diff --git a/python-package/setup.py b/python-package/setup.py +index e6c3386f..4ed0a8bd 100644 +--- a/python-package/setup.py ++++ b/python-package/setup.py +@@ -16,8 +16,6 @@ libpath_py = os.path.join(CURRENT_DIR, 'xgboost/libpath.py') + libpath = {'__file__': libpath_py} + exec(compile(open(libpath_py, "rb").read(), libpath_py, 'exec'), libpath, libpath) + +-LIB_PATH = [os.path.relpath(libfile, CURRENT_DIR) for libfile in libpath['find_lib_path']()] +-print("Install libxgboost from: %s" % LIB_PATH) + # Please use setup_pip.py for generating and deploying pip installation + # detailed instruction in setup_pip.py + setup(name='xgboost', +@@ -35,7 +33,6 @@ setup(name='xgboost', + # this will use MANIFEST.in during install where we specify additional files, + # this is the golden line + include_package_data=True, +- data_files=[('xgboost', LIB_PATH)], + license='Apache-2.0', + classifiers=['License :: OSI Approved :: Apache Software License'], + url='https://github.com/dmlc/xgboost') +diff --git a/python-package/xgboost/libpath.py b/python-package/xgboost/libpath.py +index d87922c0..859a30fb 100644 +--- a/python-package/xgboost/libpath.py ++++ b/python-package/xgboost/libpath.py +@@ -19,32 +19,4 @@ def find_lib_path(): + lib_path: list(string) + List of all found library path to xgboost + """ +- curr_path = os.path.dirname(os.path.abspath(os.path.expanduser(__file__))) +- # make pythonpack hack: copy this directory one level upper for setup.py +- dll_path = [curr_path, os.path.join(curr_path, '../../lib/'), +- os.path.join(curr_path, './lib/'), +- os.path.join(sys.prefix, 'xgboost')] +- if sys.platform == 'win32': +- if platform.architecture()[0] == '64bit': +- dll_path.append(os.path.join(curr_path, '../../windows/x64/Release/')) +- # hack for pip installation when copy all parent source directory here +- dll_path.append(os.path.join(curr_path, './windows/x64/Release/')) +- else: +- dll_path.append(os.path.join(curr_path, '../../windows/Release/')) +- # hack for pip installation when copy all parent source directory here +- dll_path.append(os.path.join(curr_path, './windows/Release/')) +- dll_path = [os.path.join(p, 'xgboost.dll') for p in dll_path] +- elif sys.platform.startswith('linux') or sys.platform.startswith('freebsd'): +- dll_path = [os.path.join(p, 'libxgboost.so') for p in dll_path] +- elif sys.platform == 'darwin': +- dll_path = [os.path.join(p, 'libxgboost.dylib') for p in dll_path] +- +- lib_path = [p for p in dll_path if os.path.exists(p) and os.path.isfile(p)] +- +- # From github issues, most of installation errors come from machines w/o compilers +- if not lib_path and not os.environ.get('XGBOOST_BUILD_DOC', False): +- raise XGBoostLibraryNotFound( +- 'Cannot find XGBoost Library in the candidate path, ' + +- 'did you install compilers and run build.sh in root path?\n' +- 'List of candidates:\n' + ('\n'.join(dll_path))) +- return lib_path ++ return ["@libpath@/libxgboost.so"] diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index 16f1abe1a899e..f902ca58c3845 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -61,7 +61,7 @@ let else name; - copyIfBundledByPath = { bundledByPath ? false, ...}@main: + copyIfBundledByPath = { bundledByPath ? false, ...}: (if bundledByPath then assert gemFiles.gemdir != null; "cp -a ${gemFiles.gemdir}/* $out/" #*/ else "" diff --git a/pkgs/development/ruby-modules/bundled-common/functions.nix b/pkgs/development/ruby-modules/bundled-common/functions.nix index 85e93959e4b5f..b8e666a92f9a3 100644 --- a/pkgs/development/ruby-modules/bundled-common/functions.nix +++ b/pkgs/development/ruby-modules/bundled-common/functions.nix @@ -22,9 +22,9 @@ rec { else gemset; }; - filterGemset = {ruby, groups,...}@env: gemset: lib.filterAttrs (name: attrs: platformMatches ruby attrs && groupMatches groups attrs) gemset; + filterGemset = {ruby, groups,...}: gemset: lib.filterAttrs (name: attrs: platformMatches ruby attrs && groupMatches groups attrs) gemset; - platformMatches = {rubyEngine, version, ...}@ruby: attrs: ( + platformMatches = {rubyEngine, version, ...}: attrs: ( !(attrs ? "platforms") || builtins.length attrs.platforms == 0 || builtins.any (platform: diff --git a/pkgs/development/ruby-modules/bundled-common/test.nix b/pkgs/development/ruby-modules/bundled-common/test.nix index ee3754595f394..7c5932c4e761e 100644 --- a/pkgs/development/ruby-modules/bundled-common/test.nix +++ b/pkgs/development/ruby-modules/bundled-common/test.nix @@ -1,4 +1,4 @@ -{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should }@defs: +{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should }: let testConfigs = { inherit lib; diff --git a/pkgs/development/ruby-modules/bundler-env/test.nix b/pkgs/development/ruby-modules/bundler-env/test.nix index 63da7044c0cfb..e42f1bf257114 100644 --- a/pkgs/development/ruby-modules/bundler-env/test.nix +++ b/pkgs/development/ruby-modules/bundler-env/test.nix @@ -1,4 +1,4 @@ -{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should}@defs: +{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should}: let bundlerEnv = callPackage ./default.nix stubs // { basicEnv = callPackage ../bundled-common stubs; diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index a98c2b4e04bde..52fec3f131b9b 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "bazel-buildtools"; + name = "bazel-buildtools-unstable-${version}"; version = "2018-05-24"; goPackagePath = "github.com/bazelbuild/buildtools"; diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index 96e9d0f9a439f..50b1d09ef9333 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -2,7 +2,7 @@ let baseName = "bloop"; - version = "1.0.0-M11"; + version = "1.0.0"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -16,12 +16,12 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "00p9mrwcms3skzicyj8frqs0r0a2rfvk5fbh58rk5yvcvkwl4fy1"; + outputHash = "0dgllwv9rjvpzvlbwwiynmfp15j2x48al7cb5rlmhq0an3q81hbh"; }; in stdenv.mkDerivation rec { name = "${baseName}-${version}"; - nailgunCommit = "60c2d130"; + nailgunCommit = "0c8b937b"; buildInputs = [ jdk makeWrapper deps ]; diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix index e64bf432b38ba..2260f083b71b7 100644 --- a/pkgs/development/tools/build-managers/buck/default.nix +++ b/pkgs/development/tools/build-managers/buck/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, bash, makeWrapper }: stdenv.mkDerivation rec { - name = "buck-${version}"; - version = "v2017.10.01.01"; + name = "buck-unstable-${version}"; + version = "2017-10-01"; src = fetchFromGitHub { owner = "facebook"; diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index e3c8d7ed014de..7e660f3fcd909 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { buildCommand = '' install -Dm555 $src $out/bin/coursier + patchShebangs $out/bin/coursier wrapProgram $out/bin/coursier --prefix PATH ":" ${jre}/bin ''; diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix index 3dc0d3fca88cb..a89861faebbcf 100644 --- a/pkgs/development/tools/erlang/cuter/default.nix +++ b/pkgs/development/tools/erlang/cuter/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = with beamPackages; [ python27.pkgs.setuptools erlang z3 python27 makeWrapper which ]; + buildInputs = with beamPackages; [ python27.pkgs.setuptools erlang z3.python python27 makeWrapper which ]; buildFlags = "PWD=$(out)/lib/erlang/lib/cuter-${version} cuter_target"; configurePhase = '' diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index 4bbb6b0bd4ff3..05e87d0846066 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -1,9 +1,9 @@ { stdenv, go, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "gotools-${version}"; - version = "20170807-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "5d2fd3ccab986d52112bf301d47a819783339d0e"; + name = "gotools-unstable-${version}"; + version = "2018-07-20"; + rev = "be728107ea8275e6f58ba07e246b94181acaab24"; goPackagePath = "golang.org/x/tools"; goPackageAliases = [ "code.google.com/p/go.tools" ]; @@ -11,7 +11,7 @@ buildGoPackage rec { src = fetchgit { inherit rev; url = "https://go.googlesource.com/tools"; - sha256 = "0r3fp7na6pg0bc5xfycjvv951f0vma1qfnpw5zy6l75yxm5r47kn"; + sha256 = "1vkc87qcnfybfcgq9kbwbwzvvzrwm6ar25q5i8z3q26b8dpaxmlw"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/gotools/deps.nix b/pkgs/development/tools/gotools/deps.nix index d4be771e8d6b9..e85fb1201012c 100644 --- a/pkgs/development/tools/gotools/deps.nix +++ b/pkgs/development/tools/gotools/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; - sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + rev = "0ed95abb35c445290478a5348a7b38bb154135fd"; + sha256 = "1v7yhcgqj0fy7rsliijw2iwmvyd85hqshrhh2n083x62kw9n9nsl"; }; } ] diff --git a/pkgs/development/tools/haskell/hyper-haskell/server.nix b/pkgs/development/tools/haskell/hyper-haskell/server.nix index ff82127f0c4b8..47a9c550fa8bc 100644 --- a/pkgs/development/tools/haskell/hyper-haskell/server.nix +++ b/pkgs/development/tools/haskell/hyper-haskell/server.nix @@ -3,7 +3,7 @@ let hyperHaskellEnv = ghcWithPackages (self: [ self.hyper-haskell-server ] ++ packages self); in stdenv.mkDerivation { - name = "hyper-haskell-server-with-packages"; + name = "hyper-haskell-server-with-packages-${hyperHaskellEnv.version}"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index df4d0e3f47db8..2badd0ed26a9a 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -10,7 +10,7 @@ let # https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=330b90b5ffbbc20c5de6ae6c7f60c40fab2e7a4f;hp=99181ccac0fc7d82e7dabb05dc7466e91f1645d3 version = "2.30"; basename = "binutils-${version}"; - inherit (stdenv.lib) optional optionals optionalString; + inherit (stdenv.lib) optionals optionalString; # The targetPrefix prepended to binary names to allow multiple binuntils on the # PATH to both be usable. targetPrefix = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index b734eadae902b..d9fab774b76ac 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -1,15 +1,13 @@ { fetchurl, stdenv, expect, makeWrapper }: stdenv.mkDerivation rec { - name = "dejagnu-1.6"; + name = "dejagnu-1.6.1"; src = fetchurl { url = "mirror://gnu/dejagnu/${name}.tar.gz"; - sha256 = "0qypaakd2065jgpcv84zcsibl8gph3p334gb2qdmhsrbirhlmdh0"; + sha256 = "14hnq1mh91vqprc43xdy4f15sycw6fbajrh7zi6cw2kyg6xjhnxz"; }; - patches = [ ./wrapped-runtest-program-name.patch ]; - buildInputs = [ expect makeWrapper ]; doCheck = true; diff --git a/pkgs/development/tools/misc/dejagnu/wrapped-runtest-program-name.patch b/pkgs/development/tools/misc/dejagnu/wrapped-runtest-program-name.patch deleted file mode 100644 index d745bc65cbb27..0000000000000 --- a/pkgs/development/tools/misc/dejagnu/wrapped-runtest-program-name.patch +++ /dev/null @@ -1,15 +0,0 @@ -This patch gives `runtest' a `$0' that contains `runtest' instead -of `.runtest-wrapped'. This is required because `runtest' checks -what `$0' looks like to determine the target. - ---- dejagnu-1.4.4/runtest 2003-08-17 03:27:59.000000000 +0200 -+++ dejagnu-1.4.4/runtest 2010-03-18 15:57:58.000000000 +0100 -@@ -10,6 +10,7 @@ - # Get the execution path to this script and the current directory. - # - mypath=${0-.} -+mypath="`echo $mypath | sed -'es|\.runtest-wrapped|runtest|g'`" - if expr ${mypath} : '.*/.*' > /dev/null - then - : - diff --git a/pkgs/development/tools/misc/gdbgui/requirements.nix b/pkgs/development/tools/misc/gdbgui/requirements.nix index 13978645c2998..273f9db0c399a 100644 --- a/pkgs/development/tools/misc/gdbgui/requirements.nix +++ b/pkgs/development/tools/misc/gdbgui/requirements.nix @@ -11,7 +11,7 @@ let inherit (pkgs) makeWrapper; - inherit (pkgs.stdenv.lib) fix' extends inNixShell; + inherit (pkgs.stdenv.lib) fix' extends; pythonPackages = import "${toString pkgs.path}/pkgs/top-level/python-packages.nix" { diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index 6d269552f6289..7980130459559 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -8,13 +8,13 @@ else stdenv.mkDerivation rec { name = "js_of_ocaml-compiler-${version}"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "ocsigen"; repo = "js_of_ocaml"; rev = version; - sha256 = "17a0kb39bcx2qq41cq7kjrxghm67l1yahrs47yakgb1avna0pqd9"; + sha256 = "0dxxdxgrbg9xvvi3i627krnk6rb1ja0ypp2diwdkpnmy45wak9lv"; }; buildInputs = [ ocaml findlib jbuilder cmdliner cppo ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix index 31a5c3ea17bb4..5ec8cca344d4f 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix @@ -1,6 +1,6 @@ { stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler, js_of_ocaml-ppx , ocaml-migrate-parsetree, ppx_tools_versioned -, js_of_ocaml, ocaml_lwt +, js_of_ocaml, ocaml_lwt, lwt_log }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib jbuilder js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ]; - propagatedBuildInputs = [ js_of_ocaml ocaml_lwt ]; + propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ]; buildPhase = "jbuilder build -p js_of_ocaml-lwt"; } diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index 6a3267b7c3418..77ef8565a34ed 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -7,8 +7,6 @@ let - inherit (lib) toLower; - toolchainName = "com.apple.dt.toolchain.XcodeDefault"; sdkName = "${xcodePlatform}${sdkVer}"; diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix index 2abc46690e944..45be0a3085e46 100644 --- a/pkgs/games/commandergenius/default.nix +++ b/pkgs/games/commandergenius/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "commandergenius-${version}"; - version = "2.2.0"; + version = "2.2.2"; src = fetchFromGitHub { owner = "gerstrong"; repo = "Commander-Genius"; rev = "v${version}"; - sha256 = "1hjx4j325vj1ayxi3j2dpplpd3x0iqx98gyb093ld7dfnsyilbph"; + sha256 = "1mfw25pgr492ayqw3b85mwp20wh6anrr90gdy605nv1yjma62pmj"; }; buildInputs = [ SDL2 SDL2_image SDL2_mixer libGL boost libvorbis zlib curl python3 ]; diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix index 9dde1da868dd7..e48ac612b32d5 100644 --- a/pkgs/games/dxx-rebirth/default.nix +++ b/pkgs/games/dxx-rebirth/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - hardeningDisable = [ "format" ]; + NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; buildPhase = '' runHook preBuild diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index d85331e788252..870d9f5c1607c 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "cups-filters-${version}"; - version = "1.20.3"; + version = "1.20.4"; src = fetchurl { url = "https://openprinting.org/download/cups-filters/${name}.tar.xz"; - sha256 = "1g18qkvl9zdxickiblgs2vvkip4b6p2jalw4d30zzz3hh8f1g6iv"; + sha256 = "0sjkmclcb1r77015wllsyz26272br3s17v6b1q2xwb2nm2gnwx9k"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 672e46409461b..b52e632419903 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -14,8 +14,7 @@ let _skim = skim; - inherit (vimUtils.override {inherit vim;}) rtpPath addRtp buildVimPlugin - buildVimPluginFrom2Nix vimHelpTags; + inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix; # TL;DR @@ -1657,6 +1656,17 @@ let }; + vim-ledger = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-ledger-2017-12-12"; + src = fetchgit { + url = "https://github.com/ledger/vim-ledger"; + rev = "6eb3bb21aa979cc295d0480b2179938c12b33d0d"; + sha256 = "0rbwyaanvl2bqk8xm4kq8fkv8y92lpf9xx5n8gw54iij7xxhnj01"; + }; + dependencies = []; + + }; + vim-jinja = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-jinja-2016-11-16"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 188d87f94849a..9e7f70925a20a 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -110,6 +110,7 @@ "github:lambdalisue/vim-gista" "github:latex-box-team/latex-box" "github:leafgarland/typescript-vim" +"github:ledger/vim-ledger" "github:lepture/vim-jinja" "github:lervag/vimtex" "github:lfilho/cosco.vim" diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 68304d6622439..219fe341d0b66 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1,8 +1,7 @@ { stdenv, callPackage, vscode-utils }: let - inherit (vscode-utils) buildVscodeExtension buildVscodeMarketplaceExtension - extensionFromVscodeMarketplace; + inherit (vscode-utils) buildVscodeMarketplaceExtension; in # # Unless there is a good reason not to, we attemp to use the same name as the diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 684955b9067de..25078b7d753cf 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -47,7 +47,7 @@ , mkValueOverride ? null , ... -} @ args: +}: assert stdenv.isLinux; diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index af3df245fe67c..880da81c42e0c 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -12,7 +12,7 @@ let , rev ? "spl-${version}" , broken ? false , patches ? [] - } @ args : stdenv.mkDerivation rec { + }: stdenv.mkDerivation rec { name = "spl-${version}-${kernel.version}"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 6eac54ddf6510..45edf8945c0e5 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -24,7 +24,7 @@ let , rev ? "zfs-${version}" , isUnstable ? false , isLegacyCrypto ? false - , incompatibleKernelVersion ? null } @ args: + , incompatibleKernelVersion ? null }: if buildKernel && (incompatibleKernelVersion != null) && versionAtLeast kernel.version incompatibleKernelVersion then diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index f83ef4cef3881..0891b72cd1e9a 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchFromGitHub, openssl, libevent }: -let inherit (stdenv.lib) optional; in - stdenv.mkDerivation rec { name = "coturn-${version}"; version = "4.5.0.7"; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 90cbc6cec55db..1d7e5722ea786 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -8,7 +8,7 @@ let # un-indented, over the whole file result = if extraFeatures then wrapped-full else unwrapped; -inherit (stdenv.lib) optional optionals optionalString concatStringsSep; +inherit (stdenv.lib) optional concatStringsSep; unwrapped = stdenv.mkDerivation rec { name = "knot-resolver-${version}"; diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index ecefc1d8fabdc..461b90bc978c8 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -53,7 +53,9 @@ let patches = [ # For 5.2+, we need a slightly adjusted patch to fix all the ldflags (if lib.versionAtLeast version "5.2" - then ./ldflags.patch + then (if lib.versionAtLeast version "6.0" + then ./ldflags-6.0.patch + else ./ldflags-5.2.patch) else ./ldflags-5.1.patch) ] ++ # for 6.0+, we do NOT need to apply this version fix, since we can specify @@ -77,10 +79,20 @@ let --replace 'exit 1' '#exit 1' patchShebangs . + '' + lib.optionalString (lib.versionAtLeast version "6.0") '' + substituteInPlace ./Makefile \ + --replace 'TLS_LIBS +=' '#TLS_LIBS +=' \ + --replace 'LDFLAGS :=' 'LDFLAGS := -ltls -lssl -lcrypto' ''; enableParallelBuilding = true; - makeFlags = [ "all" "fdb_c" "fdb_java" "KVRELEASE=1" ]; + + makeFlags = [ "all" "fdb_java" ] + # Don't compile FDBLibTLS if we don't need it in 6.0 or later; + # it gets statically linked in + ++ lib.optional (!lib.versionAtLeast version "6.0") [ "fdb_c" ] + # Needed environment overrides + ++ [ "KVRELEASE=1" ]; # on 6.0 and later, we can specify all this information manually configurePhase = lib.optionalString (lib.versionAtLeast version "6.0") '' @@ -93,7 +105,9 @@ let mkdir -vp $out/{bin,libexec/plugins} $lib/{lib,share/java} $dev/include/foundationdb cp -v ./lib/libfdb_c.so $lib/lib + '' + lib.optionalString (!lib.versionAtLeast version "6.0") '' cp -v ./lib/libFDBLibTLS.so $out/libexec/plugins/FDBLibTLS.so + '' + '' cp -v ./bindings/c/foundationdb/fdb_c.h $dev/include/foundationdb cp -v ./bindings/c/foundationdb/fdb_c_options.g.h $dev/include/foundationdb @@ -131,15 +145,16 @@ in with builtins; { }; foundationdb52 = makeFdb rec { - version = "5.2.5"; + version = "5.2.6"; branch = "release-5.2"; - sha256 = "00csr4v9cwl9y8r63p73grc6cvhlqmzcniwrf80i0klxv5asg7q7"; + rev = "refs/tags/v5.2.6"; # seemed to be tagged incorrectly + sha256 = "1q3lq1hqq0f53n51gd4cw5cpayyw65dmkfplhsw1m5mghymzmskk"; }; foundationdb60 = makeFdb rec { - version = "6.0.0pre2227_${substring 0 8 rev}"; - branch = "master"; - rev = "8caa6eaecf1eeec0298fc77db334761b0c1d1523"; - sha256 = "1q200rpsphl5fzwzp2vk7ifgsnqh95k0xfiicfi1c8253ylnsgll"; + version = "6.0.2pre2430_${substring 0 8 rev}"; + branch = "release-6.0"; + rev = "7938d247a5eaf886a176575de6592b76374df58c"; + sha256 = "0g8h2zs0f3aacs7x4hyjh0scybv33gjj6dqfb789h4n6r4gd7d9h"; }; } diff --git a/pkgs/servers/foundationdb/ldflags.patch b/pkgs/servers/foundationdb/ldflags-5.2.patch index ee5911e495f8b..ee5911e495f8b 100644 --- a/pkgs/servers/foundationdb/ldflags.patch +++ b/pkgs/servers/foundationdb/ldflags-5.2.patch diff --git a/pkgs/servers/foundationdb/ldflags-6.0.patch b/pkgs/servers/foundationdb/ldflags-6.0.patch new file mode 100644 index 0000000000000..1fa17a9615aa9 --- /dev/null +++ b/pkgs/servers/foundationdb/ldflags-6.0.patch @@ -0,0 +1,78 @@ +diff --git a/bindings/c/local.mk b/bindings/c/local.mk +index c861a29c..ff886e93 100644 +--- a/bindings/c/local.mk ++++ b/bindings/c/local.mk +@@ -30,8 +30,8 @@ fdb_c_tests_HEADERS := -Ibindings/c + CLEAN_TARGETS += fdb_c_tests_clean + + ifeq ($(PLATFORM),linux) +- fdb_c_LIBS += lib/libstdc++.a -lm -lpthread -lrt -ldl +- fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete ++ fdb_c_LIBS += lib/libstdc++.a ++ fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete -lm -lpthread -lrt -ldl + fdb_c_tests_LIBS += -lpthread + endif + +diff --git a/bindings/flow/tester/local.mk b/bindings/flow/tester/local.mk +index 2ef4fcb7..6e59625c 100644 +--- a/bindings/flow/tester/local.mk ++++ b/bindings/flow/tester/local.mk +@@ -35,8 +35,7 @@ _fdb_flow_tester_clean: + @rm -rf bindings/flow/bin + + ifeq ($(PLATFORM),linux) +- fdb_flow_tester_LIBS += -ldl -lpthread -lrt +- fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc ++ fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt + else ifeq ($(PLATFORM),osx) + fdb_flow_tester_LDFLAGS += -lc++ + endif +diff --git a/fdbbackup/local.mk b/fdbbackup/local.mk +index ca5dbab6..012f0130 100644 +--- a/fdbbackup/local.mk ++++ b/fdbbackup/local.mk +@@ -26,8 +26,7 @@ fdbbackup_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a $(FDB_TLS_LIB + fdbbackup_STATIC_LIBS := $(TLS_LIBS) + + ifeq ($(PLATFORM),linux) +- fdbbackup_LIBS += -ldl -lpthread -lrt +- fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc ++ fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt + + # GPerfTools profiler (uncomment to use) + # fdbbackup_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1 +diff --git a/fdbcli/local.mk b/fdbcli/local.mk +index fd738876..3af026b9 100644 +--- a/fdbcli/local.mk ++++ b/fdbcli/local.mk +@@ -22,14 +22,13 @@ + + fdbcli_CFLAGS := $(fdbclient_CFLAGS) + fdbcli_LDFLAGS := $(fdbrpc_LDFLAGS) +-fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a -ldl $(FDB_TLS_LIB) ++fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a $(FDB_TLS_LIB) + fdbcli_STATIC_LIBS := $(TLS_LIBS) + + fdbcli_GENERATED_SOURCES += versions.h + + ifeq ($(PLATFORM),linux) +- fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc +- fdbcli_LIBS += -lpthread -lrt ++ fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc -lpthread -lrt -ldl + else ifeq ($(PLATFORM),osx) + fdbcli_LDFLAGS += -lc++ + endif +diff --git a/fdbserver/local.mk b/fdbserver/local.mk +index 690916d0..475abbaf 100644 +--- a/fdbserver/local.mk ++++ b/fdbserver/local.mk +@@ -26,8 +26,7 @@ fdbserver_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a $(FDB_TLS_LIB + fdbserver_STATIC_LIBS := $(TLS_LIBS) + + ifeq ($(PLATFORM),linux) +- fdbserver_LIBS += -ldl -lpthread -lrt +- fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc ++ fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt + + # GPerfTools profiler (uncomment to use) + # fdbserver_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1 diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 098825d59ce83..8fe34cd6183d8 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -2,7 +2,7 @@ let - common = { versionMajor, versionMinor, sha256 } @ args: stdenv.mkDerivation (rec { + common = { versionMajor, versionMinor, sha256 }: stdenv.mkDerivation (rec { name = "apache-tomcat-${version}"; version = "${versionMajor}.${versionMinor}"; diff --git a/pkgs/servers/owncloud/default.nix b/pkgs/servers/owncloud/default.nix index f02e67740b62f..14a4a2868f0e6 100644 --- a/pkgs/servers/owncloud/default.nix +++ b/pkgs/servers/owncloud/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: let - common = { versiona, sha256 } @ args: stdenv.mkDerivation (rec { + common = { versiona, sha256 }: stdenv.mkDerivation (rec { name= "owncloud-${version}"; version= versiona; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index c8b007b36ac83..a727b60dd9d4e 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -2,7 +2,7 @@ let - common = { version, sha256, psqlSchema } @ args: + common = { version, sha256, psqlSchema }: let atLeast = lib.versionAtLeast version; in stdenv.mkDerivation (rec { name = "postgresql-${version}"; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 78f7a82d2952e..37795b11f6ddd 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -5,7 +5,7 @@ assert crossSystem == null; let - inherit (localSystem) system platform; + inherit (localSystem) system; shell = if system == "i686-freebsd" || system == "x86_64-freebsd" then "/usr/local/bin/bash" diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index e3f815621e7b7..55ab34228261b 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -9,7 +9,7 @@ with lib; let - inherit (python2Packages) python cython buildPythonApplication; + inherit (python2Packages) cython buildPythonApplication; in buildPythonApplication rec { name = "xpra-${version}"; version = "2.3.2"; diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix index b8f39a03083ca..d2a7358ff8fd6 100644 --- a/pkgs/tools/audio/playerctl/default.nix +++ b/pkgs/tools/audio/playerctl/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "playerctl-${version}"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "acrisci"; repo = "playerctl"; rev = "v${version}"; - sha256 = "1sxy87syrfk485f2x556rl567j6rph4ss0xahf04bv26bzj3mqrp"; + sha256 = "0jnylj5d6i29c5y6yjxg1a88r2qfbac5pj95f2aljjkfh9428jbb"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index e9325e9b18d58..6d95d5ee12b52 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -2,9 +2,7 @@ , docutils }: -let - inherit (stdenv.lib) optional; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { version = "3.4.0"; name = "sshfs-fuse-${version}"; diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix index 2fa4bb90a8ea7..68ff84c7495ae 100644 --- a/pkgs/tools/graphics/graphviz/base.nix +++ b/pkgs/tools/graphics/graphviz/base.nix @@ -7,7 +7,7 @@ assert stdenv.isDarwin -> ApplicationServices != null; let - inherit (stdenv.lib) optional optionals optionalString; + inherit (stdenv.lib) optionals optionalString; in stdenv.mkDerivation rec { diff --git a/pkgs/tools/misc/esptool-ck/default.nix b/pkgs/tools/misc/esptool-ck/default.nix index c1678f3907fbd..9d3b796c87969 100644 --- a/pkgs/tools/misc/esptool-ck/default.nix +++ b/pkgs/tools/misc/esptool-ck/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "esptool-ck-${version}"; - version = "0.4.11"; + version = "0.4.13"; src = fetchFromGitHub { owner = "igrr"; repo = "esptool-ck"; - rev = "0.4.11"; - sha256 = "086x68jza24xkaap8nici18kj78id2p2lzbasin98wilvpjc8d7f"; + rev = "0.4.13"; + sha256 = "1cb81b30a71r7i0gmkh2qagfx9lhq0myq5i37fk881bq6g7i5n2k"; }; makeFlags = [ "VERSION=${version}" ]; diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index f79720289bf5d..66b7ef4c29195 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -3,8 +3,6 @@ , buildPlatform, hostPlatform }: -let inherit (stdenv.lib) optionals; in - stdenv.mkDerivation rec { name = "findutils-4.6.0"; diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index 77ec5bcb86bbf..be86f6496f00d 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "fwup-${version}"; - version = "1.2.1"; + version = "1.2.3"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "14a3bd84bnnxdrf1x80w860mhm3x4cy9jp9sf9643svq4bky4i41"; + sha256 = "16v5s9xwdsii7pcphrb0a7aib2zprrw6n4fyc8w8c11gbkg27r4d"; }; doCheck = true; diff --git a/pkgs/tools/misc/mrtg/default.nix b/pkgs/tools/misc/mrtg/default.nix index 7657b072aa89c..26fcea669c223 100644 --- a/pkgs/tools/misc/mrtg/default.nix +++ b/pkgs/tools/misc/mrtg/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { - version = "2.17.4"; + version = "2.17.7"; name = "mrtg-${version}"; src = fetchurl { url = "https://oss.oetiker.ch/mrtg/pub/${name}.tar.gz"; - sha256 = "0r93ipscfp7py0b1dcx65s58q7dlwndqhprf8w4945a0h2p7zyjy"; + sha256 = "1hrjqfi290i936nblwpfzjn6v8d8p69frcrvml206nxiiwkcp54v"; }; buildInputs = [ diff --git a/pkgs/tools/misc/rcm/default.nix b/pkgs/tools/misc/rcm/default.nix index db68fab75ab1c..11ac0fc14199d 100644 --- a/pkgs/tools/misc/rcm/default.nix +++ b/pkgs/tools/misc/rcm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "rcm-${version}"; - version = "1.3.1"; + version = "1.3.3"; src = fetchurl { url = "https://thoughtbot.github.io/rcm/dist/rcm-${version}.tar.gz"; - sha256 = "9c8f92dba63ab9cb8a6b3d0ccf7ed8edf3f0fb388b044584d74778145fae7f8f"; + sha256 = "1bqk7rrp1ckzvsvl9wghsr77m8xl3a7yc5gqdsisz492dx2j8mck"; }; patches = [ ./fix-rcmlib-path.patch ]; diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index c3d60d8e87b9c..e74a3554dc293 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -2,13 +2,13 @@ python2Packages.buildPythonApplication rec { name = "s3cmd-${version}"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "s3tools"; repo = "s3cmd"; rev = "v${version}"; - sha256 = "198hzzplci57sb8hdan30nbakslawmijfw0j71wjvq85n3xn6qsl"; + sha256 = "0ninw830309cxga99gjnfghpkywf9kd6yz4wqsq85zni1dv39cdk"; }; propagatedBuildInputs = with python2Packages; [ python_magic dateutil ]; diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/tools/networking/spoofer/default.nix index 675777e4faa67..acda30dbfef82 100644 --- a/pkgs/tools/networking/spoofer/default.nix +++ b/pkgs/tools/networking/spoofer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, protobuf, openssl, libpcap, traceroute , withGUI ? false, qt5 }: -let inherit (stdenv.lib) optional optionalString; +let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix index 3f618301a864b..fd7f93d1546ca 100644 --- a/pkgs/tools/system/bfs/default.nix +++ b/pkgs/tools/system/bfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "bfs-${version}"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { repo = "bfs"; owner = "tavianator"; rev = version; - sha256 = "0a7zsipvndvg1kp2i35jrg9y9kncj7i6mp36dhpj8zjmkm5d5b8g"; + sha256 = "01vcqanj2sifa5i51wvrkxh55d6hrq6iq7zmnhv4ls221dqmbyyn"; }; # Disable fstype test, tries to read /etc/mtab diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index 2f507de9c22f4..6c852efe96e54 100644 --- a/pkgs/tools/system/ddrescue/default.nix +++ b/pkgs/tools/system/ddrescue/default.nix @@ -2,8 +2,6 @@ , fetchurl, lzip }: -let inherit (stdenv.lib) optionals; in - stdenv.mkDerivation rec { name = "ddrescue-1.23"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 598f3c009efe4..c3ef7da594c6c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -858,6 +858,8 @@ with pkgs; tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { }; + libtensorflow = callPackage ../development/libraries/libtensorflow { }; + blink1-tool = callPackage ../tools/misc/blink1-tool { }; bliss = callPackage ../applications/science/math/bliss { }; @@ -18434,8 +18436,9 @@ with pkgs; syncthing-tray = callPackage ../applications/misc/syncthing-tray { }; - # linux only by now - synergy = callPackage ../applications/misc/synergy { }; + synergy = callPackage ../applications/misc/synergy { + inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa CoreServices ScreenSaver; + }; tabbed = callPackage ../applications/window-managers/tabbed { # if you prefer a custom config, write the config.h in tabbed.config.h diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index f1b0aa997ece8..5d042c3385e14 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -39,7 +39,7 @@ , melpaBuild , external -}@args: +}: with lib.licenses; |