diff options
Diffstat (limited to 'pkgs')
25 files changed, 732 insertions, 667 deletions
diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index 84ec955de3f..fe1f4c85c30 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -1,11 +1,11 @@ -# FIXME: upgrading qt5Full (Qt 5.3) to qt5.{base,multimedia} (Qt 5.4) breaks -# the default Qt audio capture source! -{ stdenv, fetchFromGitHub, fftw, freeglut, qt5Full -, alsaSupport ? false, alsaLib ? null -, jackSupport ? false, libjack2 ? null }: +{ stdenv, fetchFromGitHub, fftw, freeglut, qt5 +, alsaSupport ? true, alsaLib ? null +, jackSupport ? false, libjack2 ? null +, portaudioSupport ? false, portaudio ? null }: assert alsaSupport -> alsaLib != null; assert jackSupport -> libjack2 != null; +assert portaudioSupport -> portaudio != null; let version = "1.0.8"; in stdenv.mkDerivation { @@ -18,9 +18,10 @@ stdenv.mkDerivation { owner = "gillesdegottex"; }; - buildInputs = [ fftw freeglut qt5Full ] + buildInputs = [ fftw freeglut qt5.base qt5.multimedia ] ++ stdenv.lib.optional alsaSupport [ alsaLib ] - ++ stdenv.lib.optional jackSupport [ libjack2 ]; + ++ stdenv.lib.optional jackSupport [ libjack2 ] + ++ stdenv.lib.optional portaudioSupport [ portaudio ]; configurePhase = '' mkdir build @@ -28,6 +29,7 @@ stdenv.mkDerivation { qmake \ CONFIG+=${stdenv.lib.optionalString alsaSupport "acs_alsa"} \ CONFIG+=${stdenv.lib.optionalString jackSupport "acs_jack"} \ + CONFIG+=${stdenv.lib.optionalString portaudioSupport "acs_portaudio"} \ PREFIX="$out" PREFIXSHORTCUT="$out" \ ../fmit.pro ''; diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index a57647e18e7..a5b90890df2 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -5,17 +5,18 @@ let if stdenv.system == "i686-linux" then fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb"; - sha256 = "1np8fkmgcwfjv82v4y1lkqcgfki368w6317gac3i0vlqi4qbfjiq"; + sha256 = "15x3nvhxk4f0rga0i99c6lhaa1rwdi446kxnx1l4jprhbl788sx6"; } else fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb"; - sha256 = "0bb0kzayj0wwvyh1b8g0l3aw2xqlrkhn85j3aw90xmchnsx42xh5"; + sha256 = "0ibdlx8fdlmh81908d1syb7c5lf88pqp49fl7r43cj6bybpdx411"; }; in stdenv.mkDerivation { - name = "rescuetime-2.8.8.1040"; + # https://www.rescuetime.com/updates/linux_release_notes.html + name = "rescuetime-2.8.9.1170"; inherit src; buildInputs = [ dpkg makeWrapper ]; unpackPhase = '' diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index fdd136cc838..76de3627630 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "xca-${version}"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "mirror://sourceforge/xca/${name}.tar.gz"; - sha256 = "0k21d4lfkn0nlj8az6067dmc5dgy5cidspljagmh5frsv576wnzg"; + sha256 = "10rxma0zm7vryzv69m0aqlvmbf82d261wa77kxni4h3lndwqvpf2"; }; postInstall = '' diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index d603bf86537..21551beb9dc 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -19,6 +19,7 @@ , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" ] +, withHelp ? true }: let @@ -137,6 +138,8 @@ stdenv.mkDerivation rec { configureFlagsArray=( "--with-parallelism=$NIX_BUILD_CORES" "--with-lang=${langsSpaces}" + "${if withHelp then "" else "--without-help"}" + ); chmod a+x ./bin/unpack-sources @@ -182,13 +185,13 @@ stdenv.mkDerivation rec { ln -s $out/lib/libreoffice/share/xdg $out/share/applications for f in $out/share/applications/*.desktop; do - substituteInPlace "$f" --replace "Exec=libreofficedev${major}.${minor}" "Exec=$out/bin/soffice" - substituteInPlace "$f" --replace "Exec=libreoffice${major}.${minor}" "Exec=$out/bin/soffice" - substituteInPlace "$f" --replace "Exec=libreoffice" "Exec=$out/bin/soffice" + substituteInPlace "$f" --replace "Exec=libreofficedev${major}.${minor}" "Exec=libreoffice" + substituteInPlace "$f" --replace "Exec=libreoffice${major}.${minor}" "Exec=libreoffice" + substituteInPlace "$f" --replace "Exec=libreoffice" "Exec=libreoffice" done mkdir -p "$out/share/desktop" - cp -r sysui/desktop/icons "$out/share/desktop" + cp -r sysui/desktop/icons "$out/share" sed -re 's@Icon=libreofficedev[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop ''; diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix new file mode 100644 index 00000000000..6bc5d874bc0 --- /dev/null +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, intltool, pkgconfig, libqalculate, gtk, gnome2 }: +stdenv.mkDerivation rec { + name = "qalculate-gtk-${version}"; + version = "0.9.7"; + + src = fetchurl { + url = "mirror://sourceforge/qalculate/${name}.tar.gz"; + sha256 = "0b986x5yny9vrzgxlbyg80b23mxylxv2zz8ppd9svhva6vi8xsm4"; + }; + + nativeBuildInputs = [ intltool pkgconfig ]; + buildInputs = [ libqalculate gtk gnome2.libglade gnome2.libgnome gnome2.scrollkeeper ]; + + meta = with stdenv.lib; { + description = "The ultimate desktop calculator"; + homepage = http://qalculate.sourceforge.net; + maintainers = with maintainers; [ gebner ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index dde5b7cc603..fce2d07c9ee 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -9,7 +9,7 @@ }: let - version = "2.5.0"; + version = "2.5.1"; svn = subversionClient.override { perlBindings = true; }; in @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0p747j94kynrx71qaamc9i0dkq5vqpv66a47b68pmin1qsxb2nfc"; + sha256 = "03r2shbya0g3adya336jpc6kcn2s0fmn5p5bs1s8q6r232qvgkmk"; }; patches = [ diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index 795299892ed..eeefc4744a2 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -8,7 +8,7 @@ let # Annoyingly, these files are updated without a change in URL. This means that # builds will start failing every month or so, until the hashes are updated. - version = "2015-08-24"; + version = "2015-08-31"; in stdenv.mkDerivation { name = "geolite-legacy-${version}"; @@ -27,10 +27,10 @@ stdenv.mkDerivation { "1fhi5vm4drfzyl29b491pr1xr2kbsr3izp9a7k5zm3zkqags2187"; srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz" - "10jdh5dknk5y1kawgp5ijg6c74a7nrmmhhw75q9x82l151irdfky"; + "0pg3715cjmajrfr5xad3g9z386gyk35zq3zkk7ah6sfidavik6vc"; srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz" - "10yrkilf0mx6i61zg2r2sd0dn2lwvq8k97jfwv8ysvq98lxb51a1"; + "1ajk18ydzhwflki25cp7fhzfphysgndig3h0f9p655qhsm0c3gzj"; meta = with stdenv.lib; { inherit version; diff --git a/pkgs/development/compilers/ghc/7.10.1.nix b/pkgs/development/compilers/ghc/7.10.1.nix deleted file mode 100644 index 34c2e3b36b0..00000000000 --- a/pkgs/development/compilers/ghc/7.10.1.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv }: - -let - - buildMK = '' - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" - libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses}/include" - libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses}/lib" - ${stdenv.lib.optionalString stdenv.isDarwin '' - libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include" - libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib" - ''} - ''; - - # We patch Cabal for GHCJS. See: https://github.com/haskell/cabal/issues/2454 - # This should be removed when GHC includes Cabal > 1.22.2.0 - cabalPatch = fetchpatch { - url = https://github.com/haskell/cabal/commit/f11b7c858bb25be78b81413c69648c87c446859e.patch; - sha256 = "1z56yyc7lgc78g847qf19f5n1yk054pzlnc2i178dpsj0mgjppyb"; - }; - -in - -stdenv.mkDerivation rec { - version = "7.10.1"; - name = "ghc-${version}"; - - src = fetchurl { - url = "https://downloads.haskell.org/~ghc/7.10.1/${name}-src.tar.xz"; - sha256 = "181srnj3s5dcqb096yminjg50lq9cx57075n95y5hz33gbbf7wwj"; - }; - - buildInputs = [ ghc perl ]; - - enableParallelBuilding = true; - - patches = [ - # Fix user pkg db location for GHCJS: - # https://ghc.haskell.org/trac/ghc/ticket/10232 - (fetchpatch { - url = "https://git.haskell.org/ghc.git/patch/c46e4b184e0abc158ad8f1eff6b3f0421acaf984"; - sha256 = "0fkdyqd4bqp742rydwmqq8d2n7gf61bgdhaiw8xf7jy0ix7lr60w"; - }) - # Fix TH + indirect symbol resolution on OSX (or any system using gold linker) - # https://phabricator.haskell.org/D852 - ./osx-dylib-resolver.patch - ]; - - postPatch = '' - pushd libraries/Cabal - patch -p1 < ${cabalPatch} - popd - ''; - - preConfigure = '' - echo >mk/build.mk "${buildMK}" - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - ''; - - configureFlags = [ - "--with-gcc=${stdenv.cc}/bin/cc" - "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp}/lib" - ]; - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; - - meta = { - homepage = "http://haskell.org/ghc"; - description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ]; - inherit (ghc.meta) license platforms; - }; - -} diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix index 064610c3557..73fcd788c74 100644 --- a/pkgs/development/compilers/ghc/7.10.2.nix +++ b/pkgs/development/compilers/ghc/7.10.2.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv, binutils, coreutils }: +{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv, binutils, coreutils +, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour +}: let @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { sha256 = "1x8m4rp2v7ydnrz6z9g8x7z3x3d3pxhv2pixy7i7hkbqbdsp7kal"; }; - buildInputs = [ ghc perl ]; + buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ]; enableParallelBuilding = true; @@ -47,6 +49,9 @@ stdenv.mkDerivation rec { stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; postInstall = '' + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc + # Patch scripts to include "readelf" and "cat" in $PATH. for i in "$out/bin/"*; do test ! -h $i || continue diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8104dceafa9..3cef7eeebff 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1013,10 +1013,7 @@ self: super: { # https://github.com/basvandijk/concurrent-extra/issues/12 concurrent-extra = dontCheck super.concurrent-extra; - # https://github.com/brendanhay/amazonka/issues/203 - amazonka-core = dontCheck super.amazonka-core; - - # https://github.com/agocorona/MFlow/issues/63 - MFlow = addBuildTool super.MFlow self.cpphs; + # https://github.com/GaloisInc/DSA/issues/1 + DSA = dontCheck super.DSA; } diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index f76719a3117..c04d8fdb409 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -130,7 +130,7 @@ in assert allPkgconfigDepends != [] -> pkgconfig != null; stdenv.mkDerivation ({ - name = "${optionalString (hasActiveLibrary && pname != "ghcjs") "haskell-"}${pname}-${version}"; + name = "${pname}-${version}"; pos = builtins.unsafeGetAttrPos "pname" args; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 33b0bf30d00..831556432b9 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -5018,11 +5018,11 @@ self: { ({ mkDerivation, base, containers, HUnit, parsec }: mkDerivation { pname = "Folly"; - version = "0.1.3.0"; - sha256 = "f155359eff68c5873057836478883804335275aa585d405774bd35f5a07efd79"; + version = "0.1.4.6"; + sha256 = "fabe878ab40e0fe8187ee40e6d4b4d0a83e6b34c42e404f04d2b4afa3e1038f6"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base containers ]; + libraryHaskellDepends = [ base containers parsec ]; executableHaskellDepends = [ base containers HUnit parsec ]; homepage = "https://github.com/dillonhuff/Folly"; description = "A first order logic library in Haskell"; @@ -6542,23 +6542,23 @@ self: { }) {}; "HGamer3D" = callPackage - ({ mkDerivation, base, HGamer3D-Audio, HGamer3D-Common - , HGamer3D-Data, HGamer3D-Graphics3D, HGamer3D-InputSystem - , HGamer3D-Network + ({ mkDerivation, base, bytestring, cereal, clock, containers + , directory, filepath, hgamer3d0, messagepack, text, Urho3D, vect }: mkDerivation { pname = "HGamer3D"; - version = "0.5.0"; - sha256 = "670dbc3b159981e248800007a89a281393771fca68111f703e70fce7eb95b302"; + version = "0.6.0"; + sha256 = "e0d1a900db2d0e10b96c242508485789ca31e5a074978fb99a4804b78cc13db7"; libraryHaskellDepends = [ - base HGamer3D-Audio HGamer3D-Common HGamer3D-Data - HGamer3D-Graphics3D HGamer3D-InputSystem HGamer3D-Network + base bytestring cereal clock containers directory filepath + messagepack text vect ]; + librarySystemDepends = [ hgamer3d0 Urho3D ]; homepage = "http://www.hgamer3d.org"; - description = "A Toolset for the Haskell Game Programmer"; + description = "Toolset for the Haskell Game Programmer"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {Urho3D = null; hgamer3d0 = null;}; "HGamer3D-API" = callPackage ({ mkDerivation, base, haskell98, HGamer3D-Data @@ -7720,20 +7720,19 @@ self: { "HUnit-Plus" = callPackage ({ mkDerivation, base, bytestring, Cabal, cmdargs, containers - , directory, hashable, hexpat, hostname, old-locale, parsec, time - , timeit + , directory, hashable, hexpat, hostname, parsec, time, timeit }: mkDerivation { pname = "HUnit-Plus"; - version = "1.0.1"; - sha256 = "71929ba45bd420d8d2061dc877ed0d82ba574155ce0be6d67b6459148129045e"; + version = "1.1.0"; + sha256 = "9cde0930c46c02833e82b10519bcc841ce5186a62be3bb29971538e85a5fcb74"; libraryHaskellDepends = [ base bytestring Cabal cmdargs containers hashable hexpat hostname - old-locale parsec time timeit + parsec time timeit ]; testHaskellDepends = [ base bytestring Cabal cmdargs containers directory hashable hexpat - hostname old-locale parsec time timeit + hostname parsec time timeit ]; homepage = "https://github.com/emc2/HUnit-Plus"; description = "A test framework building on HUnit"; @@ -9456,14 +9455,11 @@ self: { ({ mkDerivation, base, bytestring, JuicyPixels, repa, vector }: mkDerivation { pname = "JuicyPixels-repa"; - version = "0.7"; - sha256 = "a556109f053d1dfd1eebd23080d5f285816a03f73e37fdc1f32e0a8df888c93a"; - revision = "1"; - editedCabalFile = "b0dcd6dae60b506057721d2732aebbece6ce380b5d7df4b2ba64592e6e3a88a8"; + version = "0.7.0.1"; + sha256 = "767c5f7ab39b660f0a9e4c8a5af0564060f5319dee7f68306523344ddfdf3837"; libraryHaskellDepends = [ base bytestring JuicyPixels repa vector ]; - jailbreak = true; description = "Convenience functions to obtain array representations of images"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -10341,15 +10337,15 @@ self: { "MFlow" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bytestring , case-insensitive, clientsession, conduit, conduit-extra - , containers, directory, extensible-exceptions, http-types + , containers, cpphs, directory, extensible-exceptions, http-types , monadloc, mtl, old-time, parsec, pwstore-fast, random , RefSerialize, resourcet, stm, TCache, text, time, transformers , utf8-string, vector, wai, wai-extra, warp, warp-tls, Workflow }: mkDerivation { pname = "MFlow"; - version = "0.4.5.10"; - sha256 = "2c2e2c03b31f37f628e446cabaf544bf7b669d3e6a34b6c38798e89145c3b6c4"; + version = "0.4.5.11"; + sha256 = "789aceb77d0e2497a6194dba2677e32b003292075bc36db66f272f559234f25f"; libraryHaskellDepends = [ base blaze-html blaze-markup bytestring case-insensitive clientsession conduit conduit-extra containers directory @@ -10358,6 +10354,7 @@ self: { transformers utf8-string vector wai wai-extra warp warp-tls Workflow ]; + libraryToolDepends = [ cpphs ]; description = "stateful, RESTful web framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -14983,6 +14980,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "THEff" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "THEff"; + version = "0.1.0.1"; + sha256 = "0fbe048bd845a2917e88bacc47e9d63da757ab15f233e63e876a6115f460663f"; + libraryHaskellDepends = [ base template-haskell ]; + description = "TH implementation of effects"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "TTTAS" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -19570,8 +19578,8 @@ self: { }: mkDerivation { pname = "amazonka"; - version = "1.2.0.1"; - sha256 = "4e7b7cda6b6904cfd35f92596bfe5a8e00511bbd64d7b55926ad8660f6eba950"; + version = "1.2.0.2"; + sha256 = "2ed9e6eb9a6dbb0eca3d1fb68c7136a35ec5b7b5ac3ac40d8ecc59b33a00cfb5"; libraryHaskellDepends = [ amazonka-core base bytestring conduit conduit-extra directory exceptions http-client http-conduit ini lens mmorph monad-control @@ -19590,19 +19598,17 @@ self: { }: mkDerivation { pname = "amazonka-autoscaling"; - version = "1.2.0.1"; - sha256 = "c48e7db56a1fc852a505b3821a4ed273b6a68e2f68ee224eb6cdfbe27c42926a"; + version = "1.2.0.2"; + sha256 = "23b763583f2d3ffd0abcb5c01cbba2c8a86f06a622a7878f4b90b96f9589fab1"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Auto Scaling SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-cloudformation" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19610,19 +19616,17 @@ self: { }: mkDerivation { pname = "amazonka-cloudformation"; - version = "1.2.0.1"; - sha256 = "813fcdb6a35888e1a0d29252f7530f192509662445b051ab17e6e4d614e98160"; + version = "1.2.0.2"; + sha256 = "b7ad4d6b83d043e1c55d2b336702c99e3476432f5f9e29f7af2d8224e5c85f21"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFormation SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-cloudfront" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19630,19 +19634,17 @@ self: { }: mkDerivation { pname = "amazonka-cloudfront"; - version = "1.2.0.1"; - sha256 = "aeff7660a2d12b1382d14efa134b37ae35e4dc3745fb83f33e4fd4ac37b4c275"; + version = "1.2.0.2"; + sha256 = "f906be9ac06c38451549c001ce870f732a43292da7ed41ca46089179ff89617a"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFront SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-cloudhsm" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19650,19 +19652,17 @@ self: { }: mkDerivation { pname = "amazonka-cloudhsm"; - version = "1.2.0.1"; - sha256 = "64a58850be2d1df8145ca7382f7060faf873417c34b52258846ea6b4842b1389"; + version = "1.2.0.2"; + sha256 = "5885451657f173c69d52c756395b52b6fe7be9626293d61b7513afbe73ba8e79"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudHSM SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-cloudsearch" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19670,19 +19670,17 @@ self: { }: mkDerivation { pname = "amazonka-cloudsearch"; - version = "1.2.0.1"; - sha256 = "d56e2690a44f331d408603234712bcbc2ef40f0375a7c1db22513c3350b3ccb5"; + version = "1.2.0.2"; + sha256 = "053b505d3644433f9e1fa686d6416ae08ac2154bb4ebe5e994f0b2a4969a11f1"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-cloudsearch-domains" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19690,19 +19688,17 @@ self: { }: mkDerivation { pname = "amazonka-cloudsearch-domains"; - version = "1.2.0.1"; - sha256 = "f3ac35a7e9f2f9372ffabbb5b7450b4291a07609f517af8b75a4acd5d5c3610d"; + version = "1.2.0.2"; + sha256 = "a3921a0b09518c5fffe95b46f76c46a53ab1710b59fb43f099cb14b637ea593f"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch Domain SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-cloudtrail" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19710,19 +19706,17 @@ self: { }: mkDerivation { pname = "amazonka-cloudtrail"; - version = "1.2.0.1"; - sha256 = "525e3a1f674b20e3851c67cc3d519f86b9795b046f131b91d63e7f194246542b"; + version = "1.2.0.2"; + sha256 = "a352d0ff1a75b22fa9e87c18c498090f5c6e9cbfcb79a24b2840ce44ec02b2b3"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudTrail SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-cloudwatch" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19730,19 +19724,17 @@ self: { }: mkDerivation { pname = "amazonka-cloudwatch"; - version = "1.2.0.1"; - sha256 = "dfabf18379ec4f5431e4038d745686a58fb83a0559029cbbb77b40f9ebc6fd43"; + version = "1.2.0.2"; + sha256 = "0b6e1358d91a567df91aa680019b0f06f201eb81965f3b78702c4e90a9a426a4"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-cloudwatch-logs" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19750,19 +19742,17 @@ self: { }: mkDerivation { pname = "amazonka-cloudwatch-logs"; - version = "1.2.0.1"; - sha256 = "3b794ef9cb79daf5018a7cc850a348eb08407067f4b72c6accbd03b3be6997ca"; + version = "1.2.0.2"; + sha256 = "3fd0122d4e24ccb3413da041ef85e7eb07af7614e43946fb28b93404951ddc39"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch Logs SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-codecommit" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19770,19 +19760,17 @@ self: { }: mkDerivation { pname = "amazonka-codecommit"; - version = "1.2.0.1"; - sha256 = "b4dcc54a0cd2faec903a037b713d1cce6ac6d4c3716b353b4108d23d4ecc0b03"; + version = "1.2.0.2"; + sha256 = "43b58f4507c9ea4125cc4da323ff63f8d9223149455293867143984074d8be74"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeCommit SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-codedeploy" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19790,19 +19778,17 @@ self: { }: mkDerivation { pname = "amazonka-codedeploy"; - version = "1.2.0.1"; - sha256 = "9b3dcfb3f92c0f2b7a68d62857e04a6eea0f57a6e72311fa5594da8574b8f557"; + version = "1.2.0.2"; + sha256 = "cbbc6d6d6291fc47c89e7f67dc016570eecaecccee8a8f1c858fda040e9993e9"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeDeploy SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-codepipeline" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19810,19 +19796,17 @@ self: { }: mkDerivation { pname = "amazonka-codepipeline"; - version = "1.2.0.1"; - sha256 = "c97df58c12793dc079d0706d9a09ea7c470219cc80e6e583441718d7017ee138"; + version = "1.2.0.2"; + sha256 = "57c505046cfa51716624d0021d6dca82a13053c17a5e0a61944935ba7bd189b4"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodePipeline SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-cognito-identity" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19830,19 +19814,17 @@ self: { }: mkDerivation { pname = "amazonka-cognito-identity"; - version = "1.2.0.1"; - sha256 = "fbf21d9ca8e71d0b3305791db0f6a18256898b5c294057f515aef3991a0971cb"; + version = "1.2.0.2"; + sha256 = "b9965907831e771ad7268d1f8d149b8b3de6faaf0e73eb140705bdf0a7cf8805"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Identity SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-cognito-sync" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19850,19 +19832,17 @@ self: { }: mkDerivation { pname = "amazonka-cognito-sync"; - version = "1.2.0.1"; - sha256 = "2008e997fa402ab3d58f22f260df18583695b612cbf1b0d3ab158321a1576e03"; + version = "1.2.0.2"; + sha256 = "f1683d1e4c124b07f5ae7663a1471539611f77da6f11553b87ca5eb77b192c89"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Sync SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-config" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19870,19 +19850,17 @@ self: { }: mkDerivation { pname = "amazonka-config"; - version = "1.2.0.1"; - sha256 = "c4e60da7e09302b81e1c53b15c36e99b46d09dd37b4334e360d78879b556ef36"; + version = "1.2.0.2"; + sha256 = "72fb81094500ac496592cd56c8010205f40a377ccdc7d8fb8f479e3923bcbfab"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Config SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-core" = callPackage ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring @@ -19895,8 +19873,8 @@ self: { }: mkDerivation { pname = "amazonka-core"; - version = "1.2.0.1"; - sha256 = "737645a63519f535154133cf590a66e2248d436c6223539857f43069a6645d1a"; + version = "1.2.0.2"; + sha256 = "63d02d59fe206e1cfbaacea192d775424d05d617413af1771c2efe9a4e51a663"; libraryHaskellDepends = [ aeson attoparsec base bifunctors bytestring case-insensitive conduit conduit-extra cryptonite exceptions hashable http-client @@ -19920,19 +19898,17 @@ self: { }: mkDerivation { pname = "amazonka-datapipeline"; - version = "1.2.0.1"; - sha256 = "20178d505d690116528f8d1bf5c5650c7dca9350b583ad4bbc2b7ca5b74bc1e0"; + version = "1.2.0.2"; + sha256 = "a4f8c95147fd34fabe6544c5d8893aac7259a95fc37d9d900e121cc1d479d230"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Data Pipeline SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-devicefarm" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19940,19 +19916,17 @@ self: { }: mkDerivation { pname = "amazonka-devicefarm"; - version = "1.2.0.1"; - sha256 = "bebf18952a56cc249175a1bf69ab1400126b3c97c45ce8b7895acbae894c3449"; + version = "1.2.0.2"; + sha256 = "92d323fbe85ccd284ea76fcba12e8ea70b75994d2195bb12e25a753f5b78424e"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Device Farm SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-directconnect" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19960,19 +19934,17 @@ self: { }: mkDerivation { pname = "amazonka-directconnect"; - version = "1.2.0.1"; - sha256 = "39bd3999d29363b87fc64edac6151251a5a5075c7fe1ab48bb89114fa40cfa74"; + version = "1.2.0.2"; + sha256 = "1cd5cda8a0d8ca484582b5d9ef0e50fbe14542e81a49de6f5b3bf32a044ab3c6"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Direct Connect SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-ds" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19980,19 +19952,17 @@ self: { }: mkDerivation { pname = "amazonka-ds"; - version = "1.2.0.1"; - sha256 = "fac88b8ac1121ec6ab9bb1c1b419262e2720c95d3c5d5e1d5ff9b0356f59af56"; + version = "1.2.0.2"; + sha256 = "10b5a48951ec7f90b05152d2073b10d154ceea5806f5655d47d1f8a512f2cbbd"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Directory Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-dynamodb" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20000,19 +19970,17 @@ self: { }: mkDerivation { pname = "amazonka-dynamodb"; - version = "1.2.0.1"; - sha256 = "23d44253d82d2406b528abf5f1c2ed97c72cadb9afca1a578793220648ce442c"; + version = "1.2.0.2"; + sha256 = "c916d9b55e74ceeb5f1e7a64fb7ebe0de3bea7df3eb9d2d813bce7e945e81634"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon DynamoDB SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-dynamodb-streams" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20020,19 +19988,17 @@ self: { }: mkDerivation { pname = "amazonka-dynamodb-streams"; - version = "1.2.0.1"; - sha256 = "b3413412dce8dc96e449642535f623223298243d7290d778082fd6ed97511a33"; + version = "1.2.0.2"; + sha256 = "3ae26f2fdfe11cd7a366dc272d1f43f38cdb949eb5edc7b73e01a176b2096868"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon DynamoDB Streams SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-ec2" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20040,19 +20006,17 @@ self: { }: mkDerivation { pname = "amazonka-ec2"; - version = "1.2.0.1"; - sha256 = "de1421ab986e9d6833fd70a0e0d3c21895813361ecc680c95816fbcaf7c6439a"; + version = "1.2.0.2"; + sha256 = "f93ca4bb2ae863f071a0555f762e365da1616b72c8589d4fe3aad260fc936211"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Compute Cloud SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-ecs" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20060,19 +20024,17 @@ self: { }: mkDerivation { pname = "amazonka-ecs"; - version = "1.2.0.1"; - sha256 = "19c608e5218c900da768adc9f893a91a7fc6e9070e8c5d9e444baf1ae98c7544"; + version = "1.2.0.2"; + sha256 = "7c322cc5afcdcc92b21c22333c859295a508d84bd8ba83921a105d231dbfa8d6"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon EC2 Container Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-efs" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20080,19 +20042,17 @@ self: { }: mkDerivation { pname = "amazonka-efs"; - version = "1.2.0.1"; - sha256 = "d0f70ed2e5242cb05b7895199a06144cd4550fab64fb825eba8a1c10d9351bab"; + version = "1.2.0.2"; + sha256 = "193b91ede9c1abfe195788c03940214f8d54c43fde259674a468f49a5c59834f"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic File System SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-elasticache" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20100,19 +20060,17 @@ self: { }: mkDerivation { pname = "amazonka-elasticache"; - version = "1.2.0.1"; - sha256 = "9c4113c0dd2430432ac0233149571a7affc9dec675aaddbe7ff9e513171a1bf7"; + version = "1.2.0.2"; + sha256 = "1a5a8883055dcc318a90cc45f1cfd7af198c5e98b8889db86bca951bc2e9be29"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon ElastiCache SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-elasticbeanstalk" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20120,19 +20078,17 @@ self: { }: mkDerivation { pname = "amazonka-elasticbeanstalk"; - version = "1.2.0.1"; - sha256 = "b4e135c2e904f78cab94ccab8d1d38b3b7992461bc1f41ede5ee708fcb162dc2"; + version = "1.2.0.2"; + sha256 = "fa62e8248e92184e84b482012dd73953bb0892166f95d0d2163b04c42ebcc650"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Beanstalk SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-elastictranscoder" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20140,19 +20096,17 @@ self: { }: mkDerivation { pname = "amazonka-elastictranscoder"; - version = "1.2.0.1"; - sha256 = "b2eaf67b39f5d19fe5ea7a6d0c79b44951cf25c41eb3af36ead6cd82cb430dd2"; + version = "1.2.0.2"; + sha256 = "76d26a2d64094dd14090298ead0e920915c31582fe14d949836f1103af238c04"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Transcoder SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-elb" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20160,19 +20114,17 @@ self: { }: mkDerivation { pname = "amazonka-elb"; - version = "1.2.0.1"; - sha256 = "2574b79c0b09ef82dcc7b07c9dfcb55719dd7b63ac87fb938ae7a7c45efba986"; + version = "1.2.0.2"; + sha256 = "21099398af8db511131a4c8bed68b6d04f9b708a77c38d01b037020e18ab2123"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Load Balancing SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-emr" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20180,19 +20132,17 @@ self: { }: mkDerivation { pname = "amazonka-emr"; - version = "1.2.0.1"; - sha256 = "43c3e80f742abbd5d2770fa5cf05138b5be2890492a295b1ccaefeb8d50662ed"; + version = "1.2.0.2"; + sha256 = "08728f1ccd95bcce046d6e320391d1c219306b2764a0a551dfea11de3208e1f1"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic MapReduce SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-glacier" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20200,19 +20150,17 @@ self: { }: mkDerivation { pname = "amazonka-glacier"; - version = "1.2.0.1"; - sha256 = "48e2c9b10a4624b6f308bd232aafe9fabe7429911ad4a7a8222277d9c58310be"; + version = "1.2.0.2"; + sha256 = "a789aaf0927672e16ceb8202d88ff07ee5218b2244236f94a04f186a0b38a3f5"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Glacier SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-iam" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20220,19 +20168,17 @@ self: { }: mkDerivation { pname = "amazonka-iam"; - version = "1.2.0.1"; - sha256 = "8302e53d2e799b56629a2344a3b1d40b39b173defee1112ddb6e4e0102496d7f"; + version = "1.2.0.2"; + sha256 = "00454769f0848db0b6a273ff2e6e0f4b7dcfc94db067ce4774806aa0687b9f6d"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Identity and Access Management SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-importexport" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20240,19 +20186,17 @@ self: { }: mkDerivation { pname = "amazonka-importexport"; - version = "1.2.0.1"; - sha256 = "cfb98a32f18d2b1448277f5a4c5128bd9d94ecba012d458dff65a834c86648d6"; + version = "1.2.0.2"; + sha256 = "e8e9f4a8fb5762a929c9462d7d8187207a1334aa3922890ec08a6a949ba9264e"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Import/Export SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-kinesis" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20260,19 +20204,17 @@ self: { }: mkDerivation { pname = "amazonka-kinesis"; - version = "1.2.0.1"; - sha256 = "831225d3400badf60a8b390e4dd692d38b8097bcb72f1247b54876c83bb532c9"; + version = "1.2.0.2"; + sha256 = "7b5d2a726111352d21594a1704dade4d2b706286c8cec427b912a2318f91bc20"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Kinesis SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-kms" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20280,19 +20222,17 @@ self: { }: mkDerivation { pname = "amazonka-kms"; - version = "1.2.0.1"; - sha256 = "b69938c0c9f6bbc5d1774643f528e64ba28a6ac2bb16f1e15845061a97de85d4"; + version = "1.2.0.2"; + sha256 = "7c67b24e31d293411960f68efd4199e5fd4fd4274ea62619f96faa37553c8246"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Key Management Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-lambda" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20300,19 +20240,17 @@ self: { }: mkDerivation { pname = "amazonka-lambda"; - version = "1.2.0.1"; - sha256 = "e3e0e8fd76c7dbd1ced77e9d46a4e8b57820b87b00327ccc01417ddf4c53aa0d"; + version = "1.2.0.2"; + sha256 = "91f88bc3fa32f5c6350f2f49afb949e63a860614d7f90d169af216115f0927c2"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Lambda SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-ml" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20320,19 +20258,17 @@ self: { }: mkDerivation { pname = "amazonka-ml"; - version = "1.2.0.1"; - sha256 = "c29484802e0138ebbeb6666842ca1cd44b81e2e870ff4c1435d91d58d569bc37"; + version = "1.2.0.2"; + sha256 = "c3a3eee8d0bb4987d96b35b48dc074d2912883573e8859fdabf16f744641b9f0"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Machine Learning SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-opsworks" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20340,19 +20276,17 @@ self: { }: mkDerivation { pname = "amazonka-opsworks"; - version = "1.2.0.1"; - sha256 = "bad7706393fcfcc041ac4ae1bb39ef7320d282d2b4d9c6c8f0881379b4f91a6a"; + version = "1.2.0.2"; + sha256 = "bad8fc80941bdecd1799213837ef1923c88ef96b59ec2efe439a564f68e06f40"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon OpsWorks SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-rds" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20360,19 +20294,17 @@ self: { }: mkDerivation { pname = "amazonka-rds"; - version = "1.2.0.1"; - sha256 = "55ae3a2e6893fc11ca156fb9d11258d1c1ad76f928ca1143cfb0b7b3d9f1806e"; + version = "1.2.0.2"; + sha256 = "d4ae1dec9b45df0db245022c5e098ad4814f2ab2261bde850adb42b38200b248"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Relational Database Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-redshift" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20380,19 +20312,17 @@ self: { }: mkDerivation { pname = "amazonka-redshift"; - version = "1.2.0.1"; - sha256 = "0ce218a13c314c73ea9b3f5c7e8ef31f3cf92a06f820425c48d83d175f1e77b2"; + version = "1.2.0.2"; + sha256 = "b7fd76de142bc6c346d10645fe07c64c09ee26c828fe89abd6d0f44d99c39a89"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Redshift SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-route53" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20400,19 +20330,17 @@ self: { }: mkDerivation { pname = "amazonka-route53"; - version = "1.2.0.1"; - sha256 = "8a700fc08eb4585b6d9a30c81f18bfab56ae2ae4b5474f98889959f2bda33ad0"; + version = "1.2.0.2"; + sha256 = "bfe1e8d82ea77ab1a4b95cfef89a6cefc5dc2bcd349c17964fcab9ce2f00ec9b"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-route53-domains" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20420,19 +20348,17 @@ self: { }: mkDerivation { pname = "amazonka-route53-domains"; - version = "1.2.0.1"; - sha256 = "d486ae77163fc9d8dbb3b38afcce6ce79fba93b5194643ad98cb8dbbe31f745a"; + version = "1.2.0.2"; + sha256 = "e0a70770d5fea792f15e5ed7c6fac093dc52e98d5a140c8ac769d09d87a11760"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 Domains SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-s3" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20440,19 +20366,17 @@ self: { }: mkDerivation { pname = "amazonka-s3"; - version = "1.2.0.1"; - sha256 = "dd5b54f342d1a5f45ea62242f9acecb2be98ed15801b251316c9bef8ac7b948b"; + version = "1.2.0.2"; + sha256 = "e38c08253fee58cbf3f503d7f3f5c2a96e99c74cc343c99751a44adb3fc82a27"; libraryHaskellDepends = [ amazonka-core base lens text ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Storage Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-sdb" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20460,19 +20384,17 @@ self: { }: mkDerivation { pname = "amazonka-sdb"; - version = "1.2.0.1"; - sha256 = "4eebd5b37c309ee850395c2823f10636cb90c8449a1f365a11a5cf58080b4469"; + version = "1.2.0.2"; + sha256 = "58e01ab2120c1f680148fed558c1cb179867eb3770fc3a119a5770ab187de7c9"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon SimpleDB SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-ses" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20480,19 +20402,17 @@ self: { }: mkDerivation { pname = "amazonka-ses"; - version = "1.2.0.1"; - sha256 = "f547f472a3dee0944a7a26a7b421df10242d80762ca59392391a1326a39a427f"; + version = "1.2.0.2"; + sha256 = "3f81529747d25fbdff258c6027592650b5de4537fe4600a40d60116ddc7cb539"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Email Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-sns" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20500,19 +20420,17 @@ self: { }: mkDerivation { pname = "amazonka-sns"; - version = "1.2.0.1"; - sha256 = "e69b15d4fe2904cd813e22a149e4dcce5c9514a34c45379bb07589fc3a606994"; + version = "1.2.0.2"; + sha256 = "e7585e9186ab3bb1e71405f3e01b31a0a9a0e6aa228b1a78a8f65d55cff782f9"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Notification Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-sqs" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20520,19 +20438,17 @@ self: { }: mkDerivation { pname = "amazonka-sqs"; - version = "1.2.0.1"; - sha256 = "e599b394468bdeb2813b8e091b5aefc5787bb10bd2bfb24d5be4ba70a5ed0134"; + version = "1.2.0.2"; + sha256 = "0fa349f412a216cb1bd3c2ed6d9fa97ce0f95522caa2099fdc473e1b433ce4ef"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Queue Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-ssm" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20540,19 +20456,17 @@ self: { }: mkDerivation { pname = "amazonka-ssm"; - version = "1.2.0.1"; - sha256 = "d9d47fd9820fa05fbfdd62090d9319ee6fd96f321422a995e186ab3e13d789f1"; + version = "1.2.0.2"; + sha256 = "d227c62cd71a81cb02bcfe6a7024ea423940dbbae18f3d8f59be6ccdb346657e"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Systems Management Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-storagegateway" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20560,19 +20474,17 @@ self: { }: mkDerivation { pname = "amazonka-storagegateway"; - version = "1.2.0.1"; - sha256 = "d73bf3187bb9fd7b50ddcc74566841d1fb4e77328bbe0dddb19a324553e9c49b"; + version = "1.2.0.2"; + sha256 = "66f0781991832ddc0a8b68098f1d1213ffea9ed9b29effad53f4987c96914ea6"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Storage Gateway SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-sts" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20580,19 +20492,17 @@ self: { }: mkDerivation { pname = "amazonka-sts"; - version = "1.2.0.1"; - sha256 = "66502b43aea7c2f70ef4559913c58fb0ae581435d0656f1ab9f9c417bcb54a2e"; + version = "1.2.0.2"; + sha256 = "629d92d11fc73e7d3fe7e428a309c2cd93e42291a5102075ed9220fb37b916fd"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Security Token Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-support" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20600,19 +20510,17 @@ self: { }: mkDerivation { pname = "amazonka-support"; - version = "1.2.0.1"; - sha256 = "f1996613bfcfa00eac465c90ef97f18c6fe51231def2d43de1bf90fd0992e52e"; + version = "1.2.0.2"; + sha256 = "c650edb5679dbc337c2aaf6eecafa85725f02e580c913164c1381ceb0f724fbe"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Support SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-swf" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20620,19 +20528,39 @@ self: { }: mkDerivation { pname = "amazonka-swf"; - version = "1.2.0.1"; - sha256 = "d68898d0a5205e3897b36c29830564f1aecbeff759ff5c379bdf12c1c60f1c01"; + version = "1.2.0.2"; + sha256 = "ae3a8a9b918c9bc4d1bfe6e855686fc3bbc78484c7e863186295b30318761892"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Workflow Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; + + "amazonka-test" = callPackage + ({ mkDerivation, aeson, amazonka-core, base, bifunctors, bytestring + , case-insensitive, conduit, conduit-extra, groom, http-client + , http-types, lens, process, resourcet, tasty, tasty-hunit + , template-haskell, temporary, text, time, unordered-containers + , yaml + }: + mkDerivation { + pname = "amazonka-test"; + version = "1.2.0.2"; + sha256 = "cc54d2f2514d714b5261e75090f97d9432e7dd84be5c4c314d4747c733d732a8"; + libraryHaskellDepends = [ + aeson amazonka-core base bifunctors bytestring case-insensitive + conduit conduit-extra groom http-client http-types lens process + resourcet tasty tasty-hunit template-haskell temporary text time + unordered-containers yaml + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Common functionality for Amazonka library test-suites"; + license = "unknown"; + }) {}; "amazonka-workspaces" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20640,19 +20568,17 @@ self: { }: mkDerivation { pname = "amazonka-workspaces"; - version = "1.2.0.1"; - sha256 = "4125f1aa08ad2f9013bba8f8d0c83b41f0eeb76203fd1b7da41a306f81211448"; + version = "1.2.0.2"; + sha256 = "4c685ff3dca7dc5fac2ecd6d07f4400f045901a75985d62f4e38d6561a82c0d6"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon WorkSpaces SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "ampersand" = callPackage ({ mkDerivation, base, bytestring, containers, csv, directory @@ -27732,15 +27658,15 @@ self: { }: mkDerivation { pname = "bitx-bitcoin"; - version = "0.5.0.0"; - sha256 = "e52f9757e72a5f3fa2992a4f68ffb7874131357b9327ce6908200e8e89d7f9a9"; + version = "0.5.0.1"; + sha256 = "24a29bdc360b4121c7992cf4118ed1caa32854d80aa2b2d3a63a63d5a0f9e38f"; libraryHaskellDepends = [ aeson base bytestring http-conduit http-types microlens microlens-th network scientific split text time ]; testHaskellDepends = [ - aeson base bytestring directory doctest hspec microlens safe text - time + aeson base bytestring directory doctest hspec http-conduit + http-types microlens safe text time ]; homepage = "https://github.com/tebello-thejane/bitx-haskell"; description = "A Haskell library for working with the BitX bitcoin exchange"; @@ -31877,8 +31803,8 @@ self: { }: mkDerivation { pname = "cassava"; - version = "0.4.3.1"; - sha256 = "e389ea01f6f346246e7002d5eb925518d134185f260cbdf1e81628eb4cffc2ac"; + version = "0.4.4.0"; + sha256 = "0733ede68d2670fd3e676f5a19b6d31233b266a8dc42387316e6ec7ed5e5df3f"; libraryHaskellDepends = [ array attoparsec base blaze-builder bytestring containers deepseq hashable text unordered-containers vector @@ -32576,19 +32502,19 @@ self: { "cgrep" = callPackage ({ mkDerivation, ansi-terminal, array, async, base, bytestring , cmdargs, containers, directory, dlist, either, filepath, ghc-prim - , mtl, regex-posix, safe, split, stm, stringsearch, unix-compat - , unordered-containers + , mtl, regex-posix, safe, split, stm, stringsearch, transformers + , unix-compat, unordered-containers }: mkDerivation { pname = "cgrep"; - version = "6.5.3"; - sha256 = "af2f1b09aabb32fe398a575f28331979903afa00333b3f1dc0f19a6d302bca1e"; + version = "6.5.4"; + sha256 = "2dd9112da6cde89934d8a65a93597b161928c23c01b1af25ffae72ee104c768a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ ansi-terminal array async base bytestring cmdargs containers directory dlist either filepath ghc-prim mtl regex-posix safe split - stm stringsearch unix-compat unordered-containers + stm stringsearch transformers unix-compat unordered-containers ]; homepage = "http://awgn.github.io/cgrep/"; description = "Command line tool"; @@ -34985,8 +34911,8 @@ self: { pname = "codepad"; version = "0.1"; sha256 = "215704a914c2006369c63cf6000385b2ece643839a8c0f2398353f46f65a5b0e"; - revision = "1"; - editedCabalFile = "52fe2b461d77b36400724ddd77e6ec5a92cb9c1bbf5f97efb4cfe87adba3a07a"; + revision = "3"; + editedCabalFile = "6f9d1a534fa6ff720347aa10521a99456aa4b9e2a95b45f71cadb06074277c86"; libraryHaskellDepends = [ base curl mtl network tagsoup ]; jailbreak = true; homepage = "http://github.com/chrisdone/codepad"; @@ -38843,20 +38769,20 @@ self: { }) {}; "cron" = callPackage - ({ mkDerivation, attoparsec, base, derive, hspec - , hspec-expectations, mtl, mtl-compat, old-locale, QuickCheck, text - , time, transformers-compat + ({ mkDerivation, attoparsec, base, derive, mtl, mtl-compat + , old-locale, tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers-compat }: mkDerivation { pname = "cron"; - version = "0.3.0"; - sha256 = "3369302abbf131db159c4a4a8666d93e8dfbd4478c9aa56ca9d0ff45926bcaa3"; + version = "0.3.1"; + sha256 = "e4d506496d1be1327cbca8619a0a88a11219d54dbe716bcd05b4953f8fe75823"; libraryHaskellDepends = [ attoparsec base mtl mtl-compat old-locale text time ]; testHaskellDepends = [ - attoparsec base derive hspec hspec-expectations QuickCheck text - time transformers-compat + attoparsec base derive tasty tasty-hunit tasty-quickcheck text time + transformers-compat ]; homepage = "http://github.com/michaelxavier/cron"; description = "Cron datatypes and Attoparsec parser"; @@ -42545,8 +42471,8 @@ self: { }: mkDerivation { pname = "debian-build"; - version = "0.7.2.2"; - sha256 = "e9ba2452da86da69f80ed6042de3ae73de83ee96b8483a845129b1dfc685e737"; + version = "0.8.0.0"; + sha256 = "07887be08bd4521fc76e272ed9c418a7c517c57360f07529206ea2b46ace52ad"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52354,17 +52280,17 @@ self: { }) {}; "fishfood" = callPackage - ({ mkDerivation, base, Cabal, containers, factory, mtl, QuickCheck - , toolshed, unix + ({ mkDerivation, base, Cabal, containers, directory, factory, mtl + , QuickCheck, toolshed }: mkDerivation { pname = "fishfood"; - version = "0.0.1.3"; - sha256 = "5318e06292c0530f60ff93b9a0182034fcc799112fe6b0acf6c7a7f72a11b72e"; + version = "0.0.1.4"; + sha256 = "ffdc12216f142512efca5b2a5c369f040cdf24fdb355f990d209447da9a7fed2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base Cabal containers factory mtl QuickCheck toolshed unix + base Cabal containers directory factory mtl QuickCheck toolshed ]; homepage = "http://functionalley.eu"; description = "Calculates file-size frequency-distribution"; @@ -53314,8 +53240,8 @@ self: { }: mkDerivation { pname = "foldl-transduce"; - version = "0.2.0.0"; - sha256 = "38be7ab52831c7ea5ac5fd4e546b9f8b4a66305528af80aa6ec17214b6066e02"; + version = "0.2.1.0"; + sha256 = "6e6e1d3c90faf10daf0863a94742ee376457d9ea79e7b76fefe500a45f4fb6e4"; libraryHaskellDepends = [ base bifunctors bytestring comonad containers foldl semigroupoids text transformers @@ -58200,6 +58126,94 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "glue-common" = callPackage + ({ mkDerivation, async, base, ekg-core, hashable, hspec + , lifted-base, monad-control, QuickCheck, quickcheck-instances + , text, time, transformers, transformers-base, unordered-containers + }: + mkDerivation { + pname = "glue-common"; + version = "0.4.1"; + sha256 = "ee474188b6dbb022312f4f74bd16e3cd2915bc4d7699169b29d76482ec4b23b8"; + libraryHaskellDepends = [ + base hashable lifted-base monad-control text time transformers + transformers-base unordered-containers + ]; + testHaskellDepends = [ + async base ekg-core hashable hspec lifted-base monad-control + QuickCheck quickcheck-instances text time transformers + transformers-base unordered-containers + ]; + description = "Make better services"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "glue-core" = callPackage + ({ mkDerivation, async, base, ekg-core, glue-common, hashable + , hspec, lifted-base, monad-control, QuickCheck + , quickcheck-instances, text, time, transformers, transformers-base + , unordered-containers + }: + mkDerivation { + pname = "glue-core"; + version = "0.4.1"; + sha256 = "d9be37ce2995583086c960c18c9457e83b9adea0b2feff7e422af6292ee0b347"; + libraryHaskellDepends = [ + base glue-common hashable lifted-base monad-control text time + transformers transformers-base unordered-containers + ]; + testHaskellDepends = [ + async base ekg-core glue-common hashable hspec lifted-base + monad-control QuickCheck quickcheck-instances text time + transformers transformers-base unordered-containers + ]; + description = "Make better services"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "glue-ekg" = callPackage + ({ mkDerivation, async, base, ekg-core, glue-common, hashable + , hspec, lifted-base, monad-control, QuickCheck + , quickcheck-instances, text, time, transformers, transformers-base + , unordered-containers + }: + mkDerivation { + pname = "glue-ekg"; + version = "0.4.1"; + sha256 = "f655a9c8f0af74dcc5483b7974bba30d071d2e6e658ed89de4c407922cdf58e4"; + libraryHaskellDepends = [ + base ekg-core glue-common hashable lifted-base monad-control text + time transformers transformers-base unordered-containers + ]; + testHaskellDepends = [ + async base ekg-core glue-common hashable hspec lifted-base + monad-control QuickCheck quickcheck-instances text time + transformers transformers-base unordered-containers + ]; + description = "Make better services"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "glue-example" = callPackage + ({ mkDerivation, async, base, ekg-core, glue-common, glue-core + , glue-ekg, hashable, lifted-base, monad-control, monad-loops, text + , time, transformers, transformers-base, unordered-containers + }: + mkDerivation { + pname = "glue-example"; + version = "0.4.1"; + sha256 = "00a55b518dc5cb0678f5c943beb6b46a8089b1907315a5e96319146ee796b5cf"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async base ekg-core glue-common glue-core glue-ekg hashable + lifted-base monad-control monad-loops text time transformers + transformers-base unordered-containers + ]; + description = "Make better services"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gluturtle" = callPackage ({ mkDerivation, base, convertible, GLUT, stm, yjsvg, yjtools }: mkDerivation { @@ -71694,6 +71708,32 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "hops" = callPackage + ({ mkDerivation, aeson, ansi-terminal, attoparsec, base, bytestring + , conduit, conduit-extra, containers, deepseq, directory, filepath + , http-conduit, http-types, optparse-applicative, parallel + , QuickCheck, text, transformers, vector + }: + mkDerivation { + pname = "hops"; + version = "0.0.1"; + sha256 = "e7ef3084cd1e5ec4cb5a0f558b1fd01fe0dc7d959d30c977df0b2ed624055798"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson ansi-terminal attoparsec base bytestring conduit + conduit-extra containers deepseq directory filepath http-conduit + http-types optparse-applicative parallel text transformers vector + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring containers deepseq QuickCheck text + vector + ]; + homepage = "http://github.com/akc/hops"; + description = "Hackable Operations on Power Series"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hoq" = callPackage ({ mkDerivation, alex, array, base, bifunctors, bytestring , filepath, happy, mtl, pretty, readline, void @@ -80762,6 +80802,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ioref-stable" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "ioref-stable"; + version = "0.1.0.0"; + sha256 = "9044897340c044e44d3a9c33b350523147a6a95a2f1c8fb410caee880ceba314"; + libraryHaskellDepends = [ base ]; + homepage = "http://github.com/cocreature/ioref-stable#readme"; + description = "iorefs with a unique stable index"; + license = stdenv.lib.licenses.mit; + }) {}; + "iothread" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -82028,10 +82080,8 @@ self: { }: mkDerivation { pname = "jammittools"; - version = "0.5.0.1"; - sha256 = "fd01f32dc319f7088791ce696d0421215a624bc7a2923bb8a39e4d102148cae1"; - revision = "1"; - editedCabalFile = "723bbb15b1cdc91151255c89977d67e330f4795c35dc330c5cc324d7784d53b6"; + version = "0.5.0.2"; + sha256 = "2d633a0410423ad12840449bb809f3bc3ffbc9aae7db6b365379b02ebeb3829c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85664,6 +85714,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-lua2" = callPackage + ({ mkDerivation, base, containers, Earley, lexer-applicative + , microlens, optparse-applicative, QuickCheck, regex-applicative + , semigroups, srcloc, tasty, tasty-hunit, tasty-quickcheck + , transformers, unordered-containers, wl-pprint + }: + mkDerivation { + pname = "language-lua2"; + version = "0.1.0.0"; + sha256 = "0b53673bcaa3445e823e7808b95b109074d29ad3083d02e57bc39ef12619a061"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers Earley lexer-applicative microlens + regex-applicative semigroups srcloc transformers + unordered-containers wl-pprint + ]; + executableHaskellDepends = [ + base Earley lexer-applicative optparse-applicative srcloc wl-pprint + ]; + testHaskellDepends = [ + base lexer-applicative QuickCheck semigroups srcloc tasty + tasty-hunit tasty-quickcheck unordered-containers + ]; + homepage = "http://github.com/mitchellwrosen/language-lua2"; + description = "Lua parser and pretty printer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "language-mixal" = callPackage ({ mkDerivation, base, mtl, parsec, pretty }: mkDerivation { @@ -87389,8 +87468,8 @@ self: { }: mkDerivation { pname = "libmpd"; - version = "0.9.0.3"; - sha256 = "3f0c520f19520dae35bf0d6aebf2fffef067964ace91047193b330a6dfaaa3d6"; + version = "0.9.0.4"; + sha256 = "bdaa57a410396b2f02ddb9896823ce0a176751fa84261f445e9a5b7671333a7a"; libraryHaskellDepends = [ attoparsec base bytestring containers data-default-class filepath mtl network old-locale text time utf8-string @@ -88136,8 +88215,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim, mtl, transformers }: mkDerivation { pname = "linearscan"; - version = "0.9.0"; - sha256 = "1ca49da5de79fd4aa6849a2b27dae5d01b3a896968e5fce29ad0c6a670065fa2"; + version = "0.10.0"; + sha256 = "27a0461fc9fae738a621febf02e54049d21798a9347aaee7777c4d28f27e90b8"; libraryHaskellDepends = [ base containers ghc-prim mtl transformers ]; @@ -88154,8 +88233,8 @@ self: { }: mkDerivation { pname = "linearscan-hoopl"; - version = "0.9.2"; - sha256 = "fc52aedb4f8b3def5b993846543801de43cb5ea1f4091a2244626fe820382d6b"; + version = "0.10.0"; + sha256 = "4fd28d6d557c9a1f2fef6f9d8c6a49f78cedd469ddcd02629a9df515af4424ae"; libraryHaskellDepends = [ base containers free hoopl linearscan QuickCheck transformers ]; @@ -89787,6 +89866,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lookup-tables" = callPackage + ({ mkDerivation, base, primitive, tasty, tasty-hunit + , template-haskell + }: + mkDerivation { + pname = "lookup-tables"; + version = "0.1.1.0"; + sha256 = "a3b3380485752abb262c964f633c6f184a65d249658da2ae41de0276151a64b3"; + libraryHaskellDepends = [ base primitive template-haskell ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + description = "Statically generate lookup tables using Template Haskell"; + license = stdenv.lib.licenses.isc; + }) {}; + "loop" = callPackage ({ mkDerivation, base, hspec, mtl }: mkDerivation { @@ -91417,8 +91510,8 @@ self: { }: mkDerivation { pname = "mandrill"; - version = "0.3.0.0"; - sha256 = "f497b16900ead8851bec4d8529dfa2a0ba77397a8e7f95ef39d68928d64ffc09"; + version = "0.4.0.0"; + sha256 = "495c8e1863140df809275f1972ec0b2514d78790650a68413c7bf103780205a5"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-html bytestring containers email-validate http-client http-client-tls http-types lens mtl @@ -92909,24 +93002,26 @@ self: { }) {}; "microformats2-parser" = callPackage - ({ mkDerivation, aeson, aeson-pretty, aeson-qq, base, blaze-html - , blaze-markup, bytestring, containers, data-default, either, hspec - , hspec-expectations-pretty-diff, html-conduit, lens-aeson, mtl - , network, network-uri, options, pcre-heavy, raw-strings-qq, safe - , scotty, streaming-commons, stringable, template-haskell, text - , time, transformers, unordered-containers, vector, wai-extra, warp - , xml-lens, xss-sanitize + ({ mkDerivation, aeson, aeson-pretty, aeson-qq, attoparsec, base + , blaze-html, blaze-markup, bytestring, containers, data-default + , either, errors, hspec, hspec-expectations-pretty-diff + , html-conduit, lens-aeson, mtl, network, network-uri, options + , pcre-heavy, raw-strings-qq, safe, scotty, streaming-commons + , stringable, template-haskell, text, time, transformers + , unordered-containers, vector, wai-extra, warp, xml-lens + , xss-sanitize }: mkDerivation { pname = "microformats2-parser"; - version = "1.0.1.2"; - sha256 = "94c220abb5bfd065e492f138bb72466f37cb2ecf4c53e830226b64e950a061b9"; + version = "1.0.1.3"; + sha256 = "68f0da066f3c891ab15a4336eede0558f5f43dd74a70f178886e517a1fdd604f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-qq base blaze-markup bytestring containers data-default - either html-conduit lens-aeson network-uri pcre-heavy safe text - time transformers unordered-containers vector xml-lens xss-sanitize + aeson aeson-qq attoparsec base blaze-markup bytestring containers + data-default either errors html-conduit lens-aeson network-uri + pcre-heavy safe text time transformers unordered-containers vector + xml-lens xss-sanitize ]; executableHaskellDepends = [ aeson aeson-pretty base blaze-html blaze-markup data-default @@ -94093,20 +94188,21 @@ self: { "moesocks" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring - , containers, cryptohash, hslogger, HsOpenSSL, iproute, lens, mtl - , network, optparse-applicative, random, stm, strict, text, time - , transformers, unix, unordered-containers + , containers, cryptohash, hslogger, HsOpenSSL, iproute, lens + , lens-aeson, mtl, network, optparse-applicative, random, stm + , strict, text, time, transformers, unix, unordered-containers }: mkDerivation { pname = "moesocks"; - version = "0.1.0.27"; - sha256 = "3e520127ef1727d460d65b1219d5c585973c62fc2f31713d6743aed2406d5abe"; + version = "0.1.1.31"; + sha256 = "a1b105ee4d257874fc844170dd73decf7035361a27667f10fe8fdcf6da88ec8b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson async attoparsec base binary bytestring containers cryptohash - hslogger HsOpenSSL iproute lens mtl network optparse-applicative - random stm strict text time transformers unix unordered-containers + hslogger HsOpenSSL iproute lens lens-aeson mtl network + optparse-applicative random stm strict text time transformers unix + unordered-containers ]; homepage = "https://github.com/nfjinjing/moesocks"; description = "A functional firewall killer"; @@ -95515,24 +95611,23 @@ self: { "morte" = callPackage ({ mkDerivation, alex, array, base, binary, containers, deepseq - , happy, http-client, http-client-tls, lens-family-core, managed - , optparse-applicative, pipes, system-fileio, system-filepath, text - , text-format, transformers + , happy, http-client, http-client-tls, managed, microlens + , microlens-mtl, optparse-applicative, pipes, system-fileio + , system-filepath, text, text-format, transformers }: mkDerivation { pname = "morte"; - version = "1.2.1"; - sha256 = "8fb0e54f4469de6ee9018ef51bf9ffda5dcd1abca4de87f9e47edc8b4199fb97"; + version = "1.3.0"; + sha256 = "bcaf4af883e8441dff551d05efcb82985051635fe1f38dc80be2fd5bf6471240"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base binary containers deepseq http-client http-client-tls - lens-family-core managed pipes system-fileio system-filepath text - text-format transformers + managed microlens microlens-mtl pipes system-fileio system-filepath + text text-format transformers ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base optparse-applicative text ]; - jailbreak = true; description = "A bare-bones calculus of constructions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -101028,8 +101123,10 @@ self: { }: mkDerivation { pname = "opaleye-classy"; - version = "0.1.0.1"; - sha256 = "874c3f1d394653289542ef2a8ca55d8b93c01c1de78e2c0bbe1c668be39b331a"; + version = "0.3.1.1"; + sha256 = "2c3e216384bdb5e9e9eb84e67dd86b4daaf31568ccb5714b8aa84e2d3550ca9b"; + revision = "1"; + editedCabalFile = "79b08c58924ba2f19fa919f97895adb4dbb6b8e0b1644c91aaf5307e414fbc27"; libraryHaskellDepends = [ base bytestring lens mtl opaleye postgresql-simple product-profunctors transformers @@ -102682,8 +102779,8 @@ self: { pname = "pandoc-csv2table"; version = "1.0.1"; sha256 = "0b872c518f3d3f1ca178e8a6cd2581f0a3b294cfd533e19fccd0fd95dcd79d2c"; - revision = "2"; - editedCabalFile = "522492bc433302f60262c0c9a19ccda171dd4eaec177f42fe75e471b79df1924"; + revision = "3"; + editedCabalFile = "4168dab7a87533c54ed9108ae6a65c71ec20642b85091d74b7dbf46b5c27b683"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base csv pandoc pandoc-types text ]; @@ -111010,8 +111107,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "quiver"; - version = "0.0.0.11"; - sha256 = "ca895a811d854e1e1e164a4f3988f3515deb2dc2220c0af6ee153b826aebb6df"; + version = "0.0.0.12"; + sha256 = "3ae4d76c2b4f4805b43ac6136c865142d3e847affb86e1e3dba6f9bb35e7bf04"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/zadarnowski/quiver"; description = "Quiver finite stream processing library"; @@ -111034,8 +111131,8 @@ self: { ({ mkDerivation, base, data-cell, quiver }: mkDerivation { pname = "quiver-cell"; - version = "0.0.0.2"; - sha256 = "4e95b819c71225ac76342ace1472c93ecadbc549aa2b6d08fffa5c5e250de182"; + version = "1.0.0"; + sha256 = "e806d29ffb46b80ddd21cca89de3c9d4606dbc30aad523fa9691ca05e12e0c51"; libraryHaskellDepends = [ base data-cell quiver ]; homepage = "https://github.com/zadarnowski/quiver-cell"; description = "Quiver combinators for cellular data processing"; @@ -112153,8 +112250,8 @@ self: { ({ mkDerivation, base, cabal-macosx, reactive-banana, wx, wxcore }: mkDerivation { pname = "reactive-banana-wx"; - version = "0.9.0.1"; - sha256 = "554e9d6715665a52e6395148749d9c1ec58db2cf8dfaa4944374a605072529ba"; + version = "0.9.0.2"; + sha256 = "ebb1b7e3eb6f973bd9922d27af64c94c28fc392655d2271c10b29a6c89ad3c5d"; configureFlags = [ "-f-buildexamples" ]; isLibrary = true; isExecutable = true; @@ -113308,10 +113405,8 @@ self: { }: mkDerivation { pname = "regex-tdfa"; - version = "1.2.0"; - sha256 = "fc82ac14aae378c543a55cdac3f944aae5bff9918c4a342e1da87d38ba4ef401"; - revision = "1"; - editedCabalFile = "5489b69b9f0e8e181ee5134fd500bb0e2b4f914234c5223c59186035fb50478e"; + version = "1.2.1"; + sha256 = "a38d305eeb78be2e34542b423e6a4763fbb8ad1df757aed01993785858c871a7"; libraryHaskellDepends = [ array base bytestring containers ghc-prim mtl parsec regex-base ]; @@ -119232,8 +119327,8 @@ self: { }: mkDerivation { pname = "servant"; - version = "0.4.4"; - sha256 = "d2b95b9f9b8173fe83d08166707d564b2cb60526493fc7b4099e09f9480a16ec"; + version = "0.4.4.2"; + sha256 = "fc5c80822fef28b63d8a63bd63efd0bdd86c7d13f06d1cc6e9b0768c4efe61aa"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-conversion case-insensitive http-media http-types network-uri @@ -119274,8 +119369,8 @@ self: { ({ mkDerivation, base, blaze-html, http-media, servant }: mkDerivation { pname = "servant-blaze"; - version = "0.4.4"; - sha256 = "1a94a0c0ffe7cd6ddb9bea99f31ee63a1dac538965fe03b3ecd75c068f7f1a90"; + version = "0.4.4.2"; + sha256 = "da58db6c24bb5360c3ee027061d7e9183667c1bdbde56d70f4f8e8fef982a47b"; libraryHaskellDepends = [ base blaze-html http-media servant ]; homepage = "http://haskell-servant.github.io/"; description = "Blaze-html support for servant"; @@ -119291,8 +119386,8 @@ self: { }: mkDerivation { pname = "servant-client"; - version = "0.4.4"; - sha256 = "7f1b8835bddbe8b1eafa6dee9dc780561ad851e9b68e8a5c16ea45b32ee2aa54"; + version = "0.4.4.2"; + sha256 = "d5b95b943215aa227f390c284f84043d7c0db2531416ff44511e0d209bc498c3"; libraryHaskellDepends = [ aeson attoparsec base bytestring either exceptions http-client http-client-tls http-media http-types network-uri safe servant @@ -119315,8 +119410,8 @@ self: { }: mkDerivation { pname = "servant-docs"; - version = "0.4.4"; - sha256 = "ccf92b38df3506b25e6fe93d7ded665db8c1cef76a73913afa72aa2e0d19e54e"; + version = "0.4.4.2"; + sha256 = "449ff2c953c4282f768c7d514f0c5a68e7d8541bde973d0ebe50372987355d90"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119369,8 +119464,8 @@ self: { }: mkDerivation { pname = "servant-examples"; - version = "0.4.4"; - sha256 = "d54bfef47474ef525285074008ec371df437891e7f2fa9473b9c6cc7f1a4f9e3"; + version = "0.4.4.2"; + sha256 = "76edea7d08e6ee4e5c41e2056f34353dd4033ba4a171008b92e1d34f1cbd146c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -119391,8 +119486,8 @@ self: { }: mkDerivation { pname = "servant-jquery"; - version = "0.4.4"; - sha256 = "6d5726b74ee4b83d84ab62d8f3af1afc0743715d9624056d97148a9ebb654212"; + version = "0.4.4.2"; + sha256 = "c807d103b47b4f7c31708deb92786171a9b7fce2314232400caf2be74b7225ad"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base charset lens servant text ]; @@ -119411,14 +119506,36 @@ self: { ({ mkDerivation, base, http-media, lucid, servant }: mkDerivation { pname = "servant-lucid"; - version = "0.4.4"; - sha256 = "19ae35c4e46b409388d58a9f8e926ea18c4bbe1a4819cebe3d7d4f195adbc9ef"; + version = "0.4.4.2"; + sha256 = "073cff7d8e1551d1300d9d5c74159f3a7912951ac1874080359406e6de9fed01"; libraryHaskellDepends = [ base http-media lucid servant ]; homepage = "http://haskell-servant.github.io/"; description = "Servant support for lucid"; license = stdenv.lib.licenses.bsd3; }) {}; + "servant-mock" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-types, QuickCheck + , servant, servant-server, transformers, wai, warp + }: + mkDerivation { + pname = "servant-mock"; + version = "0.4.4.2"; + sha256 = "d203424df5f2d0484f874f81ec98623c226ab89f5c232c3a884aa3b91230e7c6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring http-types QuickCheck servant servant-server + transformers wai + ]; + executableHaskellDepends = [ + aeson base QuickCheck servant-server warp + ]; + homepage = "http://github.com/haskell-servant/servant"; + description = "Derive a mock server for free from your servant API types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-pandoc" = callPackage ({ mkDerivation, base, bytestring, http-media, lens, pandoc-types , servant-docs, text, unordered-containers @@ -119508,8 +119625,8 @@ self: { }: mkDerivation { pname = "servant-server"; - version = "0.4.4.1"; - sha256 = "4889f732694a34232660660332cfd61b1e404f5adedd2b96a21a42dfdb51556a"; + version = "0.4.4.2"; + sha256 = "9c937f01f0ce3ae354097406e8617ee10bbcbd86513c5808b3c430ecba4f7fff"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122215,8 +122332,8 @@ self: { }: mkDerivation { pname = "sloane"; - version = "4.0.1"; - sha256 = "015cc227cab7e205c0684821138f36d4d38a9fee893fbf23d13add0e27ec19e9"; + version = "4.0.2"; + sha256 = "acac676c02d56269ea4360b6007473eabd7f36dbfdc3fb72c17b91350b8eaf8d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -125406,17 +125523,17 @@ self: { "squeeze" = callPackage ({ mkDerivation, base, Cabal, directory, factory, filepath, mtl - , QuickCheck, random, toolshed, unix + , QuickCheck, random, toolshed }: mkDerivation { pname = "squeeze"; - version = "1.0.4.5"; - sha256 = "9079a9e9163b27612c4625542bcd530766576e1d43e496c21cc42ffdbf3c6231"; + version = "1.0.4.7"; + sha256 = "f1961d7922ca1fb8839cc3d5c536d3b4c7e8aa81ddbb187655581e8e97bdb31a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base Cabal directory factory filepath mtl QuickCheck random - toolshed unix + toolshed ]; homepage = "http://functionalley.eu"; description = "A file-packing application"; @@ -127191,11 +127308,11 @@ self: { ({ mkDerivation, base, mmorph, mtl, transformers }: mkDerivation { pname = "streaming"; - version = "0.1.0.11"; - sha256 = "824351fc0c99bd5141ad4fef9db85032c5fb4d5cd745b9aca1490ea4dbfccf06"; + version = "0.1.0.15"; + sha256 = "8c9ade2b4353a397b77818223e367af22ec77f1ca137229f8009c947757b832f"; libraryHaskellDepends = [ base mmorph mtl transformers ]; homepage = "https://github.com/michaelt/streaming"; - description = "A free monad transformer optimized for streaming applications"; + description = "a free monad transformer optimized for streaming applications"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -127205,12 +127322,12 @@ self: { }: mkDerivation { pname = "streaming-bytestring"; - version = "0.1.0.2"; - sha256 = "cae7ee4205506ab7aa22904a4a055249f8225c5d6c4049313a09ce219ba98985"; + version = "0.1.0.4"; + sha256 = "6b1feca189bac886ca543c00e6952452a6a5033cc33d9ca13be52195dc9d9a42"; libraryHaskellDepends = [ base bytestring deepseq mmorph mtl streaming transformers ]; - description = "effectful bytestrings, or: lazy bytestring done right"; + description = "effectful byte steams, or: lazy bytestring done right"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -137503,8 +137620,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "universe-base"; - version = "1.0"; - sha256 = "8475cc6dcfd785e6e9baef146bba7b5aa372ff55311d75866acb1c0467ac0fae"; + version = "1.0.1"; + sha256 = "6de2abd6951f0ae4ef4704bace4117196a5224b4f59c69706424652ca9e474fa"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/dmwit/universe"; description = "A class for finite and recursively enumerable types and some helper functions for enumerating them"; @@ -137529,12 +137646,11 @@ self: { }: mkDerivation { pname = "universe-instances-extended"; - version = "1.0"; - sha256 = "f1ad69a7cbda23c870ebf501715297d2c30ddf6288e95fe1bd6283168d3d8a32"; + version = "1.0.0.1"; + sha256 = "665b272701b16a6bb8d40a5396aa1dcb038f002452ebdc29d353e3be2070c997"; libraryHaskellDepends = [ adjunctions base comonad universe-instances-base void ]; - jailbreak = true; homepage = "https://github.com/dmwit/universe"; description = "Universe instances for types from select extra packages"; license = stdenv.lib.licenses.bsd3; @@ -143134,6 +143250,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "woot" = callPackage + ({ mkDerivation, base, hspec, vector }: + mkDerivation { + pname = "woot"; + version = "0.0.0.0"; + sha256 = "891823fa0a134df0857cb371fa3e100a54c227ce29e428b6f6eeaf983e7b8fb0"; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ base hspec ]; + jailbreak = true; + homepage = "https://github.com/TGOlson/woot-haskell"; + description = "Real time group editor without operational transform"; + license = stdenv.lib.licenses.mit; + }) {}; + "word-trie" = callPackage ({ mkDerivation, base, binary, containers, hspec, QuickCheck }: mkDerivation { @@ -144955,6 +145085,11 @@ self: { base containers directory extensible-exceptions filepath mtl process unix utf8-string X11 ]; + postInstall = '' + shopt -s globstar + mkdir -p $out/share/man/man1 + mv "$out/"**"/man/"*.1 $out/share/man/man1/ + ''; homepage = "http://xmonad.org"; description = "A tiling window manager"; license = stdenv.lib.licenses.bsd3; @@ -145591,8 +145726,8 @@ self: { }: mkDerivation { pname = "yaml"; - version = "0.8.13"; - sha256 = "f366bdd6ddbc5f94f3f783b502178dcd27afc257bdf5e8d67fcf9246aeed0f7a"; + version = "0.8.14"; + sha256 = "f40d2c54dd4be0616e1dde897c7388cdb5882f0f7545b37bb3c966fc96bcf69a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -148139,6 +148274,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {gomp = null; inherit (pkgs) z3;}; + "zalgo" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "zalgo"; + version = "0.1.0.3"; + sha256 = "74f376016d855eee365ad3d9d7ef1fb42106fbf0d302c918dce26f676b243b2f"; + libraryHaskellDepends = [ base ]; + homepage = "http://github.com/mniip/zalgo"; + description = "Z-algorithm implemented on haskell's built-in cons-cell-based lists"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "zampolit" = callPackage ({ mkDerivation, base, cmdargs, containers, directory, filepath , HSH, MissingH, old-locale, parsec, time diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index f635e0f149b..cef143e309a 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, pam ? null, x11 }: +{ stdenv, lib, fetchurl, pam ? null, autoreconfHook +, libX11, libXext, libXinerama, libXdmcp, libXt }: stdenv.mkDerivation rec { @@ -9,37 +10,26 @@ stdenv.mkDerivation rec { }; # Optionally, it can use GTK+. - buildInputs = [ pam x11 ]; + buildInputs = [ pam libX11 libXext libXinerama libXdmcp libXt ]; + + nativeBuildInputs = [ autoreconfHook ]; # Don't try to install `xlock' setuid. Password authentication works # fine via PAM without super user privileges. configureFlags = - " --with-crypt" - + " --enable-appdefaultdir=$out/share/X11/app-defaults" - + " --disable-setuid" - + " --without-editres" - + " --without-xpm" - + " --without-gltt" - + " --without-ttf" - + " --without-ftgl" - + " --without-freetype" - + " --without-opengl" - + " --without-mesa" - + " --without-dtsaver" - + " --without-ext" - + " --without-dpms" - + " --without-xinerama" - + " --without-rplay" - + " --without-nas" - + " --without-gtk2" - + " --without-gtk" - + (if pam != null then " --enable-pam --enable-bad-pam" else " --disable-pam"); + [ "--disable-setuid" + ] ++ (lib.optional (pam != null) "--enable-pam"); - preConfigure = '' - configureFlags+=" --enable-appdefaultdir=$out/share/X11/app-defaults" - ''; + postPatch = + let makePath = p: lib.concatMapStringsSep " " (x: x + "/" + p) buildInputs; + inputs = "${makePath "lib"} ${makePath "include"}"; + in '' + sed -i 's,\(for ac_dir in\),\1 ${inputs},' configure.ac + sed -i 's,/usr/,/no-such-dir/,g' configure.ac + configureFlags+=" --enable-appdefaultdir=$out/share/X11/app-defaults" + ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Screen locker for the X Window System"; homepage = http://www.tux.org/~bagleyd/xlockmore.html; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/freefall/default.nix b/pkgs/os-specific/linux/freefall/default.nix index 34d0f3881e4..683ec9f6155 100644 --- a/pkgs/os-specific/linux/freefall/default.nix +++ b/pkgs/os-specific/linux/freefall/default.nix @@ -1,39 +1,33 @@ { stdenv, fetchurl }: -let version = "3.19"; in +let version = "4.2"; in stdenv.mkDerivation { name = "freefall-${version}"; src = fetchurl { - sha256 = "0v40b5l6dcviqgl47bxlcbimz7kawmy1c2909axi441jwlgm2hmy"; - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "1syv8n5hwzdbx69rsj4vayyzskfq1w5laalg5jjd523my52f086g"; + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; }; - buildPhase = '' - cd Documentation/laptops + postPatch = '' + cd tools/laptop/freefall # Default time-out is a little low, probably because the AC/lid status # functions were never implemented. Because no-one still uses HDDs, right? - substituteInPlace freefall.c --replace "alarm(2)" "alarm(5)" - - cc -o freefall freefall.c + substituteInPlace freefall.c --replace "alarm(2)" "alarm(7)" ''; - installPhase = '' - mkdir -p $out/bin - install freefall $out/bin - ''; + makeFlags = "PREFIX=$(out)"; meta = with stdenv.lib; { description = "Free-fall protection for spinning HP/Dell laptop hard drives"; longDescription = '' - ATA/ATAPI-7 specifies the IDLE IMMEDIATE command with unload feature. - Issuing this command should cause the drive to switch to idle mode and - unload disk heads. This feature is being used in modern laptops in - conjunction with accelerometers and appropriate software to implement - a shock protection facility. The idea is to stop all I/O operations on - the internal hard drive and park its heads on the ramp when critical - situations are anticipated. This has no effect on SSD devices! + Provides a shock protection facility in modern laptops with spinning hard + drives, by stopping all input/output operations on the internal hard drive + and parking its heads on the ramp when critical situations are anticipated. + Requires support for the ATA/ATAPI-7 IDLE IMMEDIATE command with unload + feature, which should cause the drive to switch to idle mode and unload the + disk heads, and an accelerometer device. It has no effect on SSD devices! ''; license = licenses.gpl2; platforms = with platforms; linux; diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix index 4c47047ff74..dd5a2741267 100644 --- a/pkgs/os-specific/linux/phc-intel/default.nix +++ b/pkgs/os-specific/linux/phc-intel/default.nix @@ -2,20 +2,41 @@ assert stdenv.isLinux; # Don't bother with older versions, though some would probably work: -assert stdenv.lib.versionAtLeast kernel.version "4.0"; +assert stdenv.lib.versionAtLeast kernel.version "4.2"; # Disable on grsecurity kernels, which break module building: assert !kernel.features ? grsecurity; -let version = "0.4.0-rev17"; in -stdenv.mkDerivation { +let + release = "0.4.0"; + revbump = "rev18"; # don't forget to change forum download id... + version = "${release}-${revbump}"; +in stdenv.mkDerivation { name = "linux-phc-intel-${version}-${kernel.version}"; src = fetchurl { - sha256 = "1fdfpghnsa5s98lisd2sn0vplrq0n54l0pkyyzkyb77z4fa6bs4p"; - url = "http://www.linux-phc.org/forum/download/file.php?id=166"; - name = "phc-intel-pack-rev17.tar.bz2"; + sha256 = "1480y75yid4nw7dhzm97yb10dykinzjz34abvavsrqpq7qclhv27"; + url = "http://www.linux-phc.org/forum/download/file.php?id=167"; + name = "phc-intel-pack-${revbump}.tar.bz2"; }; + buildInputs = [ which ]; + + makeFlags = with kernel; [ + "DESTDIR=$(out)" + "KERNELSRC=${dev}/lib/modules/${modDirVersion}/build" + ]; + + configurePhase = '' + make $makeFlags brave + ''; + + enableParallelBuilding = false; + + installPhase = '' + install -m 755 -d $out/lib/modules/${kernel.version}/extra/ + install -m 644 *.ko $out/lib/modules/${kernel.version}/extra/ + ''; + meta = with stdenv.lib; { inherit version; description = "Undervolting kernel driver for Intel processors"; @@ -28,22 +49,7 @@ stdenv.mkDerivation { homepage = http://www.linux-phc.org/; downloadPage = "http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267"; license = licenses.gpl2; - platforms = with platforms; linux; + platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; }; - - buildInputs = [ which ]; - - makeFlags = "KERNELSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build DESTDIR=$(out)"; - - configurePhase = '' - echo make $makeFlags brave - ''; - - enableParallelBuilding = false; - - installPhase = '' - install -m 755 -d $out/lib/modules/${kernel.version}/extra/ - install -m 644 *.ko $out/lib/modules/${kernel.version}/extra/ - ''; } diff --git a/pkgs/tools/filesystems/reiser4progs/default.nix b/pkgs/tools/filesystems/reiser4progs/default.nix index 7dfbbf66c0a..662ceba03b8 100644 --- a/pkgs/tools/filesystems/reiser4progs/default.nix +++ b/pkgs/tools/filesystems/reiser4progs/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, libaal}: -let version = "1.0.9"; in +let version = "1.1.0"; in stdenv.mkDerivation rec { name = "reiser4progs-${version}"; src = fetchurl { url = "mirror://sourceforge/reiser4/reiser4-utils/${name}.tar.gz"; - sha256 = "0d6djyd7wjvzbqj738b2z4jr5c2s30g8q8xygipyi0007g42gc7z"; + sha256 = "18bgv0wd75q53642x5dsk4g0mil1hw1zrp7a4xkb0pxx4bzjlbqg"; }; buildInputs = [libaal]; diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index a64b7f55003..97d70d1a45b 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -6,18 +6,18 @@ let p = if stdenv.is64bit then { arch = "x86_64"; gcclib = "${stdenv.cc.cc}/lib64"; - sha256 = "061kl186vllqhl1443d9cwvp4qdhqc42yf3x72a1w0bjvn0i3z1i"; + sha256 = "08mmjz061b0hrqp8zg31w089n5bk3sq4r3w84zr33d8pnvkgq2wk"; } else { arch = "i386"; gcclib = "${stdenv.cc.cc}/lib"; - sha256 = "1l9mxlin41w83dn70cvdk1n1vn1dll3d8r120jkqn5jfhicrgvv3"; + sha256 = "1zb6cnldd43nr4k2qg9hnrkgj0iik2gpxqrjypbhwv75hnvjma93"; }; in stdenv.mkDerivation rec { name = "yandex-disk-${version}"; - version = "0.1.5.870"; + version = "0.1.5.905"; src = fetchurl { url = "http://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm"; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://help.yandex.com/disk/cli-clients.xml; description = "A free cloud file storage service"; - maintainers = with stdenv.lib.maintainers; [smironov]; + maintainers = with stdenv.lib.maintainers; [ smironov jagajaga ]; platforms = ["i686-linux" "x86_64-linux"]; license = stdenv.lib.licenses.unfree; longDescription = '' diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index f8925d26bea..b6158ab6445 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -1,30 +1,50 @@ {stdenv, fetchurl, perl, CryptSSLeay, LWP, unzip, xz, dpkg, TimeDate, DBFile , FileDesktopEntry, libxslt, docbook_xsl, python3, setuptools, makeWrapper -, perlPackages +, perlPackages, curl, gnupg, diffutils +, sendmailPath ? "/var/setuid-wrappers/sendmail" }: + stdenv.mkDerivation rec { - version = "2.15.4"; + version = "2.15.8"; name = "debian-devscripts-${version}"; + src = fetchurl { url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz"; - sha256 = "03ldbx07ga9df7z9yiq6grb6cms1dr8hlbis2hvbmfcs6gcr3q72"; + sha256 = "1zw7phaigncblxb3jp4m8pk165hylk1f088k51nhj9d7z5iz6bbx"; }; + buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile FileDesktopEntry libxslt python3 setuptools makeWrapper - perlPackages.ParseDebControl ]; + perlPackages.ParseDebControl perlPackages.LWPProtocolHttps + curl gnupg diffutils ]; + preConfigure = '' export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${dpkg}"; - sed -e "s@/usr/share/sgml/[^ ]*/manpages/docbook.xsl@${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl@" -i scripts/Makefile - sed -e 's/ translated_manpages//; s/--install-layout=deb//; s@--root="[^ ]*"@--prefix="'"$out"'"@' -i Makefile */Makefile tgtpy="$out/lib/${python3.libPrefix}/site-packages" mkdir -p "$tgtpy" export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$tgtpy" - sed -re "s@/usr( |$|/)@$out\\1@" -i Makefile* */Makefile* - sed -re "s@/etc( |$|/)@$out/etc\\1@" -i Makefile* */Makefile* - - # Completion currently spams every shell startup with an error. Disable for now: - sed "/\/bash_completion\.d/d" -i scripts/Makefile + find po4a scripts -type f -exec sed -r \ + -e "s@/usr/bin/gpg(2|)@${gnupg}/bin/gpg2@g" \ + -e "s@/usr/(s|)bin/sendmail@${sendmailPath}@g" \ + -e "s@/usr/bin/diff@${diffutils}/bin/diff@g" \ + -e "s@/usr/bin/gpgv(2|)@${gnupg}/bin/gpgv2@g" \ + -e "s@(command -v|/usr/bin/)curl@${curl}/bin/curl@g" \ + -i {} + + sed -e "s@/usr/share/sgml/[^ ]*/manpages/docbook.xsl@${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl@" -i scripts/Makefile + sed -r \ + -e "s@/usr( |$|/)@$out\\1@g" \ + -e "s@/etc( |$|/)@$out/etc\\1@g" \ + -e 's/ translated_manpages//; s/--install-layout=deb//; s@--root="[^ ]*"@--prefix="'"$out"'"@' \ + -i Makefile* */Makefile* ''; + + makeFlags = [ + "DESTDIR=$(out)" + "PREFIX=" + "COMPL_DIR=/share/bash-completion/completions" + "PERLMOD_DIR=/share/devscripts" + ]; + postInstall = '' sed -re 's@(^|[ !`"])/bin/bash@\1${stdenv.shell}@g' -i "$out/bin"/* for i in "$out/bin"/*; do @@ -34,9 +54,10 @@ stdenv.mkDerivation rec { --prefix PYTHONPATH : "$out/lib/python3.4/site-packages" done ''; - meta = { + + meta = with stdenv.lib; { description = ''Debian package maintenance scripts''; - license = "GPL (various)"; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO - maintainers = with stdenv.lib.maintainers; [raskin]; + license = licenses.free; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO + maintainers = with maintainers; [raskin]; }; } diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index 25e4a2cb3ad..75e4155c61d 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "connman-${version}"; - version = "1.28"; + version = "1.30"; src = fetchgit { url = "git://git.kernel.org/pub/scm/network/connman/connman.git"; rev = "refs/tags/${version}"; - sha256 = "13c374bfj7dzlx7zvnnigmk0ck5cy601aqi18n77mcrq9yyxw5y9"; + sha256 = "715474351e22b52334d37c146fd5eb87d692be8501d8dac33a0e330437235295"; }; buildInputs = [ autoconf automake libtool pkgconfig openconnect polkit diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index b2bf65ff9ee..5b95dd159bf 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "openvpn-2.3.8"; + name = "openvpn-2.3.7"; src = fetchurl { url = "http://swupdate.openvpn.net/community/releases/${name}.tar.gz"; - sha256 = "0lbw22qv3m0axhs13razr6b4x1p7jcpvf9rzb15b850wyvpka92k"; + sha256 = "0vhl0ddpxqfibc0ah0ci7ix9bs0cn5shhmhijg550qpbdb6s80hz"; }; patches = optional stdenv.isLinux ./systemd-notify.patch; @@ -21,11 +21,6 @@ stdenv.mkDerivation rec { IPROUTE=${iproute}/sbin/ip ''; - preConfigure = '' - substituteInPlace ./src/openvpn/console.c \ - --replace /bin/systemd-ask-password /run/current-system/sw/bin/systemd-ask-password - ''; - postInstall = '' mkdir -p $out/share/doc/openvpn/examples cp -r sample/sample-config-files/ $out/share/doc/openvpn/examples diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 022b8dfc2ca..2357ec77f12 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper }: -let version = "1.18.1"; in +let version = "1.18.2"; in stdenv.mkDerivation { name = "dpkg-${version}"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "1nlr0djn5zl9cmlcxxmd7dk3fx0zw9gi4qm7cfz0r5qwl9yaj9nb"; + sha256 = "192pqjd0c7i91kiqzn3cq2sqp5vivf0079i0wybdc9yhfcm4yj0i"; }; postPatch = '' @@ -20,10 +20,10 @@ stdenv.mkDerivation { configureFlags = "--disable-dselect --with-admindir=/var/lib/dpkg PERL_LIBDIR=$(out)/${perl.libPrefix}"; preConfigure = '' - # Nice: dpkg has a circular dependency on itself. Its configure + # Nice: dpkg has a circular dependency on itself. Its configure # script calls scripts/dpkg-architecture, which calls "dpkg" in - # $PATH. It doesn't actually use its result, but fails if it - # isn't present. So make a dummy available. + # $PATH. It doesn't actually use its result, but fails if it + # isn't present, so make a dummy available. touch $TMPDIR/dpkg chmod +x $TMPDIR/dpkg PATH=$TMPDIR:$PATH diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 7075b03bdfa..c2842ae2e75 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, intltool, glib, pkgconfig, polkit, python, sqlite }: -let version = "1.0.7"; in +let version = "1.0.8"; in stdenv.mkDerivation { name = "packagekit-${version}"; src = fetchurl { - sha256 = "0klwr0y3a72xpz6bwv4afbk3vvx5r1av5idhz3mx4p9ssnscb1mi"; + sha256 = "1vaxn4kwdwx6p03n88k4pnbd2l6lb0cbxpcs88kjack1jml17c3l"; url = "http://www.freedesktop.org/software/PackageKit/releases/PackageKit-${version}.tar.xz"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27b24ece369..e97fdcd505b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2787,6 +2787,8 @@ let ocz-ssd-guru = callPackage ../tools/misc/ocz-ssd-guru { }; + qalculate-gtk = callPackage ../applications/science/math/qalculate-gtk { }; + qastools = callPackage ../tools/audio/qastools { qt = qt4; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 43fc9976ec7..cb8c53ad06c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -31,10 +31,7 @@ rec { ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix ({ ghc = compiler.ghc742Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin { libiconv = pkgs.darwin.libiconv; }); - ghc7101 = callPackage ../development/compilers/ghc/7.10.1.nix ({ ghc = compiler.ghc784; } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); - ghc7102 = callPackage ../development/compilers/ghc/7.10.2.nix ({ ghc = compiler.ghc784; } // stdenv.lib.optionalAttrs stdenv.isDarwin { + ghc7102 = callPackage ../development/compilers/ghc/7.10.2.nix ({ ghc = compiler.ghc784; inherit (packages.ghc784) hscolour; } // stdenv.lib.optionalAttrs stdenv.isDarwin { libiconv = pkgs.darwin.libiconv; }); ghcHEAD = callPackage ../development/compilers/ghc/head.nix ({ inherit (packages.ghc784) ghc alex happy; } // stdenv.lib.optionalAttrs stdenv.isDarwin { @@ -86,10 +83,6 @@ rec { ghc = compiler.ghc784; packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { }; }; - ghc7101 = callPackage ../development/haskell-modules { - ghc = compiler.ghc7101; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; - }; ghc7102 = callPackage ../development/haskell-modules { ghc = compiler.ghc7102; packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 12e4eab751f..ec3d1ae7df5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9543,10 +9543,10 @@ let pgcli = buildPythonPackage rec { name = "pgcli-${version}"; - version = "0.19.1"; + version = "0.19.2"; src = pkgs.fetchFromGitHub { - sha256 = "1r34bbqbd4h72cl0cxi9w6q2nwx806wpxq220mzyiy8g45xv0ghj"; + sha256 = "1xl3yqwksnszd2vcgzb576m56613qcl82jfqmb9fbvcqlcpks6ln"; rev = "v${version}"; repo = "pgcli"; owner = "dbcli"; @@ -9556,10 +9556,6 @@ let click configobj prompt_toolkit psycopg2 pygments sqlparse ]; - postPatch = '' - substituteInPlace setup.py --replace "==" ">=" - ''; - meta = { inherit version; description = "Command-line interface for PostgreSQL"; @@ -9575,17 +9571,17 @@ let mycli = buildPythonPackage rec { name = "mycli-${version}"; - version = "1.3.0"; + version = "1.4.0"; src = pkgs.fetchFromGitHub { - sha256 = "109jz84m29v4fjhk2ngsfc1b6zw4w6dbjlr2izvib63ylcz7b5nh"; + sha256 = "175jcfixjkq17fbda9kifbljfd5iwjpjisvhs5xhxsyf6n5ykv2l"; rev = "v${version}"; repo = "mycli"; owner = "dbcli"; }; propagatedBuildInputs = with self; [ - pymysql configobj sqlparse prompt_toolkit0_45 pygments click + pymysql configobj sqlparse prompt_toolkit pygments click ]; meta = { @@ -9917,36 +9913,10 @@ let prompt_toolkit = buildPythonPackage rec { name = "prompt_toolkit-${version}"; - version = "0.47"; - - src = pkgs.fetchurl { - sha256 = "1xkrbz7d2mzd5r5a8aqbnhym57fkpri9x73cql5vb573glzwddla"; - url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz"; - }; - - buildInputs = with self; [ jedi ipython pygments ]; - propagatedBuildInputs = with self; [ docopt six wcwidth ]; - - meta = { - description = "Python library for building powerful interactive command lines"; - longDescription = '' - prompt_toolkit could be a replacement for readline, but it can be - much more than that. It is cross-platform, everything that you build - with it should run fine on both Unix and Windows systems. Also ships - with a nice interactive Python shell (called ptpython) built on top. - ''; - homepage = https://github.com/jonathanslenders/python-prompt-toolkit; - license = licenses.bsd3; - maintainers = with maintainers; [ nckx ]; - }; - }; - - prompt_toolkit0_45 = buildPythonPackage rec { - name = "prompt_toolkit-${version}"; - version = "0.45"; + version = "0.46"; src = pkgs.fetchurl { - sha256 = "19lp15rc0rq4jqaacg2a38cdgfy2avhf5v97yanasx4n2swx4gsm"; + sha256 = "1yq9nis1b2rgpndi2rqh4divf6j22jjva83r5z8jf7iffywmr8hs"; url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz"; }; @@ -13527,11 +13497,11 @@ let sqlparse = buildPythonPackage rec { name = "sqlparse-${version}"; - version = "0.1.14"; + version = "0.1.16"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/sqlparse/${name}.tar.gz"; - sha256 = "1w6shyh7n139cp636sym0frdyiwybw1m7gd2l4s3d7xbaccf6qg5"; + sha256 = "108gy82x7davjrn3jqn7yv4r5v4jrzp892ysfx8l00abr8v6r337"; }; meta = { |