diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-23 16:01:05 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-23 16:01:05 -0400 |
| commit | e5175fbf2083adcf6ea740dfba3d6add27b0c8e7 (patch) | |
| tree | ea54aa965de3fb81ebe00fc22e26f12e36a95bf5 /pkgs | |
| parent | 895fef2b19db36e841175b934ffed1297a961ffd (diff) | |
| parent | 78319bd948efc53b94bf942b155a8bc4060d5a08 (diff) | |
| download | nixpkgs-e5175fbf2083adcf6ea740dfba3d6add27b0c8e7.tar nixpkgs-e5175fbf2083adcf6ea740dfba3d6add27b0c8e7.tar.gz nixpkgs-e5175fbf2083adcf6ea740dfba3d6add27b0c8e7.tar.bz2 nixpkgs-e5175fbf2083adcf6ea740dfba3d6add27b0c8e7.tar.lz nixpkgs-e5175fbf2083adcf6ea740dfba3d6add27b0c8e7.tar.xz nixpkgs-e5175fbf2083adcf6ea740dfba3d6add27b0c8e7.tar.zst nixpkgs-e5175fbf2083adcf6ea740dfba3d6add27b0c8e7.zip | |
Merge remote-tracking branch 'upstream/master' into ios-mini-staging
Diffstat (limited to 'pkgs')
23 files changed, 800 insertions, 1238 deletions
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 2de973d41f6..5c882738a0b 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -250,12 +250,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2018.1.2"; /* updated by script */ + version = "2018.1.3"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "12rihb1ppl4i1i0j3yj4ih4qx3xf30kfx022pbvng1rjy0bpikp7"; /* updated by script */ + sha256 = "0y959p9jsfqlf6cnj2k5m4bxc85yn5lv549rbacwicx4f0g6zp6r"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "datagrip_2018_1"; @@ -263,12 +263,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2018.1.2"; /* updated by script */ + version = "2018.1.3"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "1qhhxarvw6mzavyzackzkbq52yfr5437gljxdvlbr6rpi99hgfzb"; /* updated by script */ + sha256 = "02nl6dssf2r4lk0fy40cvgm1m0nnfvaz2k6yygwzr35qmbsw2xjq"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "goland_release"; @@ -302,12 +302,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2018.1.2"; /* updated by script */ + version = "2018.1.4"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "13si8g7n1qvjm5ivbrazsbqlvwwlg65nia78k74nkaqp704z92cs"; /* updated by script */ + sha256 = "0rrcsn44va942nrznldjkxymir45q8gq1lf3f8vg1w3k87cfk1zp"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PS2018.1"; @@ -315,12 +315,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2018.1.2"; /* updated by script */ + version = "2018.1.3"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1phxzsz2qnyk0b0kkccsgjkxx4ak7rbm68k1lpgr59rwyxqnazy3"; /* updated by script */ + sha256 = "1cwrqdcp6hwr8wd234g120bblc4bjmhwxwsgj9mmxblj31c7c6an"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm_Release"; @@ -328,12 +328,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2018.1.2"; /* updated by script */ + version = "2018.1.3"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "08cfmrrmxs67dc61cvjc0ynzng0hnr2i78fv3m888k4x63cy6mv5"; /* updated by script */ + sha256 = "1chri4cknfvvqhxy973dyf7dl5linqdxc97zshrzdqhmwq6y7580"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm_Release"; @@ -341,25 +341,25 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2017.3.1"; /* updated by script */ + version = "2018.1"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = stdenv.lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/resharper/JetBrains.Rider-${version}.tar.gz"; - sha256 = "0k9yc00lmk826pylfs9jyxqnlczk9vhq7bs61b8nyfam1dqbgikv"; /* updated by script */ + url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; + sha256 = "0jhzfi9r18hy6mig8rrrr2n55lrfn5ysa7h347w5yv2dm7kx09ib"; /* updated by script */ }; wmClass = "jetbrains-rider"; - update-channel = "rider_2017_3"; + update-channel = "rider_2018_1"; }; ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2018.1.2"; /* updated by script */ + version = "2018.1.3"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "0bnzn811rmgn0kig3mzbwgx85490dqg4sg3pmmmk20n8hcph8zca"; /* updated by script */ + sha256 = "033rjsx6zjrfbl89i513ms14iw53ip56h4bkilrij32hshb7c2c5"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "rm2018.1"; diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index acd79859901..280a42fde14 100644 --- a/pkgs/applications/misc/sc-im/default.nix +++ b/pkgs/applications/misc/sc-im/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { description = "SC-IM - Spreadsheet Calculator Improvised - SC fork"; license = licenses.bsdOriginal; maintainers = [ ]; - platforms = platforms.linux; # Cannot test others + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix new file mode 100644 index 00000000000..505afd25d04 --- /dev/null +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala_0_40, gettext +, appstream-glib, desktop-file-utils, glibcLocales, wrapGAppsHook +, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite +}: + +let + pname = "FeedReader"; + version = "2.2"; +in stdenv.mkDerivation { + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "jangernert"; + repo = pname; + rev = "v" + version; + sha256 = "17588hsa7xv92ba55kmbyvnijypp373yrly48kbc391wadp1z939"; + }; + + nativeBuildInputs = [ + meson ninja pkgconfig vala_0_40 gettext appstream-glib desktop-file-utils + glibcLocales wrapGAppsHook + ]; + + buildInputs = [ + curl glib json-glib libnotify libsecret sqlite + ] ++ (with gnome3; [ + gtk libgee libpeas libsoup rest webkitgtk gnome_online_accounts + gsettings_desktop_schemas + ]) ++ (with gst_all_1; [ + gstreamer gst-plugins-base gst-plugins-good + ]); + + # TODO: fix https://github.com/NixOS/nixpkgs/issues/39547 + LIBRARY_PATH = stdenv.lib.makeLibraryPath [ curl ]; + + # vcs_tag function fails with UnicodeDecodeError + LC_ALL = "en_US.UTF-8"; + + postPatch = '' + patchShebangs meson_post_install.py + ''; + + meta = with stdenv.lib; { + description = "A modern desktop application designed to complement existing web-based RSS accounts."; + homepage = https://jangernert.github.io/FeedReader/; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ edwtjo ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 33b458ba30a..956bfe1d811 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -15,11 +15,13 @@ stdenv.mkDerivation { # that is supposed to work without Fortran but didn't for me. patches = [ ./CMakeLists.txt.patch ]; - buildInputs = [ cmake blas liblapack gfortran gmm fltk libjpeg zlib libGLU_combined + buildInputs = [ cmake blas liblapack gmm fltk libjpeg zlib libGLU_combined libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE ]; + nativeBuildInputs = [ gfortran ]; + enableParallelBuilding = true; meta = { diff --git a/pkgs/build-support/nix-prefetch-github/default.nix b/pkgs/build-support/nix-prefetch-github/default.nix new file mode 100644 index 00000000000..48297e583af --- /dev/null +++ b/pkgs/build-support/nix-prefetch-github/default.nix @@ -0,0 +1,30 @@ +{ python3 +, fetchFromGitHub +, stdenv +}: + +python3.pkgs.buildPythonApplication rec { + pname = "nix-prefetch-github"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "seppeljordan"; + repo = "nix-prefetch-github"; + rev = "${version}"; + sha256 = "1rinbv1q4q8m27ih6l81w1lsmwn6cz7q3iyjiycklywpi8684dh6"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + attrs + click + effect + jinja2 + requests + ]; + meta = with stdenv.lib; { + description = "Prefetch sources from github"; + homepage = https://github.com/seppeljordan/nix-prefetch-github; + license = licenses.gpl3; + maintainers = [ maintainers.seppeljordan ]; + }; +} diff --git a/pkgs/development/compilers/llvm/3.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix index 8f73645afc0..4e1a0ef6409 100644 --- a/pkgs/development/compilers/llvm/3.7/default.nix +++ b/pkgs/development/compilers/llvm/3.7/default.nix @@ -1,12 +1,10 @@ { newScope, stdenv, libstdcxxHook, cmake, libxml2, python2, isl, fetchurl , overrideCC, wrapCCWith, darwin -, buildLlvmPackages # ourself, but from the previous stage, for cross -, targetLlvmPackages # ourself, but from the next stage, for cross +, buildLlvmTools # tools, but from the previous stage, for cross +, targetLlvmLibraries # libraries, but from the next stage, for cross }: let - callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl version fetch; }); - version = "3.7.1"; fetch = fetch_v version; @@ -18,41 +16,44 @@ let compiler-rt_src = fetch "compiler-rt" "10c1mz2q4bdq9bqfgr3dirc6hz1h3sq8573srd5q5lr7m7j6jiwx"; clang-tools-extra_src = fetch "clang-tools-extra" "0sxw2l3q5msbrwxv1ck72arggdw6n5ysi929gi69ikniranfv4aa"; - self = { + tools = let + callPackage = newScope (tools // { inherit stdenv isl version fetch; }); + in { llvm = callPackage ./llvm.nix { - inherit compiler-rt_src stdenv; + inherit compiler-rt_src; + inherit (targetLlvmLibraries) libcxxabi; }; clang-unwrapped = callPackage ./clang { - inherit clang-tools-extra_src stdenv; + inherit clang-tools-extra_src; }; - clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; + clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang; libstdcxxClang = wrapCCWith { - cc = self.clang-unwrapped; + cc = tools.clang-unwrapped; extraPackages = [ libstdcxxHook ]; }; libcxxClang = wrapCCWith { - cc = self.clang-unwrapped; - extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ]; + cc = tools.clang-unwrapped; + extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ]; }; - stdenv = stdenv.override (drv: { - allowedRequisites = null; - cc = self.clang; - }); + lldb = callPackage ./lldb.nix {}; + }; + + libraries = let + callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; }); + in { - libcxxStdenv = stdenv.override (drv: { - allowedRequisites = null; - cc = buildLlvmPackages.libcxxClang; - }); + stdenv = overrideCC stdenv buildLlvmTools.clang; - lldb = callPackage ./lldb.nix {}; + libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; libcxx = callPackage ./libc++ {}; libcxxabi = callPackage ./libc++abi.nix {}; }; -in self + +in { inherit tools libraries; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/3.8/default.nix b/pkgs/development/compilers/llvm/3.8/default.nix index a5f3b775951..6fa1a0cf2e2 100644 --- a/pkgs/development/compilers/llvm/3.8/default.nix +++ b/pkgs/development/compilers/llvm/3.8/default.nix @@ -1,11 +1,9 @@ { newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin -, buildLlvmPackages # ourself, but from the previous stage, for cross -, targetLlvmPackages # ourself, but from the next stage, for cross +, buildLlvmTools # tools, but from the previous stage, for cross +, targetLlvmLibraries # libraries, but from the next stage, for cross }: let - callPackage = newScope (self // { inherit stdenv isl version fetch; }); - version = "3.8.1"; fetch = fetch_v version; @@ -17,43 +15,46 @@ let compiler-rt_src = fetch "compiler-rt" "0p0y85c7izndbpg2l816z7z7558axq11d5pwkm4h11sdw7d13w0d"; clang-tools-extra_src = fetch "clang-tools-extra" "15n39r4ssphpaq4a0wzyjm7ilwxb0bch6nrapy8c5s8d49h5qjk6"; - self = { + tools = let + callPackage = newScope (tools // { inherit stdenv isl version fetch; }); + in { llvm = callPackage ./llvm.nix { - inherit compiler-rt_src stdenv; + inherit compiler-rt_src; + inherit (targetLlvmLibraries) libcxxabi; }; clang-unwrapped = callPackage ./clang { - inherit clang-tools-extra_src stdenv; + inherit clang-tools-extra_src; }; - libclang = self.clang-unwrapped.lib; + libclang = tools.clang-unwrapped.lib; - clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; + clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang; libstdcxxClang = wrapCCWith { - cc = self.clang-unwrapped; + cc = tools.clang-unwrapped; extraPackages = [ libstdcxxHook ]; }; libcxxClang = wrapCCWith { - cc = self.clang-unwrapped; - extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ]; + cc = tools.clang-unwrapped; + extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ]; }; - stdenv = stdenv.override (drv: { - allowedRequisites = null; - cc = self.clang; - }); + lldb = callPackage ./lldb.nix {}; + }; + + libraries = let + callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; }); + in { - libcxxStdenv = stdenv.override (drv: { - allowedRequisites = null; - cc = buildLlvmPackages.libcxxClang; - }); + stdenv = overrideCC stdenv buildLlvmTools.clang; - lldb = callPackage ./lldb.nix {}; + libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; libcxx = callPackage ./libc++ {}; libcxxabi = callPackage ./libc++abi.nix {}; }; -in self + +in { inherit tools libraries; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix index 4b69996473d..c3bf0b48d64 100644 --- a/pkgs/development/compilers/llvm/3.9/default.nix +++ b/pkgs/development/compilers/llvm/3.9/default.nix @@ -1,11 +1,9 @@ { newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin -, buildLlvmPackages # ourself, but from the previous stage, for cross -, targetLlvmPackages # ourself, but from the next stage, for cross +, buildLlvmTools # tools, but from the previous stage, for cross +, targetLlvmLibraries # libraries, but from the next stage, for cross }: let - callPackage = newScope (self // { inherit stdenv isl version fetch; }); - version = "3.9.1"; fetch = fetch_v version; @@ -17,43 +15,46 @@ let compiler-rt_src = fetch "compiler-rt" "16gc2gdmp5c800qvydrdhsp0bzb97s8wrakl6i8a4lgslnqnf2fk"; clang-tools-extra_src = fetch "clang-tools-extra" "0d9nh7j7brbh9avigcn69dlaihsl9p3cf9s45mw6fxzzvrdvd999"; - self = { + tools = let + callPackage = newScope (tools // { inherit stdenv isl version fetch; }); + in { llvm = callPackage ./llvm.nix { - inherit compiler-rt_src stdenv; + inherit compiler-rt_src; + inherit (targetLlvmLibraries) libcxxabi; }; clang-unwrapped = callPackage ./clang { - inherit clang-tools-extra_src stdenv; + inherit clang-tools-extra_src; }; - libclang = self.clang-unwrapped.lib; + libclang = tools.clang-unwrapped.lib; - clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; + clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang; libstdcxxClang = wrapCCWith { - cc = self.clang-unwrapped; + cc = tools.clang-unwrapped; extraPackages = [ libstdcxxHook ]; }; libcxxClang = wrapCCWith { - cc = self.clang-unwrapped; - extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ]; + cc = tools.clang-unwrapped; + extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ]; }; - stdenv = stdenv.override (drv: { - allowedRequisites = null; - cc = self.clang; - }); + lldb = callPackage ./lldb.nix {}; + }; + + libraries = let + callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; }); + in { - libcxxStdenv = stdenv.override (drv: { - allowedRequisites = null; - cc = buildLlvmPackages.libcxxClang; - }); + stdenv = overrideCC stdenv buildLlvmTools.clang; - lldb = callPackage ./lldb.nix {}; + libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; libcxx = callPackage ./libc++ {}; libcxxabi = callPackage ./libc++abi.nix {}; }; -in self + +in { inherit tools libraries; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index 594397bdbbc..fecf65136bc 100644 --- a/pkgs/development/compilers/llvm/4/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -1,13 +1,11 @@ { lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook , libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith , darwin -, buildLlvmPackages # ourself, but from the previous stage, for cross -, targetLlvmPackages # ourself, but from the next stage, for cross +, buildLlvmTools # tools, but from the previous stage, for cross +, targetLlvmLibraries # libraries, but from the next stage, for cross }: let - callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); - release_version = "4.0.1"; version = release_version; # differentiating these is important for rc's @@ -24,47 +22,46 @@ let let drv-manpages = drv.override { enableManpages = true; }; in drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ }; - llvm = callPackage ./llvm.nix { - inherit compiler-rt_src stdenv; - }; - - clang-unwrapped = callPackage ./clang { - inherit clang-tools-extra_src stdenv; - }; + tools = let + callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); + in { - self = { - llvm = overrideManOutput llvm; - clang-unwrapped = overrideManOutput clang-unwrapped; + llvm = overrideManOutput (callPackage ./llvm.nix { + inherit compiler-rt_src; + inherit (targetLlvmLibraries) libcxxabi; + }); + clang-unwrapped = overrideManOutput (callPackage ./clang { + inherit clang-tools-extra_src; + }); - libclang = self.clang-unwrapped.lib; - llvm-manpages = lowPrio self.llvm.man; - clang-manpages = lowPrio self.clang-unwrapped.man; + libclang = tools.clang-unwrapped.lib; + llvm-manpages = lowPrio tools.llvm.man; + clang-manpages = lowPrio tools.clang-unwrapped.man; - clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; + clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang; libstdcxxClang = wrapCCWith { - cc = self.clang-unwrapped; + cc = tools.clang-unwrapped; extraPackages = [ libstdcxxHook ]; }; libcxxClang = wrapCCWith { - cc = self.clang-unwrapped; - extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ]; + cc = tools.clang-unwrapped; + extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ]; }; - stdenv = stdenv.override (drv: { - allowedRequisites = null; - cc = self.clang; - }); - - libcxxStdenv = stdenv.override (drv: { - allowedRequisites = null; - cc = buildLlvmPackages.libcxxClang; - }); - lld = callPackage ./lld.nix {}; lldb = callPackage ./lldb.nix {}; + }; + + libraries = let + callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); + in { + + stdenv = overrideCC stdenv buildLlvmTools.clang; + + libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; libcxx = callPackage ./libc++ {}; @@ -73,4 +70,4 @@ let openmp = callPackage ./openmp.nix {}; }; -in self +in { inherit tools libraries; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index 1f7619f7a37..21f0f3e8cf3 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -1,13 +1,11 @@ { lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook , libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith , darwin -, buildLlvmPackages # ourself, but from the previous stage, for cross -, targetLlvmPackages # ourself, but from the next stage, for cross +, buildLlvmTools # tools, but from the previous stage, for cross +, targetLlvmLibraries # libraries, but from the next stage, for cross }: let - callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); - release_version = "5.0.1"; version = release_version; # differentiating these is important for rc's @@ -24,47 +22,46 @@ let let drv-manpages = drv.override { enableManpages = true; }; in drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ }; - llvm = callPackage ./llvm.nix { - inherit compiler-rt_src stdenv; - }; - - clang-unwrapped = callPackage ./clang { - inherit clang-tools-extra_src stdenv; - }; + tools = let + callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); + in { - self = { - llvm = overrideManOutput llvm; - clang-unwrapped = overrideManOutput clang-unwrapped; + llvm = overrideManOutput (callPackage ./llvm.nix { + inherit compiler-rt_src; + inherit (targetLlvmLibraries) libcxxabi; + }); + clang-unwrapped = overrideManOutput (callPackage ./clang { + inherit clang-tools-extra_src; + }); - libclang = self.clang-unwrapped.lib; - llvm-manpages = lowPrio self.llvm.man; - clang-manpages = lowPrio self.clang-unwrapped.man; + libclang = tools.clang-unwrapped.lib; + llvm-manpages = lowPrio tools.llvm.man; + clang-manpages = lowPrio tools.clang-unwrapped.man; - clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; + clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang; libstdcxxClang = wrapCCWith { - cc = self.clang-unwrapped; + cc = tools.clang-unwrapped; extraPackages = [ libstdcxxHook ]; }; libcxxClang = wrapCCWith { - cc = self.clang-unwrapped; - extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ]; + cc = tools.clang-unwrapped; + extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ]; }; - stdenv = stdenv.override (drv: { - allowedRequisites = null; - cc = self.clang; - }); - - libcxxStdenv = stdenv.override (drv: { - allowedRequisites = null; - cc = buildLlvmPackages.libcxxClang; - }); - lld = callPackage ./lld.nix {}; lldb = callPackage ./lldb.nix {}; + }; + + libraries = let + callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); + in { + + stdenv = overrideCC stdenv buildLlvmTools.clang; + + libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; libcxx = callPackage ./libc++ {}; @@ -73,4 +70,4 @@ let openmp = callPackage ./openmp.nix {}; }; -in self +in { inherit tools libraries; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index be26a38e32e..3a7b66f1ed0 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -1,13 +1,11 @@ { lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook , libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith , darwin -, buildLlvmPackages # ourself, but from the previous stage, for cross -, targetLlvmPackages # ourself, but from the next stage, for cross +, buildLlvmTools # tools, but from the previous stage, for cross +, targetLlvmLibraries # libraries, but from the next stage, for cross }: let - callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); - release_version = "6.0.0"; version = release_version; # differentiating these is important for rc's @@ -24,47 +22,46 @@ let let drv-manpages = drv.override { enableManpages = true; }; in drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ }; - llvm = callPackage ./llvm.nix { - inherit compiler-rt_src stdenv; - }; - - clang-unwrapped = callPackage ./clang { - inherit clang-tools-extra_src stdenv; - }; + tools = let + callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); + in { - self = { - llvm = overrideManOutput llvm; - clang-unwrapped = overrideManOutput clang-unwrapped; + llvm = overrideManOutput (callPackage ./llvm.nix { + inherit compiler-rt_src; + inherit (targetLlvmLibraries) libcxxabi; + }); + clang-unwrapped = overrideManOutput (callPackage ./clang { + inherit clang-tools-extra_src; + }); - libclang = self.clang-unwrapped.lib; - llvm-manpages = lowPrio self.llvm.man; - clang-manpages = lowPrio self.clang-unwrapped.man; + libclang = tools.clang-unwrapped.lib; + llvm-manpages = lowPrio tools.llvm.man; + clang-manpages = lowPrio tools.clang-unwrapped.man; - clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; + clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang; libstdcxxClang = wrapCCWith { - cc = self.clang-unwrapped; + cc = tools.clang-unwrapped; extraPackages = [ libstdcxxHook ]; }; libcxxClang = wrapCCWith { - cc = self.clang-unwrapped; - extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ]; + cc = tools.clang-unwrapped; + extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ]; }; - stdenv = stdenv.override (drv: { - allowedRequisites = null; - cc = self.clang; - }); - - libcxxStdenv = stdenv.override (drv: { - allowedRequisites = null; - cc = buildLlvmPackages.libcxxClang; - }); - lld = callPackage ./lld.nix {}; lldb = callPackage ./lldb.nix {}; + }; + + libraries = let + callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); + in { + + stdenv = overrideCC stdenv buildLlvmTools.clang; + + libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; libcxx = callPackage ./libc++ {}; @@ -73,4 +70,4 @@ let openmp = callPackage ./openmp.nix {}; }; -in self +in { inherit tools libraries; } // libraries // tools diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 8b2b98b1729..64f0056a7ff 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -38,7 +38,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 11.9 + # LTS Haskell 11.10 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -67,7 +67,7 @@ default-package-overrides: - aeson-better-errors ==0.9.1.0 - aeson-casing ==0.1.0.5 - aeson-compat ==0.3.7.1 - - aeson-diff ==1.1.0.4 + - aeson-diff ==1.1.0.5 - aeson-extra ==0.4.1.0 - aeson-generic-compat ==0.0.1.2 - aeson-injector ==1.1.0.0 @@ -152,7 +152,7 @@ default-package-overrides: - base-compat ==0.9.3 - basement ==0.0.7 - base-orphans ==0.7 - - base-prelude ==1.2.0.1 + - base-prelude ==1.2.1 - base-unicode-symbols ==0.2.2.4 - basic-prelude ==0.7.0 - bbdb ==0.8 @@ -180,7 +180,7 @@ default-package-overrides: - binary-search ==1.0.0.3 - binary-shared ==0.8.3 - binary-tagged ==0.1.4.2 - - bindings-DSL ==1.0.24 + - bindings-DSL ==1.0.25 - bindings-GLFW ==3.1.2.4 - bindings-libzip ==1.0.1 - bindings-uname ==0.1 @@ -234,7 +234,7 @@ default-package-overrides: - brittany ==0.9.0.1 - broadcast-chan ==0.1.1 - bsb-http-chunked ==0.0.0.2 - - bson ==0.3.2.3 + - bson ==0.3.2.6 - bson-lens ==0.1.1 - btrfs ==0.1.2.3 - buchhaltung ==0.0.7 @@ -260,7 +260,7 @@ default-package-overrides: - Cabal ==2.0.1.1 - cabal-doctest ==1.0.6 - cabal-file-th ==0.2.4 - - cabal-rpm ==0.12.2 + - cabal-rpm ==0.12.3 - cabal-toolkit ==0.0.5 - cache ==0.1.1.0 - cairo ==0.13.5.0 @@ -278,7 +278,7 @@ default-package-overrides: - cassava-records ==0.1.0.4 - cassette ==0.1.0 - cast ==0.1.0.2 - - cayley-client ==0.4.5 + - cayley-client ==0.4.6 - cereal ==0.5.5.0 - cereal-conduit ==0.8.0 - cereal-text ==0.1.0.2 @@ -308,7 +308,7 @@ default-package-overrides: - circle-packing ==0.1.0.6 - cisco-spark-api ==0.1.0.3 - clang-compilation-database ==0.1.0.1 - - classyplate ==0.3.0.2 + - classyplate ==0.3.1.0 - classy-prelude ==1.4.0 - classy-prelude-conduit ==1.4.0 - classy-prelude-yesod ==1.4.0 @@ -415,7 +415,7 @@ default-package-overrides: - crypto-random-api ==0.2.0 - crypt-sha512 ==0 - csp ==1.3.1 - - css-syntax ==0.0.5 + - css-syntax ==0.0.7 - css-text ==0.1.3.0 - csv ==0.1.2 - csv-conduit ==0.6.8.1 @@ -481,7 +481,7 @@ default-package-overrides: - dependent-sum ==0.4 - dependent-sum-template ==0.0.0.6 - deque ==0.2.1 - - deriving-compat ==0.4.1 + - deriving-compat ==0.4.2 - descriptive ==0.9.4 - dhall ==1.11.1 - dhall-json ==1.0.13 @@ -511,11 +511,11 @@ default-package-overrides: - distributive ==0.5.3 - diversity ==0.8.1.0 - djinn-ghc ==0.0.2.3 - - djinn-lib ==0.0.1.2 + - djinn-lib ==0.0.1.3 - dlist ==0.8.0.4 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 - - dns ==3.0.2 + - dns ==3.0.3 - docker ==0.5.1.1 - docker-build-cacher ==1.9.2 - dockerfile ==0.1.0.1 @@ -540,7 +540,7 @@ default-package-overrides: - dynamic-state ==0.3 - dyre ==0.8.12 - Earley ==0.12.1.0 - - easy-file ==0.2.1 + - easy-file ==0.2.2 - Ebnf2ps ==1.0.15 - echo ==0.1.3 - ed25519 ==0.0.5.0 @@ -593,7 +593,7 @@ default-package-overrides: - eventsource-geteventstore-store ==1.1.0 - eventsource-store-specs ==1.1.1 - eventsource-stub-store ==1.0.3 - - eventstore ==1.1.2 + - eventstore ==1.1.3 - every ==0.0.1 - exact-combinatorics ==0.2.0.8 - exact-pi ==0.4.1.3 @@ -607,7 +607,7 @@ default-package-overrides: - expiring-cache-map ==0.0.6.1 - explicit-exception ==0.1.9.2 - exp-pairs ==0.1.6.0 - - extensible ==0.4.8 + - extensible ==0.4.9 - extensible-effects ==2.4.0.0 - extensible-exceptions ==0.1.1.4 - extra ==1.6.6 @@ -682,7 +682,7 @@ default-package-overrides: - from-sum ==0.2.1.0 - frontmatter ==0.1.0.2 - fsnotify ==0.2.1.1 - - fsnotify-conduit ==0.1.0.0 + - fsnotify-conduit ==0.1.1.0 - funcmp ==1.9 - functor-classes-compat ==1 - fuzzcheck ==0.1.1 @@ -732,7 +732,7 @@ default-package-overrides: - ghcjs-perch ==0.3.3.2 - ghc-parser ==0.2.0.2 - ghc-paths ==0.1.0.9 - - ghc-prof ==1.4.1.1 + - ghc-prof ==1.4.1.2 - ghc-syb-utils ==0.2.3.3 - ghc-tcplugins-extra ==0.2.5 - ghc-typelits-extra ==0.2.4 @@ -740,7 +740,7 @@ default-package-overrides: - ghc-typelits-natnormalise ==0.5.10 - ghost-buster ==0.1.1.0 - gi-atk ==2.0.15 - - gi-cairo ==1.0.15 + - gi-cairo ==1.0.17 - gi-glib ==2.0.16 - gi-gobject ==2.0.16 - gi-javascriptcore ==4.0.15 @@ -798,7 +798,7 @@ default-package-overrides: - hackage-db ==2.0 - hackage-security ==0.5.3.0 - haddock-library ==1.4.5 - - hailgun ==0.4.1.7 + - hailgun ==0.4.1.8 - hailgun-simple ==0.1.0.0 - hakyll ==4.12.2.0 - half ==0.2.2.3 @@ -841,7 +841,7 @@ default-package-overrides: - hasmin ==1.0.2 - hasql ==1.1.1 - hasql-migration ==0.1.3 - - hasql-optparse-applicative ==0.3 + - hasql-optparse-applicative ==0.3.0.1 - hasql-pool ==0.4.3 - hasql-transaction ==0.6 - hastache ==0.6.1 @@ -875,7 +875,7 @@ default-package-overrides: - hexml-lens ==0.2.1 - hexpat ==0.20.13 - hexstring ==0.11.1 - - hformat ==0.3.1.0 + - hformat ==0.3.2.0 - hfsevents ==0.1.6 - hid ==0.2.2 - hidapi ==0.1.4 @@ -931,8 +931,8 @@ default-package-overrides: - hsdns ==1.7.1 - hsebaysdk ==0.4.0.0 - hsemail ==2 - - hset ==2.2.0 - HSet ==0.0.1 + - hset ==2.2.0 - hsexif ==0.6.1.5 - hs-GeoIP ==0.3 - hsignal ==0.2.7.5 @@ -1013,7 +1013,7 @@ default-package-overrides: - hw-mquery ==0.1.0.1 - hworker ==0.1.0.1 - hw-parser ==0.0.0.3 - - hw-prim ==0.5.0.3 + - hw-prim ==0.5.0.5 - hw-rankselect ==0.10.0.3 - hw-rankselect-base ==0.2.0.2 - hw-string-parse ==0.0.0.4 @@ -1082,7 +1082,7 @@ default-package-overrides: - io-streams-haproxy ==1.0.0.2 - ip ==1.1.2 - ip6addr ==0.5.3 - - iproute ==1.7.4 + - iproute ==1.7.5 - IPv6Addr ==1.0.3 - IPv6DB ==0.2.6 - ipython-kernel ==0.9.0.2 @@ -1113,12 +1113,12 @@ default-package-overrides: - json ==0.9.2 - json-autotype ==1.0.18 - json-builder ==0.3 - - json-rpc-generic ==0.2.1.3 + - json-rpc-generic ==0.2.1.4 - json-schema ==0.7.4.1 - json-stream ==0.4.2.3 - JuicyPixels ==3.2.9.5 - JuicyPixels-extra ==0.3.0 - - JuicyPixels-scale-dct ==0.1.1.2 + - JuicyPixels-scale-dct ==0.1.2 - justified-containers ==0.3.0.0 - jvm ==0.4.2 - jvm-batching ==0.1.1 @@ -1297,7 +1297,7 @@ default-package-overrides: - mmap ==0.5.9 - mmark ==0.0.5.6 - mmark-cli ==0.0.3.0 - - mmark-ext ==0.2.0.0 + - mmark-ext ==0.2.1.0 - mmorph ==1.1.2 - mnist-idx ==0.1.2.8 - mockery ==0.3.5 @@ -1344,7 +1344,7 @@ default-package-overrides: - monoid-transformer ==0.0.4 - mono-traversable ==1.0.8.1 - mono-traversable-instances ==0.1.0.0 - - morte ==1.6.18 + - morte ==1.6.19 - mountpoints ==1.0.2 - mstate ==0.2.7 - mtl ==2.2.2 @@ -1394,7 +1394,7 @@ default-package-overrides: - network-ip ==0.3.0.2 - network-multicast ==0.2.0 - Network-NineP ==0.4.3 - - network-simple ==0.4.0.5 + - network-simple ==0.4.1 - network-transport ==0.5.2 - network-transport-composed ==0.2.1 - network-transport-inmemory ==0.5.2 @@ -1418,7 +1418,7 @@ default-package-overrides: - NoTrace ==0.3.0.2 - nsis ==0.3.2 - n-tuple ==0.0.2.0 - - numbers ==3000.2.0.1 + - numbers ==3000.2.0.2 - numeric-extras ==0.1 - numeric-prelude ==0.4.3 - numhask ==0.1.4.0 @@ -1438,11 +1438,11 @@ default-package-overrides: - once ==0.2 - one-liner ==0.9.2 - one-liner-instances ==0.1.2.1 - - OneTuple ==0.2.1 + - OneTuple ==0.2.2 - online ==0.2.1.0 - Only ==0.1 - oo-prototypes ==0.1.0.0 - - opaleye ==0.6.1.0 + - opaleye ==0.6.7000.0 - OpenAL ==1.7.0.4 - open-browser ==0.2.1.0 - openexr-write ==0.1.0.1 @@ -1525,7 +1525,7 @@ default-package-overrides: - picoparsec ==0.1.2.3 - picosat ==0.1.4 - pid1 ==0.1.2.0 - - pinboard ==0.9.12.9 + - pinboard ==0.9.12.10 - pinch ==0.3.2.0 - pipes ==4.3.9 - pipes-aeson ==0.4.1.8 @@ -1540,7 +1540,7 @@ default-package-overrides: - pipes-group ==1.0.10 - pipes-misc ==0.4.0.1 - pipes-mongodb ==0.1.0.0 - - pipes-network ==0.6.4.1 + - pipes-network ==0.6.5 - pipes-parse ==3.0.8 - pipes-random ==1.0.0.4 - pipes-safe ==2.2.9 @@ -1562,7 +1562,7 @@ default-package-overrides: - pooled-io ==0.0.2.1 - PortMidi ==0.1.6.1 - posix-paths ==0.2.1.5 - - postgresql-binary ==0.12.1 + - postgresql-binary ==0.12.1.1 - postgresql-libpq ==0.9.4.1 - postgresql-schema ==0.1.14 - postgresql-simple ==0.5.3.0 @@ -1653,14 +1653,14 @@ default-package-overrides: - raaz ==0.2.0 - rainbow ==0.28.0.4 - rainbox ==0.18.0.10 - - rakuten ==0.1.1.2 + - rakuten ==0.1.1.3 - ramus ==0.1.2 - random ==1.1 - random-fu ==0.2.7.0 - random-shuffle ==0.0.4 - random-source ==0.3.0.6 - random-tree ==0.6.0.5 - - range-set-list ==0.1.2.0 + - range-set-list ==0.1.2.1 - rank1dynamic ==0.4.0 - rank2classes ==1.0.2 - rank-product ==0.2.0.1 @@ -1837,7 +1837,7 @@ default-package-overrides: - signal ==0.1.0.4 - silently ==1.2.5 - simple ==0.11.2 - - simple-log ==0.9.3 + - simple-log ==0.9.4 - simple-reflect ==0.3.3 - simple-sendfile ==0.2.27 - simple-session ==0.10.1.1 @@ -1852,7 +1852,7 @@ default-package-overrides: - slack-web ==0.2.0.4 - slave-thread ==1.0.2 - slug ==0.1.7 - - smallcheck ==1.1.3.1 + - smallcheck ==1.1.4 - smoothie ==0.4.2.8 - smtp-mail ==0.1.4.6 - snap ==1.1.0.0 @@ -1977,7 +1977,7 @@ default-package-overrides: - tar-conduit ==0.2.3 - tardis ==0.4.1.0 - tasty ==1.0.1.1 - - tasty-ant-xml ==1.1.3 + - tasty-ant-xml ==1.1.4 - tasty-auto ==0.2.0.0 - tasty-dejafu ==1.1.0.2 - tasty-discover ==4.2.0 @@ -1990,10 +1990,10 @@ default-package-overrides: - tasty-kat ==0.0.3 - tasty-program ==1.0.5 - tasty-quickcheck ==0.9.2 - - tasty-rerun ==1.1.11 + - tasty-rerun ==1.1.12 - tasty-silver ==3.1.11 - tasty-smallcheck ==0.8.1 - - tasty-stats ==0.2.0.3 + - tasty-stats ==0.2.0.4 - tasty-th ==0.1.7 - TCache ==0.12.1 - tce-conf ==1.3 @@ -2042,7 +2042,7 @@ default-package-overrides: - these ==0.7.4 - th-expand-syns ==0.4.4.0 - th-extras ==0.0.0.4 - - th-lift ==0.7.8 + - th-lift ==0.7.10 - th-lift-instances ==0.1.11 - th-orphans ==0.13.5 - thread-hierarchy ==0.3.0.0 @@ -2239,7 +2239,7 @@ default-package-overrides: - wai-predicates ==0.10.0 - wai-route ==0.3.1.2 - wai-routing ==0.13.0 - - wai-session ==0.3.2 + - wai-session ==0.3.3 - wai-session-postgresql ==0.2.1.2 - wai-slack-middleware ==0.2.0 - wai-transformers ==0.0.7 @@ -2262,8 +2262,8 @@ default-package-overrides: - websockets ==0.12.4.1 - websockets-rpc ==0.6.0 - websockets-simple ==0.0.6.3 - - websockets-snap ==0.10.2.5 - - weigh ==0.0.11 + - websockets-snap ==0.10.3.0 + - weigh ==0.0.12 - wide-word ==0.1.0.6 - wikicfp-scraper ==0.1.0.9 - wild-bind ==0.1.2.0 @@ -2343,7 +2343,7 @@ default-package-overrides: - yesod-auth ==1.6.3 - yesod-auth-fb ==1.9.0 - yesod-auth-hashdb ==1.7 - - yesod-bin ==1.6.0.2 + - yesod-bin ==1.6.0.3 - yesod-core ==1.6.5 - yesod-csp ==0.2.4.0 - yesod-eventsource ==1.6.0 @@ -2718,6 +2718,7 @@ dont-distribute-packages: AesonBson: [ i686-linux, x86_64-linux, x86_64-darwin ] affection: [ i686-linux, x86_64-linux, x86_64-darwin ] affine-invariant-ensemble-mcmc: [ i686-linux, x86_64-linux, x86_64-darwin ] + affine: [ i686-linux, x86_64-linux, x86_64-darwin ] afv: [ i686-linux, x86_64-linux, x86_64-darwin ] Agata: [ i686-linux, x86_64-linux, x86_64-darwin ] Agda-executable: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2894,6 +2895,8 @@ dont-distribute-packages: Animas: [ i686-linux, x86_64-linux, x86_64-darwin ] animascii: [ i686-linux, x86_64-linux, x86_64-darwin ] animate-example: [ i686-linux, x86_64-linux, x86_64-darwin ] + animate-preview: [ i686-linux, x86_64-linux, x86_64-darwin ] + animate-sdl2: [ i686-linux, x86_64-linux, x86_64-darwin ] animate: [ i686-linux, x86_64-linux, x86_64-darwin ] annah: [ i686-linux, x86_64-linux, x86_64-darwin ] anonymous-sums-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3102,6 +3105,7 @@ dont-distribute-packages: battlenet-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] battlenet: [ i686-linux, x86_64-linux, x86_64-darwin ] battleplace-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + battleplace: [ i686-linux, x86_64-linux, x86_64-darwin ] battleships: [ i686-linux, x86_64-linux, x86_64-darwin ] bayes-stack: [ i686-linux, x86_64-linux, x86_64-darwin ] BCMtools: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3319,6 +3323,7 @@ dont-distribute-packages: bytable: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-class: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] + bytestring-encodings: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-read: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-strict-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3641,6 +3646,8 @@ dont-distribute-packages: competition: [ i686-linux, x86_64-linux, x86_64-darwin ] compilation: [ i686-linux, x86_64-linux, x86_64-darwin ] complexity: [ i686-linux, x86_64-linux, x86_64-darwin ] + componentm-devel: [ i686-linux, x86_64-linux, x86_64-darwin ] + componentm: [ i686-linux, x86_64-linux, x86_64-darwin ] compose-trans: [ i686-linux, x86_64-linux, x86_64-darwin ] composite-aeson-refined: [ i686-linux, x86_64-linux, x86_64-darwin ] composite-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3699,6 +3706,7 @@ dont-distribute-packages: constrained-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] constrained-monads: [ i686-linux, x86_64-linux, x86_64-darwin ] constraint-manip: [ i686-linux, x86_64-linux, x86_64-darwin ] + constraint-reflection: [ i686-linux, x86_64-linux, x86_64-darwin ] constraint: [ i686-linux, x86_64-linux, x86_64-darwin ] ConstraintKinds: [ i686-linux, x86_64-linux, x86_64-darwin ] constructive-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3986,6 +3994,7 @@ dont-distribute-packages: derive-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] derive: [ i686-linux, x86_64-linux, x86_64-darwin ] derp-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + descript-lang: [ i686-linux, x86_64-linux, x86_64-darwin ] deterministic-game-engine: [ i686-linux, x86_64-linux, x86_64-darwin ] deunicode: [ i686-linux, x86_64-linux, x86_64-darwin ] dewdrop: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3996,8 +4005,13 @@ dont-distribute-packages: dhall-bash: [ i686-linux, x86_64-linux, x86_64-darwin ] dhall-check: [ i686-linux, x86_64-linux, x86_64-darwin ] dhall-nix: [ i686-linux, x86_64-linux, x86_64-darwin ] + dhall-text: [ i686-linux, x86_64-linux, x86_64-darwin ] dhall-to-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] dhcp-lease-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] + di-df1: [ i686-linux, x86_64-linux, x86_64-darwin ] + di-handle: [ i686-linux, x86_64-linux, x86_64-darwin ] + di-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] + di: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-boolean: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-braille: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4027,6 +4041,7 @@ dont-distribute-packages: dicom: [ i686-linux, x86_64-linux, x86_64-darwin ] dictparser: [ i686-linux, x86_64-linux, x86_64-darwin ] diffcabal: [ i686-linux, x86_64-linux, x86_64-darwin ] + difference-monoid: [ i686-linux, x86_64-linux, x86_64-darwin ] DifferenceLogic: [ i686-linux, x86_64-linux, x86_64-darwin ] DifferentialEvolution: [ i686-linux, x86_64-linux, x86_64-darwin ] difftodo: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4207,6 +4222,7 @@ dont-distribute-packages: ehs: [ i686-linux, x86_64-linux, x86_64-darwin ] eibd-client-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] Eight-Ball-Pool-Hack-Cheats: [ i686-linux, x86_64-linux, x86_64-darwin ] + either-both: [ i686-linux, x86_64-linux, x86_64-darwin ] EitherT: [ i686-linux, x86_64-linux, x86_64-darwin ] ekg-cloudwatch: [ i686-linux, x86_64-linux, x86_64-darwin ] ekg-elastic: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4337,6 +4353,7 @@ dont-distribute-packages: explore: [ i686-linux, x86_64-linux, x86_64-darwin ] exposed-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] expressions-z3: [ i686-linux, x86_64-linux, x86_64-darwin ] + expressions: [ i686-linux, x86_64-linux, x86_64-darwin ] extcore: [ i686-linux, x86_64-linux, x86_64-darwin ] extemp: [ i686-linux, x86_64-linux, x86_64-darwin ] extended-categories: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4558,6 +4575,7 @@ dont-distribute-packages: friday-scale-dct: [ i686-linux, x86_64-linux, x86_64-darwin ] frown: [ i686-linux, x86_64-linux, x86_64-darwin ] frp-arduino: [ i686-linux, x86_64-linux, x86_64-darwin ] + frpnow-gtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] frpnow-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] fs-events: [ i686-linux, x86_64-linux, x86_64-darwin ] fsh-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4585,6 +4603,7 @@ dont-distribute-packages: functor-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] functor: [ i686-linux, x86_64-linux, x86_64-darwin ] functorm: [ i686-linux, x86_64-linux, x86_64-darwin ] + funflow: [ i686-linux, x86_64-linux, x86_64-darwin ] Fungi: [ i686-linux, x86_64-linux, x86_64-darwin ] funion: [ i686-linux, x86_64-linux, x86_64-darwin ] funpat: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4708,6 +4727,7 @@ dont-distribute-packages: ghc-session: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-syntax-highlighter: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-time-alloc-prof: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-vis: [ i686-linux, x86_64-linux, x86_64-darwin ] ghci-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4990,6 +5010,7 @@ dont-distribute-packages: grammar-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] GrammarProducts: [ i686-linux, x86_64-linux, x86_64-darwin ] grammatical-parsers: [ i686-linux, x86_64-linux, x86_64-darwin ] + grapefruit-ui-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] graph-matchings: [ i686-linux, x86_64-linux, x86_64-darwin ] graph-rewriting-cl: [ i686-linux, x86_64-linux, x86_64-darwin ] graph-rewriting-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5246,6 +5267,7 @@ dont-distribute-packages: haskarrow: [ i686-linux, x86_64-linux, x86_64-darwin ] haskbot-core: [ i686-linux, x86_64-linux, x86_64-darwin ] haskdeep: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskdogs: [ i686-linux, x86_64-linux, x86_64-darwin ] haskeem: [ i686-linux, x86_64-linux, x86_64-darwin ] haskeline-class: [ i686-linux, x86_64-linux, x86_64-darwin ] haskelisp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5352,6 +5374,7 @@ dont-distribute-packages: haskore-synthesizer: [ i686-linux, x86_64-linux, x86_64-darwin ] haskore: [ i686-linux, x86_64-linux, x86_64-darwin ] HaskRel: [ i686-linux, x86_64-linux, x86_64-darwin ] + hasktags: [ i686-linux, x86_64-linux, x86_64-darwin ] haskus-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] haskus-system-build: [ i686-linux, x86_64-linux, x86_64-darwin ] haskus-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5497,6 +5520,7 @@ dont-distribute-packages: hevolisa: [ i686-linux, x86_64-linux, x86_64-darwin ] hexchat: [ i686-linux, x86_64-linux, x86_64-darwin ] hexif: [ i686-linux, x86_64-linux, x86_64-darwin ] + hexmino: [ i686-linux, x86_64-linux, x86_64-darwin ] hexml-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] hexpat-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] hexpat-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5573,6 +5597,7 @@ dont-distribute-packages: hinquire: [ i686-linux, x86_64-linux, x86_64-darwin ] hinstaller: [ i686-linux, x86_64-linux, x86_64-darwin ] hint-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + hinter: [ i686-linux, x86_64-linux, x86_64-darwin ] hinterface: [ i686-linux, x86_64-linux, x86_64-darwin ] hinvaders: [ i686-linux, x86_64-linux, x86_64-darwin ] hinze-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5727,6 +5752,7 @@ dont-distribute-packages: hpc-tracer: [ i686-linux, x86_64-linux, x86_64-darwin ] hPDB-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] hPDB: [ i686-linux, x86_64-linux, x86_64-darwin ] + HPDF: [ i686-linux, x86_64-linux, x86_64-darwin ] hpdft: [ i686-linux, x86_64-linux, x86_64-darwin ] HPhone: [ i686-linux, x86_64-linux, x86_64-darwin ] HPi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6108,6 +6134,7 @@ dont-distribute-packages: instapaper-sender: [ i686-linux, x86_64-linux, x86_64-darwin ] int-multimap: [ i686-linux, x86_64-linux, x86_64-darwin ] integer-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] + integreat: [ i686-linux, x86_64-linux, x86_64-darwin ] intel-aes: [ i686-linux, x86_64-linux, x86_64-darwin ] interleavableGen: [ i686-linux, x86_64-linux, x86_64-darwin ] interleavableIO: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6316,6 +6343,7 @@ dont-distribute-packages: KiCS: [ i686-linux, x86_64-linux, x86_64-darwin ] kif-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] kit: [ i686-linux, x86_64-linux, x86_64-darwin ] + kleene: [ i686-linux, x86_64-linux, x86_64-darwin ] kmeans-par: [ i686-linux, x86_64-linux, x86_64-darwin ] kmp-dfa: [ i686-linux, x86_64-linux, x86_64-darwin ] knead-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6495,6 +6523,7 @@ dont-distribute-packages: libxslt: [ i686-linux, x86_64-linux, x86_64-darwin ] LibZip: [ i686-linux, x86_64-linux, x86_64-darwin ] lifted-protolude: [ i686-linux, x86_64-linux, x86_64-darwin ] + lifted-stm: [ i686-linux, x86_64-linux, x86_64-darwin ] lifter: [ i686-linux, x86_64-linux, x86_64-darwin ] ligature: [ i686-linux, x86_64-linux, x86_64-darwin ] lightning-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6577,6 +6606,7 @@ dont-distribute-packages: lock-file: [ i686-linux, x86_64-linux, x86_64-darwin ] locked-poll: [ i686-linux, x86_64-linux, x86_64-darwin ] lockpool: [ i686-linux, x86_64-linux, x86_64-darwin ] + log-effect-syslog: [ i686-linux, x86_64-linux, x86_64-darwin ] log-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] log-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] log-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7387,6 +7417,7 @@ dont-distribute-packages: PerfectHash: [ i686-linux, x86_64-linux, x86_64-darwin ] periodic: [ i686-linux, x86_64-linux, x86_64-darwin ] perm: [ i686-linux, x86_64-linux, x86_64-darwin ] + permutations: [ i686-linux, x86_64-linux, x86_64-darwin ] permute: [ i686-linux, x86_64-linux, x86_64-darwin ] PermuteEffects: [ i686-linux, x86_64-linux, x86_64-darwin ] persist2er: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8281,6 +8312,7 @@ dont-distribute-packages: shellish: [ i686-linux, x86_64-linux, x86_64-darwin ] shellmate-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] shikensu: [ i686-linux, x86_64-linux, x86_64-darwin ] + shivers-cfg: [ i686-linux, x86_64-linux, x86_64-darwin ] shoap: [ i686-linux, x86_64-linux, x86_64-darwin ] shopify: [ i686-linux, x86_64-linux, x86_64-darwin ] shorten-strings: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8592,6 +8624,7 @@ dont-distribute-packages: stego-uuid: [ i686-linux, x86_64-linux, x86_64-darwin ] stemmer-german: [ i686-linux, x86_64-linux, x86_64-darwin ] stemmer: [ i686-linux, x86_64-linux, x86_64-darwin ] + step-function: [ i686-linux, x86_64-linux, x86_64-darwin ] stepwise: [ i686-linux, x86_64-linux, x86_64-darwin ] stgi: [ i686-linux, x86_64-linux, x86_64-darwin ] stitch: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8648,6 +8681,7 @@ dont-distribute-packages: subhask: [ i686-linux, x86_64-linux, x86_64-darwin ] subleq-toolchain: [ i686-linux, x86_64-linux, x86_64-darwin ] submark: [ i686-linux, x86_64-linux, x86_64-darwin ] + subsample: [ i686-linux, x86_64-linux, x86_64-darwin ] suffix-array: [ i686-linux, x86_64-linux, x86_64-darwin ] suffixarray: [ i686-linux, x86_64-linux, x86_64-darwin ] SuffixStructures: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8732,6 +8766,7 @@ dont-distribute-packages: Tablify: [ i686-linux, x86_64-linux, x86_64-darwin ] tablize: [ i686-linux, x86_64-linux, x86_64-darwin ] tabloid: [ i686-linux, x86_64-linux, x86_64-darwin ] + taffybar: [ i686-linux, x86_64-linux, x86_64-darwin ] tag-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] tagged-exception-core: [ i686-linux, x86_64-linux, x86_64-darwin ] tagged-list: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8843,6 +8878,7 @@ dont-distribute-packages: text-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] text-generic-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] text-icu-normalized: [ i686-linux, x86_64-linux, x86_64-darwin ] + text-icu-translit: [ i686-linux, x86_64-linux, x86_64-darwin ] text-json-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] text-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] text-markup: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8881,6 +8917,7 @@ dont-distribute-packages: thimk: [ i686-linux, x86_64-linux, x86_64-darwin ] Thingie: [ i686-linux, x86_64-linux, x86_64-darwin ] thorn: [ i686-linux, x86_64-linux, x86_64-darwin ] + threadscope: [ i686-linux, x86_64-linux, x86_64-darwin ] threepenny-gui-contextmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] Thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9016,6 +9053,7 @@ dont-distribute-packages: tsuntsun: [ i686-linux, x86_64-linux, x86_64-darwin ] tsvsql: [ i686-linux, x86_64-linux, x86_64-darwin ] ttask: [ i686-linux, x86_64-linux, x86_64-darwin ] + tttool: [ i686-linux, x86_64-linux, x86_64-darwin ] tuntap: [ i686-linux, x86_64-linux, x86_64-darwin ] tup-functor: [ i686-linux, x86_64-linux, x86_64-darwin ] tuple-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9108,6 +9146,7 @@ dont-distribute-packages: unbounded-delays-units: [ i686-linux, x86_64-linux, x86_64-darwin ] unboxed-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] unbreak: [ i686-linux, x86_64-linux, x86_64-darwin ] + unexceptionalio-trans: [ i686-linux, x86_64-linux, x86_64-darwin ] uni-events: [ i686-linux, x86_64-linux, x86_64-darwin ] uni-graphs: [ i686-linux, x86_64-linux, x86_64-darwin ] uni-htk: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9220,6 +9259,7 @@ dont-distribute-packages: verbalexpressions: [ i686-linux, x86_64-linux, x86_64-darwin ] verdict-json: [ i686-linux, x86_64-linux, x86_64-darwin ] verdict: [ i686-linux, x86_64-linux, x86_64-darwin ] + verifiable-expressions: [ i686-linux, x86_64-linux, x86_64-darwin ] verify: [ i686-linux, x86_64-linux, x86_64-darwin ] verilog: [ i686-linux, x86_64-linux, x86_64-darwin ] vicinity: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9372,6 +9412,7 @@ dont-distribute-packages: woffex: [ i686-linux, x86_64-linux, x86_64-darwin ] wolf: [ i686-linux, x86_64-linux, x86_64-darwin ] word2vec-model: [ i686-linux, x86_64-linux, x86_64-darwin ] + word: [ i686-linux, x86_64-linux, x86_64-darwin ] WordAlignment: [ i686-linux, x86_64-linux, x86_64-darwin ] wordchoice: [ i686-linux, x86_64-linux, x86_64-darwin ] Wordlint: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9455,6 +9496,7 @@ dont-distribute-packages: xml-tydom-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] xml2json: [ i686-linux, x86_64-linux, x86_64-darwin ] xml2x: [ i686-linux, x86_64-linux, x86_64-darwin ] + XML: [ i686-linux, x86_64-linux, x86_64-darwin ] xmlbf-xeno: [ i686-linux, x86_64-linux, x86_64-darwin ] xmlbf-xmlhtml: [ i686-linux, x86_64-linux, x86_64-darwin ] XmlHtmlWriter: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 3ab77c42cbb..f08130a3157 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -20,7 +20,7 @@ in , buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? [], benchmarkToolDepends ? [] , configureFlags ? [] , description ? "" -, doCheck ? !isCross && (stdenv.lib.versionOlder "7.4" ghc.version) +, doCheck ? !isCross && stdenv.lib.versionOlder "7.4" ghc.version , doBenchmark ? false , doHoogle ? true , editedCabalFile ? null @@ -172,7 +172,7 @@ let buildTools ++ libraryToolDepends ++ executableToolDepends; propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends; otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ - optionals (allPkgconfigDepends != []) allPkgconfigDepends ++ + allPkgconfigDepends ++ optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++ optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends); allBuildInputs = propagatedBuildInputs ++ otherBuildInputs; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8820a54d08f..574b5e49c2f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -6427,8 +6427,8 @@ self: { }: mkDerivation { pname = "Gamgine"; - version = "0.5.2"; - sha256 = "0kry2ni9ba3sf2dpsjz0dq4dwnbgjicr1lwl7q4r8w6my94gkas0"; + version = "0.5.3"; + sha256 = "08awl1f1310ifx9gzjrinsv37n7k2yaxvmjaymjh01pawlp3w4gc"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring composition cpphs data-lens directory @@ -8337,6 +8337,7 @@ self: { homepage = "http://www.alpheccar.org"; description = "Generation of PDF documents"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HPath" = callPackage @@ -11031,26 +11032,6 @@ self: { }: mkDerivation { pname = "JuicyPixels-scale-dct"; - version = "0.1.1.2"; - sha256 = "15py0slh1jij8wrd68q0fqs9yarnabr470xm04i92904a809vgcs"; - revision = "3"; - editedCabalFile = "0z1ks049q9jsc5ysh12idkqf3rz0bnvv74rhlaw24r5q2xj8lv8i"; - libraryHaskellDepends = [ - base base-compat carray fft JuicyPixels - ]; - testHaskellDepends = [ - base base-compat carray fft JuicyPixels time - ]; - homepage = "https://github.com/phadej/JuicyPixels-scale-dct#readme"; - description = "Scale JuicyPixels images with DCT"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "JuicyPixels-scale-dct_0_1_2" = callPackage - ({ mkDerivation, base, base-compat, carray, fft, JuicyPixels, time - }: - mkDerivation { - pname = "JuicyPixels-scale-dct"; version = "0.1.2"; sha256 = "04rhrmjnh12hh2nz04k245avgdcwqfyjnsbpcrz8j9328j41nf7p"; libraryHaskellDepends = [ @@ -11062,7 +11043,6 @@ self: { homepage = "https://github.com/phadej/JuicyPixels-scale-dct#readme"; description = "Scale JuicyPixels images with DCT"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "JuicyPixels-stbir" = callPackage @@ -12841,6 +12821,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "MonadRandom_0_5_1_1" = callPackage + ({ mkDerivation, base, mtl, primitive, random, transformers + , transformers-compat + }: + mkDerivation { + pname = "MonadRandom"; + version = "0.5.1.1"; + sha256 = "0w44jl1n3kqvqaflh82l1wj3xxbhzfs3kf4m8rk7w6fgg8llmnmb"; + libraryHaskellDepends = [ + base mtl primitive random transformers transformers-compat + ]; + description = "Random-number generation monad"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "MonadRandomLazy" = callPackage ({ mkDerivation, base, MonadRandom, mtl, random }: mkDerivation { @@ -13970,25 +13966,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "OneTuple"; - version = "0.2.1"; - sha256 = "1x52b68zh3k9lnps5s87kzan7dzvqp6mrwgayjq15w9dv6v78vsb"; - revision = "1"; - editedCabalFile = "1kb7f21n9vwwrk4kipqdwdqs94k34zai6yy0kgdn22zi442yicjh"; - libraryHaskellDepends = [ base ]; - description = "Singleton Tuple"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "OneTuple_0_2_2" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "OneTuple"; version = "0.2.2"; sha256 = "1p14cvjk3rgfc0xxcn7ffaajd2ii1ljnlayil2yyzgdwhlj70bnq"; libraryHaskellDepends = [ base ]; description = "Singleton Tuple"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Only" = callPackage @@ -19859,6 +19841,7 @@ self: { testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; description = "Extensible Markup Language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "XMLParser" = callPackage @@ -22056,8 +22039,8 @@ self: { }: mkDerivation { pname = "adb"; - version = "0.1.0.0"; - sha256 = "17dxvdzmg3i8n0gbgbj0jyhm90w0dq7j27id8n24frild2w4c0d0"; + version = "0.1.0.1"; + sha256 = "19v7v308z6db5f61lalhwnn8z38s9v50f6hqd39i7krjd26f0n9a"; libraryHaskellDepends = [ base bytestring cereal containers mtl network ]; @@ -22522,35 +22505,6 @@ self: { "aeson-diff" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, doctest - , edit-distance-vector, filepath, Glob, hashable, hlint, mtl - , optparse-applicative, QuickCheck, quickcheck-instances - , scientific, text, unordered-containers, vector - }: - mkDerivation { - pname = "aeson-diff"; - version = "1.1.0.4"; - sha256 = "03lbghmivvmgj326ha3rxqldd73nyq88hyjigkb09nrd8vwy9wc7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring edit-distance-vector hashable mtl scientific - text unordered-containers vector - ]; - executableHaskellDepends = [ - aeson base bytestring optparse-applicative text - ]; - testHaskellDepends = [ - aeson base bytestring directory doctest filepath Glob hlint - QuickCheck quickcheck-instances text unordered-containers vector - ]; - homepage = "https://github.com/thsutton/aeson-diff"; - description = "Extract and apply patches to JSON documents"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "aeson-diff_1_1_0_5" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, doctest , edit-distance-vector, filepath, Glob, hashable, mtl , optparse-applicative, QuickCheck, quickcheck-instances , scientific, text, unordered-containers, vector @@ -23208,6 +23162,7 @@ self: { libraryHaskellDepends = [ alg base ]; description = "Affine spaces (generalized)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "affine-invariant-ensemble-mcmc" = callPackage @@ -27821,6 +27776,7 @@ self: { homepage = "https://github.com/jxv/animate-preview#readme"; description = "Preview tool for sprite animation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "animate-sdl2" = callPackage @@ -27833,6 +27789,7 @@ self: { homepage = "https://github.com/jxv/animate-sdl2#readme"; description = "sdl2 + animate auxiliary library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "anki-tools" = callPackage @@ -33920,25 +33877,12 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "base-prelude"; - version = "1.2.0.1"; - sha256 = "17hivs7lmsglagdlzxd9q9zsddmgqin2788mpq911zwnb57lj6l1"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/nikita-volkov/base-prelude"; - description = "The most complete prelude formed solely from the \"base\" package"; - license = stdenv.lib.licenses.mit; - }) {}; - - "base-prelude_1_2_1" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "base-prelude"; version = "1.2.1"; sha256 = "1f4s2f454zpcfrb5qi7pdlmljsfyw8zpk0kzs3dngki0ysh0rwq7"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/nikita-volkov/base-prelude"; description = "The most complete prelude formed solely from the \"base\" package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "base-unicode-symbols" = callPackage @@ -34197,6 +34141,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "basic" = callPackage + ({ mkDerivation, base, stm, template-haskell, transformers, util }: + mkDerivation { + pname = "basic"; + version = "0.1.0.0"; + sha256 = "13ikd2pkg2qspkdq0h21wa3clyaj47cm41239024g0sdv8m03bpb"; + libraryHaskellDepends = [ + base stm template-haskell transformers util + ]; + description = "Lifting values from base types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "basic-cpuid" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -34377,6 +34334,7 @@ self: { ]; description = "Core definitions for BattlePlace.io service"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "battleplace-api" = callPackage @@ -34905,6 +34863,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bench-graph" = callPackage + ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, csv + , directory, filepath, split, text, transformers, Unique + }: + mkDerivation { + pname = "bench-graph"; + version = "0.1.0"; + sha256 = "0cmb15q4yrgi8f78ijgn8h51g2f183maslffh4l4dxmi2aqn7z8q"; + libraryHaskellDepends = [ + base bytestring Chart Chart-diagrams csv directory filepath + transformers Unique + ]; + testHaskellDepends = [ base split text ]; + homepage = "https://github.com/composewell/bench-graph"; + description = "Plot and compare benchmarks"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "benchmark-function" = callPackage ({ mkDerivation, base, process, random, time }: mkDerivation { @@ -36181,25 +36157,12 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "bindings-DSL"; - version = "1.0.24"; - sha256 = "03n8z5qxrrq4l6h2f3xyav45f5v2gr112g4l4r4jw8yfvr8qyk93"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/jwiegley/bindings-dsl/wiki"; - description = "FFI domain specific language, on top of hsc2hs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bindings-DSL_1_0_25" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "bindings-DSL"; version = "1.0.25"; sha256 = "0kqrd78nspl3lk4a0fqn47d8dirjg3b24dkvkigcrlb81hw35pk3"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/jwiegley/bindings-dsl/wiki"; description = "FFI domain specific language, on top of hsc2hs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bindings-EsounD" = callPackage @@ -37330,8 +37293,8 @@ self: { }: mkDerivation { pname = "bishbosh"; - version = "0.0.0.2"; - sha256 = "18smrav39awp25j43c7k9r1laxwf7iix61qb2yi5h2b6djbgxq9h"; + version = "0.0.0.3"; + sha256 = "0kwscgfwpyn5ppwg8kfvxbmm6gmg1cvf9d7dhmbi6qydxaj0n11v"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -40441,28 +40404,6 @@ self: { }: mkDerivation { pname = "bson"; - version = "0.3.2.3"; - sha256 = "10j96x6014g3w7i6szx5klr5c7cn1r0b7k581fyzpkb5ad1vlflv"; - libraryHaskellDepends = [ - base binary bytestring cryptohash data-binary-ieee754 mtl network - text time - ]; - testHaskellDepends = [ - base binary bytestring cryptohash data-binary-ieee754 mtl network - QuickCheck test-framework test-framework-quickcheck2 text time - ]; - homepage = "http://github.com/mongodb-haskell/bson"; - description = "BSON documents are JSON-like objects with a standard binary encoding"; - license = "unknown"; - }) {}; - - "bson_0_3_2_6" = callPackage - ({ mkDerivation, base, binary, bytestring, cryptohash - , data-binary-ieee754, mtl, network, QuickCheck, test-framework - , test-framework-quickcheck2, text, time - }: - mkDerivation { - pname = "bson"; version = "0.3.2.6"; sha256 = "106fdxzwpkp5vrnfsrjjwy8dn9rgmxrp79ji7xaxv8dgb9hw73bk"; libraryHaskellDepends = [ @@ -40476,7 +40417,6 @@ self: { homepage = "http://github.com/mongodb-haskell/bson"; description = "BSON documents are JSON-like objects with a standard binary encoding"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bson-generic" = callPackage @@ -41480,6 +41420,7 @@ self: { benchmarkHaskellDepends = [ base bytestring gauge text ]; description = "checks to see if a given bytestring adheres to a certain encoding"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-from" = callPackage @@ -42135,18 +42076,18 @@ self: { }) {}; "cabal-cargs" = callPackage - ({ mkDerivation, base, Cabal, cabal-lenses, cmdargs, directory - , either, filepath, lens, strict, system-fileio, system-filepath + ({ mkDerivation, base, bytestring, Cabal, cabal-lenses, cmdargs + , directory, either, filepath, lens, system-fileio, system-filepath , tasty, tasty-golden, text, transformers, unordered-containers }: mkDerivation { pname = "cabal-cargs"; - version = "0.9.0"; - sha256 = "0w371991841m4d9r73nr86j4jnr0jilj9jnvkmgh9a055vyi573s"; + version = "0.9.1"; + sha256 = "13qbp6416k684chd0f1mk0dw9xkjh85cj6yrgxb9cbhq2944zydi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base Cabal cabal-lenses cmdargs directory either lens strict + base bytestring Cabal cabal-lenses cmdargs directory either lens system-fileio system-filepath text transformers unordered-containers ]; @@ -42515,8 +42456,8 @@ self: { }: mkDerivation { pname = "cabal-lenses"; - version = "0.7.0"; - sha256 = "07xyn4sy2snj8a5983p6g6w9pwklzmd3w9wzj02ig4pdnz7682ls"; + version = "0.7.1"; + sha256 = "1y6s99slblishngi2hw0brf6byd5w72kqz10x30vhxw2zdmprvl0"; libraryHaskellDepends = [ base Cabal either lens strict system-fileio system-filepath text transformers unordered-containers @@ -42679,25 +42620,6 @@ self: { }: mkDerivation { pname = "cabal-rpm"; - version = "0.12.2"; - sha256 = "00i3v62ys6fhq2rnw9q2hhc2h54v8my14ll746vpma2gfdy90y1c"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring Cabal directory filepath http-client - http-client-tls http-conduit process time unix - ]; - homepage = "https://github.com/juhp/cabal-rpm"; - description = "RPM packaging tool for Haskell Cabal-based packages"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "cabal-rpm_0_12_3" = callPackage - ({ mkDerivation, base, bytestring, Cabal, directory, filepath - , http-client, http-client-tls, http-conduit, process, time, unix - }: - mkDerivation { - pname = "cabal-rpm"; version = "0.12.3"; sha256 = "0nid91q38k4b3hgjrhv6sy68y5h74f85j08991hmfbwzd727dzfg"; isLibrary = false; @@ -42709,7 +42631,6 @@ self: { homepage = "https://github.com/juhp/cabal-rpm"; description = "RPM packaging tool for Haskell Cabal-based packages"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-scripts" = callPackage @@ -44998,27 +44919,6 @@ self: { }: mkDerivation { pname = "cayley-client"; - version = "0.4.5"; - sha256 = "12gmav4bwf3i44wbwc68vgrnal7j6q3428d6wl5zq078pv2c3x7w"; - libraryHaskellDepends = [ - aeson attoparsec base binary bytestring exceptions http-client - http-conduit lens lens-aeson mtl text transformers - unordered-containers vector - ]; - testHaskellDepends = [ aeson base hspec unordered-containers ]; - homepage = "https://github.com/MichelBoucey/cayley-client"; - description = "A Haskell client for the Cayley graph database"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "cayley-client_0_4_6" = callPackage - ({ mkDerivation, aeson, attoparsec, base, binary, bytestring - , exceptions, hspec, http-client, http-conduit, lens, lens-aeson - , mtl, text, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "cayley-client"; version = "0.4.6"; sha256 = "1wyf6bz87b83lxcdbm84db7ziv3ggb3zbj4qd2cvfc7m4wr9a0v6"; libraryHaskellDepends = [ @@ -45078,6 +44978,8 @@ self: { pname = "cbor-tool"; version = "0.2.0.0"; sha256 = "0m8ic53vbzk06xw8rxs9vndnmbdjmcslc8zqa7lafhnl3lgqaybp"; + revision = "1"; + editedCabalFile = "08yd8qv9kalgr6hn2kwwzmqzaq4i05fp7d7pfmnkfm7jg6zm8kwy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -45113,6 +45015,8 @@ self: { pname = "cborg-json"; version = "0.2.0.0"; sha256 = "09ps2lyvxg0qpki9f0lydag9hyys20q5ywgxim0jcaa0jky0j92x"; + revision = "1"; + editedCabalFile = "1v0brbq9ri5fx19kb2ijhd3h3ibqadfprgcisja0mx6amzkbqnrz"; libraryHaskellDepends = [ aeson aeson-pretty base cborg scientific text unordered-containers vector @@ -47784,27 +47688,12 @@ self: { }: mkDerivation { pname = "classyplate"; - version = "0.3.0.2"; - sha256 = "0dpllaahq81bn7h0vb0h8s1lf6w0knd2dgqyycimrxfc0aqh1md8"; - libraryHaskellDepends = [ base template-haskell ]; - benchmarkHaskellDepends = [ base criterion parallel uniplate ]; - description = "Fuseable type-class based generics"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "classyplate_0_3_1_0" = callPackage - ({ mkDerivation, base, criterion, parallel, template-haskell - , uniplate - }: - mkDerivation { - pname = "classyplate"; version = "0.3.1.0"; sha256 = "0ayiyxslvnhzngf8afqb82jz20i83par8piqf81s0yldk4lg4j4m"; libraryHaskellDepends = [ base template-haskell ]; benchmarkHaskellDepends = [ base criterion parallel uniplate ]; description = "Fuseable type-class based generics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clay" = callPackage @@ -50974,6 +50863,7 @@ self: { homepage = "https://github.com/roman/Haskell-componentm#readme"; description = "Monad for allocation and cleanup of application resources"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "componentm-devel" = callPackage @@ -50988,6 +50878,7 @@ self: { homepage = "https://github.com/roman/Haskell-componentm#readme"; description = "Easy REPL driven development using ComponentM"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "composable-associations" = callPackage @@ -52883,17 +52774,15 @@ self: { }) {}; "connection-string" = callPackage - ({ mkDerivation, base, containers, doctest, megaparsec - , parser-combinators, text + ({ mkDerivation, base, case-insensitive, containers, doctest + , megaparsec, parser-combinators, text }: mkDerivation { pname = "connection-string"; - version = "0.1.0.0"; - sha256 = "0hkszhms7n6vp9w8agik0qndz2a3f8l56yxidw9l9mjn3sx769g2"; - revision = "1"; - editedCabalFile = "0zirgds0ha3245cagx3fhssz58bpyzci7zv4mw9rfnc1k48v69b2"; + version = "0.2.0.0"; + sha256 = "0gj9czggj7nrp0jjwbi0v1fzl0qvyw3yvi1q5kvjnx3l6ikk3z1j"; libraryHaskellDepends = [ - base containers megaparsec parser-combinators + base case-insensitive containers megaparsec parser-combinators ]; testHaskellDepends = [ base doctest text ]; homepage = "https://github.com/Porges/connection-string-hs"; @@ -53096,6 +52985,7 @@ self: { libraryHaskellDepends = [ base category constraint reflection ]; description = "Constraint reflection"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "constraints" = callPackage @@ -56812,26 +56702,6 @@ self: { }: mkDerivation { pname = "css-syntax"; - version = "0.0.5"; - sha256 = "17hbwnhwz9c6xdw508chygq684h7hrrv16yyrmqdj7f8hfzy0s9r"; - revision = "3"; - editedCabalFile = "0p32287dxngmz6bk2xpvj8vh0kawjcrdxxdnczmay6pa1bzyhrik"; - libraryHaskellDepends = [ - attoparsec base bytestring scientific text - ]; - testHaskellDepends = [ - attoparsec base bytestring directory hspec scientific text - ]; - description = "This package implments a parser for the CSS syntax"; - license = stdenv.lib.licenses.mit; - }) {}; - - "css-syntax_0_0_7" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, directory, hspec - , scientific, text - }: - mkDerivation { - pname = "css-syntax"; version = "0.0.7"; sha256 = "0r30rnwpmzvwbhj9di5rvbsigfn1w325c700hvjyw826x53ivz13"; libraryHaskellDepends = [ @@ -56842,7 +56712,6 @@ self: { ]; description = "This package implments a parser for the CSS syntax"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "css-text" = callPackage @@ -58862,14 +58731,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse_3_1_0_0" = callPackage + "data-diverse_4_0_0_0" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim , hspec, tagged }: mkDerivation { pname = "data-diverse"; - version = "3.1.0.0"; - sha256 = "0jg8g8zp8s14qalrmqa3faspg9kfifzdv0mi8a25xmqgi6rz64aq"; + version = "4.0.0.0"; + sha256 = "0kxhfxqb97hcp2pynsmpa9a5akg49x754ivqlm7dr0jy5kay0fa3"; libraryHaskellDepends = [ base containers deepseq ghc-prim tagged ]; @@ -58900,14 +58769,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse-lens_3_1_1_0" = callPackage + "data-diverse-lens_4_0_0_0" = callPackage ({ mkDerivation, base, data-diverse, data-has, generic-lens, hspec , lens, profunctors, tagged }: mkDerivation { pname = "data-diverse-lens"; - version = "3.1.1.0"; - sha256 = "1ynw9j8a92ny8327i0r037swsc3rj3723dnlar77x640849nif0p"; + version = "4.0.0.0"; + sha256 = "06k8s7dfql4gdwws6nsajhj2g7fl1bs3nvgv76x6kxqwr42l675a"; libraryHaskellDepends = [ base data-diverse data-has generic-lens lens profunctors tagged ]; @@ -62422,32 +62291,6 @@ self: { }: mkDerivation { pname = "deriving-compat"; - version = "0.4.1"; - sha256 = "0lzcbnvzcnrrvr61mrqdx4i8fylknf4jwrpncxr9lhpxgp4fqqk4"; - revision = "1"; - editedCabalFile = "12pzj7ng66xyyj6aixd0mds8vf0p9syivngrjz9xcsi63d76dsbn"; - libraryHaskellDepends = [ - base containers ghc-boot-th ghc-prim template-haskell - th-abstraction transformers transformers-compat - ]; - testHaskellDepends = [ - base base-compat base-orphans hspec QuickCheck tagged - template-haskell transformers transformers-compat - ]; - testToolDepends = [ hspec-discover ]; - homepage = "https://github.com/haskell-compat/deriving-compat"; - description = "Backports of GHC deriving extensions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "deriving-compat_0_4_2" = callPackage - ({ mkDerivation, base, base-compat, base-orphans, containers - , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged - , template-haskell, th-abstraction, transformers - , transformers-compat - }: - mkDerivation { - pname = "deriving-compat"; version = "0.4.2"; sha256 = "0vwpir5sd0x0r5ml83qg9hrwyq1s2psalpl8m007mh3hr8d4wgvz"; libraryHaskellDepends = [ @@ -62462,7 +62305,6 @@ self: { homepage = "https://github.com/haskell-compat/deriving-compat"; description = "Backports of GHC deriving extensions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "derp" = callPackage @@ -62549,6 +62391,7 @@ self: { homepage = "https://bitbucket.org/jakobeha/descript-lang/src/master/README.md"; description = "Library, interpreter, and CLI for Descript programming language"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "descriptive" = callPackage @@ -62974,6 +62817,7 @@ self: { executableHaskellDepends = [ base dhall optparse-generic text ]; description = "Template text using Dhall"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dhall-to-cabal" = callPackage @@ -63039,6 +62883,7 @@ self: { homepage = "https://github.com/k0001/di"; description = "Typeful hierarchical structured logging using di, mtl and df1"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "di-core" = callPackage @@ -63077,6 +62922,7 @@ self: { homepage = "https://github.com/k0001/di"; description = "Write logs in the df1 format using the di logging framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "di-handle" = callPackage @@ -63091,6 +62937,7 @@ self: { homepage = "https://github.com/k0001/di"; description = "IO support for file handles in di-core"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "di-monad" = callPackage @@ -63107,6 +62954,7 @@ self: { homepage = "https://github.com/k0001/di"; description = "mtl flavoured typeful hierarchical structured logging for di-core"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dia-base" = callPackage @@ -63528,19 +63376,16 @@ self: { "diagrams-postscript" = callPackage ({ mkDerivation, base, containers, data-default-class - , diagrams-core, diagrams-lib, dlist, filepath, hashable, lens - , monoid-extras, mtl, semigroups, split, statestack + , diagrams-core, diagrams-lib, dlist, hashable, lens, monoid-extras + , mtl, semigroups, split, statestack }: mkDerivation { pname = "diagrams-postscript"; - version = "1.4"; - sha256 = "1d4dbwd4qgrlwm0m9spwqklpg3plf0ghrnrah1k6yw900l0z0n7y"; - revision = "1"; - editedCabalFile = "0vmiv3b74nml0ahb7dicq0m0vz2lahzfapln9aby0jb2saa0sf58"; + version = "1.4.1"; + sha256 = "171c53msr2x8da87fghl7jikbmrwy7gdxwhdviixc2y3k4fijn57"; libraryHaskellDepends = [ base containers data-default-class diagrams-core diagrams-lib dlist - filepath hashable lens monoid-extras mtl semigroups split - statestack + hashable lens monoid-extras mtl semigroups split statestack ]; homepage = "http://projects.haskell.org/diagrams/"; description = "Postscript backend for diagrams drawing EDSL"; @@ -63994,6 +63839,7 @@ self: { ]; homepage = "https://github.com/oisdk/difference-monoid#readme"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "difftodo" = callPackage @@ -65846,25 +65692,12 @@ self: { ({ mkDerivation, base, containers, mtl, pretty }: mkDerivation { pname = "djinn-lib"; - version = "0.0.1.2"; - sha256 = "048hs27awl4j9lg04qbnpf8c51mzbgy2afckis19zcswmavi1zn0"; - libraryHaskellDepends = [ base containers mtl pretty ]; - homepage = "http://www.augustsson.net/Darcs/Djinn/"; - description = "Generate Haskell code from a type. Library extracted from djinn package."; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "djinn-lib_0_0_1_3" = callPackage - ({ mkDerivation, base, containers, mtl, pretty }: - mkDerivation { - pname = "djinn-lib"; version = "0.0.1.3"; sha256 = "0r1kby67flpyizj117r5q0q3sj61csqxd44za5r9292hj3cacd9v"; libraryHaskellDepends = [ base containers mtl pretty ]; homepage = "http://www.augustsson.net/Darcs/Djinn/"; description = "Generate Haskell code from a type. Library extracted from djinn package."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "djinn-th" = callPackage @@ -66052,21 +65885,21 @@ self: { "dns" = callPackage ({ mkDerivation, async, attoparsec, auto-update, base - , base64-bytestring, binary, bytestring, conduit, conduit-extra - , containers, cryptonite, doctest, hspec, iproute, mtl, network - , psqueues, QuickCheck, safe, time, word8 + , base64-bytestring, binary, bytestring, containers, cryptonite + , doctest, hspec, iproute, mtl, network, psqueues, QuickCheck, safe + , time, word8 }: mkDerivation { pname = "dns"; - version = "3.0.2"; - sha256 = "193j67jnhxkih3gbfzdx9cpzvqryk4kzc3yhl1yagdg16shrba7i"; + version = "3.0.3"; + sha256 = "0m7xgf5vgh3xj5yrv8hyvhx3lligx1xrnq22a9b6s2prbywyllfv"; libraryHaskellDepends = [ async attoparsec auto-update base base64-bytestring binary - bytestring conduit conduit-extra containers cryptonite iproute mtl - network psqueues safe time + bytestring containers cryptonite iproute mtl network psqueues safe + time ]; testHaskellDepends = [ - base bytestring doctest hspec iproute QuickCheck word8 + base bytestring doctest hspec iproute network QuickCheck word8 ]; testTarget = "spec"; description = "DNS library in Haskell"; @@ -68515,25 +68348,12 @@ self: { ({ mkDerivation, base, directory, filepath, time, unix }: mkDerivation { pname = "easy-file"; - version = "0.2.1"; - sha256 = "0v75081bx4qzlqy29hh639nzlr7dncwza3qxbzm9njc4jarf31pz"; - libraryHaskellDepends = [ base directory filepath time unix ]; - homepage = "http://github.com/kazu-yamamoto/easy-file"; - description = "Cross-platform File handling"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "easy-file_0_2_2" = callPackage - ({ mkDerivation, base, directory, filepath, time, unix }: - mkDerivation { - pname = "easy-file"; version = "0.2.2"; sha256 = "0zmlcz723051qpn8l8vi51c5rx1blwrw4094jcshkmj8p9r2xxaj"; libraryHaskellDepends = [ base directory filepath time unix ]; homepage = "http://github.com/kazu-yamamoto/easy-file"; description = "Cross-platform File handling"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "easyjson" = callPackage @@ -69378,6 +69198,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Either or both"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "either-list-functions" = callPackage @@ -72711,42 +72532,6 @@ self: { , interpolate, lifted-async, lifted-base, machines, monad-control , monad-logger, mono-traversable, mtl, protobuf, random , safe-exceptions, semigroups, stm, stm-chans, tasty, tasty-hspec - , tasty-hunit, text, text-format, time, transformers-base - , unordered-containers, uuid - }: - mkDerivation { - pname = "eventstore"; - version = "1.1.2"; - sha256 = "1f2pqmsppln3p0zfw35hck5784np9hhs3f5f6h6j12k43gyj3847"; - libraryHaskellDepends = [ - aeson array base bifunctors bytestring cereal clock connection - containers dns dotnet-timespan ekg-core exceptions fast-logger - hashable http-client interpolate lifted-async lifted-base machines - monad-control monad-logger mono-traversable mtl protobuf random - safe-exceptions semigroups stm stm-chans text text-format time - transformers-base unordered-containers uuid - ]; - testHaskellDepends = [ - aeson async base bytestring cereal connection containers - dotnet-timespan exceptions fast-logger hashable lifted-async - lifted-base monad-control mono-traversable protobuf safe-exceptions - semigroups stm stm-chans tasty tasty-hspec tasty-hunit text time - transformers-base unordered-containers uuid - ]; - homepage = "https://github.com/YoEight/eventstore#readme"; - description = "EventStore TCP Client"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "eventstore_1_1_3" = callPackage - ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring - , cereal, clock, connection, containers, dns, dotnet-timespan - , ekg-core, exceptions, fast-logger, hashable, http-client - , interpolate, lifted-async, lifted-base, machines, monad-control - , monad-logger, mono-traversable, mtl, protobuf, random - , safe-exceptions, semigroups, stm, stm-chans, tasty, tasty-hspec , tasty-hunit, text, time, transformers-base, unordered-containers , uuid }: @@ -73379,6 +73164,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "exp-cache" = callPackage + ({ mkDerivation, array, base, containers, criterion, deepseq + , hashable, HUnit, psqueues, QuickCheck, random, tasty, tasty-hunit + , tasty-quickcheck, time, unordered-containers + }: + mkDerivation { + pname = "exp-cache"; + version = "0.1.0.0"; + sha256 = "01y5kxskbai7a34xkr1b0clsawj3583m3m7l86zziyjfsbn048nm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base containers deepseq hashable psqueues random time + unordered-containers + ]; + executableHaskellDepends = [ base criterion random ]; + testHaskellDepends = [ + base HUnit QuickCheck random tasty tasty-hunit tasty-quickcheck + ]; + homepage = "https://github.com/ChrisCoffey/exp-cache#readme"; + license = stdenv.lib.licenses.mit; + }) {}; + "exp-extended" = callPackage ({ mkDerivation, base, compensated, log-domain }: mkDerivation { @@ -73472,8 +73280,8 @@ self: { }: mkDerivation { pname = "expiring-containers"; - version = "0.1.2"; - sha256 = "10j5hqlp7bmiywa79xcgp1a87x6a9kxvzdg061innyh08344k0sv"; + version = "0.2"; + sha256 = "1bqcxq42x4s8kj7wpa9iqgaxww6m7vqzkd2dakry1ssy9dv8wp28"; libraryHaskellDepends = [ base containers hashable int-multimap time timestamp unordered-containers @@ -73672,6 +73480,7 @@ self: { testHaskellDepends = [ base singletons text ]; description = "Expressions and Formulae a la carte"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "expressions-z3" = callPackage @@ -73769,29 +73578,6 @@ self: { "extensible" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava, comonad , constraints, deepseq, ghc-prim, hashable, lens, monad-skeleton - , mtl, primitive, profunctors, QuickCheck, semigroups, StateVar - , tagged, template-haskell, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "extensible"; - version = "0.4.8"; - sha256 = "1bm7yqshaknnd50yf6bgb6qxl2lv21pqxhb674v3ifpwx1swrkm2"; - libraryHaskellDepends = [ - aeson base bytestring cassava comonad constraints deepseq ghc-prim - hashable monad-skeleton mtl primitive profunctors QuickCheck - semigroups StateVar tagged template-haskell text transformers - unordered-containers vector - ]; - testHaskellDepends = [ base lens QuickCheck template-haskell ]; - homepage = "https://github.com/fumieval/extensible"; - description = "Extensible, efficient, optics-friendly data types and effects"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "extensible_0_4_9" = callPackage - ({ mkDerivation, aeson, base, bytestring, cassava, comonad - , constraints, deepseq, ghc-prim, hashable, lens, monad-skeleton , mtl, prettyprinter, primitive, profunctors, QuickCheck , semigroups, StateVar, tagged, template-haskell, text, th-lift , transformers, unordered-containers, vector @@ -73810,7 +73596,6 @@ self: { homepage = "https://github.com/fumieval/extensible"; description = "Extensible, efficient, optics-friendly data types and effects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extensible-data" = callPackage @@ -74091,8 +73876,8 @@ self: { }: mkDerivation { pname = "factory"; - version = "0.3.1.4"; - sha256 = "0k5bb0imp001f1sj785qqy9k67wvb91mr4fpdcg5riykiv8j9l1x"; + version = "0.3.2.0"; + sha256 = "1ihyqs8b2rgxny69iqaxh55a2pkamp4mb4i3gcy9c6pphjrbmyz3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74106,7 +73891,7 @@ self: { array base containers data-default deepseq primes QuickCheck random toolshed ]; - homepage = "http://functionalley.eu/Factory/factory.html"; + homepage = "https://functionalley.eu/Factory/factory.html"; description = "Rational arithmetic in an irrational world"; license = "GPL"; }) {}; @@ -80132,6 +79917,7 @@ self: { homepage = "https://github.com/george-steel/frpnow-gtk3"; description = "Program GUIs with GTK3 and frpnow!"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "frpnow-vty" = callPackage @@ -80264,27 +80050,6 @@ self: { }) {}; "fsnotify-conduit" = callPackage - ({ mkDerivation, async, base, conduit, directory, filepath - , fsnotify, hspec, resourcet, temporary, transformers - }: - mkDerivation { - pname = "fsnotify-conduit"; - version = "0.1.0.0"; - sha256 = "17qf175bsn1sw0n4sz3mjd3bcmxy6qmy7df8c6275jfxvr9djnwj"; - libraryHaskellDepends = [ - base conduit directory filepath fsnotify resourcet transformers - ]; - testHaskellDepends = [ - async base conduit directory filepath hspec resourcet temporary - transformers - ]; - homepage = "https://github.com/fpco/fsnotify-conduit#readme"; - description = "Get filesystem notifications as a stream of events"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "fsnotify-conduit_0_1_1_0" = callPackage ({ mkDerivation, base, conduit, directory, filepath, fsnotify , hspec, resourcet, temporary, transformers }: @@ -80947,6 +80712,7 @@ self: { homepage = "https://github.com/tweag/funflow"; description = "Workflows with arrows"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "funion" = callPackage @@ -84466,28 +84232,6 @@ self: { }: mkDerivation { pname = "ghc-prof"; - version = "1.4.1.1"; - sha256 = "1zxk2fs0zykpqklyfwssbi5hfmzm7hc1yx8l8x1fy29qxim3y2z5"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base containers scientific text time - ]; - testHaskellDepends = [ - attoparsec base containers directory filepath process tasty - tasty-hunit temporary text - ]; - homepage = "https://github.com/maoe/ghc-prof"; - description = "Library for parsing GHC time and allocation profiling reports"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-prof_1_4_1_2" = callPackage - ({ mkDerivation, attoparsec, base, containers, directory, filepath - , process, scientific, tasty, tasty-hunit, temporary, text, time - }: - mkDerivation { - pname = "ghc-prof"; version = "1.4.1.2"; sha256 = "0rippzp76g2zn8vhxfkvpf9r2l62lid6525ym6zz1pyq4xzsbqrf"; isLibrary = true; @@ -84502,7 +84246,6 @@ self: { homepage = "https://github.com/maoe/ghc-prof"; description = "Library for parsing GHC time and allocation profiling reports"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-prof-aeson" = callPackage @@ -84664,6 +84407,7 @@ self: { homepage = "https://github.com/mrkkrp/ghc-syntax-highlighter"; description = "Syntax highlighter for Haskell using lexer of GHC itself"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-tcplugins-extra" = callPackage @@ -85423,32 +85167,6 @@ self: { }: mkDerivation { pname = "gi-cairo"; - version = "1.0.15"; - sha256 = "1hm8bcd6j11dimb3ksfjkcqf9wqa9frq1jyjpbr2j5s8srrf7031"; - setupHaskellDepends = [ base Cabal haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers haskell-gi haskell-gi-base - haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ cairo ]; - doHaddock = false; - preCompileBuildDriver = '' - PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" - setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" - ''; - homepage = "https://github.com/haskell-gi/haskell-gi"; - description = "Cairo bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) cairo;}; - - "gi-cairo_1_0_17" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cairo, containers - , haskell-gi, haskell-gi-base, haskell-gi-overloading, text - , transformers - }: - mkDerivation { - pname = "gi-cairo"; version = "1.0.17"; sha256 = "1ax7aly9ahvb18m3zjmy0dk47qfdx5yl15q52c3wp4wa0c5aggax"; setupHaskellDepends = [ base Cabal haskell-gi ]; @@ -91187,6 +90905,7 @@ self: { homepage = "https://grapefruit-project.org/"; description = "GTK+-based backend for declarative user interface programming"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-core" = callPackage @@ -91721,22 +91440,23 @@ self: { "graphviz" = callPackage ({ mkDerivation, base, bytestring, colour, containers, criterion - , deepseq, directory, dlist, fgl, fgl-arbitrary, filepath - , polyparse, process, QuickCheck, temporary, text, transformers - , wl-pprint-text + , deepseq, directory, dlist, fgl, fgl-arbitrary, filepath, hspec + , hspec-discover, mtl, polyparse, process, QuickCheck, temporary + , text, wl-pprint-text }: mkDerivation { pname = "graphviz"; - version = "2999.19.0.0"; - sha256 = "1sh4zqirblgnkmi4pl6fhd084p3mdx242db5wqikzpn9jzqpy2mg"; + version = "2999.20.0.1"; + sha256 = "147pwfswjkpmby55j5dwwhrvxpy63gzybrrq6zs4r22mrkcpjx94"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring colour containers directory dlist fgl filepath - polyparse process temporary text transformers wl-pprint-text + base bytestring colour containers directory dlist fgl filepath mtl + polyparse process temporary text wl-pprint-text ]; testHaskellDepends = [ - base containers fgl fgl-arbitrary filepath QuickCheck text + base containers fgl fgl-arbitrary filepath hspec hspec-discover + QuickCheck text ]; benchmarkHaskellDepends = [ base criterion deepseq text ]; homepage = "http://projects.haskell.org/graphviz/"; @@ -95448,25 +95168,6 @@ self: { }: mkDerivation { pname = "hailgun"; - version = "0.4.1.7"; - sha256 = "1ldh6q96xz2a8frvgq29j3gr8jc2m0rx652215bm8w99mbq4pcri"; - libraryHaskellDepends = [ - aeson base bytestring email-validate exceptions filepath - http-client http-client-tls http-types tagsoup text time - transformers - ]; - homepage = "https://bitbucket.org/robertmassaioli/hailgun"; - description = "Mailgun REST api interface for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hailgun_0_4_1_8" = callPackage - ({ mkDerivation, aeson, base, bytestring, email-validate - , exceptions, filepath, http-client, http-client-tls, http-types - , tagsoup, text, time, transformers - }: - mkDerivation { - pname = "hailgun"; version = "0.4.1.8"; sha256 = "1hyww94b0ndfypk47iffvfxm96m24ygrbm26a820arpcmxkp7k4x"; libraryHaskellDepends = [ @@ -95477,7 +95178,6 @@ self: { homepage = "https://bitbucket.org/robertmassaioli/hailgun"; description = "Mailgun REST api interface for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hailgun-send" = callPackage @@ -96719,6 +96419,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hapistrano_0_3_5_6" = callPackage + ({ mkDerivation, aeson, async, base, directory, filepath + , formatting, gitrev, hspec, mtl, optparse-applicative, path + , path-io, process, stm, temporary, time, transformers, yaml + }: + mkDerivation { + pname = "hapistrano"; + version = "0.3.5.6"; + sha256 = "0viv359hv3wzdhnfzmq4ynbxyr3a347q7ixarwff85nn9zx7kw2c"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base filepath formatting gitrev mtl path process time transformers + ]; + executableHaskellDepends = [ + aeson async base formatting gitrev optparse-applicative path + path-io stm yaml + ]; + testHaskellDepends = [ + base directory filepath hspec mtl path path-io process temporary + ]; + homepage = "https://github.com/stackbuilders/hapistrano"; + description = "A deployment library for Haskell applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "happindicator" = callPackage ({ mkDerivation, array, base, bytestring, containers, glib, gtk , gtk2hs-buildtools, libappindicator-gtk2, mtl @@ -98482,6 +98210,7 @@ self: { homepage = "http://github.com/grwlf/haskdogs"; description = "Generate tags file for Haskell project and its nearest deps"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskeem" = callPackage @@ -100889,14 +100618,15 @@ self: { "haskey-mtl" = callPackage ({ mkDerivation, base, binary, exceptions, haskey, haskey-btree - , lens, mtl, text, transformers + , lens, monad-control, mtl, text, transformers, transformers-base }: mkDerivation { pname = "haskey-mtl"; - version = "0.3.0.1"; - sha256 = "0n0wrk9sh62x87ms3fxnaj68jm91qdjd4265wk8x3lm66xw6vigw"; + version = "0.3.1.0"; + sha256 = "154jny8frg61amsyh15w4n6clj9alp8rsa8qxgg9xh8xj2i01yqz"; libraryHaskellDepends = [ - base exceptions haskey haskey-btree mtl transformers + base exceptions haskey haskey-btree monad-control mtl transformers + transformers-base ]; testHaskellDepends = [ base binary exceptions haskey haskey-btree lens mtl text @@ -101399,6 +101129,7 @@ self: { homepage = "http://github.com/MarcWeber/hasktags"; description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskus-binary" = callPackage @@ -101615,6 +101346,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hasql_1_3" = callPackage + ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring + , bytestring-strict-builder, contravariant, contravariant-extras + , criterion, data-default-class, dlist, hashable, hashtables + , loch-th, mtl, placeholders, postgresql-binary, postgresql-libpq + , profunctors, QuickCheck, quickcheck-instances, rebase, rerebase + , semigroups, tasty, tasty-hunit, tasty-quickcheck, text + , text-builder, transformers, vector + }: + mkDerivation { + pname = "hasql"; + version = "1.3"; + sha256 = "1xqw967jzn8jsyzhfnfyvqgaqr0sb9qppv3knxxvsji15hj5zrid"; + libraryHaskellDepends = [ + attoparsec base base-prelude bytestring bytestring-strict-builder + contravariant contravariant-extras data-default-class dlist + hashable hashtables loch-th mtl placeholders postgresql-binary + postgresql-libpq profunctors semigroups text text-builder + transformers vector + ]; + testHaskellDepends = [ + bug data-default-class QuickCheck quickcheck-instances rebase + rerebase tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ bug criterion rerebase ]; + homepage = "https://github.com/nikita-volkov/hasql"; + description = "An efficient PostgreSQL driver and a flexible mapping API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasql-backend" = callPackage ({ mkDerivation, base, base-prelude, bytestring, either, free , list-t, text, transformers, vector @@ -101665,8 +101427,8 @@ self: { }: mkDerivation { pname = "hasql-cursor-query"; - version = "0.4.4"; - sha256 = "0xbnhgix1g4sf2cpimz77ljiwm79l4lnx1ys7q31rak1fyw7fgs0"; + version = "0.4.4.1"; + sha256 = "1lc3x3pwfahm81pfncky6mqsz6fjyj0szwi4qhf1k1drx36wr3db"; libraryHaskellDepends = [ base base-prelude bytestring contravariant foldl hasql hasql-cursor-transaction hasql-transaction profunctors @@ -101750,23 +101512,6 @@ self: { }: mkDerivation { pname = "hasql-optparse-applicative"; - version = "0.3"; - sha256 = "05i9hij1z67l1sc53swwcmd88544dypc3qkzkh8f4n6nlmv82190"; - libraryHaskellDepends = [ - base-prelude hasql hasql-pool optparse-applicative - ]; - homepage = "https://github.com/sannsyn/hasql-optparse-applicative"; - description = "\"optparse-applicative\" parsers for \"hasql\""; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hasql-optparse-applicative_0_3_0_1" = callPackage - ({ mkDerivation, base-prelude, hasql, hasql-pool - , optparse-applicative - }: - mkDerivation { - pname = "hasql-optparse-applicative"; version = "0.3.0.1"; sha256 = "19a31qg4fj74qcjrf6ng11za7zbywg08hnls4pri816fwkjdjs9k"; libraryHaskellDepends = [ @@ -101897,6 +101642,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hasql-transaction_0_7" = callPackage + ({ mkDerivation, async, base, base-prelude, bytestring + , bytestring-tree-builder, contravariant, contravariant-extras + , hasql, mtl, rebase, transformers + }: + mkDerivation { + pname = "hasql-transaction"; + version = "0.7"; + sha256 = "1kvzj16mw471z2vgm27k0nfwfgf5cq3w6qaqwqz4247p11dkrjyy"; + libraryHaskellDepends = [ + base base-prelude bytestring bytestring-tree-builder contravariant + contravariant-extras hasql mtl transformers + ]; + testHaskellDepends = [ async hasql rebase ]; + homepage = "https://github.com/nikita-volkov/hasql-transaction"; + description = "A composable abstraction over the retryable transactions for Hasql"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hastache" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers , directory, filepath, HUnit, ieee754, mtl, process, syb, text @@ -105054,22 +104819,23 @@ self: { }) {}; "hexmino" = callPackage - ({ mkDerivation, base, containers, directory, filepath, gloss + ({ mkDerivation, base, containers, directory, filepath, gloss, grid , optparse-applicative, random }: mkDerivation { pname = "hexmino"; - version = "0.1.0.0"; - sha256 = "0s8sqpqirnnm9jp1lmifywy7ad6vxpj8k85nfyh4zjqybrs2m2p9"; + version = "0.1.1.0"; + sha256 = "0l6gjjbzz2sa17b8glyiknf1ndwkp3089af52pj8fw6cg9ckvspx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base containers directory filepath gloss optparse-applicative + base containers directory filepath gloss grid optparse-applicative random ]; homepage = "https://github.com/pasqu4le/hexmino"; description = "A small game based on domino-like hexagonal tiles"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hexml" = callPackage @@ -105398,8 +105164,8 @@ self: { }: mkDerivation { pname = "hfmt"; - version = "0.2.1"; - sha256 = "06g3l0qbj1bdrxis9ryl3cgmhs129l1lfiah5kpn0xbv1h3p3id5"; + version = "0.2.2"; + sha256 = "0xjh952djxb490nig2aj9y5461ka33d3qdlrfkxb7iz7pqmmr6fs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105446,23 +105212,6 @@ self: { }: mkDerivation { pname = "hformat"; - version = "0.3.1.0"; - sha256 = "1lf6x8y81jxvynid1k3588kbc7xk331bp6c4hnd8x19l0jvp4shd"; - libraryHaskellDepends = [ - ansi-terminal base base-unicode-symbols text - ]; - testHaskellDepends = [ base base-unicode-symbols hspec text ]; - homepage = "http://github.com/mvoidex/hformat"; - description = "Simple Haskell formatting"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hformat_0_3_2_0" = callPackage - ({ mkDerivation, ansi-terminal, base, base-unicode-symbols, hspec - , text - }: - mkDerivation { - pname = "hformat"; version = "0.3.2.0"; sha256 = "1761gw0g7ar4ls4pzm8vq3k48nckd4lliq7f9s7br961215sjgx9"; libraryHaskellDepends = [ @@ -105472,7 +105221,6 @@ self: { homepage = "http://github.com/mvoidex/hformat"; description = "Simple Haskell formatting"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hfov" = callPackage @@ -106757,6 +106505,7 @@ self: { homepage = "https://github.com/strake/hint.hs"; description = "Runtime Haskell interpreter (GHC API wrapper)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hinterface" = callPackage @@ -113514,8 +113263,8 @@ self: { }: mkDerivation { pname = "hsimport"; - version = "0.8.5"; - sha256 = "05gdzl4h67rjpw2nhk6dvd9l8lmx1kdg4cy9hmk5l36vrk8s9ic6"; + version = "0.8.6"; + sha256 = "0ylbg5bcylc0gql0qvmih66dj1qj8imn31b6bl70mynwkqh96g1d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118518,8 +118267,8 @@ self: { }: mkDerivation { pname = "hw-prim"; - version = "0.5.0.3"; - sha256 = "1cnh8qm4kz4fxh34wn9039dxbb54mwhkls21m5s73q773q9fx4rz"; + version = "0.5.0.5"; + sha256 = "1bl1jfdcp8vpl83qcnq168rnvmpl4kxz7mv94vzal8mi2sw7iilk"; libraryHaskellDepends = [ base bytestring mmap vector ]; testHaskellDepends = [ base bytestring directory exceptions hedgehog hspec @@ -123093,6 +122842,7 @@ self: { homepage = "http://github.com/GregorySchwartz/integreat#readme"; description = "Integrate different assays"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "intel-aes" = callPackage @@ -124136,26 +123886,6 @@ self: { }: mkDerivation { pname = "iproute"; - version = "1.7.4"; - sha256 = "17gcmw9m8c30cm3j5hdcqhpkvbir9js1k6s3ad141yszxymmnq8q"; - libraryHaskellDepends = [ - appar base byteorder containers network - ]; - testHaskellDepends = [ - appar base byteorder containers doctest hspec network QuickCheck - safe - ]; - homepage = "http://www.mew.org/~kazu/proj/iproute/"; - description = "IP Routing Table"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "iproute_1_7_5" = callPackage - ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec - , network, QuickCheck, safe - }: - mkDerivation { - pname = "iproute"; version = "1.7.5"; sha256 = "1vw1nm3s8vz1hqnjnqd3wh5rr4q3m2r4izn5ynhf93h9185qwqzd"; libraryHaskellDepends = [ @@ -124168,7 +123898,6 @@ self: { homepage = "http://www.mew.org/~kazu/proj/iproute/"; description = "IP Routing Table"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iptables-helpers" = callPackage @@ -127113,27 +126842,6 @@ self: { }) {}; "json-rpc-generic" = callPackage - ({ mkDerivation, aeson, aeson-generic-compat, base, bytestring - , containers, dlist, QuickCheck, quickcheck-simple, scientific - , text, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "json-rpc-generic"; - version = "0.2.1.3"; - sha256 = "105v0x610hb8vnbbmfm7myn15vblxkcvcryhgx363wgg0qqyakna"; - libraryHaskellDepends = [ - aeson aeson-generic-compat base bytestring containers dlist - scientific text transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base QuickCheck quickcheck-simple text - ]; - homepage = "http://github.com/khibino/haskell-json-rpc-generic"; - description = "Generic encoder and decode for JSON-RPC"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "json-rpc-generic_0_2_1_4" = callPackage ({ mkDerivation, aeson, aeson-generic-compat, base, containers , dlist, QuickCheck, quickcheck-simple, scientific, text , transformers, unordered-containers, vector @@ -127152,7 +126860,6 @@ self: { homepage = "http://github.com/khibino/haskell-json-rpc-generic"; description = "Generic encoder and decode for JSON-RPC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-rpc-server" = callPackage @@ -129582,6 +129289,7 @@ self: { homepage = "https://github.com/phadej/kleene"; description = "Kleene algebra"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kmeans" = callPackage @@ -132547,8 +132255,8 @@ self: { }: mkDerivation { pname = "layers-game"; - version = "0.5.2"; - sha256 = "1k39264jwysaiyq9f40n332y2xckhwsbh8fpsz4l14qwlvj68vzx"; + version = "0.5.3"; + sha256 = "050l8fd77xhl4fqhl8s1c22gdww3if69mzflgrai9gwq31kiasp3"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -134948,6 +134656,7 @@ self: { homepage = "https://github.com/mvv/lifted-stm"; description = "STM operations lifted through monad transformer stacks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lifted-threads" = callPackage @@ -137536,6 +137245,7 @@ self: { homepage = "https://github.com/greydot/log-effect-syslog"; description = "Syslog functions for log-effect"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "log-elasticsearch" = callPackage @@ -144973,26 +144683,6 @@ self: { }) {}; "mmark-ext" = callPackage - ({ mkDerivation, base, foldl, hspec, lucid, microlens, mmark - , modern-uri, skylighting, text - }: - mkDerivation { - pname = "mmark-ext"; - version = "0.2.0.0"; - sha256 = "1ccfdjsn8z80x2m5p9q17r2hf14zj63nkxkrg9s7knwr1j08gj1k"; - revision = "2"; - editedCabalFile = "0h47hy97mdan3cnxppf0yarmis81irc0c92nm1xv9f6w35li7rkq"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base foldl lucid microlens mmark modern-uri skylighting text - ]; - testHaskellDepends = [ base hspec lucid mmark text ]; - homepage = "https://github.com/mmark-md/mmark-ext"; - description = "Commonly useful extensions for MMark markdown processor"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "mmark-ext_0_2_1_0" = callPackage ({ mkDerivation, base, foldl, hspec, hspec-discover, lucid , microlens, mmark, modern-uri, skylighting, text }: @@ -145009,7 +144699,6 @@ self: { homepage = "https://github.com/mmark-md/mmark-ext"; description = "Commonly useful extensions for the MMark markdown processor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mmorph" = callPackage @@ -147555,39 +147244,6 @@ self: { }: mkDerivation { pname = "morte"; - version = "1.6.18"; - sha256 = "1cnwk2rihbywwkpxw7bd22zh33hkffpaza7d4crr5x2p7rdvhmjp"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base binary containers deepseq Earley formatting http-client - http-client-tls microlens microlens-mtl pipes system-fileio - system-filepath text transformers - ]; - libraryToolDepends = [ alex ]; - executableHaskellDepends = [ - base code-page formatting optparse-applicative text - ]; - testHaskellDepends = [ - base mtl QuickCheck system-filepath tasty tasty-hunit - tasty-quickcheck text transformers - ]; - benchmarkHaskellDepends = [ base criterion system-filepath text ]; - description = "A bare-bones calculus of constructions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "morte_1_6_19" = callPackage - ({ mkDerivation, alex, array, base, binary, code-page, containers - , criterion, deepseq, Earley, formatting, http-client - , http-client-tls, microlens, microlens-mtl, mtl - , optparse-applicative, pipes, QuickCheck, system-fileio - , system-filepath, tasty, tasty-hunit, tasty-quickcheck, text - , transformers - }: - mkDerivation { - pname = "morte"; version = "1.6.19"; sha256 = "1mqkjdn3hr3ihjai9qpcfrbn318pkddnlkck96v8byfmil6d4dph"; isLibrary = true; @@ -147609,7 +147265,6 @@ self: { benchmarkHaskellDepends = [ base criterion system-filepath text ]; description = "A bare-bones calculus of constructions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mosaico-lib" = callPackage @@ -152440,22 +152095,6 @@ self: { }: mkDerivation { pname = "network-simple"; - version = "0.4.0.5"; - sha256 = "1akarns88nhrkm47nl20mg2s2r8in339j2jcv6h0z3gnxc4v8iq9"; - libraryHaskellDepends = [ - base bytestring exceptions network transformers - ]; - homepage = "https://github.com/k0001/network-simple"; - description = "Simple network sockets usage patterns"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "network-simple_0_4_1" = callPackage - ({ mkDerivation, base, bytestring, exceptions, network - , transformers - }: - mkDerivation { - pname = "network-simple"; version = "0.4.1"; sha256 = "07cvvgbp8cbwh1x7ii326d97hfmqwiyiqhkg8dqypzwzfwb3mgkj"; libraryHaskellDepends = [ @@ -152464,7 +152103,6 @@ self: { homepage = "https://github.com/k0001/network-simple"; description = "Simple network sockets usage patterns"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-simple-sockaddr" = callPackage @@ -154565,23 +154203,6 @@ self: { }: mkDerivation { pname = "numbers"; - version = "3000.2.0.1"; - sha256 = "10z1bi5qbc81z5xx2v1ylwcpmcfl1ci7lxrswkgi0dd1wi8havbk"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base QuickCheck test-framework test-framework-quickcheck2 - ]; - homepage = "https://github.com/jwiegley/numbers#readme"; - description = "Various number types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "numbers_3000_2_0_2" = callPackage - ({ mkDerivation, base, QuickCheck, test-framework - , test-framework-quickcheck2 - }: - mkDerivation { - pname = "numbers"; version = "3000.2.0.2"; sha256 = "0xssrf7lbyplkgnbfw1jqkib3w9wgn1d6n85pk86nx63j05y9kph"; libraryHaskellDepends = [ base ]; @@ -154591,7 +154212,6 @@ self: { homepage = "https://github.com/jwiegley/numbers#readme"; description = "Various number types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "numerals" = callPackage @@ -156245,35 +155865,6 @@ self: { ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, contravariant, dotenv, hspec , hspec-discover, multiset, postgresql-simple, pretty - , product-profunctors, profunctors, QuickCheck, semigroups, text - , time, time-locale-compat, transformers, uuid, void - }: - mkDerivation { - pname = "opaleye"; - version = "0.6.1.0"; - sha256 = "0vjiwpdrff4nrs5ww8q3j77ysrq0if20yfk4gy182lr7nzhhwz0l"; - revision = "1"; - editedCabalFile = "07sz4a506hlx8da2ppiglja6hm9ipb2myh6s702ac6xx700cnl7f"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring case-insensitive - contravariant postgresql-simple pretty product-profunctors - profunctors semigroups text time time-locale-compat transformers - uuid void - ]; - testHaskellDepends = [ - aeson base containers contravariant dotenv hspec hspec-discover - multiset postgresql-simple product-profunctors profunctors - QuickCheck semigroups text time transformers - ]; - homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; - description = "An SQL-generating DSL targeting PostgreSQL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "opaleye_0_6_7000_0" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , case-insensitive, containers, contravariant, dotenv, hspec - , hspec-discover, multiset, postgresql-simple, pretty , product-profunctors, profunctors, QuickCheck, scientific , semigroups, text, time, time-locale-compat, transformers, uuid , void @@ -156298,7 +155889,6 @@ self: { homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; description = "An SQL-generating DSL targeting PostgreSQL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opaleye-classy" = callPackage @@ -159293,6 +158883,17 @@ self: { broken = true; }) {lazysmallcheck2012 = null;}; + "panic" = callPackage + ({ mkDerivation, base, gitrev, template-haskell }: + mkDerivation { + pname = "panic"; + version = "0.4.0.0"; + sha256 = "12m18s4d8xvwwf4vhv4p544h03abgkjx7bfwl22gxr1y8f7gb8wl"; + libraryHaskellDepends = [ base gitrev template-haskell ]; + description = "A convenient way to panic"; + license = stdenv.lib.licenses.isc; + }) {}; + "panpipe" = callPackage ({ mkDerivation, base, pandoc, pandoc-types, process, QuickCheck , tasty, tasty-quickcheck, temporary, unix @@ -162339,6 +161940,7 @@ self: { ]; description = "Permutations of finite sets"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "permute" = callPackage @@ -163982,32 +163584,6 @@ self: { }: mkDerivation { pname = "pinboard"; - version = "0.9.12.9"; - sha256 = "0h2w2ah7cqv0blb2pcdlzd4ww1f92x5ixr5ksqdqdcyzij2pbmbn"; - libraryHaskellDepends = [ - aeson base bytestring containers http-client http-client-tls - http-types monad-logger mtl network profunctors random - safe-exceptions text time transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers hspec mtl QuickCheck - safe-exceptions semigroups text time transformers - unordered-containers - ]; - homepage = "https://github.com/jonschoning/pinboard"; - description = "Access to the Pinboard API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "pinboard_0_9_12_10" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, hspec - , http-client, http-client-tls, http-types, monad-logger, mtl - , network, profunctors, QuickCheck, random, safe-exceptions - , semigroups, text, time, transformers, unordered-containers - , vector - }: - mkDerivation { - pname = "pinboard"; version = "0.9.12.10"; sha256 = "0jdhckdlpmgqrp8xy7m285w7kclg8dpl02szl6fd6iwzs8l8vjds"; libraryHaskellDepends = [ @@ -164023,7 +163599,6 @@ self: { homepage = "https://github.com/jonschoning/pinboard"; description = "Access to the Pinboard API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pinch" = callPackage @@ -164305,8 +163880,8 @@ self: { }: mkDerivation { pname = "pipes-binary"; - version = "0.4.1"; - sha256 = "0dyng5pvyjw7bjflzfbrkwq99qzyc4a2rh0nlidjhy95ixs7jvhv"; + version = "0.4.2"; + sha256 = "1s3462i85zd6byr18mfabfmiapb0yy3fnrsaw6mnasw19kyxjngn"; libraryHaskellDepends = [ base binary bytestring ghc-prim pipes pipes-bytestring pipes-parse transformers @@ -164879,6 +164454,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-misc_0_5_0_0" = callPackage + ({ mkDerivation, base, clock, Decimal, hspec, lens, mmorph, mtl + , pipes, pipes-category, pipes-concurrency, semigroups, stm + , transformers + }: + mkDerivation { + pname = "pipes-misc"; + version = "0.5.0.0"; + sha256 = "09ldpgza3yanpbsd6g2nlm352fwynq38sf226yp5kip0dqwpwbjf"; + libraryHaskellDepends = [ + base clock Decimal lens mmorph mtl pipes pipes-category + pipes-concurrency semigroups stm transformers + ]; + testHaskellDepends = [ + base hspec lens mmorph pipes pipes-concurrency stm transformers + ]; + homepage = "https://github.com/louispan/pipes-misc#readme"; + description = "Miscellaneous utilities for pipes, required by glazier-tutorial"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-mongodb" = callPackage ({ mkDerivation, base, monad-control, mongoDB, pipes, text }: mkDerivation { @@ -164894,25 +164491,6 @@ self: { }) {}; "pipes-network" = callPackage - ({ mkDerivation, base, bytestring, network, network-simple, pipes - , pipes-safe, transformers - }: - mkDerivation { - pname = "pipes-network"; - version = "0.6.4.1"; - sha256 = "1bx0a7whir2g83q80m145nl13271sfl5jrvdjlaailp2g3n4lqm8"; - revision = "1"; - editedCabalFile = "0i7iyzsj6hax7k66rcrkqgkd7z5z65ak77jmg9mdlm13q12r6kih"; - libraryHaskellDepends = [ - base bytestring network network-simple pipes pipes-safe - transformers - ]; - homepage = "https://github.com/k0001/pipes-network"; - description = "Use network sockets together with the pipes library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pipes-network_0_6_5" = callPackage ({ mkDerivation, base, bytestring, exceptions, network , network-simple, pipes, pipes-safe, transformers }: @@ -164927,7 +164505,6 @@ self: { homepage = "https://github.com/k0001/pipes-network"; description = "Use network sockets together with the pipes library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-network-tls" = callPackage @@ -167451,38 +167028,6 @@ self: { , conversion-bytestring, conversion-text, criterion, json-ast , loch-th, network-ip, placeholders, postgresql-libpq, QuickCheck , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, text, time, transformers - , unordered-containers, uuid, vector - }: - mkDerivation { - pname = "postgresql-binary"; - version = "0.12.1"; - sha256 = "1kb52676dz76z7blvzrfsbwaa1harnrmg0zhwlhg429d21n9y2m2"; - libraryHaskellDepends = [ - aeson base base-prelude binary-parser bytestring - bytestring-strict-builder containers loch-th network-ip - placeholders scientific text time transformers unordered-containers - uuid vector - ]; - testHaskellDepends = [ - aeson conversion conversion-bytestring conversion-text json-ast - loch-th network-ip placeholders postgresql-libpq QuickCheck - quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck - tasty-smallcheck - ]; - benchmarkHaskellDepends = [ criterion rerebase ]; - homepage = "https://github.com/nikita-volkov/postgresql-binary"; - description = "Encoders and decoders for the PostgreSQL's binary format"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "postgresql-binary_0_12_1_1" = callPackage - ({ mkDerivation, aeson, base, base-prelude, binary-parser - , bytestring, bytestring-strict-builder, containers, conversion - , conversion-bytestring, conversion-text, criterion, json-ast - , loch-th, network-ip, placeholders, postgresql-libpq, QuickCheck - , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit , tasty-quickcheck, text, time, transformers, unordered-containers , uuid, vector }: @@ -171127,6 +170672,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "protobuf_0_2_1_2" = callPackage + ({ mkDerivation, base, base-orphans, bytestring, cereal, containers + , data-binary-ieee754, deepseq, hex, HUnit, mtl, QuickCheck, tagged + , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers + }: + mkDerivation { + pname = "protobuf"; + version = "0.2.1.2"; + sha256 = "1php9pydbh2jyr5x6h1i218w8kqwys5aniz2zm1hapv6ia8p3j5k"; + libraryHaskellDepends = [ + base base-orphans bytestring cereal data-binary-ieee754 deepseq mtl + text unordered-containers + ]; + testHaskellDepends = [ + base bytestring cereal containers hex HUnit mtl QuickCheck tagged + tasty tasty-hunit tasty-quickcheck text unordered-containers + ]; + homepage = "https://github.com/alphaHeavy/protobuf"; + description = "Google Protocol Buffers via GHC.Generics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protobuf-native" = callPackage ({ mkDerivation, base, bytestring, cereal, cplusplus-th, criterion , hprotoc-fork, protobuf, protocol-buffers-fork, QuickCheck @@ -174720,31 +174288,6 @@ self: { }: mkDerivation { pname = "rakuten"; - version = "0.1.1.2"; - sha256 = "153801dij5i5byf151xf39anz005i3w7xmmkk434xr6zxc8jm604"; - libraryHaskellDepends = [ - aeson base bytestring connection constraints data-default-class - extensible http-api-data http-client http-client-tls http-types - lens req text - ]; - testHaskellDepends = [ - aeson base bytestring connection constraints data-default-class - extensible hspec http-api-data http-client http-client-tls - http-types lens req servant-server text warp - ]; - homepage = "https://github.com/matsubara0507/rakuten#readme"; - description = "The Rakuten API in Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "rakuten_0_1_1_3" = callPackage - ({ mkDerivation, aeson, base, bytestring, connection, constraints - , data-default-class, extensible, hspec, http-api-data, http-client - , http-client-tls, http-types, lens, req, servant-server, text - , warp - }: - mkDerivation { - pname = "rakuten"; version = "0.1.1.3"; sha256 = "1c578rmjrb8x26c9b0fraz2l6a7d01wky8arzwa1kigfgw9ihqxh"; libraryHaskellDepends = [ @@ -174760,7 +174303,6 @@ self: { homepage = "https://github.com/matsubara0507/rakuten#readme"; description = "The Rakuten API in Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ralist" = callPackage @@ -175214,20 +174756,16 @@ self: { }) {}; "range-set-list" = callPackage - ({ mkDerivation, base, containers, deepseq, hashable, semigroups - , tasty, tasty-quickcheck + ({ mkDerivation, base, containers, deepseq, hashable, tasty + , tasty-quickcheck }: mkDerivation { pname = "range-set-list"; - version = "0.1.2.0"; - sha256 = "0rxb5dq228xypnilqvjyn97knlzfc7fl771w4qgziwfw8zs9qx1v"; - revision = "1"; - editedCabalFile = "061xbyarcjr4bcb08a5xyzqiyvagn9729p6hk5kzayzlkscx16j2"; - libraryHaskellDepends = [ - base containers deepseq hashable semigroups - ]; + version = "0.1.2.1"; + sha256 = "06f8z9rmk2phmds9wv95y2xvjhfx8dr9jbqlv4ybv8m21283x0kw"; + libraryHaskellDepends = [ base containers deepseq hashable ]; testHaskellDepends = [ - base containers deepseq hashable semigroups tasty tasty-quickcheck + base containers deepseq hashable tasty tasty-quickcheck ]; homepage = "https://github.com/phadej/range-set-list#readme"; description = "Memory efficient sets with ranges of elements"; @@ -176287,8 +175825,8 @@ self: { }: mkDerivation { pname = "reactive-banana-automation"; - version = "0.4.0"; - sha256 = "1zc24p1jqild85k049ixbfcdhxdy66l4m5ddr1g3bkxq8apilnrr"; + version = "0.5.0"; + sha256 = "10lg4s6c29xb1j9icda1aywh64ybnk7d3hw3wl69rcwlqp52635a"; libraryHaskellDepends = [ base reactive-banana stm time transformers ]; @@ -189387,8 +188925,8 @@ self: { ({ mkDerivation, base, containers, mtl, syb }: mkDerivation { pname = "set-extra"; - version = "1.4"; - sha256 = "0cwppi2kyqcyn338nmpmkyvwhn7xcp7yfgkgpsmmkwhin0hyxnr9"; + version = "1.4.1"; + sha256 = "10kbvd09hp12rlfkc15xqiglrbxzi7gchb0aazqyg77ah66wjn10"; libraryHaskellDepends = [ base containers mtl syb ]; homepage = "https://github.com/ddssff/set-extra"; description = "Functions that could be added to Data.Set."; @@ -190897,6 +190435,7 @@ self: { ]; description = "Implementation of Shivers' Control-Flow Analysis"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shoap" = callPackage @@ -191753,8 +191292,8 @@ self: { }: mkDerivation { pname = "simple-log"; - version = "0.9.3"; - sha256 = "0i58x3gasg1gda7yx9r155ap6w7mamafcqi5jpq4adm9wx4gy4ph"; + version = "0.9.4"; + sha256 = "0chp90h9112sxa7ds0ldzdp59i6b1vy7chkqcb6d5mb9faq6vjqi"; libraryHaskellDepends = [ async base base-unicode-symbols containers data-default deepseq directory exceptions filepath hformat microlens microlens-platform @@ -193511,25 +193050,12 @@ self: { ({ mkDerivation, base, ghc-prim, logict, mtl, pretty }: mkDerivation { pname = "smallcheck"; - version = "1.1.3.1"; - sha256 = "1lmx0sxkhryra7laln8m7z0518jshahsvz121xybajjcz9pz3xcz"; - libraryHaskellDepends = [ base ghc-prim logict mtl pretty ]; - homepage = "https://github.com/feuerbach/smallcheck"; - description = "A property-based testing library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "smallcheck_1_1_4" = callPackage - ({ mkDerivation, base, ghc-prim, logict, mtl, pretty }: - mkDerivation { - pname = "smallcheck"; version = "1.1.4"; sha256 = "0x2p9rfsx0hvcmsq7v1m5qdgs9mvf4zrcpz4wywn4q8mr8hb416y"; libraryHaskellDepends = [ base ghc-prim logict mtl pretty ]; homepage = "https://github.com/feuerbach/smallcheck"; description = "A property-based testing library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smallcheck-laws" = callPackage @@ -199785,6 +199311,7 @@ self: { homepage = "https://github.com/jonpetterbergman/step-function"; description = "Staircase functions or piecewise constant functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stepwise" = callPackage @@ -201153,8 +200680,8 @@ self: { }: mkDerivation { pname = "streaming-with"; - version = "0.2.1.1"; - sha256 = "0wyq183z10sr0sdx28n316x22f4h8v67cg164qir3fb7q09pmqbg"; + version = "0.2.2.1"; + sha256 = "005krn43z92x1v8w8pgfx489h3livkklgrr7s2i2wijgsz55xp09"; libraryHaskellDepends = [ base exceptions managed streaming-bytestring temporary transformers ]; @@ -202378,6 +201905,7 @@ self: { homepage = "http://github.com/GregorySchwartz/subsample#readme"; description = "Subsample data"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "substring-parser" = callPackage @@ -204969,6 +204497,7 @@ self: { homepage = "http://github.com/taffybar/taffybar"; description = "A desktop bar similar to xmobar, but with more GUI"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tag-bits" = callPackage @@ -205908,24 +205437,6 @@ self: { }: mkDerivation { pname = "tasty-ant-xml"; - version = "1.1.3"; - sha256 = "0nxrvxk83mv29yhywswg21q156zdzs02xrwqambnz78pldsrbk4n"; - libraryHaskellDepends = [ - base containers directory filepath generic-deriving ghc-prim mtl - stm tagged tasty transformers xml - ]; - homepage = "http://github.com/ocharles/tasty-ant-xml"; - description = "Render tasty output to XML for Jenkins"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tasty-ant-xml_1_1_4" = callPackage - ({ mkDerivation, base, containers, directory, filepath - , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers - , xml - }: - mkDerivation { - pname = "tasty-ant-xml"; version = "1.1.4"; sha256 = "0v0gsb90kh6hwlgxbclzawsskywc6yf7n8xhiifia97l4y0yx2m8"; libraryHaskellDepends = [ @@ -205935,7 +205446,6 @@ self: { homepage = "http://github.com/ocharles/tasty-ant-xml"; description = "Render tasty output to XML for Jenkins"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-auto" = callPackage @@ -206344,23 +205854,6 @@ self: { }: mkDerivation { pname = "tasty-rerun"; - version = "1.1.11"; - sha256 = "0nk2qfdhdl71xcr0rwixmwwsyr74dy4hjwalhs4p4am2bhpfva5s"; - libraryHaskellDepends = [ - base containers mtl optparse-applicative reducers split stm tagged - tasty transformers - ]; - homepage = "http://github.com/ocharles/tasty-rerun"; - description = "Run tests by filtering the test tree depending on the result of previous test runs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tasty-rerun_1_1_12" = callPackage - ({ mkDerivation, base, containers, mtl, optparse-applicative - , reducers, split, stm, tagged, tasty, transformers - }: - mkDerivation { - pname = "tasty-rerun"; version = "1.1.12"; sha256 = "05lp4zy6lwd916snq6hs43848n62j9vdfl3s8sfivqydrax0vvd8"; libraryHaskellDepends = [ @@ -206370,7 +205863,6 @@ self: { homepage = "http://github.com/ocharles/tasty-rerun"; description = "Run tests by filtering the test tree depending on the result of previous test runs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-silver" = callPackage @@ -206415,24 +205907,6 @@ self: { }: mkDerivation { pname = "tasty-stats"; - version = "0.2.0.3"; - sha256 = "1jyywffrs270rvf8k9zc82b7fqqv6x1czk6qlbi6sq9z1wgs5w1b"; - revision = "2"; - editedCabalFile = "1gkan66glb235kakvwkidmxd0cn7s9405w3njiwa5k6cvkpkny4x"; - libraryHaskellDepends = [ - base containers directory process stm tagged tasty time - ]; - homepage = "https://github.com/minad/tasty-stats#readme"; - description = "Collect statistics of your Tasty testsuite in a CSV file"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tasty-stats_0_2_0_4" = callPackage - ({ mkDerivation, base, containers, directory, process, stm, tagged - , tasty, time - }: - mkDerivation { - pname = "tasty-stats"; version = "0.2.0.4"; sha256 = "0z244l1yl1m77i4nvs9db2v6a2ydgcpgyc78hzgfyin7as002kd6"; libraryHaskellDepends = [ @@ -206441,7 +205915,6 @@ self: { homepage = "https://github.com/minad/tasty-stats#readme"; description = "Collect statistics of your Tasty testsuite"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-tap" = callPackage @@ -208797,6 +208270,7 @@ self: { ]; description = "ICU transliteration"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) icu;}; "text-json-qq" = callPackage @@ -209959,19 +209433,6 @@ self: { }) {}; "th-lift" = callPackage - ({ mkDerivation, base, ghc-prim, template-haskell }: - mkDerivation { - pname = "th-lift"; - version = "0.7.8"; - sha256 = "0ay10b78x3969rpqqrgzy8srkl6iby2cljbf3mm17na8x22k7y1c"; - libraryHaskellDepends = [ base ghc-prim template-haskell ]; - testHaskellDepends = [ base ghc-prim template-haskell ]; - homepage = "http://github.com/mboes/th-lift"; - description = "Derive Template Haskell's Lift class for datatypes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-lift_0_7_10" = callPackage ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction }: mkDerivation { @@ -209985,7 +209446,6 @@ self: { homepage = "http://github.com/mboes/th-lift"; description = "Derive Template Haskell's Lift class for datatypes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-lift-instances" = callPackage @@ -210588,6 +210048,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/ThreadScope"; description = "A graphical tool for profiling parallel Haskell programs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "threefish" = callPackage @@ -212009,6 +211470,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tintin" = callPackage + ({ mkDerivation, base, clay, data-has, directory, frontmatter + , inliterate, lucid, optparse-generic, process, temporary, text + , universum, yaml + }: + mkDerivation { + pname = "tintin"; + version = "1.2.4"; + sha256 = "1jfnw911jfa9wn1inldz3qry238hrl276yb9f690c59yb3zcnvjh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base clay data-has directory frontmatter inliterate lucid process + temporary text universum yaml + ]; + executableHaskellDepends = [ base optparse-generic universum ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/theam/tintin#readme"; + description = "A softer alternative to Haddock"; + license = stdenv.lib.licenses.asl20; + }) {}; + "tiny-scheduler" = callPackage ({ mkDerivation, async, base, time }: mkDerivation { @@ -212766,8 +212249,8 @@ self: { }: mkDerivation { pname = "tomland"; - version = "0.0.0"; - sha256 = "1z6xlaw7fvl95h5nhd1r87bn8y3xv5gmfwfvryaj7hn06ghw13z2"; + version = "0.1.0"; + sha256 = "1f31awp7qy1npm4nnyk25lf4cng942mbfm7mmvglr0h7c1y11wpc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -214855,6 +214338,7 @@ self: { homepage = "https://github.com/entropia/tip-toi-reveng"; description = "Working with files for the Tiptoi® pen"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tubes" = callPackage @@ -217653,6 +217137,7 @@ self: { homepage = "https://github.com/singpolyma/unexceptionalio-trans"; description = "A wrapper around UnexceptionalIO using monad transformers"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unfoldable" = callPackage @@ -221533,8 +221018,8 @@ self: { ({ mkDerivation, base, bytes, tasty, tasty-quickcheck, vector }: mkDerivation { pname = "vector-bytes-instances"; - version = "0.1"; - sha256 = "1bmss8s8cp123s77dppma7k3p0b8cnhk16li5hnm369264h0zfga"; + version = "0.1.1"; + sha256 = "0i4cxgm984qs5ldp1x7m9blxh8wd5y8acy2ic8kpgaak8pzycrkn"; libraryHaskellDepends = [ base bytes vector ]; testHaskellDepends = [ base bytes tasty tasty-quickcheck vector ]; homepage = "https://github.com/k0001/vector-bytes-instances"; @@ -222031,6 +221516,7 @@ self: { ]; description = "An intermediate language for Hoare logic style verification"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "verify" = callPackage @@ -224473,23 +223959,6 @@ self: { }) {}; "wai-session" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, containers - , cookie, http-types, StateVar, time, transformers, vault, wai - }: - mkDerivation { - pname = "wai-session"; - version = "0.3.2"; - sha256 = "09l3gj8l127iybr8h4xcjxxcgz5b1mcy5iyyaidixnzi7jlrqww3"; - libraryHaskellDepends = [ - base blaze-builder bytestring containers cookie http-types StateVar - time transformers vault wai - ]; - homepage = "https://github.com/singpolyma/wai-session"; - description = "Flexible session middleware for WAI"; - license = "unknown"; - }) {}; - - "wai-session_0_3_3" = callPackage ({ mkDerivation, base, blaze-builder, bytestring , bytestring-builder, containers, cookie, entropy, http-types , StateVar, time, transformers, vault, wai @@ -224505,7 +223974,6 @@ self: { homepage = "https://github.com/singpolyma/wai-session"; description = "Flexible session middleware for WAI"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-session-alt" = callPackage @@ -225589,8 +225057,8 @@ self: { }: mkDerivation { pname = "web3"; - version = "0.7.2.0"; - sha256 = "15d0l5cvrncwmy27qk7y7f54snw1fjcsll52sdlmk3v2mpf6nppn"; + version = "0.7.3.0"; + sha256 = "1ff52krn6vylz8fjbj6224q48lg6cz4glg6xl9sgrz36ayliv0mg"; libraryHaskellDepends = [ aeson async base basement bytestring cereal cryptonite data-default exceptions generics-sop http-client machines memory mtl parsec @@ -226159,22 +225627,6 @@ self: { }: mkDerivation { pname = "websockets-snap"; - version = "0.10.2.5"; - sha256 = "14kxk6x5pygxlyn6421lkmc3lld5r545zq5qx6098mgn6bg2yknj"; - libraryHaskellDepends = [ - base bytestring bytestring-builder io-streams mtl snap-core - snap-server websockets - ]; - description = "Snap integration for the websockets library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "websockets-snap_0_10_3_0" = callPackage - ({ mkDerivation, base, bytestring, bytestring-builder, io-streams - , mtl, snap-core, snap-server, websockets - }: - mkDerivation { - pname = "websockets-snap"; version = "0.10.3.0"; sha256 = "1r1v6ypnaap99vy2gh3lmghqv2y3zaaq0wiv4d2bn49179c40jmk"; libraryHaskellDepends = [ @@ -226183,7 +225635,6 @@ self: { ]; description = "Snap integration for the websockets library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webwire" = callPackage @@ -226265,21 +225716,6 @@ self: { ({ mkDerivation, base, deepseq, mtl, process, split, temporary }: mkDerivation { pname = "weigh"; - version = "0.0.11"; - sha256 = "0q4l2npli78w3p74rsh56q1azwh07856ckip9v3vmw53xzx0n42l"; - libraryHaskellDepends = [ - base deepseq mtl process split temporary - ]; - testHaskellDepends = [ base deepseq ]; - homepage = "https://github.com/fpco/weigh#readme"; - description = "Measure allocations of a Haskell functions/values"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "weigh_0_0_12" = callPackage - ({ mkDerivation, base, deepseq, mtl, process, split, temporary }: - mkDerivation { - pname = "weigh"; version = "0.0.12"; sha256 = "0zw2a997gxgdzqmd7j730kxgynzmjvvlkw84dajmfzf1v9pbij7x"; libraryHaskellDepends = [ @@ -226289,7 +225725,6 @@ self: { homepage = "https://github.com/fpco/weigh#readme"; description = "Measure allocations of a Haskell functions/values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "weighted" = callPackage @@ -227279,6 +226714,7 @@ self: { testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; description = "Words of arbitrary size"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "word-trie" = callPackage @@ -232043,39 +231479,6 @@ self: { }: mkDerivation { pname = "yesod-bin"; - version = "1.6.0.2"; - sha256 = "0x1lr6xm4h3x1ld42xs946aq4sn0g5x147bxqjxr5bfswj7vjk5k"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - attoparsec base base64-bytestring blaze-builder bytestring Cabal - conduit conduit-extra containers data-default-class directory - file-embed filepath fsnotify http-client http-client-tls - http-reverse-proxy http-types network optparse-applicative parsec - process project-template resourcet say shakespeare split stm - streaming-commons tar template-haskell text time transformers - transformers-compat unix-compat unliftio unordered-containers wai - wai-extra warp warp-tls yaml zlib - ]; - homepage = "http://www.yesodweb.com/"; - description = "The yesod helper executable"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "yesod-bin_1_6_0_3" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder - , bytestring, Cabal, conduit, conduit-extra, containers - , data-default-class, directory, file-embed, filepath, fsnotify - , http-client, http-client-tls, http-reverse-proxy, http-types - , network, optparse-applicative, parsec, process, project-template - , resourcet, say, shakespeare, split, stm, streaming-commons, tar - , template-haskell, text, time, transformers, transformers-compat - , unix-compat, unliftio, unordered-containers, wai, wai-extra, warp - , warp-tls, yaml, zlib - }: - mkDerivation { - pname = "yesod-bin"; version = "1.6.0.3"; sha256 = "1p5f6bl4gynm47m1xg1x1xh9nz913i83iprh2xd207359idjknz4"; isLibrary = false; diff --git a/pkgs/development/interpreters/elixir/1.6.nix b/pkgs/development/interpreters/elixir/1.6.nix index 816bd92d5ee..fa631ebb387 100644 --- a/pkgs/development/interpreters/elixir/1.6.nix +++ b/pkgs/development/interpreters/elixir/1.6.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation rec { - version = "1.6.4"; - sha256 = "0li2zb5ha7fdkjnzjbj3dxb9xls8xn6xr23fqwl7gp2697vcw3ws"; + version = "1.6.5"; + sha256 = "0il1fraz6c8qbqv4wrp16jqrkf3xglfa9f3sdm6q4vv8kjf3lxxb"; minimumOTPVersion = "18"; } diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index 8dead564485..ada73a7e818 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "1.11.12"; + version = "1.11.13"; disabled = pythonOlder "2.7"; src = fetchurl { url = "http://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz"; - sha256 = "1szjha338grhf9dq0wpbrqwvak597shsx474pm5j67kn09xqqfad"; + sha256 = "19d4c1rlbhmbvbxvskvqjb2aw4dnf2cqi1hhdh11ykdy1a7gxba6"; }; patches = stdenv.lib.optionals withGdal [ diff --git a/pkgs/development/python-modules/effect/default.nix b/pkgs/development/python-modules/effect/default.nix new file mode 100644 index 00000000000..2738d228339 --- /dev/null +++ b/pkgs/development/python-modules/effect/default.nix @@ -0,0 +1,33 @@ +{ buildPythonPackage +, fetchPypi +, lib +, six +, attrs +, pytest +, testtools +}: +buildPythonPackage rec { + version = "0.11.0"; + pname = "effect"; + + src = fetchPypi { + inherit pname version; + sha256 = "1q75w4magkqd8ggabhhzzxmxakpdnn0vdg7ygj89zdc9yl7561q6"; + }; + checkInputs = [ + pytest + testtools + ]; + propagatedBuildInputs = [ + six + attrs + ]; + checkPhase = '' + pytest . + ''; + meta = with lib; { + description = "Pure effects for Python"; + homepage = https://github.com/python-effect/effect; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pylibconfig2/default.nix b/pkgs/development/python-modules/pylibconfig2/default.nix new file mode 100644 index 00000000000..6cea70c5708 --- /dev/null +++ b/pkgs/development/python-modules/pylibconfig2/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, pyparsing }: +buildPythonPackage rec { + pname = "pylibconfig2"; + version = "0.2.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "1iwm11v0ghv2pq2cyvly7gdwrhxsx6iwi581fz46l0snhgcd4sqq"; + }; + + # tests not included in the distribution + doCheck = false; + + propagatedBuildInputs = [ pyparsing ]; + + meta = with stdenv.lib; { + homepage = https://github.com/heinzK1X/pylibconfig2; + description = "Pure python library for libconfig syntax"; + license = licenses.gpl3; + }; +} diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index fce2fa4fa4b..a059f5658b0 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ]; - buildInputs = stdenv.lib.optional libunwind.supportsHost [ libunwind ]; # support -k + buildInputs = stdenv.lib.optional libunwind.supportsHost libunwind; # support -k configureFlags = stdenv.lib.optional (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV) "--enable-mpers=check"; diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index 0d328c02d37..4ae7f87c54d 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "stunnel-${version}"; - version = "5.44"; + version = "5.45"; src = fetchurl { url = "https://www.stunnel.org/downloads/${name}.tar.gz"; - sha256 = "990a325dbb47d77d88772dd02fbbd27d91b1fea3ece76c9ff4461eca93f12299"; + sha256 = "1qrfb418skdcm7b3v30ixng1ng907f4rfv54zvgz8jwakf1l90jl"; # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256", # not the output of `nix-prefetch-url` }; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 44c11d2814a..795925a221c 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation rec { - name = "tor-0.3.2.10"; + name = "tor-0.3.3.6"; src = fetchurl { url = "https://dist.torproject.org/${name}.tar.gz"; - sha256 = "1vnb2wkcmm8rnz0fqi3k7arl60mpycs8rjn8hvbgv56g3p1pgpv0"; + sha256 = "1drk2h8zd05xrfpx7xn77pcxz0hs4nrq6figw56qk5gkvgv5kg4r"; }; outputs = [ "out" "geoip" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8764741b21b..2a5e5dfddaa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2318,6 +2318,8 @@ with pkgs; fdm = callPackage ../tools/networking/fdm {}; + feedreader = callPackage ../applications/networking/feedreaders/feedreader {}; + ferm = callPackage ../tools/networking/ferm { }; fgallery = callPackage ../tools/graphics/fgallery { @@ -6700,51 +6702,51 @@ with pkgs; llvmPackages_34 = callPackage ../development/compilers/llvm/3.4 ({ isl = isl_0_12; } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv gcc6; + stdenv = overrideCC stdenv buildPackages.gcc6; }); llvmPackages_35 = callPackage ../development/compilers/llvm/3.5 ({ isl = isl_0_14; } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv gcc6; + stdenv = overrideCC stdenv buildPackages.gcc6; }); llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 ({ inherit (stdenvAdapters) overrideCC; - buildLlvmPackages = buildPackages.llvmPackages_37; - targetLlvmPackages = targetPackages.llvmPackages_37; + buildLlvmTools = buildPackages.llvmPackages_37.tools; + targetLlvmLibraries = targetPackages.llvmPackages_37.libraries; } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv gcc6; + stdenv = overrideCC stdenv buildPackages.gcc6; }); llvmPackages_38 = callPackage ../development/compilers/llvm/3.8 ({ inherit (stdenvAdapters) overrideCC; - buildLlvmPackages = buildPackages.llvmPackages_38; - targetLlvmPackages = targetPackages.llvmPackages_38; + buildLlvmTools = buildPackages.llvmPackages_38.tools; + targetLlvmLibraries = targetPackages.llvmPackages_38.libraries; } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv gcc6; + stdenv = overrideCC stdenv buildPackages.gcc6; }); llvmPackages_39 = callPackage ../development/compilers/llvm/3.9 ({ inherit (stdenvAdapters) overrideCC; - buildLlvmPackages = buildPackages.llvmPackages_39; - targetLlvmPackages = targetPackages.llvmPackages_39; + buildLlvmTools = buildPackages.llvmPackages_39.tools; + targetLlvmLibraries = targetPackages.llvmPackages_39.libraries; } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv gcc6; + stdenv = overrideCC stdenv buildPackages.gcc6; }); llvmPackages_4 = callPackage ../development/compilers/llvm/4 ({ inherit (stdenvAdapters) overrideCC; - buildLlvmPackages = buildPackages.llvmPackages_4; - targetLlvmPackages = targetPackages.llvmPackages_4; + buildLlvmTools = buildPackages.llvmPackages_4.tools; + targetLlvmLibraries = targetPackages.llvmPackages_4.libraries; } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv gcc6; + stdenv = overrideCC stdenv buildPackages.gcc6; }); llvmPackages_5 = callPackage ../development/compilers/llvm/5 ({ inherit (stdenvAdapters) overrideCC; - buildLlvmPackages = buildPackages.llvmPackages_5; - targetLlvmPackages = targetPackages.llvmPackages_5; + buildLlvmTools = buildPackages.llvmPackages_5.tools; + targetLlvmLibraries = targetPackages.llvmPackages_5.libraries; } // stdenv.lib.optionalAttrs stdenv.isDarwin { cmake = cmake.override { isBootstrap = true; @@ -6753,15 +6755,15 @@ with pkgs; libxml2 = libxml2.override { pythonSupport = false; }; python2 = callPackage ../development/interpreters/python/cpython/2.7/boot.nix { inherit (darwin) CF configd; }; } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' + stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4' }); llvmPackages_6 = callPackage ../development/compilers/llvm/6 ({ inherit (stdenvAdapters) overrideCC; - buildLlvmPackages = buildPackages.llvmPackages_6; - targetLlvmPackages = targetPackages.llvmPackages_6; + buildLlvmTools = buildPackages.llvmPackages_6.tools; + targetLlvmLibraries = targetPackages.llvmPackages_6.libraries; } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' + stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4' }); manticore = callPackage ../development/compilers/manticore { }; @@ -20934,6 +20936,8 @@ with pkgs; nix-pin = callPackage ../tools/package-management/nix-pin { }; + nix-prefetch-github = callPackage ../build-support/nix-prefetch-github {}; + inherit (callPackages ../tools/package-management/nix-prefetch-scripts { }) nix-prefetch-bzr nix-prefetch-cvs diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b695372fe96..9349cc3711a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5160,6 +5160,7 @@ in { }; }; + effect = callPackage ../development/python-modules/effect {}; elpy = buildPythonPackage rec { name = "elpy-${version}"; @@ -9887,25 +9888,7 @@ in { pybase64 = callPackage ../development/python-modules/pybase64 { }; - pylibconfig2 = buildPythonPackage rec { - name = "pylibconfig2-${version}"; - version = "0.2.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pylibconfig2/${name}.tar.gz"; - sha256 = "0kyg6gldj6hi2jhc5xhi834bb2mcaiy24dvfik963shnldqr7kqg"; - }; - - doCheck = false; - - propagatedBuildInputs = with self ; [ pyparsing ]; - - meta = { - homepage = https://github.com/heinzK1X/pylibconfig2; - description = "Pure python library for libconfig syntax"; - license = licenses.gpl3; - }; - }; + pylibconfig2 = callPackage ../development/python-modules/pylibconfig2 { }; pylibmc = callPackage ../development/python-modules/pylibmc {}; |