diff options
Diffstat (limited to 'pkgs')
655 files changed, 13060 insertions, 20389 deletions
diff --git a/pkgs/applications/altcoins/parity-ui/default.nix b/pkgs/applications/altcoins/parity-ui/default.nix index ec2e571e3f0..c59b2ccb8ac 100644 --- a/pkgs/applications/altcoins/parity-ui/default.nix +++ b/pkgs/applications/altcoins/parity-ui/default.nix @@ -34,8 +34,6 @@ in stdenv.mkDerivation rec { find $out/share/parity-ui -name "*.node" -exec patchelf --set-rpath "${uiEnv.libPath}:$out/share/parity-ui" {} \; - paxmark m $out/share/parity-ui/parity-ui - mkdir -p $out/bin ln -s $out/share/parity-ui/parity-ui $out/bin/parity-ui ''; diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix index 3475f62dcbb..7383623a5ff 100644 --- a/pkgs/applications/audio/ams-lv2/default.nix +++ b/pkgs/applications/audio/ams-lv2/default.nix @@ -21,5 +21,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; + # Build uses `-msse` and `-mfpmath=sse` + badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/applications/audio/artyFX/default.nix b/pkgs/applications/audio/artyFX/default.nix index 9a9095d2fc1..91a0a1f140c 100644 --- a/pkgs/applications/audio/artyFX/default.nix +++ b/pkgs/applications/audio/artyFX/default.nix @@ -20,5 +20,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; + # Build uses `-msse` and `-mfpmath=sse` + badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 450ece6a12f..b11f525e9d2 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # When updating, please check if https://github.com/csound/csound/issues/1078 # has been fixed in the new version so we can use the normal fluidsynth # version and remove fluidsynth 1.x from nixpkgs again. - version = "6.12.0"; + version = "6.12.2"; enableParallelBuilding = true; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "csound"; repo = "csound"; rev = version; - sha256 = "0pv4s54cayvavdp6y30n3r1l5x83x9whyyd2v24y0dh224v3hbxi"; + sha256 = "01krxcf0alw9k7p5sv0s707600an4sl7lhw3bymbwgqrj0v2p9z2"; }; cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index 22342581434..522ffa2a533 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "kid3-${version}"; - version = "3.6.2"; + version = "3.7.0"; src = fetchurl { url = "mirror://sourceforge/project/kid3/kid3/${version}/${name}.tar.gz"; - sha256 = "19yq39fqj19g98cxd4cdgv0f935ckfw0c43cxaxbf27x5f5dj0yz"; + sha256 = "1bj4kq9hklgfp81rbxcjzbxmdgxjqksx7cqnw3m9dc0pnns5jx0x"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 0ff864c0048..59e94e0bdad 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, alsaLib ? null, fftwFloat, fltk13 -, fluidsynth ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null +, fluidsynth_1 ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null , libsamplerate, libsoundio ? null, libsndfile, libvorbis ? null, portaudio ? null , qtbase, qtx11extras, qttools, SDL ? null }: stdenv.mkDerivation rec { name = "lmms-${version}"; - version = "1.2.0-rc6"; + version = "1.2.0-rc7"; src = fetchFromGitHub { owner = "LMMS"; repo = "lmms"; rev = "v${version}"; - sha256 = "1pqir5srfrknfd8nmbz565ymq18ffw8d8k9pbmzggaxvlcr12b25"; + sha256 = "1hshzf2sbdfw37y9rz1ksgvn81kp2n23dp74lsaasc2n7wzjwdis"; fetchSubmodules = true; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { alsaLib fftwFloat fltk13 - fluidsynth + fluidsynth_1 lame libgig libjack2 diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index a268c155a0f..29edf818ce7 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchgit, meson, ninja, pkgconfig , python3, gtk3, gst_all_1, libsecret, libsoup -, appstream-glib, desktop-file-utils, gnome3 +, appstream-glib, desktop-file-utils, totem-pl-parser , gobject-introspection, wrapGAppsHook }: python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "0.9.611"; + version = "0.9.906"; format = "other"; doCheck = false; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "1k78a26sld0xd14c9hr4qv8c7qaq1m8zqk1mzrh4pl7ysqqg9p20"; + sha256 = "1blfq3vdzs3ji3sr1z6dn5c2f8w93zv2k7aa5xpfpfnds4zfd3q6"; }; nativeBuildInputs = with python3.pkgs; [ @@ -28,7 +28,6 @@ python3.pkgs.buildPythonApplication rec { ]; buildInputs = with gst_all_1; [ - gnome3.totem-pl-parser gst-libav gst-plugins-bad gst-plugins-base @@ -38,6 +37,7 @@ python3.pkgs.buildPythonApplication rec { gtk3 libsecret libsoup + totem-pl-parser ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 83608014f14..eafde7957a2 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }: stdenv.mkDerivation rec { - version = "0.5.3"; + version = "0.5.5"; name = "qjackctl-${version}"; # some dependencies such as killall have to be installed additionally src = fetchurl { url = "mirror://sourceforge/qjackctl/${name}.tar.gz"; - sha256 = "0x08af8m5l8qy9av3dlldsg58ny9nc69h1s4i6hqkvj24jwy6fw1"; + sha256 = "1rzzqa39a6llr52vjkjr0a86nc776kmr5xs52qqga8ms9697psz5"; }; buildInputs = [ diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 31b8bce90f4..c10358eed1e 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -29,11 +29,11 @@ # handle that. stdenv.mkDerivation rec { - name = "qmmp-1.2.4"; + name = "qmmp-1.2.5"; src = fetchurl { url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; - sha256 = "0rmfd6h0186b6n4g079d8kshdmp3k5n8w06a1l41m4p3fgq08j92"; + sha256 = "1xs8kg65088yzdhdkymmknkp1s4adzv095f5jhjvy62s8ymyjvnx"; }; buildInputs = diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index 968c5edae63..e540016ac81 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -6,6 +6,7 @@ , intltool , libsoup , gnome3 +, totem-pl-parser , tdb , json-glib , itstool @@ -48,7 +49,7 @@ in stdenv.mkDerivation rec { gtk3 gnome3.libpeas - gnome3.totem-pl-parser + totem-pl-parser gnome3.defaultIconTheme gst_all_1.gstreamer diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index 0b2bd9507e5..55e3b55472b 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -3,12 +3,12 @@ , liblo, liblrdf, libsamplerate, libsndfile, lirc ? null, qtbase }: stdenv.mkDerivation (rec { - version = "18.06"; + version = "18.12"; name = "rosegarden-${version}"; src = fetchurl { url = "mirror://sourceforge/rosegarden/${name}.tar.bz2"; - sha256 = "04qc80sqb2ji42pq3mayhvqqn39hlxzymsywpbpzfpchr19chxx7"; + sha256 = "15i9fm0vkn3wsgahaxqi1j5zs0wc0j3wdwml0x49084gk2p328vb"; }; patchPhase = '' diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix index 8b93175ce35..07ab9b55e5b 100644 --- a/pkgs/applications/audio/whipper/default.nix +++ b/pkgs/applications/audio/whipper/default.nix @@ -3,13 +3,13 @@ python2.pkgs.buildPythonApplication rec { name = "whipper-${version}"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "whipper-team"; repo = "whipper"; rev = "v${version}"; - sha256 = "17cn11c6c62pfhhp6vcslxpanb0czh2xbxq1g6wd7bpmgw38yd8v"; + sha256 = "0ypbgc458i7yvbyvg6wg6agz5yzlwm1v6zw7fmyq9h59xsv27mpr"; }; pythonPath = with python2.pkgs; [ diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index fbed3b432c0..96e39cdc629 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,14 +13,14 @@ let sha256Hash = "117skqjax1xz9plarhdnrw2rwprjpybdc7mx7wggxapyy920vv5r"; }; betaVersion = { - version = "3.3.0.18"; # "Android Studio 3.3 RC 2" - build = "182.5160847"; - sha256Hash = "05rjwvcph0wx0p0hai5z6n9lnyhk3i5yvbvhr51jc8s3k3b6jyi5"; + version = "3.3.0.19"; # "Android Studio 3.3 RC 3" + build = "182.5183351"; + sha256Hash = "1rql4kxjic4qjcd8zssw2mmi55cxpzd0wp5g0kzwk5wybsfdcqhy"; }; latestVersion = { # canary & dev - version = "3.4.0.7"; # "Android Studio 3.4 Canary 8" - build = "183.5173923"; - sha256Hash = "0bf96c9db15rw1k1znz6yxhbrn9q990zy3pkq0nsirnqfpgllvpi"; + version = "3.4.0.8"; # "Android Studio 3.4 Canary 9" + build = "183.5186062"; + sha256Hash = "04i7ys0qzj3039h41q4na6737gl55wpp6hiwfas2h6zwvj25a9z9"; }; in rec { # Old alias diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 710c3ca335a..13dc9e1285b 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -70,9 +70,6 @@ let ln -s ${pkgs.git}/bin/git $dugite/git/libexec/git-core/git find $share -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$share" {} \; - - paxmark m $share/atom - paxmark m $share/resources/app/apm/bin/node ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 9595bfe4d8b..30f381644ac 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -555,12 +555,12 @@ rec { spotbugs = buildEclipseUpdateSite rec { name = "spotbugs-${version}"; - version = "3.1.9"; + version = "3.1.10"; src = fetchzip { stripRoot = false; url = "https://github.com/spotbugs/spotbugs/releases/download/${version}/eclipsePlugin.zip"; - sha256 = "0m68jbyaiz0rm4qq3nnwnvgndzv2c6ay6i29kh0p0vdbanggq3xz"; + sha256 = "0xrflgw0h05z3za784ach2fx6dh04lgmfr426m1q235vv2ibds5y"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 4d4da86d440..5674f64b30a 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -39,10 +39,10 @@ elpaBuild { pname = "ada-mode"; ename = "ada-mode"; - version = "5.3.2"; + version = "6.0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ada-mode-5.3.2.tar"; - sha256 = "1ayp4y8q201fny2far9p2ziji968f2svr7apvfrlwnnpkk3w9lif"; + url = "https://elpa.gnu.org/packages/ada-mode-6.0.1.tar"; + sha256 = "12ryblyqnhqibaffibs7qq3xq9rf5d4y9dishq82pbbh9y8s17hj"; }; packageRequires = [ cl-lib emacs wisi ]; meta = { @@ -478,10 +478,10 @@ elpaBuild { pname = "company"; ename = "company"; - version = "0.9.7"; + version = "0.9.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/company-0.9.7.tar"; - sha256 = "17p61yzbgymr46y6vbz7pfvydp5hfkqckbwficwkpz0nq8gcklhs"; + url = "https://elpa.gnu.org/packages/company-0.9.9.tar"; + sha256 = "1qinkz8gwgc27p3p3c9kddrrwx0jb4w0vgx7jq8fwpfj1n92m1rv"; }; packageRequires = [ emacs ]; meta = { @@ -711,16 +711,16 @@ license = lib.licenses.free; }; }) {}; - diff-hl = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + diff-hl = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "diff-hl"; ename = "diff-hl"; - version = "1.8.4"; + version = "1.8.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/diff-hl-1.8.4.tar"; - sha256 = "0axhidc3cym7a2x4rpxf4745qss9s9ajyg4s9h5b4zn7v7fyp71n"; + url = "https://elpa.gnu.org/packages/diff-hl-1.8.5.tar"; + sha256 = "1vxc7z7c2qs0mx7l5sa4sybi5qbzv0s79flj74p1ynw8dl3qxg3d"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/diff-hl.html"; license = lib.licenses.free; @@ -835,10 +835,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.6"; + version = "0.6.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.6.tar"; - sha256 = "1zj8jvq5l4wlk4734i3isxi4barpivarq2f9kqzkfia7mcspxav8"; + url = "https://elpa.gnu.org/packages/ebdb-0.6.2.tar"; + sha256 = "1b37962mvm80vk5sdk9kfvvxsxn83z5z6zvm20m9997ggl5dv4dz"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -891,16 +891,21 @@ license = lib.licenses.free; }; }) {}; - eglot = callPackage ({ elpaBuild, emacs, fetchurl, jsonrpc, lib }: + eglot = callPackage ({ elpaBuild + , emacs + , fetchurl + , flymake ? null + , jsonrpc + , lib }: elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.1"; + version = "1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eglot-1.1.tar"; - sha256 = "01h4wh87lrd9l50y20gjjkgg760v8ixvbcb3q8jykl29989zw62y"; + url = "https://elpa.gnu.org/packages/eglot-1.3.tar"; + sha256 = "0hndqabxvrq4ak5kx2xlds5pkayi2bfd1f1xk8aidzk5i70f7yry"; }; - packageRequires = [ emacs jsonrpc ]; + packageRequires = [ emacs flymake jsonrpc ]; meta = { homepage = "https://elpa.gnu.org/packages/eglot.html"; license = lib.licenses.free; @@ -915,10 +920,10 @@ elpaBuild { pname = "el-search"; ename = "el-search"; - version = "1.7.15"; + version = "1.8.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/el-search-1.7.15.tar"; - sha256 = "000z8vllz53vmfblsrxjm2nc4h9lcyxw8xxqfxxyl99zhfiikjai"; + url = "https://elpa.gnu.org/packages/el-search-1.8.7.tar"; + sha256 = "0jlalcz8hppra2chmppd6b2g5dz8w6yscqylkx28pd7wy6aadx1r"; }; packageRequires = [ cl-print emacs stream ]; meta = { @@ -1032,10 +1037,10 @@ elpaBuild { pname = "exwm"; ename = "exwm"; - version = "0.20"; + version = "0.21"; src = fetchurl { - url = "https://elpa.gnu.org/packages/exwm-0.20.tar"; - sha256 = "0nhhzbkm0mkj7sd1dy2c19cmn56gyaj9nl8kgy86h4fp63hjaz04"; + url = "https://elpa.gnu.org/packages/exwm-0.21.tar"; + sha256 = "07ng1pgsnc3isfsyzh2gfc7391p9il8lb5xqf1z6yqn20w7k6xzj"; }; packageRequires = [ xelb ]; meta = { @@ -1088,6 +1093,21 @@ license = lib.licenses.free; }; }) {}; + flymake = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "flymake"; + ename = "flymake"; + version = "1.0.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/flymake-1.0.3.el"; + sha256 = "1algny2zhcl4vc7kp5czcqvxzpgqfjnz2rnkv26r0ylxig3s98v7"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/flymake.html"; + license = lib.licenses.free; + }; + }) {}; fountain-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "fountain-mode"; @@ -1197,10 +1217,10 @@ elpaBuild { pname = "gnorb"; ename = "gnorb"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnorb-1.6.0.tar"; - sha256 = "0nssrnrf083mw7kllp0hkxdkklvildzmslcs1r3zf2hnl1ggfs8y"; + url = "https://elpa.gnu.org/packages/gnorb-1.6.1.tar"; + sha256 = "0n4460hsmcc3l0y3nb3fysvh33cjwgv0a3mkc26xcx8v85zl7m63"; }; packageRequires = [ cl-lib ]; meta = { @@ -1232,10 +1252,10 @@ elpaBuild { pname = "gnus-mock"; ename = "gnus-mock"; - version = "0.3.0"; + version = "0.4.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnus-mock-0.3.0.tar"; - sha256 = "02z3f8njwv480fff57dbrf7nhmwbgm4apzicnzwmip5j4a6w5q0n"; + url = "https://elpa.gnu.org/packages/gnus-mock-0.4.0.tar"; + sha256 = "058bd4f8za9bxayrd2j5b05qvk8lxxm8mmfwxb73d7k15z3z3l3s"; }; packageRequires = []; meta = { @@ -1243,6 +1263,21 @@ license = lib.licenses.free; }; }) {}; + gpastel = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "gpastel"; + ename = "gpastel"; + version = "0.3.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/gpastel-0.3.0.el"; + sha256 = "0426y55f7mbfbyjhl2bn0c2cn57jd4d8xvzri2pbqakff8ij470a"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gpastel.html"; + license = lib.licenses.free; + }; + }) {}; heap = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "heap"; @@ -1459,10 +1494,10 @@ elpaBuild { pname = "jsonrpc"; ename = "jsonrpc"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/jsonrpc-1.0.6.el"; - sha256 = "13a19smz8cksv6fgcyxb111csvagkp07z5nl4imyp5b23asgl70p"; + url = "https://elpa.gnu.org/packages/jsonrpc-1.0.7.el"; + sha256 = "19z35gjphl4mlgpznfhlccgipnmbb3c1dvax48f4hw8qwksfcac1"; }; packageRequires = [ emacs ]; meta = { @@ -1858,10 +1893,10 @@ elpaBuild { pname = "nhexl-mode"; ename = "nhexl-mode"; - version = "1.0"; + version = "1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nhexl-mode-1.0.el"; - sha256 = "1bf0jfim41m08ac4p4zxjj6qqw7f86gwiwyvfjg68n2nzbzgz1i9"; + url = "https://elpa.gnu.org/packages/nhexl-mode-1.2.el"; + sha256 = "031h22p564qdvr9khs05qcba06pmsk68cr7zyc7c04hfr3y3ziaf"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1989,6 +2024,21 @@ license = lib.licenses.free; }; }) {}; + org-edna = callPackage ({ elpaBuild, emacs, fetchurl, lib, org, seq }: + elpaBuild { + pname = "org-edna"; + ename = "org-edna"; + version = "1.0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/org-edna-1.0.1.tar"; + sha256 = "0xzyzx3pq1q6d66qcqx38pgxzn160y9yrzpy0ka8ap5xsm7ngn7m"; + }; + packageRequires = [ emacs org seq ]; + meta = { + homepage = "https://elpa.gnu.org/packages/org-edna.html"; + license = lib.licenses.free; + }; + }) {}; orgalist = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "orgalist"; @@ -2113,10 +2163,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "0.3.0"; + version = "0.4.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-0.3.0.el"; - sha256 = "0q74lwklr29c50qgaqly48nj7f49kgxiv70lsvhdy8cg2v082v8k"; + url = "https://elpa.gnu.org/packages/posframe-0.4.2.el"; + sha256 = "1h8vvxvsg41vc1nnglqjs2q0k1yzfsn72skga9s76qa3zxmx6kds"; }; packageRequires = [ emacs ]; meta = { @@ -2522,10 +2572,10 @@ elpaBuild { pname = "ssh-deploy"; ename = "ssh-deploy"; - version = "2.0"; + version = "3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ssh-deploy-2.0.tar"; - sha256 = "0mrgnandnqk25bx3x2a7hdw7pmjiq24w2lad7l2xqaqpwb8r6wgj"; + url = "https://elpa.gnu.org/packages/ssh-deploy-3.0.tar"; + sha256 = "0lv9qwm1dhcd2l2mnhjfpqsz6xx0wabjg5j5sm3425fjsaqws6m7"; }; packageRequires = [ emacs ]; meta = { @@ -2552,10 +2602,10 @@ elpaBuild { pname = "svg"; ename = "svg"; - version = "0.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/svg-0.1.el"; - sha256 = "0v27casnjvjjaalmrbw494sk0zciws037cn6cmcc6rnhj30lzbv5"; + url = "https://elpa.gnu.org/packages/svg-0.2.el"; + sha256 = "14yfi27v3zdzh1chcjiq4l63iwh0vd99wv1z4w7agr33540jybc5"; }; packageRequires = [ emacs ]; meta = { @@ -2578,6 +2628,21 @@ license = lib.licenses.free; }; }) {}; + system-packages = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "system-packages"; + ename = "system-packages"; + version = "1.0.10"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/system-packages-1.0.10.tar"; + sha256 = "1vwf2j0fxrsqmrgc7x5nkkg0vlhwgxppc4w7kb5is6dgrssskpb5"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/system-packages.html"; + license = lib.licenses.free; + }; + }) {}; tNFA = callPackage ({ elpaBuild, fetchurl, lib, queue }: elpaBuild { pname = "tNFA"; @@ -2767,6 +2832,21 @@ license = lib.licenses.free; }; }) {}; + vcl-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "vcl-mode"; + ename = "vcl-mode"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/vcl-mode-1.1.el"; + sha256 = "1r70pmvr95k5f2xphvhliqvyh7al0qabm7wvkamximcssvs38q1h"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/vcl-mode.html"; + license = lib.licenses.free; + }; + }) {}; vdiff = callPackage ({ elpaBuild, emacs, fetchurl, hydra, lib }: elpaBuild { pname = "vdiff"; @@ -2932,16 +3012,16 @@ license = lib.licenses.free; }; }) {}; - wisi = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: + wisi = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }: elpaBuild { pname = "wisi"; ename = "wisi"; - version = "1.1.6"; + version = "2.0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisi-1.1.6.tar"; - sha256 = "0p7hm9l4gbp50rmpqna6jnc1pss2axdd6m6hk9ik4afbz0knzwnk"; + url = "https://elpa.gnu.org/packages/wisi-2.0.1.tar"; + sha256 = "1h0g6y33jrafcabgyi7j700hpv4p56v84c2mlqb334k1g9rq3709"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ cl-lib emacs seq ]; meta = { homepage = "https://elpa.gnu.org/packages/wisi.html"; license = lib.licenses.free; @@ -2966,10 +3046,10 @@ elpaBuild { pname = "xclip"; ename = "xclip"; - version = "1.5"; + version = "1.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xclip-1.5.el"; - sha256 = "1fyqyi0672igjn53xlaj8hzbymkw08pk6wj58ndbrnm410g0h0i9"; + url = "https://elpa.gnu.org/packages/xclip-1.7.el"; + sha256 = "0jpy3zzbyb16vqa9l6m45crzlypwvscvs76h8lci7kvp91kq954r"; }; packageRequires = []; meta = { @@ -3044,10 +3124,10 @@ elpaBuild { pname = "zones"; ename = "zones"; - version = "2018.11.13"; + version = "2018.11.21"; src = fetchurl { - url = "https://elpa.gnu.org/packages/zones-2018.11.13.el"; - sha256 = "0716m9s5qjp5w3gdlx0p53qrfylw6mhdmic88qmsndmhkijsrax4"; + url = "https://elpa.gnu.org/packages/zones-2018.11.21.el"; + sha256 = "0s68mnynjd08gyga7xdnb0zy3irsxl1jryidpcrkzg821vfrk11i"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 479fb91acfe..d97b0729528 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20181119"; + version = "20181217"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20181119.tar"; - sha256 = "0li6mx0kv70js3mlw7wxk1yi8kgc3nxnb87kdb7jy68xh4lsila7"; + url = "http://orgmode.org/elpa/org-20181217.tar"; + sha256 = "0j301z0429dnk1d3bn7524y848vp9il41sxpm9z9hs7gpzfdcw28"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20181119"; + version = "20181217"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20181119.tar"; - sha256 = "0dz0vn2xyidifrwrd604yknyq843i31jcc8qgsi6wib29rh7zzpa"; + url = "http://orgmode.org/elpa/org-plus-contrib-20181217.tar"; + sha256 = "1p7v9246zxkp68kc63550x3w7pmhx1drgj20wmddhvs0bqd3k3ap"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix index 3b32eef4e03..4eb0fecec40 100644 --- a/pkgs/applications/editors/emacs/macport.nix +++ b/pkgs/applications/editors/emacs/macport.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { emacsVersion = "26.1"; emacsName = "emacs-${emacsVersion}"; - macportVersion = "7.2"; + macportVersion = "7.4"; name = "emacs-mac-${emacsVersion}-${macportVersion}"; src = fetchurl { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { macportSrc = fetchurl { url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz"; - sha256 = "0j4dcjv7kh84d6lzzxdzambk6ybbdr2j7r63nkbivssjv29z7zag"; + sha256 = "1xl3rfqw1f3jil20xf6iy0f1hdk9adj8rnv7xhcjq4pymj4w8ka6"; }; hiresSrc = fetchurl { diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix index dbdc13ece2a..b1e26910f1f 100644 --- a/pkgs/applications/editors/featherpad/default.nix +++ b/pkgs/applications/editors/featherpad/default.nix @@ -3,13 +3,13 @@ with qt5; stdenv.mkDerivation rec { - version = "0.9.1"; + version = "0.9.2"; name = "featherpad-${version}"; src = fetchFromGitHub { owner = "tsujan"; repo = "FeatherPad"; rev = "V${version}"; - sha256 = "053j14f6fw31cdnfr8hqpxw6jh2v65z43qchdsymbrk5zji8gxla"; + sha256 = "1kpv8x3m4hiz7q9k7qadgbrys5nyzm7v5mhjyk22hawnp98m9x4q"; }; nativeBuildInputs = [ qmake pkgconfig qttools ]; buildInputs = [ qtbase qtsvg qtx11extras ]; diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix index 1ed09a1caa5..65645dcc969 100644 --- a/pkgs/applications/editors/ghostwriter/default.nix +++ b/pkgs/applications/editors/ghostwriter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake, pkgconfig, qtwebkit, hunspell }: +{ stdenv, fetchFromGitHub, qmake, pkgconfig, qttools, qtwebkit, hunspell }: stdenv.mkDerivation rec { pname = "ghostwriter"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1pqlr08z5syqcq5p282asxwzrrm7c1w94baxyb467swh8yp3fj5m"; }; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ qmake pkgconfig qttools ]; buildInputs = [ qtwebkit hunspell ]; diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index d57e7e856a3..8e0176797d2 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -27,18 +27,19 @@ , sysprof , template-glib , vala +, vte , webkitgtk , wrapGAppsHook }: let - version = "3.30.0"; + version = "3.30.2"; pname = "gnome-builder"; in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1pshzpjy9rk6gijlm97s316aihykzxrmb07vilp17q5857passak"; + sha256 = "05yax7iv9g831xvw9xdc01qc0l7qpmh6rfd692x8cbg76hljxdrr"; }; nativeBuildInputs = [ @@ -64,7 +65,7 @@ in stdenv.mkDerivation { gnome3.devhelp libgit2-glib gnome3.libpeas - gnome3.vte + vte gspell gtk3 gtksourceview4 diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix index 815af2103d5..4f4be05f79e 100644 --- a/pkgs/applications/editors/manuskript/default.nix +++ b/pkgs/applications/editors/manuskript/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "manuskript"; - version = "0.3.0"; + version = "0.8.0"; src = fetchFromGitHub { repo = pname; owner = "olivierkes"; rev = version; - sha256 = "0bqxc4a8kyi6xz1zs0dp85wxl9h4v8lzc6073bbcsn1zg4y59ys7"; + sha256 = "0vqz02p3m9n4hk2jplnklr9s6niqdm5iykab6nblqdm4plb04c34"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 52cdc0bc067..74e8c0e6b43 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "5.4"; + version = "5.5"; name = "rawtherapee-" + version; src = fetchFromGitHub { owner = "Beep6581"; repo = "RawTherapee"; rev = version; - sha256 = "1h2x5biqsb4kfwsffqkyk8ky22qv2a0cjs1s445x9farcr3kwk99"; + sha256 = "13clnx7rwkfa7wxgsim1xdx2pd7gwmmdad1m8a3fvywr20ml8xzk"; }; nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index aef7143f7e0..2f06451438d 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, meson, ninja, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite -, webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json-glib +, webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json-glib, gcr , gettext, desktop-file-utils, gdk_pixbuf, librsvg, wrapGAppsHook , gobject-introspection, itstool, libgdata, python3 }: @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee libgudev gnome3.gexiv2 gnome3.gsettings-desktop-schemas libraw json-glib glib gdk_pixbuf librsvg gnome3.rest - gnome3.gcr gnome3.defaultIconTheme libgdata + gcr gnome3.defaultIconTheme libgdata ]; postPatch = '' diff --git a/pkgs/applications/graphics/tesseract/4.x.nix b/pkgs/applications/graphics/tesseract/4.x.nix deleted file mode 100644 index 2ebca09b831..00000000000 --- a/pkgs/applications/graphics/tesseract/4.x.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkgconfig -, leptonica, libpng, libtiff, icu, pango, opencl-headers - -# Supported list of languages or `null' for all available languages -, enableLanguages ? null -}: - -stdenv.mkDerivation rec { - name = "tesseract-${version}"; - version = "4.0.0"; - - src = fetchFromGitHub { - owner = "tesseract-ocr"; - repo = "tesseract"; - rev = version; - sha256 = "1b5fi2vibc4kk9b30kkk4ais4bw8fbbv24bzr5709194hb81cav8"; - }; - - tessdata = fetchFromGitHub { - owner = "tesseract-ocr"; - repo = "tessdata"; - rev = version; - sha256 = "1chw1ya5zf8aaj2ixr9x013x7vwwwjjmx6f2ag0d6i14lypygy28"; - }; - - nativeBuildInputs = [ pkgconfig autoreconfHook autoconf-archive ]; - buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ]; - - # Copy the .traineddata files of the languages specified in enableLanguages - # into `$out/share/tessdata' and check afterwards if copying was successful. - postInstall = let - mkArg = lang: "-iname ${stdenv.lib.escapeShellArg "${lang}.traineddata"}"; - mkFindArgs = stdenv.lib.concatMapStringsSep " -o " mkArg; - findLangArgs = if enableLanguages != null - then "\\( ${mkFindArgs enableLanguages} \\)" - else "-iname '*.traineddata'"; - in '' - numLangs="$(find "$tessdata" -mindepth 1 -maxdepth 1 -type f \ - ${findLangArgs} -exec cp -t "$out/share/tessdata" {} + -print | wc -l)" - - ${if enableLanguages != null then '' - expected=${toString (builtins.length enableLanguages)} - '' else '' - expected="$(ls -1 "$tessdata/"*.traineddata | wc -l)" - ''} - - if [ "$numLangs" -ne "$expected" ]; then - echo "Expected $expected languages, but $numLangs" \ - "were copied to \`$out/share/tessdata'" >&2 - exit 1 - fi - ''; - - meta = { - description = "OCR engine"; - homepage = https://github.com/tesseract-ocr/tesseract; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix index 7940079d099..840c87de216 100644 --- a/pkgs/applications/graphics/tesseract/default.nix +++ b/pkgs/applications/graphics/tesseract/default.nix @@ -1,67 +1,18 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig -, leptonica, libpng, libtiff, icu, pango, opencl-headers -# Supported list of languages or `null' for all available languages -, enableLanguages ? null -# if you want just a specific list of languages, optionally specify a hash -# to make tessdata a fixed output derivation. -, enableLanguagesHash ? (if enableLanguages == null # all languages - then "1h48xfzabhn0ldbx5ib67cp9607pr0zpblsy8z6fs4knn0zznfnw" - else null) -}: +{ callPackage, lowPrio }: -let tessdata = stdenv.mkDerivation ({ - name = "tessdata"; - src = fetchFromGitHub { - owner = "tesseract-ocr"; - repo = "tessdata"; - rev = "3cf1e2df1fe1d1da29295c9ef0983796c7958b7d"; - # when updating don't forget to update the default value fo enableLanguagesHash - sha256 = "1v4b63v5nzcxr2y3635r19l7lj5smjmc9vfk0wmxlryxncb4vpg7"; - }; - buildCommand = '' - cd $src; - for lang in ${if enableLanguages==null then "*.traineddata" else stdenv.lib.concatMapStringsSep " " (x: x+".traineddata") enableLanguages} ; do - install -Dt $out/share/tessdata $src/$lang ; - done; - ''; - preferLocalBuild = true; - } // (stdenv.lib.optionalAttrs (enableLanguagesHash != null) { - # when a hash is given, we make this a fixed output derivation. - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - outputHash = enableLanguagesHash; - })); +let + base3 = callPackage ./tesseract3.nix {}; + base4 = callPackage ./tesseract4.nix {}; + languages = callPackage ./languages.nix {}; in - -stdenv.mkDerivation rec { - name = "tesseract-${version}"; - version = "3.05.00"; - - src = fetchFromGitHub { - owner = "tesseract-ocr"; - repo = "tesseract"; - rev = version; - sha256 = "11wrpcfl118wxsv2c3w2scznwb48c4547qml42s2bpdz079g8y30"; +{ + tesseract3 = callPackage ./wrapper.nix { + tesseractBase = base3; + languages = languages.v3; }; - enableParallelBuilding = true; - - nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ]; - - LIBLEPT_HEADERSDIR = "${leptonica}/include"; - - postInstall = '' - for i in ${tessdata}/share/tessdata/*; do - ln -s $i $out/share/tessdata; - done - ''; - - meta = { - description = "OCR engine"; - homepage = https://github.com/tesseract-ocr/tesseract; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux ++ darwin; - }; + tesseract4 = lowPrio (callPackage ./wrapper.nix { + tesseractBase = base4; + languages = languages.v4; + }); } diff --git a/pkgs/applications/graphics/tesseract/fetch-language-hashes b/pkgs/applications/graphics/tesseract/fetch-language-hashes new file mode 100755 index 00000000000..c431f1d97c2 --- /dev/null +++ b/pkgs/applications/graphics/tesseract/fetch-language-hashes @@ -0,0 +1,35 @@ +#!/usr/bin/env bash + +# Usage: +# ./fetch-language-hashes <tessdataRev> [<language code>…] +# +# Fetches all languages if no language codes are given. +# +# Example: +# ./fetch-language-hashes 4.0.0 eng spa +# +# Output: +# eng = "0iy0..."; +# spa = "15kw..."; + +set -e + +(( $# >= 1 )) || exit 1 +tessdataRev=$1 +shift + +if (( $# > 0 )); then + langCodes="$@" +else + repoPage=$(curl -fs https://github.com/tesseract-ocr/tessdata/tree/$tessdataRev || { + >&2 echo "Invalid tessdataRev: $tessdataRev" + exit 1 + }) + langCodes=$(echo $(echo "$repoPage" | grep -ohP "(?<=/)[^/]+?(?=\.traineddata)" | sort)) +fi + +for lang in $langCodes; do + url=https://github.com/tesseract-ocr/tessdata/raw/$tessdataRev/$lang.traineddata + hash=$(nix-prefetch-url $url 2>/dev/null) + echo "$lang = \"$hash\";" +done diff --git a/pkgs/applications/graphics/tesseract/languages.nix b/pkgs/applications/graphics/tesseract/languages.nix new file mode 100644 index 00000000000..08512a5cdd9 --- /dev/null +++ b/pkgs/applications/graphics/tesseract/languages.nix @@ -0,0 +1,289 @@ +{ stdenv, lib, fetchurl, fetchFromGitHub }: + +rec { + makeLanguages = { tessdataRev, tessdata ? null, all ? null, languages ? {} }: + let + tessdataSrc = fetchFromGitHub { + owner = "tesseract-ocr"; + repo = "tessdata"; + rev = tessdataRev; + sha256 = tessdata; + }; + + languageFile = lang: sha256: fetchurl { + url = "https://github.com/tesseract-ocr/tessdata/raw/${tessdataRev}/${lang}.traineddata"; + inherit sha256; + }; + in + { + # Use a simple fixed-output derivation for all languages to increase nix eval performance + all = stdenv.mkDerivation { + name = "all"; + buildCommand = '' + mkdir $out + cd ${tessdataSrc} + cp *.traineddata $out + ''; + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = all; + }; + } // (lib.mapAttrs languageFile languages); + + v3 = makeLanguages { + tessdataRev = "3cf1e2df1fe1d1da29295c9ef0983796c7958b7d"; + tessdata = "1v4b63v5nzcxr2y3635r19l7lj5smjmc9vfk0wmxlryxncb4vpg7"; + all = "0yj6h9n6h0kzzcqsn3z87vsi8pa60szp0yiayb0znd0v9my0dqhn"; + + # Run `./fetch-language-hashes <tessdataRev>` to generate these hashes + languages = { + afr = "15dsnzy4i9ai26ilm73gkfj4ck039raa88i6w443c4b1fnay2akf"; + amh = "1wbcsdq3svxga3j1alk61xs72a9fhsfsyjxhp3cwxfaqfhrzg7h4"; + ara = "0nk495gki6jbbnwcl2ybsx4nd02d6qykcjncq0d2g8pbgapqmj91"; + asm = "0c3wq15yphq7x74s2sn3f90k6z1cf5j7ic62z0dynidrv99bddfh"; + aze = "0pz073hxqkx1a1cshlgg5k11lj73s52sdxa7k3020drc314lhaxw"; + aze_cyrl = "0djbfgx28ykcjsn2p0766qrmj256g7vhc7valc3ivsva8b906lxq"; + bel = "04zqy8vik0fcakq6apfp8wjhkkhlg0yn9kmag1lk7s8fy9ax3ws2"; + ben = "0q7812kn5xjm47hcgdcg911lhbgqr7hbvqckfxxm8qw0yjx2cy0m"; + bod = "0rwq7539zzfs8xs0bf1535z1cwkm0yk1ni25f5gjav7nm6qpiaan"; + bos = "1qr04dj7lx347gxpin5nfprbggmxq2mwx8kf3pcc3vb5x3pa57g4"; + bul = "0cyyqgi3i4y9bfzwls0lwljzgd0r8ayfqb4bbvdh4qmbni9x42ya"; + cat = "0kgw8f5pdw9lfbn6cfp5n1s0j8pj3418yx6rsbagzcf1gr36gbr9"; + ceb = "1g1n4np4vhar7wfwx2km5k6kldb600rrl7npfbf75229rar068f1"; + ces = "0zxkkyhpd74i6321nv86pkjb0k7p9cp6m174rbn42nl7jz6qxib0"; + chi_sim = "0k250xr0gk9yh22yqxd0zpxdsrqfzs164kdv5n9rxx1g996yffij"; + chi_tra = "03nxqpd546p0gwfj6pqzbdbv5zjpdddzlpa10xn4nvmks1mmckbp"; + chr = "1k1sg3hap0kd5aa36ysvmhp7r3fynxf0f7lzz814h6p3g250zclb"; + cym = "0d6wbf9cmrrzf66mhcckwdfy3xh2i38r0by9nk6isw9rl7bf7j07"; + dan = "1s1yj56rpzmif3ir3qs4iab744cgpflk7y8812z2665bh61illpr"; + dan_frak = "1bxi53ymib5g0139vfd2pflh7nl5925vqznq3sfgaqx7gdx630vi"; + deu = "0fna7fqk1a8ivd7q2k38vx37qm3vbn183zh4z5zfqb4pgqmb8znb"; + deu_frak = "1y4krkvarg7jxhcq49fgybg4phbn58y9c0z2bm8mnp28jkih1cnb"; + dzo = "1fcz0imi7zxi99762pxfcm5iz2jcbqj3s742magka4ihrxnz07xm"; + ell = "0r0f71jy4y29bg055qvvy93wchi3lh08zz0k9c8l7466b03yvq5v"; + eng = "0vghah8kqcv0n5fnjb88w6siz156ysrc41fckw3f2y8c3sgmqlf0"; + enm = "10y61xv3w1ypgqz5rgb22y5hh1i4zx03cwiqw21ifqvg4xdrln46"; + epo = "1y5lh55mbcx33cm7qlf1dcah8ffycxmlcpzjzx9r6ij14fdd4964"; + equ = "1nqrd0a9jqqh6byy8snfhad1hisrc92dcx44wsy7v4nf40j3mx1s"; + est = "12ll8lq1hjcsq9hh93020w78r7f1rcxcwlvrjqw8j5p3k9jg5a4g"; + eus = "034s9mp7lw1a4yvf2cmbbj2fbqbaq6xnjqh30yn0wq0c0jck96nw"; + fas = "0m61p4byc0kzf75cdn6g18s8hcg9r8ifs34wr85lbsb65kil4ijx"; + fin = "1wac333k0lcd5jwprzg99b10bq8sdc96b9d6275kg9imyqjwcc7q"; + fra = "1ax7i0nw1lwkz4sbrvn4z0lcrcai77ymdpla7qk7yij6s4xb5bw6"; + frk = "16nmr71p93724vk1x5mq4r8vxpwnm448p6dwqv8scg8asch1cidp"; + frm = "00yz3hz7wcralq8wbx1ap4c6b37ac6vnz5bgmxmgdx0kqzibiddn"; + gle = "1n8z8kmn5m628rlzgz5v0iw6h46aalflq5asa1wj5rygx1y2azpa"; + glg = "0fdniayplc3iwmlmvhblarh1gm97dp8rqhhkb8b0clwfd9cj342z"; + grc = "04r2193qcxqyab5998xn8bf7197wiccmjm7iakij8d0c7l61dnxb"; + guj = "0dp8mlxmf0x9wb8dg0c508sdwz03icq94z8ji8jhwgdqgv8hw1al"; + hat = "0793mmlxbb09c8103jhdvlczz647nyn4ykkgd3gwgavncmjh72v8"; + heb = "16za9ff1i3ya6hz75l9v3v7j4039kscxxw21g3i2w5p9zn52hyag"; + hin = "1vnn5wpc724kgib8jbx0kpnnp4al60ivqir72gnbyh6cpnflb6bf"; + hrv = "15rqd6xiv2bdmalb5s6rxvw0yk6w9agn9fli3bvi703q6vpj2yn3"; + hun = "19zzwdxwi3h3vdsgr271i1m87gfpdirk6b1ljw2j8qmfilp4sw56"; + iku = "1v1yvc1194qycjgb4ihh5hpj6472nlbp66dii183514g2dh9x0db"; + ind = "120d4b41wvsgcd1sgy2mp78i9hvi7w03a63078dz1yds0yqdwf1p"; + isl = "003ngk8dfv6dglkq8pmi6jsglrfkc65js5ywh3vvkg7qfqf6qsxz"; + ita = "1lxklk3zc3x3k8yfpp6ygyv7fndgs57dfasc97rh8782ds16wkjs"; + ita_old = "188gby1y51pa1ycyc8y17d16hs5w27yl5ch7xzni98bdjkwbkl1z"; + jav = "1fjyjznjchls5ifbnx2b9xagisgxvgj9lsf39rr9d87sbzdbbwbp"; + jpn = "1wmayj8wh3pfwznjhalad2qzv38mhrzw2sxl71mycvzvpdy9ag1w"; + kan = "0hak4953whw9vd9dzl0hq076kzb19kk45kmfxk03af4k6gb206vg"; + kat = "16k0057cvvdc6snm5svhdv3cr7cw71g74yy8215njjbsi838imi3"; + kat_old = "02gl755d38plyvzwfjqxvjgfqkbjs9rvzx33qfhm2zvmgbwrfrfh"; + kaz = "0hc36w7zz5waycsk220v0r83sg991gd5f5r937mvz44viql80sgm"; + khm = "1gb2nv5qdq5fz9w9xq4fj68p46b62sd1m986ra5qbnskxqizr12s"; + kir = "1b1ing6qqi8qqfh4xpk76rp4gxp69wdjdl5m777ayx3v02d7nhh3"; + kor = "1rldj6f8h1nn5wpx57b0ci7p0fnivnwzgaf0d3576xls26z2wcgv"; + kur = "1cp2pfd6g662gvxi7ywkxfbfq1lwbis888bf1gg8ynzy342mx1ic"; + lao = "03bdaxakmxpbbr9vsnbzzfksvm6js0l5i0ijwl71piqyxqjj1gxf"; + lat = "1q7v7drnwpna9k2l79jbdlxiv1j617rqzjc9d48h3lfrma5z97sj"; + lav = "0fxzyvw7n67rmw2irvlghkf1bii4w47200zv26p0v3a9dwvhc7sg"; + lit = "0f00ggjjqrl94kwwjmjqwajyfprsml0br8vhn2gvn11gaxvm52hm"; + mal = "1i83plhin3m6sq8p92vzlyng5z59gvvqypyh7rnmvdmm9rranx8a"; + mar = "0ay7q53yl3709crvn5l9c9jx7hw6m5d3x2crmvnvczsh83ayfdik"; + mkd = "1q1wadcr4j1dzssyyqz43qmizc6vfqkbivr6xi2p7p4h9rl11x73"; + mlt = "1qp4v6habak1l7xrw322wglvjjndrfp4j7bj8d4npwbzk1sh4s0h"; + msa = "048p6mkx9zr40s9s5vbi0gnizhvqwn0g8i1hf1l8db7igbax5xyj"; + mya = "17nyr5bd42kzvid3421n3mwckd49vzrjhjahd8rnfsmbsy1x382l"; + nep = "154375r32sdmvcnp1ckvgbp3wxvb2xiiypb8bxbsvrabrz4wzjqc"; + nld = "1clwbky71zkz55zd3f8r9hj8fhpnbkply80p1js4fvs7x12r715x"; + nor = "1ynvrz6s0vmlq1xkjd8k2w6bx8770x6v29qgx83d4nl17ngjd459"; + ori = "0dsakc8gnwhs6z5kxc2wdkbn31gkkiqk5vriw0swghychp164aac"; + osd = "1zq0dfliavglmix7zzrqdxz1w01rm1f1x1352bqn8xf4zivdbxcw"; + pan = "1fwdpwkydfmr6drwgkqzn89z12r2rdm02a75vvdxhxg2a9yiwmbv"; + pol = "155z870ygzws476kp7qpzi8jcjcv3jb5px8rbzhnag1fklqr48hx"; + por = "1814cff2rffpzlg4hyyrjzpf5ps2i95rmpa4c8ikblbvrlcv97q8"; + pus = "1iz5nn1zfvn1l9gb1jriwx991d2hwwc7x4k1nvzjlwpzscplx25b"; + ron = "11lr80zhvnnngvwwk01z1d3prfpbh3qbwpl1nl5fp7h09d6n3wzl"; + rus = "1d6a8lg4bmd3np16jds1py3qpkaq4ahnhwghd5r0159y0jpxq00q"; + san = "169f4ajgwn99yfdfrlwfvdgvv1abal7fpdp31sknvq8l7w2sak3g"; + sin = "1411g18r6f6j6f4n0sn7ajgs4gkplb892s6ak0hi9nyyxwv3r1gm"; + slk = "0bxfbrg1nf6px0xzkh6ihdi71fmr1rxxs99qb191k7pm16x2lpds"; + slk_frak = "0zyqnn1y5cyx1y7wzgw743k4584ljl0rhvk2q1ni6jnjx9ciwzqy"; + slv = "1kjn9m9hbwp0m0p2v8c3skpzr6f8x42hz8x48zl22550a7hq8n1h"; + spa = "1npgl8ylvfm60hd4214z8a3lriy1hckhijschrbjpzmwdfcqafgj"; + spa_old = "0w4ivkv8flyn7bjlyjcrcrdnslkvrrfs7l33mvird1jhhkyqd8sx"; + sqi = "15wzvh6qm3yx7yf0k5j7g1imsaqxvq7r2xh6a0xgmkqbyypbbkdf"; + srp = "05blqriv30x02c80ds3x7zhw0y21nc6lkqlv5jwgwnjgw4yfpgrm"; + srp_latn = "0ss8s3q60aq8sd2a3sbnzvp13qqarxnjw4hij8hd9ab5gsjw0nwr"; + swa = "1pwwhx7ldq21cv06cchws8gvwsmkwn5sjcy9z3nk3nbp9qjsf44f"; + swe = "0l10iyn2cr7ibgk0akmpg8725mpwpydawgv3s77izsw7y6xhfr1a"; + syr = "08bxil13wyp5h4hvbxjcys7ypgqgg46rrp653m7gyv5q94ycjgb0"; + tam = "1g155kyba2wjfgzgy48g6yd2csinwbfjdi5r7vw0wm3dh1z39dvz"; + tel = "0fydrcb54b6mmqazb337x4s36i2a64sb4xm7y7g3nqqmk9afsipv"; + tgk = "0f6j37friywj7y132fv0jm6aj4sx8f0b7brspj3pbjqqpi4v5ws0"; + tgl = "0f1r0gicif57qhyw8xaa1sqgny720q3z5cpd5srrn9i6fihaz577"; + tha = "1y2hw55jfpidk95y8qbsiczgg2r2khabac97s1y3gl0v93a44jna"; + tir = "1y7iryhjr83ca4yh5jjz7qlnrx4kbrp0a0p650whjvk2gnv8m98h"; + tur = "0xqnq99b2jb4v74bj95py6wmg14dm31zp5s3l48dmcv6zdgcxg2w"; + uig = "1sdddr15zlb33kd1d7hzi5lfd15bfhqn105d7x6snfpqp7vq4bxv"; + ukr = "0cdwjnfnnmzz7jdn49l96vqgaimclfxcxaw09cm63f5my382r2rg"; + urd = "10xcn1zs2lfswp5yai0ckyg7js587qhr5cf7qib3i35qjbw7nc18"; + uzb = "1jkkd5j6vsx5jv5gwprbfwg1vwh714prm8j446wzvp74brmk949l"; + uzb_cyrl = "1kdia38rgm2qd3ly80a412jyagxxryr09h1nz2d0iw71bmfn4855"; + vie = "1ja18jxxaw282y4jljxpjf1gj15il61vc2ykpfy22vn88wvydxff"; + yid = "1jddd0g8mm5v00z5kb8rbpfs7ppzgq9kzm1xlhhvv960yfdbi6fd"; + }; + }; + + v4 = makeLanguages { + tessdataRev = "4.0.0"; + tessdata = "1chw1ya5zf8aaj2ixr9x013x7vwwwjjmx6f2ag0d6i14lypygy28"; + all = "0dqgkp369rcvq72yhgnzj1pj8yrv7kqzc7y6sqs7nzcq7l5qazlg"; + + # Run `./fetch-language-hashes <tessdataRev>` to generate these hashes + languages = { + afr = "1a9f8pnrspfmcq9gpjnxn2kkhjlsmh912bnpx671fjizxpmiri2y"; + amh = "0m1vdyxjx57kmf2qra0p31k509y1cqn4pyckzw00i5n3wx11d2j0"; + ara = "0nswl6n0s94g900j5k1gwzp7m140c0yd9a2fdb2lzhdvg1krf190"; + asm = "025d9vrjcrwyd6cc6hrw1x8xqhicgrb9wpvhhmlw71ql04dadslf"; + aze = "01shcs78a6xn3my8p3y42x1c9f5hzfn83w2n2nwpffbgz4y2nsgf"; + aze_cyrl = "1sbd89i5r7rnkjh2in8j0plrxnfiill9jl8pr68iw77ghih6q1vg"; + bel = "0dhyymsxcyzwal8474q7ag3m2akv0b92hkdz7rka5z1cxry1cn8c"; + ben = "0a7q9414k3frn37x2qcglz722ysg2iivj6kqaaa0ik7z14ibc8v0"; + bod = "0rh7x54nlh6ir6ldccj8hi7g8hwlp13r3fkljw8gndvhwmgfkkar"; + bos = "1szym4n605hlx12a9vpz4jjs76jscajh22rgkqwbv4qdsl0gi3nd"; + bre = "070f4c84iznblsw4jkwpzh9dss8nfb678160szm5r8dlv2yinrrk"; + bul = "03bg2yw79lg8rl43y9288313jrfh0h69vl4s4cmlgbmnbx8pvxwj"; + cat = "19xs691aj8yy2ff07c3gzm07zicd5ha0gmcjxjh9pknqf2gfy7qv"; + ceb = "1896vn41hqc4anm6hjvrnn022i0p8pmhwsp5rv9w2cvr6738l79r"; + ces = "0fh2g47msfr91285rnccxcmcshihm126sqy496s4vrr0vk8ix1nf"; + chi_sim = "0qxkvbpm5l7gzsshnn72wfx473pprf5nmw8hd4i4x2qxnfddh1gw"; + chi_sim_vert = "1f75pzvxbda82vxa2zb1z9b9f13sh81kzaw45vg5118ncsklj8w7"; + chi_tra = "056vjws1fir1v5iv44pzykkxs5q1dbb2j8blhj47i53w1zf6g42m"; + chi_tra_vert = "10c9cdycg1a5kwlgg60sh8yp07w2fl4whinpxfhlzrzs56allql4"; + chr = "19qq8a6c27973djsc4xpcklis92r58x21fg4mz5azdyka5i1n46l"; + cos = "0z9kx1hw8h5n00pcahxla808wya50wrkk8cz7x676pd93ibyrlyx"; + cym = "13pk9cpf43xxqbz3blfz2av2yd1ma6ds6jbdiqw8anhhj7l9ch2d"; + dan = "1jirmahxvyyswhhyzhinvcqaycz7m3ixchqrj3lgfcdi3anvabr2"; + dan_frak = "17wcgdqxmbzn7qchnx5gsa05aj4wmhbwk43w173bl3wr6h5ylmh0"; + deu = "194rqsg4nlycca9bg2fqf15xgcl110rxp182l7dbjfjhar4knsw9"; + deu_frak = "12hhhp32f15c7fw2jp05mwim9ps14kmamhh6vmalvm7r2033vbm7"; + div = "09mm9r5hxhsc4qpyg10ym9mc2kdpawx8zk0aiv1xpgd35rzpyz41"; + dzo = "1zk7crgcazgqy5zmslp6iw4jws07nja31qdxx0rpzhn3c0bjgw1b"; + ell = "1hhym18a9411953j47xjk47jx9ij9xi2qwlx05c93zl41528nsqg"; + eng = "0iy07z182lwhqfa0q288ha691scpsry330aynaizn68wcmywk86s"; + enm = "1dhr1qvil38bil43wk5ci645sbm3my2y9y7qlcbnwz2p4pflayvm"; + epo = "1jig4db7050vww32vxsqyig3j1b0vgz9ipxbsw0jpkjia84k44n9"; + equ = "02qwg6s1z7pynwm0p6dvpwi04ivfkr1s7qgssbla1dx7v0ih6rlg"; + est = "1jxygahy6by7fbirbmjmd68k6560q1a3h5mvpzdx15h5fw0q58gl"; + eus = "0cai7nm7si8680avrrls8bf9ski980rvsj560fh9y6n9rz7mh9mp"; + fao = "1n3434jf18bzakbylzyg3jaw2ad4h376g56dsql32bgh2yvyww8a"; + fas = "17wjkfka9725rz32clgqgk9msmbz4axs59vz30jmhhxyrkliafqb"; + fil = "0p713k8g27df9z384ns111xqxii5kq20m8brflsmd3yckw1mibhz"; + fin = "1wc3y9nnm7rb2c2c5fkj7cv7jb27jlkb2bh0g8kaz57h6imfmb2g"; + fra = "04qrfvi6irlaahh1pgn5azyfhbhavm12yyybza8603alf8firh7a"; + frk = "05cqmxxxjqdl5hjyzi6dpmixnjpd6f3jr6741yapdmnxvkzxkiyp"; + frm = "0a86yy6hd0lvlbzvnzjmyapzc0rn7mnkdadqycd65bw1b714cvy2"; + fry = "0i84r8g9hlkr9nlhypl4lq6ncrhbcpskqkdcijgk88c2fdknh57h"; + gla = "17idyhb505waz9dnb8dsk54faw7y0xvvb12yw71k0skq3i90akar"; + gle = "1q87h5zzcva54pg364d3hl6q9hdlydlyj1qmq8n5k7hqk11msxmk"; + glg = "01xssz1rhpy3a0sm4i43nba61wc2srz6wv327vdw1kg8ijm0s0g4"; + grc = "00x0s3smx4wg5h12y2b9al0j2jk1y3f0yy2x6f2qf7ps831drgyl"; + guj = "028v4fgn0zi2044vk6j2rlqklc9i0kj22s52vhifmx1g02kz9154"; + hat = "1bca516pr2cnyjlwycc7pr6gfmdjb8565hp06pw9nwpr20ry0hss"; + heb = "1qfkffjh29b21frs0mv6llsrchixl5kjkpj1if7fq816g9mym9kx"; + hin = "1rkfam5c6qil2590lfffzndhq3bncdgf4ij0cyjcglgyljgx0xnc"; + hrv = "0da7b6mk0rwc9zlbqkycwjpddp3qpy07l643i00ia5a1zq35fmgp"; + hun = "0w2s4mn9p74zqzmp9hh2017zgsh5v43k4lid4pv29f4b0y5gj9xi"; + hye = "0ifzm875wlbjh4vkpmj1n6f14m8i174413l6pc6i44y4p5fpgxrf"; + iku = "19arnv82xbxhbcy8pf9fv1sl5zc5707mk34nh7w46dlz86qkidmn"; + ind = "1d421hizwni4m6sr4f3nqqpr1g744hzn0krk130m7x8mhzgamba5"; + isl = "1hjjw8k2r9qa990ziq5wxr36kyf16mnmrqfmq5vbcjprka9h08pq"; + ita = "1qyrvlf7pjxzyb29sc7aq3gq61bww14sijka44scxggfw7134l3r"; + ita_old = "1pf8461jbj0vpyry0b54crmkf2bk9mh4klxvmj09jvf0aq2vm9s6"; + jav = "18vvbyimj0y462amjmwvqa6h9n8l122j9v0w3hfp63hlxpfprm0m"; + jpn = "16hma9w32vdh41ihymp894jza72b0d235hwriv18r78j5n86nhbg"; + jpn_vert = "0yca09l9sbpfjgb2slnpb9q7qd7vz3a1wb6bkln30d3nl0d9r1rn"; + kan = "0lcmx37rjfxkbhhbrld1ndmkwkm9w9b3pzxhas0cv5dqsx2f84jd"; + kat = "1b164bgwa7bbvw4177h8fxfh0fbh4bycfl9pkaa184dpjpaiqpia"; + kat_old = "1mgff7sh93hdp3wh0ckikdggrdgf0syp75s39pickpbkp9ic41ai"; + kaz = "0h37y0kb5lwsp5zpl7bvxg3ryqldl5hxfnardliwgyqgnag951vi"; + khm = "0m7x1fynr18sid2kjjw8xa9ika0a0fc6a6hvc7ihizi47893hdfb"; + kir = "09kxwqpqf6kxjii07qlqsiii83zk12rszp88xnzzjp8rjsnk78s3"; + kor = "0nsr43fwrp9876ia1fc0zcviv2n8hw16n0wfh158vhygwglvy84m"; + kor_vert = "1wmvdznmikk9fq7wdffvn22scxmcl26vjh26jhicqwxpc7kg4bh8"; + kur = "0gbsf3ny3n5mgb30v54bz3crgnimdpg19jn633pbpzryzg3xhd25"; + kur_ara = "1sbj0cczhi9q119fbzpi0m6zr9kjp3k76bv9w8szkv1wc5y4fng6"; + lao = "1gvxlg8bw3a4c9izg3c2a2yl7q6rsy7z9y64axdw9a04pz2ndbl5"; + lat = "0b7an3q3xrf9c55bhiqqh7l45ga88l0kwvkp1akmlr98piach3vr"; + lav = "0fqsmy47cygamddxyjfrdgkfa9bvmrvf4csvppnkdvfzy6iiv0c2"; + lit = "0wjgbkwc3bf5khdqali7ylnhhs4xvpx19m3zx2y9s27v2wjbb6kv"; + ltz = "02zdxbniiqfl87fzsiaaqgldqfsv15z5hja1xhxnqpl0nds7shfc"; + mal = "0a41ifz8i6lj2ywxjkwvymxzxahkz2cjv4apbrawdj1h42bn7frd"; + mar = "00swhlh9bckvmlxanfmlw5j4n9qqhggl84bsq0827bmijsqwnl44"; + mkd = "1bqfiwxlzfpz4fs4z5ci2wbv01qhrcayk1inmk3dxq7dsywx1ajg"; + mlt = "1rmmga2aw88hr7q7cfr5cvhnsgnf1mi069d5k7z66zp4vzbl4zyz"; + mon = "1jksvcavn9plsmjdmhg40mwq5rlvrd1b9gvghdjg7zkf6qqqynlh"; + mri = "0jlfawx20s5clsnk82ndy3v2zidh4cfh4acrh8nindk21xmiwh5i"; + msa = "0m7zs8anaa3l4z5f3xvbhs4syp41dp4all2yfpi1plyr0hy784an"; + mya = "0hljm5haadlr4k5rhw4mvhkygcnrr709rvl7amz7av3nskmi8mb1"; + nep = "1dhy0m2h6xfgwibf92iwxsn926dmrhfvkg9rafkdaqcr4pq6w563"; + nld = "0bspf5bv1s7qzm6k4aqbpq91zvk4kxxhx5zv08w91xfsa1zpdxmi"; + nor = "08majhc9m0fjvac50yq52ia2af9kscclimwkv403klnj4kgf8ndq"; + oci = "1mzrw9gsdjrd1xj3zv7l5gzgjq5jrygxf8cfkz20d9lls0wj1xdv"; + ori = "1sh42mjzb1hv6l6lljp3wifjmz7wrv818f9f16m8qjikwqxm0s78"; + osd = "03mvfk1q1xp1klpf4bwna903rnp51bkqr3gl5hvxybvrc3l2m7z1"; + pan = "0165kr94p6x5yxzs4p8sfppvg9cywp65ps0xaym5rqz9iashz32h"; + pol = "0g0b71ms6ddgykmkna4mlavgzgmh9vj6s62fi8l4ja93nfpr37hp"; + por = "132jbhzmcsq8skanm15bw2niyx9xpbrqr411wn7w9r5i3cvnlv01"; + pus = "0iiglnkn478al11avigsav625pn7ifscycnxpj6fg8835vjww3xr"; + que = "01vkmfi9idjwskv5pllmrxpil0v5h7f7rzv5viclxrzkmbvrz9b5"; + ron = "0ag6vs0cn3sryavs1mfrallgdgi4h28114g7m61rhlhq0z484g0m"; + rus = "1hippm3w5d73sh50r136x0xff2p6x128ry2x4fywf6xdpv1f46v8"; + san = "1qlpqkr5c5wqcf1bvlipy72advqnvd4wm61vghmrj2sda8mx87sx"; + sin = "097d2s4ma0zsq0ab5qs1ylgl9l5phw91fnpsvb7vjmz2mw3ic964"; + slk = "0c97pp5iffhdzyma605x8q3rx1qq9pq2h6cai1kppaj92rz3ji9k"; + slk_frak = "16ivsam1g18zlpw6pgidvzwb7h8rvw1s10nigs6yfwir8hjxsgki"; + slv = "0644jlm55p0dg4zchgrashmbv36zb4x649ckmf2jkbss8bzx7wsf"; + snd = "1i2mfi4414l3v9nznjy7959y2jcr8ymvf6w8zpyrw6nad4d1aak7"; + spa = "15kwvr7cpcnlxm1ja1yyc022dmsd04gmk7h1p0df12aicsscn3qb"; + spa_old = "1jq80c4mi3rmwnfhb3mbaaq0ci101mgbibkji9ala4l5dkcwjra3"; + sqi = "19cvvixhz9906p4c9i2grpr386rbp5alp4fp14xm9nd81bmq4701"; + srp = "1jd25n13h6vxsa3gzbj6q6mdh02rjl4qrd1bffr5psp33asqvw0l"; + srp_latn = "1k7577mn3z0bm5ma9d8l14sn5wpvw50hq1nxwbc36yn3a5b3mhiz"; + sun = "0lvlaw3jfvr7b5v09669kq8mm19jdsk9g5h09jsa2gr6fvsq11pa"; + swa = "0qy9qc5pa1dzzqrh1z40gk845z1r4d2smywnzydknbb3n240lhz0"; + swe = "1y56r7bgzw0pqkdylbah07r1f0v03sblkggiql8x5200rhaxvqi4"; + syr = "1vfj5fsiv170jghryrxwyz0i9mdsaki1kglxrklkb2caal9kwy38"; + tam = "0rhhdbnp0a2hpg00vpc0xyxcl2w36i1kn63mrvwx1f9q7m3y1fmf"; + tat = "0a74rp8pyp4yivv2xcy2m8xgwch8scr3wmk1fzniwzf43fsrqp76"; + tel = "0gcq8hxhxvilyh7x7kiikq07hllqysc8sfyr88gvpj4xi092h2bx"; + tgk = "1458gk0k6gk49n8lr6fj7l7cwkhxn0lrhybzq10zl1ly7yzjhf67"; + tgl = "12yscwckdy3l21mvsrj1021gxw2isjrg369r08rsf7lh96wn4wkn"; + tha = "01f0j7gsc5slxaaql1gqbhk4wlwaxc29dlmfxwjzikxc46gjl0w8"; + tir = "1q6w48b1jchv55713pq20inzjjdymh32fw8wxfaj1qi7bjqfb9fk"; + ton = "06g60ga8rys8jaimqrvd4svh40qs1nz4bszdnf2hdv05ibryibdq"; + tur = "0g9g1wvibp61qbriy8ys948yfkl88xk9g8f93bnq8w8dx029b6s8"; + uig = "09sajx21lw3a3ph62dyqr10pjaq2mij10sdhkhvvjiydk34dn548"; + ukr = "14q8ls8gkrg7c9pc6qzm6yf5ady3i3303vs1hz4d2idcl6yry334"; + urd = "15vszhqraxqdcng1069p6i4xq3ck3904q207nkbap6dfpcpjig40"; + uzb = "03hyw0vavmjirqs4wkd5r85g91w2avsyl14z624fhm3gc66pqg7n"; + uzb_cyrl = "1433lrrp2lfgb1k0a4sc20b35b2jcl8f1z92vm2936y7w04xpaq7"; + vie = "02k40d3wji74d1jgvkr3zrn9gpzlmp0lqhrrdmc48r2sgvnrnk8n"; + yid = "0xnbvi04xv1qapqg72wa3bjwbw51pkdnyncjpjp37vn6dzh04l0z"; + yor = "07w3aci52ng6i6nyp97q5zb2dqlj08w6im90y1h691qah1x44zlv"; + }; + }; +} diff --git a/pkgs/applications/graphics/tesseract/tesseract3.nix b/pkgs/applications/graphics/tesseract/tesseract3.nix new file mode 100644 index 00000000000..db0e06434aa --- /dev/null +++ b/pkgs/applications/graphics/tesseract/tesseract3.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, pkgconfig +, leptonica, libpng, libtiff, icu, pango, opencl-headers }: + +stdenv.mkDerivation rec { + name = "tesseract-${version}"; + version = "3.05.00"; + + src = fetchFromGitHub { + owner = "tesseract-ocr"; + repo = "tesseract"; + rev = version; + sha256 = "11wrpcfl118wxsv2c3w2scznwb48c4547qml42s2bpdz079g8y30"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ]; + + LIBLEPT_HEADERSDIR = "${leptonica}/include"; + + meta = { + description = "OCR engine"; + homepage = https://github.com/tesseract-ocr/tesseract; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ viric earvstedt ]; + platforms = with stdenv.lib.platforms; linux ++ darwin; + }; +} diff --git a/pkgs/applications/graphics/tesseract/tesseract4.nix b/pkgs/applications/graphics/tesseract/tesseract4.nix new file mode 100644 index 00000000000..df321023c74 --- /dev/null +++ b/pkgs/applications/graphics/tesseract/tesseract4.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkgconfig +, leptonica, libpng, libtiff, icu, pango, opencl-headers }: + +stdenv.mkDerivation rec { + name = "tesseract-${version}"; + version = "4.0.0"; + + src = fetchFromGitHub { + owner = "tesseract-ocr"; + repo = "tesseract"; + rev = version; + sha256 = "1b5fi2vibc4kk9b30kkk4ais4bw8fbbv24bzr5709194hb81cav8"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ pkgconfig autoreconfHook autoconf-archive ]; + buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ]; + + meta = { + description = "OCR engine"; + homepage = https://github.com/tesseract-ocr/tesseract; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ viric earvstedt ]; + platforms = with stdenv.lib.platforms; linux ++ darwin; + }; +} diff --git a/pkgs/applications/graphics/tesseract/wrapper.nix b/pkgs/applications/graphics/tesseract/wrapper.nix new file mode 100644 index 00000000000..365d68a9ee7 --- /dev/null +++ b/pkgs/applications/graphics/tesseract/wrapper.nix @@ -0,0 +1,58 @@ +{ stdenv, makeWrapper, tesseractBase, languages + +# A list of languages like [ "eng" "spa" … ] or `null` for all available languages +, enableLanguages ? null + +# A list of files or a directory containing files +, tessdata ? (if enableLanguages == null then languages.all + else map (lang: languages.${lang}) enableLanguages) + +# This argument is obsolete +, enableLanguagesHash ? null +}: + +let + passthru = { inherit tesseractBase languages tessdata; }; + + tesseractWithData = tesseractBase.overrideAttrs (_: { + inherit tesseractBase tessdata; + + buildInputs = [ makeWrapper ]; + + buildCommand = '' + makeWrapper {$tesseractBase,$out}/bin/tesseract --set-default TESSDATA_PREFIX $out/share/tessdata + + # Recursively link include, share + cp -rs --no-preserve=mode $tesseractBase/{include,share} $out + + cp -r --no-preserve=mode $tesseractBase/lib $out + # Fixup the store paths in lib so that the tessdata from this derivation is used. + if (( ''${#tesseractBase} != ''${#out} )); then + echo "Can't replace store paths due to differing lengths" + exit 1 + fi + find $out/lib -type f -exec sed -i "s|$tesseractBase|$out|g" {} \; + + if [[ -d "$tessdata" ]]; then + ln -s $tessdata/* $out/share/tessdata + else + for lang in $tessdata; do + ln -s $lang $out/share/tessdata/''${lang#/nix/store*-} + done + fi + + if [[ ! -e $out/share/tessdata/eng.traineddata ]]; then + # This is a bug in Tesseract's internal tessdata discovery mechanism + echo "eng.traineddata must be present in tessdata for Tesseract to work" + exit 1 + fi + ''; + }); + + tesseract = (if enableLanguages == [] then tesseractBase else tesseractWithData) // passthru; +in + if enableLanguagesHash == null then + tesseract + else + stdenv.lib.warn "Argument `enableLanguagesHash` is obsolete and can be removed." + tesseract diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 4b8657c55c9..5d1e43769b7 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -43,16 +43,16 @@ let ]; in buildRustPackage rec { name = "alacritty-${version}"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "jwilm"; repo = "alacritty"; rev = "v${version}"; - sha256 = "0p9q5cpxw5v2ka1ylaa009sfbncnlrva9yam4hag6npcnd8x4f95"; + sha256 = "1mf0x8dc196qf08lqpm0n4a5954cx9qfb09dq8ab7mp3xnyrnqzx"; }; - cargoSha256 = "0664fi16kyly8hhfj0hgddsnfdk3y0z31758gvb0xq13ssdb6sv6"; + cargoSha256 = "0p3bygvmpmy09h7972nhmma51lxp8q91cdlaw3s6p35i79hq3bmp"; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index d1a62dad6c9..39dae0db125 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -1,24 +1,22 @@ { mkDerivation, lib, fetchFromGitHub, makeWrapper, qtbase, - qtdeclarative, qtsvg, qtx11extras, muparser, cmake, python3 }: + qtdeclarative, qtsvg, qtx11extras, muparser, cmake, python3, + qtcharts }: -let - pname = "albert"; - version = "0.14.22"; -in mkDerivation rec { - name = "${pname}-${version}"; + pname = "albert"; + version = "0.15.0"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${version}"; - sha256 = "0i9kss5szirmd0pzw3cm692kl9rhkan1zfywfqrjdf3i3b6914sg"; + sha256 = "063z9yq6bsxcsqsw1n93ks5dzhzv6i252mjz1d5mxhxvgmqlfk0v"; fetchSubmodules = true; }; nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ qtbase qtdeclarative qtsvg qtx11extras muparser python3 ]; + buildInputs = [ qtbase qtdeclarative qtsvg qtx11extras muparser python3 qtcharts ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 3554c36f519..6da1cdefa70 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.31.0"; + version = "3.36.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "1xg1bx0klvrywqry5rhci37fr7shpvb2wbx4bva20vhqkal169rw"; + sha256 = "0fbf4b29vkka3gg8c5n9dc7qhv43jpw6naz6w83jkz7andypikb8"; }; patches = [ diff --git a/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch b/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch index 45e27984ed5..5164b80a0be 100644 --- a/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch +++ b/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch @@ -6,7 +6,7 @@ index 938ab24..1e095f8 100644 description = _('Extract common e-book formats from archive files ' '(ZIP/RAR). Also try to autodetect if they are actually ' 'CBZ/CBR files.') -- file_types = set(['zip', 'rar']) -+ file_types = set(['zip']) +- file_types = {'zip', 'rar'} ++ file_types = {'zip'} supported_platforms = ['windows', 'osx', 'linux'] on_import = True diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index f97b83a8507..f7907746d10 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -2,24 +2,26 @@ mkDerivation rec { name = "cura-${version}"; - version = "3.4.1"; + version = "3.6.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "03s9nf1aybbnbf1rzqja41m9g6991bbvrcly1lcrfqksianfn06w"; + sha256 = "0wzkbqdd1670smw1vnq634rkpcjwnhwcvimhvjq904gy2fylgr90"; }; materials = fetchFromGitHub { owner = "Ultimaker"; repo = "fdm_materials"; - rev = "3.4.1"; - sha256 = "1pw30clxqd7qgnidsyx6grizvlgfn8rhj6rd5ppkvv3rdjh0gj28"; + rev = version; + sha256 = "0g2dkph0ll7d9109n17vmfwb4fpc8lhyb1z1q68j8vblyvg08d12"; }; buildInputs = [ qtbase qtquickcontrols2 ]; - propagatedBuildInputs = with python3.pkgs; [ uranium zeroconf pyserial numpy-stl ]; + propagatedBuildInputs = with python3.pkgs; [ + libsavitar numpy-stl pyserial requests uranium zeroconf + ]; nativeBuildInputs = [ cmake python3.pkgs.wrapPython ]; cmakeFlags = [ @@ -44,7 +46,7 @@ mkDerivation rec { meta = with lib; { description = "3D printer / slicing GUI built on top of the Uranium framework"; homepage = https://github.com/Ultimaker/Cura; - license = licenses.agpl3; + license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index 75d1936ba85..22215a7e2c6 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -2,23 +2,15 @@ stdenv.mkDerivation rec { name = "curaengine-${version}"; - version = "3.4.1"; + version = "3.6.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "083jmhzmb60rmqw0fhbnlxyblzkmpn3k6zc75xq90x5g3h60wib4"; + sha256 = "1iwmblvs3qw57698i8bbazyxha18bj9irnkcscdb0596g8q93fcm"; }; - patches = [ - # Fixed upstream, but not yet released - (fetchpatch { - url = "https://github.com/Ultimaker/CuraEngine/commit/5aad55bf67e52ce5bdb27a3925af8a4cab441b38.patch"; - sha256 = "1hxbslzhkvdg8p33mvlbrpw62gwfqpsdbfca6yhdng9hifl86j3f"; - }) - ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ libarcus stb ]; diff --git a/pkgs/applications/misc/dmrconfig/default.nix b/pkgs/applications/misc/dmrconfig/default.nix index 7e20b87eb98..7125e37f7f9 100644 --- a/pkgs/applications/misc/dmrconfig/default.nix +++ b/pkgs/applications/misc/dmrconfig/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "dmrconfig-${version}"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "sergev"; repo = "dmrconfig"; rev = version; - sha256 = "1bb3hahfdb5phxyzp1m5ibqwz3mcqplzaibb1aq7w273xcfrd9l9"; + sha256 = "1qwix75z749628w583fwp7m7kxbj0k3g159sxb7vgqxbadqqz1ab"; }; buildInputs = [ @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace Makefile \ - --replace /usr/local/bin/dmrconfig $out/bin/dmrconfig \ - --replace "\$(shell git describe --tags --abbrev=0)" ${version} \ - --replace "\$(shell git rev-list HEAD --count)" 0 + --replace /usr/local/bin/dmrconfig $out/bin/dmrconfig ''; + makeFlags = "VERSION=${version} GITCOUNT=0"; + installPhase = '' mkdir -p $out/bin $out/lib/udev/rules.d make install diff --git a/pkgs/applications/misc/flrig/default.nix b/pkgs/applications/misc/flrig/default.nix index baee3010d69..64d2677d4e1 100644 --- a/pkgs/applications/misc/flrig/default.nix +++ b/pkgs/applications/misc/flrig/default.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { - version = "1.3.40"; + version = "1.3.41"; pname = "flrig"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/fldigi/${name}.tar.gz"; - sha256 = "1wr7bb2577gha7y3a8m5w60m4xdv8m0199cj2c6349sgbds373w9"; + sha256 = "0vh14azg3pppyg3fb7kf6q3ighw1ka9m60jf2dzsd77f4hidhqx4"; }; buildInputs = [ diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 0dfeac3cf8b..919f20f1398 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "girara-${version}"; - version = "0.3.1"; + version = "0.3.2"; src = fetchurl { url = "https://pwmt.org/projects/girara/download/${name}.tar.xz"; - sha256 = "1ddwap5q5cnfdr1q1b110wy7mw1z3khn86k01jl8lqmn02n9nh1w"; + sha256 = "1kc6n1mxjxa7wvwnqy94qfg8l9jvx9qrvrr2kc7m4g0z20x3a00p"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext ]; diff --git a/pkgs/applications/misc/glom/default.nix b/pkgs/applications/misc/glom/default.nix new file mode 100644 index 00000000000..9e71837c0f5 --- /dev/null +++ b/pkgs/applications/misc/glom/default.nix @@ -0,0 +1,132 @@ +{ stdenv +, fetchFromGitLab +, pkgconfig +, autoconf +, automake +, libtool +, mm-common +, intltool +, itstool +, doxygen +, graphviz +, makeFontsConf +, freefont_ttf +, boost +, libxmlxx3 +, libxslt +, libgdamm +, libarchive +, libepc +, python3 +, ncurses +, glibmm +, gtk3 +, openssl +, gtkmm3 +, goocanvasmm2 +, evince +, isocodes +, gtksourceviewmm4 +, postgresql +, gnome3 +, gobject-introspection +, wrapGAppsHook +}: + +let + gda = libgdamm.override { + mysqlSupport = true; + postgresSupport = true; + }; + python = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]); + sphinx-build = python3.pkgs.sphinx.overrideAttrs (super: { + postFixup = super.postFixup or "" + '' + # Do not propagate Python + rm $out/nix-support/propagated-build-inputs + ''; + }); + boost_python = boost.override { enablePython = true; inherit python; }; +in stdenv.mkDerivation rec { + pname = "glom"; + version = "unstable-2018-12-16"; + + outputs = [ "out" "lib" "dev" "doc" "devdoc" ]; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = pname; + rev = "fa5ff04f209f35bf3e97bc1c3eb1d1138d6172ce"; + sha256 = "145hnk96xa4v35i3a3mbf3fnx4nlk8cksc0qhm7nrh8cnnrbdfgn"; + }; + + nativeBuildInputs = [ + pkgconfig + autoconf + automake + libtool + mm-common + intltool + gnome3.yelp-tools + itstool + doxygen + graphviz + sphinx-build + wrapGAppsHook + gobject-introspection # for setup hook + ]; + + buildInputs = [ + boost_python + glibmm + gtk3 + openssl + libxmlxx3 + libxslt + gda + libarchive + libepc + python + ncurses # for python + gtkmm3 + goocanvasmm2 + evince + isocodes + python3.pkgs.pygobject3 + gtksourceviewmm4 + postgresql # for pg_config + ]; + + enableParallelBuilding = true; + + preConfigure = "NOCONFIGURE=1 ./autogen.sh"; + + configureFlags = [ + "--with-boost-python=boost_python${stdenv.lib.versions.major python3.version}${stdenv.lib.versions.minor python3.version}" + ]; + + makeFlags = [ + "libdocdir=${placeholder "doc"}/share/doc/$(book_name)" + "devhelpdir=${placeholder "devdoc"}/share/devhelp/books/$(book_name)" + ]; + + # Fontconfig error: Cannot load default config file + FONTCONFIG_FILE = makeFontsConf { + fontDirectories = [ freefont_ttf ]; + }; + + preFixup = '' + gappsWrapperArgs+=( + --prefix PYTHONPATH : "${placeholder "out"}/${python3.sitePackages}" + --set PYTHONHOME "${python}" + ) + ''; + + meta = with stdenv.lib; { + description = "An easy-to-use database designer and user interface"; + homepage = http://www.glom.org/; + license = [ licenses.lgpl2 licenses.gpl2 ]; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 1979d290c82..4f0c1864677 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gpsprune-${version}"; - version = "19.1"; + version = "19.2"; src = fetchurl { url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - sha256 = "1drw30z21sdzjc2mcm13yqb5aipvcxmslb2yn6xs3b6b2mx3h2zy"; + sha256 = "1q2kpkkh75b9l1x7fkmv88s8k84gzcdnrg5sgf8ih0zrp49lawg9"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 0e84283a9ef..8f69abd3a98 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -75,19 +75,21 @@ stdenv.mkDerivation rec { cp ${src}/leptonica_mod/* src/ ''; }); - tesseract_modded = tesseract.overrideAttrs (attrs: { - prePatch = '' - cp ${src}/tesseract_mod/{ambigs.cpp,ccutil.h,ccutil.cpp} ccutil/ - cp ${src}/tesseract_mod/dawg.cpp api/ - cp ${src}/tesseract_mod/{imagedata.cpp,tessdatamanager.cpp} ccstruct/ - cp ${src}/tesseract_mod/openclwrapper.h opencl/ - cp ${src}/tesseract_mod/{tessedit.cpp,thresholder.cpp} ccmain/ - cp ${src}/tesseract_mod/tess_lang_mod_edge.h cube/ - cp ${src}/tesseract_mod/tesscapi.cpp api/ - cp ${src}/include_mod/{tesseract.h,leptonica.h} api/ - ''; - patches = [ ./tesseract.patch ]; - }); + tesseract_modded = tesseract.override { + tesseractBase = tesseract.tesseractBase.overrideAttrs (_: { + prePatch = '' + cp ${src}/tesseract_mod/{ambigs.cpp,ccutil.h,ccutil.cpp} ccutil/ + cp ${src}/tesseract_mod/dawg.cpp api/ + cp ${src}/tesseract_mod/{imagedata.cpp,tessdatamanager.cpp} ccstruct/ + cp ${src}/tesseract_mod/openclwrapper.h opencl/ + cp ${src}/tesseract_mod/{tessedit.cpp,thresholder.cpp} ccmain/ + cp ${src}/tesseract_mod/tess_lang_mod_edge.h cube/ + cp ${src}/tesseract_mod/tesscapi.cpp api/ + cp ${src}/include_mod/{tesseract.h,leptonica.h} api/ + ''; + patches = [ ./tesseract.patch ]; + }); + }; in [ zlib libpng ] ++ optional enableGSL gsl ++ diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index f32509686c0..ed3aca996e1 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -1,33 +1,36 @@ -{ stdenv, lib, makeWrapper, fetchgit, pkgconfig, ninja, ocaml, findlib, mupdf -, gtk3, openjpeg, jbig2dec, mujs, xsel, openssl, freetype, ncurses }: +{ stdenv, lib, substituteAll, makeWrapper, fetchgit, ocaml, mupdf, libX11, +libGLU_combined, freetype, xclip }: -assert lib.versionAtLeast (lib.getVersion ocaml) "4.02"; +assert lib.versionAtLeast (lib.getVersion ocaml) "4.07"; stdenv.mkDerivation rec { name = "llpp-${version}"; - version = "2018-03-02"; + version = "30"; src = fetchgit { url = "git://repo.or.cz/llpp.git"; - rev = "0ab1fbbf142b6df6d6bae782e3af2ec50f32dec9"; - sha256 = "1h0hrmxwm7ripgp051788p8ad0q38dc9nvjx87mdwlkwk9qc0dis"; + rev = "v${version}"; + sha256 = "0iilpzf12hs0zky58j55l4y5dvzv7fc53nsrg324n9vka92mppvd"; fetchSubmodules = false; }; - nativeBuildInputs = [ pkgconfig makeWrapper ninja ]; - buildInputs = [ ocaml findlib mupdf gtk3 jbig2dec openjpeg mujs openssl freetype ncurses ]; + patches = (substituteAll { + inherit version; + src = ./fix-build-bash.patch; + }); + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ ocaml mupdf libX11 libGLU_combined freetype ]; dontStrip = true; configurePhase = '' - sed -i -e 's+ocamlc --version+ocamlc -version+' build.sh - sed -i -e 's+-I \$srcdir/mupdf/include -I \$srcdir/mupdf/thirdparty/freetype/include+-I ${freetype.dev}/include+' build.sh - sed -i -e 's+-lmupdf +-lfreetype -lz -lharfbuzz -ljbig2dec -lopenjp2 -ljpeg -lmupdf +' build.sh - sed -i -e 's+-L\$srcdir/mupdf/build/native ++' build.sh + mkdir -p build/mupdf/thirdparty + ln -s ${freetype.dev} build/mupdf/thirdparty/freetype ''; buildPhase = '' - sh ./build.sh build + bash ./build.bash build ''; installPhase = '' @@ -35,14 +38,14 @@ stdenv.mkDerivation rec { install build/llpp $out/bin wrapProgram $out/bin/llpp \ --prefix CAML_LD_LIBRARY_PATH ":" "$out/lib" \ - --prefix PATH ":" "${xsel}/bin" + --prefix PATH ":" "${xclip}/bin" ''; meta = with stdenv.lib; { homepage = https://repo.or.cz/w/llpp.git; description = "A MuPDF based PDF pager written in OCaml"; platforms = platforms.linux; - maintainers = with maintainers; [ pSub ]; + maintainers = with maintainers; [ pSub enzime ]; license = licenses.gpl3; }; } diff --git a/pkgs/applications/misc/llpp/fix-build-bash.patch b/pkgs/applications/misc/llpp/fix-build-bash.patch new file mode 100644 index 00000000000..25d503290ce --- /dev/null +++ b/pkgs/applications/misc/llpp/fix-build-bash.patch @@ -0,0 +1,88 @@ +From cccadedfbcb6764a38382154838113a6b2fd4dee Mon Sep 17 00:00:00 2001 +From: Michael Hoang <enzime@users.noreply.github.com> +Date: Mon, 10 Dec 2018 15:08:01 +1100 +Subject: [PATCH] Patch build.bash for nixpkgs + +--- + build.bash | 37 ++----------------------------------- + 1 file changed, 2 insertions(+), 35 deletions(-) + +diff --git a/build.bash b/build.bash +index 1588011..72117d9 100755 +--- a/build.bash ++++ b/build.bash +@@ -29,7 +29,6 @@ srcd="$(dirname $0)" + mudir=$outd/mupdf + muinc="-I $mudir/include -I $mudir/thirdparty/freetype/include" + +-test -d "$mudir" || die muPDF not found, consult $(dirname $0)/BUILDING + + mkdir -p $outd/{$wsid,lablGL} + :>$outd/ordered +@@ -39,12 +38,6 @@ isfresh() { test -r "$1.past" && . "$1.past" && test "$k" = "$2"; } + mbt=native + mulibs="$mudir/build/$mbt/libmupdf.a" # $mudir/build/$mbt/libmupdf-third.a + +-keycmd="(cd $mudir && git describe --tags --dirty); digest $mulibs" +-isfresh "$mulibs" "$(eval $keycmd)" || ( +- make -C "$mudir" build=$mbt -j $mjobs libs +- echo "k='$(eval $keycmd)'" >$mudir/build/$mbt/libmupdf.a.past +-) && vecho "fresh mupdf" +- + oincs() { + local i= + local incs1= +@@ -90,32 +83,6 @@ mflags() { + } + + overs="$(ocamlc -vnum 2>/dev/null)" || overs="" +-test "$overs" = "4.07.0" || { +- url=https://caml.inria.fr/pub/distrib/ocaml-4.07/ocaml-4.07.0.tar.xz +- txz=$outd/$(basename $url) +- isfresh $txz $url || { +- executable_p() { command -v "$1" >/dev/null 2>&1; } +- if executable_p wget; then dl() { wget -q "$1" -O "$2"; } +- elif executable_p curl; then dl() { curl -L "$1" -o "$2"; } +- else die "no program to fetch remote urls found" +- fi +- dl $url $txz +- echo "k=$url" >$txz.past +- } && vecho "fresh $txz" +- absprefix=$(cd $outd &>/dev/null; pwd -P) +- export PATH=$absprefix/bin:$PATH +- isfresh $absprefix/bin/ocamlc "$url" || ( +- tar xf $txz -C $outd +- bn=$(basename $url) +- cd $outd/${bn%.tar.xz} +- ./configure -prefix $absprefix \ +- -no-graph -no-debugger -no-ocamldoc -no-native-compiler +- make -j $mjobs world +- make install +- echo "k='$url'" >$absprefix/bin/ocamlc.past +- ) && vecho "fresh ocamlc" +- overs=$(ocamlc -vnum 2>/dev/null) +-} + + bocaml1() { + grep -q "$3" $outd/ordered || { +@@ -224,7 +191,7 @@ bobjc() { + } && vecho "fresh $o" + } + +-ver=$(cd $srcd && git describe --tags --dirty) || ver=unknown ++ver=@version@ + + cmd="(. $srcd/genconfstr.sh >$outd/confstruct.ml)" + keycmd="digest $srcd/genconfstr.sh $outd/confstruct.ml" +@@ -278,7 +245,7 @@ for m in ml_gl ml_glarray ml_raw; do + done + + libs="str.cma unix.cma" +-clibs="-L$mudir/build/$mbt -lmupdf -lmupdf-third -lpthread" ++clibs="-lmupdf -lfreetype -lpthread" + if $darwin; then + mcomp=$(ocamlc -config | grep bytecomp_c_co | { read _ c; echo $c; }) + clibs="$clibs -framework Cocoa -framework OpenGL" +-- +2.19.2 + diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 1cb472ff019..2928d271efc 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook, lib, makeWrapper }: let - version = "5.1.60"; + version = "5.2.20"; in stdenv.mkDerivation { name = "masterpdfeditor-${version}"; src = fetchurl { url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; - sha256 = "0br5f04klzpbd25igbjjj1dqasmrcrw2zsan5bv0ydnr2lmpb2fz"; + sha256 = "1399zv3m7a2rxvmy213f5yii3krsqyahpwdzsw8j535xrb9f3z1m"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix index 95a2f2b940c..cd9a86e7fac 100644 --- a/pkgs/applications/misc/opentx/default.nix +++ b/pkgs/applications/misc/opentx/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , cmake, gcc-arm-embedded, binutils-arm-embedded, python -, qt5, SDL, gmock +, qt5, SDL, gtest , dfu-util, avrdude }: @@ -29,7 +29,7 @@ in stdenv.mkDerivation { buildInputs = with qt5; [ python python.pkgs.pyqt4 qtbase qtmultimedia qttranslations - SDL gmock + SDL ]; postPatch = '' @@ -38,11 +38,12 @@ in stdenv.mkDerivation { ''; cmakeFlags = [ + "-DGTEST_ROOT=${gtest.src}/googletest" "-DQT_TRANSLATIONS_DIR=${qt5.qttranslations}/translations" # XXX I would prefer to include these here, though we will need to file a bug upstream to get that changed. #"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util" #"-DAVRDUDE_PATH=${avrdude}/bin/avrdude" - "-DNANO=OFF" + "-DNANO=NO" ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index a77b2d17ecb..2649c7cbd6a 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -7,10 +7,10 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - name = "pcmanfm-1.3.0"; + name = "pcmanfm-1.3.1"; src = fetchurl { url = "mirror://sourceforge/pcmanfm/${name}.tar.xz"; - sha256 = "1ywgfyklms5hqkapsbjps4kyx20ac0d1qk16ww74yagkyfdkwsas"; + sha256 = "0mb8hg76x1z0szdyl0w7jpz0bdblc6a29is1vvnh79z37qxh8138"; }; buildInputs = [ glib gtk libfm' libX11 pango gnome3.defaultIconTheme ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configureFlags = optional withGtk3 "--with-gtk=3"; meta = with stdenv.lib; { - homepage = http://blog.lxde.org/?cat=28/; + homepage = https://blog.lxde.org/category/pcmanfm/; license = licenses.gpl2Plus; description = "File manager with GTK+ interface"; maintainers = [ maintainers.ttuegel ]; diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 8b536e49316..232184c1976 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "pdfpc"; - version = "4.2.1"; + version = "4.3.0"; src = fetchFromGitHub { repo = "pdfpc"; owner = "pdfpc"; rev = "v${version}"; - sha256 = "1rmsrpf5vlqhnyyrhq8apndny88ld2qvfjx6258653pqbimv7mx5"; + sha256 = "1ild2p2lv89yj74fbbdsg3jb8dxpzdamsw0l0xs5h20fd2lsrwcd"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix index a17f34378a8..113a63f7fe1 100644 --- a/pkgs/applications/misc/pgmanage/default.nix +++ b/pkgs/applications/misc/pgmanage/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pgmanage-${version}"; - version = "10.3.1"; + version = "11.0.1"; src = fetchFromGitHub { owner = "pgManage"; repo = "pgManage"; rev = "v${version}"; - sha256 = "0ym1arla9wfkmr5n6h6dfyd680vlnng5s5j5nyxi2gl2wxqqhxzz"; + sha256 = "1a1dbc32b3y0ph8ydf800h6pz7dg6g1gxgid4gffk7k58xj0c5yf"; }; patchPhase = '' diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix index 626e400eac4..cc6b74dc998 100644 --- a/pkgs/applications/misc/plank/default.nix +++ b/pkgs/applications/misc/plank/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, vala, atk, cairo, glib, gnome3, gtk3, libwnck3 , libX11, libXfixes, libXi, pango, intltool, pkgconfig, libxml2 -, bamf, gdk_pixbuf, libdbusmenu-gtk3, file +, bamf, gdk_pixbuf, libdbusmenu-gtk3, file, gnome-menus , wrapGAppsHook, autoreconfHook, gobject-introspection }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { autoreconfHook ]; - buildInputs = [ vala atk cairo glib gnome3.gnome-menus + buildInputs = [ vala atk cairo glib gnome-menus gtk3 gnome3.libgee libwnck3 libX11 libXfixes libXi pango gnome3.gnome-common bamf gdk_pixbuf libdbusmenu-gtk3 gnome3.dconf ]; diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 8c9f13ce92c..e1b6b7fcc46 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -22,7 +22,7 @@ }: let - version = "4.2.12"; + version = "4.3.3"; binpath = stdenv.lib.makeBinPath [ cabextract @@ -55,7 +55,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz"; - sha256 = "03k8v9dknc5hfrfzqw1nkpifz7wkixv3mvjl1vnp4fx8rj2xrjrq"; + sha256 = "117xivwa87i2w66klplmwd5q7pfxcbrj2rjm11wl8iy5h3xpqkak"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/pmenu/default.nix b/pkgs/applications/misc/pmenu/default.nix index b14bb445b5d..4b39e9291a8 100644 --- a/pkgs/applications/misc/pmenu/default.nix +++ b/pkgs/applications/misc/pmenu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, python2Packages, gnome3 }: +{ stdenv, fetchFromGitLab, python2Packages, gnome-menus }: stdenv.mkDerivation rec { name = "pmenu-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python2Packages.wrapPython ]; - buildInputs = [ python2Packages.pygtk gnome3.gnome-menus ]; + buildInputs = [ python2Packages.pygtk gnome-menus ]; pythonPath = [ python2Packages.pygtk ]; diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix index a2c8c75dc24..7b2e8bed10e 100644 --- a/pkgs/applications/misc/qmapshack/default.nix +++ b/pkgs/applications/misc/qmapshack/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "qmapshack-${version}"; - version = "1.12.0"; + version = "1.12.1"; src = fetchurl { url = "https://bitbucket.org/maproom/qmapshack/downloads/${name}.tar.gz"; - sha256 = "0d5p60kq9pa2hfql4nr8p42n88lr42jrsryrsllvaj45b8b6kvih"; + sha256 = "1d6n7xk0ksxb1fw43s5lb08vgxf6h93k3rb401cbka1inpyf2232"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/rtl_433/default.nix b/pkgs/applications/misc/rtl_433/default.nix index 7097dda3574..5d012437e6e 100644 --- a/pkgs/applications/misc/rtl_433/default.nix +++ b/pkgs/applications/misc/rtl_433/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libusb1, rtl-sdr }: stdenv.mkDerivation rec { - version = "18.05"; + version = "18.12"; name = "rtl_433-${version}"; src = fetchFromGitHub { owner = "merbanan"; repo = "rtl_433"; - rev = "18.05"; - sha256 = "0vfhnjyrx6w1m8g1hww5vdz4zgdlhcaps9g0397mxlki4sm77wpc"; + rev = "18.12"; + sha256 = "0y73g9ffpsgnmfk8lbihyl9d1fd9v91wsn8k8xhsdmgmn4ra1jk5"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/soapysdr/default.nix b/pkgs/applications/misc/soapysdr/default.nix index 90639fc5705..f14b560bf52 100644 --- a/pkgs/applications/misc/soapysdr/default.nix +++ b/pkgs/applications/misc/soapysdr/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ libusb ncurses numpy swig2 python ]; + buildInputs = [ libusb ncurses numpy swig2 python makeWrapper ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" @@ -33,8 +33,8 @@ in stdenv.mkDerivation { done # Needed for at least the remote plugin server - for file in out/bin/*; do - ${makeWrapper}/bin/wrapProgram "$file" \ + for file in $out/bin/*; do + wrapProgram "$file" \ --prefix SOAPY_SDR_PLUGIN_PATH : ${lib.makeSearchPath "lib/SoapySDR/modules0.6" extraPackages} done ''; diff --git a/pkgs/applications/misc/terminator/default.nix b/pkgs/applications/misc/terminator/default.nix index f32a27b9b78..4a6ad4e5ea3 100644 --- a/pkgs/applications/misc/terminator/default.nix +++ b/pkgs/applications/misc/terminator/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python2, keybinder3, intltool, file, gtk3, gobject-introspection -, libnotify, wrapGAppsHook, gnome3 +, libnotify, wrapGAppsHook, vte }: python2.pkgs.buildPythonApplication rec { @@ -12,7 +12,7 @@ python2.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ file intltool wrapGAppsHook gobject-introspection ]; - buildInputs = [ gtk3 gnome3.vte libnotify keybinder3 ]; + buildInputs = [ gtk3 vte libnotify keybinder3 ]; propagatedBuildInputs = with python2.pkgs; [ pygobject3 psutil pycairo ]; postPatch = '' diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index 957b5bc0e8d..22f669f0329 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, vte, gtk3, ncurses, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, pkgconfig, vte-ng, gtk3, ncurses, wrapGAppsHook }: stdenv.mkDerivation rec { name = "termite-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ]; - buildInputs = [ vte gtk3 ncurses ]; + buildInputs = [ vte-ng gtk3 ncurses ]; nativeBuildInputs = [ wrapGAppsHook pkgconfig ]; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index bcf6df7417f..0c199dab6bc 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -282,8 +282,6 @@ let MENUNAME="Chromium" process_template chrome/app/resources/manpage.1.in "${buildPath}/chrome.1" ) - '' + optionalString (target == "mksnapshot" || target == "chrome") '' - paxmark m "${buildPath}/${target}" ''; targets = extraAttrs.buildTargets or []; commands = map buildCommand targets; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index a6dc397cbc5..add3cd6a4a7 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "03ddfxxzh8pxil9n28y8nkzl8x0kb5bzzjy4mihg448dflh3anq2"; - sha256bin64 = "147lh1way8db0j0m6wbpfzmfsvvlsjb29cjgf7s9hljb00wqv6ay"; - version = "71.0.3578.80"; + sha256 = "1xcdbf5yia3xm0kil0gyd1mlj3m902w1px3lzpdqv31mr2lzaz08"; + sha256bin64 = "0pcbz3201nyl07psdxwphb3z9shqj4crj16f97xclyvjnwpl1jnp"; + version = "72.0.3626.28"; }; dev = { - sha256 = "0whw1kq5gd07k061ycfdn7bygahbl6zqa54wkz2lqh73yknbbnj4"; - sha256bin64 = "0hlfzzf7kx90jw0zin685c4haiv262hf9a4sj6fmb2yhj21hbp87"; - version = "72.0.3622.0"; + sha256 = "1vlpcafg3xx6bpnf74xs6ifqjbpb5bpxp10r55w4784yr57pmhq3"; + sha256bin64 = "02y974zbxy1gbiv9q8hp7nfl0l5frn35ggmgc44g90pbry48h8rg"; + version = "73.0.3642.0"; }; stable = { - sha256 = "03ddfxxzh8pxil9n28y8nkzl8x0kb5bzzjy4mihg448dflh3anq2"; - sha256bin64 = "1rnw3whn2aaxxb4w3s2nf0wb91qjrq099550j42wig7xa71j6rz4"; - version = "71.0.3578.80"; + sha256 = "0icxdg4fvz30jzq0xvl11zlwc9anb3lr9lb8sn1lqxr513isjmhw"; + sha256bin64 = "07kiqx5bpk54il0ynxl61bs5yscxb470q2bw3sx6cxjbhmnvbcn2"; + version = "71.0.3578.98"; }; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 2a2f71d419f..8f135614f4d 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -263,20 +263,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = false; # "--disable-tests" above - preInstall = '' - # The following is needed for startup cache creation on grsecurity kernels. - paxmark m dist/bin/xpcshell - ''; - installPhase = if stdenv.isDarwin then '' mkdir -p $out/Applications cp -LR dist/Firefox.app $out/Applications '' else null; postInstall = lib.optionalString stdenv.isLinux '' - # For grsecurity kernels - paxmark m $out/lib/firefox*/{firefox,firefox-bin,plugin-container} - # Remove SDK cruft. FIXME: move to a separate output? rm -rf $out/share/idl $out/include $out/lib/firefox-devel-* diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index c3273562b0b..290810198ad 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -1,54 +1,31 @@ -{ stdenv, fetchurl, cmake, pkgconfig, intltool, vala_0_34, wrapGAppsHook -, gtk3, webkitgtk, librsvg, libnotify, sqlite -, glib-networking, gsettings-desktop-schemas, libsoup, pcre, gnome3 -, libxcb, libpthreadstubs, libXdmcp, libxkbcommon, epoxy, at-spi2-core -, zeitgeistSupport ? false, zeitgeist ? null +{ stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook, gcr +, gtk3, webkitgtk, sqlite, gsettings-desktop-schemas, libsoup, glib-networking, gnome3 }: -assert zeitgeistSupport -> zeitgeist != null; - stdenv.mkDerivation rec { - name = "midori-${version}"; - version = "0.5.11"; - - meta = with stdenv.lib; { - description = "Lightweight WebKitGTK+ web browser"; - homepage = http://midori-browser.org; - license = with licenses; [ lgpl21Plus ]; - platforms = with platforms; linux; - maintainers = with maintainers; [ raskin ramkromberg ]; - }; + pname = "midori"; + version = "7"; src = fetchurl { - urls = [ - "${meta.homepage}/downloads/midori_${version}_all_.tar.bz2" - "http://mirrors-ru.go-parts.com/blfs/conglomeration/midori/midori_${version}_all_.tar.bz2" - ]; - name = "midori_${version}_all_.tar.bz2"; - sha256 = "0gcwqkcyliqz10i33ww3wl02mmfnl7jzl2d493l4l53ipsb1l6cn"; + url = "https://github.com/midori-browser/core/releases/download/v${version}/midori-v${version}.0.tar.gz"; + sha256 = "0ffdnjp55s0ci737vlhxikb2nihghwlb6mjcjzpgpnzi47vjqnwh"; }; nativeBuildInputs = [ - pkgconfig wrapGAppsHook cmake intltool vala_0_34 + pkgconfig cmake ninja intltool vala wrapGAppsHook ]; buildInputs = [ - gtk3 webkitgtk librsvg libnotify sqlite gsettings-desktop-schemas pcre gnome3.gcr - libxcb libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core - (libsoup.override {gnomeSupport = true;}) - ] ++ stdenv.lib.optionals zeitgeistSupport [ - zeitgeist + gtk3 webkitgtk sqlite gsettings-desktop-schemas gcr + (libsoup.override { gnomeSupport = true; }) gnome3.libpeas + glib-networking ]; - cmakeFlags = [ - "-DUSE_ZEITGEIST=${if zeitgeistSupport then "ON" else "OFF"}" - "-DHALF_BRO_INCOM_WEBKIT2=ON" - "-DUSE_GTK3=1" - ]; - - NIX_LDFLAGS="-lX11"; - - preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules") - ''; + meta = with stdenv.lib; { + description = "Lightweight WebKitGTK+ web browser"; + homepage = https://www.midori-browser.org/; + license = with licenses; [ lgpl21Plus ]; + platforms = with platforms; linux; + maintainers = with maintainers; [ raskin ramkromberg ]; + }; } diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 8b7dfc86027..5e44bb8cbef 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -10,20 +10,14 @@ assert withMediaPlayback -> gst_all_1 != null; let - pdfjs = stdenv.mkDerivation rec { - name = "pdfjs-${version}"; + pdfjs = let version = "1.10.100"; - - src = fetchzip { - url = "https://github.com/mozilla/pdf.js/releases/download/${version}/${name}-dist.zip"; - sha256 = "04df4cf6i6chnggfjn6m1z9vb89f01a0l9fj5rk21yr9iirq9rkq"; - stripRoot = false; - }; - - buildCommand = '' - mkdir $out - cp -r $src $out - ''; + in + fetchzip rec { + name = "pdfjs-${version}"; + url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip"; + sha256 = "04df4cf6i6chnggfjn6m1z9vb89f01a0l9fj5rk21yr9iirq9rkq"; + stripRoot = false; }; in python3Packages.buildPythonApplication rec { diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index 88680414d1c..3a7612bb0fb 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { inherit patches; - installFlags = [ "PREFIX=/" "DESTDIR=$(out)" ]; + installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "A simple web browser based on WebKit/GTK+"; diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix index 130ccdc8311..3f342ea04a0 100644 --- a/pkgs/applications/networking/cluster/cni/default.nix +++ b/pkgs/applications/networking/cluster/cni/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, go, removeReferencesTo }: +{ stdenv, fetchFromGitHub, buildGoPackage }: -stdenv.mkDerivation rec { +buildGoPackage rec { name = "cni-${version}"; version = "0.6.0"; @@ -11,29 +11,23 @@ stdenv.mkDerivation rec { sha256 = "00ajs2r5r2z3l0vqwxrcwhjfc9px12qbcv5vnvs2mdipvvls1y2y"; }; - buildInputs = [ removeReferencesTo go ]; - - GOCACHE = "off"; + goPackagePath = "github.com/containernetworking/cni"; buildPhase = '' + cd "go/src/${goPackagePath}" patchShebangs build.sh ./build.sh ''; installPhase = '' - mkdir -p $out/bin - mv bin/cnitool $out/bin - ''; - - preFixup = '' - find $out/bin -type f -exec remove-references-to -t ${go} '{}' + + install -Dm555 bin/cnitool $bin/bin/cnitool ''; meta = with stdenv.lib; { description = "Container Network Interface - networking for Linux containers"; license = licenses.asl20; homepage = https://github.com/containernetworking/cni; - maintainers = with maintainers; [offline]; + maintainers = with maintainers; [ offline vdemeester ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix index e7cba7d9f38..aad75264364 100644 --- a/pkgs/applications/networking/cluster/luigi/default.nix +++ b/pkgs/applications/networking/cluster/luigi/default.nix @@ -19,6 +19,9 @@ python3Packages.buildPythonApplication rec { # Requires tox, hadoop, and google cloud doCheck = false; + # This enables accessing modules stored in cwd + makeWrapperArgs = ["--prefix PYTHONPATH . :"]; + meta = with lib; { homepage = https://github.com/spotify/luigi; description = "Python package that helps you build complex pipelines of batch jobs"; diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/applications/networking/cluster/minishift/default.nix index c07be777de0..6f227615502 100644 --- a/pkgs/applications/networking/cluster/minishift/default.nix +++ b/pkgs/applications/networking/cluster/minishift/default.nix @@ -4,10 +4,9 @@ }: let - version = "1.27.0"; + version = "1.29.0"; # Update these on version bumps according to Makefile - b2dIsoVersion = "v1.3.0"; centOsIsoVersion = "v1.13.0"; openshiftVersion = "v3.11.0"; @@ -19,7 +18,7 @@ in buildGoPackage rec { owner = "minishift"; repo = "minishift"; rev = "v${version}"; - sha256 = "1zd9fjw90h8dlr5w7pdf1agvm51b1zckf3grwwjdg64jqpzdwg9f"; + sha256 = "17scvv60hgk7s9fy4s9z26sc8a69ryh33rhr1f7p92kb5wfh2x40"; }; nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ]; @@ -41,7 +40,6 @@ in buildGoPackage rec { buildFlagsArray = '' -ldflags= -X ${goPackagePath}/pkg/version.minishiftVersion=${version} - -X ${goPackagePath}/pkg/version.b2dIsoVersion=${b2dIsoVersion} -X ${goPackagePath}/pkg/version.centOsIsoVersion=${centOsIsoVersion} -X ${goPackagePath}/pkg/version.openshiftVersion=${openshiftVersion} ''; @@ -65,7 +63,7 @@ in buildGoPackage rec { or develop with it, day-to-day, on your local host. ''; homepage = https://github.com/minishift/minishift; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz vdemeester ]; platforms = platforms.linux; license = licenses.asl20; }; diff --git a/pkgs/applications/networking/cluster/pig/default.nix b/pkgs/applications/networking/cluster/pig/default.nix index 45dcfb1738c..26c39f8cbe2 100644 --- a/pkgs/applications/networking/cluster/pig/default.nix +++ b/pkgs/applications/networking/cluster/pig/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { - name = "pig-0.16.0"; + name = "pig-0.17.0"; src = fetchurl { url = "mirror://apache/pig/${name}/${name}.tar.gz"; - sha256 = "0p79grz5islnq195lv7pqdxb5l3v4y0k0w63602827qs70zpr508"; + sha256 = "1wwpg0w47f49rnivn2d26vrxgyfl9gpqx3vmzbl5lhx6x5l3fqbd"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://pig.apache.org/; + homepage = https://pig.apache.org/; description = "High-level language for Apache Hadoop"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index ab884a1b97c..56c30df37c5 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terragrunt-${version}"; - version = "0.17.3"; + version = "0.17.4"; goPackagePath = "github.com/gruntwork-io/terragrunt"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gruntwork-io"; repo = "terragrunt"; rev = "v${version}"; - sha256 = "1b0fwql9nr00qpvcbsbdymxf1wrgr590gkms7yz3yirb4xfl3gl3"; + sha256 = "13hlv0ydmv8gpzgg6bfr7rp89xfw1bkgd0j684armw8zq29cmv3a"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 3fec84d224f..8508ab10e1a 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -1,8 +1,4 @@ -{ lib, python -, delugeSupport ? true, deluge ? null -}: - -assert delugeSupport -> deluge != null; +{ lib, python36 }: # Flexget have been a trouble maker in the past, # if you see flexget breaking when updating packages, don't worry. @@ -10,17 +6,9 @@ assert delugeSupport -> deluge != null; # -- Mic92 let - python' = python.override { inherit packageOverrides; }; + python' = python36.override { inherit packageOverrides; }; packageOverrides = self: super: { - sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec { - version = "1.2.6"; - src = old.src.override { - inherit version; - sha256 = "1nwylglh256mbwwnng6n6bzgxshyz18j12hw76sghbprp74hrc3w"; - }; - }); - guessit = super.guessit.overridePythonAttrs (old: rec { version = "3.0.3"; src = old.src.override { @@ -36,14 +24,16 @@ with python'.pkgs; buildPythonApplication rec { pname = "FlexGet"; - version = "2.17.14"; + version = "2.17.20"; src = fetchPypi { inherit pname version; - sha256 = "1wh12nspjzsgb0a7qp67s4k8wssbhhf500s8x8mx2smb1mgy4xzz"; + sha256 = "a09ef9482ed54f7e96eb8b4d08c59687c5c43a3341c9d2675383693e6c3681c3"; }; postPatch = '' + # build for the correct python version + substituteInPlace setup.cfg --replace $'[bdist_wheel]\npython-tag = py27' "" # remove dependency constraints sed 's/==\([0-9]\.\?\)\+//' -i requirements.txt ''; @@ -52,25 +42,20 @@ buildPythonApplication rec { doCheck = false; propagatedBuildInputs = [ + # See https://github.com/Flexget/Flexget/blob/master/requirements.in feedparser sqlalchemy pyyaml - chardet beautifulsoup4 html5lib + beautifulsoup4 html5lib PyRSS2Gen pynzb rpyc jinja2 - jsonschema requests dateutil + requests dateutil jsonschema pathpy guessit APScheduler terminaltables colorclass cherrypy flask flask-restful flask-restplus flask-compress - flask_login flask-cors safe - pyparsing future zxcvbn-python - werkzeug tempora cheroot rebulk - portend transmissionrpc aniso8601 - babelfish certifi click futures - idna itsdangerous markupsafe - plumbum pytz six tzlocal urllib3 - webencodings werkzeug zxcvbn-python - backports_functools_lru_cache - ] ++ lib.optional (pythonOlder "3.4") pathlib - ++ lib.optional delugeSupport deluge; + flask_login flask-cors + pyparsing zxcvbn-python future + # Optional requirements + deluge-client + ] ++ lib.optional (pythonOlder "3.4") pathlib; meta = with lib; { homepage = https://flexget.com/; diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 7717862f6a0..24e641abc82 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -1,10 +1,10 @@ { stable, branch, version, sha256Hash }: -{ stdenv, python3Packages, fetchFromGitHub, fetchurl }: +{ stdenv, python36Packages, fetchFromGitHub, fetchurl }: let - pythonPackages = python3Packages; - async-timeout = (stdenv.lib.overrideDerivation pythonPackages.async-timeout + pythonPackages = python36Packages; + async-timeout = pythonPackages.async-timeout.overrideAttrs (oldAttrs: rec { pname = "async-timeout"; @@ -13,8 +13,8 @@ let inherit pname version; sha256 = "1l3kg062m02mph6rf9rdv8r5c5n356clxa6b6mrn0i77vk9g9kq0"; }; - })); - aiohttp = (stdenv.lib.overrideDerivation pythonPackages.aiohttp + }); + aiohttp = pythonPackages.aiohttp.overrideAttrs (oldAttrs: rec { pname = "aiohttp"; @@ -24,10 +24,9 @@ let sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964"; }; propagatedBuildInputs = [ async-timeout ] - ++ (with pythonPackages; [ attrs chardet multidict yarl ]) - ++ stdenv.lib.optional (pythonPackages.pythonOlder "3.7") pythonPackages.idna-ssl; - })); - aiohttp-cors = (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors + ++ (with pythonPackages; [ attrs chardet multidict yarl idna-ssl ]); + }); + aiohttp-cors = pythonPackages.aiohttp-cors.overrideAttrs (oldAttrs: rec { pname = "aiohttp-cors"; @@ -41,7 +40,7 @@ let ++ stdenv.lib.optional (pythonPackages.pythonOlder "3.5") pythonPackages.typing; - })); + }); in pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "gns3-server"; @@ -57,7 +56,7 @@ in pythonPackages.buildPythonPackage rec { ++ (with pythonPackages; [ yarl aiohttp multidict jinja2 psutil zipstream raven jsonschema typing - prompt_toolkit + (pythonPackages.callPackage ../../../development/python-modules/prompt_toolkit/1.nix {}) ]); # Requires network access diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 09ead9b3de6..4b1af80d624 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -32,8 +32,6 @@ stdenv.mkDerivation rec { patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ $out/opt/discord/Discord - paxmark m $out/opt/discord/Discord - wrapProgram $out/opt/discord/Discord --prefix LD_LIBRARY_PATH : ${libPath} ln -s $out/opt/discord/Discord $out/bin/ diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index 2f3870d7899..4b8670f23d4 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -54,7 +54,6 @@ in stdenv.mkDerivation rec { ''; postFixup = '' - paxmark m $out/opt/franz/Franz wrapProgram $out/opt/franz/Franz --prefix PATH : ${xdg_utils}/bin ''; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix index 3b8cdd7a8cc..45214944309 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix @@ -13,9 +13,10 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.linux; }; - makeFlags = "PURPLE_LIBDIR=lib PURPLE_DATADIR=share/data DESTDIR=$$out"; - preInstall = "mkdir -p \$out/share"; - postInstall = "ln -s \$out/lib/purple-2 \$out/share/pidgin-msn-pecan"; + makeFlags = [ + "PURPLE_LIBDIR=${placeholder "out"}/lib" + "PURPLE_DATADIR=${placeholder "out"}/share/data" + ]; buildInputs = [pidgin]; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix index 574c01c2cde..18bf89a5f2e 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix @@ -15,13 +15,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ pidgin ]; - preConfigure = '' + postPatch = '' sed -i 's|-I/usr/include/libpurple|$(shell pkg-config --cflags purple)|' Makefile - export DESTDIR=$out - export LIBDIR=/lib - export DATADIR=/share ''; + makeFlags = [ + "DESTDIR=/" + "LIBDIR=${placeholder "out"}/lib" + "DATADIR=${placeholder "out"}/share" + ]; + meta = { homepage = https://github.com/dreadatour/pidgin-mra; description = "Mail.ru Agent plugin for Pidgin / libpurple"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix index b8d6cf6aee3..7e86a390edc 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pidgin, unzip, glib, json-glib, nss, nspr, libgnome-keyring } : +{ stdenv, fetchFromGitHub, pidgin, glib, json-glib, nss, nspr, libgnome-keyring } : stdenv.mkDerivation rec { name = "pidgin-opensteamworks-${version}"; @@ -13,12 +13,11 @@ stdenv.mkDerivation rec { preConfigure = "cd steam-mobile"; installFlags = [ - "DESTDIR=$(out)" - "PLUGIN_DIR_PURPLE=/lib/purple-2" - "DATA_ROOT_DIR_PURPLE=/share" + "PLUGIN_DIR_PURPLE=${placeholder "out"}/lib/purple-2" + "DATA_ROOT_DIR_PURPLE=${placeholder "out"}/share" ]; - buildInputs = [ pidgin unzip glib json-glib nss nspr libgnome-keyring ]; + buildInputs = [ pidgin glib json-glib nss nspr libgnome-keyring ]; meta = with stdenv.lib; { homepage = https://github.com/EionRobb/pidgin-opensteamworks; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix index 6e589febe6d..5fbf385ed07 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pidgin-skypeweb-${version}"; - version = "1.2.2"; + version = "1.5"; src = fetchFromGitHub { owner = "EionRobb"; repo = "skype4pidgin"; - rev = "${version}"; - sha256 = "1lxpz316jmns6i143v4j6sd6k0a4a54alw08rvwjckf2rig57lj2"; + rev = version; + sha256 = "1bd9gd36yhrbrww0dvai9rnzxxj1c9sb4003c72wg27w12y47xfv"; }; setSourceRoot = '' @@ -18,13 +18,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ pidgin json-glib ]; - makeFlags = [ - "PLUGIN_DIR_PURPLE=/lib/pidgin/" - "DATA_ROOT_DIR_PURPLE=/share" - "DESTDIR=$(out)" - ]; - - postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-skypeweb"; + PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; + PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share"; meta = with stdenv.lib; { homepage = https://github.com/EionRobb/skype4pidgin; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix index af58aaa0a76..ba1d64c8b92 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix @@ -14,12 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ pidgin json-glib ]; - makeFlags = [ - "DESTDIR=$(out)" - ]; - - PKG_CONFIG_PURPLE_PLUGINDIR = "/lib/purple-2"; - PKG_CONFIG_PURPLE_DATADIR = "/share"; + PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; + PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share"; meta = with stdenv.lib; { homepage = https://github.com/EionRobb/purple-discord; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix index d4a26a266c3..0b2cba64920 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -18,9 +18,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "fortify" ]; # upstream compiles with -O0 makeFlags = [ - "DESTDIR=$(out)" - "PLUGIN_DIR_PURPLE=/lib/pidgin/" - "DATA_ROOT_DIR_PURPLE=/share" + "PLUGIN_DIR_PURPLE=${placeholder "out"}/lib/purple-2" + "DATA_ROOT_DIR_PURPLE=${placeholder "out"}/share" ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index d01019a5619..e1a2fb40c5a 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "psi-plus-${version}"; - version = "1.4.404"; + version = "1.4.504"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; rev = "${version}"; - sha256 = "05dcr1i7ic6nff70w4zfpdcmwf19kkhgxm7mcznmlr484d5i1v2m"; + sha256 = "1nv1ynad2gcn7r8mm2w3kixmahaql7xax1lccsqyxqmj1r0klk8q"; }; resources = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index e2ca3972b5f..1d1617ed9e0 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -3,11 +3,11 @@ let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "0.17.6"; + version = "0.17.8"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "1y38fq0r9cxmazh9rjc5qy7fzwy81ad35k538d6rsfwz1y88ipdm"; + sha256 = "0610h307q0zlyd0l7afrb8jv1r9gy9gc07zkjn33jpycwmpbwxbz"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index c74226e1e40..2aa09074204 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,8 +4,8 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.5.2"; - sha256Hash = "0kg1xw1b4zj5a2yf6x5r7wrpl7w0fs52s58w606n9gyx7kdcgkj8"; + version = "1.5.4"; + sha256Hash = "0a52m5qkvk01yl3za3k7pccjrqkr8gbxqnj5lnhh1im1pdxqwh4m"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk archPatchesRevision = "415526"; archPatchesHash = "1lfzws90ab0vajhm5r64gyyqqc1g6a2ay0a1vkp0ah1iw5jh11ik"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix index 302eb975d81..c20da7eeb66 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix @@ -29,7 +29,9 @@ mkDerivation rec { }; # TODO: libtgvoip.patch no-gtk2.patch - patches = [ "${archPatches}/tdesktop.patch" ] + patches = [ + "${archPatches}/tdesktop.patch" + ] # TODO: Only required to work around a compiler bug. # This should be fixed in GCC 7.3.1 (or later?) ++ [ ./fix-internal-compiler-error.patch ]; diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix index b85e9d3d4cb..7a78527c501 100644 --- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -8,7 +8,7 @@ with stdenv.lib; let bits = "x86_64"; - version = "4.5.5"; + version = "4.5.9"; desktopItem = makeDesktopItem rec { name = "Wavebox"; @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { name = "wavebox-${version}"; src = fetchurl { url = "https://github.com/wavebox/waveboxapp/releases/download/v${version}/${tarball}"; - sha256 = "b392e02b3b1b4deece32311aeb69b31c2550c4251be65f408c35b0badbf3c8b6"; + sha256 = "158kj7r5p4p3xk5pwzvbd51h543panmgkr64knv418ksyqjdi16g"; }; # don't remove runtime deps @@ -52,7 +52,6 @@ in stdenv.mkDerivation rec { ''; postFixup = '' - paxmark m $out/opt/wavebox/Wavebox makeWrapper $out/opt/wavebox/Wavebox $out/bin/wavebox \ --prefix PATH : ${xdg_utils}/bin ''; diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix index fee19de0e8d..9c1aa8f86f6 100644 --- a/pkgs/applications/networking/insync/default.nix +++ b/pkgs/applications/networking/insync/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "insync-${version}"; - version = "1.4.5.37069"; + version = "1.5.5.37367"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "http://s.insynchq.com/builds/insync-portable_${version}_amd64.tar.bz2"; - sha256 = "0mkqgpq4isngkj20c0ygmxf4cj975d446svhwvl3cqdrjkjm1ybd"; + sha256 = "1yz8l8xjr0pm30hvv4w59wzs569xzkpn8lv12pyl82r1l16h5zp3"; } else throw "${name} is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index c048c2938a9..b53c7b910f6 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -100,7 +100,7 @@ in stdenv.mkDerivation rec { '' cxxLib=$( echo -n ${gcc}/include/c++/* ) archLib=$cxxLib/$( ${gcc}/bin/gcc -dumpmachine ) - + test -f layout/style/ServoBindings.toml && sed -i -e '/"-DRUST_BINDGEN"/ a , "-cxx-isystem", "'$cxxLib'", "-isystem", "'$archLib'"' layout/style/ServoBindings.toml configureScript="$(realpath ./configure)" @@ -108,18 +108,9 @@ in stdenv.mkDerivation rec { cd ../objdir ''; - preInstall = - '' - # The following is needed for startup cache creation on grsecurity kernels. - paxmark m ../objdir/dist/bin/xpcshell - ''; - dontWrapGApps = true; # we do it ourselves postInstall = '' - # For grsecurity kernels - paxmark m $out/lib/thunderbird/thunderbird - # TODO: Move to a dev output? rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 9d51a76f536..308c857644e 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -2,7 +2,7 @@ , stdenv, fetchurl, pkgconfig, gtk3, gtkspell3 ? null , perl, gmime2, gettext, intltool, itstool, libxml2, dbus-glib, libnotify, gnutls , makeWrapper, gnupg -, gnomeSupport ? true, gnome3, libsecret +, gnomeSupport ? true, libsecret, gcr }: assert spellChecking -> gtkspell3 != null; @@ -20,7 +20,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig gettext intltool itstool libxml2 makeWrapper ]; buildInputs = [ gtk3 gmime2 libnotify gnutls ] ++ stdenv.lib.optional spellChecking gtkspell3 - ++ stdenv.lib.optionals gnomeSupport [ libsecret gnome3.gcr ]; + ++ stdenv.lib.optionals gnomeSupport [ libsecret gcr ]; configureFlags = [ "--with-dbus" diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 532efa68f9a..81c493fedcf 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,13 +10,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "qbittorrent-${version}"; - version = "4.1.4"; + version = "4.1.5"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qbittorrent"; rev = "release-${version}"; - sha256 = "1hclyahgzj775h1fnv2rck9cw3r2yp2r6p1q263mj890n32gf3hp"; + sha256 = "09zcygaxfv9g6av0vsvlyzv4v65wvj766xyfx31yz5ig3xan6ak1"; }; # NOTE: 2018-05-31: CMake is working but it is not officially supported diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index 5861513e7bd..b8c905345bd 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "syncplay-${version}"; - version = "1.6.0"; + version = "1.6.1"; format = "other"; src = fetchurl { - url = https://github.com/Syncplay/syncplay/archive/v1.6.0.tar.gz; - sha256 = "19x7b694p8b3qp578qk8q4g0pybhfjd4zk8rgrggz40s1yyfnwy5"; + url = https://github.com/Syncplay/syncplay/archive/v1.6.1.tar.gz; + sha256 = "15rhbc3r7l012d330hb64p8bhcpy4ydy89iv34c34a1r554b8k97"; }; propagatedBuildInputs = with python3Packages; [ pyside twisted ]; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 16649653eb3..b084e4af972 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,14 +3,14 @@ let common = { stname, target, postInstall ? "" }: buildGoPackage rec { - version = "0.14.52"; + version = "0.14.54"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "1qzzbqfyjqlgzysyf6dr0xsm3gn35irmllxjjd94v169swvkk5kd"; + sha256 = "0l73ka71l6gxv46wmlyzj8zhfpfj3vf6nv6x3x0z25ymr3wa2fza"; }; goPackagePath = "github.com/syncthing/syncthing"; diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index b1aed5e5f59..5d0985b0ba2 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -5,33 +5,23 @@ let inherit (pythonPackages) python pygobject3; - isopub = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isopub.ent; sha256 = "073l492jz70chcadr2p7ssx7gz5hd731s2cazhxx4r845kilyr77"; }; - isonum = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isonum.ent; sha256 = "04b62dw2g3cj9i4vn9xyrsrlz8fpmmijq98dm0nrkky31bwbbrs3"; }; - isogrk1 = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent; sha256 = "04b23anhs5wr62n4rgsjirzvw7rpjcsf8smz4ffzaqh3b0vw90vm"; }; in stdenv.mkDerivation rec { - name = "gnumeric-1.12.43"; + pname = "gnumeric"; + version = "1.12.44"; src = fetchurl { - url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz"; - sha256 = "87c9abd6260cf29401fa1e0fcce374e8c7bcd1986608e4049f6037c9d32b5fd5"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0147962c6ybdsj57rz95nla0rls7g545wc2n7pz59zmzyd5pksk0"; }; configureFlags = [ "--disable-component" ]; - prePatch = '' - substituteInPlace doc/C/gnumeric.xml \ - --replace http://www.oasis-open.org/docbook/xml/4.5/ent/isopub.ent ${isopub} \ - --replace http://www.oasis-open.org/docbook/xml/4.5/ent/isonum.ent ${isonum} \ - --replace http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent ${isogrk1} - ''; - - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig intltool bison itstool makeWrapper ]; # ToDo: optional libgda, introspection? buildInputs = [ - intltool bison - goffice gtk3 makeWrapper gnome3.defaultIconTheme - python pygobject3 itstool + goffice gtk3 gnome3.defaultIconTheme + python pygobject3 ] ++ (with perlPackages; [ perl XMLParser ]); enableParallelBuilding = true; @@ -44,6 +34,12 @@ in stdenv.mkDerivation rec { done ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { description = "The GNOME Office Spreadsheet"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index aa9317d2ffd..9c4c22dabe9 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -112,7 +112,6 @@ stdenv.mkDerivation { patchelf --set-interpreter $interpreter \ --set-rpath ${stdenv.lib.makeLibraryPath deps}:$out/lib \ $out/bin/mendeleydesktop - paxmark m $out/bin/mendeleydesktop wrapProgram $out/bin/mendeleydesktop \ --add-flags "--unix-distro-build" \ diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index 070ef4845d8..5168b2fef53 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -7,11 +7,11 @@ mkDerivation rec { name = "skrooge-${version}"; - version = "2.16.2"; + version = "2.17.0"; src = fetchurl { url = "http://download.kde.org/stable/skrooge/${name}.tar.xz"; - sha256 = "0idvqbra8a71jb5kq9y5v377l7k3shf4z7w71apc3rjvb4l0jkhj"; + sha256 = "0v83bcabchsz5fs0iv5i75ps01sga48hq4cx29dajcq3kf9xgwhr"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 26a141dc506..a3e2bdd4d1e 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -9,11 +9,11 @@ python2Packages.buildPythonApplication rec { name = "zim-${version}"; - version = "0.68"; + version = "0.69"; src = fetchurl { url = "http://zim-wiki.org/downloads/${name}.tar.gz"; - sha256 = "05fzb24a2s3pm89zb6gwa48wb925an5i652klx8yk9pn23h1h5fr"; + sha256 = "1j04l1914iw87b0jd3r1czrh0q491fdgbqbi0biacxiri5q0i6a1"; }; propagatedBuildInputs = with python2Packages; [ pyGtkGlade pyxdg pygobject2 ]; @@ -42,5 +42,6 @@ python2Packages.buildPythonApplication rec { homepage = http://zim-wiki.org; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; + broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/52658#issuecomment-449565790 }; } diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index cb7b2fbff3c..eb7ba2a8c9c 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { name = "stellarium-${version}"; - version = "0.18.2"; + version = "0.18.3"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - sha256 = "17764i52dmipaz62k5n23fyx07d7cjir0dgav0s5b6sjd8gbjwbf"; + sha256 = "1cnwfk3vdsxh8gacw22qik401z0kpzd1ralbg9ph2cjqx9x2m1s1"; }; nativeBuildInputs = [ cmake perl ]; diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index 4ffbaf85fbd..1804f854c48 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "igv-${version}"; - version = "2.4.15"; + version = "2.4.16"; src = fetchurl { url = "https://data.broadinstitute.org/igv/projects/downloads/2.4/IGV_${version}.zip"; - sha256 = "000l9hnkjbl9js7v8fyssgl4imrl0qd15mgz37qx2bwvimdp75gh"; + sha256 = "0bsl20zw7sgw16xadh1hmlg6d6ijyb1dhpnyvf4kxk3nk0abrmn1"; }; buildInputs = [ unzip jre ]; diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 9c7de486573..ad37a3a7dab 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "picard-tools-${version}"; - version = "2.18.17"; + version = "2.18.20"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "0ks7ymrjfya5h77hp0bqyipzdri0kf97c8wks32nvwkj821687zm"; + sha256 = "0dx6fxn6d7mawkah242fdi9wm8pdzmm4m004fb9ak2fsvrs2m5pk"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix new file mode 100644 index 00000000000..af3844f4731 --- /dev/null +++ b/pkgs/applications/science/electronics/dsview/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub, pkgconfig, cmake, autoreconfHook, +glib, libzip, boost, fftw, qtbase, +libusb, makeWrapper, libsigrok4dsl, libsigrokdecode4dsl +}: + +stdenv.mkDerivation rec { + name = "dsview-${version}"; + + version = "0.99"; + + src = fetchFromGitHub { + owner = "DreamSourceLab"; + repo = "DSView"; + rev = version; + sha256 = "189i3baqgn8k3aypalayss0g489xi0an9hmvyggvxmgg1cvcwka2"; + }; + + postUnpack = '' + export sourceRoot=$sourceRoot/DSView + ''; + + patches = [ + # Fix absolute install paths + ./install.patch + ]; + + nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; + + buildInputs = [ + boost fftw qtbase libusb libzip libsigrokdecode4dsl libsigrok4dsl + ]; + + enableParallelBuilding = true; + + postFixup = '' + wrapProgram $out/bin/DSView --suffix QT_PLUGIN_PATH : \ + ${qtbase.bin}/${qtbase.qtPluginPrefix} + ''; + + meta = with stdenv.lib; { + description = "A GUI program for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc"; + homepage = http://www.dreamsourcelab.com/; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.bachp ]; + }; +} diff --git a/pkgs/applications/science/electronics/dsview/install.patch b/pkgs/applications/science/electronics/dsview/install.patch new file mode 100644 index 00000000000..e30a28d80fa --- /dev/null +++ b/pkgs/applications/science/electronics/dsview/install.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c1c33e1..208a184 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -403,8 +403,8 @@ install(DIRECTORY res DESTINATION share/${PROJECT_NAME}) + install(FILES icons/logo.png DESTINATION share/${PROJECT_NAME} RENAME logo.png) + install(FILES ../NEWS DESTINATION share/${PROJECT_NAME} RENAME NEWS) + install(FILES ../ug.pdf DESTINATION share/${PROJECT_NAME} RENAME ug.pdf) +-install(FILES DreamSourceLab.rules DESTINATION /etc/udev/rules.d/) +-install(FILES DSView.desktop DESTINATION /usr/share/applications/) ++install(FILES DreamSourceLab.rules DESTINATION etc/udev/rules.d/) ++install(FILES DSView.desktop DESTINATION share/applications/) + + #=============================================================================== + #= Packaging (handled by CPack) diff --git a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix new file mode 100644 index 00000000000..4a681907e19 --- /dev/null +++ b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix @@ -0,0 +1,28 @@ +{ stdenv, pkgconfig, autoreconfHook, +glib, libzip, libserialport, check, libusb, libftdi, +systemd, alsaLib, dsview +}: + +stdenv.mkDerivation rec { + inherit (dsview) version src; + + name = "libsigrok4dsl-${version}"; + + postUnpack = '' + export sourceRoot=$sourceRoot/libsigrok4DSL + ''; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + + buildInputs = [ + glib libzip libserialport libusb libftdi systemd check alsaLib + ]; + + meta = with stdenv.lib; { + description = "A fork of the sigrok library for usage with DSView"; + homepage = http://www.dreamsourcelab.com/; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.bachp ]; + }; +} diff --git a/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix new file mode 100644 index 00000000000..58f32f2ae6c --- /dev/null +++ b/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix @@ -0,0 +1,27 @@ +{ stdenv, pkgconfig, autoreconfHook, +glib, check, python3, dsview +}: + +stdenv.mkDerivation rec { + inherit (dsview) version src; + + name = "libsigrokdecode4dsl-${version}"; + + postUnpack = '' + export sourceRoot=$sourceRoot/libsigrokdecode4DSL + ''; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + + buildInputs = [ + python3 glib check + ]; + + meta = with stdenv.lib; { + description = "A fork of the sigrokdecode library for usage with DSView"; + homepage = http://www.dreamsourcelab.com/; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.bachp ]; + }; +} diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index ab9f6af85d3..fdee3e013de 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "verilator-${version}"; - version = "4.006"; + version = "4.008"; src = fetchurl { url = "https://www.veripool.org/ftp/${name}.tgz"; - sha256 = "0vnybpknf4llw3fw800ffiqj89ilbq06j8b2x4syj2gsrlnjvp1i"; + sha256 = "1b0cj7bb2a3hrfaziix7p9idcpbygapdl0nrfr3pbdxxsgnzdknm"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix index d7a5e7b4c83..bf8d3cf03b8 100644 --- a/pkgs/applications/science/logic/aspino/default.nix +++ b/pkgs/applications/science/logic/aspino/default.nix @@ -44,5 +44,7 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.asl20; homepage = http://alviano.net/software/maxino/; + # See pkgs/applications/science/logic/glucose/default.nix + badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix index 218006e15d5..6c2d2f0a062 100644 --- a/pkgs/applications/science/logic/avy/default.nix +++ b/pkgs/applications/science/logic/avy/default.nix @@ -46,5 +46,8 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; platforms = stdenv.lib.platforms.linux; + # See pkgs/applications/science/logic/glucose/default.nix + # (The error is different due to glucose-fenv.patch, but the same) + badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/applications/science/logic/glucose/default.nix b/pkgs/applications/science/logic/glucose/default.nix index a0035f96539..bc8d372ce42 100644 --- a/pkgs/applications/science/logic/glucose/default.nix +++ b/pkgs/applications/science/logic/glucose/default.nix @@ -23,5 +23,7 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ gebner ]; + # Build uses _FPU_EXTENDED macro + badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 5cd6bbf4bdd..4283ebd931a 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -8,11 +8,11 @@ }: stdenv.mkDerivation rec { - name = "R-3.5.1"; + name = "R-3.5.2"; src = fetchurl { url = "https://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "0463bff5eea0f3d93fa071f79c18d0993878fd4f2e18ae6cf22c1639d11457ed"; + sha256 = "0qjvdic1qd5vndc4f0wjndpm0x18lbvbcc8nkix8saqgy8y8qgg5"; }; dontUseImakeConfigure = true; diff --git a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix index 4993910634a..5c6c22ac9cc 100644 --- a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, git, gnupg }: +{ stdenv, lib, fetchFromGitHub, makeWrapper, git, gnupg, gawk }: let version = "0.2.4"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation { install -D git-secret $out/bin/git-secret wrapProgram $out/bin/git-secret \ - --prefix PATH : "${lib.makeBinPath [ git gnupg ]}" + --prefix PATH : "${lib.makeBinPath [ git gnupg gawk ]}" mkdir $out/share cp -r man $out/share diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 242c06138eb..8df7c3700a2 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "git-repo-${version}"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "0078nyz2j3ci9rs0h104xh046n0mcls3xcw5mysi2r7453xj8fkn"; + sha256 = "09p0xv8x7mkmibri7rcl1k4dwh2gj3c7dipkrwrsir6hrwsispd1"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 3af24ffe759..eca07b81bac 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; buildGoPackage rec { name = "gitea-${version}"; - version = "1.6.0"; + version = "1.6.2"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "01nqf8pnpa0n72brqh499z15rys6f0ck7l2cnpbiqgg3kir8b21p"; + sha256 = "1ijxpihdg8k6gs1xpim0iviqakvjadjzp0a5ki2czykilnyg8y85"; # Required to generate the same checksum on MacOS due to unicode encoding differences # More information: https://github.com/NixOS/nixpkgs/pull/48128 extraPostFetch = '' @@ -33,7 +33,12 @@ buildGoPackage rec { nativeBuildInputs = [ makeWrapper ]; - buildFlags = optionalString sqliteSupport "-tags sqlite"; + buildFlags = optional sqliteSupport "-tags sqlite"; + buildFlagsArray = '' + -ldflags= + -X=main.Version=${version} + ${optionalString sqliteSupport "-X=main.Tags=sqlite"} + ''; outputs = [ "bin" "out" "data" ]; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 1f8f627f5ed..1e0d5de0847 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,12 +1,12 @@ { "ce": { - "version": "11.5.4", - "repo_hash": "1mk7zj79cz9g8y6b5p4cznv90h94mwgy14w9vdvmqbgbnx9bayc8", - "deb_hash": "18i3w1k8l5hj3732w3adw3cma78l9hx77wlrgvssg9gz609kqvx6", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.5.4-ce.0_amd64.deb/download.deb", + "version": "11.5.5", + "repo_hash": "1dxky06im18s4kxbb33qwm22pkkhgvyjggx31164iy71zcxxj1jr", + "deb_hash": "0wnyfl1bb5wb8kdyarjk9y4ydla84f3alnk3m3zwmdqfg9jsqgb8", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.5.5-ce.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ce", - "rev": "v11.5.4", + "rev": "v11.5.5", "passthru": { "GITALY_SERVER_VERSION": "0.129.0", "GITLAB_PAGES_VERSION": "1.3.1", @@ -15,13 +15,13 @@ } }, "ee": { - "version": "11.5.4", - "repo_hash": "1rpj34wblhk6yirix16grrlhg4dfna3mjvhn8bz82m94dkhx06lc", - "deb_hash": "05lizhf45xv4j0y0yafrpcrqmav1xmncxxgsm97s2mlhdwn5rfnd", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.5.4-ee.0_amd64.deb/download.deb", + "version": "11.5.5", + "repo_hash": "1j5g0x7rxrdb39b12psjirsa3s0lhqgnxh0q3r22cgzgxv0332b8", + "deb_hash": "193s1f7w9lcamqnmrc7c3klmybqqra7yr16x6ay0cznwcdgirisp", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.5.5-ee.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ee", - "rev": "v11.5.4-ee", + "rev": "v11.5.5-ee", "passthru": { "GITALY_SERVER_VERSION": "0.129.0", "GITLAB_PAGES_VERSION": "1.3.1", diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index d59b7241230..f5127094bc9 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -49,8 +49,9 @@ in python2Packages.buildPythonApplication { cp -v hgweb.cgi contrib/hgweb.wsgi $out/share/cgi-bin chmod u+x $out/share/cgi-bin/hgweb.cgi - # install bash completion - install -D -v contrib/bash_completion $out/share/bash-completion/completions/mercurial + # install bash/zsh completions + install -v -m644 -D contrib/bash_completion $out/share/bash-completion/completions/_hg + install -v -m644 -D contrib/zsh_completion $out/share/zsh/site-functions/_hg ''; meta = { diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix index 4a4879600ae..1054a2c06cf 100644 --- a/pkgs/applications/version-management/src/default.nix +++ b/pkgs/applications/version-management/src/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "src-${version}"; - version = "1.18"; + version = "1.22"; src = fetchurl { url = "http://www.catb.org/~esr/src/${name}.tar.gz"; - sha256 = "0n0skhvya8w2az45h2gsafxy8m2mvqas64nrgxifcmrzfv0rf26c"; + sha256 = "0xvfg3aikr2jh09vjvxsha7day5br88chvirncr59ad40da1fils"; }; buildInputs = [ python rcs git makeWrapper ]; diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index 6a429116a71..3937244f25b 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "clipgrab-${version}"; - version = "3.7.1"; + version = "3.7.2"; src = fetchurl { - sha256 = "0bhzkmcinlsfp5ldgqp59xnkaz6ikzdnq78drcdf1w7q4z05ipxd"; + sha256 = "1xkap4zgx8k0h0qfcqfwi3lj7s3mqsj0dp1cddiqmxbibbmg3rcc"; # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz! url = "https://download.clipgrab.org/${name}.tar.gz"; }; diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index bce8e3981d1..2cd4f19ca93 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchurl, pkgconfig, intltool, itstool, python3, wrapGAppsHook , python3Packages, gst_all_1, gtk3 -, gobject-introspection, librsvg, gnome3, libnotify +, gobject-introspection, librsvg, gnome3, libnotify, gsound , meson, ninja }: @@ -47,7 +47,7 @@ in python3Packages.buildPythonApplication rec { nativeBuildInputs = [ meson ninja pkgconfig intltool itstool python3 wrapGAppsHook ]; buildInputs = [ - gobject-introspection gtk3 librsvg gnome3.gnome-desktop gnome3.gsound + gobject-introspection gtk3 librsvg gnome3.gnome-desktop gsound gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas libnotify gst-transcoder diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix new file mode 100644 index 00000000000..0ad0b04e7e4 --- /dev/null +++ b/pkgs/applications/video/vdr/default.nix @@ -0,0 +1,78 @@ +{ stdenv, fetchurl, fontconfig, libjpeg, libcap, freetype, fribidi, pkgconfig +, gettext, ncurses, systemd, perl +, enableSystemd ? true +, enableBidi ? true +}: +let + + version = "2.4.0"; + + name = "vdr-${version}"; + + mkPlugin = name: stdenv.mkDerivation { + name = "vdr-${name}-${version}"; + inherit (vdr) src; + buildInputs = [ vdr ]; + preConfigure = "cd PLUGINS/src/${name}"; + installFlags = [ "DESTDIR=$(out)" ]; + }; + + vdr = stdenv.mkDerivation { + + inherit name; + + src = fetchurl { + url = "ftp://ftp.tvdr.de/vdr/${name}.tar.bz2"; + sha256 = "1klcgy9kr7n6z8d2c77j63bl8hvhx5qnqppg73f77004hzz4kbwk"; + }; + + enableParallelBuilding = true; + + postPatch = "substituteInPlace Makefile --replace libsystemd-daemon libsystemd"; + + buildInputs = [ fontconfig libjpeg libcap freetype ] + ++ stdenv.lib.optional enableSystemd systemd + ++ stdenv.lib.optional enableBidi fribidi; + + buildFlags = [ "vdr" "i18n" ] + ++ stdenv.lib.optional enableSystemd "SDNOTIFY=1" + ++ stdenv.lib.optional enableBidi "BIDI=1"; + + nativeBuildInputs = [ perl ]; + + # plugins uses the same build environment as vdr + propagatedNativeBuildInputs = [ pkgconfig gettext ]; + + installFlags = [ + "DESTDIR=$(out)" + "PREFIX=" # needs to be empty, otherwise plugins try to install at same prefix + ]; + + installTargets = [ "install-pc" "install-bin" "install-doc" "install-i18n" + "install-includes" ]; + + postInstall = '' + mkdir -p $out/lib/vdr # only needed if vdr is started without any plugin + mkdir -p $out/share/vdr/conf + cp *.conf $out/share/vdr/conf + ''; + + outputs = [ "out" "dev" "man" ]; + + meta = with stdenv.lib; { + homepage = http://www.tvdr.de/; + description = "Video Disc Recorder"; + maintainers = [ maintainers.ck3d ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + license = licenses.gpl2; + }; + + }; +in vdr // { + plugins = { + skincurses = (mkPlugin "skincurses").overrideAttrs( + oldAttr: { buildInputs = oldAttr.buildInputs ++ [ ncurses ]; }); + } // (stdenv.lib.genAttrs [ + "epgtableid0" "hello" "osddemo" "pictures" "servicedemo" "status" "svdrpdemo" + ] mkPlugin); +} diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix new file mode 100644 index 00000000000..0e543390c4b --- /dev/null +++ b/pkgs/applications/video/vdr/plugins.nix @@ -0,0 +1,318 @@ +{ stdenv, fetchurl, fetchgit, vdr, ffmpeg_2, alsaLib, fetchFromGitHub +, libvdpau, libxcb, xcbutilwm, graphicsmagick, libav, pcre, xorgserver, ffmpeg +, libiconv, boost, libgcrypt, perl, utillinux, groff, libva, xorg }: +{ + femon = stdenv.mkDerivation rec { + + name = "vdr-femon-2.4.0"; + + buildInputs = [ vdr ]; + + src = fetchurl { + url = "http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/${name}.tgz"; + sha256 = "1hra1xslj8s68zbyr8zdqp8yap0aj1p6rxyc6cwy1j122kwcnapp"; + }; + + postPatch = "substituteInPlace Makefile --replace /bin/true true"; + + makeFlags = [ "DESTDIR=$(out)" ]; + + meta = with stdenv.lib; { + homepage = http://www.saunalahti.fi/~rahrenbe/vdr/femon/; + description = "DVB Frontend Status Monitor plugin for VDR"; + maintainers = [ maintainers.ck3d ]; + license = licenses.gpl2; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; + + }; + + vaapidevice = stdenv.mkDerivation { + + name = "vdr-vaapidevice-0.7.0"; + + buildInputs = [ + vdr libxcb xcbutilwm ffmpeg + alsaLib + libvdpau # vdpau + libva # va-api + ] ++ (with xorg; [ libxcb libX11 ]); + + makeFlags = [ "DESTDIR=$(out)" ]; + + postPatch = '' + substituteInPlace softhddev.c --replace /usr/bin/X ${xorgserver}/bin/X + ''; + + src = fetchFromGitHub { + owner = "pesintta"; + repo = "vdr-plugin-vaapidevice"; + sha256 = "072y61fpkh3i2dragg0nsd4g3malgwxkwpdrb1ykdljyzf52s5hs"; + rev = "c99afc23a53e6d91f9afaa99af59b30e68e626a8"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/pesintta/vdr-plugin-vaapidevice; + description = "VDR SoftHDDevice Plug-in (with VA-API VPP additions)"; + maintainers = [ maintainers.ck3d ]; + license = licenses.gpl2; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; + + }; + + + markad = stdenv.mkDerivation rec { + name = "vdr-markad-2017-03-13"; + + src = fetchgit { + url = "git://projects.vdr-developer.org/vdr-plugin-markad.git"; + sha256 = "0jvy70r8bcmbs7zdqilfz019z5xkz5c6rs57h1dsgv8v6x86c2i4"; + rev = "ea2e182ec798375f3830f8b794e7408576f139ad"; + }; + + buildInputs = [ vdr libav ]; + + postPatch = '' + substituteInPlace command/Makefile --replace '$(DESTDIR)/usr' '$(DESTDIR)' + + substituteInPlace plugin/markad.cpp \ + --replace "/usr/bin" "$out/bin" \ + --replace "/var/lib/markad" "$out/var/lib/markad" + + substituteInPlace command/markad-standalone.cpp \ + --replace "/var/lib/markad" "$out/var/lib/markad" + ''; + + preBuild = '' + mkdir -p $out/lib/vdr + ''; + + buildFlags = [ + "DESTDIR=$(out)" + "LIBDIR=$(out)/lib/vdr" + "VDRDIR=${vdr.dev}/include/vdr" + "LOCALEDIR=$(DESTDIR)/share/locale" + ]; + + installFlags = buildFlags; + + meta = with stdenv.lib; { + homepage = https://projects.vdr-developer.org/projects/plg-markad; + description = "Ein Programm zum automatischen Setzen von Schnittmarken bei Werbeeinblendungen während einer Sendung."; + maintainers = [ maintainers.ck3d ]; + license = licenses.gpl2; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; + + }; + + epgsearch = stdenv.mkDerivation rec { + pname = "vdr-epgsearch"; + version = "2.4.0"; + + src = fetchurl { + url = "https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-${version}.tar.bz2"; + sha256 = "0xfgn17vicyjwdf0rbkrik4q16mnfi305d4wmi8f0qk825pa0z3y"; + }; + + postPatch = '' + for f in *.sh; do + patchShebangs "$f" + done + ''; + + nativeBuildInputs = [ + perl # for pod2man and pos2html + utillinux + groff + ]; + + buildInputs = [ + vdr + pcre + ]; + + buildFlags = [ + "SENDMAIL=" + "REGEXLIB=pcre" + ]; + + installFlags = [ + "DESTDIR=$(out)" + ]; + + outputs = [ "out" "man" ]; + + meta = with stdenv.lib; { + homepage = http://winni.vdr-developer.org/epgsearch; + description = "Searchtimer and replacement of the VDR program menu"; + maintainers = [ maintainers.ck3d ]; + license = licenses.gpl2; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; + + }; + + vnsiserver = let + name = "vnsiserver"; + version = "1.8.0"; + in stdenv.mkDerivation { + name = "vdr-${name}-${version}"; + + buildInputs = [ vdr ]; + + installFlags = [ "DESTDIR=$(out)" ]; + + src = fetchFromGitHub { + repo = "vdr-plugin-${name}"; + owner = "FernetMenta"; + rev = "v${version}"; + sha256 = "0n7idpxqx7ayd63scl6xwdx828ik4kb2mwz0c30cfjnmnxxd45lw"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/FernetMenta/vdr-plugin-vnsiserver; + description = "VDR plugin to handle KODI clients."; + maintainers = [ maintainers.ck3d ]; + license = licenses.gpl2; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; + + }; + + text2skin = stdenv.mkDerivation rec { + name = "vdr-text2skin-1.3.4-20170702"; + + src = fetchgit { + url = "git://projects.vdr-developer.org/vdr-plugin-text2skin.git"; + sha256 = "19hkwmaw6nwak38bv6cm2vcjjkf4w5yjyxb98qq6zfjjh5wq54aa"; + rev = "8f7954da2488ced734c30e7c2704b92a44e6e1ad"; + }; + + buildInputs = [ vdr graphicsmagick ]; + + buildFlags = [ + "DESTDIR=$(out)" + "IMAGELIB=graphicsmagic" + "VDRDIR=${vdr.dev}/include/vdr" + "LOCALEDIR=$(DESTDIR)/share/locale" + "LIBDIR=$(DESTDIR)/lib/vdr" + ]; + + preBuild = '' + mkdir -p $out/lib/vdr + ''; + + installPhase = ":"; + + meta = with stdenv.lib; { + homepage = https://projects.vdr-developer.org/projects/plg-text2skin; + description = "VDR Text2Skin Plugin"; + maintainers = [ maintainers.ck3d ]; + license = licenses.gpl2; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; + }; + + fritzbox = let + libconvpp = stdenv.mkDerivation { + name = "jowi24-libconv++-20130216"; + propagatedBuildInputs = [ libiconv ]; + CXXFLAGS = "-std=gnu++11 -Os"; + src = fetchFromGitHub { + owner = "jowi24"; + repo = "libconvpp"; + rev = "90769b2216bc66c5ea5e41a929236c20d367c63b"; + sha256 = "0bf0dwxrzd42l84p8nxcsjdk1gvzlhad93nsbn97z6kr61n4cr33"; + }; + installPhase = '' + mkdir -p $out/lib $out/include/libconv++ + cp source.a $out/lib/libconv++.a + cp *.h $out/include/libconv++ + ''; + }; + + liblogpp = stdenv.mkDerivation { + name = "jowi24-liblogpp-20130216"; + CXXFLAGS = "-std=gnu++11 -Os"; + src = fetchFromGitHub { + owner = "jowi24"; + repo = "liblogpp"; + rev = "eee4046d2ae440974bcc8ceec00b069f0a2c62b9"; + sha256 = "01aqvwmwh5kk3mncqpim8llwha9gj5qq0c4cvqfn4h8wqi3d9l3p"; + }; + installPhase = '' + mkdir -p $out/lib $out/include/liblog++ + cp source.a $out/lib/liblog++.a + cp *.h $out/include/liblog++ + ''; + }; + + libnetpp = stdenv.mkDerivation { + name = "jowi24-libnet++-20180628"; + CXXFLAGS = "-std=gnu++11 -Os"; + src = fetchFromGitHub { + owner = "jowi24"; + repo = "libnetpp"; + rev = "212847f0efaeffee8422059b8e202d844174aaf3"; + sha256 = "0vjl6ld6aj25rzxm26yjv3h2gy7gp7qnbinpw6sf1shg2xim9x0b"; + }; + installPhase = '' + mkdir -p $out/lib $out/include/libnet++ + cp source.a $out/lib/libnet++.a + cp *.h $out/include/libnet++ + ''; + buildInputs = [ boost liblogpp libconvpp ]; + }; + + libfritzpp = stdenv.mkDerivation { + name = "jowi24-libfritzpp-20131201"; + CXXFLAGS = "-std=gnu++11 -Os"; + src = fetchFromGitHub { + owner = "jowi24"; + repo = "libfritzpp"; + rev = "ca19013c9451cbac7a90155b486ea9959ced0f67"; + sha256 = "0jk93zm3qzl9z96gfs6xl1c8ip8lckgbzibf7jay7dbgkg9kyjfg"; + }; + installPhase = '' + mkdir -p $out/lib $out/include/libfritz++ + cp source.a $out/lib/libfritz++.a + cp *.h $out/include/libfritz++ + ''; + propagatedBuildInputs = [ libgcrypt ]; + buildInputs = [ boost liblogpp libconvpp libnetpp ]; + }; + + in stdenv.mkDerivation rec { + pname = "vdr-fritzbox"; + + version = "1.5.3"; + + src = fetchFromGitHub { + owner = "jowi24"; + repo = "vdr-fritz"; + rev = version; + sha256 = "0wab1kyma9jzhm6j33cv9hd2a5d1334ghgdi2051nmr1bdcfcsw8"; + }; + + postUnpack = '' + cp ${libfritzpp}/lib/* $sourceRoot/libfritz++ + cp ${liblogpp}/lib/* $sourceRoot/liblog++ + cp ${libnetpp}/lib/* $sourceRoot/libnet++ + cp ${libconvpp}/lib/* $sourceRoot/libconv++ + ''; + + buildInputs = [ vdr boost libconvpp libfritzpp libnetpp liblogpp ]; + + installFlags = [ "DESTDIR=$(out)" ]; + + meta = with stdenv.lib; { + homepage = https://github.com/jowi24/vdr-fritz; + description = "A plugin for VDR to access AVMs Fritz Box routers"; + maintainers = [ maintainers.ck3d ]; + license = licenses.gpl2; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; + }; +} diff --git a/pkgs/applications/video/vdr/wrapper.nix b/pkgs/applications/video/vdr/wrapper.nix new file mode 100644 index 00000000000..2272d1605fd --- /dev/null +++ b/pkgs/applications/video/vdr/wrapper.nix @@ -0,0 +1,21 @@ +{ symlinkJoin, lib, makeWrapper, vdr, plugins ? [] }: +symlinkJoin { + + name = "vdr-with-plugins-${(builtins.parseDrvName vdr.name).version}"; + + paths = [ vdr ] ++ plugins; + + nativeBuildInputs = [ makeWrapper ]; + + postBuild = '' + wrapProgram $out/bin/vdr --add-flags "-L $out/lib/vdr --localedir=$out/share/locale" + ''; + + meta = with vdr.meta; { + inherit license homepage; + description = description + + " (with plugins: " + + lib.concatStrings (lib.intersperse ", " (map (x: ""+x.name) plugins)) + + ")"; + }; +} diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix new file mode 100644 index 00000000000..7d8772da73d --- /dev/null +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -0,0 +1,35 @@ +{ fetchurl, stdenv }: + +let + version = "0.12.0"; + baseurl = "https://github.com/firecracker-microvm/firecracker/releases/download"; + + fetchbin = name: sha256: fetchurl { + url = "${baseurl}/v${version}/${name}-v${version}"; + inherit sha256; + }; + + firecracker-bin = fetchbin "firecracker" "0jk9w5kagqp3w668c1x0g4yyahmy7696pm0bkhv066rrdpcqpw66"; + jailer-bin = fetchbin "jailer" "1fcxzpnapnccklgbi4bis3f6c9fki2daxvzg9l7433vfqz2zbyjl"; +in +stdenv.mkDerivation { + name = "firecracker-${version}"; + inherit version; + + srcs = [ firecracker-bin jailer-bin ]; + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out/bin + install -D ${firecracker-bin} $out/bin/firecracker + install -D ${jailer-bin} $out/bin/jailer + ''; + + meta = with stdenv.lib; { + description = "Secure, fast, minimal micro-container virtualization"; + homepage = http://firecracker-microvm.io; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 1cd85cead12..86cf5352d6b 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -8,7 +8,7 @@ , seccompSupport ? stdenv.isLinux, libseccomp , pulseSupport ? !stdenv.isDarwin, libpulseaudio , sdlSupport ? !stdenv.isDarwin, SDL2 -, gtkSupport ? !stdenv.isDarwin && !xenSupport, gtk3, gettext, gnome3 +, gtkSupport ? !stdenv.isDarwin && !xenSupport, gtk3, gettext, vte , vncSupport ? true, libjpeg, libpng , smartcardSupport ? true, libcacard , spiceSupport ? !stdenv.isDarwin, spice, spice-protocol @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ++ optionals numaSupport [ numactl ] ++ optionals pulseSupport [ libpulseaudio ] ++ optionals sdlSupport [ SDL2 ] - ++ optionals gtkSupport [ gtk3 gettext gnome3.vte ] + ++ optionals gtkSupport [ gtk3 gettext vte ] ++ optionals vncSupport [ libjpeg libpng ] ++ optionals smartcardSupport [ libcacard ] ++ optionals spiceSupport [ spice-protocol spice ] @@ -125,9 +125,6 @@ stdenv.mkDerivation rec { postFixup = '' - for exe in $out/bin/qemu-system-* ; do - paxmark m $exe - done # copy qemu-ga (guest agent) to separate output mkdir -p $ga/bin cp $out/bin/qemu-ga $ga/bin/ diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index be5b8f62108..b89ef1dd7bf 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, fetchFromGitHub, removeReferencesTo, go-md2man -, go, pkgconfig, libapparmor, apparmor-parser, libseccomp }: +{ stdenv, lib, fetchFromGitHub, buildGoPackage, go-md2man +, pkgconfig, libapparmor, apparmor-parser, libseccomp, which }: with lib; -stdenv.mkDerivation rec { +buildGoPackage rec { name = "runc-${version}"; version = "1.0.0-rc6"; @@ -14,32 +14,26 @@ stdenv.mkDerivation rec { sha256 = "1jwacb8xnmx5fr86gximhbl9dlbdwj3rpf27hav9q1si86w5pb1j"; }; - outputs = [ "out" "man" ]; + goPackagePath = "github.com/opencontainers/runc"; + outputs = [ "bin" "out" "man" ]; hardeningDisable = ["fortify"]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ removeReferencesTo go-md2man go libseccomp libapparmor apparmor-parser ]; + buildInputs = [ go-md2man libseccomp libapparmor apparmor-parser which ]; makeFlags = ''BUILDTAGS+=seccomp BUILDTAGS+=apparmor''; - preConfigure = '' - # Extract the source - cd "$NIX_BUILD_TOP" - mkdir -p "go/src/github.com/opencontainers" - mv "$sourceRoot" "go/src/github.com/opencontainers/runc" - export GOPATH=$NIX_BUILD_TOP/go:$GOPATH - ''; - - preBuild = '' - cd go/src/github.com/opencontainers/runc + buildPhase = '' + cd go/src/${goPackagePath} patchShebangs . substituteInPlace libcontainer/apparmor/apparmor.go \ --replace /sbin/apparmor_parser ${apparmor-parser}/bin/apparmor_parser + make ${makeFlags} runc ''; installPhase = '' - install -Dm755 runc $out/bin/runc + install -Dm755 runc $bin/bin/runc # Include contributed man pages man/md2man-all.sh -q @@ -55,10 +49,6 @@ stdenv.mkDerivation rec { done ''; - preFixup = '' - find $out/bin -type f -exec remove-references-to -t ${go} '{}' + - ''; - meta = { homepage = https://runc.io/; description = "A CLI tool for spawning and running containers according to the OCI specification"; diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index f88ef63bc2e..d846ab7e29d 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -9,23 +9,22 @@ in rustPlatform.buildRustPackage rec { name = "dwm-status-${version}"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "Gerschtli"; repo = "dwm-status"; rev = version; - sha256 = "054lwgqpx3kbrnlsqbnd8fxsawvw3nl702pf56c7dcm4sfws15nl"; + sha256 = "0mfzpyacd7i6ipbjwyl1zc0x3lnz0f4qqzsmsb07p047z95mw4v6"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ dbus gdk_pixbuf libnotify xorg.libX11 ]; - cargoSha256 = "0wbbbk99hxxlrkm389iqni9aqvw2laarwk6hhwsr4ph3y278qhi8"; + cargoSha256 = "1cngcacsbzijs55k4kz8fidki3p8jblk3v5s21hjsn4glzjdbkmm"; postInstall = lib.optionalString enableAlsaUtils '' - wrapProgram $out/bin/dwm-status \ - --prefix "PATH" : "${binPath}" + wrapProgram $out/bin/dwm-status --prefix "PATH" : "${binPath}" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/window-managers/yabar/unstable.nix b/pkgs/applications/window-managers/yabar/unstable.nix index 77abc0c7ed4..47c8f6c5e56 100644 --- a/pkgs/applications/window-managers/yabar/unstable.nix +++ b/pkgs/applications/window-managers/yabar/unstable.nix @@ -1,4 +1,4 @@ -{ playerctl, libxkbcommon, callPackage, attrs ? {} }: +{ fetchpatch, playerctl, libxkbcommon, callPackage, attrs ? {} }: let pkg = callPackage ./build.nix ({ @@ -15,4 +15,11 @@ in pkg.overrideAttrs (o: { makeFlags = o.makeFlags ++ [ "PLAYERCTL=1" ]; + + patches = (o.patches or []) ++ [ + (fetchpatch { + url = "https://github.com/geommer/yabar/commit/008dc1420ff684cf12ce2ef3ac9d642e054e39f5.patch"; + sha256 = "1q7nd66ai6nr2m6iqxn55gvbr4r5gjc00c8wyjc3riv31qcbqbhv"; + }) + ]; }) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index f16cb7cec13..731dd1ea992 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -157,7 +157,7 @@ rec { }; inherit fromImage fromImageName fromImageTag; - buildInputs = [ utillinux e2fsprogs jshon rsync ]; + buildInputs = [ utillinux e2fsprogs jshon rsync jq ]; } '' rm -rf $out @@ -202,8 +202,8 @@ rec { extractionID=$((extractionID + 1)) mkdir -p image/$extractionID/layer - tar -C image/$extractionID/layer -xpf $layerTar - rm $layerTar + tar -C image/$extractionID/layer -xpf image/$layerTar + rm image/$layerTar find image/$extractionID/layer -name ".wh.*" -exec bash -c 'name="$(basename {}|sed "s/^.wh.//")"; mknod "$(dirname {})/$name" c 0 0; rm {}' \; diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 34dfe67df4b..fa4e504c908 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -152,7 +152,7 @@ checkout_ref(){ if "$deepClone"; then # The caller explicitly asked for a deep clone. Deep clones # allow "git describe" and similar tools to work. See - # http://thread.gmane.org/gmane.linux.distributions.nixos/3569 + # https://marc.info/?l=nix-dev&m=139641582514772 # for a discussion. return 1 fi diff --git a/pkgs/data/fonts/source-sans-pro/default.nix b/pkgs/data/fonts/source-sans-pro/default.nix index fccb231f4ca..1561605b6ad 100644 --- a/pkgs/data/fonts/source-sans-pro/default.nix +++ b/pkgs/data/fonts/source-sans-pro/default.nix @@ -1,16 +1,18 @@ { stdenv, fetchzip }: fetchzip { - name = "source-sans-pro-2.010"; + name = "source-sans-pro-2.040"; - url = "https://github.com/adobe-fonts/source-sans-pro/archive/2.010R-ro/1.065R-it.zip"; + url = "https://github.com/adobe-fonts/source-sans-pro/releases/download/2.040R-ro%2F1.090R-it/source-sans-pro-2.040R-ro-1.090R-it.zip"; postFetch = '' - mkdir -p $out/share/fonts/opentype - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + mkdir -p $out/share/fonts/opentype $out/share/fonts/truetype $out/share/fonts/variable + unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype + unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype + unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable ''; - sha256 = "17rgkh54arybmcdg750ynw32x2sps7p9vrvq9kpih8vdghwrh9k2"; + sha256 = "1n7z9xpxls74xxjsa61df1ln86y063m07w1f4sbxpjaa0frim4pp"; meta = with stdenv.lib; { homepage = https://sourceforge.net/adobe/sourcesans; diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix index af8270e6eef..59773e34cce 100644 --- a/pkgs/data/misc/iana-etc/default.nix +++ b/pkgs/data/misc/iana-etc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchzip }: let - version = "20180905"; + version = "20181219"; in fetchzip { name = "iana-etc-${version}"; url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz"; - sha256 = "1vl3by24xddl267cjq9bcwb7yvfd7gqalwgd5sgx8i7kz9bk40q2"; + sha256 = "0i3f7shvf1g6dp984w8xfix6id3q5c10b292wz2qw3v5n7h6wkm3"; postFetch = '' tar -xzvf $downloadedFile --strip-components=1 diff --git a/pkgs/misc/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index d76e0ed74c5..edb1113a696 100644 --- a/pkgs/misc/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "matcha-${version}"; - version = "2018-11-12"; + version = "2018-12-24"; src = fetchFromGitHub { owner = "vinceliuice"; repo = "matcha"; rev = version; - sha256 = "04alnwb3r0546y7xk2lx8bsdm47q6j89vld3g19rfb3622iv85la"; + sha256 = "178y5s5jfprkw8y6clqb8ss4kvfswivfrh6cn67fk4z7wg72i3yc"; }; buildInputs = [ gdk_pixbuf librsvg ]; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { installPhase = '' patchShebangs . - substituteInPlace Install --replace '$HOME/.themes' "$out/share/themes" - ./Install + mkdir -p $out/share/themes + name= ./Install -d $out/share/themes install -D -t $out/share/gtksourceview-3.0/styles src/extra/gedit/matcha.xml ''; diff --git a/pkgs/misc/themes/plano/default.nix b/pkgs/data/themes/plano/default.nix index e1d319ba8c1..e878943ff62 100644 --- a/pkgs/misc/themes/plano/default.nix +++ b/pkgs/data/themes/plano/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "plano-theme-${version}"; - version = "3.28-3"; + version = "3.30-2"; src = fetchFromGitHub { owner = "lassekongo83"; repo = "plano-theme"; rev = "v${version}"; - sha256 = "0k9jgnifc2s8vsw9fanknx1mg8vlh6qa1cbb910nm4vgrxsbrc74"; + sha256 = "06yagpb0dpb8nzh3lvs607rzg6y5l6skl4mjcmbxayapsqka45hj"; }; buildInputs = [ gdk_pixbuf gtk_engines ]; diff --git a/pkgs/misc/themes/shades-of-gray/default.nix b/pkgs/data/themes/shades-of-gray/default.nix index 009a45b39dd..64cc2be5998 100644 --- a/pkgs/misc/themes/shades-of-gray/default.nix +++ b/pkgs/data/themes/shades-of-gray/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "shades-of-gray-theme-${version}"; - version = "1.1.1"; + version = "1.1.3"; src = fetchFromGitHub { owner = "WernerFP"; repo = "Shades-of-gray-theme"; rev = version; - sha256 = "1m75m6aq4hh39m8qrmbkaw31j4gzkh63ial4xnhw2habf31av682"; + sha256 = "14p1s1pmzqnn9j9vwqfxfd4i045p356a6d9rwzzs0gx3c6ibqx3a"; }; buildInputs = [ gtk_engines ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/share/themes - cp -a Shades-of-gray* README.md preview_01.png $out/share/themes/ + cp -a Shades-of-gray* $out/share/themes/ ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 62a67c11492..4fe787bc5d4 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -23,7 +23,7 @@ let deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { }; deepin-sound-theme = callPackage ./deepin-sound-theme { }; deepin-terminal = callPackage ./deepin-terminal { - inherit (pkgs.gnome3) libgee vte; + inherit (pkgs.gnome3) libgee; wnck = pkgs.libwnck3; }; deepin-wallpapers = callPackage ./deepin-wallpapers { }; diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix index 3cac8bca2d3..f11f21f5b95 100644 --- a/pkgs/desktops/enlightenment/terminology.nix +++ b/pkgs/desktops/enlightenment/terminology.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "terminology-${version}"; - version = "1.3.0"; + version = "1.3.2"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.xz"; - sha256 = "07vw28inkimi9avp16j0rqcfqjq16081554qsv29pcqhz18xp59r"; + sha256 = "1kclxzadmk272s9spa7n704pcb1c611ixxrq88w5zk22va0i25xm"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 344fb4a5738..9ef2b57e6d1 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, vala, meson, ninja , pkgconfig, gtk3, glib, gobject-introspection , wrapGAppsHook, itstool, gnupg, libsoup -, gnome3, gpgme, python3, openldap +, gnome3, gpgme, python3, openldap, gcr , libsecret, avahi, p11-kit, openssh }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { python3 gobject-introspection ]; buildInputs = [ - gtk3 glib gnome3.gcr + gtk3 glib gcr gnome3.gsettings-desktop-schemas gnupg gnome3.defaultIconTheme gpgme libsecret avahi libsoup p11-kit diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index 4867335af12..94d39964bc4 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -4,7 +4,7 @@ , librsvg, gobject-introspection, yelp-tools, gspell , recentListSize ? null # 5 is not enough, allow passing a different number , supportXPS ? false # Open XML Paper Specification via libgxps -, autoreconfHook +, autoreconfHook, pruneLibtoolFiles }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig gobject-introspection intltool itstool wrapGAppsHook yelp-tools autoreconfHook + pkgconfig gobject-introspection intltool itstool wrapGAppsHook yelp-tools autoreconfHook pruneLibtoolFiles ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index c9c8acfecb3..5efd50a006b 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, substituteAll, pkgconfig, gnome3, python3, gobject-introspection -, intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3 +, intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr , p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre , vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }: diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix index ff4263f74e3..ec6d1af015a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, gettext, pkgconfig, spidermonkey_52, glib -, gnome3, substituteAll }: +, gnome3, gnome-menus, substituteAll }: stdenv.mkDerivation rec { name = "gnome-shell-extensions-${version}"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./fix_gmenu.patch; - gmenu_path = "${gnome3.gnome-menus}/lib/girepository-1.0"; + gmenu_path = "${gnome-menus}/lib/girepository-1.0"; }) ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index c1d5a5a916b..76e5bd13522 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -2,8 +2,8 @@ , python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core , libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info , libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils -, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt -, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet +, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr +, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, libgnomekbd , sassc, systemd, gst_all_1 }: # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup @@ -56,8 +56,7 @@ in stdenv.mkDerivation rec { }) (substituteAll { src = ./fix-paths.patch; - inherit (gnome3) libgnomekbd; - inherit unzip; + inherit libgnomekbd unzip; }) ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index fc822be4e0e..3c45842fdd4 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-software-${version}"; - version = "3.30.5"; + version = "3.30.6"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0d2x208qbkx8szkrfddv1bz4rd9awfhbxvh078j7zrrfmzvq7892"; + sha256 = "00lh1ifgcs888i0774qdz2pzd5vnzcc5kvx20lcmgk37vvf0qqsl"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix index 124db927236..ab2ead7d344 100644 --- a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix +++ b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, sqlite , gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp-av -, gmime, json-glib, avahi, tracker, dleyna-server, itstool }: +, gmime, json-glib, avahi, tracker, dleyna-server, itstool, totem-pl-parser }: let pname = "grilo-plugins"; @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { buildInputs = [ gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata lua5 liboauth gupnp-av sqlite gnome3.gnome-online-accounts - gnome3.totem-pl-parser gnome3.rest gmime json-glib + totem-pl-parser gnome3.rest gmime json-glib avahi gnome3.libmediaart tracker dleyna-server ]; diff --git a/pkgs/desktops/gnome-3/core/grilo/default.nix b/pkgs/desktops/gnome-3/core/grilo/default.nix index acde7a38572..a2bee6ac41e 100644 --- a/pkgs/desktops/gnome-3/core/grilo/default.nix +++ b/pkgs/desktops/gnome-3/core/grilo/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, vala, glib, liboauth, gtk3 , gtk-doc, docbook_xsl, docbook_xml_dtd_43 -, libxml2, gnome3, gobject-introspection, libsoup }: +, libxml2, gnome3, gobject-introspection, libsoup, totem-pl-parser }: let pname = "grilo"; @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { meson ninja pkgconfig gettext gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ glib liboauth gtk3 libxml2 libsoup gnome3.totem-pl-parser ]; + buildInputs = [ glib liboauth gtk3 libxml2 libsoup totem-pl-parser ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index 3b701591914..3565931e4df 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, meson, ninja, intltool, gst_all_1 , clutter-gtk, clutter-gst, python3Packages, shared-mime-info -, pkgconfig, gtk3, glib, gobject-introspection +, pkgconfig, gtk3, glib, gobject-introspection, totem-pl-parser , wrapGAppsHook, itstool, libxml2, vala, gnome3 , gdk_pixbuf, tracker, nautilus }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool gobject-introspection wrapGAppsHook ]; buildInputs = [ - gtk3 glib gnome3.grilo clutter-gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins + gtk3 glib gnome3.grilo clutter-gtk clutter-gst totem-pl-parser gnome3.grilo-plugins gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav gnome3.libpeas shared-mime-info gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome-desktop diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix index 5e57a22906c..7127ab71b1f 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix @@ -2,7 +2,7 @@ , meson, ninja, pkgconfig, vala, wrapGAppsHook, bzip2, dbus, evolution-data-server , exempi, flac, giflib, glib, gnome3, gst_all_1, icu, json-glib, libcue, libexif , libgrss, libgsf, libiptcdata, libjpeg, libpng, libseccomp, libsoup, libtiff, libuuid -, libvorbis, libxml2, poppler, taglib, upower }: +, libvorbis, libxml2, poppler, taglib, upower, totem-pl-parser }: let pname = "tracker-miners"; @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { giflib glib gnome3.gexiv2 - gnome3.totem-pl-parser + totem-pl-parser gnome3.tracker gst_all_1.gst-plugins-base gst_all_1.gstreamer diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index a6a56a2e63e..e79ca7c3af8 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -38,7 +38,7 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3 libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4 easytag meld orca rhythmbox shotwell gnome-usage - clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib; + clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; @@ -47,6 +47,7 @@ lib.makeScope pkgs.newScope (self: with self; { gtkmm = gtkmm3; vala = pkgs.vala_0_42; gegl_0_4 = pkgs.gegl_0_4.override { inherit gtk; }; + rest = librest; # Simplify the nixos module and gnome packages defaultIconTheme = adwaita-icon-theme; @@ -73,10 +74,6 @@ lib.makeScope pkgs.newScope (self: with self; { evolution-data-server = callPackage ./core/evolution-data-server { }; - geocode-glib = callPackage ./core/geocode-glib { }; - - gcr = callPackage ./core/gcr { }; # ToDo: tests fail - gdm = callPackage ./core/gdm { }; gjs = callPackage ./core/gjs { }; @@ -107,16 +104,10 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-font-viewer = callPackage ./core/gnome-font-viewer { }; - gnome-menus = callPackage ./core/gnome-menus { }; - gnome-keyring = callPackage ./core/gnome-keyring { }; libgnome-keyring = callPackage ./core/libgnome-keyring { }; - libgnomekbd = callPackage ./core/libgnomekbd { }; - - folks = callPackage ./core/folks { }; - gnome-online-accounts = callPackage ./core/gnome-online-accounts { }; gnome-online-miners = callPackage ./core/gnome-online-miners { }; @@ -153,30 +144,12 @@ lib.makeScope pkgs.newScope (self: with self; { gsettings-desktop-schemas = callPackage ./core/gsettings-desktop-schemas { }; - gsound = callPackage ./core/gsound { }; - gucharmap = callPackage ./core/gucharmap { }; gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; }; eog = callPackage ./core/eog { }; - libcroco = callPackage ./core/libcroco {}; - - libgee = callPackage ./core/libgee { }; - - libgepub = callPackage ./core/libgepub { }; - - libgdata = callPackage ./core/libgdata { }; - - libgxps = callPackage ./core/libgxps { }; - - libpeas = callPackage ./core/libpeas {}; - - libgweather = callPackage ./core/libgweather { }; - - libzapojit = callPackage ./core/libzapojit { }; - mutter = callPackage ./core/mutter { }; # Needed for elementary's gala and greeter until they get around to adapting to all the API breaking changes in libmutter-3 @@ -214,8 +187,6 @@ lib.makeScope pkgs.newScope (self: with self; { withGnome = true; }; - rest = callPackage ./core/rest { }; - rygel = callPackage ./core/rygel { }; simple-scan = callPackage ./core/simple-scan { }; @@ -224,18 +195,10 @@ lib.makeScope pkgs.newScope (self: with self; { totem = callPackage ./core/totem { }; - totem-pl-parser = callPackage ./core/totem-pl-parser { }; - tracker = callPackage ./core/tracker { }; tracker-miners = callPackage ./core/tracker-miners { }; - vte = callPackage ./core/vte { }; - - vte_290 = callPackage ./core/vte/2.90.nix { }; - - vte-ng = callPackage ./core/vte/ng.nix { }; - vino = callPackage ./core/vino { }; yelp = callPackage ./core/yelp { }; @@ -359,20 +322,12 @@ lib.makeScope pkgs.newScope (self: with self; { #### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/ - california = callPackage ./misc/california { }; - geary = callPackage ./misc/geary { }; - gfbgraph = callPackage ./misc/gfbgraph { }; - gitg = callPackage ./misc/gitg { }; libgnome-games-support = callPackage ./misc/libgnome-games-support { }; - libmediaart = callPackage ./misc/libmediaart { }; - - gexiv2 = callPackage ./misc/gexiv2 { }; - gnome-applets = callPackage ./misc/gnome-applets { }; gnome-flashback = callPackage ./misc/gnome-flashback { }; diff --git a/pkgs/desktops/gnome-3/misc/california/default.nix b/pkgs/desktops/gnome-3/misc/california/default.nix deleted file mode 100644 index 8024f66650e..00000000000 --- a/pkgs/desktops/gnome-3/misc/california/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_34, libgee, wrapGAppsHook, itstool, gobject-introspection -, gnome-online-accounts, evolution-data-server, gnome3, glib, libsoup, libgdata, sqlite, xdg_utils }: - -let - pname = "california"; - version = "0.4.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1dky2kllv469k8966ilnf4xrr7z35pq8mdvs7kwziy59cdikapxj"; - }; - - nativeBuildInputs = [ intltool itstool vala_0_34 pkgconfig wrapGAppsHook gobject-introspection ]; - buildInputs = [ glib gtk3 libgee libsoup libgdata gnome-online-accounts evolution-data-server sqlite xdg_utils gnome3.gsettings-desktop-schemas ]; - - enableParallelBuilding = true; - - patches = [ - # Apply Fedora patch to build with evolution-data-server > 3.13 - (fetchurl { - url = https://src.fedoraproject.org/rpms/california/raw/c00bf9924d8fa8cb0a9ec06564d1a1b00c9055af/f/0002-Build-with-evolution-data-server-3.13.90.patch; - sha256 = "0g9923n329p32gzr1q52ad30f8vyz8vrri4rih0w8klmf02ga4pm"; - }) - # Apply Fedora patch to build with libical > 3.0 - (fetchurl { - url = https://src.fedoraproject.org/rpms/california/raw/2af9a6a1b67b53f3fca1472c5350dc11a1acf28f/f/california-0.4.0-libical-3.0.patch; - sha256 = "0cxycfaql0bsiz9hzanns33pwdqpb5n44znfcfa66i1bin34r4n6"; - }) - ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/California; - description = "Calendar application for GNOME 3"; - maintainers = with maintainers; [ pSub ]; - license = licenses.lgpl21; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index 7bb54904fb0..0841fa13a73 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_40, enchant , wrapGAppsHook, gdk_pixbuf, cmake, ninja, desktop-file-utils , libnotify, libcanberra-gtk3, libsecret, gmime, isocodes -, gobject-introspection, libpthreadstubs, sqlite +, gobject-introspection, libpthreadstubs, sqlite, gcr , gnome3, librsvg, gnome-doc-utils, webkitgtk, fetchpatch }: let @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobject-introspection ]; buildInputs = [ gtk3 enchant webkitgtk libnotify libcanberra-gtk3 gnome3.libgee libsecret gmime sqlite - libpthreadstubs gnome3.gsettings-desktop-schemas gnome3.gcr isocodes + libpthreadstubs gnome3.gsettings-desktop-schemas gcr isocodes gdk_pixbuf librsvg gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index a2f35284f4e..ce8f58cc99b 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, gnome3, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, gnome3, gtk3, vte, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-terminal-${version}"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { mate.mate-desktop - gnome3.vte - gnome3.gtk + vte + gtk3 gnome3.dconf ]; diff --git a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix index 95d371959e5..d6bc8f5330b 100644 --- a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, wrapGAppsHook, gobject-introspection }: +{ stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, vte_290, libnotify, gettext, wrapGAppsHook, gobject-introspection }: stdenv.mkDerivation rec { majorVersion = "0.4"; diff --git a/pkgs/desktops/xfce4-13/default.nix b/pkgs/desktops/xfce4-13/default.nix index 4809cec839a..d3e46cf2365 100644 --- a/pkgs/desktops/xfce4-13/default.nix +++ b/pkgs/desktops/xfce4-13/default.nix @@ -81,9 +81,7 @@ makeScope newScope (self: with self; { xfce4-taskmanager = callPackage ./xfce4-taskmanager { }; - xfce4-terminal = callPackage ./xfce4-terminal { - inherit (gnome3) vte; - }; + xfce4-terminal = callPackage ./xfce4-terminal { }; xfce4-volumed-pulse = callPackage ./xfce4-volumed-pulse { }; diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index d4189fe8455..e43dacce625 100644 --- a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix +++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -38,14 +38,16 @@ let hostInfo = ndkInfoFun stdenv.hostPlatform; targetInfo = ndkInfoFun stdenv.targetPlatform; - in rec { # Misc tools binaries = let ndkBinDir = - "${androidndk}/libexec/${androidndk.name}/toolchains/${targetInfo.triple}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}/bin"; + "${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.triple}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}/bin"; + ndkGCCLibDir = + "${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.triple}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}/lib/gcc/${targetInfo.triple}/4.9.x"; + in runCommand "ndk-gcc-binutils" { isGNU = true; # for cc-wrapper nativeBuildInputs = [ makeWrapper ]; @@ -54,8 +56,15 @@ rec { mkdir -p $out/bin for prog in ${ndkBinDir}/${targetInfo.triple}-*; do prog_suffix=$(basename $prog | sed 's/${targetInfo.triple}-//') - ln -s $prog $out/bin/${stdenv.targetPlatform.config}-$prog_suffix + cat > $out/bin/${stdenv.targetPlatform.config}-$prog_suffix <<EOF + #! ${stdenv.shell} -e + $prog "\$@" + EOF + chmod +x $out/bin/${stdenv.targetPlatform.config}-$prog_suffix done + + ln -s $out/bin/${stdenv.targetPlatform.config}-ld $out/bin/ld + ln -s ${ndkGCCLibDir} $out/lib ''; binutils = wrapBintoolsWith { @@ -109,18 +118,15 @@ rec { # anyways. libraries = let - includePath = if buildAndroidndk.version == "10e" then - "${buildAndroidndk}/libexec/${buildAndroidndk.name}/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/include/" - else - "${buildAndroidndk}/libexec/${buildAndroidndk.name}/sysroot/usr/include"; - libPath = "${buildAndroidndk}/libexec/${buildAndroidndk.name}/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/lib/"; + includePath = "${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include"; + asmIncludePath = "${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include/${targetInfo.triple}"; + libPath = "${buildAndroidndk}/libexec/android-sdk/ndk-bundle/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/lib/"; in runCommand "bionic-prebuilt" {} '' mkdir -p $out cp -r ${includePath} $out/include chmod +w $out/include - ${lib.optionalString (lib.versionOlder "10e" buildAndroidndk.version) - "ln -s $out/include/${hostInfo.triple}/asm $out/include/asm"} + cp -r ${asmIncludePath}/* $out/include ln -s ${libPath} $out/lib ''; } diff --git a/pkgs/development/androidndk-pkgs/default.nix b/pkgs/development/androidndk-pkgs/default.nix new file mode 100644 index 00000000000..341cdf72028 --- /dev/null +++ b/pkgs/development/androidndk-pkgs/default.nix @@ -0,0 +1,34 @@ +{ androidenv, buildPackages, pkgs, targetPackages +, includeSources ? true, licenseAccepted ? false +}: + +rec { + "18b" = + let + ndkVersion = "18.1.5063045"; + + buildAndroidComposition = buildPackages.buildPackages.androidenv.composeAndroidPackages { + includeNDK = true; + inherit ndkVersion; + }; + + androidComposition = androidenv.composeAndroidPackages { + includeNDK = true; + inherit ndkVersion; + }; + in + import ./androidndk-pkgs.nix { + inherit (buildPackages) + makeWrapper; + inherit (pkgs) + lib stdenv + runCommand wrapBintoolsWith wrapCCWith; + # buildPackages.foo rather than buildPackages.buildPackages.foo would work, + # but for splicing messing up on infinite recursion for the variants we + # *dont't* use. Using this workaround, but also making a test to ensure + # these two really are the same. + buildAndroidndk = buildAndroidComposition.ndk-bundle; + androidndk = androidComposition.ndk-bundle; + targetAndroidndkPkgs = targetPackages.androidndkPkgs_18b; + }; +} diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix index eb614b0784f..531cf3a8051 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix @@ -61,14 +61,6 @@ let result = stdenv.mkDerivation rec { installPhase = '' cd .. - # Set PaX markings - exes=$(file $sourceRoot/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') - for file in $exes; do - paxmark m "$file" - # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. - ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''} - done - mv $sourceRoot $out rm -rf $out/demo diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix index d1db77215d1..f9d4b81d989 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix @@ -5,5 +5,6 @@ in jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.hotspot; jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.hotspot; jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.openj9; - jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.openj9; + # openj9 jre builds are currently missing: https://github.com/AdoptOpenJDK/openjdk-build/issues/796 + #jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.openj9; } diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index 09d68084e77..5b02aed274f 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -83,6 +83,7 @@ stdenv.mkDerivation rec { homepage = https://cisco.github.io/ChezScheme/; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; + badPlatforms = [ "aarch64-linux" ]; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index 75e70006d74..07a003691d6 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -282,11 +282,6 @@ postInstall() { fi done - # Disable RANDMMAP on grsec, which causes segfaults when using - # precompiled headers. - # See https://bugs.gentoo.org/show_bug.cgi?id=301299#c31 - paxmark r $out/libexec/gcc/*/*/{cc1,cc1plus} - # Two identical man pages are shipped (moving and compressing is done later) ln -sf gcc.1 "$out"/share/man/man1/g++.1 } diff --git a/pkgs/development/compilers/ghc/8.2.2-binary.nix b/pkgs/development/compilers/ghc/8.2.2-binary.nix index 039eea744f3..f52d8fd4a11 100644 --- a/pkgs/development/compilers/ghc/8.2.2-binary.nix +++ b/pkgs/development/compilers/ghc/8.2.2-binary.nix @@ -105,8 +105,6 @@ stdenv.mkDerivation rec { --replace-needed libtinfo.so libtinfo.so.5 \ --interpreter ${glibcDynLinker} {} \; - paxmark m ./ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 - sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 ''; diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 3b9fecd55e1..3e355dc302d 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -238,11 +238,6 @@ stdenv.mkDerivation (rec { hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; postInstall = '' - for bin in "$out"/lib/${name}/bin/*; do - isELF "$bin" || continue - paxmark m "$bin" - done - # Install the bash completion file. install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix index 4db5c07b460..c5fe3c925f0 100644 --- a/pkgs/development/compilers/ghc/8.4.4.nix +++ b/pkgs/development/compilers/ghc/8.4.4.nix @@ -214,11 +214,6 @@ stdenv.mkDerivation (rec { hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; postInstall = '' - for bin in "$out"/lib/${name}/bin/*; do - isELF "$bin" || continue - paxmark m "$bin" - done - # Install the bash completion file. install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix index 5710c60338a..b54164ccc69 100644 --- a/pkgs/development/compilers/ghc/8.6.1.nix +++ b/pkgs/development/compilers/ghc/8.6.1.nix @@ -195,11 +195,6 @@ stdenv.mkDerivation (rec { hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; postInstall = '' - for bin in "$out"/lib/${name}/bin/*; do - isELF "$bin" || continue - paxmark m "$bin" - done - # Install the bash completion file. install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc diff --git a/pkgs/development/compilers/ghc/8.6.2.nix b/pkgs/development/compilers/ghc/8.6.2.nix index 914d6ae08fa..07d4420804d 100644 --- a/pkgs/development/compilers/ghc/8.6.2.nix +++ b/pkgs/development/compilers/ghc/8.6.2.nix @@ -195,11 +195,6 @@ stdenv.mkDerivation (rec { hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; postInstall = '' - for bin in "$out"/lib/${name}/bin/*; do - isELF "$bin" || continue - paxmark m "$bin" - done - # Install the bash completion file. install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc diff --git a/pkgs/development/compilers/ghc/8.6.3.nix b/pkgs/development/compilers/ghc/8.6.3.nix index b29b7facd1f..4e1f0dd9fc7 100644 --- a/pkgs/development/compilers/ghc/8.6.3.nix +++ b/pkgs/development/compilers/ghc/8.6.3.nix @@ -192,11 +192,6 @@ stdenv.mkDerivation (rec { hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; postInstall = '' - for bin in "$out"/lib/${name}/bin/*; do - isELF "$bin" || continue - paxmark m "$bin" - done - # Install the bash completion file. install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 42119682892..65a4a0c4ecd 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -177,11 +177,6 @@ stdenv.mkDerivation (rec { hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; postInstall = '' - for bin in "$out"/lib/${name}/bin/*; do - isELF "$bin" || continue - paxmark m "$bin" - done - # Install the bash completion file. install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix index a0cc27b37e2..b823bf9bdd4 100644 --- a/pkgs/development/compilers/gprolog/default.nix +++ b/pkgs/development/compilers/gprolog/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "gprolog-1.4.4"; + name = "gprolog-1.4.5"; src = fetchurl { urls = [ "mirror://gnu/gprolog/${name}.tar.gz" "http://www.gprolog.org/${name}.tar.gz" ]; - sha256 = "13miyas47bmijmadm68cbvb21n4s156gjafz7kfx9brk9djfkh0q"; + sha256 = "0z4cc42n3k6i35b8mr816iwsvrpxshw6d7dgz6s2h1hy0l7g1p5z"; }; hardeningDisable = stdenv.lib.optional stdenv.isi686 "pic"; diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 39fab8b25d8..876e474bed9 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -25,11 +25,6 @@ let drv = stdenv.mkDerivation rec { installPhase = '' cd .. - exes=$(file $sourceRoot/bin/* $sourceRoot/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') - for file in $exes; do - paxmark m "$file" - done - mv $sourceRoot $out jrePath=$out/jre ''; diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix index 15eec4134ac..6104ffc7aaa 100644 --- a/pkgs/development/compilers/jsonnet/default.nix +++ b/pkgs/development/compilers/jsonnet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "jsonnet-${version}"; - version = "0.11.2"; + version = "0.12.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "google"; repo = "jsonnet"; - sha256 = "05rl5i4g36k2ikxv4sw726mha1qf5bb66wiqpi0s09wj9azm7vym"; + sha256 = "13a0sf1k8ivxhc28w0d0axzr0sj3jccl9sjq6l0dkyzrnmbxzmkb"; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/julia/0004-hardened.patch b/pkgs/development/compilers/julia/0004-hardened.patch deleted file mode 100644 index 901f967c9d5..00000000000 --- a/pkgs/development/compilers/julia/0004-hardened.patch +++ /dev/null @@ -1,25 +0,0 @@ -From eddb251a00ace6e63e32e7dcb9e1ec632cac14e0 Mon Sep 17 00:00:00 2001 -From: Will Dietz <w@wdtz.org> -Date: Wed, 1 Feb 2017 06:09:49 -0600 -Subject: [PATCH] Set pax flags on julia binaries to disable memory protection. - ---- - Makefile | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Makefile b/Makefile -index 0e28cc87b..aab8cfa8d 100644 ---- a/Makefile -+++ b/Makefile -@@ -91,6 +91,8 @@ julia-src-release julia-src-debug : julia-src-% : julia-deps julia_flisp.boot.in - - julia-ui-release julia-ui-debug : julia-ui-% : julia-src-% - @$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT)/ui julia-$* -+ @echo "setting PaX flags on $(JULIA_EXECUTABLE_$*)" -+ @paxctl -czexm $(JULIA_EXECUTABLE_$*) - - julia-inference : julia-base julia-ui-$(JULIA_BUILD_MODE) $(build_prefix)/.examples - @$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT) $(build_private_libdir)/inference.ji JULIA_BUILD_MODE=$(JULIA_BUILD_MODE) --- -2.11.0 - diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 086570f5ce2..4c0b1359bd8 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchzip # build tools -, gfortran, m4, makeWrapper, patchelf, perl, which, python2, paxctl +, gfortran, m4, makeWrapper, patchelf, perl, which, python2 # libjulia dependencies , libunwind, readline, utf8proc, zlib , llvm @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { patches = [ ./0001.1-use-system-utf8proc.patch ./0002-use-system-suitesparse.patch - ] ++ stdenv.lib.optional stdenv.needsPax ./0004-hardened.patch; + ]; postPatch = '' patchShebangs . contrib @@ -96,8 +96,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] ; - nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ] - ++ stdenv.lib.optional stdenv.needsPax paxctl; + nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]; makeFlags = let diff --git a/pkgs/development/compilers/julia/shared.nix b/pkgs/development/compilers/julia/shared.nix index 70ff40cd7ec..95b45adcc6f 100644 --- a/pkgs/development/compilers/julia/shared.nix +++ b/pkgs/development/compilers/julia/shared.nix @@ -5,7 +5,7 @@ }: { stdenv, fetchurl, fetchzip # build tools -, gfortran, m4, makeWrapper, patchelf, perl, which, python2, paxctl +, gfortran, m4, makeWrapper, patchelf, perl, which, python2 , llvm, cmake # libjulia dependencies , libunwind, readline, utf8proc, zlib @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { patches = [ ./0001.1-use-system-utf8proc.patch - ] ++ stdenv.lib.optional stdenv.needsPax ./0004-hardened.patch; + ]; postPatch = '' patchShebangs . contrib @@ -117,8 +117,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] ; - nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ] - ++ stdenv.lib.optional stdenv.needsPax paxctl; + nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]; makeFlags = let diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index 388da007d33..2645469767a 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -81,12 +81,6 @@ in stdenv.mkDerivation rec { postBuild = '' rm -fR $out - - paxmark m bin/{lli,llvm-rtdyld} - - paxmark m unittests/ExecutionEngine/JIT/JITTests - paxmark m unittests/ExecutionEngine/MCJIT/MCJITTests - paxmark m unittests/Support/SupportTests ''; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix index e540469c627..a6fd18f94d6 100644 --- a/pkgs/development/compilers/llvm/3.7/llvm.nix +++ b/pkgs/development/compilers/llvm/3.7/llvm.nix @@ -89,8 +89,6 @@ in stdenv.mkDerivation rec { postBuild = '' rm -fR $out - - paxmark m bin/{lli,llvm-rtdyld} ''; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index c246bfe496e..fcb4214a1de 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -97,8 +97,6 @@ in stdenv.mkDerivation rec { postBuild = '' rm -fR $out - - paxmark m bin/{lli,llvm-rtdyld} ''; postInstall = stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) '' diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 3cc1a4d6cce..00c56e49e37 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -141,8 +141,6 @@ in stdenv.mkDerivation rec { postBuild = '' rm -fR $out - - paxmark m bin/{lli,llvm-rtdyld} ''; postInstall = "" diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix index 2b543b9d793..6344304b84b 100644 --- a/pkgs/development/compilers/llvm/4/libc++/default.nix +++ b/pkgs/development/compilers/llvm/4/libc++/default.nix @@ -44,6 +44,11 @@ stdenv.mkDerivation rec { linkCxxAbi = stdenv.isLinux; + postInstall = '' + mv $out/lib/libc++.a $out/lib/libc++_static.a + cp ${./libc++.a} $out/lib/libc++.a + ''; + setupHooks = [ ../../../../../build-support/setup-hooks/role.bash ./setup-hook.sh diff --git a/pkgs/development/compilers/llvm/4/libc++/libc++.a b/pkgs/development/compilers/llvm/4/libc++/libc++.a new file mode 100644 index 00000000000..f676948115e --- /dev/null +++ b/pkgs/development/compilers/llvm/4/libc++/libc++.a @@ -0,0 +1 @@ +INPUT(-lc++_static -lc++abi) diff --git a/pkgs/development/compilers/llvm/4/libc++abi.nix b/pkgs/development/compilers/llvm/4/libc++abi.nix index 5eeec395b97..735c5e9e743 100644 --- a/pkgs/development/compilers/llvm/4/libc++abi.nix +++ b/pkgs/development/compilers/llvm/4/libc++abi.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation { '' else '' install -d -m 755 $out/include $out/lib + install -m 644 lib/libc++abi.a $out/lib install -m 644 lib/libc++abi.so.1.0 $out/lib install -m 644 ../include/cxxabi.h $out/include ln -s libc++abi.so.1.0 $out/lib/libc++abi.so diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index 7d93fec6a12..aac9c4275ad 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -121,12 +121,6 @@ in stdenv.mkDerivation (rec { postBuild = '' rm -fR $out - - paxmark m bin/{lli,llvm-rtdyld} - paxmark m unittests/ExecutionEngine/MCJIT/MCJITTests - paxmark m unittests/ExecutionEngine/Orc/OrcJITTests - paxmark m unittests/Support/SupportTests - paxmark m bin/lli-child-target ''; preCheck = '' diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix index b182f1250e7..6dc81e10163 100644 --- a/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -38,6 +38,11 @@ stdenv.mkDerivation rec { linkCxxAbi = stdenv.isLinux; + postInstall = '' + mv $out/lib/libc++.a $out/lib/libc++_static.a + cp ${./libc++.a} $out/lib/libc++.a + ''; + setupHooks = [ ../../../../../build-support/setup-hooks/role.bash ./setup-hook.sh diff --git a/pkgs/development/compilers/llvm/5/libc++/libc++.a b/pkgs/development/compilers/llvm/5/libc++/libc++.a new file mode 100644 index 00000000000..f676948115e --- /dev/null +++ b/pkgs/development/compilers/llvm/5/libc++/libc++.a @@ -0,0 +1 @@ +INPUT(-lc++_static -lc++abi) diff --git a/pkgs/development/compilers/llvm/5/libc++abi.nix b/pkgs/development/compilers/llvm/5/libc++abi.nix index 69970543674..227ecbeda19 100644 --- a/pkgs/development/compilers/llvm/5/libc++abi.nix +++ b/pkgs/development/compilers/llvm/5/libc++abi.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation { '' else '' install -d -m 755 $out/include $out/lib + install -m 644 lib/libc++abi.a $out/lib install -m 644 lib/libc++abi.so.1.0 $out/lib install -m 644 ../include/cxxabi.h $out/include ln -s libc++abi.so.1.0 $out/lib/libc++abi.so diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 5277205f880..9e181a1202b 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -98,12 +98,6 @@ in stdenv.mkDerivation (rec { postBuild = '' rm -fR $out - - paxmark m bin/{lli,llvm-rtdyld} - paxmark m unittests/ExecutionEngine/MCJIT/MCJITTests - paxmark m unittests/ExecutionEngine/Orc/OrcJITTests - paxmark m unittests/Support/SupportTests - paxmark m bin/lli-child-target ''; preCheck = '' diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix index 3a165e9da7b..b90b6b7b58c 100644 --- a/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -38,6 +38,11 @@ stdenv.mkDerivation rec { linkCxxAbi = stdenv.isLinux; + postInstall = '' + mv $out/lib/libc++.a $out/lib/libc++_static.a + cp ${./libc++.a} $out/lib/libc++.a + ''; + setupHooks = [ ../../../../../build-support/setup-hooks/role.bash ./setup-hook.sh diff --git a/pkgs/development/compilers/llvm/6/libc++/libc++.a b/pkgs/development/compilers/llvm/6/libc++/libc++.a new file mode 100644 index 00000000000..f676948115e --- /dev/null +++ b/pkgs/development/compilers/llvm/6/libc++/libc++.a @@ -0,0 +1 @@ +INPUT(-lc++_static -lc++abi) diff --git a/pkgs/development/compilers/llvm/6/libc++abi.nix b/pkgs/development/compilers/llvm/6/libc++abi.nix index 425b00c689e..df9c784a10f 100644 --- a/pkgs/development/compilers/llvm/6/libc++abi.nix +++ b/pkgs/development/compilers/llvm/6/libc++abi.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation { '' else '' install -d -m 755 $out/include $out/lib + install -m 644 lib/libc++abi.a $out/lib install -m 644 lib/libc++abi.so.1.0 $out/lib install -m 644 ../include/cxxabi.h $out/include ln -s libc++abi.so.1.0 $out/lib/libc++abi.so diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index 192439b019b..54617a07573 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -13,7 +13,8 @@ , fetchpatch , debugVersion ? false , enableManpages ? false -, enableTargets ? [ stdenv.hostPlatform stdenv.targetPlatform ] +# Mesa requires AMDGPU target +, enableTargets ? [ stdenv.hostPlatform stdenv.targetPlatform "AMDGPU" ] , enableSharedLibraries ? true }: @@ -115,12 +116,6 @@ in stdenv.mkDerivation (rec { postBuild = '' rm -fR $out - - paxmark m bin/{lli,llvm-rtdyld} - paxmark m unittests/ExecutionEngine/MCJIT/MCJITTests - paxmark m unittests/ExecutionEngine/Orc/OrcJITTests - paxmark m unittests/Support/SupportTests - paxmark m bin/lli-child-target ''; preCheck = '' diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix index 76bfb34975e..f3b2f4df6cc 100644 --- a/pkgs/development/compilers/llvm/7/libc++/default.nix +++ b/pkgs/development/compilers/llvm/7/libc++/default.nix @@ -36,6 +36,11 @@ stdenv.mkDerivation rec { linkCxxAbi = stdenv.isLinux; + postInstall = '' + mv $out/lib/libc++.a $out/lib/libc++_static.a + cp ${./libc++.a} $out/lib/libc++.a + ''; + setupHooks = [ ../../../../../build-support/setup-hooks/role.bash ./setup-hook.sh diff --git a/pkgs/development/compilers/llvm/7/libc++/libc++.a b/pkgs/development/compilers/llvm/7/libc++/libc++.a new file mode 100644 index 00000000000..f676948115e --- /dev/null +++ b/pkgs/development/compilers/llvm/7/libc++/libc++.a @@ -0,0 +1 @@ +INPUT(-lc++_static -lc++abi) diff --git a/pkgs/development/compilers/llvm/7/libc++abi.nix b/pkgs/development/compilers/llvm/7/libc++abi.nix index 7dbda6c365e..04062b83f50 100644 --- a/pkgs/development/compilers/llvm/7/libc++abi.nix +++ b/pkgs/development/compilers/llvm/7/libc++abi.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation { '' else '' install -d -m 755 $out/include $out/lib + install -m 644 lib/libc++abi.a $out/lib install -m 644 lib/libc++abi.so.1.0 $out/lib install -m 644 ../include/cxxabi.h $out/include ln -s libc++abi.so.1.0 $out/lib/libc++abi.so diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix index d085f3af0ea..a852822cddc 100644 --- a/pkgs/development/compilers/llvm/7/llvm.nix +++ b/pkgs/development/compilers/llvm/7/llvm.nix @@ -14,7 +14,8 @@ , debugVersion ? false , enableManpages ? false , enableSharedLibraries ? true -, enableTargets ? [ stdenv.hostPlatform stdenv.targetPlatform ] +# Mesa requires AMDGPU target +, enableTargets ? [ stdenv.hostPlatform stdenv.targetPlatform "AMDGPU" ] , enablePFM ? !stdenv.isDarwin }: @@ -110,12 +111,6 @@ in stdenv.mkDerivation (rec { postBuild = '' rm -fR $out - - paxmark m bin/{lli,llvm-rtdyld} - paxmark m unittests/ExecutionEngine/MCJIT/MCJITTests - paxmark m unittests/ExecutionEngine/Orc/OrcJITTests - paxmark m unittests/Support/SupportTests - paxmark m bin/lli-child-target ''; preCheck = '' diff --git a/pkgs/development/compilers/llvm/common.nix b/pkgs/development/compilers/llvm/common.nix index e4f55963a6f..27f48ff3f11 100644 --- a/pkgs/development/compilers/llvm/common.nix +++ b/pkgs/development/compilers/llvm/common.nix @@ -2,7 +2,9 @@ rec { llvmBackend = platform: - if platform.parsed.cpu.family == "x86" then + if builtins.typeOf platform == "string" then + platform + else if platform.parsed.cpu.family == "x86" then "X86" else if platform.parsed.cpu.name == "aarch64" then "AArch64" diff --git a/pkgs/development/compilers/mono/4.6.nix b/pkgs/development/compilers/mono/4.6.nix deleted file mode 100644 index 5ccdadc2878..00000000000 --- a/pkgs/development/compilers/mono/4.6.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ callPackage, Foundation, libobjc }: - -callPackage ./generic.nix (rec { - inherit Foundation libobjc; - version = "4.6.2.16"; - sha256 = "190f7kcrm1y5x61s1xwdmjnwc3czsg50s3mml4xmix7byh3x2rc9"; - enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65617511 - meta.knownVulnerabilities = [ "CVE-2018-1002208" ]; -}) diff --git a/pkgs/development/compilers/mono/4.8.nix b/pkgs/development/compilers/mono/4.nix index f445127c0da..3c748e2dff7 100644 --- a/pkgs/development/compilers/mono/4.8.nix +++ b/pkgs/development/compilers/mono/4.nix @@ -1,6 +1,6 @@ { callPackage, Foundation, libobjc }: -callPackage ./generic-cmake.nix (rec { +callPackage ./generic.nix (rec { inherit Foundation libobjc; version = "4.8.1.0"; sha256 = "1vyvp2g28ihcgxgxr8nhzyzdmzicsh5djzk8dk1hj5p5f2k3ijqq"; diff --git a/pkgs/development/compilers/mono/5.0.nix b/pkgs/development/compilers/mono/5.0.nix deleted file mode 100644 index 53820c97b1b..00000000000 --- a/pkgs/development/compilers/mono/5.0.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ callPackage, Foundation, libobjc }: - -callPackage ./generic-cmake.nix (rec { - inherit Foundation libobjc; - version = "5.0.1.1"; - sha256 = "064pgsmanpybpbhpam9jv9n8aicx6mlyb7a91yzh3kcksmqsxmj8"; - enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65820147 -}) diff --git a/pkgs/development/compilers/mono/5.14.nix b/pkgs/development/compilers/mono/5.14.nix deleted file mode 100644 index dcf587a5fa4..00000000000 --- a/pkgs/development/compilers/mono/5.14.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ callPackage, Foundation, libobjc }: - -callPackage ./generic-cmake.nix (rec { - inherit Foundation libobjc; - version = "5.14.0.177"; - sha256 = "164l30fkvfgs1rh663h7dnm1yp7425bi9x2lh2y6zml8h4pgmxfl"; - enableParallelBuilding = false; -}) diff --git a/pkgs/development/compilers/mono/5.4.nix b/pkgs/development/compilers/mono/5.4.nix deleted file mode 100644 index acebb4beef6..00000000000 --- a/pkgs/development/compilers/mono/5.4.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ callPackage, Foundation, libobjc }: - -callPackage ./generic-cmake.nix (rec { - inherit Foundation libobjc; - version = "5.4.1.6"; - sha256 = "1pv5lmyxjr8z9s17jx19850k43ylzqlbzsgr5jxj1knmkbza1zdx"; - enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65820147 -}) diff --git a/pkgs/development/compilers/mono/5.8.nix b/pkgs/development/compilers/mono/5.8.nix deleted file mode 100644 index 7b5008fd04c..00000000000 --- a/pkgs/development/compilers/mono/5.8.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ callPackage, Foundation, libobjc }: - -callPackage ./generic-cmake.nix (rec { - inherit Foundation libobjc; - version = "5.8.0.108"; - sha256 = "177khb06dfll0pcncr84vvibni7f8m5fgb30ndgsdjk25xfcbmzc"; - enableParallelBuilding = false; -}) diff --git a/pkgs/development/compilers/mono/5.nix b/pkgs/development/compilers/mono/5.nix new file mode 100644 index 00000000000..2b987b08364 --- /dev/null +++ b/pkgs/development/compilers/mono/5.nix @@ -0,0 +1,8 @@ +{ callPackage, Foundation, libobjc }: + +callPackage ./generic.nix (rec { + inherit Foundation libobjc; + version = "5.16.0.220"; + sha256 = "1qwdmxssplfdb5rq86f1j8lskvr9dfk5c8hqz9ic09ml69r8c87l"; + enableParallelBuilding = false; +}) diff --git a/pkgs/development/compilers/mono/build-fix-llvm.patch b/pkgs/development/compilers/mono/build-fix-llvm.patch deleted file mode 100644 index 526986ad12c..00000000000 --- a/pkgs/development/compilers/mono/build-fix-llvm.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/lib/CodeGen/AsmPrinter/CMakeLists.txt.old b/lib/CodeGen/AsmPrinter/CMakeLists.txt -index be484a6..c92ff46 100644 ---- a/lib/CodeGen/AsmPrinter/CMakeLists.txt.old -+++ b/lib/CodeGen/AsmPrinter/CMakeLists.txt -@@ -10,6 +10,7 @@ add_llvm_library(LLVMAsmPrinter - DwarfCompileUnit.cpp - DwarfDebug.cpp - DwarfException.cpp -+ DwarfMonoException.cpp - ErlangGCPrinter.cpp - OcamlGCPrinter.cpp - Win64Exception.cpp diff --git a/pkgs/development/compilers/mono/generic-cmake.nix b/pkgs/development/compilers/mono/generic-cmake.nix deleted file mode 100644 index 12f833f5525..00000000000 --- a/pkgs/development/compilers/mono/generic-cmake.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python, version, sha256, autoconf, libtool, automake, cmake, which, enableParallelBuilding ? true }: - -let - llvm = callPackage ./llvm.nix { }; -in -stdenv.mkDerivation rec { - name = "mono-${version}"; - - src = fetchurl { - inherit sha256; - url = "https://download.mono-project.com/sources/mono/${name}.tar.bz2"; - }; - - buildInputs = - [ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib python autoconf libtool automake cmake which - ] - ++ (stdenv.lib.optionals stdenv.isDarwin [ Foundation libobjc ]); - - propagatedBuildInputs = [glib]; - - NIX_LDFLAGS = if stdenv.isDarwin then "" else "-lgcc_s" ; - - # To overcome the bug https://bugzilla.novell.com/show_bug.cgi?id=644723 - dontDisableStatic = true; - - configureFlags = [ - "--x-includes=${libX11.dev}/include" - "--x-libraries=${libX11.out}/lib" - "--with-libgdiplus=${libgdiplus}/lib/libgdiplus.so" - ] - ++ stdenv.lib.optionals withLLVM [ - "--enable-llvm" - "--enable-llvmloaded" - "--with-llvm=${llvm}" - ]; - - configurePhase = '' - patchShebangs ./ - ./autogen.sh --prefix $out $configureFlags - ''; - - # Attempt to fix this error when running "mcs --version": - # The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image - dontStrip = true; - - # We want pkg-config to take priority over the dlls in the Mono framework and the GAC - # because we control pkg-config - patches = [ ./pkgconfig-before-gac.patch ]; - - # Patch all the necessary scripts. Also, if we're using LLVM, we fix the default - # LLVM path to point into the Mono LLVM build, since it's private anyway. - preBuild = '' - makeFlagsArray=(INSTALL=`type -tp install`) - substituteInPlace mcs/class/corlib/System/Environment.cs --replace /usr/share "$out/share" - '' + stdenv.lib.optionalString withLLVM '' - substituteInPlace mono/mini/aot-compiler.c --replace "llvm_path = g_strdup (\"\")" "llvm_path = g_strdup (\"${llvm}/bin/\")" - ''; - - # Fix mono DLLMap so it can find libX11 to run winforms apps - # libgdiplus is correctly handled by the --with-libgdiplus configure flag - # Other items in the DLLMap may need to be pointed to their store locations, I don't think this is exhaustive - # http://www.mono-project.com/Config_DllMap - postBuild = '' - find . -name 'config' -type f | xargs \ - sed -i -e "s@libX11.so.6@${libX11.out}/lib/libX11.so.6@g" - ''; - - # Without this, any Mono application attempting to open an SSL connection will throw with - # The authentication or decryption has failed. - # ---> Mono.Security.Protocol.Tls.TlsException: Invalid certificate received from server. - postInstall = '' - echo "Updating Mono key store" - $out/bin/cert-sync ${cacert}/etc/ssl/certs/ca-bundle.crt - '' - # According to [1], gmcs is just mcs - # [1] https://github.com/mono/mono/blob/master/scripts/gmcs.in - + '' - ln -s $out/bin/mcs $out/bin/gmcs - ''; - - inherit enableParallelBuilding; - - meta = with stdenv.lib; { - homepage = http://mono-project.com/; - description = "Cross platform, open source .NET development framework"; - platforms = with platforms; darwin ++ linux; - maintainers = with maintainers; [ thoughtpolice obadz vrthra ]; - license = licenses.free; # Combination of LGPL/X11/GPL ? - }; -} diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index 06dcfb8b393..400b040ae85 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -1,19 +1,10 @@ -{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11 -, callPackage, ncurses, zlib -, cacert, Foundation, libobjc, python - -, version, sha256 -, withLLVM ? false -, enableParallelBuilding ? true -, meta ? {} -}: +{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python, version, sha256, autoconf, libtool, automake, cmake, which, enableParallelBuilding ? true }: let llvm = callPackage ./llvm.nix { }; - name = "mono-${version}"; in -stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + name = "mono-${version}"; src = fetchurl { inherit sha256; @@ -21,7 +12,7 @@ stdenv.mkDerivation { }; buildInputs = - [ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib python + [ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib python autoconf libtool automake cmake which ] ++ (stdenv.lib.optionals stdenv.isDarwin [ Foundation libobjc ]); @@ -32,8 +23,6 @@ stdenv.mkDerivation { # To overcome the bug https://bugzilla.novell.com/show_bug.cgi?id=644723 dontDisableStatic = true; - # In fact I think this line does not help at all to what I - # wanted to achieve: have mono to find libgdiplus automatically configureFlags = [ "--x-includes=${libX11.dev}/include" "--x-libraries=${libX11.out}/lib" @@ -41,10 +30,14 @@ stdenv.mkDerivation { ] ++ stdenv.lib.optionals withLLVM [ "--enable-llvm" - "--enable-llvmloaded" "--with-llvm=${llvm}" ]; + configurePhase = '' + patchShebangs ./ + ./autogen.sh --prefix $out $configureFlags + ''; + # Attempt to fix this error when running "mcs --version": # The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image dontStrip = true; @@ -57,19 +50,18 @@ stdenv.mkDerivation { # LLVM path to point into the Mono LLVM build, since it's private anyway. preBuild = '' makeFlagsArray=(INSTALL=`type -tp install`) - patchShebangs ./ substituteInPlace mcs/class/corlib/System/Environment.cs --replace /usr/share "$out/share" '' + stdenv.lib.optionalString withLLVM '' substituteInPlace mono/mini/aot-compiler.c --replace "llvm_path = g_strdup (\"\")" "llvm_path = g_strdup (\"${llvm}/bin/\")" ''; - # Fix mono DLLMap so it can find libX11 and gdiplus to run winforms apps + # Fix mono DLLMap so it can find libX11 to run winforms apps + # libgdiplus is correctly handled by the --with-libgdiplus configure flag # Other items in the DLLMap may need to be pointed to their store locations, I don't think this is exhaustive # http://www.mono-project.com/Config_DllMap postBuild = '' find . -name 'config' -type f | xargs \ - sed -i -e "s@libX11.so.6@${libX11.out}/lib/libX11.so.6@g" \ - -e "s@/.*libgdiplus.so@${libgdiplus}/lib/libgdiplus.so@g" \ + sed -i -e "s@libX11.so.6@${libX11.out}/lib/libX11.so.6@g" ''; # Without this, any Mono application attempting to open an SSL connection will throw with @@ -87,11 +79,11 @@ stdenv.mkDerivation { inherit enableParallelBuilding; - meta = { + meta = with stdenv.lib; { homepage = http://mono-project.com/; description = "Cross platform, open source .NET development framework"; - platforms = stdenv.lib.platforms.x86; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice obadz vrthra ]; - license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ? - } // meta; + platforms = with platforms; darwin ++ linux; + maintainers = with maintainers; [ thoughtpolice obadz vrthra ]; + license = licenses.free; # Combination of LGPL/X11/GPL ? + }; } diff --git a/pkgs/development/compilers/mono/llvm.nix b/pkgs/development/compilers/mono/llvm.nix index 8e9dcc1dbcb..616ec420d2d 100644 --- a/pkgs/development/compilers/mono/llvm.nix +++ b/pkgs/development/compilers/mono/llvm.nix @@ -1,9 +1,10 @@ { stdenv -, fetchurl -, perl +, lib +, fetchFromGitHub , groff , cmake -, python +, python2 +, perl , libffi , libbfd , libxml2 @@ -14,22 +15,16 @@ stdenv.mkDerivation rec { name = "llvm-${version}"; - version = "3.4svn-mono-f9b1a74368"; - src = fetchurl { - # from the HEAD of the 'mono3' branch - url = "https://github.com/mono/llvm/archive/f9b1a74368ec299fc04c4cfef4b5aa0992b7b806.tar.gz"; - name = "${name}.tar.gz"; - sha256 = "1bbkx4p5zdnk3nbdd5jxvbwqx8cdq8z1n1nhf639i98mggs0zhdg"; - }; + version = "3.6-mono-2017-02-15"; - patches = [ ./build-fix-llvm.patch ]; - unpackPhase = '' - unpackFile ${src} - mv llvm-* llvm - sourceRoot=$PWD/llvm - ''; + src = fetchFromGitHub { + owner = "mono"; + repo = "llvm"; + rev = "dbb6fdffdeb780d11851a6be77c209bd7ada4bd3"; + sha256 = "07wd1cs3fdvzb1lv41b655z5zk34f47j8fgd9ljjimi5j9pj71f7"; + }; - buildInputs = [ perl groff cmake libxml2 python libffi ] ++ stdenv.lib.optional stdenv.isLinux valgrind; + buildInputs = [ perl groff cmake libxml2 python2 libffi ] ++ lib.optional stdenv.isLinux valgrind; propagatedBuildInputs = [ ncurses zlib ]; @@ -43,7 +38,6 @@ stdenv.mkDerivation rec { cmakeFlags = with stdenv; [ "-DLLVM_ENABLE_FFI=ON" "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - "-DCMAKE_CXX_FLAGS=-std=c++11" ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON"; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/mono/pkgconfig-before-gac-5x.patch b/pkgs/development/compilers/mono/pkgconfig-before-gac-5x.patch deleted file mode 100644 index 1b9c59402bf..00000000000 --- a/pkgs/development/compilers/mono/pkgconfig-before-gac-5x.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff -Naur mono-5.0.0/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets.old mono-5.0.0/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets ---- mono-5.0.0/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets.old 2017-04-24 23:45:18.348116305 +0200 -+++ mono-5.0.0/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets 2017-04-24 23:45:11.407051755 +0200 -@@ -167,8 +167,8 @@ - $(ReferencePath); - @(AdditionalReferencePath); - {HintPathFromItem}; -- {TargetFrameworkDirectory}; - {PkgConfig}; -+ {TargetFrameworkDirectory}; - {GAC}; - {RawFileName}; - $(OutDir) -diff -Naur mono-5.0.0/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets.old mono-5.0.0/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets ---- mono-5.0.0/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets.old 2017-04-24 23:49:53.019616196 +0200 -+++ mono-5.0.0/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets 2017-04-24 23:50:05.709729585 +0200 -@@ -232,8 +232,8 @@ - $(ReferencePath); - @(AdditionalReferencePath); - {HintPathFromItem}; -- {TargetFrameworkDirectory}; - {PkgConfig}; -+ {TargetFrameworkDirectory}; - {GAC}; - {RawFileName}; - $(OutDir) -diff -Naur mono-5.0.0/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets.old mono-5.0.0/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets ---- mono-5.0.0/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets.old 2017-04-24 23:52:33.200037047 +0200 -+++ mono-5.0.0/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets 2017-04-24 23:52:43.281125802 +0200 -@@ -139,8 +139,8 @@ - $(ReferencePath); - @(AdditionalReferencePath); - {HintPathFromItem}; -- {TargetFrameworkDirectory}; - {PkgConfig}; -+ {TargetFrameworkDirectory}; - {GAC}; - {RawFileName}; - $(OutDir) -diff -Naur mono-5.0.0/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets.old mono-5.0.0/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets ---- mono-5.0.0/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets.old 2017-04-24 23:54:02.585821594 +0200 -+++ mono-5.0.0/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets 2017-04-24 23:54:09.313880438 +0200 -@@ -234,8 +234,8 @@ - $(ReferencePath); - @(AdditionalReferencePath); - {HintPathFromItem}; -- {TargetFrameworkDirectory}; - {PkgConfig}; -+ {TargetFrameworkDirectory}; - {GAC}; - {RawFileName}; - $(OutDir) -diff -Naur mono-5.0.0/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets.old mono-5.0.0/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets ---- mono-5.0.0/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets.old 2017-04-24 23:55:46.244895155 +0200 -+++ mono-5.0.0/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets 2017-04-24 23:55:51.998961342 +0200 -@@ -232,8 +232,8 @@ - $(ReferencePath); - @(AdditionalReferencePath); - {HintPathFromItem}; -- {TargetFrameworkDirectory}; - {PkgConfig}; -+ {TargetFrameworkDirectory}; - {GAC}; - {RawFileName}; - $(OutDir) diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/development/compilers/mruby/default.nix index 3ab553678b6..cfc1f00a803 100644 --- a/pkgs/development/compilers/mruby/default.nix +++ b/pkgs/development/compilers/mruby/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mruby-${version}"; - version = "1.4.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "mruby"; repo = "mruby"; rev = version; - sha256 = "0pw72acbqgs4n1qa297nnja23v9hxz9g7190yfx9kwm7mgbllmww"; + sha256 = "1r6w1asjshff43ymdwa6xmrkggza99mi2kw88k7ic6ag2j81hcj5"; }; patches = [ diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index 271d26eda1c..51156549552 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nasm-${version}"; - version = "2.14"; + version = "2.14.01"; src = fetchurl { url = "https://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2"; - sha256 = "0i678zbm1ljn5jwia7gj1n503izwvzlh55xzm4i0qgfmr8kzsg6l"; + sha256 = "1v9fazd3in0rphnw5ck58wqnl8dis4dyqpsqgjsm4h9jjj0vylvz"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 42208ecf8d9..a389f0f5ca1 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -21,7 +21,6 @@ let update = ".0.1"; build = "13"; repover = "jdk-${major}${update}+${build}"; - paxflags = if stdenv.isi686 then "msp" else "m"; openjdk = stdenv.mkDerivation { name = "openjdk-${major}${update}-b${build}"; @@ -106,14 +105,6 @@ let rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so ''} - # Set PaX markings - exes=$(file $out/lib/openjdk/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') - echo "to mark: *$exes*" - for file in $exes; do - echo "marking *$file*" - paxmark ${paxflags} "$file" - done - ln -s $out/lib/openjdk/bin $out/bin ''; diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index d26627ff5b9..19b16921e32 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -25,7 +25,6 @@ let build = "26"; baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u"; repover = "jdk8u${update}-b${build}"; - paxflags = if stdenv.isi686 then "msp" else "m"; jdk8 = fetchurl { url = "${baseurl}/archive/${repover}.tar.gz"; sha256 = "1hx5sfsglc101aqs9n7cz7rh447d6rxfxkbw03crvzbvy9n6ag2d"; @@ -176,14 +175,6 @@ let rm -rf $out/lib/openjdk/jre/lib/cmm ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm - # Set PaX markings - exes=$(file $out/lib/openjdk/bin/* $jre/lib/openjdk/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') - echo "to mark: *$exes*" - for file in $exes; do - echo "marking *$file*" - paxmark ${paxflags} "$file" - done - # Remove duplicate binaries. for i in $(cd $out/lib/openjdk/bin && echo *); do if [ "$i" = java ]; then continue; fi diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix index 1b20ca6cc60..e58888cc9ed 100644 --- a/pkgs/development/compilers/openjdk/bootstrap.nix +++ b/pkgs/development/compilers/openjdk/bootstrap.nix @@ -36,13 +36,5 @@ let patchelf --set-interpreter $(cat "${stdenv.cc}/nix-support/dynamic-linker") "$elf" || true patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:${zlib}/lib:$LIBDIRS" "$elf" || true done - - # Temporarily, while NixOS's OpenJDK bootstrap tarball doesn't have PaX markings: - find "$out/bin" -type f -print0 | while IFS= read -r -d "" elf; do - isELF "$elf" || continue - paxmark m "$elf" - # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. - ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$elf"''} - done ''; in bootstrap diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 5d55e0554e5..8e04b776ed8 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -93,14 +93,6 @@ let result = stdenv.mkDerivation rec { installPhase = '' cd .. - # Set PaX markings - exes=$(file $sourceRoot/bin/* $sourceRoot/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') - for file in $exes; do - paxmark m "$file" || true - # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. - ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''} - done - if test -z "$installjdk"; then mv $sourceRoot/jre $out else diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index af9ddb872f9..48279fd7108 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchzip, fetchFromGitHub, boost, cmake, z3 }: let - version = "0.5.1"; - rev = "c8a2cb62832afb2dc09ccee6fd42c1516dfdb981"; - sha256 = "0d6mfnixlr9m5yr3r4p6cv6vwrrivcamyar5d0f9rvir9w9ypzrr"; + version = "0.5.2"; + rev = "1df8f40cd2fd7b47698d847907b8ca7b47eb488d"; + sha256 = "009kjyb3r2p64wpdzfcmqr9swm5haaixbzvsbw1nd4wipwbp66y0"; jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz; jsoncpp = fetchzip { url = jsoncppURL; @@ -33,11 +33,10 @@ stdenv.mkDerivation { cmakeFlags = [ "-DBoost_USE_STATIC_LIBS=OFF" "-DBUILD_SHARED_LIBS=ON" - "-DINSTALL_LLLC=ON" ]; doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform == stdenv.buildPlatform; - checkPhase = "LD_LIBRARY_PATH=./libsolc:./libsolidity:./liblll:./libevmasm:./libdevcore:./libyul:./liblangutil:$LD_LIBRARY_PATH " + + checkPhase = "LD_LIBRARY_PATH=./libsolc:./libsolidity:./libevmasm:./libdevcore:./libyul:./liblangutil:$LD_LIBRARY_PATH " + "./test/soltest -p -- --no-ipc --no-smt --testpath ../test"; nativeBuildInputs = [ cmake ]; @@ -47,7 +46,6 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Compiler for Ethereum smart contract language Solidity"; - longDescription = "This package also includes `lllc', the LLL compiler."; homepage = https://github.com/ethereum/solidity; license = licenses.gpl3; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/compilers/solc/patches/shared-libs-install.patch b/pkgs/development/compilers/solc/patches/shared-libs-install.patch index fa30655e04e..e106c9bbb74 100644 --- a/pkgs/development/compilers/solc/patches/shared-libs-install.patch +++ b/pkgs/development/compilers/solc/patches/shared-libs-install.patch @@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c05208f..8893648e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -48,6 +48,25 @@ add_subdirectory(libevmasm) +@@ -48,6 +48,22 @@ add_subdirectory(libevmasm) add_subdirectory(libsolidity) add_subdirectory(libsolc) @@ -21,9 +21,6 @@ index 0c05208f..8893648e 100644 +install(DIRECTORY liblangutil/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/liblangutil + FILES_MATCHING PATTERN "*.h") -+install(DIRECTORY liblll/ -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/liblll -+ FILES_MATCHING PATTERN "*.h") + if (NOT EMSCRIPTEN) add_subdirectory(solc) @@ -46,15 +43,6 @@ index 86192c1b..e7f15e93 100644 add_library(evmasm ${sources} ${headers}) target_link_libraries(evmasm PUBLIC devcore) +install(TARGETS evmasm LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -diff --git a/liblll/CMakeLists.txt b/liblll/CMakeLists.txt -index 4cdc073a..b61f03c7 100644 ---- a/liblll/CMakeLists.txt -+++ b/liblll/CMakeLists.txt -@@ -3,3 +3,4 @@ file(GLOB headers "*.h") - - add_library(lll ${sources} ${headers}) - target_link_libraries(lll PUBLIC evmasm devcore) -+install(TARGETS lll LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt index 0bdec4b4..e876177e 100644 --- a/libsolidity/CMakeLists.txt @@ -69,11 +57,10 @@ index 0bdec4b4..e876177e 100644 target_link_libraries(solidity PUBLIC ${Z3_LIBRARY}) --- a/libyul/CMakeLists.txt +++ b/libyul/CMakeLists.txt -@@ -42,3 +42,4 @@ endif() +@@ -43,3 +43,4 @@ endif() optimiser/VarDeclPropagator.cpp ) --target_link_libraries(yul PUBLIC devcore) -+target_link_libraries(yul PUBLIC evmasm devcore langutil) + target_link_libraries(yul PUBLIC evmasm devcore langutil) +install(TARGETS yul LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) --- a/liblangutil/CMakeLists.txt +++ b/liblangutil/CMakeLists.txt diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index bbfa1be8f92..02b100fe613 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -27,7 +27,6 @@ , git , libgit2 , fetchFromGitHub -, paxctl , findutils , makeWrapper , gnumake @@ -150,7 +149,7 @@ stdenv.mkDerivation rec { findutils makeWrapper gnumake - ] ++ stdenv.lib.optional stdenv.needsPax paxctl; + ]; # TODO: Revisit what's propagated and how propagatedBuildInputs = [ @@ -218,9 +217,6 @@ stdenv.mkDerivation rec { substituteInPlace swift/utils/build-script-impl \ --replace '/usr/include/c++' "${clang.cc.gcc}/include/c++" patch -p1 -d swift -i ${./patches/glibc-arch-headers.patch} - '' + stdenv.lib.optionalString stdenv.needsPax '' - patch -p1 -d swift -i ${./patches/build-script-pax.patch} - '' + '' patch -p1 -d swift -i ${./patches/0001-build-presets-linux-don-t-require-using-Ninja.patch} patch -p1 -d swift -i ${./patches/0002-build-presets-linux-allow-custom-install-prefix.patch} patch -p1 -d swift -i ${./patches/0004-build-presets-linux-plumb-extra-cmake-options.patch} @@ -266,9 +262,6 @@ stdenv.mkDerivation rec { tar xf $INSTALLABLE_PACKAGE -C $out --strip-components=3 $PREFIX find $out -type d -empty -delete - paxmark pmr $out/bin/swift - paxmark pmr $out/bin/* - # TODO: Use wrappers to get these on the PATH for swift tools, instead ln -s ${clang}/bin/* $out/bin/ ln -s ${targetPackages.stdenv.cc.bintools.bintools_bin}/bin/ar $out/bin/ar diff --git a/pkgs/development/compilers/swift/patches/build-script-pax.patch b/pkgs/development/compilers/swift/patches/build-script-pax.patch deleted file mode 100644 index 1f47bf8ee04..00000000000 --- a/pkgs/development/compilers/swift/patches/build-script-pax.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- swift/utils/build-script-impl 2017-01-23 12:47:20.401326309 -0600 -+++ swift-pax/utils/build-script-impl 2017-01-23 13:24:10.339366996 -0600 -@@ -1837,6 +1837,17 @@ function set_lldb_xcodebuild_options() { - fi - } - -+## XXX: Taken from nixpkgs /pkgs/stdenv/generic/setup.sh -+isELF() { -+ local fn="$1" -+ local fd -+ local magic -+ exec {fd}< "$fn" -+ read -n 4 -u $fd magic -+ exec {fd}<&- -+ if [[ "$magic" =~ ELF ]]; then return 0; else return 1; fi -+} -+ - # - # Configure and build each product - # -@@ -2735,6 +2746,12 @@ for host in "${ALL_HOSTS[@]}"; do - fi - - call "${CMAKE_BUILD[@]}" "${build_dir}" $(cmake_config_opt ${product}) -- "${BUILD_ARGS[@]}" ${build_targets[@]} -+ -+ while IFS= read -r -d $'\0' i; do -+ if ! isELF "$i"; then continue; fi -+ echo "setting pax flags on $i" -+ paxctl -czexm "$i" || true -+ done < <(find "${build_dir}" -executable -type f -wholename "*/bin/*" -print0) - fi - done - done diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index 98795f96ffa..80d04080aac 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -51,10 +51,6 @@ stdenv.mkDerivation rec { '' ; - postFixup = '' - paxmark m $bin/bin/terra - ''; - buildInputs = with llvmPackages; [ lua llvm clang-unwrapped ncurses ]; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index da706d502e6..a5c3db65857 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -33,10 +33,6 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; - postFixup = '' - paxmark m $out/bin/tcc - ''; - meta = { description = "Small, fast, and embeddable C compiler and interpreter"; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index a721625b1f4..f945a658109 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -45,16 +45,10 @@ let }; in rec { - vala_0_34 = generic { - major = "0.34"; - minor = "18"; - sha256 = "1lhw3ghns059y5d6pdldy5p4yjwlhcls84k892i6qmbhxg34945q"; - }; - vala_0_36 = generic { major = "0.36"; - minor = "15"; - sha256 = "11lnwjbhiz2l7g6y1f0jb0s81ymgssinlil3alibzcwmzpk175ix"; + minor = "17"; + sha256 = "1f6qg40zd6jzhbwr3dy4fb66k4qs1xlk2whdyqh64zxxjw0k9pv7"; }; vala_0_38 = generic { @@ -66,14 +60,14 @@ in rec { vala_0_40 = generic { major = "0.40"; - minor = "11"; - sha256 = "0xhm61kjdws167pafcji43s7icfvpq58lkbq3irb1jv3icjr3i8z"; + minor = "12"; + sha256 = "1nhk45w5iwg97q3cfybn0i4qz5w9qvk423ndpg6mq6cnna076snx"; }; vala_0_42 = generic { major = "0.42"; - minor = "3"; - sha256 = "0zaq9009wqk5aah131m426a2ia0scwpjpl4npf8p7p43wv8kvisz"; + minor = "4"; + sha256 = "07jgkx812y7wq4cswwfsf1f4k3lq9hcjra45682bdi8a11nr0a5m"; }; vala = vala_0_42; diff --git a/pkgs/development/coq-modules/Cheerios/default.nix b/pkgs/development/coq-modules/Cheerios/default.nix index 217c2ad5344..2429ccf3cf6 100644 --- a/pkgs/development/coq-modules/Cheerios/default.nix +++ b/pkgs/development/coq-modules/Cheerios/default.nix @@ -1,32 +1,11 @@ { stdenv, fetchFromGitHub, coq, StructTact }: -let params = +let param = { - "8.6" = { version = "20181102"; rev = "04da309304bdd28a1f7dacca9fdf8696204a4ff2"; sha256 = "1xfa78p70c90favds1mv1vj5sr9bv0ad3dsgg05v3v72006g2f1q"; - }; - - "8.7" = { - version = "20181102"; - rev = "04da309304bdd28a1f7dacca9fdf8696204a4ff2"; - sha256 = "1xfa78p70c90favds1mv1vj5sr9bv0ad3dsgg05v3v72006g2f1q"; - }; - - "8.8" = { - version = "20181102"; - rev = "04da309304bdd28a1f7dacca9fdf8696204a4ff2"; - sha256 = "1xfa78p70c90favds1mv1vj5sr9bv0ad3dsgg05v3v72006g2f1q"; - }; - - "8.9" = { - version = "20181102"; - rev = "04da309304bdd28a1f7dacca9fdf8696204a4ff2"; - sha256 = "1xfa78p70c90favds1mv1vj5sr9bv0ad3dsgg05v3v72006g2f1q"; - }; }; - param = params."${coq.coq-version}"; in stdenv.mkDerivation rec { @@ -38,15 +17,16 @@ stdenv.mkDerivation rec { inherit (param) rev sha256; }; - buildInputs = [ - coq coq.ocaml coq.camlp5 coq.findlib StructTact - ]; + buildInputs = [ coq ]; + + propagatedBuildInputs = [ StructTact ]; enableParallelBuilding = true; - buildPhase = "make -j$NIX_BUILD_CORES"; + preConfigure = "patchShebangs ./configure"; + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ]; + compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; }; } diff --git a/pkgs/development/coq-modules/InfSeqExt/default.nix b/pkgs/development/coq-modules/InfSeqExt/default.nix index 355b9e43927..6b908f5a09a 100644 --- a/pkgs/development/coq-modules/InfSeqExt/default.nix +++ b/pkgs/development/coq-modules/InfSeqExt/default.nix @@ -1,38 +1,11 @@ -{ stdenv, fetchFromGitHub, coq, mathcomp }: +{ stdenv, fetchFromGitHub, coq }: -let params = +let param = { - "8.5" = { version = "20180918"; rev = "243d6be45666da73a9da6c37d451327165275798"; sha256 = "1nh2psb4pcppy1akk24ilb4p08m35cba357i4xyymmarmbwqpxmn"; - }; - - "8.6" = { - version = "20180918"; - rev = "243d6be45666da73a9da6c37d451327165275798"; - sha256 = "1nh2psb4pcppy1akk24ilb4p08m35cba357i4xyymmarmbwqpxmn"; - }; - - "8.7" = { - version = "20180918"; - rev = "243d6be45666da73a9da6c37d451327165275798"; - sha256 = "1nh2psb4pcppy1akk24ilb4p08m35cba357i4xyymmarmbwqpxmn"; - }; - - "8.8" = { - version = "20180918"; - rev = "243d6be45666da73a9da6c37d451327165275798"; - sha256 = "1nh2psb4pcppy1akk24ilb4p08m35cba357i4xyymmarmbwqpxmn"; - }; - - "8.9" = { - version = "20180918"; - rev = "243d6be45666da73a9da6c37d451327165275798"; - sha256 = "1nh2psb4pcppy1akk24ilb4p08m35cba357i4xyymmarmbwqpxmn"; - }; }; - param = params."${coq.coq-version}"; in stdenv.mkDerivation rec { @@ -44,15 +17,15 @@ stdenv.mkDerivation rec { inherit (param) rev sha256; }; - buildInputs = [ - coq coq.ocaml coq.camlp5 coq.findlib mathcomp - ]; + buildInputs = [ coq ]; + enableParallelBuilding = true; - buildPhase = "make -j$NIX_BUILD_CORES"; + preConfigure = "patchShebangs ./configure"; + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ]; + compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.5"; }; } diff --git a/pkgs/development/coq-modules/StructTact/default.nix b/pkgs/development/coq-modules/StructTact/default.nix index 1fd6187e049..55d59b93140 100644 --- a/pkgs/development/coq-modules/StructTact/default.nix +++ b/pkgs/development/coq-modules/StructTact/default.nix @@ -1,38 +1,11 @@ { stdenv, fetchFromGitHub, coq, mathcomp }: -let params = +let param = { - "8.5" = { version = "20181102"; rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510"; sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v"; - }; - - "8.6" = { - version = "20181102"; - rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510"; - sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v"; - }; - - "8.7" = { - version = "20181102"; - rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510"; - sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v"; - }; - - "8.8" = { - version = "20181102"; - rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510"; - sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v"; - }; - - "8.9" = { - version = "20181102"; - rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510"; - sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v"; - }; }; - param = params."${coq.coq-version}"; in stdenv.mkDerivation rec { @@ -44,15 +17,15 @@ stdenv.mkDerivation rec { inherit (param) rev sha256; }; - buildInputs = [ - coq coq.ocaml coq.camlp5 coq.findlib - ]; + buildInputs = [ coq ]; + enableParallelBuilding = true; - buildPhase = "make -j$NIX_BUILD_CORES"; + preConfigure = "patchShebangs ./configure"; + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ]; + compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.5"; }; } diff --git a/pkgs/development/coq-modules/Verdi/default.nix b/pkgs/development/coq-modules/Verdi/default.nix index 9f54eb67c72..8eaa2bdfae7 100644 --- a/pkgs/development/coq-modules/Verdi/default.nix +++ b/pkgs/development/coq-modules/Verdi/default.nix @@ -1,32 +1,11 @@ -{ stdenv, fetchFromGitHub, coq, mathcomp, StructTact, InfSeqExt, Cheerios }: +{ stdenv, fetchFromGitHub, coq, Cheerios, InfSeqExt, ssreflect }: -let params = +let param = { - "8.6" = { version = "20181102"; rev = "25b79cf1be5527ab8dc1b8314fcee93e76a2e564"; sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z"; - }; - - "8.7" = { - version = "20181102"; - rev = "25b79cf1be5527ab8dc1b8314fcee93e76a2e564"; - sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z"; - }; - - "8.8" = { - version = "20181102"; - rev = "25b79cf1be5527ab8dc1b8314fcee93e76a2e564"; - sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z"; - }; - - "8.9" = { - version = "20181102"; - rev = "25b79cf1be5527ab8dc1b8314fcee93e76a2e564"; - sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z"; - }; }; - param = params."${coq.coq-version}"; in stdenv.mkDerivation rec { @@ -38,15 +17,16 @@ stdenv.mkDerivation rec { inherit (param) rev sha256; }; - buildInputs = [ - coq coq.ocaml coq.camlp5 coq.findlib mathcomp StructTact InfSeqExt Cheerios - ]; + buildInputs = [ coq ]; + propagatedBuildInputs = [ Cheerios InfSeqExt ssreflect ]; + enableParallelBuilding = true; - buildPhase = "make -j$NIX_BUILD_CORES"; + preConfigure = "patchShebangs ./configure"; + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ]; + compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; }; } diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix index 54cb7c50e40..191812b3f2e 100644 --- a/pkgs/development/coq-modules/coqprime/default.nix +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -1,16 +1,19 @@ { stdenv, fetchFromGitHub, coq, bignums }: let params = + let v_8_8 = { + version = "8.8"; + sha256 = "075yjczk79pf1hd3lgdjiz84ilkzfxjh18lgzrhhqp7d3kz5lxp5"; + }; + in { "8.7" = { version = "8.7.2"; sha256 = "15zlcrx06qqxjy3nhh22wzy0rb4npc8l4nx2bbsfsvrisbq1qb7k"; }; - "8.8" = { - version = "8.8"; - sha256 = "075yjczk79pf1hd3lgdjiz84ilkzfxjh18lgzrhhqp7d3kz5lxp5"; + "8.8" = v_8_8; + "8.9" = v_8_8; }; - }; param = params."${coq.coq-version}" ; in diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3c01250c3fe..9e0dd0758b0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -51,7 +51,6 @@ self: super: { clock = dontCheck super.clock; Dust-crypto = dontCheck super.Dust-crypto; hasql-postgres = dontCheck super.hasql-postgres; - hspec = super.hspec.override { stringbuilder = dontCheck self.stringbuilder; }; hspec-core = super.hspec-core.override { silently = dontCheck self.silently; temporary = dontCheck self.temporary; }; hspec-expectations = dontCheck super.hspec-expectations; HTTP = dontCheck super.HTTP; @@ -869,10 +868,6 @@ self: super: { testToolDepends = drv.testToolDepends or [] ++ [pkgs.procps]; }); - # These packages depend on each other, forming an infinite loop. - scalendar = markBroken (super.scalendar.override { SCalendar = null; }); - SCalendar = markBroken (super.SCalendar.override { scalendar = null; }); - # Needs QuickCheck <2.10, which we don't have. edit-distance = doJailbreak super.edit-distance; blaze-markup = doJailbreak super.blaze-markup; @@ -948,9 +943,9 @@ self: super: { # hledger needs a newer megaparsec version than we have in LTS 12.x. hledger-lib = super.hledger-lib.overrideScope (self: super: { - cassava-megaparsec = self.cassava-megaparsec_2_0_0; - hspec-megaparsec = self.hspec-megaparsec_2_0_0; - megaparsec = self.megaparsec_7_0_4; + # cassava-megaparsec = self.cassava-megaparsec_2_0_0; + # hspec-megaparsec = self.hspec-megaparsec_2_0_0; + # megaparsec = self.megaparsec_7_0_4; }); # Copy hledger man pages from data directory into the proper place. This code @@ -979,10 +974,10 @@ self: super: { cp -v *.info* $out/share/info/ ''; })).overrideScope (self: super: { - cassava-megaparsec = self.cassava-megaparsec_2_0_0; - config-ini = self.config-ini_0_2_4_0; - hspec-megaparsec = self.hspec-megaparsec_2_0_0; - megaparsec = self.megaparsec_7_0_4; + # cassava-megaparsec = self.cassava-megaparsec_2_0_0; + # config-ini = self.config-ini_0_2_4_0; + # hspec-megaparsec = self.hspec-megaparsec_2_0_0; + # megaparsec = self.megaparsec_7_0_4; }); hledger-web = overrideCabal super.hledger-web (drv: { postInstall = '' @@ -1087,19 +1082,15 @@ self: super: { haddock-library = doJailbreak (dontCheck super.haddock-library); # haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0); - # The tool needs a newer hpack version than the one mandated by LTS-12.x. - # Also generate shell completions. - cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" - (super.cabal2nix.overrideScope (self: super: { - hpack = self.hpack_0_31_1; - yaml = self.yaml_0_11_0_0; - })); - stack2nix = super.stack2nix.overrideScope (self: super: { - hpack = self.hpack_0_31_1; - yaml = self.yaml_0_11_0_0; - }); - # Break out of "aeson <1.3, temporary <1.3". - stack = generateOptparseApplicativeCompletion "stack" (doJailbreak super.stack); + # Break out of tasty >=0.10 && <1.2. + aeson-compat = doJailbreak super.aeson-compat; + + # Break out of pretty-show >=1.6 && <1.9 + hedgehog = doJailbreak super.hedgehog; + + # Generate shell completion. + cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix; + stack = generateOptparseApplicativeCompletion "stack" super.stack; # https://github.com/pikajude/stylish-cabal/issues/11 stylish-cabal = super.stylish-cabal.override { hspec = self.hspec_2_4_8; hspec-core = self.hspec-core_2_4_8; }; @@ -1131,9 +1122,6 @@ self: super: { libraryHaskellDepends = drv.libraryHaskellDepends ++ [self.QuickCheck]; })) ./patches/sexpr-0.2.1.patch; - # Can be removed once yi-language >= 0.18 is in the LTS - yi-core = super.yi-core.overrideScope (self: super: { yi-language = self.yi-language_0_18_0; }); - # https://github.com/haskell/hoopl/issues/50 hoopl = dontCheck super.hoopl; @@ -1143,22 +1131,12 @@ self: super: { # Generate shell completions purescript = generateOptparseApplicativeCompletion "purs" super.purescript; - # https://github.com/NixOS/nixpkgs/issues/46467 - safe-money-aeson = super.safe-money-aeson.overrideScope (self: super: { safe-money = self.safe-money_0_7; }); - safe-money-store = super.safe-money-store.overrideScope (self: super: { safe-money = self.safe-money_0_7; }); - safe-money-cereal = super.safe-money-cereal.overrideScope (self: super: { safe-money = self.safe-money_0_7; }); - safe-money-serialise = super.safe-money-serialise.overrideScope (self: super: { safe-money = self.safe-money_0_7; }); - safe-money-xmlbf = super.safe-money-xmlbf.overrideScope (self: super: { safe-money = self.safe-money_0_7; }); - # https://github.com/adinapoli/mandrill/pull/52 mandrill = appendPatch super.mandrill (pkgs.fetchpatch { url = https://github.com/adinapoli/mandrill/commit/30356d9dfc025a5f35a156b17685241fc3882c55.patch; sha256 = "1qair09xs6vln3vsjz7sy4hhv037146zak4mq3iv6kdhmp606hqv"; }); - # Can be removed once vinyl >= 0.10 is in the LTS. - Frames = super.Frames.overrideScope (self: super: { vinyl = self.vinyl_0_10_0; }); - # https://github.com/Euterpea/Euterpea2/pull/22 Euterpea = overrideSrc super.Euterpea { src = pkgs.fetchFromGitHub { @@ -1201,9 +1179,6 @@ self: super: { # https://github.com/mgajda/json-autotype/issues/25 json-autotype = dontCheck super.json-autotype; - # https://github.com/kazu-yamamoto/iproute/issues/43 - appar = self.appar_0_1_7; - # The LTS-12.x version doesn't suffice to build hlint, hoogle, etc. hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; }); hoogle = super.hoogle.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; }); diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 2b3165981ea..088e2d5f9ce 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -41,44 +41,39 @@ self: super: { unix = null; xhtml = null; - # Use to be a core-library, but no longer is since GHC 8.4.x. - hoopl = self.hoopl_3_10_2_2; - # LTS-12.x versions do not compile. - base-orphans = self.base-orphans_0_8; - brick = self.brick_0_45; - cassava-megaparsec = doJailbreak super.cassava-megaparsec; - config-ini = doJailbreak super.config-ini; # https://github.com/aisamanra/config-ini/issues/18 - contravariant = self.contravariant_1_5; - fgl = self.fgl_5_7_0_1; - free = self.free_5_1; - haddock-library = dontCheck super.haddock-library_1_7_0; - HaTeX = doJailbreak super.HaTeX; - hpack = self.hpack_0_31_1; - hslua = self.hslua_1_0_1; - hslua-module-text = self.hslua-module-text_0_2_0; - hspec = self.hspec_2_6_0; - hspec-contrib = self.hspec-contrib_0_5_1; - hspec-core = self.hspec-core_2_6_0; - hspec-discover = self.hspec-discover_2_6_0; - hspec-megaparsec = doJailbreak super.hspec-megaparsec; # newer versions need megaparsec 7.x - hspec-meta = self.hspec-meta_2_6_0; - JuicyPixels = self.JuicyPixels_3_3_2; - lens = self.lens_4_17; - megaparsec = dontCheck (doJailbreak super.megaparsec); - pandoc = self.pandoc_2_5; - pandoc-citeproc = self.pandoc-citeproc_0_15; - pandoc-citeproc_0_15 = doJailbreak super.pandoc-citeproc_0_15; - patience = markBrokenVersion "0.1.1" super.patience; - polyparse = self.polyparse_1_12_1; - primitive = self.primitive_0_6_4_0; - QuickCheck = self.QuickCheck_2_12_6_1; - semigroupoids = self.semigroupoids_5_3_1; - tagged = self.tagged_0_8_6; - vty = self.vty_5_25_1; - wizards = doJailbreak super.wizards; - wl-pprint-extras = doJailbreak super.wl-pprint-extras; - yaml = self.yaml_0_11_0_0; + # base-orphans = self.base-orphans_0_8; + # brick = self.brick_0_45; + # cassava-megaparsec = doJailbreak super.cassava-megaparsec; + # config-ini = doJailbreak super.config-ini; # https://github.com/aisamanra/config-ini/issues/18 + # contravariant = self.contravariant_1_5; + # fgl = self.fgl_5_7_0_1; + # free = self.free_5_1; + # haddock-library = dontCheck super.haddock-library_1_7_0; + # HaTeX = doJailbreak super.HaTeX; + # hpack = self.hpack_0_31_1; + # hslua = self.hslua_1_0_1; + # hslua-module-text = self.hslua-module-text_0_2_0; + # hspec = self.hspec_2_6_0; + # hspec-contrib = self.hspec-contrib_0_5_1; + # hspec-core = self.hspec-core_2_6_0; + # hspec-discover = self.hspec-discover_2_6_0; + # hspec-megaparsec = doJailbreak super.hspec-megaparsec; # newer versions need megaparsec 7.x + # hspec-meta = self.hspec-meta_2_6_0; + # JuicyPixels = self.JuicyPixels_3_3_3; + # lens = self.lens_4_17; + # megaparsec = dontCheck (doJailbreak super.megaparsec); + # pandoc = self.pandoc_2_5; + # pandoc-citeproc = self.pandoc-citeproc_0_15; + # pandoc-citeproc_0_15 = doJailbreak super.pandoc-citeproc_0_15; + # patience = markBrokenVersion "0.1.1" super.patience; + # polyparse = self.polyparse_1_12_1; + # semigroupoids = self.semigroupoids_5_3_1; + # tagged = self.tagged_0_8_6; + # vty = self.vty_5_25_1; + # wizards = doJailbreak super.wizards; + # wl-pprint-extras = doJailbreak super.wl-pprint-extras; + # yaml = self.yaml_0_11_0_0; # https://github.com/tibbe/unordered-containers/issues/214 unordered-containers = dontCheck super.unordered-containers; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 18a6c1ea12b..66cc0808f65 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -1,34 +1,36 @@ # pkgs/development/haskell-modules/configuration-hackage2nix.yaml -compiler: ghc-8.4.4 +compiler: ghc-8.6.3 core-packages: - - array-0.5.2.0 - - base-4.11.1.0 - - binary-0.8.5.1 + - array-0.5.3.0 + - base-4.12.0.0 + - binary-0.8.6.0 - bytestring-0.10.8.2 - - Cabal-2.2.0.1 - - containers-0.5.11.0 - - deepseq-1.4.3.0 - - directory-1.3.1.5 - - filepath-1.4.2 - - ghc-8.4.4 - - ghc-boot-8.4.4 - - ghc-boot-th-8.4.4 + - Cabal-2.4.0.1 + - containers-0.6.0.1 + - deepseq-1.4.4.0 + - directory-1.3.3.0 + - filepath-1.4.2.1 + - ghc-8.6.3 + - ghc-boot-8.6.3 + - ghc-boot-th-8.6.3 - ghc-compact-0.1.0.0 - - ghc-prim-0.5.2.0 - - ghci-8.4.4 - - haskeline-0.7.4.2 + - ghc-heap-8.6.3 + - ghc-prim-0.5.3 + - ghci-8.6.3 + - haskeline-0.7.4.3 - hpc-0.6.0.3 - integer-gmp-1.0.2.0 + - libiserv-8.6.3 - mtl-2.2.2 - parsec-3.1.13.0 - pretty-1.1.3.6 - process-1.6.3.0 - rts-1.0 - - stm-2.4.5.1 - - template-haskell-2.13.0.0 - - terminfo-0.4.1.1 + - stm-2.5.0.0 + - template-haskell-2.14.0.0 + - terminfo-0.4.1.2 - text-1.2.3.1 - time-1.8.0.2 - transformers-0.5.5.0 @@ -42,8 +44,9 @@ core-packages: default-package-overrides: # Newer versions don't work in LTS-12.x + - alsa-mixer < 0.3 - cassava-megaparsec < 2 - # LTS Haskell 12.22 + # LTS Haskell 13.0 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -54,9 +57,9 @@ default-package-overrides: - ad ==4.3.5 - adjunctions ==4.4 - adler32 ==0.1.2.0 + - advent-of-code-api ==0.1.2.3 - aern2-mp ==0.1.3.1 - - aern2-real ==0.1.1.0 - - aeson ==1.3.1.1 + - aeson ==1.4.2.0 - aeson-attoparsec ==0.0.0 - aeson-better-errors ==0.9.1.0 - aeson-casing ==0.1.0.5 @@ -71,17 +74,15 @@ default-package-overrides: - aeson-typescript ==0.1.1.0 - aeson-utils ==0.3.0.2 - aeson-yak ==0.1.1.3 - - Agda ==2.5.4.2 - al ==0.1.4.2 - - alarmclock ==0.5.0.2 + - alarmclock ==0.6.0.2 - alerts ==0.1.0.0 - alex ==3.2.4 - - alg ==0.2.8.0 - - algebra ==4.3.1 - - algebraic-graphs ==0.2 - - Allure ==0.8.3.0 + - alg ==0.2.9.0 + - algebraic-graphs ==0.3 - almost-fix ==0.0.2 - alsa-core ==0.5.0.1 + - alsa-mixer ==0.3.0 - alsa-pcm ==0.6.1.1 - alsa-seq ==0.6.0.7 - alternative-vector ==0.0.0 @@ -91,6 +92,7 @@ default-package-overrides: - amazonka-apigateway ==1.6.0 - amazonka-application-autoscaling ==1.6.0 - amazonka-appstream ==1.6.0 + - amazonka-athena ==1.6.0 - amazonka-autoscaling ==1.6.0 - amazonka-budgets ==1.6.0 - amazonka-certificatemanager ==1.6.0 @@ -180,18 +182,32 @@ default-package-overrides: - annotated-wl-pprint ==0.7.0 - ansi-terminal ==0.8.2 - ansi-wl-pprint ==0.6.8.2 + - antiope-athena ==6.2.0 + - antiope-core ==6.2.0 + - antiope-dynamodb ==6.2.0 + - antiope-messages ==6.2.0 + - antiope-s3 ==6.2.0 + - antiope-sns ==6.2.0 + - antiope-sqs ==6.2.0 - ANum ==0.2.0.2 + - aos-signature ==0.1.1 + - apecs ==0.7.1 + - apecs-gloss ==0.2.0 + - apecs-physics ==0.3.1 - api-field-json-th ==0.1.0.2 - - appar ==0.1.5 - - apply-refact ==0.5.0.0 + - appar ==0.1.7 + - appendmap ==0.1.5 + - apply-refact ==0.6.0.0 - apportionment ==0.0.0.3 - approximate ==0.3.1 - app-settings ==0.2.0.12 - - arithmoi ==0.7.0.0 + - arbor-lru-cache ==0.1.1.0 + - arithmoi ==0.8.0.0 - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 - - arrow-list ==0.7 + - asciidiagram ==1.3.3.2 - ascii-progress ==0.3.3.0 + - asif ==3.2.0 - asn1-encoding ==0.9.5 - asn1-parse ==0.9.4 - asn1-types ==0.3.2 @@ -203,27 +219,31 @@ default-package-overrides: - async-refresh-tokens ==0.4.0.0 - async-timer ==0.2.0.0 - atom-basic ==0.2.5 - - atom-conduit ==0.5.0.1 - atomic-primops ==0.8.2 - atomic-write ==0.2.0.6 - attoparsec ==0.13.2.2 - attoparsec-base64 ==0.0.0 - attoparsec-binary ==0.2 - attoparsec-expr ==0.1.1.2 - - attoparsec-ip ==0.0.1 + - attoparsec-ip ==0.0.5 - attoparsec-iso8601 ==1.0.1.0 - attoparsec-path ==0.0.0.1 - - attoparsec-uri ==0.0.4 + - attoparsec-uri ==0.0.7 - audacity ==0.0.2 - authenticate ==1.3.4 - authenticate-oauth ==1.6 - auto ==0.4.3.1 - autoexporter ==1.1.13 - auto-update ==0.1.4 - - avro ==0.3.5.1 + - avers ==0.0.17.1 + - avers-api ==0.1.0 + - avers-server ==0.1.0.1 + - avro ==0.4.1.1 - avwx ==0.3.0.2 - - backprop ==0.2.5.0 + - axel ==0.0.9 + - backprop ==0.2.6.1 - bank-holidays-england ==0.1.0.8 + - barbies ==1.1.0.0 - barrier ==0.1.1 - base16-bytestring ==0.1.1.6 - base32string ==0.9.1 @@ -232,20 +252,20 @@ default-package-overrides: - base64-bytestring-type ==1 - base64-string ==0.2 - base-compat ==0.10.5 - - base-compat-batteries ==0.10.1 + - base-compat-batteries ==0.10.5 - basement ==0.0.8 - - base-orphans ==0.7 + - base-noprelude ==4.12.0.0 + - base-orphans ==0.8 - base-prelude ==1.3 - - base-unicode-symbols ==0.2.2.4 + - base-unicode-symbols ==0.2.3 - basic-prelude ==0.7.0 + - bazel-runfiles ==0.7.0.1 - bbdb ==0.8 - bcrypt ==0.0.11 - - beam-core ==0.7.2.2 - - beam-migrate ==0.3.2.1 - bench ==1.0.12 + - benchpress ==0.2.2.12 - bencode ==0.6.0.0 - between ==0.11.0.0 - - bhoogle ==0.1.3.5 - bibtex ==0.1.0.6 - bifunctors ==5.5.3 - bimap ==0.3.3 @@ -265,10 +285,8 @@ default-package-overrides: - bindings-GLFW ==3.2.1.1 - bindings-libzip ==1.0.1 - bindings-uname ==0.1 - - BiobaseNewick ==0.0.0.2 + - bins ==0.1.1.1 - bitarray ==0.0.1.1 - - bitcoin-api ==0.12.1 - - bitcoin-api-extra ==0.9.1 - bitcoin-block ==0.13.1 - bitcoin-script ==0.11.1 - bitcoin-tx ==0.13.1 @@ -279,9 +297,7 @@ default-package-overrides: - bit-stream ==0.1.0.2 - bitx-bitcoin ==0.12.0.0 - blake2 ==0.2.0 - - blank-canvas ==0.6.3 - - blas-carray ==0.0.1.1 - - blas-ffi ==0.0.1.1 + - blas-ffi ==0.1 - blas-hs ==0.1.1.0 - blaze-bootstrap ==0.1.0.1 - blaze-builder ==0.4.1.0 @@ -295,6 +311,7 @@ default-package-overrides: - boltzmann-samplers ==0.1.1.0 - Boolean ==0.2.4 - boolean-like ==0.1.1.0 + - boolean-normal-forms ==0.0.1 - boolsimplifier ==0.1.8 - bordacount ==0.1.0.0 - boring ==0.1 @@ -304,16 +321,14 @@ default-package-overrides: - boundingboxes ==0.2.3 - bower-json ==1.0.0.1 - boxes ==0.1.5 - - brick ==0.37.2 - - brittany ==0.11.0.0 - - broadcast-chan ==0.1.1 - bsb-http-chunked ==0.0.0.4 - - bson ==0.3.2.6 + - bson ==0.3.2.7 - bson-lens ==0.1.1 - - btrfs ==0.1.2.3 + - btrfs ==0.2.0.0 - buffer-builder ==0.2.4.7 - buffer-pipe ==0.0 - - butcher ==1.3.2.0 + - bugsnag-haskell ==0.0.3.0 + - bulletproofs ==0.4.0 - butter ==0.1.0.6 - bv ==0.5 - bv-little ==0.1.2 @@ -330,43 +345,41 @@ default-package-overrides: - bzlib ==0.5.0.5 - bzlib-conduit ==0.3.0.1 - c2hs ==0.28.6 - - Cabal ==2.2.0.1 - - cabal2spec ==2.1.1 + - Cabal ==2.4.1.0 + - cabal2spec ==2.2.2 - cabal-doctest ==1.0.6 - cabal-rpm ==0.12.6 - cache ==0.1.1.1 - - cachix ==0.1.3 - cachix-api ==0.1.0.3 - - cairo ==0.13.5.0 + - cacophony ==0.10.1 - calendar-recycling ==0.0.0.1 - call-stack ==0.1.0 - - capataz ==0.2.0.0 - carray ==0.1.6.8 - cased ==0.1.0.0 - case-insensitive ==1.2.0.11 - cases ==0.1.3.2 - casing ==0.1.4.0 - cassava ==0.5.1.0 - - cassava-conduit ==0.5.0 + - cassava-conduit ==0.5.1 + - cassava-megaparsec ==2.0.0 - cassava-records ==0.1.0.4 - cast ==0.1.0.2 - category ==0.2.0.1 - - cayley-client ==0.4.7 + - cayley-client ==0.4.8 - cborg ==0.2.1.0 + - cborg-json ==0.2.1.0 - cereal ==0.5.7.0 - cereal-conduit ==0.8.0 - cereal-text ==0.1.0.2 - cereal-time ==0.1.0.0 - cereal-vector ==0.2.0.1 - cfenv ==0.1.0.0 + - cgi ==3001.3.0.3 - chan ==0.0.4.1 - ChannelT ==0.0.0.7 - charset ==0.3.7.1 - charsetdetect-ae ==1.1.0.4 - - chart-unit ==0.7.0.0 - chaselev-deque ==0.5.0.5 - - ChasingBottoms ==1.3.1.5 - - chatwork ==0.1.3.5 - cheapskate ==0.1.1.1 - cheapskate-highlight ==0.1.0.0 - cheapskate-lucid ==0.1.0.0 @@ -384,33 +397,29 @@ default-package-overrides: - cipher-rc4 ==0.1.4 - circle-packing ==0.1.0.6 - cisco-spark-api ==0.1.0.3 - - clang-compilation-database ==0.1.0.1 - - clash-ghc ==0.99.3 - - clash-lib ==0.99.3 - - clash-prelude ==0.99.3 - classyplate ==0.3.2.0 - - classy-prelude ==1.4.0 - - classy-prelude-conduit ==1.4.0 - - classy-prelude-yesod ==1.4.0 + - classy-prelude ==1.5.0 + - classy-prelude-conduit ==1.5.0 + - classy-prelude-yesod ==1.5.0 - clay ==0.13.1 - clientsession ==0.9.1.2 - Clipboard ==2.3.2.0 - clock ==0.7.2 - clock-extras ==0.1.0.2 - - closed ==0.2.0 - clr-host ==0.2.1.0 - clr-marshal ==0.2.0.0 - clumpiness ==0.17.0.0 - - ClustalParser ==1.2.3 + - cmark ==0.5.6 - cmark-gfm ==0.1.6 - cmdargs ==0.10.20 - - code-builder ==0.1.3 - codec ==0.2.1 - codec-beam ==0.2.0 - codec-rpm ==0.2.2 - - code-page ==0.1.3 + - code-page ==0.2 - codo-notation ==0.5.2 - coercible-utils ==0.0.0 + - co-log ==0.2.0 + - co-log-core ==0.1.1 - colonnade ==1.2.0.1 - colorful-monoids ==0.2.1.2 - colorize-haskell ==1.0.1 @@ -422,14 +431,10 @@ default-package-overrides: - compactmap ==0.1.4.2.1 - compensated ==0.7.2 - compiler-warnings ==0.1.0 - - componentm ==0.0.0.2 - - componentm-devel ==0.0.0.2 - composable-associations ==0.1.0.0 - composable-associations-aeson ==0.1.0.0 - composition ==1.0.2.1 - composition-extra ==2.0.0 - - composition-prelude ==1.5.3.1 - - compressed ==3.11 - concise ==0.1.0.1 - concurrency ==1.6.2.0 - concurrent-extra ==0.7.0.12 @@ -440,13 +445,15 @@ default-package-overrides: - conduit ==1.3.1 - conduit-algorithms ==0.0.8.2 - conduit-combinators ==1.3.0 + - conduit-concurrent-map ==0.1.1 - conduit-connection ==0.1.0.4 - conduit-extra ==1.3.0 - conduit-iconv ==0.1.1.3 - conduit-parse ==0.2.1.0 - conduit-throttle ==0.3.1.0 - - config-ini ==0.2.2.0 - - configuration-tools ==0.3.1 + - conduit-zstd ==0.0.1.1 + - confcrypt ==0.1.0.4 + - configuration-tools ==0.4.0 - configurator ==0.3.0.0 - configurator-export ==0.1.0.1 - connection ==0.2.8 @@ -454,9 +461,7 @@ default-package-overrides: - console-style ==0.0.2.1 - constraint ==0.1.1.1 - constraints ==0.10.1 - - consul-haskell ==0.4.2 - - containers-unicode-symbols ==0.3.1.1 - - contravariant ==1.4.1 + - contravariant ==1.5 - contravariant-extras ==0.3.4 - control-bool ==0.2.1 - control-dsl ==0.2.1.3 @@ -476,7 +481,7 @@ default-package-overrides: - cql-io ==1.0.1.1 - crackNum ==2.3 - credential-store ==0.1.2 - - criterion ==1.4.1.0 + - criterion ==1.5.3.0 - criterion-measurement ==0.1.1.0 - cron ==0.6.1 - crypto-api ==0.13.3 @@ -485,7 +490,7 @@ default-package-overrides: - crypto-cipher-tests ==0.0.11 - crypto-cipher-types ==0.0.9 - cryptocompare ==0.1.1 - - crypto-enigma ==0.0.3.1 + - crypto-enigma ==0.1.1.4 - cryptohash ==0.11.9 - cryptohash-cryptoapi ==0.1.4 - cryptohash-md5 ==0.11.100.1 @@ -495,29 +500,29 @@ default-package-overrides: - cryptonite ==0.25 - cryptonite-conduit ==0.2.2 - cryptonite-openssl ==0.7 - - crypto-numbers ==0.2.7 - - crypto-pubkey ==0.2.8 + - crypto-pubkey-openssh ==0.2.7 - crypto-pubkey-types ==0.4.3 - crypto-random ==0.0.9 - crypto-random-api ==0.2.0 - crypt-sha512 ==0 - - csg ==0.1.0.5 - csp ==1.4.0 - - css-syntax ==0.0.8 + - css-syntax ==0.1.0.0 - css-text ==0.1.3.0 - csv ==0.1.2 - ctrie ==0.2 - cubicbezier ==0.6.0.5 - cubicspline ==0.1.2 - - cue-sheet ==1.0.1 + - cublas ==0.5.0.0 + - cuckoo-filter ==0.2.0.2 + - cuda ==0.10.0.0 + - cue-sheet ==2.0.0 + - cufft ==0.9.0.1 - curl ==1.3.8 - - curl-runnings ==0.6.0 - currencies ==0.2.0.0 - currency ==0.2.0.0 + - cusparse ==0.2.0.0 - cutter ==0.0 - - cyclotomic ==0.5.1 - czipwith ==1.0.1.1 - - darcs ==2.14.1 - data-accessor ==0.2.2.8 - data-accessor-mtl ==0.2.0.4 - data-accessor-template ==0.2.1.16 @@ -525,7 +530,6 @@ default-package-overrides: - data-binary-ieee754 ==0.4.4 - data-bword ==0.1.0.1 - data-checked ==0.3 - - data-clist ==0.1.2.1 - data-default ==0.7.1.1 - data-default-class ==0.1.2.0 - data-default-instances-containers ==0.0.1 @@ -538,7 +542,6 @@ default-package-overrides: - data-endian ==0.1.1 - data-fix ==0.2.0 - data-has ==0.3.0.0 - - data-hash ==0.2.0.1 - data-inttrie ==0.1.4 - data-lens-light ==0.1.2.2 - data-memocombinators ==0.5.1 @@ -549,119 +552,105 @@ default-package-overrides: - data-ref ==0.0.1.2 - data-reify ==0.6.1 - data-serializer ==0.3.4 - - datasets ==0.2.5 - data-textual ==0.3.0.2 - data-tree-print ==0.1.0.2 - dataurl ==0.1.0.0 - DAV ==1.3.3 - - dawg-ord ==0.5.1.0 - dbcleaner ==0.1.3 - - dbus ==1.0.1 + - DBFunctor ==0.1.0.0 + - dbus ==1.2.1 - debian-build ==0.10.1.2 - debug ==0.1.1 - debug-trace-var ==0.2.0 + - decidable ==0.1.4.0 - Decimal ==0.5.1 - declarative ==0.5.2 - deepseq-generics ==0.2.0.0 + - deferred-folds ==0.9.10 - dejafu ==1.11.0.4 + - dense-linear-algebra ==0.1.0.0 - dependent-map ==0.2.4.0 - dependent-sum ==0.4 - dependent-sum-template ==0.0.0.6 - - deque ==0.2.1 + - deque ==0.2.7 + - deriveJsonNoPrefix ==0.1.0.1 - deriving-compat ==0.5.2 - derulo ==1.0.5 - detour-via-sci ==1.0.0 - - df1 ==0.1.1 - - dhall ==1.15.1 - - dhall-bash ==1.0.15 - - dhall-json ==1.2.3 + - dhall ==1.19.1 + - dhall-bash ==1.0.17 + - dhall-json ==1.2.5 - dhall-text ==1.0.14 - - di ==1.0.1 - diagrams ==1.4 - - diagrams-builder ==0.8.0.3 - - diagrams-cairo ==1.4.1 - - diagrams-canvas ==1.4.1 - diagrams-contrib ==1.4.3 - diagrams-core ==1.4.1.1 - - diagrams-gtk ==1.4 - - diagrams-html5 ==1.4.1 - diagrams-lib ==1.4.2.3 - - diagrams-postscript ==1.4.1 - diagrams-rasterific ==1.4.1.1 - diagrams-solve ==0.1.1 - diagrams-svg ==1.4.2 - di-core ==1.0.3 - dictionary-sharing ==0.1.0.0 - - di-df1 ==1.0.2 - Diff ==0.3.4 - digest ==0.0.1.2 - digits ==0.3.1 - - di-handle ==1.0 - - dimensional ==1.1 - - di-monad ==1.0.2 + - di-monad ==1.3 - directory-tree ==0.12.1 - direct-sqlite ==2.3.23 - discount ==0.1.1 - - discrimination ==0.3 - disk-free-space ==0.1.0.1 - distributed-closure ==0.4.1 - - distributed-static ==0.3.8 - - distributive ==0.5.3 + - distribution-opensuse ==1.1.1 + - distributive ==0.6 - dlist ==0.8.0.5 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 - dns ==3.0.4 - - docker ==0.6.0.0 - - dockerfile ==0.1.0.1 + - dockerfile ==0.2.0 - docopt ==0.7.0.5 - doctemplates ==0.2.2.1 - doctest ==0.16.0.1 - - doctest-discover ==0.1.0.9 - - doctest-driver-gen ==0.2.0.4 + - doctest-discover ==0.2.0.0 + - doctest-driver-gen ==0.3.0.0 - do-list ==1.0.1 - dom-parser ==3.1.0 - - dotenv ==0.5.2.5 + - dotenv ==0.8.0.0 + - dotgen ==0.4.2 - dotnet-timespan ==0.0.1.0 - double-conversion ==2.0.2.0 - download ==0.3.2.6 - - drawille ==0.1.2.0 - - DRBG ==0.5.5 - - drifter ==0.2.3 - - drifter-postgresql ==0.2.1 + - drinkery ==0.4 - dsp ==0.2.4.1 - dual-tree ==0.2.2 - dublincore-xml-conduit ==0.1.0.2 - - dunai ==0.4.0.0 + - dunai ==0.5.1 + - dunai-core ==0.5.1.0 + - duration ==0.1.0.0 - dvorak ==0.1.0.0 - dynamic-state ==0.3.1 - dyre ==0.8.12 - - Earley ==0.12.1.0 + - Earley ==0.13.0.0 - easy-file ==0.2.2 - easytest ==0.2.1 - Ebnf2ps ==1.0.15 - echo ==0.1.3 - ed25519 ==0.0.5.0 - - EdisonAPI ==1.3.1 - - EdisonCore ==1.3.2.1 - edit-distance ==0.2.2.1 - edit-distance-vector ==1.0.0.4 - editor-open ==0.6.0.0 - either ==5.0.1 - - either-unwrap ==1.1 - - ekg ==0.4.0.15 + - either-both ==0.1.0.0 - ekg-core ==0.1.1.6 - - ekg-json ==0.1.0.6 - ekg-statsd ==0.2.4.0 - - ekg-wai ==0.1.0.3 - elerea ==2.9.0 - elf ==0.29 - - eliminators ==0.4.1 + - eliminators ==0.5 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 + - emacs-module ==0.1.1 - email-validate ==2.3.2.9 + - emd ==0.1.4.0 - enclosed-exceptions ==1.0.3 - entropy ==0.4.1.4 - - enummapset ==0.5.2.2 - enumset ==0.0.4.1 - enum-subset-generate ==0.1.0.0 - envelope ==0.2.2.0 @@ -669,60 +658,51 @@ default-package-overrides: - epub-metadata ==4.5 - eq ==4.2 - equal-files ==0.0.5.3 - - equivalence ==0.3.3 - erf ==2.0.0.0 - errors ==2.3.0 - errors-ext ==0.4.2 - error-util ==0.0.1.2 - ersatz ==0.4.4 - etc ==0.4.1.0 - - event ==0.1.4 - eventful-core ==0.2.0 - eventful-memory ==0.2.0 - eventful-sql-common ==0.2.0 - eventful-sqlite ==0.2.0 - eventful-test-helpers ==0.2.0 - event-list ==0.1.2 - - eventstore ==1.1.6 + - eventstore ==1.2.0 - every ==0.0.1 - exact-combinatorics ==0.2.0.8 - - exact-pi ==0.4.1.4 + - exact-pi ==0.5.0.1 - exceptional ==0.3.0.0 - - exception-hierarchy ==0.1.0.1 - exception-mtl ==0.4.0.1 - exceptions ==0.10.0 - exception-transformers ==0.4.0.7 - executable-hash ==0.2.0.4 - executable-path ==0.0.3.1 - - exinst ==0.6 + - exit-codes ==1.0.0 - exomizer ==1.0.0 - expiring-cache-map ==0.0.6.1 - explicit-exception ==0.1.9.2 - - exp-pairs ==0.1.6.0 - - extensible ==0.4.9 + - exp-pairs ==0.2.0.0 - extensible-exceptions ==0.1.1.4 - - extra ==1.6.13 + - extra ==1.6.14 - extractable-singleton ==0.0.1 - extrapolate ==0.3.3 - - facts ==0.0.1.0 - fail ==4.9.0.0 - farmhash ==0.1.0.5 - fast-digits ==0.2.1.0 - - fast-logger ==2.4.11 + - fast-logger ==2.4.12 - fast-math ==1.0.2 - - fay ==0.24.0.1 - - fay-base ==0.21.1.0 - - fay-dom ==0.5.0.1 - fb ==1.2.1 - fclabels ==2.0.3.3 - feature-flags ==0.1.0.1 - - fedora-haskell-tools ==0.5.1 + - fedora-haskell-tools ==0.6 - feed ==1.0.1.0 - FenwickTree ==0.1.2.1 - fft ==0.1.8.6 - - fgl ==5.6.0.0 - filecache ==0.4.1 - - file-embed ==0.0.10.1 + - file-embed ==0.0.11 - file-embed-lzma ==0 - filelock ==0.1.1.2 - filemanip ==0.3.6.3 @@ -731,15 +711,15 @@ default-package-overrides: - filter-logger ==0.6.0.0 - filtrable ==0.1.1.0 - fin ==0.0.1 - - Fin ==0.2.6.0 - FindBin ==0.0.5 - - find-clumpiness ==0.2.3.1 - fingertree ==0.1.4.2 - finite-typelits ==0.1.4.2 + - first-class-families ==0.3.0.1 - first-class-patterns ==0.3.2.4 + - fitspec ==0.4.7 - fixed ==0.2.1.1 - fixed-length ==0.2 - - fixed-vector ==1.1.0.0 + - fixed-vector ==1.2.0.0 - fixed-vector-hetero ==0.5.0.0 - flac ==0.1.2 - flac-picture ==0.1.1 @@ -750,8 +730,9 @@ default-package-overrides: - floatshow ==0.2.4 - flow ==1.0.17 - fmlist ==0.9.2 + - fmt ==0.6.1.1 - fn ==0.3.0.2 - - focus ==0.1.5.2 + - focus ==1.0.1.2 - focuslist ==0.1.0.1 - foldable1 ==0.1.0.0 - fold-debounce ==0.2.0.8 @@ -761,78 +742,76 @@ default-package-overrides: - FontyFruity ==0.5.3.4 - force-layout ==0.4.0.6 - foreign-store ==0.2 - - ForestStructures ==0.0.0.2 - forkable-monad ==0.2.0.3 - forma ==1.1.0 - format-numbers ==0.1.0.0 - formatting ==6.3.6 - foundation ==0.0.21 - - free ==5.0.2 + - free ==5.1 - freenect ==1.2.1 - - freer-simple ==1.1.0.0 + - freer-simple ==1.2.1.0 - freetype2 ==0.1.2 - free-vl ==0.1.4 - - friday ==0.2.3.1 - - friday-juicypixels ==0.1.2.4 - friendly-time ==0.4.1 - frisby ==0.2.2 - from-sum ==0.2.1.0 - frontmatter ==0.1.0.2 - fsnotify ==0.3.0.1 - fsnotify-conduit ==0.1.1.1 + - ftp-client ==0.5.1.1 + - ftp-client-conduit ==0.5.0.4 - funcmp ==1.9 - functor-classes-compat ==1 + - fused-effects ==0.1.2.1 - fuzzcheck ==0.1.1 - fuzzy-dates ==0.1.1.1 - - fuzzyset ==0.1.0.6 + - fuzzyset ==0.1.0.8 - gauge ==0.2.4 - gc ==0.0.2 - gd ==3000.7.3 - - gdax ==0.6.0.0 - gdp ==0.0.0.2 - general-games ==1.1.1 - - generic-aeson ==0.2.0.9 - generic-arbitrary ==0.1.0 + - generic-data ==0.3.0.0 - generic-deriving ==1.12.2 - - generic-lens ==1.0.0.2 + - generic-lens ==1.1.0.0 - GenericPretty ==1.2.2 - generic-random ==1.2.0.0 - generics-eot ==0.4 - - generics-sop ==0.3.2.0 + - generics-mrsop ==1.2.2 + - generics-sop ==0.4.0.1 - generics-sop-lens ==0.1.2.1 - - generic-xmlpickler ==0.1.0.5 - - geniplate-mirror ==0.7.6 - - genvalidity ==0.5.1.0 + - genvalidity ==0.7.0.0 - genvalidity-aeson ==0.2.0.2 - - genvalidity-bytestring ==0.2.0.2 - - genvalidity-containers ==0.5.1.0 - - genvalidity-hspec ==0.6.2.0 - - genvalidity-hspec-aeson ==0.3.0.0 - - genvalidity-hspec-binary ==0.2.0.2 - - genvalidity-hspec-cereal ==0.2.0.2 - - genvalidity-hspec-hashable ==0.2.0.2 + - genvalidity-bytestring ==0.3.0.1 + - genvalidity-containers ==0.5.1.1 + - genvalidity-hspec ==0.6.2.1 + - genvalidity-hspec-aeson ==0.3.0.1 + - genvalidity-hspec-binary ==0.2.0.3 + - genvalidity-hspec-cereal ==0.2.0.3 + - genvalidity-hspec-hashable ==0.2.0.3 + - genvalidity-hspec-optics ==0.1.1.1 - genvalidity-path ==0.3.0.2 - - genvalidity-property ==0.2.1.1 + - genvalidity-property ==0.3.0.0 - genvalidity-scientific ==0.2.1.0 - genvalidity-text ==0.5.1.0 - genvalidity-time ==0.2.1.1 - - genvalidity-unordered-containers ==0.2.0.3 + - genvalidity-unordered-containers ==0.2.0.4 - genvalidity-uuid ==0.1.0.2 - genvalidity-vector ==0.2.0.3 - - geodetics ==0.0.6 + - geojson ==3.0.4 - getopt-generics ==0.13.0.3 - ghc-core ==0.5.6 - - ghc-exactprint ==0.5.6.1 + - ghc-exactprint ==0.5.8.2 - ghcid ==0.7.1 - - ghcjs-base-stub ==0.2.0.0 + - ghci-hexcalc ==0.1.0.1 - ghcjs-codemirror ==0.0.0.2 - - ghc-parser ==0.2.0.2 - ghc-paths ==0.1.0.9 - - ghc-prof ==1.4.1.4 + - ghc-prof ==1.4.1.5 - ghc-syntax-highlighter ==0.0.3.0 - ghc-tcplugins-extra ==0.3 - - ghc-typelits-extra ==0.2.6 - - ghc-typelits-knownnat ==0.5.1 + - ghc-typelits-extra ==0.3 + - ghc-typelits-knownnat ==0.6 - ghc-typelits-natnormalise ==0.6.2 - ghost-buster ==0.1.1.0 - gi-atk ==2.0.15 @@ -846,71 +825,62 @@ default-package-overrides: - gi-gtk-hs ==0.3.6.3 - gi-gtksource ==3.0.16 - gi-javascriptcore ==4.0.16 - - gio ==0.13.5.0 + - gingersnap ==0.3.1.0 - gi-pango ==1.0.16 - giphy-api ==0.6.0.1 - - github ==0.19 + - githash ==0.1.3.0 - github-release ==1.2.3 - github-types ==0.2.1 - github-webhooks ==0.10.0 - gitrev ==1.3.1 - - git-vogue ==0.3.0.2 - gi-vte ==2.91.19 - gl ==0.8.0 - - glabrous ==0.3.6 + - glabrous ==1.0.0 - glaze ==0.3.0.1 - glazier ==1.0.0.0 - GLFW-b ==3.2.1.0 - - glib ==0.13.6.0 - Glob ==0.9.3 - - gloss ==1.12.0.0 - - gloss-raster ==1.12.0.0 - - gloss-rendering ==1.12.0.0 + - gloss ==1.13.0.1 + - gloss-algorithms ==1.13.0.1 + - gloss-examples ==1.13.0.2 + - gloss-raster ==1.13.0.2 + - gloss-rendering ==1.13.0.2 - GLURaw ==2.0.0.4 - GLUT ==2.7.0.14 - gnuplot ==0.5.5.3 - goggles ==0.3.2 - - google-oauth2-jwt ==0.3.0 + - google-isbn ==1.0.3 + - google-oauth2-jwt ==0.3.1 - gpolyline ==0.1.0.1 - graph-core ==0.3.0.0 - graphs ==0.7.1 - - graphviz ==2999.20.0.2 - - graph-wrapper ==0.2.5.1 + - graph-wrapper ==0.2.5.2 - gravatar ==0.8.0 - graylog ==0.1.0.1 - greskell ==0.2.2.0 - greskell-core ==0.1.2.4 - greskell-websocket ==0.1.1.2 - groom ==0.1.2.1 - - groundhog ==0.9.0 - - groundhog-inspector ==0.9.0 - - groundhog-mysql ==0.9.0 - - groundhog-postgresql ==0.9.0.1 - - groundhog-sqlite ==0.9.0 - - groundhog-th ==0.9.0.1 + - groundhog ==0.10.0 + - groundhog-mysql ==0.10 + - groundhog-postgresql ==0.10 + - groundhog-sqlite ==0.10.0 - groups ==0.4.1.0 - - gtk ==0.14.10 - - gtk2hs-buildtools ==0.13.4.0 - - gtk3 ==0.14.9 - gym-http-api ==0.1.0.1 - h2c ==1.0.0 - hackage-db ==2.0.1 - hackage-security ==0.5.3.0 - - haddock-library ==1.5.0.1 + - haddock-library ==1.7.0 - hailgun ==0.4.1.8 - - hakyll ==4.12.4.0 - half ==0.3 - hamilton ==0.1.0.3 - hamtsolo ==1.0.3 - HandsomeSoup ==0.4.2 - - handwriting ==0.1.0.3 - - hapistrano ==0.3.7.0 - - happstack-server ==7.5.1.1 + - hapistrano ==0.3.8.0 - happy ==1.19.9 - - hasbolt ==0.1.3.1 - hashable ==1.2.7.0 + - hashable-time ==0.2.0.2 - hashids ==1.0.2.4 - - hashing ==0.1.0.1 - hashmap ==1.3.3 - hashtables ==1.2.3.1 - haskeline ==0.7.4.3 @@ -918,34 +888,22 @@ default-package-overrides: - haskell-gi-base ==0.21.4 - haskell-gi-overloading ==1.0 - haskell-lexer ==1.0.2 - - haskell-lsp ==0.2.2.0 - - haskell-lsp-types ==0.2.2.0 + - haskell-lsp ==0.8.0.1 + - haskell-lsp-types ==0.8.0.1 + - haskell-names ==0.9.4 - HaskellNet ==0.5.1 - - HaskellNet-SSL ==0.3.4.0 - haskell-spacegoo ==0.2.0.1 - haskell-src ==1.0.3.0 - haskell-src-exts ==1.20.3 - - haskell-src-exts-simple ==1.20.0.0 - haskell-src-exts-util ==0.2.4 - haskell-src-meta ==0.8.0.3 - - haskell-tools-ast ==1.1.0.2 - - haskell-tools-backend-ghc ==1.1.0.2 - - haskell-tools-builtin-refactorings ==1.1.0.2 - - haskell-tools-debug ==1.1.0.2 - - haskell-tools-demo ==1.1.0.2 - - haskell-tools-prettyprint ==1.1.0.2 - - haskell-tools-refactor ==1.1.0.2 - - haskell-tools-rewrite ==1.1.0.2 - - haskey ==0.3.0.2 - haskey-btree ==0.3.0.0 - - haskey-mtl ==0.3.1.0 - - haskintex ==0.8.0.0 + - haskoin-core ==0.8.4 - hasql ==1.3.0.3 - hasql-optparse-applicative ==0.3.0.3 - hasql-pool ==0.5 - hasql-transaction ==0.7 - hasty-hamiltonian ==1.3.2 - - HaTeX ==3.19.0.0 - haxl ==2.0.1.1 - hbeanstalk ==0.2.4 - HCodecs ==0.5.1 @@ -956,61 +914,58 @@ default-package-overrides: - heap ==1.0.4 - heaps ==0.3.6 - hebrew-time ==0.1.1 - - hedgehog ==0.6.1 - hedgehog-corpus ==0.1.0 - hedis ==0.10.10 - here ==1.2.13 - heredoc ==0.2.0.0 - - heterocephalus ==1.0.5.2 - hex ==0.1.2 - hexml ==0.3.4 - hexml-lens ==0.2.1 - hexpat ==0.20.13 - hexstring ==0.11.1 + - hformat ==0.3.3.1 - hfsevents ==0.1.6 - hgmp ==0.1.1 - hidapi ==0.1.5 - hidden-char ==0.1.0.2 - - hierarchical-clustering ==0.4.6 - - hierarchy ==1.0.2 - higher-leveldb ==0.5.0.2 - highlighting-kate ==0.6.4 - - hinotify ==0.3.10 - - hint ==0.8.0 - - histogram-fill ==0.9.1.0 + - hinfo ==0.0.3.0 + - hinotify ==0.4 + - hint ==0.9.0 - hjsmin ==0.2.0.2 - hlibgit2 ==0.18.0.16 - hlibsass ==0.1.8.0 - hmatrix ==0.19.0.0 - - hmatrix-backprop ==0.1.2.3 + - hmatrix-backprop ==0.1.2.5 - hmatrix-gsl ==0.19.0.1 - hmatrix-gsl-stats ==0.4.1.7 - hmatrix-morpheus ==0.1.1.2 - - hmatrix-special ==0.19.0.0 - hmatrix-vector-sized ==0.1.1.2 - hmpfr ==0.4.4 + - hoauth2 ==1.8.3 - Hoed ==0.5.1 - - hoopl ==3.10.2.2 - hOpenPGP ==2.7.4.1 - - hopenpgp-tools ==0.21.2 - hopfli ==0.2.2.1 + - hosc ==0.17 - hostname ==1.0 - hostname-validate ==1.0.0 - hourglass ==0.2.12 - hourglass-orphans ==0.1.0.0 - - hp2pretty ==0.8.0.2 - - hpack ==0.28.2 - - HPDF ==1.4.10 - - hpqtypes ==1.5.3.0 - - hprotoc ==2.4.11 - - hquantlib ==0.0.5.0 - - hquantlib-time ==0.0.4.1 + - hp2pretty ==0.9 + - hpack ==0.31.1 + - hpack-dhall ==0.5.1 - hreader ==1.1.0 - hreader-lens ==0.1.3.0 - hruby ==0.3.6 - - hsass ==0.7.0 - - hs-bibutils ==6.6.0.0 + - hsass ==0.8.0 + - hs-bibutils ==6.7.0.0 + - hschema ==0.0.1.1 + - hschema-aeson ==0.0.1.1 + - hschema-prettyprinter ==0.0.1.1 + - hschema-quickcheck ==0.0.1.1 - hscolour ==1.24.4 + - hsdev ==0.3.2.3 - hsdns ==1.7.1 - hsebaysdk ==0.4.0.0 - hsemail ==2 @@ -1020,37 +975,39 @@ default-package-overrides: - hs-functors ==0.1.3.0 - hs-GeoIP ==0.3 - hsini ==0.5.1.2 - - hsinstall ==1.6 + - hsinstall ==2.2 - HSlippyMap ==3.0.1 - hslogger ==1.2.12 - - hslua ==0.9.5.2 - - hslua-aeson ==0.3.0.2 - - hslua-module-text ==0.1.2.1 + - hslua ==1.0.1 + - hslua-aeson ==1.0.0 + - hslua-module-text ==0.2.0 - HsOpenSSL ==0.11.4.15 - HsOpenSSL-x509-system ==0.1.0.3 - hsp ==0.10.0 - - hspec ==2.5.5 + - hspec ==2.6.0 - hspec-attoparsec ==0.1.0.2 - hspec-checkers ==0.1.0.2 - - hspec-contrib ==0.5.0 - - hspec-core ==2.5.5 - - hspec-discover ==2.5.5 + - hspec-contrib ==0.5.1 + - hspec-core ==2.6.0 + - hspec-discover ==2.6.0 - hspec-expectations ==0.8.2 - hspec-expectations-lifted ==0.10.0 - hspec-expectations-pretty-diff ==0.7.2.4 - hspec-golden-aeson ==0.7.0.0 - - hspec-megaparsec ==1.0.0 - - hspec-meta ==2.4.6 + - hspec-leancheck ==0.0.3 + - hspec-megaparsec ==2.0.0 + - hspec-meta ==2.6.0 + - hspec-need-env ==0.1.0.2 - hspec-pg-transact ==0.1.0.2 - hspec-smallcheck ==0.5.2 - hspec-wai ==0.9.0 - hspec-wai-json ==0.9.0 + - hs-php-session ==0.0.9.3 - hstatsd ==0.1 - HStringTemplate ==0.8.7 - HSvm ==0.1.0.3.22 - - hsx-jmacro ==7.3.8.1 + - HsYAML ==0.1.1.2 - hsyslog ==5.0.1 - - hsyslog-udp ==0.2.4 - htaglib ==1.2.0 - HTF ==0.13.2.5 - html ==1.0.1.2 @@ -1061,12 +1018,11 @@ default-package-overrides: - htoml ==1.0.0.3 - HTTP ==4000.3.12 - http2 ==1.6.4 - - http-api-data ==0.3.8.1 + - http-api-data ==0.4 - http-client ==0.5.14 - - http-client-openssl ==0.2.2.0 - http-client-tls ==0.3.5.3 - http-common ==0.8.2.0 - - http-conduit ==2.3.2 + - http-conduit ==2.3.4 - http-date ==0.0.8 - httpd-shed ==0.4.0.3 - http-link-header ==1.0.3.1 @@ -1083,31 +1039,30 @@ default-package-overrides: - hw-balancedparens ==0.2.0.2 - hw-bits ==0.7.0.5 - hw-conduit ==0.2.0.5 + - hw-conduit-merges ==0.2.0.0 - hw-diagnostics ==0.0.0.5 - hweblib ==0.6.3 + - hw-eliasfano ==0.1.0.1 - hw-excess ==0.2.0.2 - hw-fingertree-strict ==0.1.1.1 - - hw-hedgehog ==0.1.0.2 - - hw-hspec-hedgehog ==0.1.0.5 - hw-int ==0.0.0.3 - - hw-ip ==0.1.0.0 - - hw-json ==0.6.0.0 + - hw-ip ==2.0.0.0 + - hw-json ==0.9.0.1 - hw-mquery ==0.1.0.1 - - hworker ==0.1.0.1 - - hw-parser ==0.0.0.3 + - hw-packed-vector ==0.0.0.1 + - hw-parser ==0.1.0.0 - hw-prim ==0.6.2.22 - - hw-rankselect ==0.10.0.3 + - hw-rankselect ==0.12.0.4 - hw-rankselect-base ==0.3.2.1 + - hw-streams ==0.0.0.8 - hw-string-parse ==0.0.0.4 - hw-succinct ==0.1.0.1 - - hw-xml ==0.1.0.3 - hxt ==9.3.1.16 - hxt-charproperties ==9.2.0.1 - hxt-css ==0.1.0.3 - hxt-curl ==9.1.1.1 - hxt-expat ==9.1.1 - hxt-http ==9.1.5.2 - - hxt-pickle-utils ==0.1.0.3 - hxt-regex-xmlschema ==9.2.0.3 - hxt-tagsoup ==9.1.4 - hxt-unicode ==9.0.2.4 @@ -1120,9 +1075,7 @@ default-package-overrides: - ieee754 ==0.8.0 - if ==0.1.0.0 - iff ==0.0.6 - - ihaskell ==0.9.1.0 - - ihaskell-hvega ==0.1.0.3 - - ihs ==0.1.0.2 + - ihs ==0.1.0.3 - ilist ==0.3.1.0 - imagesize-conduit ==1.1 - Imlib ==0.1.2 @@ -1133,14 +1086,15 @@ default-package-overrides: - indentation-parsec ==0.0.0.2 - indents ==0.5.0.0 - indexed-list-literals ==0.2.1.2 - - inflections ==0.4.0.3 + - infer-license ==0.2.0 + - inflections ==0.4.0.4 - influxdb ==1.6.1 - ini ==0.3.6 - - inline-c ==0.6.1.0 - - inline-java ==0.8.4 + - inline-c ==0.7.0.1 + - inline-c-cpp ==0.3.0.1 - inliterate ==0.1.0 - insert-ordered-containers ==0.2.1.0 - - inspection-testing ==0.2.0.1 + - inspection-testing ==0.4.1.1 - instance-control ==0.1.2.0 - integer-logarithms ==1.0.2.2 - integration ==0.2.1 @@ -1148,13 +1102,14 @@ default-package-overrides: - interpolate ==0.2.0 - interpolatedstring-perl6 ==1.0.1 - interpolation ==0.1.0.3 + - interpolator ==0.1.1 - IntervalMap ==0.6.1.0 - intervals ==0.8.1 - - intro ==0.3.2.0 + - intro ==0.5.2.1 + - intset-imperative ==0.1.0.0 - invariant ==0.5.1 - invertible ==0.2.0.5 - - invertible-grammar ==0.1.1 - - io-choice ==0.0.6 + - io-choice ==0.0.7 - io-machine ==0.2.0.0 - io-manager ==0.1.0.2 - io-memoize ==1.1.1.0 @@ -1162,17 +1117,15 @@ default-package-overrides: - io-storage ==0.3 - io-streams ==1.5.0.1 - io-streams-haproxy ==1.0.0.2 - - ip ==1.3.0 + - ip ==1.4.1 - ip6addr ==1.0.0 - - iproute ==1.7.6 + - iproute ==1.7.7 - IPv6Addr ==1.1.1 - - IPv6DB ==0.3.1 - ipython-kernel ==0.9.1.0 - irc ==0.6.1.0 - irc-client ==1.1.0.5 - irc-conduit ==0.3.0.1 - irc-ctcp ==0.1.3.0 - - irc-dcc ==2.0.1 - islink ==0.1.0.0 - iso3166-country-codes ==0.20140203.8 - iso639 ==0.1.0.3 @@ -1181,36 +1134,32 @@ default-package-overrides: - ixset-typed ==0.4.0.1 - ix-shapable ==0.1.0 - jack ==0.7.1.4 - - jmacro ==0.6.15 - - jmacro-rpc ==0.3.3 - - jmacro-rpc-snap ==0.3 - - jni ==0.6.1 - - jose ==0.7.0.0 - - jose-jwt ==0.7.8 + - jose ==0.8.0.0 + - jose-jwt ==0.8.0 - js-flot ==0.8.3 - js-jquery ==3.3.1 - - json ==0.9.2 + - json ==0.9.3 + - json-alt ==1.0.0 - json-feed ==1.0.5 + - json-rpc ==1.0.0 - json-rpc-client ==0.2.5.0 - json-rpc-generic ==0.2.1.5 - json-rpc-server ==0.2.6.0 - - json-schema ==0.7.4.2 - - JuicyPixels ==3.2.9.5 - - JuicyPixels-blp ==0.1.1.0 - - JuicyPixels-extra ==0.3.0 + - JuicyPixels ==3.3.3 + - JuicyPixels-extra ==0.4.0 - JuicyPixels-scale-dct ==0.1.2 - justified-containers ==0.3.0.0 - - jvm ==0.4.2 - - jvm-batching ==0.1.1 - - jvm-streaming ==0.3.1 - - jwt ==0.7.2 - kan-extensions ==5.2 - kanji ==3.4.0 - - kansas-comet ==0.4 + - katip ==0.7.0.0 - kawhi ==0.3.0 + - kazura-queue ==0.1.0.4 - kdt ==0.2.4 - keycode ==0.2.2 - keys ==3.12.1 + - kind-apply ==0.3.0.0 + - kind-generics ==0.3.0.0 + - kind-generics-th ==0.1.0.0 - kleene ==0 - kmeans ==0.1.3 - koofr-client ==1.0.0.3 @@ -1218,66 +1167,64 @@ default-package-overrides: - l10n ==0.1.0.1 - labels ==0.3.3 - lackey ==1.0.7 - - LambdaHack ==0.8.3.0 - lame ==0.1.1 - language-c ==0.8.2 - language-c-quote ==0.12.2 - - language-docker ==6.0.4 + - language-docker ==8.0.0 - language-ecmascript ==0.19 - language-haskell-extract ==0.2.4 - language-java ==0.2.9 - language-javascript ==0.6.0.11 - - language-puppet ==1.3.20.1 - - lapack-carray ==0.0.2 + - language-puppet ==1.4.2 - lapack-ffi ==0.0.2 - lapack-ffi-tools ==0.1.1 - - large-hashable ==0.1.0.4 - largeword ==1.2.5 - latex ==0.1.0.4 - lattices ==1.7.1.1 - lawful ==0.1.0.0 - lazyio ==0.1.0.4 - lca ==0.3.1 - - leancheck ==0.7.7 + - leancheck ==0.8.0 + - leancheck-instances ==0.0.1 - leapseconds-announced ==2017.1.0.1 - - learn-physics ==0.6.3 - - lens ==4.16.1 + - lens ==4.17 - lens-action ==0.2.3 - lens-aeson ==1.0.2 - lens-datetime ==0.3 - lens-family ==1.2.3 - lens-family-core ==1.2.3 - lens-family-th ==0.5.0.2 - - lens-labels ==0.2.0.2 + - lens-labels ==0.3.0.1 - lens-misc ==0.0.2.0 - lens-properties ==4.11.1 - lens-regex ==0.1.0 - lens-simple ==0.1.0.9 + - lens-typelevel ==0.1.1.0 - lenz ==0.3.0.0 - leveldb-haskell ==0.6.5 - libffi ==0.1 - libgit ==0.3.1 - libgraph ==1.14 - libmpd ==0.9.0.9 - - libxml-sax ==0.7.5 + - libraft ==0.1.1.0 + - libyaml ==0.1.0.0 - LibZip ==1.0.1 - lifted-async ==0.10.0.3 - lifted-base ==0.2.3.12 - lift-generics ==0.1.2 - line ==4.0.1 - linear ==1.20.8 - - linked-list-with-iterator ==0.1.1.0 - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.3.0 - List ==0.6.2 - ListLike ==4.6 - listsafe ==0.1.0.1 - - list-t ==1.0.1 - - llvm-hs ==6.3.0 - - llvm-hs-pretty ==0.5.0.0 - - llvm-hs-pure ==6.2.1 + - list-t ==1.0.2 + - ListTree ==0.2.3 + - llvm-hs-pure ==7.0.0 - lmdb ==0.2.5 - load-env ==0.2.0.2 + - loc ==0.1.3.4 - locators ==0.2.4.4 - loch-th ==0.2.2 - lockfree-queue ==0.2.3.1 @@ -1289,38 +1236,35 @@ default-package-overrides: - logging-facade ==0.3.0 - logging-facade-syslog ==1 - logict ==0.6.0.2 - - log-postgres ==0.7.0.2 - long-double ==0.1 - loop ==0.3.0 - - lrucache ==1.2.0.1 - lrucaching ==0.3.3 + - lsp-test ==0.5.0.2 - lucid ==2.9.11 - lucid-extras ==0.1.0.1 - lxd-client-config ==0.1.0.1 - - lz4 ==0.2.3.1 - lzma ==0.0.0.3 - lzma-conduit ==1.2.1 - machines ==0.6.4 - machines-binary ==0.3.0.3 - machines-directory ==0.2.1.0 - machines-io ==0.2.0.13 - - magicbane ==0.3.0 - mainland-pretty ==0.7 - - main-tester ==0.1.0.0 + - main-tester ==0.2.0.0 - makefile ==1.1.0.0 - managed ==1.0.6 - mapquest-api ==0.3.1 - markdown ==0.1.17.4 - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 - - marvin-interpolate ==1.1.2 - massiv ==0.2.5.0 - massiv-io ==0.1.4.0 - mathexpr ==0.3.0.0 - - math-functions ==0.2.1.0 + - math-functions ==0.3.1.0 - matrices ==0.4.5 - matrix ==0.3.6.1 - matrix-market-attoparsec ==0.1.0.8 + - matrix-static ==0.2 - maximal-cliques ==0.1.1 - mbox ==0.3.4 - mbox-utility ==0.0.1 @@ -1328,66 +1272,62 @@ default-package-overrides: - mbug ==1.3 - mcmc-types ==1.0.3 - median-stream ==0.7.0.0 - - med-module ==0.1.1 - - megaparsec ==6.5.0 - - mega-sdist ==0.3.3.1 + - megaparsec ==7.0.4 + - mega-sdist ==0.3.3.2 - memory ==0.14.18 - MemoTrie ==0.6.9 - mercury-api ==0.1.0.1 + - merkle-tree ==0.1.1 - mersenne-random-pure64 ==0.2.2.0 - - messagepack ==0.5.4 - - messagepack-rpc ==0.5.1 - metrics ==0.4.1.1 - mfsolve ==0.3.2.0 - microformats2-parser ==1.0.1.9 - - microlens ==0.4.9.1 + - microlens ==0.4.10 - microlens-aeson ==2.3.0 - microlens-contra ==0.1.0.2 - - microlens-ghc ==0.4.9.1 + - microlens-ghc ==0.4.10 - microlens-mtl ==0.1.11.1 - - microlens-platform ==0.3.10 + - microlens-platform ==0.3.11 - microlens-th ==0.4.2.3 - - microspec ==0.1.0.0 + - microspec ==0.2.1.3 - microstache ==1.0.1.1 + - midair ==0.2.0.1 - midi ==0.2.2.2 - mighty-metropolis ==1.2.0 - - milena ==0.5.2.3 - mime-mail ==0.4.14 - mime-mail-ses ==0.4.1 - mime-types ==0.1.0.8 - - minimorph ==0.1.6.1 + - minimorph ==0.2.1.0 - minio-hs ==1.2.0 - - minisat-solver ==0.1 - - miniutter ==0.4.7.0 + - miniutter ==0.5.0.0 - mintty ==0.1.2 - miso ==0.21.2.0 - missing-foreign ==0.1.1 - MissingH ==1.4.1.0 - mixed-types-num ==0.3.1.5 + - mixpanel-client ==0.1.1 - mltool ==0.2.0.1 - mmap ==0.5.9 - - mmark ==0.0.5.6 - - mmark-cli ==0.0.3.0 + - mmark ==0.0.6.0 + - mmark-cli ==0.0.5.0 - mmark-ext ==0.2.1.1 - mmorph ==1.1.2 - mnist-idx ==0.1.2.8 - mockery ==0.3.5 - - modern-uri ==0.2.2.0 - - moesocks ==1.0.0.44 + - modern-uri ==0.3.0.1 + - modular ==0.1.0.8 - monad-control ==1.0.2.3 - monad-control-aligned ==0.0.1.1 - monad-coroutine ==0.9.0.4 - monad-extras ==0.6.0 - monadic-arrays ==0.2.2 - monad-journal ==0.8.1 - - monadlist ==0.0.2 - monad-logger ==0.3.30 - monad-logger-json ==0.1.0.0 - monad-logger-prefix ==0.1.10 - monad-logger-syslog ==0.1.4.0 - monad-loops ==0.4.3 - - monad-memo ==0.4.1 - - monad-metrics ==0.2.1.2 + - monad-memo ==0.5.1 - monad-par ==0.3.4.8 - monad-parallel ==0.7.2.3 - monad-par-extras ==0.3.3 @@ -1395,7 +1335,6 @@ default-package-overrides: - monad-products ==4.0.1 - MonadPrompt ==1.0.0.5 - MonadRandom ==0.5.1.1 - - monad-recorder ==0.1.1 - monad-skeleton ==0.1.5 - monad-st ==0.2.4.1 - monads-tf ==0.1.0.3 @@ -1403,36 +1342,35 @@ default-package-overrides: - monad-unlift ==0.2.0 - monad-unlift-ref ==0.2.1 - mongoDB ==2.4.0.0 - - monoidal-containers ==0.3.1.0 + - monoidal-containers ==0.4.0.0 - monoid-extras ==0.5 - monoid-subclasses ==0.4.6.1 - monoid-transformer ==0.0.4 - - mono-traversable ==1.0.9.0 + - mono-traversable ==1.0.10.0 - mono-traversable-instances ==0.1.0.0 - - morte ==1.6.20 - mountpoints ==1.0.2 - - mstate ==0.2.7 - mtl ==2.2.2 - mtl-compat ==0.2.1.3 - mtl-prelude ==2.0.3.1 - multiarg ==0.30.0.10 - multimap ==1.2.1 - multipart ==0.1.3 - - multistate ==0.8.0.1 + - multiset ==0.3.4.1 + - murmur3 ==1.0.3 - murmur-hash ==0.1.0.9 - MusicBrainz ==0.4.1 - mustache ==2.3.0 - mutable-containers ==0.3.4 - mwc-probability ==2.0.4 - mwc-probability-transition ==0.4 - - mwc-random ==0.13.6.0 + - mwc-random ==0.14.0.0 - mysql ==0.1.6 - - mysql-haskell ==0.8.3.0 + - mysql-haskell ==0.8.4.1 - mysql-haskell-nem ==0.1.0.0 - - mysql-haskell-openssl ==0.8.3.0 - mysql-simple ==0.4.5 + - n2o ==0.11.1 - nagios-check ==0.3.2 - - named ==0.1.0.0 + - named ==0.2.0.0 - names-th ==0.3.0.0 - nano-erl ==0.1.0.1 - nanospec ==0.2.2 @@ -1441,15 +1379,14 @@ default-package-overrides: - natural-sort ==0.1.2 - natural-transformation ==0.4 - ndjson-conduit ==0.1.0.5 - - neat-interpolation ==0.3.2.2 - - netlib-carray ==0.0.1.1 + - neat-interpolation ==0.3.2.4 - netlib-ffi ==0.1 - netpbm ==1.0.2 - nettle ==0.3.0 - netwire ==5.0.3 - netwire-input ==0.0.7 - netwire-input-glfw ==0.0.10 - - network ==2.6.3.6 + - network ==2.8.0.0 - network-anonymous-i2p ==0.10.0 - network-anonymous-tor ==0.11.0 - network-attoparsec ==0.12.2 @@ -1458,18 +1395,15 @@ default-package-overrides: - network-house ==0.1.0.2 - network-info ==0.2.0.10 - network-ip ==0.3.0.2 + - network-messagepack-rpc ==0.1.1.0 - network-multicast ==0.2.0 - - Network-NineP ==0.4.3 - network-simple ==0.4.3 - network-simple-tls ==0.3.1 - network-transport ==0.5.2 - network-transport-composed ==0.2.1 - - network-transport-inmemory ==0.5.2 - - network-transport-tests ==0.2.4.2 - network-uri ==2.6.1.0 - newtype ==0.2 - newtype-generics ==0.5.3 - - next-ref ==0.1.0.2 - nicify-lib ==1.0.1 - NineP ==0.0.2.1 - nix-paths ==1.0.1 @@ -1477,38 +1411,35 @@ default-package-overrides: - nonce ==1.0.7 - nondeterminism ==1.4 - non-empty ==0.3.0.1 + - nonempty-containers ==0.1.1.0 + - nonemptymap ==0.0.6.0 - non-empty-sequence ==0.2.0.2 - non-negative ==0.1.2 - - not-gloss ==0.7.7.0 + - nowdoc ==0.1.1.0 + - nqe ==0.6.1 - nsis ==0.3.2 - numbers ==3000.2.0.2 - numeric-extras ==0.1 - numeric-prelude ==0.4.3.1 - - numhask ==0.2.3.1 - - numhask-prelude ==0.1.0.1 - - numhask-range ==0.2.3.1 - - numhask-test ==0.1.0.0 - NumInstances ==1.4 - numtype-dk ==0.5.0.2 - - nvim-hs ==1.0.0.3 - - nvim-hs-contrib ==1.0.0.0 + - nuxeo ==0.3.2 + - nvvm ==0.9.0.0 - oauthenticated ==0.2.1.0 - - objective ==1.1.2 - ObjectName ==1.1.0.1 - - o-clock ==1.0.0.1 + - oblivious-transfer ==0.1.0 - odbc ==0.2.2 - oeis ==0.3.9 - ofx ==0.4.2.0 - old-locale ==1.0.0.7 - old-time ==1.1.0.3 - - om-elm ==1.0.0.3 - - once ==0.2 + - once ==0.4 - one-liner ==1.0 - one-liner-instances ==0.1.2.1 - OneTuple ==0.2.2 - - online ==0.3.0.0 - Only ==0.1 - oo-prototypes ==0.1.0.0 + - opaleye ==0.6.7003.1 - OpenAL ==1.7.0.4 - open-browser ==0.2.1.0 - openexr-write ==0.1.0.2 @@ -1528,31 +1459,33 @@ default-package-overrides: - optparse-simple ==0.1.0 - optparse-text ==0.1.1.0 - overhang ==1.0.0 - - packcheck ==0.3.1 - - packdeps ==0.4.5 + - packcheck ==0.4.1 - pager ==0.1.1.0 - pagination ==0.2.1 - - palette ==0.3.0.1 - - pandoc ==2.2.1 - - pandoc-citeproc ==0.14.8.1 + - pairing ==0.1.4 + - pandoc ==2.5 + - pandoc-citeproc ==0.15.0.1 + - pandoc-pyplot ==1.0.3.0 - pandoc-types ==1.17.5.4 - - pango ==0.13.5.0 - - papillon ==0.1.0.6 - parallel ==3.2.2.0 - parallel-io ==0.3.3 + - paripari ==0.6.0.0 - parseargs ==0.2.0.8 - parsec ==3.1.13.0 + - parsec-class ==1.0.0.0 + - parsec-numbers ==0.1.0 - parsec-numeric ==0.1.0.0 - ParsecTools ==0.0.2.0 - parser-combinators ==1.0.0 - parsers ==0.12.9 - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.2.1 - - partial-order ==0.1.2.1 + - partial-semigroup ==0.5.0.0 - path ==0.6.1 - path-extra ==0.2.0 - - path-io ==1.3.3 + - path-io ==1.4.1 - path-pieces ==0.2.1 + - path-text-utf8 ==0.0.1.2 - pathtype ==0.8.1 - pathwalk ==0.3.1.2 - pattern-arrows ==0.0.2 @@ -1564,25 +1497,24 @@ default-package-overrides: - pcre-utils ==0.1.8.1.1 - pdfinfo ==1.5.4 - peano ==0.1.0.1 + - pedersen-commitment ==0.2.0 - pem ==0.2.4 - - perf ==0.4.1.0 + - percent-format ==0.0.1 - perfect-hash-generator ==0.2.0.6 + - persist ==0.1.1.0 - persistable-record ==0.6.0.4 - persistable-types-HDBC-pg ==0.0.3.5 - - persistent ==2.8.2 + - persistent ==2.9.0 - persistent-iproute ==0.2.3 - - persistent-mysql ==2.8.1 - - persistent-mysql-haskell ==0.4.2 - - persistent-postgresql ==2.8.2.0 - - persistent-refs ==0.4 - - persistent-sqlite ==2.8.2 + - persistent-mysql ==2.9.0 + - persistent-mysql-haskell ==0.5.0 + - persistent-postgresql ==2.9.0 + - persistent-sqlite ==2.9.1 - persistent-template ==2.5.4 - pgp-wordlist ==0.1.0.2 - pg-transact ==0.1.0.1 - phantom-state ==0.2.1.2 - - picosat ==0.1.5 - pid1 ==0.1.2.0 - - pinboard ==0.9.12.11 - pipes ==4.3.9 - pipes-aeson ==0.4.1.8 - pipes-attoparsec ==0.5.1.5 @@ -1600,12 +1532,10 @@ default-package-overrides: - pipes-network ==0.6.5 - pipes-network-tls ==0.3 - pipes-parse ==3.0.8 - - pipes-random ==1.0.0.4 - - pipes-safe ==2.2.9 + - pipes-safe ==2.3.1 - pipes-wai ==3.2.0 - pkcs10 ==0.2.0.0 - placeholders ==0.1 - - plot-light ==0.4.3 - plotlyhs ==0.2.1 - pointed ==5.0.1 - pointedlist ==0.6.1 @@ -1613,24 +1543,22 @@ default-package-overrides: - poll ==0.0.0.1 - poly-arity ==0.1.0 - polynomials-bernstein ==1.1.2 - - polyparse ==1.12 + - polyparse ==1.12.1 - pooled-io ==0.0.2.2 - - portable-lines ==0.1 + - port-utils ==0.2.0.0 + - posix-paths ==0.2.1.6 - postgresql-binary ==0.12.1.2 - postgresql-libpq ==0.9.4.2 - postgresql-schema ==0.1.14 - - postgresql-simple ==0.5.4.0 - - postgresql-simple-migration ==0.1.13.0 + - postgresql-simple ==0.6 - postgresql-simple-queue ==1.0.1 - postgresql-simple-url ==0.2.1.0 - postgresql-transactional ==1.1.1 - - postgresql-typed ==0.5.3.0 - post-mess-age ==0.2.1.0 - pptable ==0.3.0.0 - pqueue ==1.4.1.2 - prefix-units ==0.2.0 - prelude-compat ==0.0.0.1 - - prelude-extras ==0.4.0.3 - prelude-safeenum ==0.1.1.2 - present ==4.1.0 - prettyclass ==1.0.0.0 @@ -1641,98 +1569,101 @@ default-package-overrides: - prettyprinter-compat-annotated-wl-pprint ==1 - prettyprinter-compat-ansi-wl-pprint ==1.0.1 - prettyprinter-compat-wl-pprint ==1.0.0.1 - - prettyprinter-convert-ansi-wl-pprint ==1.1 - - pretty-show ==1.7 - - pretty-simple ==2.1.0.1 + - pretty-show ==1.9.4 + - pretty-simple ==2.2.0.1 + - pretty-sop ==0.2.0.2 - pretty-types ==0.2.3.1 - primes ==0.2.1.0 - - primitive ==0.6.3.0 + - primitive ==0.6.4.0 - prim-uniq ==0.1.0.1 - probability ==0.2.5.2 - process-extras ==0.7.4 - product-isomorphic ==0.0.3.3 - product-profunctors ==0.10.0.0 - profiterole ==0.1 - - profunctors ==5.2.2 + - profunctors ==5.3 - projectroot ==0.2.0.1 - project-template ==0.2.0.1 - - prometheus-client ==0.3.0 + - prometheus-client ==1.0.0 - promises ==0.3 - prompt ==0.1.1.2 - protobuf ==0.2.1.2 - protobuf-simple ==0.1.1.0 - - protocol-buffers ==2.4.11 - - protocol-buffers-descriptor ==2.4.11 + - protocol-buffers ==2.4.12 + - protocol-buffers-descriptor ==2.4.12 - protocol-radius ==0.0.1.1 - protocol-radius-test ==0.0.1.0 - - proto-lens ==0.3.1.0 - - proto-lens-arbitrary ==0.1.2.2 - - proto-lens-combinators ==0.1.0.11 + - proto-lens ==0.4.0.1 + - proto-lens-arbitrary ==0.1.2.5 + - proto-lens-combinators ==0.4.0.1 - proto-lens-optparse ==0.1.1.4 - - proto-lens-protobuf-types ==0.3.0.1 - - proto-lens-protoc ==0.3.1.2 - - protolude ==0.2.2 + - proto-lens-protobuf-types ==0.4.0.1 + - proto-lens-protoc ==0.4.0.2 + - proto-lens-runtime ==0.4.0.2 + - proto-lens-setup ==0.4.0.1 + - protolude ==0.2.3 - proxied ==0.3 - psql-helpers ==0.1.0.0 - psqueues ==0.2.7.0 - - publicsuffix ==0.20180513 - pureMD5 ==2.1.3 - purescript-bridge ==0.13.0.0 - pure-zlib ==0.6.4 - pushbullet-types ==0.4.1.0 + - pusher-http-haskell ==1.5.1.6 + - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.0.0 - qnap-decrypt ==0.3.3 + - quadratic-irrational ==0.0.6 - QuasiText ==0.1.2.6 - quickbench ==1.0 - - QuickCheck ==2.11.3 + - QuickCheck ==2.12.6.1 - quickcheck-arbitrary-adt ==0.3.1.0 - quickcheck-assertions ==0.3.0 - quickcheck-instances ==0.3.19 - quickcheck-io ==0.2.0 - quickcheck-simple ==0.1.0.4 - quickcheck-special ==0.1.0.6 + - quickcheck-state-machine ==0.4.3 - quickcheck-text ==0.1.2.1 - quickcheck-unicode ==1.0.1.0 - - quicklz ==1.5.0.11 - rainbow ==0.30.0.2 - rainbox ==0.20.0.0 - - rakuten ==0.1.1.5 - ramus ==0.1.2 + - rando ==0.0.0.4 - random ==1.1 - random-bytestring ==0.1.3.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 ==0.2.1.1 - range-set-list ==0.1.3 - rank1dynamic ==0.4.0 - - rank2classes ==1.1.0.1 - - Rasterific ==0.7.4 + - rank2classes ==1.2 + - Rasterific ==0.7.4.2 - rasterific-svg ==0.3.3.2 - ratel ==1.0.7 - ratel-wai ==1.0.4 - - ratio-int ==0.1.2 - - rattletrap ==4.1.2 + - rattletrap ==6.0.2 - rawfilepath ==0.2.4 - rawstring-qm ==0.2.3.0 - raw-strings-qq ==1.1 - rcu ==0.2.3 - - rdf ==0.1.0.2 - - rdtsc ==1.3.0.1 - - re2 ==0.2 + - re2 ==0.3 - readable ==0.3.1 - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 - - rebase ==1.2.4 + - rebase ==1.3 - record-dot-preprocessor ==0.1.4 - - recursion-schemes ==5.0.3 + - records-sop ==0.1.0.2 + - recursion-schemes ==5.1 - reducers ==3.12.3 - refact ==0.3.0.2 - references ==0.3.3.1 - - ref-fd ==0.4.0.1 - - refined ==0.2.3.0 + - refined ==0.3.0.0 - reflection ==2.1.4 - RefSerialize ==0.4.0 + - regex ==1.0.2.0 - regex-applicative ==0.3.3 - regex-applicative-text ==0.1.0.1 - regex-base ==0.93.2 @@ -1744,41 +1675,43 @@ default-package-overrides: - regex-posix ==0.95.2 - regex-tdfa ==1.2.3.1 - regex-tdfa-text ==1.0.0.3 + - regex-with-pcre ==1.0.2.0 + - registry ==0.1.2.2 - reinterpret-cast ==0.1.0 + - relapse ==1.0.0.0 - relational-query ==0.12.1.0 - relational-query-HDBC ==0.7.1.1 - relational-record ==0.2.2.0 - relational-schemas ==0.1.6.2 - - relude ==0.1.1 + - relude ==0.4.0 - renderable ==0.2.0.1 - repa ==3.4.1.4 - - repline ==0.1.7.0 - - req ==1.1.0 + - repa-algorithms ==3.4.1.3 + - repa-io ==3.4.1.1 + - repline ==0.2.0.0 + - req ==1.2.1 - req-conduit ==1.0.0 - - require ==0.2.1 - req-url-extra ==0.1.0.0 - - reroute ==0.5.0.0 - - resolv ==0.1.1.2 + - rerebase ==1.3 - resource-pool ==0.2.3.2 - resourcet ==1.2.2 - - rest-stringmap ==0.2.0.7 - result ==0.2.6.0 - rethinkdb-client-driver ==0.0.25 - retry ==0.7.7.0 - rev-state ==0.1.2 + - rfc1751 ==0.1.2 - rfc5051 ==0.1.0.4 - - rhine ==0.4.0.1 - - riak ==1.1.2.5 - - riak-protobuf ==0.23.0.0 - rio ==0.1.6.0 - rio-orphans ==0.1.1.0 - rng-utils ==0.3.0 + - roc-id ==0.1.0.0 + - rocksdb-haskell ==1.0.1 + - rocksdb-query ==0.2.0 - roles ==0.2.0.0 - rosezipper ==0.2 - rot13 ==0.2.0.1 - rounded ==0.1.0.1 - RSA ==2.3.0 - - rss-conduit ==0.4.2.2 - runmemo ==1.0.0.1 - rvar ==0.2.0.3 - s3-signer ==0.5.0.0 @@ -1788,23 +1721,21 @@ default-package-overrides: - safe-exceptions-checked ==0.1.0 - safe-foldable ==0.1.0.0 - safeio ==0.0.5.0 - - safe-money ==0.6 - SafeSemaphore ==0.10.1 + - salak ==0.1.4 - saltine ==0.1.0.2 - salve ==1.0.6 - sample-frame ==0.0.3 - sample-frame-np ==0.0.4.1 - sampling ==0.3.3 - - sandi ==0.4.3 - sandman ==0.2.0.1 - say ==0.1.0.1 - - sbp ==2.3.17 - - sbv ==7.12 - - scalendar ==1.2.0 - - SCalendar ==1.1.0 + - sbp ==2.4.0 + - sbv ==7.13 - scalpel ==0.5.1 - scalpel-core ==0.5.1 - - scanner ==0.2 + - scanf ==0.1.0.0 + - scanner ==0.3 - scientific ==0.3.6.2 - scotty ==0.11.2 - scrypt ==0.5.0 @@ -1813,72 +1744,72 @@ default-package-overrides: - sdl2-image ==2.0.0 - sdl2-mixer ==1.1.0 - sdl2-ttf ==2.1.0 - - search-algorithms ==0.3.0 + - secp256k1-haskell ==0.1.4 - securemem ==0.1.10 - - SegmentTree ==0.3 - - selda ==0.2.0.0 - - selda-postgresql ==0.1.7.2 - - selda-sqlite ==0.1.6.0 + - selda ==0.3.4.0 + - selda-postgresql ==0.1.7.3 + - selda-sqlite ==0.1.6.1 - semigroupoid-extras ==5 - - semigroupoids ==5.2.2 + - semigroupoids ==5.3.1 - semigroups ==0.18.5 + - semirings ==0.2.1.1 - semiring-simple ==1.0.0.1 - semver ==0.3.3.1 - sendfile ==0.7.9 - seqalign ==0.2.0.4 - serf ==0.1.1.0 - - servant ==0.14.1 + - serialise ==0.2.1.0 + - servant ==0.15 - servant-auth ==0.3.2.0 - servant-auth-client ==0.3.3.0 - servant-auth-docs ==0.2.10.0 - - servant-auth-server ==0.4.0.1 + - servant-auth-server ==0.4.2.0 - servant-auth-swagger ==0.2.10.0 - servant-blaze ==0.8 - servant-cassava ==0.10 - servant-checked-exceptions ==2.0.0.0 - servant-checked-exceptions-core ==2.0.0.0 - - servant-client ==0.14 - - servant-client-core ==0.14.1 - - servant-dhall ==0.1.0.1 - - servant-docs ==0.11.2 + - servant-client ==0.15 + - servant-client-core ==0.15 + - servant-docs ==0.11.3 - servant-elm ==0.5.0.0 - servant-exceptions ==0.1.1 - - servant-foreign ==0.11.1 - - servant-github-webhook ==0.4.1.0 - - servant-js ==0.9.3.2 + - servant-foreign ==0.15 + - servant-js ==0.9.4 - servant-JuicyPixels ==0.3.0.4 + - servant-kotlin ==0.1.1.5 - servant-lucid ==0.8.1 - - servant-mock ==0.8.4 + - servant-mock ==0.8.5 - servant-pandoc ==0.5.0.0 - - servant-ruby ==0.8.0.2 - - servant-server ==0.14.1 + - servant-rawm ==0.3.0.0 + - servant-ruby ==0.9.0.0 + - servant-server ==0.15 - servant-static-th ==0.2.2.0 - servant-streaming ==0.3.0.0 - - servant-streaming-client ==0.3.0.0 - - servant-streaming-server ==0.3.0.0 - - servant-swagger ==1.1.6 - - servant-swagger-ui ==0.3.0.3.13.2 - - servant-swagger-ui-core ==0.3.1 + - servant-swagger ==1.1.7 + - servant-swagger-ui ==0.3.2.3.19.3 + - servant-swagger-ui-core ==0.3.2 + - servant-swagger-ui-redoc ==0.3.2.1.22.2 - servant-tracing ==0.1.0.2 - servant-websockets ==1.1.0 - - servant-yaml ==0.1.0.0 - - serverless-haskell ==0.6.7 + - servant-yaml ==0.1.0.1 + - serverless-haskell ==0.8.4 - serversession ==1.0.1 - serversession-frontend-wai ==1.0 - servius ==1.2.3.0 - ses-html ==0.4.0.0 - - set-cover ==0.0.9 - setenv ==0.1.1.3 - setlocale ==1.0.0.8 - - sexp-grammar ==2.0.1 - SHA ==1.6.4.4 - shake-language-c ==0.12.0 - shakespeare ==2.0.20 + - shared-memory ==0.2.0.0 - shell-conduit ==4.7.0 - shell-escape ==0.2.0 - shelltestrunner ==1.9 - shelly ==1.8.1 - - shortcut-links ==0.4.2.0 + - shikensu ==0.3.11 + - shortcut-links ==0.4.2.1 - should-not-typecheck ==2.1.0 - show-combinators ==0.1.0.0 - show-prettyprint ==0.2.2 @@ -1886,96 +1817,86 @@ default-package-overrides: - signal ==0.1.0.4 - silently ==1.2.5 - simple-cmd ==0.1.2 + - simple-log ==0.9.10 - simple-reflect ==0.3.3 - simple-sendfile ==0.2.27 - - simplest-sqlite ==0.1.0.0 - simple-vec3 ==0.4.0.9 - since ==0.0.0 - singleton-bool ==0.1.4 - singleton-nats ==0.4.2 - - singletons ==2.4.1 + - singletons ==2.5.1 - siphash ==1.0.3 - size-based ==0.1.2.0 + - sized-grid ==0.1.1.6 - skein ==1.0.9.4 + - skews ==0.1.0.1 + - skip-var ==0.1.0.0 - skylighting ==0.7.5 - skylighting-core ==0.7.5 - slack-web ==0.2.0.9 - - slave-thread ==1.0.2 - smallcheck ==1.1.5 - smoothie ==0.4.2.9 - smtp-mail ==0.1.4.6 - snap-blaze ==0.2.1.5 - snap-core ==1.0.3.2 - - snappy ==0.2.0.2 - snap-server ==1.1.0.0 - snowflake ==0.1.1.1 - soap ==0.2.3.6 - - soap-openssl ==0.1.0.2 - soap-tls ==0.1.1.4 - socket-activation ==0.1.0.2 - socks ==0.5.6 + - sop-core ==0.4.0.0 - sort ==1.0.0.0 - sorted-list ==0.2.1.0 - sourcemap ==0.1.6 - sox ==0.2.3.1 - soxlib ==0.0.3.1 - - sparkle ==0.7.4 - sparse-linear-algebra ==0.3.1 - - spatial-math ==0.5.0.1 - special-values ==0.1.0.0 - speculate ==0.3.5 - - speculation ==1.5.0.3 - speedy-slice ==0.3.0 - sphinx ==0.6.0.2 - Spintax ==0.3.3 - splice ==0.6.1.1 - split ==0.2.3.3 - splitmix ==0.0.1 - - Spock ==0.13.0.0 - - Spock-core ==0.13.0.0 - spoon ==0.3.1 - spreadsheet ==0.1.3.8 - sqlite-simple ==0.4.16.0 - sqlite-simple-errors ==0.6.1.0 - sql-words ==0.1.6.2 - - squeal-postgresql ==0.3.2.0 - srcloc ==0.5.1.2 - - stache ==1.2.1 + - stache ==2.0.1 - starter ==0.3.0 - state-codes ==0.1.3 - stateref ==0.3 - statestack ==0.2.0.5 - StateVar ==1.1.1.1 - - static-canvas ==0.2.0.3 - static-text ==0.2.0.3 - - statistics ==0.14.0.2 + - statistics ==0.15.0.0 - stb-image-redux ==0.2.1.2 - step-function ==0.2 - - stm ==2.4.5.1 + - stm ==2.5.0.0 - stm-chans ==3.0.0.4 - stm-conduit ==4.0.1 - - stm-containers ==0.2.16 - stm-delay ==0.1.1.1 - stm-extras ==0.1.0.3 - - STMonadTrans ==0.4.3 - stm-split ==0.0.2.1 - - stm-stats ==0.2.0.0 - stopwatch ==0.1.0.5 - storable-complex ==0.2.3.0 - - storable-endian ==0.2.6 - storable-record ==0.0.4 - storable-tuple ==0.0.3.3 - storablevector ==0.2.13 - store ==0.5.0.1 - store-core ==0.4.4 - Strafunski-StrategyLib ==5.0.1.0 - - stratosphere ==0.24.4 + - stratosphere ==0.29.0 - streaming ==0.2.2.0 - streaming-attoparsec ==1.0.0 - streaming-bytestring ==0.1.6 - streaming-commons ==0.2.1.0 - streaming-wai ==0.1.1 - - streamly ==0.3.0 + - streamly ==0.5.2 - streamproc ==1.6.2 - streams ==3.3 - strict ==0.3.2 @@ -1991,26 +1912,29 @@ default-package-overrides: - string-transform ==1.1.0 - strive ==5.0.7 - structs ==0.1.1 - - stylish-haskell ==0.9.2.0 + - summoner ==1.2.0 - sum-type-boilerplate ==0.1.1 - sundown ==0.6 - superbuffer ==0.3.1.1 + - sv-cassava ==0.3 + - sv-core ==0.3 - svg-builder ==0.1.1 - SVGFonts ==1.7 - svg-tree ==0.6.2.3 - swagger ==0.3.0 - - swagger2 ==2.2.2 - - swish ==0.9.2.1 + - swagger2 ==2.3.1 + - swish ==0.10.0.1 - syb ==0.7 - symbol ==0.2.4 - symengine ==0.1.2.0 - sysinfo ==0.1.1 - system-argv0 ==0.1.1 + - systemd ==1.1.2 - system-fileio ==0.3.16.4 - system-filepath ==0.4.14 - tabular ==0.2.2.7 - tagchup ==0.4.1.1 - - tagged ==0.8.5 + - tagged ==0.8.6 - tagged-binary ==0.2.0.1 - tagged-identity ==0.1.2 - tagged-transformer ==0.8.1 @@ -2020,37 +1944,40 @@ default-package-overrides: - tao ==1.0.0 - tao-example ==1.0.0 - tar ==0.5.1.0 - - tar-conduit ==0.2.5 + - tar-conduit ==0.3.1 - tardis ==0.4.1.0 - - tasty ==1.1.0.4 - - tasty-ant-xml ==1.1.4 + - tasty ==1.2 + - tasty-ant-xml ==1.1.5 - tasty-dejafu ==1.2.0.8 - tasty-discover ==4.2.1 - tasty-expected-failure ==0.11.1.1 - tasty-golden ==2.3.2 - - tasty-hedgehog ==0.2.0.0 - tasty-hspec ==1.1.5.1 - tasty-hunit ==0.10.0.1 - tasty-kat ==0.0.3 + - tasty-leancheck ==0.0.1 - tasty-program ==1.0.5 - tasty-quickcheck ==0.10 - tasty-silver ==3.1.12 - tasty-smallcheck ==0.8.1 - - tasty-stats ==0.2.0.4 - tasty-th ==0.1.7 - TCache ==0.12.1 - tce-conf ==1.3 - tcp-streams ==1.0.1.0 - tcp-streams-openssl ==1.0.1.0 - tdigest ==0.2.1 - - teardown ==0.5.0.0 - telegram-bot-simple ==0.2.0 + - template-toolkit ==0.1.1.0 - temporary ==1.3 - temporary-rc ==1.2.0.3 + - temporary-resourcet ==0.1.0.1 - tensorflow-test ==0.1.0.0 + - tensors ==0.1.0 + - termbox ==0.1.0 - terminal-size ==0.3.2.1 - test-framework ==0.8.2.0 - test-framework-hunit ==0.3.0.2 + - test-framework-leancheck ==0.0.1 - test-framework-quickcheck2 ==0.3.0.5 - test-framework-smallcheck ==0.2 - test-framework-th ==0.2.4 @@ -2059,8 +1986,9 @@ default-package-overrides: - texmath ==0.11.1.2 - text ==1.2.3.1 - text-binary ==0.2.1.1 - - text-builder ==0.5.4.3 + - text-builder ==0.6.4 - text-conversions ==0.3.0 + - text-format ==0.3.2 - text-icu ==0.7.0.1 - text-latin1 ==0.3.1 - text-ldap ==0.1.1.13 @@ -2069,36 +1997,31 @@ default-package-overrides: - text-metrics ==0.3.0 - text-postgresql ==0.0.3.1 - text-printer ==0.5 + - text-region ==0.3.1.0 - text-short ==0.1.2 - - text-show ==3.7.4 - - text-show-instances ==3.6.5 - - text-zipper ==0.10.1 - tfp ==1.0.0.2 - tf-random ==0.5 - - th-abstraction ==0.2.8.0 + - th-abstraction ==0.2.10.0 - th-data-compat ==0.0.2.7 - - th-desugar ==1.8 + - th-desugar ==1.9 - these ==0.7.5 - th-expand-syns ==0.4.4.0 - th-extras ==0.0.0.4 - th-lift ==0.7.11 - th-lift-instances ==0.1.11 - - th-nowq ==0.1.0.2 - th-orphans ==0.13.6 - - th-printf ==0.5.1 + - th-printf ==0.6.0 - thread-hierarchy ==0.3.0.0 - thread-local-storage ==0.2 - threads ==0.5.1.6 - - threads-extras ==0.1.0.2 - threepenny-gui ==0.8.3.0 - th-reify-compat ==0.0.1.5 - th-reify-many ==0.1.8 - throttle-io-stream ==0.2.0.1 - - through-text ==0.1.0.0 - throwable-exceptions ==0.1.0.9 - th-strict-compat ==0.1.0.1 - th-utilities ==0.2.0.1 - - tibetan-utils ==0.1.1.5 + - thyme ==0.3.5.5 - tile ==0.3.0.0 - time-compat ==0.1.0.3 - timeit ==2.0 @@ -2107,20 +2030,24 @@ default-package-overrides: - time-locale-compat ==0.1.1.5 - time-locale-vietnamese ==1.0.0.0 - time-parsers ==0.1.2.0 + - time-qq ==0.0.1.0 - timerep ==2.0.0.2 + - timer-wheel ==0.1.0 - timezone-olson ==0.1.9 - timezone-series ==0.1.9 - - tintin ==1.9.2 - tinylog ==0.14.1 - titlecase ==1.0.1 + - tldr ==0.4.0.1 - tls ==1.4.1 - tls-debug ==0.4.5 - tls-session-manager ==0.0.0.2 - tmapchan ==0.0.3 - tmapmvar ==0.0.4 - tmp-postgres ==0.1.1.1 - - tomland ==0.3.1 + - token-bucket ==0.1.0.1 + - tomland ==0.5.0 - tostring ==0.2.1.1 + - TotalMap ==0.1.0.0 - transaction ==0.1.1.3 - transformers-base ==0.4.5.2 - transformers-bifunctors ==0.1 @@ -2131,15 +2058,14 @@ default-package-overrides: - tree-diff ==0.0.2 - tree-fun ==0.8.1.0 - trifecta ==2 - - triplesec ==0.1.2.0 + - triplesec ==0.2.2.0 - tsv2csv ==0.1.0.2 - ttrie ==0.1.2.1 - tuple ==0.3.0.2 - tuples-homogenous-h98 ==0.1.1.0 - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 - - turtle ==1.5.12 - - TypeCompose ==0.9.14 + - turtle ==1.5.13 - typed-process ==0.2.3.0 - type-fun ==0.1.1 - type-hint ==0.1 @@ -2148,21 +2074,22 @@ default-package-overrides: - type-level-numbers ==0.1.1.1 - typelits-witnesses ==0.3.0.3 - typenums ==0.1.2.1 - - type-of-html ==1.4.1.0 + - type-of-html ==1.5.0.0 - type-of-html-static ==0.1.0.2 - type-operators ==0.1.0.4 + - typerep-map ==0.3.0 - type-spec ==0.3.0.1 - - typography-geometry ==1.0.0.1 - tz ==0.1.3.2 - tzdata ==0.1.20181026.0 + - ua-parser ==0.7.5.1 + - ucam-webauth ==0.1.0.0 + - ucam-webauth-types ==0.1.0.0 - uglymemo ==0.1.0.1 - unbounded-delays ==0.1.1.0 - - unbound-generics ==0.3.4 + - unbound-generics ==0.4.0 - unboxed-ref ==0.4.0.0 - uncertain ==0.3.1.0 - unconstrained ==0.1.0.2 - - unfoldable ==0.9.6 - - unfoldable-restricted ==0.0.3 - unicode ==0.0.1.1 - unicode-show ==0.1.0.3 - unicode-transforms ==0.3.5 @@ -2174,26 +2101,26 @@ default-package-overrides: - uniq-deep ==1.1.0.0 - unique ==0 - unit-constraint ==0.0.0 - - universe ==1.0 - universe-base ==1.0.2.1 - universe-instances-base ==1.0 - - universe-instances-extended ==1.0.0.1 - universe-instances-trans ==1.0.0.1 - universe-reverse-instances ==1.0 - - universum ==1.2.0 + - universum ==1.5.0 - unix-bytestring ==0.3.7.3 - unix-compat ==0.5.1 - - unix-time ==0.3.8 - - unliftio ==0.2.8.1 + - unix-time ==0.4.3 + - unliftio ==0.2.9.0 - unliftio-core ==0.1.2.0 - unlit ==0.4.0.0 - unordered-containers ==0.2.9.0 - unordered-intmap ==0.1.1 - unsafe ==0.0 - uri-bytestring ==0.3.2.1 + - uri-bytestring-aeson ==0.1.0.7 - uri-encode ==1.5.0.5 - uri-templater ==0.3.1.0 - - urlpath ==9.0.0 + - url ==2.1.3 + - urlpath ==9.0.1 - users ==0.5.0.0 - users-postgresql-simple ==0.5.0.2 - users-test ==0.5.0.1 @@ -2204,9 +2131,9 @@ default-package-overrides: - uuid ==1.3.13 - uuid-types ==1.0.3 - validation ==1 - - validity ==0.7.0.0 + - validity ==0.9.0.0 - validity-aeson ==0.2.0.2 - - validity-bytestring ==0.3.0.2 + - validity-bytestring ==0.4.0.0 - validity-containers ==0.3.1.0 - validity-path ==0.3.0.2 - validity-scientific ==0.2.0.2 @@ -2219,28 +2146,26 @@ default-package-overrides: - vault ==0.3.1.2 - vec ==0.1 - vector ==0.12.0.2 - - vector-algorithms ==0.7.0.4 + - vector-algorithms ==0.8.0.1 - vector-binary-instances ==0.2.5.1 - vector-buffer ==0.4.1 - vector-builder ==0.3.6 - vector-bytes-instances ==0.1.1 - vector-instances ==3.4 - vector-mmap ==0.0.3 - - vector-sized ==1.0.4.0 - - vector-space ==0.13 + - vector-sized ==1.2.0.0 + - vector-space ==0.15 - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.1.6 - - vectortiles ==1.4.0 - verbosity ==0.2.3.0 - - versions ==3.4.0.1 + - versions ==3.5.0 - ViennaRNAParser ==1.3.3 - - viewprof ==0.0.0.25 - - vinyl ==0.8.1.1 - - vivid ==0.3.0.2 - - vivid-osc ==0.3.0.0 - - vivid-supercollider ==0.3.0.0 + - vinyl ==0.10.0.1 + - vivid ==0.4.2.3 + - vivid-osc ==0.5.0.0 + - vivid-supercollider ==0.4.1.2 - void ==0.7.2 - - vty ==5.21 + - vty ==5.25.1 - wai ==3.2.1.2 - wai-app-static ==3.1.6.2 - wai-cli ==0.1.1 @@ -2249,13 +2174,12 @@ default-package-overrides: - wai-eventsource ==3.0.0 - wai-extra ==3.0.24.3 - wai-handler-launch ==3.0.2.4 - - wai-logger ==2.3.2 + - wai-logger ==2.3.3 + - wai-middleware-auth ==0.1.2.1 - wai-middleware-caching ==0.1.0.2 - - wai-middleware-caching-lru ==0.1.0.0 - - wai-middleware-consul ==0.1.0.2 - wai-middleware-crowd ==0.1.4.2 - - wai-middleware-metrics ==0.2.4 - wai-middleware-static ==0.8.2 + - wai-middleware-throttle ==0.3.0.0 - wai-middleware-travisci ==0.1.0 - wai-predicates ==0.10.0 - wai-session ==0.3.3 @@ -2268,12 +2192,11 @@ default-package-overrides: - warp-tls-uid ==0.2.0.5 - wave ==0.1.5 - wcwidth ==0.0.2 - - web3 ==0.7.3.0 + - web3 ==0.8.2.1 - webdriver ==0.8.5 - webex-teams-api ==0.2.0.0 - webex-teams-conduit ==0.2.0.0 - webex-teams-pipes ==0.2.0.0 - - web-plugins ==0.2.9 - web-routes ==0.27.14.2 - web-routes-hsp ==0.24.6.1 - web-routes-wai ==0.24.3.1 @@ -2286,31 +2209,29 @@ default-package-overrides: - wild-bind ==0.1.2.3 - wild-bind-x11 ==0.2.0.6 - Win32-notify ==0.3.0.3 + - windns ==0.1.0.1 + - winery ==0.3.1 - wire-streams ==0.1.1.0 - - withdependencies ==0.2.4.2 - - witherable ==0.2 + - witherable ==0.3 - with-location ==0.1.0 - witness ==0.4 - wizards ==1.0.3 - wl-pprint-annotated ==0.1.0.1 - wl-pprint-console ==0.1.0.2 - - wl-pprint-extras ==3.5.0.5 - - wl-pprint-terminfo ==3.7.1.4 - wl-pprint-text ==1.2.0.0 - word24 ==2.0.1 - word8 ==0.1.3 - word-trie ==0.3.0 - - word-wrap ==0.4.1 - world-peace ==0.1.0.0 - wrap ==0.0.0 - - wreq ==0.5.3.0 - - wreq-stringless ==0.5.9.1 + - wreq ==0.5.3.1 + - writer-cps-exceptions ==0.1.0.0 - writer-cps-full ==0.1.0.0 - writer-cps-lens ==0.1.0.1 - writer-cps-morph ==0.1.0.2 - writer-cps-mtl ==0.1.1.5 - writer-cps-transformers ==0.1.1.4 - - ws ==0.0.4 + - ws ==0.0.5 - wuss ==1.1.11 - X11 ==1.9 - X11-xft ==0.3.1 @@ -2326,6 +2247,7 @@ default-package-overrides: - xhtml ==3000.2.2.1 - xls ==0.1.1 - xlsx ==0.7.2 + - xlsx-tabular ==0.2.2.1 - xml ==1.3.14 - xml-basic ==0.1.3.1 - xmlbf ==0.4.1 @@ -2335,7 +2257,6 @@ default-package-overrides: - xml-conduit-writer ==0.1.1.2 - xmlgen ==0.6.2.2 - xml-hamlet ==0.5.0 - - xml-html-qq ==0.1.0.1 - xml-indexed-cursor ==0.1.1.0 - xml-isogen ==0.3.0 - xml-lens ==0.1.6.3 @@ -2343,37 +2264,41 @@ default-package-overrides: - xml-to-json ==2.0.1 - xml-to-json-fast ==2.0.0 - xml-types ==0.3.6 + - xmonad ==0.15 + - xmonad-contrib ==0.15 + - xmonad-extras ==0.15.1 - xss-sanitize ==0.3.6 - xxhash-ffi ==0.2.0.0 - - yaml ==0.8.32 + - yaml ==0.11.0.0 - yeshql ==4.1.0.1 - yeshql-core ==4.1.0.2 - yeshql-hdbc ==4.1.0.2 - yesod ==1.6.0 - yesod-alerts ==0.1.2.0 - yesod-auth ==1.6.5 - - yesod-auth-fb ==1.9.1 - yesod-auth-hashdb ==1.7.1 + - yesod-auth-oauth2 ==0.6.0.0 - yesod-bin ==1.6.0.3 - yesod-core ==1.6.9 - yesod-csp ==0.2.4.0 - yesod-eventsource ==1.6.0 - yesod-fb ==0.5.0 - yesod-form ==1.6.3 - - yesod-form-bootstrap4 ==1.0.2 + - yesod-form-bootstrap4 ==2.1.0 - yesod-gitrepo ==0.3.0 - yesod-gitrev ==0.2.0.0 + - yesod-markdown ==0.12.6.0 - yesod-newsfeed ==1.6.1.0 - yesod-paginator ==1.1.0.1 - yesod-persistent ==1.6.0.1 - - yesod-recaptcha2 ==0.2.4 + - yesod-recaptcha2 ==0.3.0 - yesod-sitemap ==1.6.0 - yesod-static ==1.6.0.1 - yesod-test ==1.6.5.1 - yesod-text-markdown ==0.1.10 - yesod-websockets ==0.3.0.1 - yes-precure5-command ==5.5.3 - - yi-language ==0.17.1 + - yi-language ==0.18.0 - yi-rope ==0.11 - yjtools ==0.9.18 - yoga ==0.0.0.5 @@ -2382,10 +2307,10 @@ default-package-overrides: - zeromq4-haskell ==0.7.0 - zeromq4-patterns ==0.3.1.0 - zim-parser ==0.2.1.0 - - zip ==1.1.0 - - zip-archive ==0.3.3 + - zip ==1.2.0 + - zip-archive ==0.4 - zippers ==0.2.5 - - zip-stream ==0.1.1 + - zip-stream ==0.2.0.1 - zlib ==0.6.2 - zlib-bindings ==0.1.1.5 - zlib-lens ==0.1.2.1 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index db518444cb2..a6deacf7015 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -4595,27 +4595,6 @@ self: { }: mkDerivation { pname = "Earley"; - version = "0.12.1.0"; - sha256 = "07dxsl2cvb40z2z41a263xpg5mhplaqj9p2qjhaw6q5rkjz9653k"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ListLike ]; - testHaskellDepends = [ - base QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base criterion deepseq ListLike parsec - ]; - description = "Parsing all context-free grammars using Earley's algorithm"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Earley_0_13_0_0" = callPackage - ({ mkDerivation, base, criterion, deepseq, ListLike, parsec - , QuickCheck, tasty, tasty-hunit, tasty-quickcheck - }: - mkDerivation { - pname = "Earley"; version = "0.13.0.0"; sha256 = "0pyj9c5d6xvz4mdpg0nfrl0100rh34442ix73l6ys4pnsadyql0g"; isLibrary = true; @@ -4629,7 +4608,6 @@ self: { ]; description = "Parsing all context-free grammars using Earley's algorithm"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Ebnf2ps" = callPackage @@ -5051,6 +5029,8 @@ self: { pname = "Euterpea"; version = "2.0.6"; sha256 = "0smaa34s0yz90q4qx104glyx8s93k6vn6r60m6aq9infm7rkffxw"; + revision = "1"; + editedCabalFile = "1yrr18wv22ri1v8mij4lazl5lpri7sf8bxbz7igsbs8dngmycn9r"; libraryHaskellDepends = [ array arrows base bytestring containers deepseq ghc-prim HCodecs heap PortMidi random stm @@ -5474,21 +5454,6 @@ self: { }: mkDerivation { pname = "Fin"; - version = "0.2.6.0"; - sha256 = "18qc3ih3l9zd13knxxsh657iq3c742pfaz4i45bq1ir60qwjqmhw"; - libraryHaskellDepends = [ - alg base foldable1 natural-induction peano universe-base - ]; - description = "Finite totally-ordered sets"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Fin_0_2_6_1" = callPackage - ({ mkDerivation, alg, base, foldable1, natural-induction, peano - , universe-base - }: - mkDerivation { - pname = "Fin"; version = "0.2.6.1"; sha256 = "15r5cvxwwbp7d6fmkfkzg65kzwf5v4j3rf84a5qsw900i4c05cmx"; libraryHaskellDepends = [ @@ -5496,7 +5461,6 @@ self: { ]; description = "Finite totally-ordered sets"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Finance-Quote-Yahoo" = callPackage @@ -5670,27 +5634,6 @@ self: { }) {}; "ForestStructures" = callPackage - ({ mkDerivation, base, containers, criterion, fgl, QuickCheck - , tasty, tasty-quickcheck, tasty-th, unordered-containers, vector - , vector-th-unbox - }: - mkDerivation { - pname = "ForestStructures"; - version = "0.0.0.2"; - sha256 = "0gv9hvwbql015k28xvphx4dllpfp5dgi36l3bkg48630xrzhcx7y"; - libraryHaskellDepends = [ - base containers fgl QuickCheck unordered-containers vector - vector-th-unbox - ]; - testHaskellDepends = [ - base containers QuickCheck tasty tasty-quickcheck tasty-th vector - ]; - benchmarkHaskellDepends = [ base criterion ]; - description = "Tree- and forest structures"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ForestStructures_0_0_1_0" = callPackage ({ mkDerivation, base, bifunctors, containers, criterion, fgl, lens , QuickCheck, tasty, tasty-quickcheck, tasty-th , unordered-containers, vector, vector-th-unbox @@ -5709,7 +5652,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Tree- and forest structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Forestry" = callPackage @@ -6689,6 +6631,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Glob_0_10_0" = callPackage + ({ mkDerivation, base, containers, directory, dlist, filepath + , HUnit, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, transformers, transformers-compat + }: + mkDerivation { + pname = "Glob"; + version = "0.10.0"; + sha256 = "0953f91f62ncna402vsrfzdcyxhdpjna3bgdw017kad0dfymacs7"; + libraryHaskellDepends = [ + base containers directory dlist filepath transformers + transformers-compat + ]; + testHaskellDepends = [ + base containers directory dlist filepath HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + transformers transformers-compat + ]; + description = "Globbing library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "GlomeTrace" = callPackage ({ mkDerivation, array, base, GlomeVec }: mkDerivation { @@ -7367,18 +7332,15 @@ self: { }) {inherit (pkgs) unixODBC;}; "HDBC-postgresql" = callPackage - ({ mkDerivation, base, bytestring, Cabal, convertible, HDBC, mtl - , old-time, parsec, postgresql, time, utf8-string + ({ mkDerivation, base, bytestring, convertible, HDBC, mtl, old-time + , parsec, postgresql, time, utf8-string }: mkDerivation { pname = "HDBC-postgresql"; - version = "2.3.2.5"; - sha256 = "0l9i7mkdcch7f1ajl0fma7rra3dc0llmlia0iqhqb4k0gcrpy7l8"; - revision = "1"; - editedCabalFile = "1myhqsn3kk21pchlwf9s6vxggl59s6vmhmbx2539ad4jvnfy2ijx"; + version = "2.3.2.6"; + sha256 = "1kas80zv3vbqq9cd73w87fj4mwxcphfmf7ycfnl4jwdzpqjzr0yj"; isLibrary = true; isExecutable = true; - setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring convertible HDBC mtl old-time parsec time utf8-string @@ -9290,8 +9252,8 @@ self: { ({ mkDerivation, array, base, containers, random }: mkDerivation { pname = "HaskellForMaths"; - version = "0.4.8"; - sha256 = "0yn2nj6irmj24j1djvnnq26i2lbf9g9x1wdhmcrk519glcn5k64j"; + version = "0.4.9"; + sha256 = "1jgim9g0jbv6k31aalq0yps843jmfx74k53lnd1p79kgad7670rz"; libraryHaskellDepends = [ array base containers random ]; description = "Combinatorics, group theory, commutative algebra, non-commutative algebra"; license = stdenv.lib.licenses.bsd3; @@ -10733,31 +10695,16 @@ self: { }: mkDerivation { pname = "JuicyPixels"; - version = "3.2.9.5"; - sha256 = "0mf3ihr0xy2wc2wzb9a17g0n3p60x7pvm8akwpvhdy8klvs6r744"; - libraryHaskellDepends = [ - base binary bytestring containers deepseq mtl primitive - transformers vector zlib - ]; - description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "JuicyPixels_3_3_2" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl - , primitive, transformers, vector, zlib - }: - mkDerivation { - pname = "JuicyPixels"; - version = "3.3.2"; - sha256 = "120jlrqwa7i32yddwbyl6iyx99gx1fvrizb5lybj87p4fr7cxj6z"; + version = "3.3.3"; + sha256 = "1i5k81nfgibbmf5f70iicbh8rqbng61r926wcf9hwy2aa2vba11c"; + revision = "1"; + editedCabalFile = "1q8xyxn1a4ldaa1grmr7dywdbf4vqjw65v52h6z7ssz12hgjx0gq"; libraryHaskellDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib ]; description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "JuicyPixels-blp" = callPackage @@ -10796,22 +10743,6 @@ self: { }) {}; "JuicyPixels-extra" = callPackage - ({ mkDerivation, base, criterion, hspec, JuicyPixels }: - mkDerivation { - pname = "JuicyPixels-extra"; - version = "0.3.0"; - sha256 = "08hf3dklz3zaczbffq11z1yjk3hqf53rnz3g9n989ndw8ybkm865"; - revision = "3"; - editedCabalFile = "1xr4vjhzjw3ynibb6693dhcz2jbvbx4yg2bir8w2s98n37gwsxd7"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ base JuicyPixels ]; - testHaskellDepends = [ base hspec JuicyPixels ]; - benchmarkHaskellDepends = [ base criterion JuicyPixels ]; - description = "Efficiently scale, crop, flip images with JuicyPixels"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "JuicyPixels-extra_0_4_0" = callPackage ({ mkDerivation, base, criterion, hspec, hspec-discover , JuicyPixels }: @@ -10826,7 +10757,6 @@ self: { benchmarkHaskellDepends = [ base criterion JuicyPixels ]; description = "Efficiently scale, crop, flip images with JuicyPixels"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "JuicyPixels-repa" = callPackage @@ -10950,8 +10880,8 @@ self: { ({ mkDerivation, array, base, Cabal }: mkDerivation { pname = "KMP"; - version = "0.1.0.2"; - sha256 = "14dpqfji00jq2rc09l8d1ivphpiwkryjk5sn6lrwxv8mcly3pvhn"; + version = "0.2.0.0"; + sha256 = "0x90yi4aplfqhwaaw5ymgcmv6fpg7659r8n7ir6xfkrpgfmk18i9"; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ base Cabal ]; description = "Knuth–Morris–Pratt string searching algorithm"; @@ -13167,8 +13097,8 @@ self: { }: mkDerivation { pname = "Network-NineP"; - version = "0.4.3"; - sha256 = "1hsfcicijzqy7vxvknxxq9qa4qx3d1smg6mw4mpvk46nvxny8sc1"; + version = "0.4.4"; + sha256 = "119v9iimpgd5cym5q7az0gg70irja9034r2mhvq2k4ygmmz0lazy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -14639,8 +14569,8 @@ self: { }: mkDerivation { pname = "Plot-ho-matic"; - version = "0.12.2.2"; - sha256 = "07zxn4gqkmprrpfyd8vvsf4c2350965k029nzvs0zvrwfbkxin4m"; + version = "0.12.2.3"; + sha256 = "1wmylc6z8ikq2qky46jvzffrrjzl8c9xzzlkwsx8223cxa2n59pn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -15111,23 +15041,6 @@ self: { }) {}; "QuickCheck" = callPackage - ({ mkDerivation, base, containers, deepseq, random - , template-haskell, tf-random, transformers - }: - mkDerivation { - pname = "QuickCheck"; - version = "2.11.3"; - sha256 = "0xhqk35fkzlbjcqbabg6962jkv8d688nzmz7ng4bm84x2d95d328"; - libraryHaskellDepends = [ - base containers deepseq random template-haskell tf-random - transformers - ]; - testHaskellDepends = [ base ]; - description = "Automatic testing of Haskell programs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "QuickCheck_2_12_6_1" = callPackage ({ mkDerivation, base, containers, deepseq, erf, process, random , template-haskell, tf-random, transformers }: @@ -15142,7 +15055,6 @@ self: { testHaskellDepends = [ base deepseq process ]; description = "Automatic testing of Haskell programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "QuickCheck-GenT" = callPackage @@ -15510,6 +15422,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "RSolve" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "RSolve"; + version = "0.1.0.1"; + sha256 = "1qqcn87hmya2cl8d4b312y4j4s099czsw5qgqcwh1gc261ppkxvm"; + libraryHaskellDepends = [ base containers ]; + description = "A general solver for equations"; + license = stdenv.lib.licenses.mit; + }) {}; + "Raincat" = callPackage ({ mkDerivation, base, containers, extensible-exceptions, GLUT, mtl , OpenGL, random, sdl2, sdl2-image, sdl2-mixer, time @@ -15643,34 +15566,14 @@ self: { }: mkDerivation { pname = "Rasterific"; - version = "0.7.4"; - sha256 = "13f5ay9wmva9k15a6pk4imxz6rj80gwc1f16906m7a6rm9vgwvlq"; - libraryHaskellDepends = [ - base bytestring containers dlist FontyFruity free JuicyPixels mtl - primitive transformers vector vector-algorithms - ]; - description = "A pure haskell drawing engine"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Rasterific_0_7_4_1" = callPackage - ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity - , free, JuicyPixels, mtl, primitive, transformers, vector - , vector-algorithms - }: - mkDerivation { - pname = "Rasterific"; - version = "0.7.4.1"; - sha256 = "1d0j7xf2xbgrlny30qwm52wby51ic2cqlhb867a7a03k02p7ib2b"; - revision = "1"; - editedCabalFile = "1lz8b9xcfcv0a762zvaksh7c80yryc9yhap198dlm60i0znpjdg2"; + version = "0.7.4.2"; + sha256 = "1sg63cvcb64gbrxkn5pgs1nvvb1c9qfya7xxwn5daqpjgan426w1"; libraryHaskellDepends = [ base bytestring containers dlist FontyFruity free JuicyPixels mtl primitive transformers vector vector-algorithms ]; description = "A pure haskell drawing engine"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ReadArgs" = callPackage @@ -16345,6 +16248,8 @@ self: { pname = "SVGFonts"; version = "1.7"; sha256 = "1k9ili7l9pp5a009jh55vigb917wdnsl6iaz0ggp6d4nw1jwsg6s"; + revision = "1"; + editedCabalFile = "1w687f4lk4l07wqgldhpg7ycid0fs099x8vrylcxqdgfrzmm04dg"; enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base blaze-markup blaze-svg bytestring cereal @@ -21760,37 +21665,6 @@ self: { ({ mkDerivation, attoparsec, base, base-compat, base-orphans , base16-bytestring, bytestring, containers, deepseq, directory , dlist, filepath, generic-deriving, ghc-prim, hashable - , hashable-time, HUnit, integer-logarithms, QuickCheck - , quickcheck-instances, scientific, tagged, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, text, th-abstraction, time - , time-locale-compat, unordered-containers, uuid-types, vector - }: - mkDerivation { - pname = "aeson"; - version = "1.3.1.1"; - sha256 = "1i1ig840fvsb1lnklcv32zsc0zscirc301lw1mpfxhc6h4pk0gw4"; - libraryHaskellDepends = [ - attoparsec base base-compat bytestring containers deepseq dlist - ghc-prim hashable scientific tagged template-haskell text - th-abstraction time time-locale-compat unordered-containers - uuid-types vector - ]; - testHaskellDepends = [ - attoparsec base base-compat base-orphans base16-bytestring - bytestring containers directory dlist filepath generic-deriving - ghc-prim hashable hashable-time HUnit integer-logarithms QuickCheck - quickcheck-instances scientific tagged tasty tasty-hunit - tasty-quickcheck template-haskell text time time-locale-compat - unordered-containers uuid-types vector - ]; - description = "Fast JSON parsing and encoding"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson_1_4_2_0" = callPackage - ({ mkDerivation, attoparsec, base, base-compat, base-orphans - , base16-bytestring, bytestring, containers, contravariant, deepseq - , directory, dlist, filepath, generic-deriving, ghc-prim, hashable , hashable-time, integer-logarithms, primitive, QuickCheck , quickcheck-instances, scientific, tagged, tasty, tasty-hunit , tasty-quickcheck, template-haskell, text, th-abstraction, time @@ -21801,10 +21675,10 @@ self: { version = "1.4.2.0"; sha256 = "1l4b675nxddim3v30kd7zr3vmrs7i1m81rh8h9bfbm9k9a0p3kkm"; libraryHaskellDepends = [ - attoparsec base base-compat bytestring containers contravariant - deepseq dlist ghc-prim hashable primitive scientific tagged - template-haskell text th-abstraction time time-locale-compat - unordered-containers uuid-types vector + attoparsec base base-compat bytestring containers deepseq dlist + ghc-prim hashable primitive scientific tagged template-haskell text + th-abstraction time time-locale-compat unordered-containers + uuid-types vector ]; testHaskellDepends = [ attoparsec base base-compat base-orphans base16-bytestring @@ -21816,7 +21690,6 @@ self: { ]; description = "Fast JSON parsing and encoding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-applicative" = callPackage @@ -22009,8 +21882,8 @@ self: { pname = "aeson-extra"; version = "0.4.1.1"; sha256 = "1y7xss382hdxrv4jzprsm3b7ij7wiw8jgjg9wp49dx6bfvcnb2nl"; - revision = "2"; - editedCabalFile = "1iiibpr8pcdr0bjp0rhf1sxvs0kv66jm01nwlhj4243864qx476r"; + revision = "3"; + editedCabalFile = "0b9ccv529msmqay0gw2xcxm67n08hmv6s45ivyd8vq0rig4wz407"; libraryHaskellDepends = [ aeson aeson-compat attoparsec attoparsec-iso8601 base base-compat-batteries bytestring containers deepseq exceptions @@ -22908,8 +22781,8 @@ self: { }: mkDerivation { pname = "aivika"; - version = "5.8"; - sha256 = "0yj022qf7afxs8md45qxz42n9i5g60572lz330szbm9ziwdwb1wp"; + version = "5.9"; + sha256 = "0chmrj8r1qh1k1xkp9gybadxz5zz04v2zh26byrckyx7l2bb7j8x"; libraryHaskellDepends = [ array base binary containers deepseq exceptions mtl mwc-random random semigroups vector @@ -23070,8 +22943,8 @@ self: { }: mkDerivation { pname = "aivika-transformers"; - version = "5.8"; - sha256 = "0mndlxvi98k74q2qvzc7wry8ndcgmyi9ph1sas42cbc7a2djnlf0"; + version = "5.9"; + sha256 = "1vqwhjwjsnrbqp3n97arl2nz28xb0vwxvsn42iqf8fxj6xsks3y1"; libraryHaskellDepends = [ aivika array base containers exceptions mtl mwc-random random semigroups vector @@ -23127,24 +23000,6 @@ self: { }: mkDerivation { pname = "alarmclock"; - version = "0.5.0.2"; - sha256 = "0k6nfgxbhnsdlxiv1d6q7kgfmfnix8d1z9cpp84kz9m9jw4a6x15"; - libraryHaskellDepends = [ - async base clock stm time unbounded-delays - ]; - testHaskellDepends = [ - async base clock hspec stm time unbounded-delays - ]; - description = "Wake up and perform an action at a certain time"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "alarmclock_0_6_0_2" = callPackage - ({ mkDerivation, async, base, clock, hspec, stm, time - , unbounded-delays - }: - mkDerivation { - pname = "alarmclock"; version = "0.6.0.2"; sha256 = "1zhq3sx6x54v7cjzmjvcs7pzqyql3x4vk3b5n4x7xhgxs54xdasc"; libraryHaskellDepends = [ @@ -23155,7 +23010,6 @@ self: { ]; description = "Wake up and perform an action at a certain time"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alea" = callPackage @@ -23288,23 +23142,11 @@ self: { ({ mkDerivation, base, util }: mkDerivation { pname = "alg"; - version = "0.2.8.0"; - sha256 = "1zw50da4wz8qdc62qlvg74k3g5n48xlzda2k7c3y9zb8xb2xbfrr"; - libraryHaskellDepends = [ base util ]; - description = "Algebraic structures"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "alg_0_2_9_0" = callPackage - ({ mkDerivation, base, util }: - mkDerivation { - pname = "alg"; version = "0.2.9.0"; sha256 = "0w5lxmz52nskh8ms3nliya78v1pb77f7nyn19klqf8yskaalywlq"; libraryHaskellDepends = [ base util ]; description = "Algebraic structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alga" = callPackage @@ -23421,25 +23263,6 @@ self: { "algebraic-graphs" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, containers - , deepseq, extra, mtl, QuickCheck - }: - mkDerivation { - pname = "algebraic-graphs"; - version = "0.2"; - sha256 = "0rfs58z60nn041ymi7lilc7dyijka30l4hhdznfaz9sfzx4f8yl8"; - libraryHaskellDepends = [ - array base base-compat containers deepseq mtl - ]; - testHaskellDepends = [ - array base base-compat base-orphans containers extra QuickCheck - ]; - description = "A library for algebraic graph construction and transformation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "algebraic-graphs_0_3" = callPackage - ({ mkDerivation, array, base, base-compat, base-orphans, containers , deepseq, extra, inspection-testing, mtl, QuickCheck }: mkDerivation { @@ -26594,8 +26417,8 @@ self: { }: mkDerivation { pname = "amqp-worker"; - version = "0.2.4"; - sha256 = "0ps0d9hly3cc9y7cmi5gr6p3h8qddig7sz3s7v6dl0icy3bvhinc"; + version = "0.2.5"; + sha256 = "0crbrmxwv1dwd84l41p2zmx5ap5wwr0n5a9cznz87x3cc6qncylq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -27272,8 +27095,8 @@ self: { }: mkDerivation { pname = "antiope-athena"; - version = "6.1.5"; - sha256 = "0p78yxdnfzz6jw7az6xfh6sjcnf9d8sl512cmhdcws78p7f2rhlx"; + version = "6.2.0"; + sha256 = "0kd31s399rddcjj8ayvki85j66xlkb7gh0jgfwxmxcxp3x4gs0xi"; libraryHaskellDepends = [ amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core @@ -27289,8 +27112,8 @@ self: { ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }: mkDerivation { pname = "antiope-contract"; - version = "6.1.5"; - sha256 = "1ikd0sn3z901hyad55ngzs99b0v9bs5vkry5965w22smljdg3rqh"; + version = "6.2.0"; + sha256 = "0s2s0vq6n7zwjj1yd7kmpwxkvbnfd2ikjv9nzg1rz0hm6mz1dn4p"; libraryHaskellDepends = [ aeson antiope-s3 avro base bytestring text ]; @@ -27305,8 +27128,8 @@ self: { }: mkDerivation { pname = "antiope-core"; - version = "6.1.5"; - sha256 = "06c8wd4gjlrz1sdk7qpd1l8n29a3jkipy749j3414x7b5fqxbzi7"; + version = "6.2.0"; + sha256 = "0g3bhh8vdnkd5h9savhjc053jbb4k7b7chbzcjjqd4kj95v8jmr3"; libraryHaskellDepends = [ amazonka amazonka-core base bytestring exceptions generic-lens http-client http-types lens monad-logger mtl resourcet text @@ -27328,8 +27151,8 @@ self: { }: mkDerivation { pname = "antiope-dynamodb"; - version = "6.1.5"; - sha256 = "181ygxvf29acianvnryv1kbn5g69axkagqa54429ja8jfxiblrqq"; + version = "6.2.0"; + sha256 = "1kv6ihb6829fbgzz489sg0zyz02rp9p8wk90w4x3sjsynf8djrjj"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers @@ -27349,8 +27172,8 @@ self: { }: mkDerivation { pname = "antiope-messages"; - version = "6.1.5"; - sha256 = "09ysy9r38d216vzq0nm1zfl4fqz8mrqa39c2ivy7pqm4xldsqary"; + version = "6.2.0"; + sha256 = "11zkyfv06fsqxznr36hh563yz401y3wg2a5hc6x6ydza4xdnrzdz"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3 base generic-lens lens lens-aeson monad-loops network-uri text @@ -27374,8 +27197,8 @@ self: { }: mkDerivation { pname = "antiope-s3"; - version = "6.1.5"; - sha256 = "0b2mildkgd271c8hwg6b3jf8xgli5bmd4dx9c0ac8ihyn28xr0m8"; + version = "6.2.0"; + sha256 = "1gb9ypj5gp6qkzncg44sja35pw2s6qg7msjrlcvhdfbcjs6pxrqj"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-s3 antiope-core attoparsec base bytestring conduit conduit-extra exceptions generic-lens http-types @@ -27397,8 +27220,8 @@ self: { }: mkDerivation { pname = "antiope-sns"; - version = "6.1.5"; - sha256 = "07kg0b0iyik0axnycph3irp73cv614qcny3z3rib1rpvbknz9iwh"; + version = "6.2.0"; + sha256 = "0npm9q3vf2njiqwyswxc6xh5psjls0skz29mz22y59sk25m5fmkv"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sns base generic-lens lens text unliftio-core @@ -27418,8 +27241,8 @@ self: { }: mkDerivation { pname = "antiope-sqs"; - version = "6.1.5"; - sha256 = "097vxkz54k4ijqqzb8lijr90hvnyyhqm7sqn5qxam3wy355w3z5c"; + version = "6.2.0"; + sha256 = "0v33diw8cwvfb9b4k24whbyl4apjq67rh36ndn5qr6627kp3b825"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-messages antiope-s3 base generic-lens lens lens-aeson @@ -27643,8 +27466,8 @@ self: { }: mkDerivation { pname = "apecs"; - version = "0.7.0"; - sha256 = "1yah3yn4z6nxm8gdlkmzlbi8h7nd4zb4905dvzb9b66njhff06l2"; + version = "0.7.1"; + sha256 = "0cvjqv6zbjzvp01ikfx5lkwb7fbq25555rbvfriwhsfjqanw5pj7"; libraryHaskellDepends = [ base containers mtl template-haskell vector ]; @@ -27662,8 +27485,8 @@ self: { }: mkDerivation { pname = "apecs-gloss"; - version = "0.1.1"; - sha256 = "0s5vhxgfgj4v51dnrhzfbids0a873113rqb76xr8f5azq6kr9g3p"; + version = "0.2.0"; + sha256 = "0qkdjanbrnwhxzr168xwrnhcd1hwsymlb1nvsb1mrklzj93amfvh"; libraryHaskellDepends = [ apecs apecs-physics base containers gloss linear ]; @@ -28202,25 +28025,11 @@ self: { ({ mkDerivation, base, bytestring }: mkDerivation { pname = "appar"; - version = "0.1.5"; - sha256 = "0qlfwy8nxl1na55p155vq5yn0cqz26mmmh5vs28aqry7kyyxndfi"; - revision = "1"; - editedCabalFile = "0adhm7jldcqnikvd8b9wj6p5rnhf4ciwbms0jafwx79w720knj9p"; - libraryHaskellDepends = [ base bytestring ]; - description = "A simple applicative parser"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "appar_0_1_7" = callPackage - ({ mkDerivation, base, bytestring }: - mkDerivation { - pname = "appar"; version = "0.1.7"; sha256 = "07zjgx7xpjgkjqvga0wv542cyrjzh1mszlczg82nbmij2cflzppn"; libraryHaskellDepends = [ base bytestring ]; description = "A simple applicative parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "appc" = callPackage @@ -28389,37 +28198,6 @@ self: { }: mkDerivation { pname = "apply-refact"; - version = "0.5.0.0"; - sha256 = "1bvlbchpma3vlxfvjbyd01rmzqc9h5q3my9n7v3wal2p7ysvjpqz"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers directory filemanip ghc ghc-exactprint mtl process - refact syb temporary transformers unix-compat - ]; - executableHaskellDepends = [ - base containers directory filemanip filepath ghc ghc-exactprint mtl - optparse-applicative process refact syb temporary transformers - unix-compat - ]; - testHaskellDepends = [ - base containers directory filemanip filepath ghc ghc-exactprint mtl - optparse-applicative process refact silently syb tasty - tasty-expected-failure tasty-golden temporary transformers - unix-compat - ]; - description = "Perform refactorings specified by the refact library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "apply-refact_0_6_0_0" = callPackage - ({ mkDerivation, base, containers, directory, filemanip, filepath - , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact - , silently, syb, tasty, tasty-expected-failure, tasty-golden - , temporary, transformers, unix-compat - }: - mkDerivation { - pname = "apply-refact"; version = "0.6.0.0"; sha256 = "0p2mqgjcqr1zcmk8zgr0yq7g8z1agsa6l493lkj6g3ya9lyhxgig"; isLibrary = true; @@ -28441,7 +28219,6 @@ self: { ]; description = "Perform refactorings specified by the refact library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "apportionment" = callPackage @@ -28704,8 +28481,8 @@ self: { }: mkDerivation { pname = "arbtt"; - version = "0.10.0.2"; - sha256 = "13jmv7bxiy0v2y2w6qwsb9mh5m97sxrlb5w1kaqzag8d0cnz7w6c"; + version = "0.10.1"; + sha256 = "09n6v32yz612ag4acjd4jwnmv0ljarxi3b7v2mp4bj18c2gx1wbq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -29099,34 +28876,6 @@ self: { }) {}; "arithmoi" = callPackage - ({ mkDerivation, array, base, containers, exact-pi, gauge, ghc-prim - , integer-gmp, integer-logarithms, mtl, QuickCheck, random - , smallcheck, tasty, tasty-hunit, tasty-quickcheck - , tasty-smallcheck, transformers, vector - }: - mkDerivation { - pname = "arithmoi"; - version = "0.7.0.0"; - sha256 = "0303bqlbf8abixcq3x3px2ijj01c9hlqadkv8rhls6f64a8h8cwb"; - revision = "3"; - editedCabalFile = "1s0jm2y0jhfrj7af80csckiizkfq5h0v4zb92mkwh1pkfi763fha"; - configureFlags = [ "-f-llvm" ]; - libraryHaskellDepends = [ - array base containers exact-pi ghc-prim integer-gmp - integer-logarithms mtl random vector - ]; - testHaskellDepends = [ - base containers integer-gmp QuickCheck smallcheck tasty tasty-hunit - tasty-quickcheck tasty-smallcheck transformers vector - ]; - benchmarkHaskellDepends = [ - base containers gauge integer-logarithms random vector - ]; - description = "Efficient basic number-theoretic functions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "arithmoi_0_8_0_0" = callPackage ({ mkDerivation, array, base, containers, deepseq, exact-pi, gauge , ghc-prim, integer-gmp, integer-logarithms, QuickCheck, random , smallcheck, tasty, tasty-hunit, tasty-quickcheck @@ -29152,7 +28901,6 @@ self: { ]; description = "Efficient basic number-theoretic functions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "armada" = callPackage @@ -29177,6 +28925,8 @@ self: { pname = "armor"; version = "0.1"; sha256 = "0jmq6lhi1byhjzgkvnn4p481z8wik93angx7sf6cjfj5j0kqzv71"; + revision = "1"; + editedCabalFile = "075nxkch0azmf4fkrnckwsr9s7bmxpm38xbwkj9kak3lsfaml4sk"; libraryHaskellDepends = [ base bytestring containers directory filepath HUnit lens ]; @@ -29227,14 +28977,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) arpack;}; - "array_0_5_2_0" = callPackage + "array_0_5_3_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "array"; - version = "0.5.2.0"; - sha256 = "12v83s2imxb3p2crnlzrpjh0nk6lpysw9bdk9yahs6f37csa5jaj"; - revision = "2"; - editedCabalFile = "1irpwz3spy3yy27kzw8sklhcvxz3mx9fkgqia7r9m069w5wid9kg"; + version = "0.5.3.0"; + sha256 = "07pyr2x09n23rdxldqgbx12hlg9dk92q9p56bpcdw3r87ajc3m9z"; libraryHaskellDepends = [ base ]; description = "Mutable and immutable arrays"; license = stdenv.lib.licenses.bsd3; @@ -30997,19 +30745,6 @@ self: { }) {}; "attoparsec-ip" = callPackage - ({ mkDerivation, attoparsec, base, ip }: - mkDerivation { - pname = "attoparsec-ip"; - version = "0.0.1"; - sha256 = "0aananvfa7h9d73yf1c69zw5b3s3m67qhfmfrzdbifw3wj5cm9cd"; - libraryHaskellDepends = [ attoparsec base ip ]; - testHaskellDepends = [ base ]; - description = "Parse IP data types with attoparsec"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "attoparsec-ip_0_0_5" = callPackage ({ mkDerivation, attoparsec, base, ip, QuickCheck, tasty , tasty-quickcheck, text, vector }: @@ -31145,22 +30880,6 @@ self: { "attoparsec-uri" = callPackage ({ mkDerivation, attoparsec, attoparsec-ip, base, bytedump, ip - , strict, text, vector - }: - mkDerivation { - pname = "attoparsec-uri"; - version = "0.0.4"; - sha256 = "1wzisb9xnykaxnp1jp0a3lvh1m2swynk2r2mg6nfv5jzlv52q0sf"; - libraryHaskellDepends = [ - attoparsec attoparsec-ip base bytedump ip strict text vector - ]; - description = "URI parser / printer using attoparsec"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "attoparsec-uri_0_0_7" = callPackage - ({ mkDerivation, attoparsec, attoparsec-ip, base, bytedump, ip , QuickCheck, quickcheck-instances, strict, tasty, tasty-quickcheck , text, vector }: @@ -31830,32 +31549,6 @@ self: { }) {}; "avro" = callPackage - ({ mkDerivation, aeson, array, base, base16-bytestring, binary - , bytestring, containers, data-binary-ieee754, directory, entropy - , extra, fail, hashable, hspec, lens, lens-aeson, mtl, pure-zlib - , QuickCheck, scientific, semigroups, tagged, template-haskell - , text, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "avro"; - version = "0.3.5.1"; - sha256 = "147w9a30z2vxjf8lsmf4vy0p9dvc8c3lla45b42sinr9916m61f8"; - libraryHaskellDepends = [ - aeson array base base16-bytestring binary bytestring containers - data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific - semigroups tagged template-haskell text unordered-containers vector - ]; - testHaskellDepends = [ - aeson array base base16-bytestring binary bytestring containers - directory entropy extra fail hashable hspec lens lens-aeson mtl - pure-zlib QuickCheck scientific semigroups tagged template-haskell - text transformers unordered-containers vector - ]; - description = "Avro serialization support for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "avro_0_4_1_0" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors , binary, bytestring, containers, data-binary-ieee754, directory , entropy, extra, fail, hashable, hspec, lens, lens-aeson, mtl @@ -31865,8 +31558,8 @@ self: { }: mkDerivation { pname = "avro"; - version = "0.4.1.0"; - sha256 = "0dndnk8wk1ir59m19qsb3jrza8xy2w3w3fqv52hyqz1w5ca906n6"; + version = "0.4.1.1"; + sha256 = "150pzq5yfvd8vgmrgcdw4kww2jgs0c6hyw7z9wsk7fhjbvrz570k"; libraryHaskellDepends = [ aeson array base base16-bytestring bifunctors binary bytestring containers data-binary-ieee754 entropy fail hashable mtl pure-zlib @@ -31881,7 +31574,6 @@ self: { ]; description = "Avro serialization support for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "avwx" = callPackage @@ -32372,30 +32064,21 @@ self: { "aws-lambda-haskell-runtime" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit , directory, filepath, hspec, microlens-platform, mtl - , optparse-generic, process, QuickCheck, relude, template-haskell - , text, wreq + , optparse-generic, process, template-haskell, text, uuid, wreq }: mkDerivation { pname = "aws-lambda-haskell-runtime"; - version = "1.0.4"; - sha256 = "0cfmdgy0vn62gdi01r02k4yb87s4xv0xhyd06j5ws6ky6cpmmdwx"; + version = "1.0.9"; + sha256 = "0cx59jmqzjz1ff1mng63pf008mxmfffpv9nlcmrisjliginjh2v3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring case-insensitive conduit directory filepath - microlens-platform mtl optparse-generic process relude - template-haskell text wreq - ]; - executableHaskellDepends = [ - aeson base bytestring case-insensitive conduit directory filepath - microlens-platform mtl optparse-generic process relude - template-haskell text wreq - ]; - testHaskellDepends = [ - aeson base bytestring case-insensitive conduit directory filepath - hspec microlens-platform mtl optparse-generic process QuickCheck - relude template-haskell text wreq + microlens-platform mtl optparse-generic process template-haskell + text uuid wreq ]; + executableHaskellDepends = [ base mtl ]; + testHaskellDepends = [ base hspec mtl ]; description = "Haskell runtime for AWS Lambda"; license = stdenv.lib.licenses.asl20; }) {}; @@ -32646,8 +32329,8 @@ self: { }) {}; "axel" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath - , freer-simple, haskell-src-exts, hedgehog, lens, lens-aeson + ({ mkDerivation, base, bytestring, containers, directory, filepath + , freer-simple, ghcid, haskell-src-exts, hedgehog, lens, lens-aeson , optparse-applicative, parsec, process, regex-pcre, singletons , split, strict, tasty, tasty-discover, tasty-golden , tasty-hedgehog, tasty-hspec, template-haskell, text, transformers @@ -32655,22 +32338,24 @@ self: { }: mkDerivation { pname = "axel"; - version = "0.0.8"; - sha256 = "16fkrc87yirzha3fgdcbidi7k9xkmb5y5w1i4i10rlikhszfr2b9"; + version = "0.0.9"; + sha256 = "0kr7iblj23dlfjzym2ndrns2x7z65sdn2pz8dwxsqvn8jhh24p7f"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring directory filepath freer-simple haskell-src-exts - lens lens-aeson optparse-applicative parsec process regex-pcre - singletons strict template-haskell text typed-process vector yaml + base bytestring containers directory filepath freer-simple ghcid + haskell-src-exts lens lens-aeson optparse-applicative parsec + process regex-pcre singletons strict template-haskell text + typed-process vector yaml ]; executableHaskellDepends = [ - base freer-simple optparse-applicative + base containers freer-simple optparse-applicative ]; testHaskellDepends = [ - base bytestring filepath freer-simple hedgehog lens split tasty - tasty-discover tasty-golden tasty-hedgehog tasty-hspec transformers + base bytestring containers filepath freer-simple hedgehog lens + split tasty tasty-discover tasty-golden tasty-hedgehog tasty-hspec + transformers ]; testToolDepends = [ tasty-discover ]; description = "The Axel programming language"; @@ -32945,27 +32630,6 @@ self: { "backprop" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, directory , hmatrix, microlens, microlens-th, mwc-random, primitive - , reflection, simple-reflect, time, transformers, vector, vinyl - }: - mkDerivation { - pname = "backprop"; - version = "0.2.5.0"; - sha256 = "1xbbmv6cp9n21x2bqpr0p4cls994mchxp7hd7k6ib83avr0vwbda"; - libraryHaskellDepends = [ - base containers deepseq microlens primitive reflection - simple-reflect transformers vector vinyl - ]; - benchmarkHaskellDepends = [ - base criterion deepseq directory hmatrix microlens microlens-th - mwc-random time vector - ]; - description = "Heterogeneous automatic differentation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "backprop_0_2_6_1" = callPackage - ({ mkDerivation, base, containers, criterion, deepseq, directory - , hmatrix, microlens, microlens-th, mwc-random, primitive , reflection, time, transformers, vector, vinyl }: mkDerivation { @@ -32982,7 +32646,6 @@ self: { ]; description = "Heterogeneous automatic differentation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "backtracking-exceptions" = callPackage @@ -33302,8 +32965,8 @@ self: { }: mkDerivation { pname = "barbies"; - version = "1.0.0.0"; - sha256 = "05bbn1aqa6r9392fffgjgdl4m8nnagjx27aps5xrcf5x45kk88ci"; + version = "1.1.0.0"; + sha256 = "02lnq2f5n75r214lrhkhdl3a85lzn3am197df4a0mp6pvw07z1cs"; libraryHaskellDepends = [ base bifunctors ]; testHaskellDepends = [ base QuickCheck tasty tasty-hunit tasty-quickcheck @@ -33453,29 +33116,13 @@ self: { }: mkDerivation { pname = "base-compat-batteries"; - version = "0.10.1"; - sha256 = "1j8ky6241mj1ymbwm9scvyvbknj7n2r56cnkg9y1zf2xwjpqnmqm"; - libraryHaskellDepends = [ base base-compat ]; - testHaskellDepends = [ base hspec QuickCheck ]; - testToolDepends = [ hspec-discover ]; - description = "base-compat with extra batteries"; - license = stdenv.lib.licenses.mit; - }) {}; - - "base-compat-batteries_0_10_5" = callPackage - ({ mkDerivation, base, base-compat, contravariant, hspec - , hspec-discover, QuickCheck - }: - mkDerivation { - pname = "base-compat-batteries"; version = "0.10.5"; sha256 = "1vkhc639vqiv5p39jn1v312z32i7yk5q2lf0ap4jxl1v8p8wyp8p"; - libraryHaskellDepends = [ base base-compat contravariant ]; + libraryHaskellDepends = [ base base-compat ]; testHaskellDepends = [ base hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; description = "base-compat with extra batteries"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "base-compat-migrate" = callPackage @@ -33565,20 +33212,6 @@ self: { }: mkDerivation { pname = "base-orphans"; - version = "0.7"; - sha256 = "057f9npnqk71ccfh95djfkpd54dzazphj06grwxa3fyhwcwxrb8a"; - libraryHaskellDepends = [ base ghc-prim ]; - testHaskellDepends = [ base hspec QuickCheck ]; - testToolDepends = [ hspec-discover ]; - description = "Backwards-compatible orphan instances for base"; - license = stdenv.lib.licenses.mit; - }) {}; - - "base-orphans_0_8" = callPackage - ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck - }: - mkDerivation { - pname = "base-orphans"; version = "0.8"; sha256 = "05s8s9zbnvcwnnd8z23jbdcjpd1h07c8fgaw0g9jl8mlpxbcdvmc"; libraryHaskellDepends = [ base ghc-prim ]; @@ -33586,7 +33219,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Backwards-compatible orphan instances for base"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "base-prelude" = callPackage @@ -33604,23 +33236,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "base-unicode-symbols"; - version = "0.2.2.4"; - sha256 = "1afc5pchd3vw33bmjbjygkd0l5zh7glbsx4bfyxfscpc1x1l3y52"; - libraryHaskellDepends = [ base ]; - description = "Unicode alternatives for common functions and operators"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "base-unicode-symbols_0_2_3" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "base-unicode-symbols"; version = "0.2.3"; sha256 = "1ia6li7qjg1zkak4gf6mnbshw45mq9bfjr0jch58ds0lscmvwyzf"; libraryHaskellDepends = [ base ]; description = "Unicode alternatives for common functions and operators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "base16-bytestring" = callPackage @@ -36401,8 +36021,8 @@ self: { ({ mkDerivation, base, monetdb-mapi }: mkDerivation { pname = "bindings-monetdb-mapi"; - version = "0.1.0.1"; - sha256 = "0ghl73n679y5srg4b2jwy6xgnd4lbv7wad8k133k6c7k70zq89hl"; + version = "0.1.0.2"; + sha256 = "1f6n2x8c0r72d011piyf8fqclfxcqda98ha3w29c86y66qid0wjm"; libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ monetdb-mapi ]; description = "Low-level bindings for the MonetDB API (mapi)"; @@ -36779,6 +36399,8 @@ self: { pname = "biocore"; version = "0.3.1"; sha256 = "06ml9p144bv0c9hv6pkcvhdgc0vw0jxzbqb834ilr38kjmrpsar1"; + revision = "1"; + editedCabalFile = "0lz3inilvxn1simbpm8002iv7h9wk1gzng2vj3gpxps99zvihqc4"; libraryHaskellDepends = [ base bytestring stringable ]; description = "A bioinformatics library"; license = "LGPL"; @@ -37514,6 +37136,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "bitset-word8_0_1_1_1" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , hspec, QuickCheck, template-haskell, th-lift-instances, vector + }: + mkDerivation { + pname = "bitset-word8"; + version = "0.1.1.1"; + sha256 = "1pjjpqfqjnylfs5npnh7w75h9xk5gpkwzaqx0a972wa9h18gih7z"; + libraryHaskellDepends = [ + base containers template-haskell th-lift-instances + ]; + testHaskellDepends = [ + base containers hspec QuickCheck template-haskell th-lift-instances + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion deepseq template-haskell + th-lift-instances vector + ]; + description = "Space efficient set of Word8 and some pre-canned sets useful for parsing HTTP"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bitspeak" = callPackage ({ mkDerivation, base, bindings-DSL, bindings-glib , bindings-gobject, gtk2, pango @@ -37819,6 +37464,25 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "blake2_0_3_0" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, criterion + , hlint, QuickCheck, tasty, tasty-quickcheck + }: + mkDerivation { + pname = "blake2"; + version = "0.3.0"; + sha256 = "0y937kr3dp87likwrl4wpaw80jhf383k89zn8li1yj3zp1vb6niv"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + base base16-bytestring bytestring hlint QuickCheck tasty + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; + description = "A library providing BLAKE2"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "blakesum" = callPackage ({ mkDerivation, base, bytestring, text, vector }: mkDerivation { @@ -37938,21 +37602,8 @@ self: { ({ mkDerivation, base, blas, netlib-ffi }: mkDerivation { pname = "blas-ffi"; - version = "0.0.1.1"; - sha256 = "0dphqcnnka0ahfgdnshm8r3bd6r5wbpln9kksa6y09yi2nnqh3gf"; - libraryHaskellDepends = [ base netlib-ffi ]; - libraryPkgconfigDepends = [ blas ]; - description = "Auto-generated interface to Fortran BLAS"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) blas;}; - - "blas-ffi_0_0_2" = callPackage - ({ mkDerivation, base, blas, netlib-ffi }: - mkDerivation { - pname = "blas-ffi"; - version = "0.0.2"; - sha256 = "047qal272s1hc3pp7xy8vyq4dm80nvqin34zvl7wz09c0qrnnvyc"; + version = "0.1"; + sha256 = "1zmw1x37ayssplj8w01ivfyh2jjg906c389cjah4hpn5dpb7p9w5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base netlib-ffi ]; @@ -39105,14 +38756,14 @@ self: { "boolector" = callPackage ({ mkDerivation, base, boolector, c2hs, containers, directory, mtl - , temporary + , temporary, time }: mkDerivation { pname = "boolector"; - version = "0.0.0.7"; - sha256 = "1mb897br307c84p0aj8r20qjwryinhy0bxgm62hphz7mvxlak1pb"; + version = "0.0.0.8"; + sha256 = "09zhrg6zrf3viigjdw4q4c1i0x4ww467m9ghapdfwq4d01cr0c43"; libraryHaskellDepends = [ - base containers directory mtl temporary + base containers directory mtl temporary time ]; librarySystemDepends = [ boolector ]; libraryToolDepends = [ c2hs ]; @@ -39700,30 +39351,6 @@ self: { "brick" = callPackage ({ mkDerivation, base, config-ini, containers, contravariant - , data-clist, deepseq, dlist, microlens, microlens-mtl - , microlens-th, QuickCheck, stm, template-haskell, text - , text-zipper, transformers, vector, vty, word-wrap - }: - mkDerivation { - pname = "brick"; - version = "0.37.2"; - sha256 = "176rq7xpwww1c3h7hm6n6z7sxbd3wc2zhxvnk65llk9lipc6rf3w"; - revision = "1"; - editedCabalFile = "0cj98cjlr400yf47lg50syj5zpvh6q9mm1hp4blns6ndz2xys5rz"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base config-ini containers contravariant data-clist deepseq dlist - microlens microlens-mtl microlens-th stm template-haskell text - text-zipper transformers vector vty word-wrap - ]; - testHaskellDepends = [ base containers QuickCheck ]; - description = "A declarative terminal user interface library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "brick_0_45" = callPackage - ({ mkDerivation, base, config-ini, containers, contravariant , data-clist, deepseq, directory, dlist, filepath, microlens , microlens-mtl, microlens-th, QuickCheck, stm, template-haskell , text, text-zipper, transformers, unix, vector, vty, word-wrap @@ -39745,7 +39372,6 @@ self: { ]; description = "A declarative terminal user interface library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "brick-dropdownmenu" = callPackage @@ -39970,19 +39596,6 @@ self: { }) {}; "broadcast-chan" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "broadcast-chan"; - version = "0.1.1"; - sha256 = "1wl5x7qi00z7q9k6rbmzszzbrqycfcpg04a1ikrnvzqs61ddcnxd"; - revision = "1"; - editedCabalFile = "03bmddz9bryh3viskh2nldj4hbzl5b9xkkx2pml73vq9bn2aq5s4"; - libraryHaskellDepends = [ base ]; - description = "Broadcast channel type that avoids 0 reader space leaks"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "broadcast-chan_0_2_0_1" = callPackage ({ mkDerivation, async, base, criterion, deepseq, stm , unliftio-core }: @@ -39996,7 +39609,6 @@ self: { benchmarkHaskellDepends = [ async base criterion deepseq stm ]; description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "broadcast-chan-conduit" = callPackage @@ -40174,10 +39786,8 @@ self: { }: mkDerivation { pname = "bson"; - version = "0.3.2.6"; - sha256 = "106fdxzwpkp5vrnfsrjjwy8dn9rgmxrp79ji7xaxv8dgb9hw73bk"; - revision = "1"; - editedCabalFile = "0d9s7v330fckrxzdgmbdj7bapb1pgla8yf0mq5zhw27shxy5m3dx"; + version = "0.3.2.7"; + sha256 = "0avzr3aa3mbr9hcjwd0nr0pnpiym7s35qw7nghz51mrzb76rsci7"; libraryHaskellDepends = [ base binary bytestring cryptohash data-binary-ieee754 mtl network text time @@ -40317,21 +39927,6 @@ self: { ({ mkDerivation, base, bytestring, time, unix }: mkDerivation { pname = "btrfs"; - version = "0.1.2.3"; - sha256 = "13dq5xdzny1c0yih67r3yhnsr9vxxim8kbqbj5hcygb2cmf0pz3y"; - revision = "1"; - editedCabalFile = "1py88k9sjmx9x41l0wmp19a52ng9fdf66rmd0n9404gxxbqd5jxv"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base bytestring time unix ]; - description = "Bindings to the btrfs API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "btrfs_0_2_0_0" = callPackage - ({ mkDerivation, base, bytestring, time, unix }: - mkDerivation { - pname = "btrfs"; version = "0.2.0.0"; sha256 = "1h56yb4a3i1c452splxj06c8harrcws2pg86rx7jz6b804ncrzr2"; isLibrary = true; @@ -40339,7 +39934,6 @@ self: { libraryHaskellDepends = [ base bytestring time unix ]; description = "Bindings to the btrfs API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "buchhaltung" = callPackage @@ -40854,29 +40448,6 @@ self: { }: mkDerivation { pname = "butcher"; - version = "1.3.2.0"; - sha256 = "06pas8iq0qvvraidjid9m85z7wx8cy017xhyqralxz67alirmchc"; - revision = "1"; - editedCabalFile = "1r4v2biwd0hp6v1jgx7zngh0hqlsk8ia3bvggbxxn5sp5x7ika1m"; - libraryHaskellDepends = [ - base bifunctors containers deque extra free microlens microlens-th - mtl multistate pretty transformers unsafe void - ]; - testHaskellDepends = [ - base containers deque extra free hspec microlens microlens-th mtl - multistate pretty transformers unsafe - ]; - description = "Chops a command or program invocation into digestable pieces"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "butcher_1_3_2_1" = callPackage - ({ mkDerivation, base, bifunctors, containers, deque, extra, free - , hspec, microlens, microlens-th, mtl, multistate, pretty - , transformers, unsafe, void - }: - mkDerivation { - pname = "butcher"; version = "1.3.2.1"; sha256 = "16jwhj3lrghn11igc5ci484r4xc1ii6hz6ysj39njds547dmznda"; libraryHaskellDepends = [ @@ -40889,7 +40460,6 @@ self: { ]; description = "Chops a command or program invocation into digestable pieces"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "butter" = callPackage @@ -42046,6 +41616,8 @@ self: { pname = "cabal-file-th"; version = "0.2.4"; sha256 = "076rprsnb9nyhm97ky4vzfcvirl8wx4g3f68lx7k5inhmkzxfm8b"; + revision = "1"; + editedCabalFile = "0qbhrpn23vrqyh71vkbbs5yxwlb8m6nzfpwn6mqz2xi0wwzvl9s6"; libraryHaskellDepends = [ base Cabal directory pretty template-haskell ]; @@ -42363,10 +41935,8 @@ self: { }: mkDerivation { pname = "cabal-plan"; - version = "0.4.0.0"; - sha256 = "0cbk0xhv189jv656x6a2s0bcnhkks4rlpkhvxbb215v5ldmrkpb1"; - revision = "1"; - editedCabalFile = "161vgfbwm8psqa6ncs12j7sn5lqjag1xi62vllvp8xbz9lcvbchb"; + version = "0.5.0.0"; + sha256 = "1vfa4lwfjhv4nyl1rwm7i99zdkwriighlhfcz0rgjwzgg56wrihq"; configureFlags = [ "-fexe" ]; isLibrary = true; isExecutable = true; @@ -42380,7 +41950,7 @@ self: { ]; doHaddock = false; description = "Library and utiltity for processing cabal's plan.json file"; - license = stdenv.lib.licenses.gpl3; + license = "GPL-2.0-or-later AND BSD-3-Clause"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -42697,8 +42267,8 @@ self: { }: mkDerivation { pname = "cabal2nix"; - version = "2.12"; - sha256 = "0zm85ax4wcdkcyljm2nq40j2yi514x44wr4k75r5qjpsrpsg473v"; + version = "2.13"; + sha256 = "0qp5q40y2wsba0gykws0w6xzbvr19bcgbqbz05xacp14zxw4r4sp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42731,26 +42301,6 @@ self: { }: mkDerivation { pname = "cabal2spec"; - version = "2.1.1"; - sha256 = "1fm9vi7iyxcpvvivy973njlmsp7ia7cl4jijhf43h8wq60skh1md"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base Cabal filepath time ]; - executableHaskellDepends = [ - base Cabal filepath optparse-applicative - ]; - testHaskellDepends = [ base Cabal filepath tasty tasty-golden ]; - description = "Convert Cabal files into rpm spec files"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {}; - - "cabal2spec_2_2_2" = callPackage - ({ mkDerivation, base, Cabal, filepath, optparse-applicative, tasty - , tasty-golden, time - }: - mkDerivation { - pname = "cabal2spec"; version = "2.2.2"; sha256 = "1rb7z4lslqsf8ipsyy7nc3mz4ixz5f5cv5jn5nidj0pc5rl16sxw"; isLibrary = true; @@ -42762,7 +42312,6 @@ self: { testHaskellDepends = [ base Cabal filepath tasty tasty-golden ]; description = "Convert Cabal files into rpm spec files"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -43976,8 +43525,8 @@ self: { }: mkDerivation { pname = "casadi-bindings"; - version = "3.1.0.3"; - sha256 = "0fb4pyz1f66r811ihpcrq5qpznnxrnrrsh8wfy5g8i5k8srf78n9"; + version = "3.4.5.0"; + sha256 = "0ps01gm27dajr8ixfppc2mfmx8yzr24fbq9k5n3c9xgxvn9w7rmc"; libraryHaskellDepends = [ base binary casadi-bindings-core casadi-bindings-internal cereal containers linear spatial-math vector vector-binary-instances @@ -44015,8 +43564,8 @@ self: { }: mkDerivation { pname = "casadi-bindings-core"; - version = "3.1.0.0"; - sha256 = "08z6jh8hn23162d6baznvs3br3fin4rp6j4sdfsiid1c3z92q3rn"; + version = "3.4.5.0"; + sha256 = "0iqzr6gm30a0v7523yqkipgph89wlyihwmnzidpvki0vlv6fldrl"; libraryHaskellDepends = [ base casadi-bindings-internal containers vector ]; @@ -44030,8 +43579,8 @@ self: { ({ mkDerivation, base, casadi, containers, vector }: mkDerivation { pname = "casadi-bindings-internal"; - version = "0.1.5.0"; - sha256 = "0p7kbg015447sasn6n4l5kdafrxc2yhgqrxg46xadma6vvv00hf2"; + version = "0.1.6.1"; + sha256 = "1y2h0r0l0b9y43n0irsc5s82x7xmzdjdjaz6cqmxk19v0hg4jdnx"; libraryHaskellDepends = [ base containers vector ]; librarySystemDepends = [ casadi ]; description = "low level bindings to CasADi"; @@ -44457,26 +44006,6 @@ self: { }: mkDerivation { pname = "cassava-conduit"; - version = "0.5.0"; - sha256 = "0xj8hxyijkajgrg6g52lxfbg83d8gp01b2x35z0mqia2k6whlihr"; - libraryHaskellDepends = [ - array base bifunctors bytestring cassava conduit containers mtl - text - ]; - testHaskellDepends = [ - base bytestring cassava conduit QuickCheck text - ]; - benchmarkHaskellDepends = [ base criterion ]; - description = "Conduit interface for cassava package"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cassava-conduit_0_5_1" = callPackage - ({ mkDerivation, array, base, bifunctors, bytestring, cassava - , conduit, containers, criterion, mtl, QuickCheck, text - }: - mkDerivation { - pname = "cassava-conduit"; version = "0.5.1"; sha256 = "1y3pjvc273vxb8lr3wckliw23n8vninl034wc0zlfh1asplp4nxm"; libraryHaskellDepends = [ @@ -44489,7 +44018,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Conduit interface for cassava package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cassava-embed" = callPackage @@ -44511,27 +44039,6 @@ self: { }) {}; "cassava-megaparsec" = callPackage - ({ mkDerivation, base, bytestring, cassava, containers, hspec - , hspec-megaparsec, megaparsec, unordered-containers, vector - }: - mkDerivation { - pname = "cassava-megaparsec"; - version = "1.0.0"; - sha256 = "14d1idyw4pm8gq41383sy6cid6v1dr9zc7wviy4vd786406j2n28"; - revision = "1"; - editedCabalFile = "0dk6bxyvlg0iq83m81cbyysiydcj3dsvhlishjc119hzpy8g8xd6"; - libraryHaskellDepends = [ - base bytestring cassava containers megaparsec unordered-containers - vector - ]; - testHaskellDepends = [ - base bytestring cassava hspec hspec-megaparsec vector - ]; - description = "Megaparsec parser of CSV files that plays nicely with Cassava"; - license = stdenv.lib.licenses.mit; - }) {}; - - "cassava-megaparsec_2_0_0" = callPackage ({ mkDerivation, base, bytestring, cassava, hspec, hspec-megaparsec , megaparsec, unordered-containers, vector }: @@ -44547,7 +44054,6 @@ self: { ]; description = "Megaparsec parser of CSV files that plays nicely with Cassava"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cassava-records" = callPackage @@ -44878,8 +44384,8 @@ self: { }: mkDerivation { pname = "cayley-client"; - version = "0.4.7"; - sha256 = "13jrmlci29hdx0mxs4lzd9xdrdn9qga4891p49nhfpfiz4gch6xs"; + version = "0.4.8"; + sha256 = "09hrq1k8s8w7rawyn78hjagirs3yrkp79nn7p5w1l8amp27k5cdi"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring exceptions http-client http-conduit lens lens-aeson mtl text transformers @@ -47043,6 +46549,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "cisco-spark-api_0_1_0_4" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bitset-word8 + , bytestring, conduit, data-default, hspec, http-conduit + , http-types, network-uri, optparse-applicative, text, utf8-string + , wai, warp + }: + mkDerivation { + pname = "cisco-spark-api"; + version = "0.1.0.4"; + sha256 = "0i528c0lbk3k30q53p3qy01fq3mdpv0664q49lfvzcxkkjchwmbg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bitset-word8 bytestring conduit data-default + http-conduit network-uri text + ]; + executableHaskellDepends = [ + aeson base bytestring conduit data-default http-conduit + optparse-applicative text utf8-string + ]; + testHaskellDepends = [ + aeson async attoparsec base bytestring conduit data-default hspec + http-conduit http-types network-uri text wai warp + ]; + description = "DEPRECATED in favor of webex-teams-api"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "citation-resolve" = callPackage ({ mkDerivation, aeson, base, bytestring, citeproc-hs, containers , curl, data-default, directory, doctest, download-curl, either @@ -47666,34 +47201,6 @@ self: { }: mkDerivation { pname = "classy-prelude"; - version = "1.4.0"; - sha256 = "1q7r4lnrxjsh7rj5nr0cs22ddp9m6maa7bzbkarxw3xbfrb2afrb"; - revision = "1"; - editedCabalFile = "1gf615lz0bfsn09vrjgj63d8zcpsmz1cgvdv8px3h0b4jrwdij6v"; - libraryHaskellDepends = [ - async base basic-prelude bifunctors bytestring chunked-data - containers deepseq dlist ghc-prim hashable mono-traversable - mono-traversable-instances mtl mutable-containers primitive say - semigroups stm stm-chans text time transformers unliftio - unordered-containers vector vector-instances - ]; - testHaskellDepends = [ - base containers hspec QuickCheck transformers unordered-containers - ]; - description = "A typeclass-based Prelude"; - license = stdenv.lib.licenses.mit; - }) {}; - - "classy-prelude_1_5_0" = callPackage - ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring - , chunked-data, containers, deepseq, dlist, ghc-prim, hashable - , hspec, mono-traversable, mono-traversable-instances, mtl - , mutable-containers, primitive, QuickCheck, say, semigroups, stm - , stm-chans, text, time, transformers, unliftio - , unordered-containers, vector, vector-instances - }: - mkDerivation { - pname = "classy-prelude"; version = "1.5.0"; sha256 = "1nm4lygxqb1wq503maki6dsah2gpn5rd22jmbwjxfwyzgyqy9fnk"; libraryHaskellDepends = [ @@ -47708,7 +47215,6 @@ self: { ]; description = "A typeclass-based Prelude"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "classy-prelude-conduit" = callPackage @@ -47717,25 +47223,6 @@ self: { }: mkDerivation { pname = "classy-prelude-conduit"; - version = "1.4.0"; - sha256 = "096466cyyxxmg3jpq705xjjc4r7v9b607hgbys8vybjlldkjbvrr"; - libraryHaskellDepends = [ - base bytestring classy-prelude conduit monad-control resourcet - transformers void - ]; - testHaskellDepends = [ - base bytestring conduit hspec QuickCheck transformers - ]; - description = "classy-prelude together with conduit functions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "classy-prelude-conduit_1_5_0" = callPackage - ({ mkDerivation, base, bytestring, classy-prelude, conduit, hspec - , monad-control, QuickCheck, resourcet, transformers, void - }: - mkDerivation { - pname = "classy-prelude-conduit"; version = "1.5.0"; sha256 = "007xz0yzp0bzbrx7arj7xmjlwrja120kwgxrbkm98sydjlsph9ys"; libraryHaskellDepends = [ @@ -47747,7 +47234,6 @@ self: { ]; description = "classy-prelude together with conduit functions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "classy-prelude-yesod" = callPackage @@ -47757,25 +47243,6 @@ self: { }: mkDerivation { pname = "classy-prelude-yesod"; - version = "1.4.0"; - sha256 = "0a4y9fipcikndzqqna5694f1wcwwin5ir076pjj1nm638a7silhc"; - libraryHaskellDepends = [ - aeson base classy-prelude classy-prelude-conduit data-default - http-conduit http-types persistent yesod yesod-newsfeed - yesod-static - ]; - description = "Provide a classy prelude including common Yesod functionality"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "classy-prelude-yesod_1_5_0" = callPackage - ({ mkDerivation, aeson, base, classy-prelude - , classy-prelude-conduit, data-default, http-conduit, http-types - , persistent, yesod, yesod-newsfeed, yesod-static - }: - mkDerivation { - pname = "classy-prelude-yesod"; version = "1.5.0"; sha256 = "10wz09ksn537w5z9lmj4dsfi0ygk37d5khijr8qq3py2gr2c9ywz"; libraryHaskellDepends = [ @@ -48622,8 +48089,8 @@ self: { }: mkDerivation { pname = "cloudi"; - version = "1.7.4"; - sha256 = "0vpsb7sngc8q7bkdg737bfzqfkl14mwjzaycfs0x0fwl6f8l5a8a"; + version = "1.7.5"; + sha256 = "08cklswxmd7x0zxkkrlwh1qy57jbqp0dv3x57xskxpmwyhws2vgs"; libraryHaskellDepends = [ array base binary bytestring containers network time unix zlib ]; @@ -49312,25 +48779,12 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "code-page"; - version = "0.1.3"; - sha256 = "1491frk4jx6dlhifky9dvcxbsbcfssrz979a5hp5zn061rh8cp76"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; - description = "Windows code page library for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "code-page_0_2" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "code-page"; version = "0.2"; sha256 = "0i0qbrbhvrwkbikqb7hh7yxaipaavwzvyrw211d0vkz99f62mqxz"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Windows code page library for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "codec" = callPackage @@ -49504,26 +48958,26 @@ self: { "codex" = callPackage ({ mkDerivation, ascii-progress, base, bytestring, Cabal - , containers, cryptohash, directory, either, filepath, hackage-db - , http-client, lens, machines, machines-directory, MissingH - , monad-loops, network, process, tar, text, transformers, wreq - , yaml, zlib + , containers, cryptohash, directory, filepath, hackage-db + , http-client, lens, machines, machines-directory, network, process + , tar, text, transformers, wreq, yaml, zlib }: mkDerivation { pname = "codex"; - version = "0.5.1.2"; - sha256 = "0w9m737v3fdgslqdfw16bq7hhsimjazdxrd4r5kzpm0jai39707r"; + version = "0.5.2.0"; + sha256 = "1bvz8pzh9qgb7ffnmihcain877igf1hm8rs4z9qx1gckz2c566vv"; + revision = "1"; + editedCabalFile = "0v0jlarip2689jxixymqzy36qywla76j78iqzyyc6s7hrd63mrlx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ascii-progress base bytestring Cabal containers cryptohash - directory either filepath hackage-db http-client lens machines + directory filepath hackage-db http-client lens machines machines-directory process tar text transformers wreq yaml zlib ]; executableHaskellDepends = [ - ascii-progress base bytestring Cabal directory either filepath - hackage-db MissingH monad-loops network process transformers wreq - yaml + ascii-progress base Cabal directory filepath hackage-db network + process transformers wreq yaml ]; description = "A ctags file generator for cabal project dependencies"; license = stdenv.lib.licenses.asl20; @@ -51201,23 +50655,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "composition-prelude"; - version = "1.5.3.1"; - sha256 = "0dq4znxr3qy2avmv68lzw4xrbfccap19ri2hxmlkl6r8p2850k7d"; - libraryHaskellDepends = [ base ]; - description = "Higher-order function combinators"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "composition-prelude_2_0_2_1" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "composition-prelude"; version = "2.0.2.1"; sha256 = "0vxgy13k0ca3bi7rh9wc1pdrlpdjbm6va95djmmysdw8a9yyp9wi"; libraryHaskellDepends = [ base ]; description = "Higher-order function combinators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "composition-tree" = callPackage @@ -52565,24 +52007,6 @@ self: { }: mkDerivation { pname = "config-ini"; - version = "0.2.2.0"; - sha256 = "1820w4y8k0qrlilrizkqckwiyli0x4qcdjmagvcngy5bfsw6fk9n"; - libraryHaskellDepends = [ - base containers megaparsec text transformers unordered-containers - ]; - testHaskellDepends = [ - base containers directory hedgehog ini text unordered-containers - ]; - description = "A library for simple INI-based configuration files"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "config-ini_0_2_4_0" = callPackage - ({ mkDerivation, base, containers, directory, hedgehog, ini - , megaparsec, text, transformers, unordered-containers - }: - mkDerivation { - pname = "config-ini"; version = "0.2.4.0"; sha256 = "0dfm4xb1sd713rcqzplzdgw68fyhj24i6lj8j3q8kldpmkl98lbf"; libraryHaskellDepends = [ @@ -52593,7 +52017,6 @@ self: { ]; description = "A library for simple INI-based configuration files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "config-manager" = callPackage @@ -52745,38 +52168,6 @@ self: { }: mkDerivation { pname = "configuration-tools"; - version = "0.3.1"; - sha256 = "0ivfz3vjf81dnxqlzp4ij8snw0bfy227b26r3j1vvhc4n1qpxpz0"; - libraryHaskellDepends = [ - aeson ansi-wl-pprint attoparsec base base-unicode-symbols - base64-bytestring bytestring Cabal case-insensitive connection - data-default deepseq directory dlist enclosed-exceptions filepath - http-client http-client-tls http-types monad-control mtl - network-uri optparse-applicative process profunctors semigroups - text tls transformers unordered-containers x509 x509-system - x509-validation yaml - ]; - testHaskellDepends = [ - base base-unicode-symbols bytestring Cabal enclosed-exceptions - http-types monad-control mtl text transformers unordered-containers - wai warp warp-tls yaml - ]; - description = "Tools for specifying and parsing configurations"; - license = stdenv.lib.licenses.mit; - }) {}; - - "configuration-tools_0_4_0" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base - , base-unicode-symbols, base64-bytestring, bytestring, Cabal - , case-insensitive, connection, data-default, deepseq, directory - , dlist, enclosed-exceptions, filepath, http-client - , http-client-tls, http-types, monad-control, mtl, network-uri - , optparse-applicative, process, profunctors, semigroups, text, tls - , transformers, unordered-containers, wai, warp, warp-tls, x509 - , x509-system, x509-validation, yaml - }: - mkDerivation { - pname = "configuration-tools"; version = "0.4.0"; sha256 = "0bsxvbdhcgrhz9dm32bs5fb7ywdjb68xii74wdli4s0axs4q5dpx"; setupHaskellDepends = [ @@ -52798,7 +52189,6 @@ self: { ]; description = "Tools for specifying and parsing configurations"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "configurator" = callPackage @@ -53339,8 +52729,8 @@ self: { ({ mkDerivation, base, containers, convert, lens, text, vector }: mkDerivation { pname = "container"; - version = "1.1.5"; - sha256 = "1hh3ahw1vfmws1hyyl6blqyxaz4qcip0h0d80ia8pb6b1gfbvxsm"; + version = "1.1.6"; + sha256 = "0q4zgd7hsnpq5wnn5gk5rz9nq1kfp8ci5kc6yp1rmzbyky3j0211"; libraryHaskellDepends = [ base containers convert lens text vector ]; @@ -53633,22 +53023,6 @@ self: { }) {}; "contravariant" = callPackage - ({ mkDerivation, base, StateVar, transformers, transformers-compat - }: - mkDerivation { - pname = "contravariant"; - version = "1.4.1"; - sha256 = "1vfhk8c5cxmmakx7rflap1ipkx5q0j5vnlrcz7yz6y53kxhksgf9"; - revision = "1"; - editedCabalFile = "0qj5nymccrb9p0cd6hffsy90jidjng14g9yv95z8v6h4q84sbzvx"; - libraryHaskellDepends = [ - base StateVar transformers transformers-compat - ]; - description = "Contravariant functors"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "contravariant_1_5" = callPackage ({ mkDerivation, base, StateVar, transformers }: mkDerivation { pname = "contravariant"; @@ -53657,7 +53031,6 @@ self: { libraryHaskellDepends = [ base StateVar transformers ]; description = "Contravariant functors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "contravariant-extras" = callPackage @@ -54025,8 +53398,8 @@ self: { }: mkDerivation { pname = "convert"; - version = "1.5"; - sha256 = "0hw2qmb3g9p7zqqk92hwnzamld6kg121dkv4va4hkpcjlhb8af6g"; + version = "1.5.1"; + sha256 = "044syln587z5mc4fia0d81p47rpkbvzkyyrcxyckqkh2yj3b2k85"; libraryHaskellDepends = [ ansi-wl-pprint base bytestring containers data-default impossible lens template-haskell text utf8-string @@ -55005,6 +54378,45 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cql-io_1_1_0" = callPackage + ({ mkDerivation, async, auto-update, base, bytestring, containers + , cql, cryptonite, data-default-class, Decimal, exceptions + , hashable, HsOpenSSL, iproute, lens, mtl, mwc-random, network + , primes, raw-strings-qq, retry, semigroups, stm, tasty + , tasty-hunit, text, time, transformers, unliftio-core + , unordered-containers, uuid, vector + }: + mkDerivation { + pname = "cql-io"; + version = "1.1.0"; + sha256 = "1pqqq31f9xcpn5rykkgrakgl17dm1nnskh1m88fxaynzjj485pkw"; + libraryHaskellDepends = [ + async auto-update base bytestring containers cql cryptonite + data-default-class exceptions hashable HsOpenSSL iproute lens mtl + mwc-random network retry semigroups stm text time transformers + unliftio-core unordered-containers uuid vector + ]; + testHaskellDepends = [ + async base containers cql Decimal iproute mtl primes raw-strings-qq + tasty tasty-hunit text time uuid + ]; + doHaddock = false; + description = "Cassandra CQL client"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "cql-io-tinylog" = callPackage + ({ mkDerivation, base, bytestring, cql-io, tinylog }: + mkDerivation { + pname = "cql-io-tinylog"; + version = "0.1.0"; + sha256 = "14mr1i7g61h25fn2xa02iyzq1mxcgzkisfmiakdakiya4zxjk10f"; + libraryHaskellDepends = [ base bytestring cql-io tinylog ]; + description = "Tinylog integration for cql-io"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "cqrs" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -55599,43 +55011,6 @@ self: { "criterion" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat , base-compat-batteries, binary, bytestring, cassava, code-page - , containers, deepseq, directory, exceptions, filepath, Glob, HUnit - , js-flot, js-jquery, microstache, mtl, mwc-random - , optparse-applicative, parsec, QuickCheck, semigroups, statistics - , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers - , transformers-compat, vector, vector-algorithms - }: - mkDerivation { - pname = "criterion"; - version = "1.4.1.0"; - sha256 = "0v429araqkcw3wwwi6fsp0g7g1hy3l47p061lcy7r4m7d9khd4y4"; - revision = "1"; - editedCabalFile = "0jg7mk9y9br5aqi29vrrrq28mnyknyg96zmr8rrlxw0rf68l892a"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint base base-compat-batteries binary bytestring - cassava code-page containers deepseq directory exceptions filepath - Glob js-flot js-jquery microstache mtl mwc-random - optparse-applicative parsec semigroups statistics text time - transformers transformers-compat vector vector-algorithms - ]; - executableHaskellDepends = [ - base base-compat-batteries optparse-applicative semigroups - ]; - testHaskellDepends = [ - aeson base base-compat base-compat-batteries bytestring deepseq - directory HUnit QuickCheck statistics tasty tasty-hunit - tasty-quickcheck vector - ]; - description = "Robust, reliable performance measurement and analysis"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "criterion_1_5_3_0" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat - , base-compat-batteries, binary, bytestring, cassava, code-page , containers, criterion-measurement, deepseq, directory, exceptions , filepath, Glob, HUnit, js-flot, js-jquery, microstache, mtl , mwc-random, optparse-applicative, parsec, QuickCheck, statistics @@ -55666,7 +55041,6 @@ self: { ]; description = "Robust, reliable performance measurement and analysis"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "criterion-measurement" = callPackage @@ -56035,25 +55409,6 @@ self: { }) {}; "crypto-enigma" = callPackage - ({ mkDerivation, ansi-terminal, base, containers, HUnit, mtl - , optparse-applicative, QuickCheck, split, text - }: - mkDerivation { - pname = "crypto-enigma"; - version = "0.0.3.1"; - sha256 = "0iadzyp44ylzwq65jqvln1cmlnsvpwvy0cvpn8xfdqd1x0qil8i2"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base containers mtl split text ]; - executableHaskellDepends = [ - ansi-terminal base containers mtl optparse-applicative split text - ]; - testHaskellDepends = [ base HUnit QuickCheck ]; - description = "An Enigma machine simulator with display"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "crypto-enigma_0_1_1_4" = callPackage ({ mkDerivation, ansi-terminal, base, containers, HUnit , optparse-applicative, QuickCheck, split, text }: @@ -56070,7 +55425,6 @@ self: { testHaskellDepends = [ base HUnit QuickCheck ]; description = "An Enigma machine simulator with display"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "crypto-multihash" = callPackage @@ -56466,8 +55820,8 @@ self: { pname = "cryptoids"; version = "0.5.1.0"; sha256 = "0ai7hg4r944hck9vq2ffwwjsxp3mjfvxwhfr8b8765n1bh86i466"; - revision = "1"; - editedCabalFile = "0whcgkgdq7hp1z4dr8291q8kpqipfr4mvn8dqq7byxm10v59kn0k"; + revision = "3"; + editedCabalFile = "0pjdc90i3qyzxc289kjvn90hnn5xjjzjpgnb24iwqj6ik9asi86g"; libraryHaskellDepends = [ base binary bytestring cryptoids-class cryptoids-types cryptonite directory exceptions filepath memory @@ -56482,22 +55836,26 @@ self: { pname = "cryptoids-class"; version = "0.0.0"; sha256 = "0zp0d815r0dv2xqdi6drq846zz2a82gpqp6nvap3b5dnx2q3hbjy"; - revision = "3"; - editedCabalFile = "1hcdhmksd81sylfjyx0wb4yhrswdwbjlaarq8fbmwcl7fjm4sxfy"; + revision = "4"; + editedCabalFile = "0c3cq648sh5cpj0isknhayamzgzv8avixxfpzr4riags70jr28ld"; libraryHaskellDepends = [ base cryptoids-types exceptions ]; description = "Typeclass-based interface to cryptoids"; license = stdenv.lib.licenses.bsd3; }) {}; "cryptoids-types" = callPackage - ({ mkDerivation, base, binary, http-api-data, path-pieces }: + ({ mkDerivation, aeson, base, binary, deepseq, hashable + , http-api-data, path-pieces + }: mkDerivation { pname = "cryptoids-types"; - version = "0.0.0"; - sha256 = "0qp6lx1k2mqay1i4wgkwgaqamp33gijw0wb13rh71i0qwyvnr51b"; - revision = "3"; - editedCabalFile = "1v8fgyh03qggn0fr2kg79m3r1v9i85q0dihgmbq5z4s1y700c8vq"; - libraryHaskellDepends = [ base binary http-api-data path-pieces ]; + version = "1.0.0"; + sha256 = "0dhv92hdydhhgwgdihl3wpiyxl10szrgfnb68ygn07xxhmmfc3hf"; + revision = "1"; + editedCabalFile = "0fy6fxzaimgi0nrplzdgi0s26cjz2nrv7y5gdnk0z6k3jd1x5qgb"; + libraryHaskellDepends = [ + aeson base binary deepseq hashable http-api-data path-pieces + ]; description = "Shared types for encrypting internal object identifiers before exposure"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -56866,24 +56224,6 @@ self: { }) {}; "css-syntax" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, directory, hspec - , scientific, text - }: - mkDerivation { - pname = "css-syntax"; - version = "0.0.8"; - sha256 = "1h9h606q9m9sxgwjxx3km9b30l4rmaygd2zfigf38wz45vqfqwa2"; - 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_1_0_0" = callPackage ({ mkDerivation, base, criterion, deepseq, directory, hspec , QuickCheck, scientific, text }: @@ -56902,7 +56242,6 @@ self: { ]; description = "High-performance CSS tokenizer and serializer"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "css-text" = callPackage @@ -57244,30 +56583,6 @@ self: { "cue-sheet" = callPackage ({ mkDerivation, base, bytestring, containers, data-default-class - , exceptions, hspec, hspec-megaparsec, megaparsec, mtl, QuickCheck - , text - }: - mkDerivation { - pname = "cue-sheet"; - version = "1.0.1"; - sha256 = "13vzay3i385k8i2k56bl9rr9sy7mnhas4b35xc8q7744gbl5hji1"; - revision = "3"; - editedCabalFile = "14kgk1digf1vbsr7v5jvj8gajkx0rkn3zjl4m8csqhxalkaxa2zl"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers data-default-class exceptions megaparsec - mtl QuickCheck text - ]; - testHaskellDepends = [ - base bytestring exceptions hspec hspec-megaparsec megaparsec - QuickCheck text - ]; - description = "Support for construction, rendering, and parsing of CUE sheets"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cue-sheet_2_0_0" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default-class , exceptions, hspec, hspec-discover, hspec-megaparsec, megaparsec , mtl, QuickCheck, text }: @@ -57289,7 +56604,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Support for construction, rendering, and parsing of CUE sheets"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cufft" = callPackage @@ -57336,29 +56650,6 @@ self: { }) {}; "curl-runnings" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring - , case-insensitive, cmdargs, directory, hspec, hspec-expectations - , http-conduit, http-types, megaparsec, text, unordered-containers - , vector, yaml - }: - mkDerivation { - pname = "curl-runnings"; - version = "0.6.0"; - sha256 = "06dcxwhmzsinmay63m9wnsjsy1cgwyms64c0jicndnc3nhbl0824"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base bytestring case-insensitive directory hspec - hspec-expectations http-conduit http-types megaparsec text - unordered-containers vector yaml - ]; - executableHaskellDepends = [ base cmdargs text ]; - testHaskellDepends = [ base directory hspec hspec-expectations ]; - description = "A framework for declaratively writing curl based API tests"; - license = stdenv.lib.licenses.mit; - }) {}; - - "curl-runnings_0_9_2" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive, cmdargs , directory, hspec, hspec-expectations, http-conduit, http-types , megaparsec, pretty-simple, regex-posix, tar, text @@ -57381,7 +56672,6 @@ self: { testHaskellDepends = [ base directory hspec hspec-expectations ]; description = "A framework for declaratively writing curl based API tests"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "curlhs" = callPackage @@ -60564,6 +59854,8 @@ self: { pname = "dbus"; version = "0.10.15"; sha256 = "1a5sjavq8mfzz4zxpkd9b6jxsvy0kl1rjq2hhy40gcz2qjfnamb4"; + revision = "1"; + editedCabalFile = "04fy208xlvdyi2ms9c2l2xd7jwi6vd0wzpv2v2s0bc2icha79rih"; libraryHaskellDepends = [ base bytestring cereal containers deepseq libxml-sax network parsec random text transformers unix vector xml-types @@ -60582,34 +59874,6 @@ self: { }) {}; "dbus" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, criterion - , deepseq, directory, extra, filepath, lens, libxml-sax, network - , parsec, process, QuickCheck, random, resourcet, split, tasty - , tasty-hunit, tasty-quickcheck, template-haskell, text, th-lift - , transformers, unix, vector, xml-types - }: - mkDerivation { - pname = "dbus"; - version = "1.0.1"; - sha256 = "1xg8wzs7xnh3455v3bbw9nd8inzr06n5939pzlq3nd4ajp3ba9d3"; - libraryHaskellDepends = [ - base bytestring cereal containers deepseq filepath lens libxml-sax - network parsec random split template-haskell text th-lift - transformers unix vector xml-types - ]; - testHaskellDepends = [ - base bytestring cereal containers directory extra filepath - libxml-sax network parsec process QuickCheck random resourcet tasty - tasty-hunit tasty-quickcheck text transformers unix vector - xml-types - ]; - benchmarkHaskellDepends = [ base criterion ]; - doCheck = false; - description = "A client library for the D-Bus IPC system"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "dbus_1_2_1" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, containers , criterion, deepseq, directory, exceptions, extra, filepath, lens , network, parsec, process, QuickCheck, random, resourcet, split @@ -60634,7 +59898,6 @@ self: { doCheck = false; description = "A client library for the D-Bus IPC system"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dbus-client" = callPackage @@ -62264,17 +61527,6 @@ self: { }) {}; "deque" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "deque"; - version = "0.2.1"; - sha256 = "0r1jabz5jamm79nrbwjnajzzn77fkhqbjfnmkahg293761z1k781"; - libraryHaskellDepends = [ base ]; - description = "Double-ended queue"; - license = stdenv.lib.licenses.mit; - }) {}; - - "deque_0_2_7" = callPackage ({ mkDerivation, base, QuickCheck, quickcheck-instances, rerebase , tasty, tasty-hunit, tasty-quickcheck }: @@ -62289,7 +61541,6 @@ self: { ]; description = "Double-ended queue"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dequeue" = callPackage @@ -62783,25 +62034,6 @@ self: { }: mkDerivation { pname = "df1"; - version = "0.1.1"; - sha256 = "1qrgf823bf33g6vvilg9q4v1avdwh0iprf26qypzjsbzykbhj91n"; - libraryHaskellDepends = [ - attoparsec base bytestring containers text time - ]; - testHaskellDepends = [ - attoparsec base bytestring QuickCheck tasty tasty-quickcheck text - time - ]; - description = "Type, render and parse the df1 hierarchical structured log format"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "df1_0_3" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers - , QuickCheck, tasty, tasty-quickcheck, text, time - }: - mkDerivation { - pname = "df1"; version = "0.3"; sha256 = "1qiy2xxri3vdqhy78ccan7phrlfdkb2ndvrj8grlhbzycmai64i3"; libraryHaskellDepends = [ @@ -62813,7 +62045,6 @@ self: { ]; description = "Type, render and parse the df1 hierarchical structured log format"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dfinity-radix-tree" = callPackage @@ -62911,42 +62142,6 @@ self: { "dhall" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, case-insensitive - , containers, contravariant, criterion, cryptonite, deepseq, Diff - , directory, doctest, exceptions, filepath, haskeline, http-client - , http-client-tls, insert-ordered-containers, lens-family-core - , megaparsec, memory, mockery, mtl, optparse-applicative, parsers - , prettyprinter, prettyprinter-ansi-terminal, repline, scientific - , tasty, tasty-hunit, template-haskell, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "dhall"; - version = "1.15.1"; - sha256 = "0c4fr0cs56wkfqiylbpi5qlyxxk9k6x5f9yphq12xf06l2vb6fza"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal base bytestring case-insensitive containers - contravariant cryptonite Diff directory exceptions filepath - haskeline http-client http-client-tls insert-ordered-containers - lens-family-core megaparsec memory mtl optparse-applicative parsers - prettyprinter prettyprinter-ansi-terminal repline scientific - template-haskell text transformers unordered-containers vector - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base deepseq directory doctest filepath insert-ordered-containers - mockery prettyprinter tasty tasty-hunit text vector - ]; - benchmarkHaskellDepends = [ - base containers criterion directory text - ]; - description = "A configuration language guaranteed to terminate"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dhall_1_19_1" = callPackage - ({ mkDerivation, ansi-terminal, base, bytestring, case-insensitive , cborg, containers, contravariant, criterion, cryptonite, deepseq , Diff, directory, doctest, dotgen, exceptions, filepath, haskeline , http-client, http-client-tls, http-types, lens-family-core @@ -62984,33 +62179,10 @@ self: { ]; description = "A configuration language guaranteed to terminate"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dhall-bash" = callPackage ({ mkDerivation, base, bytestring, containers, dhall - , insert-ordered-containers, neat-interpolation, optparse-generic - , shell-escape, text - }: - mkDerivation { - pname = "dhall-bash"; - version = "1.0.15"; - sha256 = "15xgfglxy5bac93i83pp4pc78yfcwq6ys9vpak9kmklsbr08ynq4"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers dhall insert-ordered-containers - neat-interpolation shell-escape text - ]; - executableHaskellDepends = [ - base bytestring dhall optparse-generic text - ]; - description = "Compile Dhall to Bash"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dhall-bash_1_0_17" = callPackage - ({ mkDerivation, base, bytestring, containers, dhall , neat-interpolation, optparse-generic, shell-escape, text }: mkDerivation { @@ -63028,7 +62200,6 @@ self: { ]; description = "Compile Dhall to Bash"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dhall-check" = callPackage @@ -63051,30 +62222,6 @@ self: { "dhall-json" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall - , insert-ordered-containers, optparse-applicative, tasty - , tasty-hunit, text, unordered-containers, yaml - }: - mkDerivation { - pname = "dhall-json"; - version = "1.2.3"; - sha256 = "1npw5x49jrijq6lby5ipnywqvbq67znmbsrfhnk0pi9pz4kixjw3"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base dhall insert-ordered-containers optparse-applicative - text unordered-containers - ]; - executableHaskellDepends = [ - aeson aeson-pretty base bytestring dhall optparse-applicative text - yaml - ]; - testHaskellDepends = [ aeson base dhall tasty tasty-hunit text ]; - description = "Compile Dhall to JSON or YAML"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dhall-json_1_2_5" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall , optparse-applicative, tasty, tasty-hunit, text , unordered-containers, vector, yaml }: @@ -63098,7 +62245,6 @@ self: { ]; description = "Compile Dhall to JSON or YAML"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dhall-lex" = callPackage @@ -63208,22 +62354,6 @@ self: { }) {}; "di" = callPackage - ({ mkDerivation, base, df1, di-core, di-df1, di-handle, di-monad - , exceptions - }: - mkDerivation { - pname = "di"; - version = "1.0.1"; - sha256 = "0h7c6s18vj60higi23icjsf1ky756l553v3a18bdkf4dgcxfs4r9"; - libraryHaskellDepends = [ - base df1 di-core di-df1 di-handle di-monad exceptions - ]; - description = "Typeful hierarchical structured logging using di, mtl and df1"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "di_1_2" = callPackage ({ mkDerivation, base, containers, df1, di-core, di-df1, di-handle , di-monad, exceptions }: @@ -63298,21 +62428,6 @@ self: { }: mkDerivation { pname = "di-monad"; - version = "1.0.2"; - sha256 = "1s2f2rvchfc6ha8w75rcz5w9706vf9zmxgrimav211vph3hpjkdq"; - libraryHaskellDepends = [ - base containers di-core exceptions mtl pipes stm transformers - ]; - description = "mtl flavoured typeful hierarchical structured logging for di-core"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "di-monad_1_3" = callPackage - ({ mkDerivation, base, containers, di-core, exceptions, mtl, pipes - , stm, transformers - }: - mkDerivation { - pname = "di-monad"; version = "1.3"; sha256 = "019k7jc3lvh6cgmrgdjq13hcvh6ar76n38li4nviikqbsvxmpqsl"; libraryHaskellDepends = [ @@ -63320,7 +62435,6 @@ self: { ]; description = "mtl flavoured typeful hierarchical structured logging for di-core"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dia-base" = callPackage @@ -63635,8 +62749,8 @@ self: { pname = "diagrams-lib"; version = "1.4.2.3"; sha256 = "175yzi5kw4yd8ykdkpf64q85c7j3p89l90m3h6qcsx9ipv6av9r5"; - revision = "1"; - editedCabalFile = "0zsigisgn6sjpfy2hm31zddnsyqm2a046nxb5drjqm7r0aa3vjff"; + revision = "2"; + editedCabalFile = "0gn1lpsq1v9qpyhpizyknn3sfixg1b64s0dsl1jf25lz4kcrpbs7"; libraryHaskellDepends = [ active adjunctions array base bytestring cereal colour containers data-default-class diagrams-core diagrams-solve directory @@ -63812,8 +62926,8 @@ self: { pname = "diagrams-solve"; version = "0.1.1"; sha256 = "17agchqkmj14b17sw50kzxq4hm056g5d8yy0wnqn5w8h1d0my7x4"; - revision = "3"; - editedCabalFile = "13vfs5k09c16q3dvqzgfca1kd93pgc4ll8mfl3wracanm5mn5rx7"; + revision = "4"; + editedCabalFile = "1yjacw17ga4rh6iw70vclk03qm5xjw4y17c7m43gjw8h3cfaq15d"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base deepseq tasty tasty-hunit tasty-quickcheck @@ -65944,26 +65058,6 @@ self: { "distributive" = callPackage ({ mkDerivation, base, base-orphans, Cabal, cabal-doctest, doctest - , generic-deriving, hspec, tagged, transformers - , transformers-compat - }: - mkDerivation { - pname = "distributive"; - version = "0.5.3"; - sha256 = "0y566r97sfyvhsmd4yxiz4ns2mqgwf5bdbp56wgxl6wlkidq0wwi"; - revision = "6"; - editedCabalFile = "06bd38rf31yrvvy989r44pm0id3dsxwcp6nxg7wk6ccj3n2b8rzk"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base base-orphans tagged transformers transformers-compat - ]; - testHaskellDepends = [ base doctest generic-deriving hspec ]; - description = "Distributive functors -- Dual to Traversable"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "distributive_0_6" = callPackage - ({ mkDerivation, base, base-orphans, Cabal, cabal-doctest, doctest , generic-deriving, hspec, hspec-discover, tagged, transformers }: mkDerivation { @@ -65976,7 +65070,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Distributive functors -- Dual to Traversable"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diversity" = callPackage @@ -66540,25 +65633,12 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "dockerfile"; - version = "0.1.0.1"; - sha256 = "0980w0fh5xb7azknnmph6rmnzswsjw360ga5ymds2valq2vc0ji9"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec ]; - description = "A simple DSL for describing and generating Dockerfile containers in Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "dockerfile_0_2_0" = callPackage - ({ mkDerivation, base, hspec }: - mkDerivation { - pname = "dockerfile"; version = "0.2.0"; sha256 = "1amm7xrfry3fnd53wj50b684lp1vkv98yrz52xxhlldzb4jrk8cp"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "A Haskell DSL for generating Dockerfiles"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "docopt" = callPackage @@ -66648,28 +65728,6 @@ self: { }: mkDerivation { pname = "doctest-discover"; - version = "0.1.0.9"; - sha256 = "1clr6w1h726bbcpq2px2c51jsk48i6ki1yd9vhqj2scvy4nvp437"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring directory doctest filepath - ]; - executableHaskellDepends = [ - aeson base bytestring directory doctest filepath - ]; - testHaskellDepends = [ base doctest ]; - doHaddock = false; - description = "Easy way to run doctests via cabal"; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "doctest-discover_0_2_0_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, doctest - , filepath - }: - mkDerivation { - pname = "doctest-discover"; version = "0.2.0.0"; sha256 = "1j4yqkb5jvvm9g2xpnm6gy4brb725cn3hzm7cv3yylkyhd8allx9"; isLibrary = true; @@ -66684,7 +65742,6 @@ self: { doHaddock = false; description = "Easy way to run doctests via cabal"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "doctest-discover-configurator" = callPackage @@ -66716,11 +65773,11 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "doctest-driver-gen"; - version = "0.2.0.4"; - sha256 = "0wbsql0pph74nghnnwwm2p8w4wnqs0iiwqfn3p3i26g6cg8yv1nr"; + version = "0.3.0.0"; + sha256 = "13m5f15076grwln29pnpqrq9h45cy46pagpk1qw3vzspp7k4ahk1"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base doctest ]; + libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "Generate driver file for doctest's cabal integration"; @@ -67036,35 +66093,6 @@ self: { }) {}; "dotenv" = callPackage - ({ mkDerivation, base, base-compat, directory, exceptions, hspec - , hspec-megaparsec, megaparsec, optparse-applicative, process, text - , transformers, yaml - }: - mkDerivation { - pname = "dotenv"; - version = "0.5.2.5"; - sha256 = "1qglnss7jpns585l1k2m3pwqv7mq3jvh66ypmjjxxi1zcihbz5x1"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base base-compat directory exceptions megaparsec process text - transformers yaml - ]; - executableHaskellDepends = [ - base base-compat megaparsec optparse-applicative process text - transformers yaml - ]; - testHaskellDepends = [ - base base-compat directory exceptions hspec hspec-megaparsec - megaparsec process text transformers yaml - ]; - description = "Loads environment variables from dotenv files"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "dotenv_0_8_0_0" = callPackage ({ mkDerivation, base, base-compat, containers, directory , exceptions, hspec, hspec-megaparsec, megaparsec , optparse-applicative, process, text, transformers, yaml @@ -68119,20 +67147,6 @@ self: { }: mkDerivation { pname = "dunai"; - version = "0.4.0.0"; - sha256 = "05xqhbz0x7wzfka4wl2wvfhzr242nx4ci4r3zvm89mcyxn9q7x6n"; - libraryHaskellDepends = [ - base MonadRandom transformers transformers-base - ]; - description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dunai_0_5_1" = callPackage - ({ mkDerivation, base, MonadRandom, transformers, transformers-base - }: - mkDerivation { - pname = "dunai"; version = "0.5.1"; sha256 = "07bkjp7z5lbm6466nc99p4ngiqkh5mgbczwl7rflxzis4w1vm997"; libraryHaskellDepends = [ @@ -68140,7 +67154,6 @@ self: { ]; description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dunai-core" = callPackage @@ -70062,24 +69075,6 @@ self: { }: mkDerivation { pname = "eliminators"; - version = "0.4.1"; - sha256 = "000x3gjwyf2s44ry16a2a9dk7cqjvl0dh21r5k85s19ljrxsxv1v"; - libraryHaskellDepends = [ - base extra singleton-nats singletons template-haskell - th-abstraction th-desugar - ]; - testHaskellDepends = [ base hspec singleton-nats singletons ]; - testToolDepends = [ hspec-discover ]; - description = "Dependently typed elimination functions using singletons"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "eliminators_0_5" = callPackage - ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats - , singletons, template-haskell, th-abstraction, th-desugar - }: - mkDerivation { - pname = "eliminators"; version = "0.5"; sha256 = "0d1d2pp8r2gai25q898v30gb5r82pjzi9smqndn27p1bk9xlqzzr"; libraryHaskellDepends = [ @@ -70090,7 +69085,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Dependently typed elimination functions using singletons"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elision" = callPackage @@ -72972,8 +71966,8 @@ self: { }: mkDerivation { pname = "eventsource-store-specs"; - version = "1.2.0"; - sha256 = "1fvwwbbn8407rcxl7sww1k944gq95hniq9s9ys3hzr8a9y65598i"; + version = "1.2.1"; + sha256 = "1b7nhigf4r26zfbcq0civbsw8mhsz4hpdsdnm94zmkysl5k58f04"; libraryHaskellDepends = [ aeson async base eventsource-api mtl streaming tasty tasty-hspec text transformers-base uuid @@ -72989,8 +71983,8 @@ self: { }: mkDerivation { pname = "eventsource-stub-store"; - version = "1.1.0"; - sha256 = "0rfbn3f6dw6m03f47f68if11xkjd98djhballl50zv7fqifcpz7h"; + version = "1.1.1"; + sha256 = "1xd3ngjjpimfpglkgad3r9dmd7sf2mq3kdlbqs4d6xz28gd7vh7y"; libraryHaskellDepends = [ async base containers eventsource-api mtl stm streaming transformers-base @@ -73029,43 +72023,6 @@ self: { , 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 - }: - mkDerivation { - pname = "eventstore"; - version = "1.1.6"; - sha256 = "00bdkklwrabxvbr725hkdsc1a2fdr50gdwryn7spmsqxmqgzv96w"; - revision = "1"; - editedCabalFile = "1y1a7brw220bg4mfc80qhkcyzlm38qvs6pkr7p8xyk104b8k5qgx"; - 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 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 - ]; - description = "EventStore TCP Client"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "eventstore_1_2_0" = 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 , safe-exceptions, semigroups, stm, stm-chans, streaming, tasty , tasty-hspec, tasty-hunit, text, time, transformers-base @@ -73181,17 +72138,6 @@ self: { }) {}; "exact-pi" = callPackage - ({ mkDerivation, base, numtype-dk }: - mkDerivation { - pname = "exact-pi"; - version = "0.4.1.4"; - sha256 = "15v10wn5zgg7y66jzfg0l8lx2qpj91dh7rp05aa3c6c3dss9dx3v"; - libraryHaskellDepends = [ base numtype-dk ]; - description = "Exact rational multiples of pi (and integer powers of pi)"; - license = stdenv.lib.licenses.mit; - }) {}; - - "exact-pi_0_5_0_1" = callPackage ({ mkDerivation, base, numtype-dk, QuickCheck, tasty, tasty-hunit , tasty-quickcheck }: @@ -73205,7 +72151,6 @@ self: { ]; description = "Exact rational multiples of pi (and integer powers of pi)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exact-real" = callPackage @@ -73551,28 +72496,6 @@ self: { }) {inherit (pkgs) exif;}; "exinst" = callPackage - ({ mkDerivation, aeson, base, binary, bytes, bytestring, cborg - , cereal, constraints, deepseq, hashable, profunctors, QuickCheck - , serialise, singletons, tasty, tasty-hunit, tasty-quickcheck - }: - mkDerivation { - pname = "exinst"; - version = "0.6"; - sha256 = "0pljgk0y4azzgp0k9q8dl7jpf9bf2719xax54mnc35g1px4s21p9"; - libraryHaskellDepends = [ - aeson base binary bytes cborg cereal constraints deepseq hashable - profunctors QuickCheck serialise singletons - ]; - testHaskellDepends = [ - aeson base binary bytes bytestring cborg cereal constraints deepseq - hashable profunctors QuickCheck serialise singletons tasty - tasty-hunit tasty-quickcheck - ]; - description = "Dependent pairs and their instances"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "exinst_0_7" = callPackage ({ mkDerivation, base, binary, bytestring, constraints, deepseq , hashable, profunctors, QuickCheck, singletons, tasty, tasty-hunit , tasty-quickcheck @@ -73591,7 +72514,6 @@ self: { ]; description = "Dependent pairs and their instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exinst-aeson" = callPackage @@ -73823,28 +72745,6 @@ self: { }: mkDerivation { pname = "exp-pairs"; - version = "0.1.6.0"; - sha256 = "1qsvly4klhk17r2pk60cf03dyz0cjc449fa2plqrlai9rl7xjfp6"; - revision = "1"; - editedCabalFile = "1zbsjlj6wavz9ysfzjqb4ng7688crlfvsbyj4li84khc1jp71xj3"; - libraryHaskellDepends = [ - base containers deepseq ghc-prim prettyprinter - ]; - testHaskellDepends = [ - base matrix QuickCheck random smallcheck tasty tasty-hunit - tasty-quickcheck tasty-smallcheck - ]; - description = "Linear programming over exponent pairs"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "exp-pairs_0_2_0_0" = callPackage - ({ mkDerivation, base, containers, deepseq, ghc-prim, matrix - , prettyprinter, QuickCheck, random, smallcheck, tasty, tasty-hunit - , tasty-quickcheck, tasty-smallcheck - }: - mkDerivation { - pname = "exp-pairs"; version = "0.2.0.0"; sha256 = "0ry9k89xfy2493j7yypyiqcj0v7h5x9w8gl60dy28w4597yinisp"; revision = "1"; @@ -73858,7 +72758,6 @@ self: { ]; description = "Linear programming over exponent pairs"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "expand" = callPackage @@ -74203,49 +73102,25 @@ self: { "extensible" = 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 - }: - mkDerivation { - pname = "extensible"; - version = "0.4.9"; - sha256 = "11iyz4lgs2bf6wg1iiancwj58ywpj8f93bqj9scy4mzz8mpyllmp"; - libraryHaskellDepends = [ - aeson base bytestring cassava comonad constraints deepseq ghc-prim - hashable monad-skeleton mtl prettyprinter primitive profunctors - QuickCheck semigroups StateVar tagged template-haskell text th-lift - transformers unordered-containers vector - ]; - testHaskellDepends = [ base lens QuickCheck template-haskell ]; - description = "Extensible, efficient, optics-friendly data types and effects"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "extensible_0_4_10_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, cassava, comonad , constraints, deepseq, exceptions, ghc-prim, hashable, lens , monad-skeleton, mtl, prettyprinter, primitive, profunctors - , QuickCheck, resourcet, semigroups, StateVar, tagged - , template-haskell, text, th-lift, transformers - , unordered-containers, vector + , QuickCheck, resourcet, StateVar, tagged, template-haskell, text + , th-lift, transformers, unordered-containers, vector }: mkDerivation { pname = "extensible"; - version = "0.4.10.1"; - sha256 = "009z0grpjnnmnsc887k6vgfz5w55mniax25dl4ispj1nq74djksb"; + version = "0.5"; + sha256 = "1nsidp8rb3fnkybirgql2ij1vwjzsy2da3qp8abjb1g8aj50ih14"; libraryHaskellDepends = [ aeson base bytestring cassava comonad constraints deepseq exceptions ghc-prim hashable monad-skeleton mtl prettyprinter - primitive profunctors QuickCheck resourcet semigroups StateVar - tagged template-haskell text th-lift transformers - unordered-containers vector + primitive profunctors QuickCheck resourcet StateVar tagged + template-haskell text th-lift transformers unordered-containers + vector ]; testHaskellDepends = [ base lens QuickCheck template-haskell ]; description = "Extensible, efficient, optics-friendly data types and effects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extensible-data" = callPackage @@ -74296,8 +73171,8 @@ self: { }: mkDerivation { pname = "extensible-effects-concurrent"; - version = "0.15.0"; - sha256 = "0hy1z2caqwyxqw1s3xxkbrzi3f86w3vzch783ajq41xqd6z8spdp"; + version = "0.18.1"; + sha256 = "14kx3ipwz51g2qvdmz97v4mckglh6hajw6yzbzllqysgljs243cl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74360,22 +73235,6 @@ self: { }: mkDerivation { pname = "extra"; - version = "1.6.13"; - sha256 = "0jc5g120ff97sayff10kqn66wz8aw2wymgwgh2livzkf7vqm5q50"; - libraryHaskellDepends = [ - base clock directory filepath process time unix - ]; - testHaskellDepends = [ base directory filepath QuickCheck unix ]; - description = "Extra functions I use"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "extra_1_6_14" = callPackage - ({ mkDerivation, base, clock, directory, filepath, process - , QuickCheck, time, unix - }: - mkDerivation { - pname = "extra"; version = "1.6.14"; sha256 = "170jmwx2wnpa6bs92pcijm4ib4hq0vs4582s6v63wrcn1m9l21m6"; libraryHaskellDepends = [ @@ -74384,7 +73243,6 @@ self: { testHaskellDepends = [ base directory filepath QuickCheck unix ]; description = "Extra functions I use"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extract-dependencies" = callPackage @@ -74726,6 +73584,8 @@ self: { pname = "fake"; version = "0.1.1.1"; sha256 = "0f6iqbyyrllry2q48by8qwaq0n9k7b5d00xgw5vvlr9zdvrpllgf"; + revision = "1"; + editedCabalFile = "1a1rsa8hpgpyw8m2bq9ns76n4dbr4iymjhxqkiif6b6xvg8zwld5"; libraryHaskellDepends = [ base containers generics-sop random text time ]; @@ -74936,23 +73796,56 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "fast-downward" = callPackage + ({ mkDerivation, base, containers, list-t, mtl, process, temporary + , text, transformers + }: + mkDerivation { + pname = "fast-downward"; + version = "0.1.0.0"; + sha256 = "187c3mx2vw1d8xj0k8k2wy51nz7bskcmxgbzx4d5pgrn74gr5azb"; + libraryHaskellDepends = [ + base containers list-t mtl process temporary text transformers + ]; + description = "Solve classical planning problems (STRIPS/SAS+) using Haskell & Fast Downward"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fast-logger" = callPackage ({ mkDerivation, array, auto-update, base, bytestring, directory - , easy-file, filepath, hspec, text, unix, unix-time + , easy-file, filepath, hspec, text, unix-compat, unix-time }: mkDerivation { pname = "fast-logger"; - version = "2.4.11"; - sha256 = "1ad2vq4nifdxshqk9yrmghqizhkgybfz134kpr6padglb2mxxrdv"; + version = "2.4.12"; + sha256 = "1jl9kiiijjpilj4zka8ffb2sil31qmgysan2hkld6mhddlr6pjdy"; libraryHaskellDepends = [ array auto-update base bytestring directory easy-file filepath text - unix unix-time + unix-compat unix-time ]; testHaskellDepends = [ base bytestring directory hspec ]; description = "A fast logging system"; license = stdenv.lib.licenses.bsd3; }) {}; + "fast-logger_2_4_13" = callPackage + ({ mkDerivation, array, auto-update, base, bytestring, directory + , easy-file, filepath, hspec, text, unix-compat, unix-time + }: + mkDerivation { + pname = "fast-logger"; + version = "2.4.13"; + sha256 = "1ciji847kcpg8zfld964wd20c5n554y3ak5340rn07k6dx0fzm2b"; + libraryHaskellDepends = [ + array auto-update base bytestring directory easy-file filepath text + unix-compat unix-time + ]; + testHaskellDepends = [ base bytestring directory hspec ]; + description = "A fast logging system"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fast-math" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -75719,29 +74612,14 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "fedora-dists"; - version = "1.0.0.1"; - sha256 = "0x5lccpwcf2cd97vnqlzyi4lgbyhqcs5ks1sr3l33h1zffpb0br8"; + version = "1.0.0.2"; + sha256 = "0jc7kv2zflxwfbidc4wm6wad8hpwfxw7w2ri1zghk3970dkl7lnl"; libraryHaskellDepends = [ base ]; description = "Library for Fedora distribution versions"; license = stdenv.lib.licenses.gpl3; }) {}; "fedora-haskell-tools" = callPackage - ({ mkDerivation, base, directory, filepath, process, time, unix }: - mkDerivation { - pname = "fedora-haskell-tools"; - version = "0.5.1"; - sha256 = "1543i2lxzplqmx1cpggp5773qvqc6jzn4960c1cgyhg9mjd13adr"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base directory filepath process time unix - ]; - description = "Building and managing tools for Fedora Haskell"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "fedora-haskell-tools_0_6" = callPackage ({ mkDerivation, base, csv, directory, filepath, HTTP, process , time, unix }: @@ -75756,7 +74634,6 @@ self: { ]; description = "Building and maintenance tools for Fedora Haskell"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fedora-packages" = callPackage @@ -76290,25 +75167,6 @@ self: { }: mkDerivation { pname = "fgl"; - version = "5.6.0.0"; - sha256 = "1i6cp4b3w7sjk7y1dq3fh6bci2sm5h3lnbbaw9ln19nwncg2wwll"; - revision = "1"; - editedCabalFile = "17r5p1c6srgyzpdkqkjcl9k3ax9c82lvps1kqjhxpdzypsnzns70"; - libraryHaskellDepends = [ - array base containers deepseq transformers - ]; - testHaskellDepends = [ base containers hspec QuickCheck ]; - benchmarkHaskellDepends = [ base deepseq microbench ]; - description = "Martin Erwig's Functional Graph Library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fgl_5_7_0_1" = callPackage - ({ mkDerivation, array, base, containers, deepseq, hspec - , microbench, QuickCheck, transformers - }: - mkDerivation { - pname = "fgl"; version = "5.7.0.1"; sha256 = "04793yh778ck3kz1z2svnfdwwls2kisbnky4lzvf4zjfgpv7mkpz"; libraryHaskellDepends = [ @@ -76318,7 +75176,6 @@ self: { benchmarkHaskellDepends = [ base deepseq microbench ]; description = "Martin Erwig's Functional Graph Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fgl-arbitrary" = callPackage @@ -76502,22 +75359,6 @@ self: { }: mkDerivation { pname = "file-embed"; - version = "0.0.10.1"; - sha256 = "0lj164cnzqyd487mli91nnr7137a4h4qsasfwsnsh77sx12fpk9k"; - libraryHaskellDepends = [ - base bytestring directory filepath template-haskell - ]; - testHaskellDepends = [ base filepath ]; - description = "Use Template Haskell to embed file contents directly"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "file-embed_0_0_11" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath - , template-haskell - }: - mkDerivation { - pname = "file-embed"; version = "0.0.11"; sha256 = "0l6dkwccbzzyx8rcav03lya2334dgi3vfwk96h7l93l0fc4x19gf"; libraryHaskellDepends = [ @@ -76526,7 +75367,6 @@ self: { testHaskellDepends = [ base filepath ]; description = "Use Template Haskell to embed file contents directly"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "file-embed-lzma" = callPackage @@ -76726,8 +75566,8 @@ self: { pname = "filepath-crypto"; version = "0.1.0.0"; sha256 = "1bj9haa4ignmk6c6gdiqb4rnwy395pwqdyfy4kgg0z16w0l39mw0"; - revision = "6"; - editedCabalFile = "0lg22k1f9l51a8bdnhkwq07mg0m3w3rhgavp1lxi3vmsszsmpmvc"; + revision = "7"; + editedCabalFile = "0dniq1rzv6qb75svf2ya32r0116pjh9jlgly7106x3gyziq2cwh3"; libraryHaskellDepends = [ base binary bytestring case-insensitive cryptoids cryptoids-class cryptoids-types exceptions filepath sandi template-haskell @@ -76787,8 +75627,8 @@ self: { }: mkDerivation { pname = "filestore"; - version = "0.6.3.3"; - sha256 = "04qvp5hmnnassw13lw7g1l785lgdlfzl9msy4k1ja8p6gksy7r1c"; + version = "0.6.3.4"; + sha256 = "0q1ynqjslcxx5r93l6w2hsmd1khlq38c5g5mwrifrv12qnh28sx0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers Diff directory filepath old-locale @@ -77430,25 +76270,12 @@ self: { ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }: mkDerivation { pname = "fixed-vector"; - version = "1.1.0.0"; - sha256 = "1iclmv1xkyr1wdszrahzdim6ilqvpxrhpsiammcxishg9gwvxl0y"; - libraryHaskellDepends = [ base deepseq primitive ]; - testHaskellDepends = [ base doctest filemanip primitive ]; - description = "Generic vectors with statically known size"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fixed-vector_1_2_0_0" = callPackage - ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }: - mkDerivation { - pname = "fixed-vector"; version = "1.2.0.0"; sha256 = "19846sgjlsv7qy9nm9l4p2wdms5kvx6y9wm5ffz1hw7h77qy8ryw"; libraryHaskellDepends = [ base deepseq primitive ]; testHaskellDepends = [ base doctest filemanip primitive ]; description = "Generic vectors with statically known size"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fixed-vector-binary" = callPackage @@ -78705,17 +77532,6 @@ self: { }) {}; "focus" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "focus"; - version = "0.1.5.2"; - sha256 = "1dswf4l7d6z3rrv1d00fr3vcpawnvxhj3q741fh62s5wq948v662"; - libraryHaskellDepends = [ base ]; - description = "A general abstraction for manipulating elements of container data structures"; - license = stdenv.lib.licenses.mit; - }) {}; - - "focus_1_0_1_2" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "focus"; @@ -78724,7 +77540,6 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "A general abstraction for manipulating elements of container data structures"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "focuslist" = callPackage @@ -79952,25 +78767,6 @@ self: { }) {}; "free" = callPackage - ({ mkDerivation, base, bifunctors, comonad, containers - , distributive, exceptions, mtl, profunctors, semigroupoids - , semigroups, template-haskell, transformers, transformers-base - , transformers-compat - }: - mkDerivation { - pname = "free"; - version = "5.0.2"; - sha256 = "15m3n9vhz7z3kzv1w3wlfa3x8jp4cbrkwmrcjr7jlx39iqffn1gg"; - libraryHaskellDepends = [ - base bifunctors comonad containers distributive exceptions mtl - profunctors semigroupoids semigroups template-haskell transformers - transformers-base transformers-compat - ]; - description = "Monads for free"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "free_5_1" = callPackage ({ mkDerivation, base, comonad, containers, distributive , exceptions, mtl, profunctors, semigroupoids, template-haskell , transformers, transformers-base @@ -79985,7 +78781,6 @@ self: { ]; description = "Monads for free"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "free-algebras" = callPackage @@ -80397,31 +79192,6 @@ self: { "freer-simple" = callPackage ({ mkDerivation, base, criterion, extensible-effects, free, mtl , natural-transformation, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, transformers-base - }: - mkDerivation { - pname = "freer-simple"; - version = "1.1.0.0"; - sha256 = "00dvn620xg24pxw1h9p7dgl5wj25q77mfdsmxlmijsr0ysqwv611"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base natural-transformation transformers-base - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base criterion extensible-effects free mtl - ]; - description = "Implementation of a friendly effect system for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "freer-simple_1_2_1_0" = callPackage - ({ mkDerivation, base, criterion, extensible-effects, free, mtl - , natural-transformation, QuickCheck, tasty, tasty-hunit , tasty-quickcheck, template-haskell, transformers-base }: mkDerivation { @@ -80442,7 +79212,6 @@ self: { ]; description = "Implementation of a friendly effect system for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "freer-simple-catching" = callPackage @@ -81576,6 +80345,8 @@ self: { pname = "functor-infix"; version = "0.0.5"; sha256 = "0rifm1p5zq2711vak2lyxzz2xs03saym3m3695wpf3zy38safbpn"; + revision = "1"; + editedCabalFile = "0nvk9hff0vd3s7q67pb4my5vfz1y954y0l8vlbbmdx9i20r1m8nf"; libraryHaskellDepends = [ base template-haskell ]; description = "Infix operators for mapping over compositions of functors. Lots of them."; license = stdenv.lib.licenses.mit; @@ -81597,8 +80368,8 @@ self: { ({ mkDerivation, base, ghc-prim, lens }: mkDerivation { pname = "functor-utils"; - version = "1.17.1"; - sha256 = "1ixssxdhw94l1kjxd5k4gvq8wz4b9d0vww5mg2al9q3vzb7d4pld"; + version = "1.17.2"; + sha256 = "1sf4d3af4kf341g7slpylm2113cy0597fngr5ldlds8znylspmms"; libraryHaskellDepends = [ base ghc-prim lens ]; description = "Collection of functor utilities, providing handy operators, like generalization of (.)."; license = stdenv.lib.licenses.asl20; @@ -81958,26 +80729,6 @@ self: { }: mkDerivation { pname = "fuzzyset"; - version = "0.1.0.6"; - sha256 = "18v1zsmdgy5if7l23vciip6dbbhbpgvn0dy0ray0pqwdcw9yh6kk"; - libraryHaskellDepends = [ - base base-unicode-symbols data-default lens text text-metrics - unordered-containers vector - ]; - testHaskellDepends = [ - base base-unicode-symbols hspec ieee754 lens text - unordered-containers - ]; - description = "Fuzzy set for approximate string matching"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fuzzyset_0_1_0_8" = callPackage - ({ mkDerivation, base, base-unicode-symbols, data-default, hspec - , ieee754, lens, text, text-metrics, unordered-containers, vector - }: - mkDerivation { - pname = "fuzzyset"; version = "0.1.0.8"; sha256 = "096izffsa3fgdi8qiz7n6l2fl2rbiq6kv5h1xljmq0nkaig5m5wv"; libraryHaskellDepends = [ @@ -81990,7 +80741,6 @@ self: { ]; description = "Fuzzy set for approximate string matching"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fuzzytime" = callPackage @@ -83104,26 +81854,6 @@ self: { }: mkDerivation { pname = "generic-lens"; - version = "1.0.0.2"; - sha256 = "0s21jfw0ndkkmx7di3q0b7xj7hws6yxxcsflal617c44iqc8lvsy"; - libraryHaskellDepends = [ base profunctors tagged ]; - testHaskellDepends = [ - base doctest HUnit inspection-testing lens profunctors - ]; - benchmarkHaskellDepends = [ - base criterion deepseq lens QuickCheck - ]; - description = "Generically derive traversals, lenses and prisms"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "generic-lens_1_1_0_0" = callPackage - ({ mkDerivation, base, criterion, deepseq, doctest, HUnit - , inspection-testing, lens, profunctors, QuickCheck, tagged - }: - mkDerivation { - pname = "generic-lens"; version = "1.1.0.0"; sha256 = "1frng5vgk4pkaw8wqqj6ch9p5fk88rbw1mmxzs0cp13wpxnr9wpc"; libraryHaskellDepends = [ base profunctors tagged ]; @@ -83352,20 +82082,6 @@ self: { }) {}; "generics-sop" = callPackage - ({ mkDerivation, base, deepseq, ghc-prim, template-haskell }: - mkDerivation { - pname = "generics-sop"; - version = "0.3.2.0"; - sha256 = "168v62i845jh9jbfaz3ldz8svz4wmzq9mf2vhb7pxlnbkk8fqq1h"; - revision = "3"; - editedCabalFile = "0lw5n8npdrdd1h7j000flaig4z30b8pig4q52sj34zhwccjkdzq2"; - libraryHaskellDepends = [ base deepseq ghc-prim template-haskell ]; - testHaskellDepends = [ base ]; - description = "Generic Programming using True Sums of Products"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "generics-sop_0_4_0_1" = callPackage ({ mkDerivation, base, criterion, deepseq, ghc-prim, sop-core , template-haskell }: @@ -83382,7 +82098,6 @@ self: { ]; description = "Generic Programming using True Sums of Products"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "generics-sop-lens" = callPackage @@ -83630,18 +82345,6 @@ self: { }) {}; "genvalidity" = callPackage - ({ mkDerivation, base, hspec, QuickCheck, validity }: - mkDerivation { - pname = "genvalidity"; - version = "0.5.1.0"; - sha256 = "17ykq38j9a2lzir6dqz5jgy6ndaafrpkhqhcg96c5ppg7wcxaaj0"; - libraryHaskellDepends = [ base QuickCheck validity ]; - testHaskellDepends = [ base hspec QuickCheck ]; - description = "Testing utilities for the validity library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity_0_7_0_0" = callPackage ({ mkDerivation, base, hspec, hspec-core, QuickCheck, validity }: mkDerivation { pname = "genvalidity"; @@ -83651,7 +82354,6 @@ self: { testHaskellDepends = [ base hspec hspec-core QuickCheck ]; description = "Testing utilities for the validity library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-aeson" = callPackage @@ -83677,24 +82379,6 @@ self: { }) {}; "genvalidity-bytestring" = callPackage - ({ mkDerivation, base, bytestring, genvalidity, genvalidity-hspec - , hspec, QuickCheck, validity, validity-bytestring - }: - mkDerivation { - pname = "genvalidity-bytestring"; - version = "0.2.0.2"; - sha256 = "1qy19j0cyza2a6z59br4wma68081xqsq9m4ndmv195ym04a0bfa3"; - libraryHaskellDepends = [ - base bytestring genvalidity QuickCheck validity validity-bytestring - ]; - testHaskellDepends = [ - base bytestring genvalidity genvalidity-hspec hspec QuickCheck - ]; - description = "GenValidity support for ByteString"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-bytestring_0_3_0_1" = callPackage ({ mkDerivation, base, bytestring, deepseq, genvalidity , genvalidity-hspec, hspec, QuickCheck, validity , validity-bytestring @@ -83712,7 +82396,6 @@ self: { ]; description = "GenValidity support for ByteString"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-containers" = callPackage @@ -83721,24 +82404,6 @@ self: { }: mkDerivation { pname = "genvalidity-containers"; - version = "0.5.1.0"; - sha256 = "098360pcf522xcwa3lk091pyjl6a08cl12z18ybrlai38saskd83"; - libraryHaskellDepends = [ - base containers genvalidity QuickCheck validity validity-containers - ]; - testHaskellDepends = [ - base containers genvalidity genvalidity-hspec hspec - ]; - description = "GenValidity support for containers"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-containers_0_5_1_1" = callPackage - ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec - , hspec, QuickCheck, validity, validity-containers - }: - mkDerivation { - pname = "genvalidity-containers"; version = "0.5.1.1"; sha256 = "1z7bmbwi07nylkgm3dysmnv57z1iww2sjy2zv88jpg6nvq9r9ffg"; libraryHaskellDepends = [ @@ -83749,7 +82414,6 @@ self: { ]; description = "GenValidity support for containers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec" = callPackage @@ -83758,25 +82422,6 @@ self: { }: mkDerivation { pname = "genvalidity-hspec"; - version = "0.6.2.0"; - sha256 = "05dgfivvsfcnrbdkvx7mssi14xsnxck8h2xasbqnn6xng3pc351v"; - libraryHaskellDepends = [ - base genvalidity genvalidity-property hspec hspec-core QuickCheck - transformers validity - ]; - testHaskellDepends = [ - base doctest genvalidity hspec hspec-core QuickCheck - ]; - description = "Standard spec's for GenValidity instances"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-hspec_0_6_2_1" = callPackage - ({ mkDerivation, base, doctest, genvalidity, genvalidity-property - , hspec, hspec-core, QuickCheck, transformers, validity - }: - mkDerivation { - pname = "genvalidity-hspec"; version = "0.6.2.1"; sha256 = "100mjmbjfzy431a52yqkq2rja0mb5zw8dbkpfbfy17rdkwwx2yn1"; libraryHaskellDepends = [ @@ -83789,33 +82434,11 @@ self: { ]; description = "Standard spec's for GenValidity instances"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, doctest , genvalidity, genvalidity-aeson, genvalidity-hspec - , genvalidity-text, hspec, QuickCheck, text - }: - mkDerivation { - pname = "genvalidity-hspec-aeson"; - version = "0.3.0.0"; - sha256 = "0bqjfl86gj2201w5yingzizwq8hn63zdhir9wp3p0jiah2zp5rxh"; - libraryHaskellDepends = [ - aeson base bytestring deepseq genvalidity genvalidity-hspec hspec - QuickCheck - ]; - testHaskellDepends = [ - aeson base doctest genvalidity genvalidity-aeson genvalidity-hspec - genvalidity-text hspec text - ]; - description = "Standard spec's for aeson-related instances"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-hspec-aeson_0_3_0_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, deepseq, doctest - , genvalidity, genvalidity-aeson, genvalidity-hspec , genvalidity-property, genvalidity-text, hspec, QuickCheck, text , validity }: @@ -83833,27 +82456,10 @@ self: { ]; description = "Standard spec's for aeson-related instances"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec-binary" = callPackage ({ mkDerivation, base, binary, deepseq, doctest, genvalidity - , genvalidity-hspec, hspec, QuickCheck - }: - mkDerivation { - pname = "genvalidity-hspec-binary"; - version = "0.2.0.2"; - sha256 = "1h14b0m5kq3md5rys07rrn5jjcpk0c09fln40v221z2rrssnh211"; - libraryHaskellDepends = [ - base binary deepseq genvalidity genvalidity-hspec hspec QuickCheck - ]; - testHaskellDepends = [ base doctest genvalidity hspec ]; - description = "Standard spec's for binary-related Instances"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-hspec-binary_0_2_0_3" = callPackage - ({ mkDerivation, base, binary, deepseq, doctest, genvalidity , genvalidity-hspec, genvalidity-property, hspec, QuickCheck , validity }: @@ -83869,27 +82475,10 @@ self: { ]; description = "Standard spec's for binary-related Instances"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec-cereal" = callPackage ({ mkDerivation, base, cereal, deepseq, doctest, genvalidity - , genvalidity-hspec, hspec, QuickCheck - }: - mkDerivation { - pname = "genvalidity-hspec-cereal"; - version = "0.2.0.2"; - sha256 = "16r4g9k9rjifvbmy5nwkan6lnwhjvp85nlfihr1in5lwxf3gcl71"; - libraryHaskellDepends = [ - base cereal deepseq genvalidity genvalidity-hspec hspec QuickCheck - ]; - testHaskellDepends = [ base doctest genvalidity hspec ]; - description = "Standard spec's for cereal-related instances"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-hspec-cereal_0_2_0_3" = callPackage - ({ mkDerivation, base, cereal, deepseq, doctest, genvalidity , genvalidity-hspec, genvalidity-property, hspec, QuickCheck , validity }: @@ -83905,7 +82494,6 @@ self: { ]; description = "Standard spec's for cereal-related instances"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec-hashable" = callPackage @@ -83915,27 +82503,6 @@ self: { }: mkDerivation { pname = "genvalidity-hspec-hashable"; - version = "0.2.0.2"; - sha256 = "0s4z5k4myx4c6sky11l7s2lsvkxgyri11ikq75nfinff8b44h7iw"; - libraryHaskellDepends = [ - base genvalidity genvalidity-hspec genvalidity-property hashable - hspec QuickCheck validity - ]; - testHaskellDepends = [ - base doctest genvalidity genvalidity-hspec hashable hspec - hspec-core QuickCheck - ]; - description = "Standard spec's for Hashable instances"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-hspec-hashable_0_2_0_3" = callPackage - ({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec - , genvalidity-property, hashable, hspec, hspec-core, QuickCheck - , validity - }: - mkDerivation { - pname = "genvalidity-hspec-hashable"; version = "0.2.0.3"; sha256 = "0lb1aiv07fbbkyhh8ig2lhqgm9yibrny2bw9qwbdkwwsi6hk4566"; libraryHaskellDepends = [ @@ -83948,7 +82515,6 @@ self: { ]; description = "Standard spec's for Hashable instances"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec-optics" = callPackage @@ -84020,22 +82586,6 @@ self: { }: mkDerivation { pname = "genvalidity-property"; - version = "0.2.1.1"; - sha256 = "0cjw5i2pydidda9bnp6x37ylhxdk9g874x5sadr6sscg5kq85a1b"; - libraryHaskellDepends = [ - base genvalidity hspec QuickCheck validity - ]; - testHaskellDepends = [ base directory doctest filepath ]; - description = "Standard properties for functions on `Validity` types"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-property_0_3_0_0" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, genvalidity - , hspec, QuickCheck, validity - }: - mkDerivation { - pname = "genvalidity-property"; version = "0.3.0.0"; sha256 = "03cpmkqmfqypj9kydrdzs0pyix0ffwrlx8idzvgyrqiyhg03rsis"; libraryHaskellDepends = [ @@ -84044,7 +82594,6 @@ self: { testHaskellDepends = [ base directory doctest filepath ]; description = "Standard properties for functions on `Validity` types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-scientific" = callPackage @@ -84106,26 +82655,6 @@ self: { }: mkDerivation { pname = "genvalidity-unordered-containers"; - version = "0.2.0.3"; - sha256 = "0r89pisv6a7m0vf6dif7lx7w7gc4jsx33d4hzskwz3x6si07xadd"; - libraryHaskellDepends = [ - base genvalidity hashable QuickCheck unordered-containers validity - validity-unordered-containers - ]; - testHaskellDepends = [ - base genvalidity genvalidity-hspec hspec unordered-containers - ]; - description = "GenValidity support for unordered-containers"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-unordered-containers_0_2_0_4" = callPackage - ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable - , hspec, QuickCheck, unordered-containers, validity - , validity-unordered-containers - }: - mkDerivation { - pname = "genvalidity-unordered-containers"; version = "0.2.0.4"; sha256 = "0rkvwm5imbgl8cx5pdk16dc4wzhcndw6g3wwxs0blykiri32wl3q"; libraryHaskellDepends = [ @@ -84138,7 +82667,6 @@ self: { ]; description = "GenValidity support for unordered-containers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-uuid" = callPackage @@ -84565,8 +83093,7 @@ self: { description = "The GHC API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {ghc-heap = null;}; + }) {}; "ghc-boot_8_6_1" = callPackage ({ mkDerivation, base, binary, bytestring, directory, filepath @@ -84830,29 +83357,6 @@ self: { }: mkDerivation { pname = "ghc-exactprint"; - version = "0.5.6.1"; - sha256 = "141k6qiys0m0r4br7ikp4i546vs3xcil9cwglzcdfcbnb5nj1z87"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers directory filepath free ghc ghc-boot - ghc-paths mtl syb - ]; - testHaskellDepends = [ - base bytestring containers Diff directory filemanip filepath ghc - ghc-boot ghc-paths HUnit mtl silently syb - ]; - description = "ExactPrint for GHC"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-exactprint_0_5_8_2" = callPackage - ({ mkDerivation, base, bytestring, containers, Diff, directory - , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl - , silently, syb - }: - mkDerivation { - pname = "ghc-exactprint"; version = "0.5.8.2"; sha256 = "18wlhvgpbk7ym1vbi8fkdwbjhcplgr7zcqm328yi4v7rilbxw7cn"; isLibrary = true; @@ -84867,7 +83371,6 @@ self: { ]; description = "ExactPrint for GHC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-gc-tune" = callPackage @@ -85214,8 +83717,8 @@ self: { }: mkDerivation { pname = "ghc-prof"; - version = "1.4.1.4"; - sha256 = "1wrlz2x9zsrip92m254vh0s07j9afjli6n1kcass8z0lw17m26mh"; + version = "1.4.1.5"; + sha256 = "0cpyzfyfkq6c17xpccgibjpq8j0l4w33mbpivim3kha7k76ilbg4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85446,27 +83949,6 @@ self: { }: mkDerivation { pname = "ghc-typelits-extra"; - version = "0.2.6"; - sha256 = "0dx6rk6lpklqqklj74mg92vjn66kkjfxp87hwazzlx9wai23r3cm"; - libraryHaskellDepends = [ - base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat - ghc-typelits-natnormalise integer-gmp transformers - ]; - testHaskellDepends = [ - base ghc-typelits-knownnat ghc-typelits-natnormalise tasty - tasty-hunit template-haskell - ]; - description = "Additional type-level operations on GHC.TypeLits.Nat"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "ghc-typelits-extra_0_3" = callPackage - ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra - , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp - , tasty, tasty-hunit, template-haskell, transformers - }: - mkDerivation { - pname = "ghc-typelits-extra"; version = "0.3"; sha256 = "1khkchxic6i3sg3g3dzdg8dsdgk86xy5j5lnh5n5hr7fpdm9ppj7"; libraryHaskellDepends = [ @@ -85479,7 +83961,6 @@ self: { ]; description = "Additional type-level operations on GHC.TypeLits.Nat"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-typelits-knownnat" = callPackage @@ -85489,26 +83970,6 @@ self: { }: mkDerivation { pname = "ghc-typelits-knownnat"; - version = "0.5.1"; - sha256 = "0yvdb3y82wrm41p9sbbsmfq91cp9kzx7mmqr20wgxrqamhnw952v"; - libraryHaskellDepends = [ - base ghc ghc-tcplugins-extra ghc-typelits-natnormalise - template-haskell transformers - ]; - testHaskellDepends = [ - base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck - ]; - description = "Derive KnownNat constraints from other KnownNat constraints"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "ghc-typelits-knownnat_0_6" = callPackage - ({ mkDerivation, base, ghc, ghc-tcplugins-extra - , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, transformers - }: - mkDerivation { - pname = "ghc-typelits-knownnat"; version = "0.6"; sha256 = "0dzjqzfh1mywx2dzki6yhrac5l2y2h58zjwmgps3vk16n8krnljb"; libraryHaskellDepends = [ @@ -85520,7 +83981,6 @@ self: { ]; description = "Derive KnownNat constraints from other KnownNat constraints"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-typelits-natnormalise" = callPackage @@ -85608,8 +84068,7 @@ self: { description = "The library supporting GHC's interactive interpreter"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {ghc-heap = null;}; + }) {}; "ghci-diagrams" = callPackage ({ mkDerivation, base, cairo, colour, diagrams, gtk }: @@ -86866,20 +85325,21 @@ self: { "ginger" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring - , data-default, filepath, http-types, mtl, parsec, process, safe - , scientific, tasty, tasty-hunit, tasty-quickcheck, text, time - , transformers, unordered-containers, utf8-string, vector, yaml + , data-default, filepath, http-types, mtl, parsec, process + , regex-tdfa, safe, scientific, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers, unordered-containers + , utf8-string, vector, yaml }: mkDerivation { pname = "ginger"; - version = "0.8.2.0"; - sha256 = "06k2imp511v4xxlzqgii14hf0ncnc6wci3hm7w48z332c5nk24m1"; + version = "0.8.4.0"; + sha256 = "0mk0jmw0qvbv73n7g8n14shnyxjkkq6wp3vnk1gx1dnmbk20vdm7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring data-default filepath http-types - mtl parsec safe scientific text time transformers + mtl parsec regex-tdfa safe scientific text time transformers unordered-containers utf8-string vector ]; executableHaskellDepends = [ @@ -87509,39 +85969,6 @@ self: { }) {}; "github" = callPackage - ({ mkDerivation, aeson, aeson-compat, base, base-compat - , base16-bytestring, binary, binary-orphans, byteable, bytestring - , containers, cryptohash, deepseq, deepseq-generics, exceptions - , file-embed, hashable, hspec, hspec-discover, http-client - , http-client-tls, http-link-header, http-types, iso8601-time, mtl - , network-uri, semigroups, text, time, tls, transformers - , transformers-compat, unordered-containers, vector - , vector-instances - }: - mkDerivation { - pname = "github"; - version = "0.19"; - sha256 = "1523p2rv4jwsbsqjc9g3qff4cy5dhdy5wzp382x5nr11rmbrpsph"; - revision = "3"; - editedCabalFile = "0s3zmkzgfbh1mc0492i7rjiawxkzg0im8z2p10niv5ff58m87yri"; - libraryHaskellDepends = [ - aeson aeson-compat base base-compat base16-bytestring binary - binary-orphans byteable bytestring containers cryptohash deepseq - deepseq-generics exceptions hashable http-client http-client-tls - http-link-header http-types iso8601-time mtl network-uri semigroups - text time tls transformers transformers-compat unordered-containers - vector vector-instances - ]; - testHaskellDepends = [ - aeson-compat base base-compat bytestring file-embed hspec - unordered-containers vector - ]; - testToolDepends = [ hspec-discover ]; - description = "Access to the GitHub API, v3"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "github_0_20" = callPackage ({ mkDerivation, aeson, base, base-compat, base16-bytestring , binary, binary-orphans, byteable, bytestring, containers , cryptohash, deepseq, deepseq-generics, exceptions, file-embed @@ -87569,7 +85996,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Access to the GitHub API, v3"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "github-backup" = callPackage @@ -88181,26 +86607,6 @@ self: { }: mkDerivation { pname = "glabrous"; - version = "0.3.6"; - sha256 = "1ba1smngfq6xqwcbfg10sy2qjxh7miyd8qbfmmv14klzwimk44ri"; - libraryHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring cereal cereal-text - either text unordered-containers - ]; - testHaskellDepends = [ - base directory either hspec text unordered-containers - ]; - description = "A template DSL library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "glabrous_1_0_0" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , cereal, cereal-text, directory, either, hspec, text - , unordered-containers - }: - mkDerivation { - pname = "glabrous"; version = "1.0.0"; sha256 = "00q07675lrsniwrzb85bz2b5n8llbhyp0zxkscm9yr8mlirasr3k"; libraryHaskellDepends = [ @@ -88212,7 +86618,6 @@ self: { ]; description = "A template DSL library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glade" = callPackage @@ -88670,21 +87075,6 @@ self: { }: mkDerivation { pname = "gloss"; - version = "1.12.0.0"; - sha256 = "0jxcvvmxvmb7n0wp4lwhvl4axkbhwwv4i6pi4xng357hfanxh1k9"; - libraryHaskellDepends = [ - base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL - ]; - description = "Painless 2D vector graphics, animations and simulations"; - license = stdenv.lib.licenses.mit; - }) {}; - - "gloss_1_13_0_1" = callPackage - ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim - , gloss-rendering, GLUT, OpenGL - }: - mkDerivation { - pname = "gloss"; version = "1.13.0.1"; sha256 = "1f19vlx32nkgply25p83n7498lwdpshiibqg7nzkhb2kv7n0y71q"; revision = "1"; @@ -88694,7 +87084,6 @@ self: { ]; description = "Painless 2D vector graphics, animations and simulations"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-accelerate" = callPackage @@ -88828,21 +87217,6 @@ self: { }: mkDerivation { pname = "gloss-raster"; - version = "1.12.0.0"; - sha256 = "14a1qcajm4fp4hr4y55mw1jl5id747d455yn1818y5kz75m4k7y8"; - libraryHaskellDepends = [ - base containers ghc-prim gloss gloss-rendering repa - ]; - description = "Parallel rendering of raster images"; - license = stdenv.lib.licenses.mit; - }) {}; - - "gloss-raster_1_13_0_2" = callPackage - ({ mkDerivation, base, containers, ghc-prim, gloss, gloss-rendering - , repa - }: - mkDerivation { - pname = "gloss-raster"; version = "1.13.0.2"; sha256 = "1k4l19c1fn1s14phq2qml5ibsli3jmkk6748k9y96lbrgj5nfp49"; libraryHaskellDepends = [ @@ -88850,7 +87224,6 @@ self: { ]; description = "Parallel rendering of raster images"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-raster-accelerate" = callPackage @@ -88875,19 +87248,6 @@ self: { ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }: mkDerivation { pname = "gloss-rendering"; - version = "1.12.0.0"; - sha256 = "1g64wlyk13lssf8p71xhpjaqygzdkn5fq6k2bmqwixmq56bhpnb0"; - libraryHaskellDepends = [ - base bmp bytestring containers GLUT OpenGL - ]; - description = "Gloss picture data types and rendering functions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "gloss-rendering_1_13_0_2" = callPackage - ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }: - mkDerivation { - pname = "gloss-rendering"; version = "1.13.0.2"; sha256 = "0ivzijqkxn0r4iqk0rmq0bzdzzgv9a8fgwy3gwnfibmvhhm9jfq0"; revision = "1"; @@ -88897,7 +87257,6 @@ self: { ]; description = "Gloss picture data types and rendering functions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-sodium" = callPackage @@ -91009,21 +89368,6 @@ self: { }: mkDerivation { pname = "google-oauth2-jwt"; - version = "0.3.0"; - sha256 = "1mi7mdkq2d7n3pxlspc5zgval7wb2q7sn261k704nwrbm0phzzbj"; - libraryHaskellDepends = [ - base base64-bytestring bytestring HsOpenSSL RSA text unix-time - ]; - description = "Get a signed JWT for Google Service Accounts"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "google-oauth2-jwt_0_3_1" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL - , RSA, text, unix-time - }: - mkDerivation { - pname = "google-oauth2-jwt"; version = "0.3.1"; sha256 = "121g7fsdcnv65gp81z450dqqw6ii75pwn3cbilwx5yv4mm571mvi"; libraryHaskellDepends = [ @@ -91031,7 +89375,6 @@ self: { ]; description = "Get a signed JWT for Google Service Accounts"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "google-search" = callPackage @@ -91056,8 +89399,8 @@ self: { }: mkDerivation { pname = "google-server-api"; - version = "0.2.0.1"; - sha256 = "0d07flz3vpdyq4ifldp466zhj19ll7zlcnwn0ns47d72r79wghiw"; + version = "0.3.0.0"; + sha256 = "1zrgflz6pav8ygjjisjm35w7a232116f90s0pd8jqf46an2bm8i2"; libraryHaskellDepends = [ aeson aeson-casing base base64-bytestring bytestring HsOpenSSL http-api-data http-client http-client-tls mime-mail monad-control @@ -92004,22 +90347,6 @@ self: { }: mkDerivation { pname = "graph-wrapper"; - version = "0.2.5.1"; - sha256 = "04z1qbsf1c31r0mhn8bgr8hisffxacq3j61y4fym28idr8zqaqc3"; - libraryHaskellDepends = [ array base containers ]; - testHaskellDepends = [ - array base containers deepseq hspec QuickCheck - ]; - description = "A wrapper around the standard Data.Graph with a less awkward interface"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "graph-wrapper_0_2_5_2" = callPackage - ({ mkDerivation, array, base, containers, deepseq, hspec - , QuickCheck - }: - mkDerivation { - pname = "graph-wrapper"; version = "0.2.5.2"; sha256 = "1kcdfr1bz2ks71gapz6wrzv7sj6qbmj1zadj1cmh39g9xvqjx94q"; libraryHaskellDepends = [ array base containers ]; @@ -92028,7 +90355,6 @@ self: { ]; description = "A wrapper around the standard Data.Graph with a less awkward interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graphbuilder" = callPackage @@ -92695,6 +91021,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "grids" = callPackage + ({ mkDerivation, adjunctions, base, distributive, finite-typelits + , lens, vector + }: + mkDerivation { + pname = "grids"; + version = "0.1.1.0"; + sha256 = "048k7r9x7d6vfyhsspqawzjrabk30igf3049hjnji27xhpghr90k"; + libraryHaskellDepends = [ + adjunctions base distributive finite-typelits lens vector + ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "grm" = callPackage ({ mkDerivation, base, Cabal, cmdargs, directory, filepath, happy , parsec, process, syb, wl-pprint @@ -92804,8 +91144,8 @@ self: { }: mkDerivation { pname = "groundhog"; - version = "0.9.0"; - sha256 = "09d0n91cd0bvmrik4ail2svbh7l8vp5va0344jzvy1g2ancy0yj0"; + version = "0.10.0"; + sha256 = "1wckm2qrgmv1ccavwvq8ji3pfb4y197s1n1adv8hz9bqk246byrq"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-builder bytestring containers monad-control mtl resourcet safe-exceptions scientific @@ -92842,10 +91182,8 @@ self: { }: mkDerivation { pname = "groundhog-inspector"; - version = "0.9.0"; - sha256 = "1vb9zsg2r5d9ad6ppbzzm18hq4d4ygc7g2z1w5nb866774zwlywb"; - revision = "1"; - editedCabalFile = "1fzkm7rxg3la10j65drhvqnzcv6c5rscq3cqz7f0395rbw0pakmy"; + version = "0.10.0"; + sha256 = "1l4smiydqqgpfqcyq77d2g0cvglanqfhlhx3y1k9n3kx94yss5a2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92868,8 +91206,8 @@ self: { }: mkDerivation { pname = "groundhog-mysql"; - version = "0.9.0"; - sha256 = "0n3zcvb1qh5jdfrzgiamaf51fvkhgabsl07asy7wcdp0hb8rxdkq"; + version = "0.10"; + sha256 = "1idyisl0dbij4ffd0bn1bm681az87wc30qnkn1vmr0cd0xb6mwnx"; libraryHaskellDepends = [ base bytestring containers groundhog monad-control monad-logger mysql mysql-simple resource-pool resourcet text time transformers @@ -92887,8 +91225,8 @@ self: { }: mkDerivation { pname = "groundhog-postgresql"; - version = "0.9.0.1"; - sha256 = "0p88l85rsmbdpfnrh2411n68yy70g0iw7pqmp496b8n6gr0mmvl5"; + version = "0.10"; + sha256 = "1digvi8ra58r122i030h0b089sbyzaclir1cg4iqaflbzrnz45l9"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring containers groundhog monad-control postgresql-libpq postgresql-simple resource-pool @@ -92906,8 +91244,8 @@ self: { }: mkDerivation { pname = "groundhog-sqlite"; - version = "0.9.0"; - sha256 = "06985myr96dc7f6hkkm9nihvvl2c19wdl1bn3nfvyj78yvz8ryxb"; + version = "0.10.0"; + sha256 = "1z6yss15aw0a14i0nj0flb0h2641sjr70mhasp718qmc4iwkgw7x"; libraryHaskellDepends = [ base bytestring containers direct-sqlite groundhog monad-control resource-pool resourcet text transformers unordered-containers @@ -92919,15 +91257,15 @@ self: { "groundhog-th" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, groundhog - , template-haskell, text, time, unordered-containers, yaml + , libyaml, template-haskell, text, time, unordered-containers, yaml }: mkDerivation { pname = "groundhog-th"; - version = "0.9.0.1"; - sha256 = "0hrk86s5mfj33sx5im6pcym1br160vnp17yhi82b2x1imm26cmlk"; + version = "0.10.2"; + sha256 = "1bpxvprsxd66k951yjlvpbpzni2f0s94ypkad698a2iyccb2slzk"; libraryHaskellDepends = [ - aeson base bytestring containers groundhog template-haskell text - time unordered-containers yaml + aeson base bytestring containers groundhog libyaml template-haskell + text time unordered-containers yaml ]; description = "Type-safe datatype-database mapping library"; license = stdenv.lib.licenses.bsd3; @@ -93332,24 +91670,6 @@ self: { }: mkDerivation { pname = "gtk"; - version = "0.14.10"; - sha256 = "0cq6cpr42mjansnbk3p38xkqslqcb8lbl4smc73kaqr1xcg6gq98"; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; - libraryHaskellDepends = [ - array base bytestring cairo containers gio glib mtl pango text - ]; - libraryPkgconfigDepends = [ gtk2 ]; - description = "Binding to the Gtk+ graphical user interface library"; - license = stdenv.lib.licenses.lgpl21; - }) {gtk2 = pkgs.gnome2.gtk;}; - - "gtk_0_15_0" = callPackage - ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers - , gio, glib, gtk2, gtk2hs-buildtools, mtl, pango, text - }: - mkDerivation { - pname = "gtk"; version = "0.15.0"; sha256 = "110lawhnd00acllfjhimcq59wxsrl2xs68mam6wmqfc43wan5f5k"; enableSeparateDataOutput = true; @@ -93360,7 +91680,6 @@ self: { libraryPkgconfigDepends = [ gtk2 ]; description = "Binding to the Gtk+ graphical user interface library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {gtk2 = pkgs.gnome2.gtk;}; "gtk-helpers" = callPackage @@ -93685,26 +92004,6 @@ self: { }: mkDerivation { pname = "gtk3"; - version = "0.14.9"; - sha256 = "1rcn0x6q0r0a3waxdsyvbyzfswsi6j7yr9fsixqr1c0g334lmqa8"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; - libraryHaskellDepends = [ - array base bytestring cairo containers gio glib mtl pango text - ]; - libraryPkgconfigDepends = [ gtk3 ]; - description = "Binding to the Gtk+ 3 graphical user interface library"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) gtk3;}; - - "gtk3_0_15_0" = callPackage - ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers - , gio, glib, gtk2hs-buildtools, gtk3, mtl, pango, text - }: - mkDerivation { - pname = "gtk3"; version = "0.15.0"; sha256 = "1q6ysw00gjaaali18iz111zqzkjiblzg7cfg6ckvzf93mg0w6g0c"; isLibrary = true; @@ -93717,7 +92016,6 @@ self: { libraryPkgconfigDepends = [ gtk3 ]; description = "Binding to the Gtk+ 3 graphical user interface library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gtk3;}; "gtk3-mac-integration" = callPackage @@ -95614,7 +93912,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haddock-library" = callPackage + "haddock-library_1_5_0_1" = callPackage ({ mkDerivation, base, base-compat, bytestring, containers, deepseq , directory, filepath, hspec, hspec-discover, optparse-applicative , QuickCheck, transformers, tree-diff @@ -95634,9 +93932,10 @@ self: { doHaddock = false; description = "Library exposing some functionality of Haddock"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haddock-library_1_7_0" = callPackage + "haddock-library" = callPackage ({ mkDerivation, base, base-compat, bytestring, containers, deepseq , hspec, hspec-discover, parsec, QuickCheck, text, transformers }: @@ -95654,7 +93953,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Library exposing some functionality of Haddock"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haddock-test" = callPackage @@ -96403,6 +94701,26 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "hakyll-images" = callPackage + ({ mkDerivation, base, bytestring, hakyll, HUnit-approx + , JuicyPixels, JuicyPixels-extra, tasty, tasty-hunit + }: + mkDerivation { + pname = "hakyll-images"; + version = "0.1.0"; + sha256 = "1l135gmlm2ydqj3d27gfarykcg6k1g204cysm3bk163f499b8w50"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring hakyll JuicyPixels JuicyPixels-extra + ]; + testHaskellDepends = [ + base bytestring hakyll HUnit-approx JuicyPixels JuicyPixels-extra + tasty tasty-hunit + ]; + description = "Hakyll utilities to work with images"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hakyll-ogmarkup" = callPackage ({ mkDerivation, base, hakyll, ogmarkup }: mkDerivation { @@ -96862,6 +95180,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "han2zen" = callPackage + ({ mkDerivation, base, text }: + mkDerivation { + pname = "han2zen"; + version = "0.1"; + sha256 = "1wm2pa549z3yvyxzl0wbaz623za54fyryhz9bjx4xi7fwlgxylqk"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ base text ]; + description = "Convert Halfwidth Katakana to Fullwidth Katakana"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "handa-data" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -97100,19 +95430,19 @@ self: { "hapistrano" = callPackage ({ mkDerivation, aeson, async, base, directory, filepath , formatting, gitrev, hspec, mtl, optparse-applicative, path - , path-io, process, QuickCheck, stm, temporary, time, transformers - , yaml + , path-io, process, QuickCheck, silently, stm, temporary, time + , transformers, typed-process, yaml }: mkDerivation { pname = "hapistrano"; - version = "0.3.7.0"; - sha256 = "16d1y3dwbvj76b1yyghvwi4f7wak1dv6l07ymknrbi42ks0w9041"; + version = "0.3.8.0"; + sha256 = "1kkasqfx7k8sl22sklysxl76d5ljcm7p96hgcak7qgwwbj7igj56"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base filepath formatting gitrev mtl path process time - transformers + aeson base filepath formatting gitrev mtl path process stm time + transformers typed-process ]; executableHaskellDepends = [ aeson async base formatting gitrev optparse-applicative path @@ -97120,7 +95450,7 @@ self: { ]; testHaskellDepends = [ base directory filepath hspec mtl path path-io process QuickCheck - temporary + silently temporary ]; description = "A deployment library for Haskell applications"; license = stdenv.lib.licenses.mit; @@ -98193,26 +96523,6 @@ self: { }: mkDerivation { pname = "hasbolt"; - version = "0.1.3.1"; - sha256 = "0d6prk5fav5l0d4j0ndinn3szimy02dmayx997z5yg6yb5ix3lai"; - libraryHaskellDepends = [ - base binary bytestring connection containers data-binary-ieee754 - data-default network text transformers - ]; - testHaskellDepends = [ - base bytestring containers hex hspec QuickCheck text - ]; - description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hasbolt_0_1_3_2" = callPackage - ({ mkDerivation, base, binary, bytestring, connection, containers - , data-binary-ieee754, data-default, hex, hspec, network - , QuickCheck, text, transformers - }: - mkDerivation { - pname = "hasbolt"; version = "0.1.3.2"; sha256 = "14sq3iqbrfkwyswdka2285cdhwx3c6srfhn5qb7yw1nfjx2bdb1i"; libraryHaskellDepends = [ @@ -98224,20 +96534,22 @@ self: { ]; description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasbolt-extras" = callPackage - ({ mkDerivation, base, containers, free, hasbolt, lens, mtl - , neat-interpolation, template-haskell, text, th-lift-instances + ({ mkDerivation, aeson, aeson-casing, base, containers, free + , hasbolt, lens, mtl, neat-interpolation, scientific + , template-haskell, text, th-lift-instances, unordered-containers + , vector }: mkDerivation { pname = "hasbolt-extras"; - version = "0.0.0.12"; - sha256 = "0rh4nn7dy9jfn4vhmf18fgyqhldj5lg46l35ka2m60ig86za9fkn"; + version = "0.0.0.14"; + sha256 = "1sqlngr8wbvs94j1qmqam0q5shjbil61j7dq520qa87rblljs96i"; libraryHaskellDepends = [ - base containers free hasbolt lens mtl neat-interpolation - template-haskell text th-lift-instances + aeson aeson-casing base containers free hasbolt lens mtl + neat-interpolation scientific template-haskell text + th-lift-instances unordered-containers vector ]; description = "Extras for hasbolt library"; license = stdenv.lib.licenses.bsd3; @@ -98888,8 +97200,8 @@ self: { }: mkDerivation { pname = "haskdogs"; - version = "0.5.3"; - sha256 = "1n3vwrm99h4kzcimav18dkbvkpkhspwdf5gz8da1sr4g0m4kg96n"; + version = "0.5.4"; + sha256 = "1f35np3a99y3aifqgp24c5wdjr5nvvs3jj6g71v39355sjj1hsqq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -99145,8 +97457,8 @@ self: { "haskell-ci" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, Cabal, containers - , deepseq, Diff, directory, filepath, ShellCheck, tasty - , tasty-golden, transformers + , deepseq, Diff, directory, filepath, tasty, tasty-golden + , transformers }: mkDerivation { pname = "haskell-ci"; @@ -99155,8 +97467,7 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base Cabal containers deepseq directory filepath ShellCheck - transformers + base Cabal containers deepseq directory filepath transformers ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -99255,8 +97566,8 @@ self: { }: mkDerivation { pname = "haskell-dap"; - version = "0.0.9.0"; - sha256 = "1flsz93wbhd61yfydbfbb3q8brhh0d0gzfsdd3xscwvcbdzgw9qr"; + version = "0.0.10.0"; + sha256 = "1d2jma4gly0bh1a114a7pm6xq13y5py3p1hkkn24755mi4b0ykqa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -99638,38 +97949,6 @@ self: { }: mkDerivation { pname = "haskell-lsp"; - version = "0.2.2.0"; - sha256 = "1h3ibwd0i0z2c35fxw0m0gyd6dj45pf17x9hc5cgf3sql4qr5yxd"; - revision = "1"; - editedCabalFile = "0bdgpj5cj4qwp31glmilp1gqdm8c3fkqvgw18aqv8pz2wg39x23y"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hashable haskell-lsp-types hslogger lens mtl network-uri parsec - sorted-list stm text time unordered-containers yi-rope - ]; - executableHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hslogger lens mtl network-uri parsec stm text time transformers - unordered-containers vector yi-rope - ]; - testHaskellDepends = [ - aeson base containers directory filepath hashable hspec lens - network-uri sorted-list text yi-rope - ]; - description = "Haskell library for the Microsoft Language Server Protocol"; - license = stdenv.lib.licenses.mit; - }) {}; - - "haskell-lsp_0_8_0_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, data-default - , directory, filepath, hashable, haskell-lsp-types, hslogger, hspec - , lens, mtl, network-uri, parsec, sorted-list, stm, text, time - , transformers, unordered-containers, vector, yi-rope - }: - mkDerivation { - pname = "haskell-lsp"; version = "0.8.0.1"; sha256 = "1lvrqxp6v5xvha88l8r6n86ydvlszzxmi7fazvjxz4bixy9zvw8q"; isLibrary = true; @@ -99690,7 +97969,6 @@ self: { ]; description = "Haskell library for the Microsoft Language Server Protocol"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-lsp-client" = callPackage @@ -99716,22 +97994,6 @@ self: { "haskell-lsp-types" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, filepath - , hashable, lens, network-uri, text, unordered-containers - }: - mkDerivation { - pname = "haskell-lsp-types"; - version = "0.2.2.0"; - sha256 = "0wchy8qrd450s90j6d26psznrd3n245lvn01qxa42l5akljmlymx"; - libraryHaskellDepends = [ - aeson base bytestring data-default filepath hashable lens - network-uri text unordered-containers - ]; - description = "Haskell library for the Microsoft Language Server Protocol, data types"; - license = stdenv.lib.licenses.mit; - }) {}; - - "haskell-lsp-types_0_8_0_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-default, filepath , hashable, lens, network-uri, scientific, text , unordered-containers }: @@ -99745,7 +98007,6 @@ self: { ]; description = "Haskell library for the Microsoft Language Server Protocol, data types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-menu" = callPackage @@ -99830,8 +98091,32 @@ self: { }: mkDerivation { pname = "haskell-names"; - version = "0.9.5"; - sha256 = "0j1snakldb29v8786licz4k2b92pbdbxhxgyz22rvjypdxyhaa7h"; + version = "0.9.4"; + sha256 = "0dbf5rxysm57jn018wd3dfz3m621n0347mbpgv7q2yb77cwrlg8y"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers data-lens-light filepath + haskell-src-exts mtl transformers traverse-with-class uniplate + ]; + testHaskellDepends = [ + base containers filemanip filepath haskell-src-exts mtl pretty-show + tasty tasty-golden traverse-with-class + ]; + description = "Name resolution library for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "haskell-names_0_9_6" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers + , data-lens-light, filemanip, filepath, haskell-src-exts, mtl + , pretty-show, tasty, tasty-golden, transformers + , traverse-with-class, uniplate + }: + mkDerivation { + pname = "haskell-names"; + version = "0.9.6"; + sha256 = "06g1h1dvsh31hm18v3hkx2s4bcrv2h49kgc2x9k1xk6532a9503w"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers data-lens-light filepath @@ -101668,8 +99953,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.9.1"; - sha256 = "099fng9wy9qhcxn14m1mlpq004bl51xas3rk6jkspqv32d4rr6zs"; + version = "0.9.2"; + sha256 = "1p4za0b6n7ldz7jnq25n9f7wmngxy8ic0vy1kppb7wka0a96sdh1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101905,6 +100190,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskseg" = callPackage + ({ mkDerivation, ansi-terminal, array, base, bytestring, containers + , exact-combinatorics, logging-effect, monad-loops, MonadRandom + , mtl, optparse-generic, random, random-shuffle, text, vector, zlib + }: + mkDerivation { + pname = "haskseg"; + version = "0.1.0.1"; + sha256 = "0m9226wwkkvfqr2nfhf2gxymav3fp6klvzilsrkx502dqlll25qc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal array base bytestring containers exact-combinatorics + logging-effect monad-loops MonadRandom mtl optparse-generic random + random-shuffle text vector zlib + ]; + executableHaskellDepends = [ + ansi-terminal array base bytestring containers exact-combinatorics + logging-effect monad-loops MonadRandom mtl optparse-generic random + random-shuffle text vector zlib + ]; + description = "Simple unsupervised segmentation model"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hasktags" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , HUnit, json, microlens-platform, optparse-applicative @@ -104406,8 +102716,8 @@ self: { }: mkDerivation { pname = "heavy-logger"; - version = "0.3.2.0"; - sha256 = "1kx6l7ysniqjzzp7l74vjcfbi8qz5xqjqvisb49k18cnf22mikvv"; + version = "0.3.2.1"; + sha256 = "09m8wqldmiwys4g5fjisgfc192g55y88gr9akgfhs18nm1gggix6"; libraryHaskellDepends = [ attoparsec base bytestring containers data-default fast-logger hsyslog lifted-base monad-control monad-logger mtl stm @@ -105329,8 +103639,8 @@ self: { ({ mkDerivation, base, doctest, time }: mkDerivation { pname = "herf-time"; - version = "0.2.2"; - sha256 = "13nn46l5mf555rab3fwl38g4fznjh3n07754l671vqcr8c5zfm4m"; + version = "0.3.0"; + sha256 = "00ar1kb29gjvna7rcdg6wj3f22dil2pzbzy8zblvyc452zjy03y2"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base doctest ]; description = "haskell time manipulation in a 'kerf like' style"; @@ -106634,6 +104944,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {harp = null;}; + "hhp" = callPackage + ({ mkDerivation, base, Cabal, containers, deepseq, directory + , doctest, filepath, ghc, hlint, hspec, io-choice, process, syb + }: + mkDerivation { + pname = "hhp"; + version = "0.0.0"; + sha256 = "1520cax79wrf5a183630pji3bypz6qck73fa3p0x63vgcv3p5rwk"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base Cabal containers deepseq directory filepath ghc hlint + io-choice process syb + ]; + executableHaskellDepends = [ + base containers directory filepath ghc + ]; + testHaskellDepends = [ + base Cabal containers deepseq directory doctest filepath ghc hlint + hspec io-choice process syb + ]; + description = "Happy Haskell Programming"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hi" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, directory , doctest, filepath, hspec, HUnit, optparse-applicative, parsec @@ -107363,29 +105699,12 @@ self: { }: mkDerivation { pname = "hinotify"; - version = "0.3.10"; - sha256 = "17ax3n68a5c2ddazp86aciliskrh6znd3bnry0wcllmb6dbpsaxg"; - revision = "1"; - editedCabalFile = "07z0n5rvki3w0kjr190bwv7sq8p3myspv8999ilz9rlsqf5a0324"; - libraryHaskellDepends = [ async base bytestring containers unix ]; - testHaskellDepends = [ base bytestring directory unix ]; - description = "Haskell binding to inotify"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hinotify_0_4" = callPackage - ({ mkDerivation, async, base, bytestring, containers, directory - , unix - }: - mkDerivation { - pname = "hinotify"; version = "0.4"; sha256 = "1x1lm685ws2q0z0ibwq6x3l72xh67mj06s36xiga3al48d92q63x"; libraryHaskellDepends = [ async base bytestring containers unix ]; testHaskellDepends = [ base bytestring directory unix ]; description = "Haskell binding to inotify"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hinotify-bytestring" = callPackage @@ -107450,26 +105769,6 @@ self: { }: mkDerivation { pname = "hint"; - version = "0.8.0"; - sha256 = "0h8wan0hb16m1gcil1csaay9f9f1pq3kfgbzfsfpjszmr1i2sw1f"; - libraryHaskellDepends = [ - base directory exceptions filepath ghc ghc-boot ghc-paths mtl - random temporary unix - ]; - testHaskellDepends = [ - base directory exceptions extensible-exceptions filepath HUnit unix - ]; - description = "Runtime Haskell interpreter (GHC API wrapper)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hint_0_9_0" = callPackage - ({ mkDerivation, base, directory, exceptions, extensible-exceptions - , filepath, ghc, ghc-boot, ghc-paths, HUnit, mtl, random, temporary - , unix - }: - mkDerivation { - pname = "hint"; version = "0.9.0"; sha256 = "1g7q4clzc2pdnbvmm265dindjpynabsykd088qjjzlk6590sy9bl"; libraryHaskellDepends = [ @@ -107481,7 +105780,6 @@ self: { ]; description = "Runtime Haskell interpreter (GHC API wrapper)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hint-server" = callPackage @@ -107502,8 +105800,7 @@ self: { "hinter" = callPackage ({ mkDerivation, base, directory, exceptions, extensible-exceptions - , filepath, ghc, ghc-boot, ghc-paths, HUnit, mtl, random, temporary - , unix + , filepath, ghc, ghc-boot, ghc-paths, HUnit, mtl, random, unix }: mkDerivation { pname = "hinter"; @@ -107511,7 +105808,7 @@ self: { sha256 = "0r790y7j64y79rqg7ip4dk5a8pbpryisp008lcmswzc0si35jfgl"; libraryHaskellDepends = [ base directory exceptions filepath ghc ghc-boot ghc-paths mtl - random temporary unix + random unix ]; testHaskellDepends = [ base directory exceptions extensible-exceptions filepath HUnit unix @@ -107529,8 +105826,8 @@ self: { }: mkDerivation { pname = "hinterface"; - version = "0.8.0"; - sha256 = "1mzq87sdcx50i67kf2lv5wg0k6ahxf1x2qxvi41dnaxkjjl1vcmr"; + version = "0.8.1"; + sha256 = "1qpdapvxy03jqrvn4p45pi2zhiy888k8acysb0fqzi3f8mypqm1c"; libraryHaskellDepends = [ array async base binary bytestring containers cryptonite deepseq exceptions lifted-async lifted-base memory monad-control @@ -108772,31 +107069,6 @@ self: { ({ mkDerivation, backprop, base, finite-typelits , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog , hmatrix, hmatrix-vector-sized, microlens, microlens-platform - , vector, vector-sized - }: - mkDerivation { - pname = "hmatrix-backprop"; - version = "0.1.2.3"; - sha256 = "1x833a48czc2hphswxgwf1ihkgxz13w3bz2d2zs9dqq8xkzdf4mx"; - revision = "1"; - editedCabalFile = "03zrx1kvyz8gn2w2ygd7ql98yimsm3kyrnrr1cc99mz1cm0phnrv"; - libraryHaskellDepends = [ - backprop base ghc-typelits-knownnat ghc-typelits-natnormalise - hmatrix hmatrix-vector-sized microlens vector vector-sized - ]; - testHaskellDepends = [ - backprop base finite-typelits hedgehog hmatrix hmatrix-vector-sized - microlens microlens-platform vector-sized - ]; - description = "hmatrix operations lifted for backprop"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hmatrix-backprop_0_1_2_5" = callPackage - ({ mkDerivation, backprop, base, finite-typelits - , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog - , hmatrix, hmatrix-vector-sized, microlens, microlens-platform , vector, vector-sized, vinyl }: mkDerivation { @@ -110555,8 +108827,8 @@ self: { ({ mkDerivation, base, bytestring, HUnit, openssl }: mkDerivation { pname = "hopenssl"; - version = "2.2.3"; - sha256 = "0nihpm1zlb8y4bx5j429p0sybwnvz61pnd7ixcl90flwzlizr168"; + version = "2.2.4"; + sha256 = "0wbnibaffpmk453jbvh95r1d1scz1ivkj59ddrbd3hf4iwr6rx4x"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ openssl ]; testHaskellDepends = [ base bytestring HUnit ]; @@ -110802,17 +109074,15 @@ self: { }: mkDerivation { pname = "hosc"; - version = "0.16"; - sha256 = "1xj5kkpkzzwfi26n28s0gkr9vzkmvp276n9jb75j2ccbr8q79vbj"; - revision = "1"; - editedCabalFile = "0n9ra6qhy5wighwa3zn5496473kdarhdgzsvmhnlp14s6sgw8akb"; + version = "0.17"; + sha256 = "0340lldzim02ixj4n0smfwn20y5i0z7v0gqgbb0mdjs6c90rqhv6"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary blaze-builder bytestring data-binary-ieee754 network time transformers ]; description = "Haskell Open Sound Control"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; }) {}; "hosc-json" = callPackage @@ -111084,24 +109354,6 @@ self: { }: mkDerivation { pname = "hp2pretty"; - version = "0.8.0.2"; - sha256 = "1j3rn4xjpyqnl8vcsc9pyj03mwpilq20g0z8brh3prsvhjb9gl9g"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - array attoparsec base containers filepath floatshow mtl - optparse-applicative semigroups text - ]; - description = "generate pretty graphs from heap profiles"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hp2pretty_0_9" = callPackage - ({ mkDerivation, array, attoparsec, base, containers, filepath - , floatshow, mtl, optparse-applicative, semigroups, text - }: - mkDerivation { - pname = "hp2pretty"; version = "0.9"; sha256 = "0libwl8kl6yhingvbrmw1b8l5yiq6wn07asvkwbnh9l6mnh8pz2n"; isLibrary = false; @@ -111112,48 +109364,11 @@ self: { ]; description = "generate pretty graphs from heap profiles"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hpack" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, cryptonite, deepseq, directory, filepath, Glob, hspec - , http-client, http-client-tls, http-types, HUnit, interpolate - , mockery, pretty, QuickCheck, scientific, template-haskell - , temporary, text, transformers, unordered-containers, vector, yaml - }: - mkDerivation { - pname = "hpack"; - version = "0.28.2"; - sha256 = "18w0h76jdp3mk9vin8da9iz3cwhcxmw787xy8wlh8bxcpcr16q5r"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bifunctors bytestring Cabal containers cryptonite - deepseq directory filepath Glob http-client http-client-tls - http-types pretty scientific text transformers unordered-containers - vector yaml - ]; - executableHaskellDepends = [ - aeson base bifunctors bytestring Cabal containers cryptonite - deepseq directory filepath Glob http-client http-client-tls - http-types pretty scientific text transformers unordered-containers - vector yaml - ]; - testHaskellDepends = [ - aeson base bifunctors bytestring Cabal containers cryptonite - deepseq directory filepath Glob hspec http-client http-client-tls - http-types HUnit interpolate mockery pretty QuickCheck scientific - template-haskell temporary text transformers unordered-containers - vector yaml - ]; - description = "An alternative format for Haskell packages"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hpack_0_31_1" = callPackage - ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal - , containers, cryptonite, deepseq, directory, filepath, Glob, hspec , hspec-discover, http-client, http-client-tls, http-types, HUnit , infer-license, interpolate, mockery, pretty, QuickCheck , scientific, template-haskell, temporary, text, transformers @@ -111187,7 +109402,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A modern format for Haskell packages"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hpack-convert" = callPackage @@ -111625,36 +109839,6 @@ self: { }: mkDerivation { pname = "hpqtypes"; - version = "1.5.3.0"; - sha256 = "1igzja5vy3pfvn2xi4bfbrbnxggxwav16cw2kfjrzkp2xrxq09gz"; - setupHaskellDepends = [ base Cabal directory filepath ]; - libraryHaskellDepends = [ - aeson async base bytestring containers data-default-class - exceptions lifted-base monad-control mtl resource-pool semigroups - text text-show time transformers transformers-base vector - ]; - librarySystemDepends = [ postgresql ]; - testHaskellDepends = [ - aeson base bytestring exceptions HUnit lifted-base monad-control - mtl QuickCheck random scientific test-framework - test-framework-hunit text text-show time transformers-base - unordered-containers vector - ]; - description = "Haskell bindings to libpqtypes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) postgresql;}; - - "hpqtypes_1_6_1_0" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, Cabal, containers - , data-default-class, directory, exceptions, filepath, HUnit - , lifted-base, monad-control, mtl, postgresql, QuickCheck, random - , resource-pool, scientific, semigroups, test-framework - , test-framework-hunit, text, text-show, time, transformers - , transformers-base, unordered-containers, vector - }: - mkDerivation { - pname = "hpqtypes"; version = "1.6.1.0"; sha256 = "02vh9l86dnayccvfq3cqmk6gbbwyqglnpg3mhr3v72vraxymm7jn"; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -111706,33 +109890,6 @@ self: { }: mkDerivation { pname = "hprotoc"; - version = "2.4.11"; - sha256 = "0740yc33ginskkiggyaqc1khkb2bzb4vg0r12rj59f3gimzfiwlk"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary bytestring containers directory filepath - haskell-src-exts mtl parsec protocol-buffers - protocol-buffers-descriptor utf8-string - ]; - libraryToolDepends = [ alex ]; - executableHaskellDepends = [ - array base binary bytestring containers directory filepath - haskell-src-exts mtl parsec protocol-buffers - protocol-buffers-descriptor utf8-string - ]; - executableToolDepends = [ alex ]; - description = "Parse Google Protocol Buffer specifications"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hprotoc_2_4_12" = callPackage - ({ mkDerivation, alex, array, base, binary, bytestring, containers - , directory, filepath, haskell-src-exts, mtl, parsec - , protocol-buffers, protocol-buffers-descriptor, utf8-string - }: - mkDerivation { - pname = "hprotoc"; version = "2.4.12"; sha256 = "0xj000ikh3y8dg5sbrl7ycb471qgra4khmk4kq079biasjvhf58a"; isLibrary = true; @@ -111751,7 +109908,6 @@ self: { executableToolDepends = [ alex ]; description = "Parse Google Protocol Buffer specifications"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hprotoc-fork" = callPackage @@ -112070,23 +110226,11 @@ self: { ({ mkDerivation, base, syb }: mkDerivation { pname = "hs-bibutils"; - version = "6.6.0.0"; - sha256 = "0n2sz2zl4naspryd49ii858qkjp2lapns5a2gr8zm6vvn5sh1f0l"; - libraryHaskellDepends = [ base syb ]; - description = "Haskell bindings to bibutils, the bibliography conversion utilities"; - license = "GPL"; - }) {}; - - "hs-bibutils_6_7_0_0" = callPackage - ({ mkDerivation, base, syb }: - mkDerivation { - pname = "hs-bibutils"; version = "6.7.0.0"; sha256 = "1qfyssl76lm4g09yxr3y10kmf8cnzls46g5h0ijk0wpk9wlhbln5"; libraryHaskellDepends = [ base syb ]; description = "Haskell bindings to bibutils, the bibliography conversion utilities"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hs-blake2" = callPackage @@ -112923,28 +111067,6 @@ self: { }: mkDerivation { pname = "hsass"; - version = "0.7.0"; - sha256 = "0mqsj1jm37pqc1vwjs5y5mh4sfhdyclp1vdr7q5nq2a3pa3qwxbk"; - libraryHaskellDepends = [ - base bytestring data-default-class filepath hlibsass monad-loops - transformers - ]; - testHaskellDepends = [ - base bytestring data-default-class hspec hspec-discover temporary - text - ]; - testToolDepends = [ hspec-discover ]; - description = "Integrating Sass into Haskell applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hsass_0_8_0" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, filepath - , hlibsass, hspec, hspec-discover, monad-loops, temporary, text - , transformers - }: - mkDerivation { - pname = "hsass"; version = "0.8.0"; sha256 = "1bnjvj6dpmcbpkbi4g5m5hvr0w5rmd7y5zkiwbqc8n9y4l2dkd5g"; libraryHaskellDepends = [ @@ -112958,7 +111080,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Integrating Sass into Haskell applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsay" = callPackage @@ -113116,21 +111237,21 @@ self: { "hsc3" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers - , data-default, data-ordlist, directory, filepath, hashable, hosc - , network, process, random, safe, split, transformers, vector + , data-ordlist, directory, filepath, hosc, murmur-hash, network + , process, random, safe, split, transformers, vector }: mkDerivation { pname = "hsc3"; - version = "0.16"; - sha256 = "0m6pas8dx48mx91159s7p7fljnivs13cg34gys906nhq11dmjdqn"; + version = "0.17"; + sha256 = "1k7gm0qk96rm7rphmmwlqh99kn5v79g8szyyhb9cqg3rfv6as1ld"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array base binary bytestring containers data-default data-ordlist - directory filepath hashable hosc network process random safe split + array base binary bytestring containers data-ordlist directory + filepath hosc murmur-hash network process random safe split transformers vector ]; description = "Haskell SuperCollider"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; }) {}; "hsc3-auditor" = callPackage @@ -114143,21 +112264,6 @@ self: { }) {}; "hsinstall" = callPackage - ({ mkDerivation, base, directory, filepath }: - mkDerivation { - pname = "hsinstall"; - version = "1.6"; - sha256 = "04f86mk2304q9kz37hr18b9jcz66wk04z747xzpxbnnwig390406"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ base directory filepath ]; - executableHaskellDepends = [ base directory filepath ]; - description = "Install Haskell software"; - license = stdenv.lib.licenses.isc; - }) {}; - - "hsinstall_2_2" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, heredoc, process , safe-exceptions }: @@ -114173,7 +112279,6 @@ self: { ]; description = "Install Haskell software"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hskeleton" = callPackage @@ -114322,28 +112427,6 @@ self: { }) {}; "hslua" = callPackage - ({ mkDerivation, base, bytestring, containers, exceptions, fail - , lua5_3, mtl, QuickCheck, quickcheck-instances, tasty - , tasty-expected-failure, tasty-hunit, tasty-quickcheck, text - }: - mkDerivation { - pname = "hslua"; - version = "0.9.5.2"; - sha256 = "1rdvv01p214zfjh6fcqjjgqwi8y42wad6cqzhlcv5gvclzw2ck8f"; - configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; - libraryHaskellDepends = [ - base bytestring containers exceptions fail mtl text - ]; - librarySystemDepends = [ lua5_3 ]; - testHaskellDepends = [ - base bytestring containers QuickCheck quickcheck-instances tasty - tasty-expected-failure tasty-hunit tasty-quickcheck text - ]; - description = "A Lua language interpreter embedding in Haskell"; - license = stdenv.lib.licenses.mit; - }) {inherit (pkgs) lua5_3;}; - - "hslua_1_0_1" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, deepseq , exceptions, fail, lua5_3, mtl, QuickCheck, quickcheck-instances , tasty, tasty-hunit, tasty-quickcheck, text @@ -114364,31 +112447,9 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; description = "Bindings to Lua, an embeddable scripting language"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) lua5_3;}; "hslua-aeson" = callPackage - ({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit - , ieee754, QuickCheck, quickcheck-instances, scientific, text - , unordered-containers, vector - }: - mkDerivation { - pname = "hslua-aeson"; - version = "0.3.0.2"; - sha256 = "0qfqq2xz5jqws1bh7iwznnv50kgqc1v5xxvnrraqkmz7hh4wyam2"; - libraryHaskellDepends = [ - aeson base hashable hslua scientific text unordered-containers - vector - ]; - testHaskellDepends = [ - aeson base hashable hslua hspec HUnit ieee754 QuickCheck - quickcheck-instances scientific text unordered-containers vector - ]; - description = "Allow aeson data types to be used with lua"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hslua-aeson_1_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, hashable, hslua, hspec , HUnit, ieee754, QuickCheck, quickcheck-instances, scientific , text, unordered-containers, vector @@ -114407,24 +112468,9 @@ self: { ]; description = "Allow aeson data types to be used with lua"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hslua-module-text" = callPackage - ({ mkDerivation, base, hslua, tasty, tasty-hunit, text }: - mkDerivation { - pname = "hslua-module-text"; - version = "0.1.2.1"; - sha256 = "0bcfpb1dhnxp0gr376ai4w7vczr9zrjl1r3r6w7kcxivfkwq9cxf"; - revision = "1"; - editedCabalFile = "0vajlsd7y6pwa08635q0cx8z5c1c55bk7fvavw7g2vmyvxqjzx6n"; - libraryHaskellDepends = [ base hslua text ]; - testHaskellDepends = [ base hslua tasty tasty-hunit text ]; - description = "Lua module for text"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hslua-module-text_0_2_0" = callPackage ({ mkDerivation, base, bytestring, hslua, tasty, tasty-hunit, text }: mkDerivation { @@ -114435,7 +112481,6 @@ self: { testHaskellDepends = [ base hslua tasty tasty-hunit text ]; description = "Lua module for text"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsluv-haskell" = callPackage @@ -114804,29 +112849,6 @@ self: { }) {}; "hspec" = callPackage - ({ mkDerivation, base, call-stack, directory, hspec-core - , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck - , stringbuilder, transformers - }: - mkDerivation { - pname = "hspec"; - version = "2.5.5"; - sha256 = "1yv4k5b5kkig2q3waj28587sq28wms7wfav5a3lq4dra6jybimfm"; - libraryHaskellDepends = [ - base call-stack hspec-core hspec-discover hspec-expectations HUnit - QuickCheck transformers - ]; - testHaskellDepends = [ - base call-stack directory hspec-core hspec-discover - hspec-expectations hspec-meta HUnit QuickCheck stringbuilder - transformers - ]; - testToolDepends = [ hspec-discover ]; - description = "A Testing Framework for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec_2_6_0" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: @@ -114839,7 +112861,6 @@ self: { ]; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-attoparsec" = callPackage @@ -114876,18 +112897,6 @@ self: { ({ mkDerivation, base, hspec, hspec-core, HUnit, QuickCheck }: mkDerivation { pname = "hspec-contrib"; - version = "0.5.0"; - sha256 = "13579xdqwbsy8k0vxdcvgy932d4p76mij1rzkzbpqbspfn7399yv"; - libraryHaskellDepends = [ base hspec-core HUnit ]; - testHaskellDepends = [ base hspec hspec-core HUnit QuickCheck ]; - description = "Contributed functionality for Hspec"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-contrib_0_5_1" = callPackage - ({ mkDerivation, base, hspec, hspec-core, HUnit, QuickCheck }: - mkDerivation { - pname = "hspec-contrib"; version = "0.5.1"; sha256 = "0hhzxaa3fxz5mk5qcsrnfr98a7bn3szx2ydgr0x9mbqmm1jg06rc"; revision = "1"; @@ -114896,7 +112905,6 @@ self: { testHaskellDepends = [ base hspec hspec-core HUnit QuickCheck ]; description = "Contributed functionality for Hspec"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-core_2_4_8" = callPackage @@ -114936,34 +112944,6 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.5.5"; - sha256 = "1vfrqlpn32s9wiykmkxbnrnd5p56yznw20pf8fwzw78ar4wpz55x"; - revision = "1"; - editedCabalFile = "1fifkdjhzrvwsx27qcsj0jam66sswjas5vfrzmb75z0xqyg5lpr7"; - libraryHaskellDepends = [ - ansi-terminal array base call-stack clock deepseq directory - filepath hspec-expectations HUnit QuickCheck quickcheck-io random - setenv stm tf-random transformers - ]; - testHaskellDepends = [ - ansi-terminal array base call-stack clock deepseq directory - filepath hspec-expectations hspec-meta HUnit process QuickCheck - quickcheck-io random setenv silently stm temporary tf-random - transformers - ]; - testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; - description = "A Testing Framework for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-core_2_6_0" = callPackage - ({ mkDerivation, ansi-terminal, array, base, call-stack, clock - , deepseq, directory, filepath, hspec-expectations, hspec-meta - , HUnit, process, QuickCheck, quickcheck-io, random, setenv - , silently, stm, temporary, tf-random, transformers - }: - mkDerivation { - pname = "hspec-core"; version = "2.6.0"; sha256 = "0f3fb6cgfp0yywxi9ii2vzmkrj669nprphcs1piad7bacsk12y6r"; libraryHaskellDepends = [ @@ -114981,7 +112961,6 @@ self: { testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-dirstream" = callPackage @@ -115027,24 +113006,6 @@ self: { }: mkDerivation { pname = "hspec-discover"; - version = "2.5.5"; - sha256 = "04aidzi91ccr9bygmfkjzshz34z9vh8wvqj4zinx2clxq6r7gqfz"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base directory filepath ]; - executableHaskellDepends = [ base directory filepath ]; - testHaskellDepends = [ - base directory filepath hspec-meta QuickCheck - ]; - description = "Automatically discover and run Hspec tests"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-discover_2_6_0" = callPackage - ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck - }: - mkDerivation { - pname = "hspec-discover"; version = "2.6.0"; sha256 = "17q5g5z7pylw8ghx1jbwk5qrafcg2cblpckvkwla1y3dzry43nc2"; isLibrary = true; @@ -115057,7 +113018,6 @@ self: { testToolDepends = [ hspec-meta ]; description = "Automatically discover and run Hspec tests"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-expectations" = callPackage @@ -115254,22 +113214,6 @@ self: { }: mkDerivation { pname = "hspec-megaparsec"; - version = "1.0.0"; - sha256 = "1dafrbzjm7rzwvcpjpk3bsg7bd111xfij94n17sh8wfykzhim5hl"; - libraryHaskellDepends = [ - base containers hspec-expectations megaparsec - ]; - testHaskellDepends = [ base hspec hspec-expectations megaparsec ]; - description = "Utility functions for testing Megaparsec parsers with Hspec"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hspec-megaparsec_2_0_0" = callPackage - ({ mkDerivation, base, containers, hspec, hspec-expectations - , megaparsec - }: - mkDerivation { - pname = "hspec-megaparsec"; version = "2.0.0"; sha256 = "0c4vb0c2y8yar0jjhh24wkkp1g7pbg2wc8h8nw3avfznbil6zyd8"; revision = "1"; @@ -115280,35 +113224,9 @@ self: { testHaskellDepends = [ base hspec hspec-expectations megaparsec ]; description = "Utility functions for testing Megaparsec parsers with Hspec"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-meta" = callPackage - ({ mkDerivation, ansi-terminal, array, async, base, call-stack - , deepseq, directory, filepath, hspec-expectations, HUnit - , QuickCheck, quickcheck-io, random, setenv, time, transformers - }: - mkDerivation { - pname = "hspec-meta"; - version = "2.4.6"; - sha256 = "0qmvk01n79j6skn79r6zalg2pd0x0nqqn9qn8mhg0pgyzcdnfc9b"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal array async base call-stack deepseq directory - filepath hspec-expectations HUnit QuickCheck quickcheck-io random - setenv time transformers - ]; - executableHaskellDepends = [ - ansi-terminal array async base call-stack deepseq directory - filepath hspec-expectations HUnit QuickCheck quickcheck-io random - setenv time transformers - ]; - description = "A version of Hspec which is used to test Hspec itself"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-meta_2_6_0" = callPackage ({ mkDerivation, ansi-terminal, array, base, call-stack, clock , deepseq, directory, filepath, hspec-expectations, HUnit , QuickCheck, quickcheck-io, random, setenv, stm, time @@ -115332,7 +113250,6 @@ self: { ]; description = "A version of Hspec which is used to test Hspec itself"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-monad-control" = callPackage @@ -115601,6 +113518,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-wai_0_9_1" = callPackage + ({ mkDerivation, base, base-compat, bytestring, case-insensitive + , hspec, hspec-core, hspec-expectations, http-types, QuickCheck + , text, transformers, wai, wai-extra + }: + mkDerivation { + pname = "hspec-wai"; + version = "0.9.1"; + sha256 = "01fc00dxm717blynx4a0b4rrjdqc6yn5pxpk21m8y3jqbw7pryhk"; + libraryHaskellDepends = [ + base base-compat bytestring case-insensitive hspec-core + hspec-expectations http-types QuickCheck text transformers wai + wai-extra + ]; + testHaskellDepends = [ + base base-compat bytestring case-insensitive hspec hspec-core + hspec-expectations http-types QuickCheck text transformers wai + wai-extra + ]; + description = "Experimental Hspec support for testing WAI applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-wai-json" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring , case-insensitive, hspec, hspec-wai, template-haskell @@ -115618,6 +113559,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-wai-json_0_9_1" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, bytestring + , case-insensitive, hspec, hspec-wai, template-haskell + }: + mkDerivation { + pname = "hspec-wai-json"; + version = "0.9.1"; + sha256 = "15llj764lgl0rad6bypkidcz5dbmsdzr182x1vp5sa0wx6xsvlzm"; + libraryHaskellDepends = [ + aeson aeson-qq base bytestring case-insensitive hspec-wai + template-haskell + ]; + testHaskellDepends = [ base hspec hspec-wai ]; + description = "Testing JSON APIs with hspec-wai"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-webdriver" = callPackage ({ mkDerivation, aeson, base, data-default, hashable, hspec , hspec-core, HUnit, lifted-base, stm, text, transformers @@ -117120,34 +115079,6 @@ self: { }) {}; "http-api-data" = callPackage - ({ mkDerivation, attoparsec, attoparsec-iso8601, base, bytestring - , Cabal, cabal-doctest, containers, directory, doctest, filepath - , hashable, hspec, hspec-discover, http-types, HUnit, QuickCheck - , quickcheck-instances, text, time, time-locale-compat - , unordered-containers, uri-bytestring, uuid-types - }: - mkDerivation { - pname = "http-api-data"; - version = "0.3.8.1"; - sha256 = "1cq6459b8wz6nvkvpi89dg189n5q2xdq4rdq435hf150555vmskf"; - revision = "1"; - editedCabalFile = "1843bapm2rdkl4941rycryircpqpp7mbal7vgmlikf11f8ws7y7x"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - attoparsec attoparsec-iso8601 base bytestring containers hashable - http-types text time time-locale-compat unordered-containers - uri-bytestring uuid-types - ]; - testHaskellDepends = [ - base bytestring directory doctest filepath hspec HUnit QuickCheck - quickcheck-instances text time unordered-containers uuid-types - ]; - testToolDepends = [ hspec-discover ]; - description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "http-api-data_0_4" = callPackage ({ mkDerivation, attoparsec, attoparsec-iso8601, base, base-compat , bytestring, Cabal, cabal-doctest, containers, cookie, directory , doctest, filepath, hashable, hspec, hspec-discover, http-types @@ -117172,7 +115103,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-attoparsec" = callPackage @@ -117293,23 +115223,6 @@ self: { }) {}; "http-client-openssl" = callPackage - ({ mkDerivation, base, HsOpenSSL, hspec, http-client, http-types - , network - }: - mkDerivation { - pname = "http-client-openssl"; - version = "0.2.2.0"; - sha256 = "1ahh2b34cwkmspwg8zilf2llmayf03p33z2gsw455wkhgfbhshcn"; - libraryHaskellDepends = [ base HsOpenSSL http-client network ]; - testHaskellDepends = [ - base HsOpenSSL hspec http-client http-types - ]; - doCheck = false; - description = "http-client backend using the OpenSSL library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "http-client-openssl_0_3_0_0" = callPackage ({ mkDerivation, base, bytestring, HsOpenSSL, hspec, http-client , http-types, network }: @@ -117326,7 +115239,6 @@ self: { doCheck = false; description = "http-client backend using the OpenSSL library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-client-request-modifiers" = callPackage @@ -117476,36 +115388,6 @@ self: { }: mkDerivation { pname = "http-conduit"; - version = "2.3.2"; - sha256 = "1iay4hr0mj8brkxvgkv1liqa8irl9axfc3qhn8qsvcyq4n1l95km"; - revision = "1"; - editedCabalFile = "0g6rg8r33q5rmrx5287vjfcqwjacchgzyfc8aqqrhrfz3fq5ll0g"; - libraryHaskellDepends = [ - aeson base bytestring conduit conduit-extra http-client - http-client-tls http-types mtl resourcet transformers unliftio-core - ]; - testHaskellDepends = [ - aeson base blaze-builder bytestring case-insensitive conduit - conduit-extra connection cookie data-default-class hspec - http-client http-types HUnit network resourcet streaming-commons - temporary text time transformers unliftio utf8-string wai - wai-conduit warp warp-tls - ]; - doCheck = false; - description = "HTTP client package with conduit interface and HTTPS support"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "http-conduit_2_3_4" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring - , case-insensitive, conduit, conduit-extra, connection, cookie - , data-default-class, hspec, http-client, http-client-tls - , http-types, HUnit, mtl, network, resourcet, streaming-commons - , temporary, text, time, transformers, unliftio, unliftio-core - , utf8-string, wai, wai-conduit, warp, warp-tls - }: - mkDerivation { - pname = "http-conduit"; version = "2.3.4"; sha256 = "03si9ymgnv1252q3wyj8cblbzx56shcvmi1hx51p90a2aiqbhj15"; libraryHaskellDepends = [ @@ -117522,7 +115404,6 @@ self: { doCheck = false; description = "HTTP client package with conduit interface and HTTPS support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-conduit-browser" = callPackage @@ -118287,8 +116168,8 @@ self: { }: mkDerivation { pname = "htvm"; - version = "0.1.0.0"; - sha256 = "0bf3dqyqrdi9mw72kp6hid4p6jk3gs5vw5fd1ycjgid218na7qmm"; + version = "0.1.2"; + sha256 = "0ggb6g6cdx6qzvda4l2z9danq5pkwncf3p2cyb68bwghs988fgxs"; libraryHaskellDepends = [ array base bytestring containers deriving-compat directory Earley filepath mtl pretty-show process recursion-schemes temporary text @@ -118301,7 +116182,7 @@ self: { tasty tasty-hunit tasty-quickcheck temporary text ]; testSystemDepends = [ tvm_runtime ]; - description = "TVM bindings"; + description = "Bindings for TVM machine learning framework"; license = stdenv.lib.licenses.gpl3; }) {tvm_runtime = null;}; @@ -119214,82 +117095,26 @@ self: { }) {}; "hw-ip" = callPackage - ({ mkDerivation, base, hedgehog, hspec, hw-hspec-hedgehog }: - mkDerivation { - pname = "hw-ip"; - version = "0.1.0.0"; - sha256 = "1gw0g6xd6q2rbnpb8j2yi8ddq39r2l8rplx8nfwk9mqzpgxx0r1n"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ]; - description = "Library for manipulating IP addresses and CIDR blocks"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-ip_1_0_0_0" = callPackage - ({ mkDerivation, appar, attoparsec, base, generic-lens, hedgehog + ({ mkDerivation, appar, base, containers, generic-lens, hedgehog , hspec, hw-bits, hw-hspec-hedgehog, iproute, text }: mkDerivation { pname = "hw-ip"; - version = "1.0.0.0"; - sha256 = "0di0r4dq1fzmb1cgmks54wqamx9jsjgnv4qjs3s8kwszz19plpfw"; + version = "2.0.0.0"; + sha256 = "04hb06rbkipm21fji9n5v56wm2jvdnr7w42ndp9x2hyp3m1i9sm0"; libraryHaskellDepends = [ - appar attoparsec base generic-lens hw-bits iproute text + appar base containers generic-lens hw-bits iproute text ]; testHaskellDepends = [ - attoparsec base generic-lens hedgehog hspec hw-bits - hw-hspec-hedgehog text + appar base generic-lens hedgehog hspec hw-bits hw-hspec-hedgehog + text ]; description = "Library for manipulating IP addresses and CIDR blocks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-json" = callPackage ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base - , bytestring, conduit, containers, criterion, dlist, hspec - , hw-balancedparens, hw-bits, hw-conduit, hw-diagnostics, hw-mquery - , hw-parser, hw-prim, hw-rankselect, hw-rankselect-base, mmap - , mono-traversable, parsec, QuickCheck, resourcet, text - , transformers, vector, word8 - }: - mkDerivation { - pname = "hw-json"; - version = "0.6.0.0"; - sha256 = "1na1xcgnnig27cv1v773jr7mv5izv8n1dnf6k3irw9rml3l213mv"; - revision = "2"; - editedCabalFile = "0ygq95nx4sb70l5kfxlsj6rf2b3ry84ixby567n0jk1g0zks3z7s"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-wl-pprint array attoparsec base bytestring conduit containers - dlist hw-balancedparens hw-bits hw-conduit hw-mquery hw-parser - hw-prim hw-rankselect hw-rankselect-base mmap mono-traversable - resourcet text vector word8 - ]; - executableHaskellDepends = [ - ansi-wl-pprint array attoparsec base bytestring conduit containers - criterion dlist hw-balancedparens hw-bits hw-conduit hw-diagnostics - hw-mquery hw-parser hw-prim hw-rankselect hw-rankselect-base mmap - mono-traversable resourcet text vector word8 - ]; - testHaskellDepends = [ - attoparsec base bytestring conduit containers hspec - hw-balancedparens hw-bits hw-conduit hw-prim hw-rankselect - hw-rankselect-base mmap parsec QuickCheck resourcet transformers - vector - ]; - benchmarkHaskellDepends = [ - base bytestring conduit criterion hw-balancedparens hw-bits - hw-conduit hw-prim hw-rankselect hw-rankselect-base mmap resourcet - vector - ]; - description = "Memory efficient JSON parser"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-json_0_9_0_1" = callPackage - ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base , bytestring, containers, criterion, directory, dlist, hspec , hw-balancedparens, hw-bits, hw-mquery, hw-parser, hw-prim , hw-rankselect, hw-rankselect-base, lens, mmap @@ -119321,7 +117146,6 @@ self: { ]; description = "Memory efficient JSON parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-json-lens" = callPackage @@ -119448,21 +117272,6 @@ self: { }) {}; "hw-parser" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, hw-prim - , mono-traversable, text - }: - mkDerivation { - pname = "hw-parser"; - version = "0.0.0.3"; - sha256 = "1wn68s00smwnivi813jcb71mx095v1kjgd2253gqknpmdv3ig16x"; - libraryHaskellDepends = [ - attoparsec base bytestring hw-prim mono-traversable text - ]; - description = "Simple parser support"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-parser_0_1_0_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hw-prim, text }: mkDerivation { pname = "hw-parser"; @@ -119473,7 +117282,6 @@ self: { ]; description = "Simple parser support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-prim" = callPackage @@ -119523,39 +117331,6 @@ self: { "hw-rankselect" = callPackage ({ mkDerivation, base, bytestring, conduit, criterion, deepseq , directory, hedgehog, hspec, hw-balancedparens, hw-bits - , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, mmap - , QuickCheck, resourcet, vector - }: - mkDerivation { - pname = "hw-rankselect"; - version = "0.10.0.3"; - sha256 = "1jqlyprb83bnffmq6ck6xpx27mqnmrarn890r2dn8k06asghf7da"; - revision = "1"; - editedCabalFile = "1rkni89h3sq02y03phb2bgx4yrx4gly9mzan6r4ziph0qayf09wf"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base deepseq hw-balancedparens hw-bits hw-prim hw-rankselect-base - vector - ]; - executableHaskellDepends = [ - base directory hw-bits hw-prim hw-rankselect-base mmap vector - ]; - testHaskellDepends = [ - base directory hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog - hw-prim hw-rankselect-base mmap QuickCheck vector - ]; - benchmarkHaskellDepends = [ - base bytestring conduit criterion directory hw-bits hw-prim - hw-rankselect-base mmap resourcet vector - ]; - description = "Rank-select"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-rankselect_0_12_0_4" = callPackage - ({ mkDerivation, base, bytestring, conduit, criterion, deepseq - , directory, hedgehog, hspec, hw-balancedparens, hw-bits , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, lens , mmap, mtl, optparse-applicative, QuickCheck, resourcet , transformers, vector @@ -119584,7 +117359,6 @@ self: { ]; description = "Rank-select"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-rankselect-base" = callPackage @@ -122010,19 +119784,6 @@ self: { ({ mkDerivation, base, process }: mkDerivation { pname = "ihs"; - version = "0.1.0.2"; - sha256 = "0cprv8g7kz07s5954020ac9yfggf3d2wmwp4xa61q4sz5rs7wiwq"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ base process ]; - description = "Interpolated Haskell"; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "ihs_0_1_0_3" = callPackage - ({ mkDerivation, base, process }: - mkDerivation { - pname = "ihs"; version = "0.1.0.3"; sha256 = "1zfmxgb3l7mihzjyggzb30d9b57y2z80yk562z2x2padsqx95gqk"; isLibrary = false; @@ -122030,7 +119791,6 @@ self: { executableHaskellDepends = [ base process ]; description = "Interpolated Haskell"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihttp" = callPackage @@ -122595,8 +120355,8 @@ self: { ({ mkDerivation, base, lens }: mkDerivation { pname = "impossible"; - version = "1.1.3"; - sha256 = "01p9s6nzzlmgg1gr42ys6wkxnzp1jqs3ay8jz5lbm1nkbjlabs4n"; + version = "1.1.4"; + sha256 = "0557f8a9aaslkhpyp7b6zidg88a3472ya31rp8amqf71393nvkqp"; libraryHaskellDepends = [ base lens ]; description = "Set of data and type definitions of impossible types. Impossible types are useful when declaring type classes / type families instances that should not be expanded by GHC until a specific type is provided in order to keep the types nice and readable."; license = stdenv.lib.licenses.asl20; @@ -123014,6 +120774,8 @@ self: { pname = "indexed-extras"; version = "0.2"; sha256 = "17rbk2kgiy04n48i6hk4lracwdl45qqklvs1lri7mma2r62f67xh"; + revision = "1"; + editedCabalFile = "0103q2ns33wmcnlhda2lcrz2x1kr2cyfxpv7akj6y09k7q19ir77"; libraryHaskellDepends = [ base bifunctors indexed mtl pointed ]; description = "Indexed functors, monads and comonads that require extensions to Haskell98"; license = stdenv.lib.licenses.bsd3; @@ -123225,25 +120987,6 @@ self: { }: mkDerivation { pname = "inflections"; - version = "0.4.0.3"; - sha256 = "028dj9pgs5g6qb9x1hc8r4rn0rznr1ynn79vln48k2llyf2r38dx"; - libraryHaskellDepends = [ - base exceptions megaparsec text unordered-containers - ]; - testHaskellDepends = [ - base containers hspec hspec-megaparsec megaparsec QuickCheck text - ]; - description = "Inflections library for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "inflections_0_4_0_4" = callPackage - ({ mkDerivation, base, containers, exceptions, hspec - , hspec-megaparsec, megaparsec, QuickCheck, text - , unordered-containers - }: - mkDerivation { - pname = "inflections"; version = "0.4.0.4"; sha256 = "0lspb0xpfj4q6wrzgss7pfjmr6xb5clj7y686vsairbkpcj3cfcl"; libraryHaskellDepends = [ @@ -123254,7 +120997,6 @@ self: { ]; description = "Inflections library for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inflist" = callPackage @@ -123470,8 +121212,8 @@ self: { }: mkDerivation { pname = "inline-c"; - version = "0.6.1.0"; - sha256 = "0vbfrsqsi7mdziqsnj68bsqlwbqxxhvrmy9rv6w8z18d1m8w3n6h"; + version = "0.7.0.1"; + sha256 = "19scbviwiv1fbsdcjji3dscjg7w0xa8r97xwkqqrwm7zhvrg5wns"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123562,6 +121304,8 @@ self: { pname = "inline-r"; version = "0.9.2"; sha256 = "1h2gwrh8kzx3przx29gcl4wffni3bxy1yrfabf88bdxjwj79s7z0"; + revision = "1"; + editedCabalFile = "01cxsjdxy5brdnw966928bcdivc8ab7kq91vdqkg2q801jf5jj9g"; libraryHaskellDepends = [ aeson base bytestring containers data-default-class deepseq exceptions inline-c mtl pretty primitive process reflection setenv @@ -123678,22 +121422,6 @@ self: { }: mkDerivation { pname = "inspection-testing"; - version = "0.2.0.1"; - sha256 = "1551dvk63xb4lr2zsyg3ri8v1nsjs050k2jsf8v0vfasx7w9ns8z"; - libraryHaskellDepends = [ - base containers ghc mtl template-haskell transformers - ]; - testHaskellDepends = [ base ]; - description = "GHC plugin to do inspection testing"; - license = stdenv.lib.licenses.mit; - }) {}; - - "inspection-testing_0_4_1_1" = callPackage - ({ mkDerivation, base, containers, ghc, mtl, template-haskell - , transformers - }: - mkDerivation { - pname = "inspection-testing"; version = "0.4.1.1"; sha256 = "1liysxim5lhf0a09asvv7j9hin60bljhp1p642j5j1j0hh2jax4l"; libraryHaskellDepends = [ @@ -123702,7 +121430,6 @@ self: { testHaskellDepends = [ base ]; description = "GHC plugin to do inspection testing"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inspector-wrecker" = callPackage @@ -124153,8 +121880,8 @@ self: { }: mkDerivation { pname = "intero"; - version = "0.1.34"; - sha256 = "02yq6rxg50za2lcsf6hvld5f1ab4q91kmw74j6kngm7921fa8fi3"; + version = "0.1.35"; + sha256 = "1vja9hfgisvkyv3qd69lswwxjmkddvd2ijag6jxc0w2bq25v452h"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -124278,6 +122005,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "interpolator" = callPackage + ({ mkDerivation, aeson, base, containers, either, hspec + , mono-traversable, mtl, product-profunctors, profunctors + , QuickCheck, template-haskell, text + }: + mkDerivation { + pname = "interpolator"; + version = "0.1.1"; + sha256 = "13symhhxvv2dxn7449p8b9g7p37p98icj0ql63y9qkdg6s7b8rf0"; + libraryHaskellDepends = [ + aeson base containers either mono-traversable mtl + product-profunctors profunctors QuickCheck template-haskell text + ]; + testHaskellDepends = [ + aeson base containers either hspec mono-traversable mtl + product-profunctors profunctors QuickCheck template-haskell text + ]; + description = "Runtime interpolation of environment variables in records using profunctors"; + license = stdenv.lib.licenses.mit; + }) {}; + "interprocess" = callPackage ({ mkDerivation, base, typed-process }: mkDerivation { @@ -124397,28 +122145,6 @@ self: { }) {}; "intro" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, deepseq - , dlist, extra, hashable, lens, mtl, QuickCheck, safe, text - , transformers, unordered-containers, writer-cps-mtl - }: - mkDerivation { - pname = "intro"; - version = "0.3.2.0"; - sha256 = "0nffkv59ws5ls8smafsvbgnpfhs6bbf6balwn23za1dlb5982ky3"; - libraryHaskellDepends = [ - base binary bytestring containers deepseq dlist extra hashable mtl - safe text transformers unordered-containers writer-cps-mtl - ]; - testHaskellDepends = [ - base binary bytestring containers deepseq dlist extra hashable lens - mtl QuickCheck safe text transformers unordered-containers - writer-cps-mtl - ]; - description = "\"Fixed Prelude\" - Mostly total and safe, provides Text and Monad transformers"; - license = stdenv.lib.licenses.mit; - }) {}; - - "intro_0_5_2_1" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, dlist , extra, hashable, lens, mtl, QuickCheck, safe, text, transformers , unordered-containers, writer-cps-mtl @@ -124438,7 +122164,6 @@ self: { ]; description = "Safe and minimal prelude"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "intro-prelude" = callPackage @@ -124652,25 +122377,6 @@ self: { }: mkDerivation { pname = "io-choice"; - version = "0.0.6"; - sha256 = "1vqw5v1b9mrkhhszxp1rg8gl1d53akdlzwh40w01b1ni208jhav1"; - libraryHaskellDepends = [ - base lifted-base monad-control template-haskell transformers - transformers-base - ]; - testHaskellDepends = [ - base hspec lifted-base monad-control transformers - ]; - description = "Choice for IO and lifted IO"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "io-choice_0_0_7" = callPackage - ({ mkDerivation, base, hspec, lifted-base, monad-control - , template-haskell, transformers, transformers-base - }: - mkDerivation { - pname = "io-choice"; version = "0.0.7"; sha256 = "16v6b9r5k2y5vm2s8k3j7xc5wh77nqd8j636mc6wxcxwn3260jir"; libraryHaskellDepends = [ @@ -124682,7 +122388,6 @@ self: { ]; description = "Choice for IO and lifted IO"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "io-machine" = callPackage @@ -124932,32 +122637,6 @@ self: { "ip" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion - , doctest, hashable, hspec, HUnit, primitive, QuickCheck - , quickcheck-classes, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, vector - }: - mkDerivation { - pname = "ip"; - version = "1.3.0"; - sha256 = "10dc3b41j11xa9rfqlbbrjs4wjszn1zn50w9cjs4i0yc02fqck4y"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring hashable primitive text vector - ]; - testHaskellDepends = [ - attoparsec base bytestring doctest hspec HUnit QuickCheck - quickcheck-classes test-framework test-framework-hunit - test-framework-quickcheck2 text - ]; - benchmarkHaskellDepends = [ - attoparsec base bytestring criterion text - ]; - description = "Library for IP and MAC addresses"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "ip_1_4_1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion , deepseq, doctest, hashable, hspec, HUnit, primitive, QuickCheck , quickcheck-classes, test-framework, test-framework-hunit , test-framework-quickcheck2, text, vector @@ -125123,25 +122802,6 @@ self: { }: mkDerivation { pname = "iproute"; - version = "1.7.6"; - sha256 = "1svczhzy126w7pa5vyfg90xrvi2ym34f47nj4hhcpx13dv06g5wi"; - libraryHaskellDepends = [ - appar base byteorder containers network - ]; - testHaskellDepends = [ - appar base byteorder containers doctest hspec network QuickCheck - safe - ]; - description = "IP Routing Table"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "iproute_1_7_7" = callPackage - ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec - , network, QuickCheck, safe - }: - mkDerivation { - pname = "iproute"; version = "1.7.7"; sha256 = "0gab5930nvzrpvisx3x43ydnp2rd4fbmy9cq1zpgqy1adx5gx8z6"; libraryHaskellDepends = [ @@ -125153,7 +122813,6 @@ self: { ]; description = "IP Routing Table"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iptables-helpers" = callPackage @@ -127313,12 +124972,13 @@ self: { , bytestring, concise, containers, cryptonite, hspec, lens, memory , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances , safe, semigroups, tasty, tasty-hspec, tasty-quickcheck - , template-haskell, text, time, unordered-containers, vector, x509 + , template-haskell, text, time, unix, unordered-containers, vector + , x509 }: mkDerivation { pname = "jose"; - version = "0.7.0.0"; - sha256 = "051rjqfskizgm9j927zh500q54lii3scldsymgcdfbaw40d0mncc"; + version = "0.8.0.0"; + sha256 = "027698xq5l8in420x3sc5zqwp16i1jzjcy8rlh546j8acxcvrqc4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127327,7 +124987,9 @@ self: { QuickCheck quickcheck-instances safe semigroups template-haskell text time unordered-containers vector x509 ]; - executableHaskellDepends = [ aeson base bytestring lens mtl ]; + executableHaskellDepends = [ + aeson base bytestring lens mtl semigroups text unix + ]; testHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring concise containers cryptonite hspec lens memory monad-time mtl network-uri @@ -127347,30 +125009,6 @@ self: { }: mkDerivation { pname = "jose-jwt"; - version = "0.7.8"; - sha256 = "0azkqllqc35hp2d2q50cwk472amhf0q5fkqs04a4kpnj50z6kqfk"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring cereal containers cryptonite - either memory mtl text time transformers transformers-compat - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring cryptonite doctest either hspec HUnit memory - mtl QuickCheck text unordered-containers vector - ]; - benchmarkHaskellDepends = [ base bytestring criterion cryptonite ]; - description = "JSON Object Signing and Encryption Library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "jose-jwt_0_8_0" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal - , containers, criterion, cryptonite, doctest, either, hspec, HUnit - , memory, mtl, QuickCheck, text, time, transformers - , transformers-compat, unordered-containers, vector - }: - mkDerivation { - pname = "jose-jwt"; version = "0.8.0"; sha256 = "1hmnkmbhmw78k35g3h3b016p0b4rrax9s8izp5xfrsqqxkl9ic2g"; libraryHaskellDepends = [ @@ -127385,7 +125023,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion cryptonite ]; description = "JSON Object Signing and Encryption Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jot" = callPackage @@ -127653,8 +125290,8 @@ self: { }: mkDerivation { pname = "json"; - version = "0.9.2"; - sha256 = "13kkfgx58z18jphbg56jn08jn72wi3kvfndlwwx87hqwg7x1dfz6"; + version = "0.9.3"; + sha256 = "1z8s3mfg76p2flqqd2wqsi96l5bg8k8w8m58zlv81pw3k7h1vbwb"; libraryHaskellDepends = [ array base bytestring containers mtl parsec pretty syb text ]; @@ -128627,6 +126264,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {Judy = null;}; + "juicy-draw" = callPackage + ({ mkDerivation, base, JuicyPixels, numeric-extras, primitive }: + mkDerivation { + pname = "juicy-draw"; + version = "0.2.0.0"; + sha256 = "0fi4kwcb8mqnzi3cx2gzpls6nyc8vxnhjfgrb7zf04bpcsph7rgr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base JuicyPixels numeric-extras primitive + ]; + executableHaskellDepends = [ base JuicyPixels ]; + description = "Draw and fill lines, rectangles and polygons"; + license = stdenv.lib.licenses.mit; + }) {}; + "juicy-gcode" = callPackage ({ mkDerivation, base, configurator, lens, linear, matrix , optparse-applicative, svg-tree, text @@ -128858,34 +126511,6 @@ self: { "jwt" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, cryptonite - , data-default, doctest, http-types, HUnit, lens, lens-aeson - , memory, network-uri, QuickCheck, scientific, semigroups, tasty - , tasty-hunit, tasty-quickcheck, tasty-th, text, time - , unordered-containers, vector - }: - mkDerivation { - pname = "jwt"; - version = "0.7.2"; - sha256 = "0c8aq9y7chq58xp9qd0w5dgbh2q3ksfidj3b4dm5k68ks89p95hp"; - revision = "1"; - editedCabalFile = "1q8h94yslw6k6zcjbwx94pnji8dcr2w5n1wzgzfb8hb78w2qr1dm"; - libraryHaskellDepends = [ - aeson base bytestring containers cryptonite data-default http-types - memory network-uri scientific semigroups text time - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers cryptonite data-default doctest - http-types HUnit lens lens-aeson memory network-uri QuickCheck - scientific semigroups tasty tasty-hunit tasty-quickcheck tasty-th - text time unordered-containers vector - ]; - description = "JSON Web Token (JWT) decoding and encoding"; - license = stdenv.lib.licenses.mit; - }) {}; - - "jwt_0_8_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, cryptonite , doctest, HsOpenSSL, http-types, HUnit, lens, lens-aeson, memory , network-uri, QuickCheck, RSA, scientific, semigroups, tasty , tasty-hunit, tasty-quickcheck, tasty-th, text, time @@ -128910,7 +126535,6 @@ self: { ]; description = "JSON Web Token (JWT) decoding and encoding"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kademlia" = callPackage @@ -130249,8 +127873,8 @@ self: { }: mkDerivation { pname = "keystore"; - version = "0.8.1.0"; - sha256 = "11dfxm7wxn1l82cr30gn2xw45ma7apssfgrgz95wrzm5k0kq331v"; + version = "0.8.1.1"; + sha256 = "013cvfp8cfj90lj4n41g8wwrv6xj3iql4m3zzawmpxzkqwmflsqy"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -131509,6 +129133,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lambdabot-xmpp" = callPackage + ({ mkDerivation, base, data-default, lambdabot-core + , lambdabot-haskell-plugins, lambdabot-irc-plugins + , lambdabot-misc-plugins, lambdabot-novelty-plugins + , lambdabot-reference-plugins, lambdabot-social-plugins + , lifted-base, mtl, network, pontarius-xmpp, split, text, tls + , x509-validation, xml-types + }: + mkDerivation { + pname = "lambdabot-xmpp"; + version = "0.1.0.0"; + sha256 = "1bn8gd2gxl44xqffiy8skh714hkvfv2d318v1qg9k52pp53al2ny"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base data-default lambdabot-core lambdabot-haskell-plugins + lambdabot-irc-plugins lambdabot-misc-plugins + lambdabot-novelty-plugins lambdabot-reference-plugins + lambdabot-social-plugins lifted-base mtl network pontarius-xmpp + split text tls x509-validation xml-types + ]; + description = "Lambdabot plugin for XMPP (Jabber) protocol"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lambdabot-zulip" = callPackage ({ mkDerivation, base, containers, hint, hspec, HUnit, hzulip , mueval, optparse-applicative, say, text, yaml @@ -132125,30 +129775,6 @@ self: { }: mkDerivation { pname = "language-docker"; - version = "6.0.4"; - sha256 = "1brlqlxa1h7iv2p17h4nb6ly7nr4dr9j815z3yiz0gbj91bgj4c1"; - revision = "1"; - editedCabalFile = "0la3l8m32zmgb4nk4fwchy1abip0k1b0x1i9205dih136g1iaq62"; - libraryHaskellDepends = [ - base bytestring containers free megaparsec mtl prettyprinter split - template-haskell text th-lift time - ]; - testHaskellDepends = [ - base bytestring containers directory filepath free Glob hspec HUnit - megaparsec mtl prettyprinter process QuickCheck split - template-haskell text th-lift time - ]; - description = "Dockerfile parser, pretty-printer and embedded DSL"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "language-docker_8_0_0" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , free, Glob, hspec, HUnit, megaparsec, mtl, prettyprinter, process - , QuickCheck, split, template-haskell, text, th-lift, time - }: - mkDerivation { - pname = "language-docker"; version = "8.0.0"; sha256 = "00zryknsc0717ysq8g1ip5dm70v8b33lfrscbzpdcw5dd2j32k7n"; libraryHaskellDepends = [ @@ -132162,7 +129788,6 @@ self: { ]; description = "Dockerfile parser, pretty-printer and embedded DSL"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-dockerfile" = callPackage @@ -132743,51 +130368,6 @@ self: { }) {}; "language-puppet" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base - , base16-bytestring, bytestring, case-insensitive, containers - , cryptonite, directory, exceptions, filecache, filepath - , formatting, Glob, hashable, hruby, hslogger, hspec - , hspec-megaparsec, http-api-data, http-client, lens, lens-aeson - , megaparsec, memory, mtl, operational, optparse-applicative - , parallel-io, parsec, pcre-utils, process, protolude, random - , regex-pcre-builtin, scientific, servant, servant-client, split - , stm, strict-base-types, temporary, text, time, transformers, unix - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "language-puppet"; - version = "1.3.20.1"; - sha256 = "0gak1v8p6fnrac7br2gvz3wg8mymm82gyv4wbdcp5rkj7ncm19vs"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring - case-insensitive containers cryptonite directory exceptions - filecache filepath formatting hashable hruby hslogger hspec - http-api-data http-client lens lens-aeson megaparsec memory mtl - operational parsec pcre-utils process protolude random - regex-pcre-builtin scientific servant servant-client split stm - strict-base-types text time transformers unix unordered-containers - vector yaml - ]; - executableHaskellDepends = [ - aeson ansi-wl-pprint base bytestring containers Glob hslogger - http-client lens megaparsec mtl optparse-applicative parallel-io - regex-pcre-builtin strict-base-types text transformers - unordered-containers vector yaml - ]; - testHaskellDepends = [ - base Glob hslogger hspec hspec-megaparsec lens megaparsec mtl - pcre-utils protolude scientific strict-base-types temporary text - transformers unordered-containers vector - ]; - description = "Tools to parse and evaluate the Puppet DSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "language-puppet_1_4_2" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, async, attoparsec, base , base16-bytestring, bytestring, case-insensitive, containers , cryptonite, directory, filecache, filepath, formatting, Glob @@ -133430,8 +131010,8 @@ self: { }: mkDerivation { pname = "layered-state"; - version = "1.1.4"; - sha256 = "06mwkz6816nkwlsc51hfx0y67dhf42rkib165xag7kga7843idxa"; + version = "1.1.5"; + sha256 = "122z7jzhy65ksdkgn505gkjgn0j04gqq38q5k1d3xlg96x670chk"; libraryHaskellDepends = [ base constraints data-default exceptions lens lens-utils monad-branch monoid mtl primitive profunctors prologue transformers @@ -133520,8 +131100,8 @@ self: { }: mkDerivation { pname = "layouting"; - version = "1.1.3"; - sha256 = "1ji0hmfa87n3pl61gmgk4phmpir29j5r81ack95s3h7nxh0q5qh7"; + version = "1.1.4"; + sha256 = "0p50zg1xydvci313dh87g0asx292vbhbz5iaywcw9rapwxlg5zld"; libraryHaskellDepends = [ base container layered-state prologue terminal-text text ]; @@ -133861,25 +131441,12 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "leancheck"; - version = "0.7.7"; - sha256 = "0ymzs3w7nfagpcyh4f57f1wi1gr72k7pbkh729jrxxqgqhd84bvd"; - libraryHaskellDepends = [ base template-haskell ]; - testHaskellDepends = [ base ]; - description = "Enumerative property-based testing"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "leancheck_0_8_0" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "leancheck"; version = "0.8.0"; sha256 = "1lblxlg881asqgbdv6sivzxryis7cgkpclgyyks598ii06vd0z1s"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base ]; description = "Enumerative property-based testing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "leancheck-enum-instances" = callPackage @@ -134233,48 +131800,6 @@ self: { }: mkDerivation { pname = "lens"; - version = "4.16.1"; - sha256 = "1im4drhbydbawd6i0jsrzpqihnmx4ywpkg7yg94ddwsw3mxwkgpm"; - revision = "2"; - editedCabalFile = "11h83lj5mba4grhz1qx3irz10ysm9c3k7k6i6xv2cr60q8xin3ri"; - setupHaskellDepends = [ base Cabal cabal-doctest filepath ]; - libraryHaskellDepends = [ - array base base-orphans bifunctors bytestring call-stack comonad - containers contravariant distributive exceptions filepath free - ghc-prim hashable kan-extensions mtl parallel profunctors - reflection semigroupoids semigroups tagged template-haskell text - th-abstraction transformers transformers-compat - unordered-containers vector void - ]; - testHaskellDepends = [ - base bytestring containers deepseq directory doctest filepath - generic-deriving HUnit mtl nats parallel QuickCheck semigroups - simple-reflect test-framework test-framework-hunit - test-framework-quickcheck2 test-framework-th text transformers - unordered-containers vector - ]; - benchmarkHaskellDepends = [ - base bytestring comonad containers criterion deepseq - generic-deriving transformers unordered-containers vector - ]; - description = "Lenses, Folds and Traversals"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "lens_4_17" = callPackage - ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring - , Cabal, cabal-doctest, call-stack, comonad, containers - , contravariant, criterion, deepseq, directory, distributive - , doctest, exceptions, filepath, free, generic-deriving, ghc-prim - , hashable, HUnit, kan-extensions, mtl, nats, parallel, profunctors - , QuickCheck, reflection, semigroupoids, semigroups, simple-reflect - , tagged, template-haskell, test-framework, test-framework-hunit - , test-framework-quickcheck2, test-framework-th, text - , th-abstraction, transformers, transformers-compat - , unordered-containers, vector, void - }: - mkDerivation { - pname = "lens"; version = "4.17"; sha256 = "1k087zfy10rijr3cikalj8p58d8ypfmhb4d29bsbw8qhakg68dj7"; setupHaskellDepends = [ base Cabal cabal-doctest filepath ]; @@ -134299,7 +131824,6 @@ self: { ]; description = "Lenses, Folds and Traversals"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-accelerate" = callPackage @@ -134422,23 +131946,11 @@ self: { ({ mkDerivation, base, ghc-prim, profunctors, tagged }: mkDerivation { pname = "lens-labels"; - version = "0.2.0.2"; - sha256 = "1s23klkxckly91yfn194bbd3g8lq2x5ykp2mx6730wh2izzwiblw"; - libraryHaskellDepends = [ base ghc-prim profunctors tagged ]; - description = "Integration of lenses with OverloadedLabels"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lens-labels_0_3_0_1" = callPackage - ({ mkDerivation, base, ghc-prim, profunctors, tagged }: - mkDerivation { - pname = "lens-labels"; version = "0.3.0.1"; sha256 = "0zz2w01knsj1zn9vj8g3dbhvh0sgnibr5wm9dn91qv0bmps745z7"; libraryHaskellDepends = [ base ghc-prim profunctors tagged ]; description = "Integration of lenses with OverloadedLabels"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-misc" = callPackage @@ -134616,8 +132128,8 @@ self: { }: mkDerivation { pname = "lens-utils"; - version = "1.4.5"; - sha256 = "00xcwyl12w95k14rc12ww2i0kgbrv39q1lvq5kfj3z7l5hv4fg0g"; + version = "1.4.6"; + sha256 = "1gz2mf33lszk33yszzcsbjhch1jxszg1h9cin49wwbgrb0imz7ds"; libraryHaskellDepends = [ aeson base containers data-default lens monoid split template-haskell @@ -137207,10 +134719,8 @@ self: { }: mkDerivation { pname = "list-t"; - version = "1.0.1"; - sha256 = "0wv78c3fg4g98pwdamsaasfnww4mdyffp4fhvb685s12kpg8shy3"; - revision = "1"; - editedCabalFile = "0jv0wxxr6rpw9mi3n6jbjqlk403wzycyafrc26vcwkdjaw63ckxb"; + version = "1.0.2"; + sha256 = "08wjng9d1sqjqc6pgq2lh84gcaabqmrslm3slc0rvaxh1lvasv6s"; libraryHaskellDepends = [ base mmorph monad-control mtl transformers transformers-base ]; @@ -137348,8 +134858,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "list-zip-def"; - version = "0.1.0.2"; - sha256 = "15123r7a52qb6dcxy1bxid8llykx439srqripmvji3rizwlqaa89"; + version = "0.1.0.3"; + sha256 = "0sklydccvdbxnj0c79lj7pcvw5v0bkycs9zp566gdcfy08qcjq79"; libraryHaskellDepends = [ base ]; description = "Provides zips with default values"; license = stdenv.lib.licenses.publicDomain; @@ -137836,35 +135346,6 @@ self: { }: mkDerivation { pname = "llvm-hs"; - version = "6.3.0"; - sha256 = "10v13f0pcsjaz7lhpg5wr520qp9rgajbv5c3pqx4v79nmfv797jd"; - revision = "2"; - editedCabalFile = "08rm1y7icxp2bdmv65n5nxg5mkppqpqd3m62n50gk6991kki9qdf"; - setupHaskellDepends = [ base Cabal containers ]; - libraryHaskellDepends = [ - array attoparsec base bytestring containers exceptions llvm-hs-pure - mtl template-haskell transformers utf8-string - ]; - libraryToolDepends = [ llvm-config ]; - testHaskellDepends = [ - base bytestring containers llvm-hs-pure mtl pretty-show process - QuickCheck tasty tasty-hunit tasty-quickcheck temporary - transformers - ]; - description = "General purpose LLVM bindings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {llvm-config = null;}; - - "llvm-hs_7_0_1" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring, Cabal - , containers, exceptions, llvm-config, llvm-hs-pure, mtl - , pretty-show, process, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, temporary, transformers - , utf8-string - }: - mkDerivation { - pname = "llvm-hs"; version = "7.0.1"; sha256 = "1ghgmmks22ra6ivhwhy65yj9ihr51lbhwdghm52pna5f14brhlyy"; revision = "1"; @@ -137892,27 +135373,6 @@ self: { }: mkDerivation { pname = "llvm-hs-pretty"; - version = "0.5.0.0"; - sha256 = "1715x7wggllp445kkb6f2pkc87qw504yvl2adzz2i4fz8jzm1jhd"; - libraryHaskellDepends = [ - array base bytestring llvm-hs-pure prettyprinter text - ]; - testHaskellDepends = [ - base directory filepath llvm-hs llvm-hs-pure mtl tasty tasty-golden - tasty-hspec tasty-hunit text transformers - ]; - description = "A pretty printer for LLVM IR"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "llvm-hs-pretty_0_6_1_0" = callPackage - ({ mkDerivation, array, base, bytestring, directory, filepath - , llvm-hs, llvm-hs-pure, mtl, prettyprinter, tasty, tasty-golden - , tasty-hspec, tasty-hunit, text, transformers - }: - mkDerivation { - pname = "llvm-hs-pretty"; version = "0.6.1.0"; sha256 = "12w1rkkaf50jl2vdkyk4xpvjmsxzjbfkdyklaq5p6b8ykw872pda"; libraryHaskellDepends = [ @@ -137934,26 +135394,6 @@ self: { }: mkDerivation { pname = "llvm-hs-pure"; - version = "6.2.1"; - sha256 = "1a9xzg6q4gd6j7dkvpkqpnrmh8y1fabllpjbh0m181v1c52aj23r"; - libraryHaskellDepends = [ - attoparsec base bytestring containers fail mtl template-haskell - transformers unordered-containers - ]; - testHaskellDepends = [ - base containers mtl tasty tasty-hunit tasty-quickcheck transformers - ]; - description = "Pure Haskell LLVM functionality (no FFI)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "llvm-hs-pure_7_0_0" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, fail - , mtl, tasty, tasty-hunit, tasty-quickcheck, template-haskell - , transformers, unordered-containers - }: - mkDerivation { - pname = "llvm-hs-pure"; version = "7.0.0"; sha256 = "1b82cin889qkyp9qv5p3yk7wq7ibnx2v9pk0mpvk6k9ca7fpr7dg"; libraryHaskellDepends = [ @@ -137965,7 +135405,6 @@ self: { ]; description = "Pure Haskell LLVM functionality (no FFI)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "llvm-ht" = callPackage @@ -140660,6 +138099,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "macos-corelibs" = callPackage + ({ mkDerivation, base, containers, managed, mtl, profunctors + , tagged, transformers + }: + mkDerivation { + pname = "macos-corelibs"; + version = "0.0.1.0"; + sha256 = "1ma5dc8j1s3fpqkqwlqnb32vwchdyabxp001qa7r7balima5xfjs"; + libraryHaskellDepends = [ + base containers managed mtl profunctors tagged transformers + ]; + description = "Haskell bindings to C-based Mac OS SDK frameworks"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "macosx-make-standalone" = callPackage ({ mkDerivation, base, containers, data-lens, data-lens-template , deepseq, directory, filepath, graph-visit, mtl, process @@ -140772,37 +138226,6 @@ self: { "magicbane" = callPackage ({ mkDerivation, aeson, aeson-qq, attoparsec, base, bytestring - , conduit, conduit-combinators, data-default, data-has, ekg-core - , ekg-wai, envy, errors, exceptions, fast-logger, http-api-data - , http-client, http-client-tls, http-conduit, http-link-header - , http-types, lifted-base, monad-control, monad-logger - , monad-metrics, mono-traversable, mtl, network-uri, raw-strings-qq - , refined, rio, rio-orphans, servant-server, split - , string-conversions, text, transformers, transformers-base - , unliftio, unliftio-core, unordered-containers, wai, wai-cli - , wai-middleware-metrics - }: - mkDerivation { - pname = "magicbane"; - version = "0.3.0"; - sha256 = "1jg6mhi046gdp0mhwzx2n40dv2ysrj8mkif6krb4vg3mdwh39lr0"; - libraryHaskellDepends = [ - aeson aeson-qq attoparsec base bytestring conduit - conduit-combinators data-default data-has ekg-core ekg-wai envy - errors exceptions fast-logger http-api-data http-client - http-client-tls http-conduit http-link-header http-types - lifted-base monad-control monad-logger monad-metrics - mono-traversable mtl network-uri raw-strings-qq refined rio - rio-orphans servant-server split string-conversions text - transformers transformers-base unliftio unliftio-core - unordered-containers wai wai-cli wai-middleware-metrics - ]; - description = "A web framework that integrates Servant, RIO, EKG, fast-logger, wai-cli…"; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "magicbane_0_4_0" = callPackage - ({ mkDerivation, aeson, aeson-qq, attoparsec, base, bytestring , conduit, conduit-combinators, data-has, ekg-core, ekg-wai, envy , errors, exceptions, fast-logger, http-api-data, http-client , http-client-tls, http-conduit, http-link-header, http-types @@ -140829,7 +138252,6 @@ self: { ]; description = "A web framework that integrates Servant, RIO, EKG, fast-logger, wai-cli…"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "magico" = callPackage @@ -140989,23 +138411,6 @@ self: { }) {}; "main-tester" = callPackage - ({ mkDerivation, base, bytestring, directory, doctest, hspec - , hspec-core, QuickCheck, text - }: - mkDerivation { - pname = "main-tester"; - version = "0.1.0.0"; - sha256 = "0sagm9fkdgjv8x602bjj32glcrivjf3yz47gpbbm48k0mk0dj2dc"; - libraryHaskellDepends = [ base bytestring directory ]; - testHaskellDepends = [ - base bytestring doctest hspec hspec-core QuickCheck text - ]; - description = "Capture stdout/stderr/exit code, and replace stdin of your main function"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "main-tester_0_2_0_0" = callPackage ({ mkDerivation, base, bytestring, directory, hspec, hspec-core , QuickCheck, text }: @@ -142374,27 +139779,6 @@ self: { }) {inherit (pkgs) pcre;}; "math-functions" = callPackage - ({ mkDerivation, base, deepseq, erf, HUnit, primitive, QuickCheck - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , vector, vector-th-unbox - }: - mkDerivation { - pname = "math-functions"; - version = "0.2.1.0"; - sha256 = "1sv5vabsx332v1lpb6v3jv4zrzvpx1n7yprzd8wlcda5vsc5a6zp"; - libraryHaskellDepends = [ - base deepseq primitive vector vector-th-unbox - ]; - testHaskellDepends = [ - base deepseq erf HUnit primitive QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 vector - vector-th-unbox - ]; - description = "Special functions and Chebyshev polynomials"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "math-functions_0_3_1_0" = callPackage ({ mkDerivation, base, data-default-class, deepseq, erf, HUnit , primitive, QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, vector, vector-th-unbox @@ -142413,7 +139797,6 @@ self: { ]; description = "Collection of tools for numeric computations"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mathblog" = callPackage @@ -142585,6 +139968,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "matrices_0_5_0" = callPackage + ({ mkDerivation, base, criterion, deepseq, primitive, tasty + , tasty-hunit, tasty-quickcheck, vector + }: + mkDerivation { + pname = "matrices"; + version = "0.5.0"; + sha256 = "0k8x75k1vkalpmcblmfjqy7lq49nr5mznh134h3d0zqz0q5ky0gx"; + libraryHaskellDepends = [ base deepseq primitive vector ]; + testHaskellDepends = [ + base tasty tasty-hunit tasty-quickcheck vector + ]; + benchmarkHaskellDepends = [ base criterion vector ]; + description = "native matrix based on vector"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "matrix" = callPackage ({ mkDerivation, base, criterion, deepseq, loop, primitive , QuickCheck, semigroups, tasty, tasty-quickcheck, vector @@ -143511,25 +140912,6 @@ self: { }: mkDerivation { pname = "mega-sdist"; - version = "0.3.3.1"; - sha256 = "0p4n5m91i80cns1g5n18bczpyxm8jcc205syr3k8xd7x9gwg69ww"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring conduit conduit-extra http-conduit optparse-simple - rio rio-orphans tar-conduit yaml - ]; - description = "Handles uploading to Hackage from mega repos"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mega-sdist_0_3_3_2" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra - , http-conduit, optparse-simple, rio, rio-orphans, tar-conduit - , yaml - }: - mkDerivation { - pname = "mega-sdist"; version = "0.3.3.2"; sha256 = "0jhlaww753spj5k2mrzrizcb408265wglc7gycdicnashsxc7qd4"; isLibrary = false; @@ -143540,37 +140922,10 @@ self: { ]; description = "Handles uploading to Hackage from mega repos"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "megaparsec" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers - , criterion, deepseq, hspec, hspec-discover, hspec-expectations - , mtl, parser-combinators, QuickCheck, scientific, text - , transformers, weigh - }: - mkDerivation { - pname = "megaparsec"; - version = "6.5.0"; - sha256 = "12iggy7qpf8x93jm64zf0g215xwy779bqyfyjk2bhmxqqr1yzgdy"; - revision = "4"; - editedCabalFile = "0ij3asi5vwlhbgwsy6nhli9a0qb7926mg809fsgyl1rnhs9fvpx1"; - libraryHaskellDepends = [ - base bytestring case-insensitive containers deepseq mtl - parser-combinators scientific text transformers - ]; - testHaskellDepends = [ - base bytestring containers hspec hspec-expectations mtl QuickCheck - scientific text transformers - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ base criterion deepseq text weigh ]; - description = "Monadic parser combinators"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "megaparsec_7_0_4" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers , criterion, deepseq, hspec, hspec-expectations, mtl , parser-combinators, QuickCheck, scientific, text, transformers , weigh @@ -143593,7 +140948,6 @@ self: { ]; description = "Monadic parser combinators"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "meldable-heap" = callPackage @@ -144622,23 +141976,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "microlens"; - version = "0.4.9.1"; - sha256 = "0j2nzf0vpx2anvsrg2w0vy2z4jn3kkcs2n6glkzblhn1j9piqh51"; - libraryHaskellDepends = [ base ]; - description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this."; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "microlens_0_4_10" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "microlens"; version = "0.4.10"; sha256 = "1v277yyy4p9q57xr2lfp6qs24agglfczmcabrapxrzci3jfshmcw"; libraryHaskellDepends = [ base ]; description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microlens-aeson" = callPackage @@ -144669,12 +142011,12 @@ self: { }) {}; "microlens-contra" = callPackage - ({ mkDerivation, base, contravariant, microlens }: + ({ mkDerivation, base, microlens }: mkDerivation { pname = "microlens-contra"; version = "0.1.0.2"; sha256 = "1ny9qhvd7rfzdkq4jdcgh4mfia856rsgpdhg8lprfprh6p7lhy5m"; - libraryHaskellDepends = [ base contravariant microlens ]; + libraryHaskellDepends = [ base microlens ]; description = "True folds and getters for microlens"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -144697,21 +142039,6 @@ self: { }: mkDerivation { pname = "microlens-ghc"; - version = "0.4.9.1"; - sha256 = "03iwgg8zww9irv59l70c8yy7vzxir1zf66y12210xk91k5hq6jrj"; - libraryHaskellDepends = [ - array base bytestring containers microlens transformers - ]; - description = "microlens + array, bytestring, containers, transformers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "microlens-ghc_0_4_10" = callPackage - ({ mkDerivation, array, base, bytestring, containers, microlens - , transformers - }: - mkDerivation { - pname = "microlens-ghc"; version = "0.4.10"; sha256 = "102dbrdsdadxbbhvx8avv1wbk84767a7lkb8ckp3zxk9g7qlly33"; libraryHaskellDepends = [ @@ -144719,7 +142046,6 @@ self: { ]; description = "microlens + array, bytestring, containers, transformers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microlens-mtl" = callPackage @@ -144743,22 +142069,6 @@ self: { }: mkDerivation { pname = "microlens-platform"; - version = "0.3.10"; - sha256 = "1d4nhmgf9jq0ixc7qhwm7aaw3xdr0nalw58d0ydsydgf02cyazwv"; - libraryHaskellDepends = [ - base hashable microlens microlens-ghc microlens-mtl microlens-th - text unordered-containers vector - ]; - description = "Feature-complete microlens"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "microlens-platform_0_3_11" = callPackage - ({ mkDerivation, base, hashable, microlens, microlens-ghc - , microlens-mtl, microlens-th, text, unordered-containers, vector - }: - mkDerivation { - pname = "microlens-platform"; version = "0.3.11"; sha256 = "18950lxgmsg5ksvyyi3zs1smjmb1qf1q73a3p3g44bh21miz0xwb"; libraryHaskellDepends = [ @@ -144767,7 +142077,6 @@ self: { ]; description = "Feature-complete microlens"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microlens-th" = callPackage @@ -144824,19 +142133,6 @@ self: { }) {}; "microspec" = callPackage - ({ mkDerivation, base, QuickCheck }: - mkDerivation { - pname = "microspec"; - version = "0.1.0.0"; - sha256 = "0hykarba8ccwkslh8cfsxbriw043f8pa4jyhr3hqc5yqfijibr71"; - revision = "1"; - editedCabalFile = "0cnfj3v6fzck57bgrsnmgz8a9azvz04pm3hv17fg12xzchmp07cq"; - libraryHaskellDepends = [ base QuickCheck ]; - description = "Tiny QuickCheck test library with minimal dependencies"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "microspec_0_2_1_3" = callPackage ({ mkDerivation, base, QuickCheck, time }: mkDerivation { pname = "microspec"; @@ -144845,7 +142141,6 @@ self: { libraryHaskellDepends = [ base QuickCheck time ]; description = "Tiny QuickCheck test library with minimal dependencies"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microstache" = callPackage @@ -145313,6 +142608,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mime-types_0_1_0_9" = callPackage + ({ mkDerivation, base, bytestring, containers, text }: + mkDerivation { + pname = "mime-types"; + version = "0.1.0.9"; + sha256 = "1lkipa4v73z3l5lqs6sdhl898iq41kyxv2jb9agsajzgd58l6cha"; + libraryHaskellDepends = [ base bytestring containers text ]; + description = "Basic mime-type handling types and functions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "minecraft-data" = callPackage ({ mkDerivation, array, base, bytestring, cereal, containers, lens , mtl, nbt, pipes, pipes-bytestring, pipes-cereal, pipes-parse @@ -145436,22 +142743,6 @@ self: { }: mkDerivation { pname = "minimorph"; - version = "0.1.6.1"; - sha256 = "0i5qigcj5qpzyg2br8xppd36b5q86y3n457g0hdpv9469d2pnrwl"; - libraryHaskellDepends = [ base text ]; - testHaskellDepends = [ - base HUnit test-framework test-framework-hunit text - ]; - description = "English spelling functions with an emphasis on simplicity"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "minimorph_0_2_1_0" = callPackage - ({ mkDerivation, base, HUnit, test-framework, test-framework-hunit - , text - }: - mkDerivation { - pname = "minimorph"; version = "0.2.1.0"; sha256 = "1phpsd0j8c987sw99p4hyywr4ydcxf5aq4h6xqdl3acwi0dv4zhj"; libraryHaskellDepends = [ base text ]; @@ -145460,7 +142751,6 @@ self: { ]; description = "English spelling functions with an emphasis on simplicity"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "minimung" = callPackage @@ -145622,24 +142912,6 @@ self: { }) {}; "miniutter" = callPackage - ({ mkDerivation, base, binary, containers, ghc-prim, HUnit - , minimorph, test-framework, test-framework-hunit, text - }: - mkDerivation { - pname = "miniutter"; - version = "0.4.7.0"; - sha256 = "10nwg3vw0p8hb8hgc34xspg4vrwf8xyhi22b9j57ms3045marjdd"; - libraryHaskellDepends = [ - base binary containers ghc-prim minimorph text - ]; - testHaskellDepends = [ - base containers HUnit test-framework test-framework-hunit text - ]; - description = "Simple English clause creation from arbitrary words"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "miniutter_0_5_0_0" = callPackage ({ mkDerivation, base, binary, containers, HUnit, minimorph , test-framework, test-framework-hunit, text }: @@ -145654,7 +142926,6 @@ self: { ]; description = "Simple English clause creation from arbitrary words"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "minlen" = callPackage @@ -145760,6 +143031,66 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "mismi-core" = callPackage + ({ mkDerivation, amazonka, amazonka-core, base, bytestring + , exceptions, hedgehog, http-client, http-types, lens + , mismi-core-test, mismi-kernel, mismi-p, mmorph, mtl, resourcet + , retry, text, transformers + }: + mkDerivation { + pname = "mismi-core"; + version = "0.0.1"; + sha256 = "1vcj56blmk3g7vbp3d3a4yhla002w1ws5jxzbmgf1wxswc8hywvc"; + libraryHaskellDepends = [ + amazonka amazonka-core base bytestring exceptions http-client + http-types lens mismi-kernel mismi-p mtl resourcet retry text + transformers + ]; + testHaskellDepends = [ + amazonka-core base exceptions hedgehog mismi-core-test mismi-p + mmorph resourcet transformers + ]; + description = "AWS Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {mismi-core-test = null;}; + + "mismi-kernel" = callPackage + ({ mkDerivation, base, hedgehog, mismi-p, text }: + mkDerivation { + pname = "mismi-kernel"; + version = "0.0.1"; + sha256 = "1pqm6xza3ds6z5n32bb12q6z2x9n5jzwyxhy7b7f0ryzijasabg4"; + libraryHaskellDepends = [ base mismi-p text ]; + testHaskellDepends = [ base hedgehog mismi-p text ]; + description = "AWS Library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "mismi-p" = callPackage + ({ mkDerivation, base, text }: + mkDerivation { + pname = "mismi-p"; + version = "0.0.1"; + sha256 = "1xkrf270rfjig6bkpk4n63kgmjh05x38p99ndan4gr31ghbjyvk5"; + libraryHaskellDepends = [ base text ]; + description = "A commmon prelude for the mismi project"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "mismi-s3-core" = callPackage + ({ mkDerivation, attoparsec, base, hedgehog, mismi-p, text }: + mkDerivation { + pname = "mismi-s3-core"; + version = "0.0.1"; + sha256 = "06c7sgkhw7iax6z5cqq1a0icpizwmwl8agvi788h5w2d6hn9wgjh"; + libraryHaskellDepends = [ attoparsec base mismi-p text ]; + testHaskellDepends = [ base hedgehog mismi-p text ]; + description = "AWS Library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "miso" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, http-api-data , http-types, lucid, network-uri, servant, servant-lucid, text @@ -145974,37 +143305,6 @@ self: { "mmark" = callPackage ({ mkDerivation, aeson, base, case-insensitive, containers , criterion, data-default-class, deepseq, dlist, email-validate - , foldl, hashable, hspec, hspec-megaparsec, html-entity-map, lucid - , megaparsec, microlens, microlens-th, modern-uri, mtl - , parser-combinators, QuickCheck, text, text-metrics - , unordered-containers, weigh, yaml - }: - mkDerivation { - pname = "mmark"; - version = "0.0.5.6"; - sha256 = "0d0jxxj0b1jy9mym6389dmm6biiw8kzdh06zj2j0gsjczn2n60zw"; - revision = "6"; - editedCabalFile = "13cn8nkqj0zl26rgs01rspb2mz6gq1a6ax3g5bygdphvwzraswc5"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base case-insensitive containers data-default-class deepseq - dlist email-validate foldl hashable html-entity-map lucid - megaparsec microlens microlens-th modern-uri mtl parser-combinators - text text-metrics unordered-containers yaml - ]; - testHaskellDepends = [ - aeson base foldl hspec hspec-megaparsec lucid megaparsec modern-uri - QuickCheck text - ]; - benchmarkHaskellDepends = [ base criterion text weigh ]; - description = "Strict markdown processor for writers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "mmark_0_0_6_0" = callPackage - ({ mkDerivation, aeson, base, case-insensitive, containers - , criterion, data-default-class, deepseq, dlist, email-validate , foldl, hashable, hspec, hspec-discover, hspec-megaparsec , html-entity-map, lucid, megaparsec, microlens, microlens-th , modern-uri, mtl, parser-combinators, QuickCheck, text @@ -146035,28 +143335,6 @@ self: { }) {}; "mmark-cli" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, gitrev, lucid - , megaparsec, mmark, mmark-ext, optparse-applicative, stache, text - , unordered-containers - }: - mkDerivation { - pname = "mmark-cli"; - version = "0.0.3.0"; - sha256 = "0nb17k23bs21qi7a888qp81w682ax2qvih9fbvdkdh6c2n6yklrp"; - revision = "2"; - editedCabalFile = "0i3gvfgm4bfbdyflhhaf4gdr7cbkw51i330f25rgha9k3s4v59w3"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson base bytestring directory gitrev lucid megaparsec mmark - mmark-ext optparse-applicative stache text unordered-containers - ]; - description = "Command line interface to MMark markdown processor"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "mmark-cli_0_0_5_0" = callPackage ({ mkDerivation, aeson, base, bytestring, directory , ghc-syntax-highlighter, gitrev, lucid, megaparsec, mmark , mmark-ext, optparse-applicative, stache, text @@ -146262,32 +143540,6 @@ self: { }: mkDerivation { pname = "modern-uri"; - version = "0.2.2.0"; - sha256 = "1ldl2i34fl7srv72bjxnrbihafq8m8mmk5xca6lhcqwdpx8yakxb"; - libraryHaskellDepends = [ - base bytestring containers contravariant deepseq exceptions - megaparsec mtl profunctors QuickCheck reflection tagged - template-haskell text - ]; - testHaskellDepends = [ - base bytestring hspec hspec-megaparsec megaparsec QuickCheck text - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq megaparsec text weigh - ]; - description = "Modern library for working with URIs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "modern-uri_0_3_0_1" = callPackage - ({ mkDerivation, base, bytestring, containers, contravariant - , criterion, deepseq, exceptions, hspec, hspec-discover - , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck - , reflection, tagged, template-haskell, text, weigh - }: - mkDerivation { - pname = "modern-uri"; version = "0.3.0.1"; sha256 = "01a5jnv8kbl2c9ka9dgqm4a8b7n6frmg7yi8f417qcnwgn1lbs78"; revision = "1"; @@ -146306,7 +143558,6 @@ self: { ]; description = "Modern library for working with URIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "modify-fasta" = callPackage @@ -146366,13 +143617,13 @@ self: { }) {}; "modular-arithmetic" = callPackage - ({ mkDerivation, base, doctest, Glob }: + ({ mkDerivation, base, doctest }: mkDerivation { pname = "modular-arithmetic"; - version = "1.2.1.3"; - sha256 = "1f5k25gqnn037fpan3l956ly0g5cgwnw7qxyc6sm6hgdcl91wn1l"; + version = "1.2.1.4"; + sha256 = "1nlv5bwyfppw6qz6j2z1cvgzpixciv5gygpcvqlfnmmv410il4si"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest Glob ]; + testHaskellDepends = [ base doctest ]; description = "A type for integers modulo some constant"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -146653,8 +143904,8 @@ self: { ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "monad-branch"; - version = "1.0.3"; - sha256 = "15nk9lvwz4s6lx8g08x5npai0bk13s6mj26vz6biwy3shpf5v11r"; + version = "1.0.4"; + sha256 = "0g82ccql6pmj319ji3zpmxab78qwdlrjsl7cdfhjvv4m1i4kmzdf"; libraryHaskellDepends = [ base mtl transformers ]; description = "Monadic abstraction for computations that can be branched and run independently"; license = stdenv.lib.licenses.asl20; @@ -147121,29 +144372,6 @@ self: { }) {}; "monad-memo" = callPackage - ({ mkDerivation, array, base, containers, criterion, mtl, primitive - , QuickCheck, random, test-framework, test-framework-quickcheck2 - , transformers, vector - }: - mkDerivation { - pname = "monad-memo"; - version = "0.4.1"; - sha256 = "07gid18rsja7gvk2ccsbwvpz223x59mdk9x9w36bz18cy2pw802c"; - libraryHaskellDepends = [ - array base containers mtl primitive transformers vector - ]; - testHaskellDepends = [ - array base containers mtl primitive QuickCheck random - test-framework test-framework-quickcheck2 transformers vector - ]; - benchmarkHaskellDepends = [ - array base containers criterion mtl primitive transformers vector - ]; - description = "Memoization monad transformer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "monad-memo_0_5_1" = callPackage ({ mkDerivation, array, base, containers, criterion, primitive , QuickCheck, random, test-framework, test-framework-quickcheck2 , transformers, vector @@ -147164,7 +144392,6 @@ self: { ]; description = "Memoization monad transformer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-mersenne-random" = callPackage @@ -147976,8 +145203,8 @@ self: { ({ mkDerivation, base, bindings-monetdb-mapi }: mkDerivation { pname = "monetdb-mapi"; - version = "0.1.0.1"; - sha256 = "1r035w349js424x0864xghvs79v4wsf9br4rwqpfqkyz2hxsqhx0"; + version = "0.1.0.2"; + sha256 = "069jmlnrgia36ncl5mqaqq0iaqwrhx6ig5jjnlxr40vfdi4m4dw6"; libraryHaskellDepends = [ base bindings-monetdb-mapi ]; description = "Mid-level bindings for the MonetDB API (mapi)"; license = stdenv.lib.licenses.bsd3; @@ -148125,8 +145352,10 @@ self: { }: mkDerivation { pname = "mono-traversable"; - version = "1.0.9.0"; - sha256 = "0180ks0dyvpk1r20w5jw2w2n79mjnk69n9vhspaxzlyxqgim5psa"; + version = "1.0.10.0"; + sha256 = "04c8gcksxkrfdll2lm3aaj1dgz7snvfa8avsccs3h6v5ygvdp5h0"; + revision = "1"; + editedCabalFile = "1hgwrmq7r8d1nq9283wis67lg0wlid2sgqnr9vpsv2wpnd4n1rdl"; libraryHaskellDepends = [ base bytestring containers hashable split text transformers unordered-containers vector vector-algorithms @@ -148172,8 +145401,8 @@ self: { ({ mkDerivation, base, containers, lens, mtl }: mkDerivation { pname = "monoid"; - version = "0.1.8"; - sha256 = "15mwj4w46wszawhiabykamaf020m795zg017jb2j49gpzk8abqjf"; + version = "0.1.9"; + sha256 = "13k5s9y37igvrsfbw5q76zy10fm585dijx10qk32c4agih9fxyfv"; libraryHaskellDepends = [ base containers lens mtl ]; description = "Monoid type classes, designed in modular way, distinguish Monoid from Mempty and Semigroup. This design allows mempty operation don't bring Semigroups related constraints until (<>) is used."; license = stdenv.lib.licenses.asl20; @@ -148281,22 +145510,6 @@ self: { }) {}; "monoidal-containers" = callPackage - ({ mkDerivation, base, containers, deepseq, hashable, lens, newtype - , semigroups, unordered-containers - }: - mkDerivation { - pname = "monoidal-containers"; - version = "0.3.1.0"; - sha256 = "11gpqp4c54q6kmsdfpl0lcrfj6687h51mjpgirl299j6bam2bhs4"; - libraryHaskellDepends = [ - base containers deepseq hashable lens newtype semigroups - unordered-containers - ]; - description = "Containers with monoidal accumulation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "monoidal-containers_0_4_0_0" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, hashable, lens , newtype, semigroups, unordered-containers }: @@ -148310,7 +145523,6 @@ self: { ]; description = "Containers with monoidal accumulation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monoidplus" = callPackage @@ -148520,8 +145732,8 @@ self: { ({ mkDerivation, base, containers, hspec }: mkDerivation { pname = "more-containers"; - version = "0.1.1.0"; - sha256 = "1gy7h36spmksn1d3vg56l93kfgd24im304ync20pzaymkbljh1gk"; + version = "0.1.2.0"; + sha256 = "0q3ljqjzzrx1y0vbsgvrnmbmvysxkfk2ky5xxix1kirpn1q45yjj"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers hspec ]; description = "A few more collections"; @@ -148609,40 +145821,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "morte" = 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 - }: + "morphisms-functors" = callPackage + ({ mkDerivation, morphisms }: mkDerivation { - pname = "morte"; - version = "1.6.20"; - sha256 = "01m382137sa9if332y9aag8fl77f4sd3i8kxz5cp8g1p10iyjjbl"; - 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; + pname = "morphisms-functors"; + version = "0.1.2"; + sha256 = "056vy0pmjm5p88kjhzy19nfhdwsjv9qqyvi78ff2czmv88242ala"; + libraryHaskellDepends = [ morphisms ]; + description = "Functors, theirs compositions and transformations"; + license = stdenv.lib.licenses.mit; }) {}; - "morte_1_7_1" = callPackage + "morte" = callPackage ({ mkDerivation, alex, array, base, binary, code-page, containers , criterion, deepseq, Earley, formatting, http-client , http-client-tls, microlens, microlens-mtl, mtl @@ -148673,7 +145863,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 @@ -148706,6 +145895,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "moss" = callPackage + ({ mkDerivation, base, bytestring, conduit-extra, mtl, network + , network-simple, unix-compat + }: + mkDerivation { + pname = "moss"; + version = "0.1.0.0"; + sha256 = "19gy0x191gk6wa85vp5nhh0xgmr3mj2daiqx8bap452fm1y85qcr"; + libraryHaskellDepends = [ + base bytestring conduit-extra mtl network network-simple + unix-compat + ]; + description = "Haskell client for Moss"; + license = stdenv.lib.licenses.mit; + }) {}; + "moto" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , cryptohash-sha1, df1, di, di-core, di-df1, directory, filepath @@ -150811,20 +148016,6 @@ self: { ({ mkDerivation, base, math-functions, primitive, time, vector }: mkDerivation { pname = "mwc-random"; - version = "0.13.6.0"; - sha256 = "05j7yh0hh9nxic3dijmzv44kc6gzclvamdph7sq7w19wq57k6pq6"; - libraryHaskellDepends = [ - base math-functions primitive time vector - ]; - doCheck = false; - description = "Fast, high quality pseudo random number generation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "mwc-random_0_14_0_0" = callPackage - ({ mkDerivation, base, math-functions, primitive, time, vector }: - mkDerivation { - pname = "mwc-random"; version = "0.14.0.0"; sha256 = "18pg24sw3b79b32cwx8q01q4k0lm34mwr3l6cdkchl8alvd0wdq0"; libraryHaskellDepends = [ @@ -150833,7 +148024,6 @@ self: { doCheck = false; description = "Fast, high quality pseudo random number generation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mwc-random-accelerate" = callPackage @@ -151172,32 +148362,6 @@ self: { }: mkDerivation { pname = "mysql-haskell"; - version = "0.8.3.0"; - sha256 = "1b3sa119m82qmq2mkn0ixhs175i6l92nk4qwvfhh226crj6g5bp9"; - revision = "1"; - editedCabalFile = "1kpfmrwwdaxjqwbsc6m9imlcfi2vvkz62pin5nrvm1fk17isy69v"; - libraryHaskellDepends = [ - base binary binary-ieee754 binary-parsers blaze-textual bytestring - bytestring-lexing cryptonite io-streams memory monad-loops network - scientific tcp-streams text time tls vector wire-streams word24 - ]; - testHaskellDepends = [ - base bytestring io-streams tasty tasty-hunit text time vector - ]; - description = "pure haskell MySQL driver"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "mysql-haskell_0_8_4_1" = callPackage - ({ mkDerivation, base, binary, binary-ieee754, binary-parsers - , blaze-textual, bytestring, bytestring-lexing, cryptonite - , io-streams, memory, monad-loops, network, scientific, tasty - , tasty-hunit, tcp-streams, text, time, tls, vector, wire-streams - , word24 - }: - mkDerivation { - pname = "mysql-haskell"; version = "0.8.4.1"; sha256 = "0m3kqm5ldy47gv0gbh3sxv2zm4kmszw96r5sar5bzb3v9jvmz94x"; libraryHaskellDepends = [ @@ -151566,18 +148730,6 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "named"; - version = "0.1.0.0"; - sha256 = "0n26085hhqcqazwb02j5ippicl04caln935dbsq8sgkaj1imryp7"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; - description = "Named parameters (keyword arguments) for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "named_0_2_0_0" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "named"; version = "0.2.0.0"; sha256 = "17ldvxypf099wj5phzh2aymzfwmyiyzhz24h1aj2s21nrys5n6n0"; revision = "2"; @@ -151586,7 +148738,6 @@ self: { testHaskellDepends = [ base ]; description = "Named parameters (keyword arguments) for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "named-formlet" = callPackage @@ -152267,22 +149418,6 @@ self: { }: mkDerivation { pname = "neat-interpolation"; - version = "0.3.2.2"; - sha256 = "0ffcr6q9bmvlmz5j8s0q08pbqzcfz9pkh8gz52arzscflpncbj5n"; - libraryHaskellDepends = [ - base base-prelude megaparsec template-haskell text - ]; - testHaskellDepends = [ base-prelude HTF ]; - description = "A quasiquoter for neat and simple multiline text interpolation"; - license = stdenv.lib.licenses.mit; - }) {}; - - "neat-interpolation_0_3_2_4" = callPackage - ({ mkDerivation, base, base-prelude, HTF, megaparsec - , template-haskell, text - }: - mkDerivation { - pname = "neat-interpolation"; version = "0.3.2.4"; sha256 = "0lhpjckwhzlvx4cdhrwprwb85vc7hc44ybvk5nswgn7z73cp0wyy"; libraryHaskellDepends = [ @@ -152291,7 +149426,6 @@ self: { testHaskellDepends = [ base-prelude HTF ]; description = "A quasiquoter for neat and simple multiline text interpolation"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "needle" = callPackage @@ -153076,18 +150210,6 @@ self: { }) {}; "network" = callPackage - ({ mkDerivation, base, bytestring, doctest, hspec, HUnit, unix }: - mkDerivation { - pname = "network"; - version = "2.6.3.6"; - sha256 = "198mam7ahny48p9fajznbqq16a8ya2gw0xm3gnm1si1rmc4hdplv"; - libraryHaskellDepends = [ base bytestring unix ]; - testHaskellDepends = [ base bytestring doctest hspec HUnit ]; - description = "Low-level networking interface"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "network_2_8_0_0" = callPackage ({ mkDerivation, base, bytestring, directory, doctest, hspec, HUnit , unix }: @@ -153101,7 +150223,6 @@ self: { ]; description = "Low-level networking interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-address" = callPackage @@ -153200,8 +150321,8 @@ self: { }: mkDerivation { pname = "network-arbitrary"; - version = "0.3.0.0"; - sha256 = "13mr3gxgc4g1ij0fj8xwn1md0hi9l1gpka06y072ffh8ib7qg98c"; + version = "0.4.0.1"; + sha256 = "161l63gr2l2ncp8vaznl4izxgig43w26q91hvpd6x57k0y4r2zk9"; libraryHaskellDepends = [ base bytestring http-media http-types network-uri QuickCheck ]; @@ -154026,6 +151147,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "network-uri-lenses" = callPackage + ({ mkDerivation, base, lens, network-uri }: + mkDerivation { + pname = "network-uri-lenses"; + version = "0.2.0.0"; + sha256 = "08yvcvpqwibxpqjz3qbkvks1aqgbshdc9chnj8b49yd1vdrzx41p"; + libraryHaskellDepends = [ base lens network-uri ]; + description = "Lenses for network-uri"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "network-uri-static" = callPackage ({ mkDerivation, base, doctest, network-uri, template-haskell }: mkDerivation { @@ -154423,8 +151555,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools"; - version = "0.4.1.0"; - sha256 = "0q70p894sqzzx534vxl8grrizllzhw3cx1d02nfg88h7gr82zp3f"; + version = "0.4.2.2"; + sha256 = "08ar9qjilx9im2qyxkxf8h6nah9k5c8qdfvbkqxbklg3lq9a54nf"; libraryHaskellDepends = [ aeson base binary bytestring ngx-export safe template-haskell ]; @@ -155519,6 +152651,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "notmuch" = callPackage + ({ mkDerivation, base, bytestring, c2hs, deepseq, mtl, notmuch + , profunctors, tagged, talloc, text, time + }: + mkDerivation { + pname = "notmuch"; + version = "0.1.0.0"; + sha256 = "100kqfyw5aan07ywynqrpmgvsv1cma1v7sl2a8zvlwnhva39nz3b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring deepseq mtl profunctors tagged text time + ]; + librarySystemDepends = [ notmuch talloc ]; + libraryToolDepends = [ c2hs ]; + description = "Haskell binding to Notmuch, the mail indexer"; + license = stdenv.lib.licenses.gpl3; + }) {inherit (pkgs) notmuch; inherit (pkgs) talloc;}; + "notmuch-haskell" = callPackage ({ mkDerivation, base, containers, filepath, notmuch, old-locale , parseargs, time @@ -157342,21 +154493,6 @@ self: { }) {}; "once" = callPackage - ({ mkDerivation, base, containers, hashable, template-haskell - , unordered-containers - }: - mkDerivation { - pname = "once"; - version = "0.2"; - sha256 = "1a2833v9mvjjh0m87qc5aj0n5yb8wzg5mrxhlh4g7hgsl4lccgkm"; - libraryHaskellDepends = [ - base containers hashable template-haskell unordered-containers - ]; - description = "memoization for IO actions and functions"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "once_0_4" = callPackage ({ mkDerivation, async, base, containers, hashable, hspec , hspec-discover, HUnit, template-haskell, unordered-containers }: @@ -157374,7 +154510,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "memoization for IO actions and functions"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "one-line-aeson-text" = callPackage @@ -158856,6 +155991,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "optparse-simple_0_1_1" = callPackage + ({ mkDerivation, base, bytestring, directory, githash + , optparse-applicative, template-haskell, transformers + }: + mkDerivation { + pname = "optparse-simple"; + version = "0.1.1"; + sha256 = "192mw3dn43vcckjbhmmrbs3r6vaaa74xqsp6c5bvmv2wafm1plq3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base githash optparse-applicative template-haskell transformers + ]; + testHaskellDepends = [ base bytestring directory ]; + description = "Simple interface to optparse-applicative"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "optparse-text" = callPackage ({ mkDerivation, base, hspec, optparse-applicative, text }: mkDerivation { @@ -159553,19 +156707,6 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "packcheck"; - version = "0.3.1"; - sha256 = "1s171bgqpqh61vaf8s91bbpgn816380bma4wb8in4pnnaf2s0xhv"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; - benchmarkHaskellDepends = [ base ]; - description = "Universal build and CI testing for Haskell packages"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "packcheck_0_4_1" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "packcheck"; version = "0.4.1"; sha256 = "056sjs771gdfvbyynb3vaxgabqj747hyhnbfjq83d0nnqyks8rdy"; libraryHaskellDepends = [ base ]; @@ -159573,7 +156714,6 @@ self: { benchmarkHaskellDepends = [ base ]; description = "Universal build and CI testing for Haskell packages"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "packdeps" = callPackage @@ -160008,60 +157148,6 @@ self: { , case-insensitive, cmark-gfm, containers, criterion, data-default , deepseq, Diff, directory, doctemplates, exceptions , executable-path, filepath, Glob, haddock-library, hslua - , hslua-module-text, HTTP, http-client, http-client-tls, http-types - , JuicyPixels, mtl, network, network-uri, pandoc-types, parsec - , process, QuickCheck, random, safe, scientific, SHA, skylighting - , split, syb, tagsoup, tasty, tasty-golden, tasty-hunit - , tasty-quickcheck, temporary, texmath, text, time, unix - , unordered-containers, vector, weigh, xml, yaml, zip-archive, zlib - }: - mkDerivation { - pname = "pandoc"; - version = "2.2.1"; - sha256 = "1dqin92w513l7whg5wdgrngnxsj5mb8gppfvn7kjgyv2pdgpy0zy"; - revision = "1"; - editedCabalFile = "16f2c7awxbs17xycl3z1x11h7gc7rfzvw7i3pslsn9nms7rz3s3v"; - configureFlags = [ "-fhttps" "-f-trypandoc" ]; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ - aeson aeson-pretty base base64-bytestring binary blaze-html - blaze-markup bytestring case-insensitive cmark-gfm containers - data-default deepseq directory doctemplates exceptions filepath - Glob haddock-library hslua hslua-module-text HTTP http-client - http-client-tls http-types JuicyPixels mtl network network-uri - pandoc-types parsec process random safe scientific SHA skylighting - split syb tagsoup temporary texmath text time unix - unordered-containers vector xml yaml zip-archive zlib - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base base64-bytestring bytestring containers Diff directory - executable-path filepath Glob hslua pandoc-types process QuickCheck - tasty tasty-golden tasty-hunit tasty-quickcheck temporary text time - xml zip-archive - ]; - benchmarkHaskellDepends = [ - base bytestring containers criterion mtl text time weigh - ]; - doCheck = false; - postInstall = '' - mkdir -p $out/share - mv $data/*/*/man $out/share/ - ''; - description = "Conversion between markup formats"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {}; - - "pandoc_2_5" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring - , binary, blaze-html, blaze-markup, bytestring, Cabal - , case-insensitive, cmark-gfm, containers, criterion, data-default - , deepseq, Diff, directory, doctemplates, exceptions - , executable-path, filepath, Glob, haddock-library, hslua , hslua-module-text, HsYAML, HTTP, http-client, http-client-tls , http-types, JuicyPixels, mtl, network, network-uri, pandoc-types , parsec, process, QuickCheck, random, safe, SHA, skylighting @@ -160107,7 +157193,6 @@ self: { ''; description = "Conversion between markup formats"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -160120,40 +157205,6 @@ self: { }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.14.8.1"; - sha256 = "04cdx0b9k3xk2ss97vws21pydxcwxffsgh7xrqrnwwc3v7jn80fz"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051 - setenv split syb tagsoup text time unordered-containers vector - xml-conduit yaml - ]; - executableHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring filepath pandoc - pandoc-types syb text yaml - ]; - testHaskellDepends = [ - aeson base bytestring containers directory filepath mtl pandoc - pandoc-types process temporary text yaml - ]; - doCheck = false; - description = "Supports using pandoc with citeproc"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pandoc-citeproc_0_15_0_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , Cabal, containers, data-default, directory, filepath, hs-bibutils - , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051 - , setenv, split, syb, tagsoup, temporary, text, time - , unordered-containers, vector, xml-conduit, yaml - }: - mkDerivation { - pname = "pandoc-citeproc"; version = "0.15.0.1"; sha256 = "1y4jmralmcikmk75cf5bjlv4ymr42x35a6174ybqa99jmlm5znr9"; isLibrary = true; @@ -160177,7 +157228,6 @@ self: { doCheck = false; description = "Supports using pandoc with citeproc"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-citeproc-preamble" = callPackage @@ -162254,29 +159304,8 @@ self: { }: mkDerivation { pname = "path-io"; - version = "1.3.3"; - sha256 = "1g9m3qliqjk1img894wsb89diym5zrq51qkkrwhz4sbm9a8hbv1a"; - revision = "3"; - editedCabalFile = "1h9hsibbflkxpjl2fqamqiv3x3gasf51apnmklrs9l9x8r32hzcc"; - libraryHaskellDepends = [ - base containers directory dlist exceptions filepath path temporary - time transformers unix-compat - ]; - testHaskellDepends = [ - base directory exceptions hspec path transformers unix-compat - ]; - description = "Interface to ‘directory’ package for users of ‘path’"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "path-io_1_4_0" = callPackage - ({ mkDerivation, base, containers, directory, dlist, exceptions - , filepath, hspec, path, temporary, time, transformers, unix-compat - }: - mkDerivation { - pname = "path-io"; - version = "1.4.0"; - sha256 = "0pffdxzn59qm3ifk746sp2g3h2gip2ijs39gwi0k0xn1rkid6ph5"; + version = "1.4.1"; + sha256 = "0v5zwdsy8dd2ljidjm2rr8wfpvjlgk1g7c5xf40ddzjn9ghykk2p"; libraryHaskellDepends = [ base containers directory dlist exceptions filepath path temporary time transformers unix-compat @@ -162286,7 +159315,6 @@ self: { ]; description = "Interface to ‘directory’ package for users of ‘path’"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "path-pieces" = callPackage @@ -163784,40 +160812,6 @@ self: { "persistent" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, blaze-markup, bytestring, conduit, containers - , fast-logger, haskell-src-meta, hspec, http-api-data - , monad-control, monad-logger, mtl, old-locale, path-pieces - , resource-pool, resourcet, scientific, silently, tagged - , template-haskell, text, time, transformers, unliftio-core - , unordered-containers, vector, void - }: - mkDerivation { - pname = "persistent"; - version = "2.8.2"; - sha256 = "1h0yijbf1yiwl50klyafy4ln99j8bib4kgbzviw7fc4y4mwv4sv9"; - revision = "1"; - editedCabalFile = "18a6dfpjakcmyl9qnflgi63rss09zj3xg0py6bliary4y2cqw4fz"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-html blaze-markup - bytestring conduit containers fast-logger haskell-src-meta - http-api-data monad-logger mtl old-locale path-pieces resource-pool - resourcet scientific silently tagged template-haskell text time - transformers unliftio-core unordered-containers vector void - ]; - testHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-html bytestring - conduit containers fast-logger hspec http-api-data monad-control - monad-logger mtl old-locale path-pieces resource-pool resourcet - scientific tagged template-haskell text time transformers - unordered-containers vector - ]; - description = "Type-safe, multi-backend data serialization"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "persistent_2_9_0" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , blaze-html, blaze-markup, bytestring, conduit, containers , fast-logger, hspec, http-api-data, monad-control, monad-logger , mtl, old-locale, path-pieces, resource-pool, resourcet , scientific, silently, tagged, template-haskell, text, time @@ -163845,7 +160839,6 @@ self: { ]; description = "Type-safe, multi-backend data serialization"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -164034,24 +161027,6 @@ self: { }: mkDerivation { pname = "persistent-mysql"; - version = "2.8.1"; - sha256 = "0m76hsrgv118bg6sawna6xwg30q8vl84zqa8qc9kll4hzbw2kk40"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring conduit containers monad-logger - mysql mysql-simple persistent resource-pool resourcet text - transformers unliftio-core - ]; - description = "Backend for the persistent library using MySQL database server"; - license = stdenv.lib.licenses.mit; - }) {}; - - "persistent-mysql_2_9_0" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit - , containers, monad-logger, mysql, mysql-simple, persistent - , resource-pool, resourcet, text, transformers, unliftio-core - }: - mkDerivation { - pname = "persistent-mysql"; version = "2.9.0"; sha256 = "0aa1ia4r49vy5hfg59rbrfmfwdyaix0l32drdjnj9xxqbayifjzf"; libraryHaskellDepends = [ @@ -164061,7 +161036,6 @@ self: { ]; description = "Backend for the persistent library using MySQL database server"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-mysql-haskell" = callPackage @@ -164072,8 +161046,8 @@ self: { }: mkDerivation { pname = "persistent-mysql-haskell"; - version = "0.4.2"; - sha256 = "012vnfxjqlp352jm5s8glvypgyjligsqfrhb3y0kpzvxlsw4a653"; + version = "0.5.0"; + sha256 = "047mlzrav06pm7fpz2x6v6il1gbbm8g0f5s1lvsa2kzmmbvbl4fg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164089,7 +161063,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "persistent-mysql-haskell_0_5_0" = callPackage + "persistent-mysql-haskell_0_5_1" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , io-streams, monad-logger, mysql-haskell, network, persistent , persistent-template, resource-pool, resourcet, text, time, tls @@ -164097,8 +161071,8 @@ self: { }: mkDerivation { pname = "persistent-mysql-haskell"; - version = "0.5.0"; - sha256 = "047mlzrav06pm7fpz2x6v6il1gbbm8g0f5s1lvsa2kzmmbvbl4fg"; + version = "0.5.1"; + sha256 = "1hl0igjcq9clwhn1dl6nix9gy8ka1mb2alb80cixz8gm8q6bx1dc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164156,26 +161130,6 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.8.2.0"; - sha256 = "0j9g12fk1rlxhd45frxrj9bkmzrk1qbz611296af8nhxkw5wiwzj"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring conduit containers monad-logger - persistent postgresql-libpq postgresql-simple resource-pool - resourcet text time transformers unliftio-core - ]; - description = "Backend for the persistent library using postgresql"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "persistent-postgresql_2_9_0" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit - , containers, monad-logger, persistent, postgresql-libpq - , postgresql-simple, resource-pool, resourcet, text, time - , transformers, unliftio-core - }: - mkDerivation { - pname = "persistent-postgresql"; version = "2.9.0"; sha256 = "1rqlbdz7wwjl1d3xqp01sz5xnn8hff35hgkhx6c66lzrfyl9q0mx"; revision = "1"; @@ -164187,7 +161141,6 @@ self: { ]; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -164335,36 +161288,8 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.8.2"; - sha256 = "1chbmvjz46smhgnzhha3bbkhys3fys6dip1jr4v7xp1jf78zbyp6"; - configureFlags = [ "-fsystemlib" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring conduit containers microlens-th monad-logger - old-locale persistent resource-pool resourcet text time - transformers unliftio-core unordered-containers - ]; - librarySystemDepends = [ sqlite ]; - testHaskellDepends = [ - base hspec persistent persistent-template temporary text time - transformers - ]; - description = "Backend for the persistent library using sqlite3"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {inherit (pkgs) sqlite;}; - - "persistent-sqlite_2_9_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, containers - , hspec, microlens-th, monad-logger, old-locale, persistent - , persistent-template, resource-pool, resourcet, sqlite, temporary - , text, time, transformers, unliftio-core, unordered-containers - }: - mkDerivation { - pname = "persistent-sqlite"; - version = "2.9.0"; - sha256 = "0yn99m64p49x0bghpbnm77bk3ghk99w2w5d1772cmx15aq2d7w0y"; + version = "2.9.1"; + sha256 = "1lh55511zw1zrbvfwbyz18zsm7kb2xsym76f1lp4cdjz37c7sh2j"; configureFlags = [ "-fsystemlib" ]; isLibrary = true; isExecutable = true; @@ -164380,7 +161305,6 @@ self: { ]; description = "Backend for the persistent library using sqlite3"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {inherit (pkgs) sqlite;}; @@ -165476,31 +162400,6 @@ self: { "pinboard" = 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.11"; - sha256 = "12vj9lg7l2nb92j9mydsa8hcy0ql71qnphfhgdm30xrsps79vwd0"; - 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 - ]; - description = "Access to the Pinboard API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "pinboard_0_10_0_2" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, hspec - , http-client, http-client-tls, http-types, monad-logger, mtl , network, profunctors, QuickCheck, random, semigroups, text, time , transformers, unliftio, unliftio-core, unordered-containers , vector @@ -165522,7 +162421,6 @@ self: { ]; description = "Access to the Pinboard API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pinch" = callPackage @@ -166534,24 +163432,6 @@ self: { }: mkDerivation { pname = "pipes-safe"; - version = "2.2.9"; - sha256 = "160qba0r8lih186qfrpvnx1m2j632x5b7n1x53mif9aag41n9w8p"; - revision = "2"; - editedCabalFile = "1crpzg72nahmffw468d31l23bw3wgi0p3w7ad2pv3jxhy1432c71"; - libraryHaskellDepends = [ - base containers exceptions monad-control mtl pipes primitive - transformers transformers-base - ]; - description = "Safety for the pipes ecosystem"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pipes-safe_2_3_1" = callPackage - ({ mkDerivation, base, containers, exceptions, monad-control, mtl - , pipes, primitive, transformers, transformers-base - }: - mkDerivation { - pname = "pipes-safe"; version = "2.3.1"; sha256 = "0dfdd3fccfd7wfn5228hbfj3h10xq01sddpy1v2ds63wlg84kwly"; libraryHaskellDepends = [ @@ -166560,7 +163440,6 @@ self: { ]; description = "Safety for the pipes ecosystem"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-shell" = callPackage @@ -168173,25 +165052,11 @@ self: { ({ mkDerivation, base, bytestring, text }: mkDerivation { pname = "polyparse"; - version = "1.12"; - sha256 = "05dya1vdvq29hkhkdlsglzhw7bdn51rvs1javs0q75nf99c66k7m"; - revision = "1"; - editedCabalFile = "18daiyj3009wx0bhr87fbgy7xfh68ss9qzn6k3lgmh1z9dfsryrd"; - libraryHaskellDepends = [ base bytestring text ]; - description = "A variety of alternative parser combinator libraries"; - license = "LGPL"; - }) {}; - - "polyparse_1_12_1" = callPackage - ({ mkDerivation, base, bytestring, text }: - mkDerivation { - pname = "polyparse"; version = "1.12.1"; sha256 = "19fs18g7fvfdkm9zy28cgighjcxfa6mcpqgyp6whmsjkb3h393fx"; libraryHaskellDepends = [ base bytestring text ]; description = "A variety of alternative parser combinator libraries"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "polyseq" = callPackage @@ -168396,8 +165261,9 @@ self: { }: mkDerivation { pname = "pontarius-xmpp"; - version = "0.5.4"; - sha256 = "0fmi915jmdh2k6fp97vywxpbljpcf6xpmvy3m7l1imqig0hfd8nf"; + version = "0.5.5"; + sha256 = "044fhp9fa2fp0aka972wmlmfq05k63dc1xb6fqrbwcyaamlprdsp"; + setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ attoparsec base base64-bytestring binary bytestring conduit containers crypto-api crypto-random cryptohash cryptohash-cryptoapi @@ -168763,8 +165629,8 @@ self: { }: mkDerivation { pname = "posix-paths"; - version = "0.2.1.5"; - sha256 = "1pyi25gz2r3pc64f1i5awyp3mg5w74ik9wh5s9i9hs7bfmkjk1as"; + version = "0.2.1.6"; + sha256 = "0ibycc7z3gm6jr83cgsqwa7hkky2ldfqqd30ickgq6vn2rkp8fbj"; libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring doctest HUnit QuickCheck unix @@ -169191,30 +166057,6 @@ self: { "postgresql-simple" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, bytestring-builder, case-insensitive, containers - , cryptohash, filepath, hashable, HUnit, postgresql-libpq - , scientific, tasty, tasty-golden, tasty-hunit, template-haskell - , text, time, transformers, uuid-types, vector - }: - mkDerivation { - pname = "postgresql-simple"; - version = "0.5.4.0"; - sha256 = "0xrsyx25v5z06qziy32wlb3lvkyci3nxkbb25nis21vkj3kimlgm"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring bytestring-builder - case-insensitive containers hashable postgresql-libpq scientific - template-haskell text time transformers uuid-types vector - ]; - testHaskellDepends = [ - aeson base base16-bytestring bytestring containers cryptohash - filepath HUnit tasty tasty-golden tasty-hunit text time vector - ]; - description = "Mid-Level PostgreSQL client library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "postgresql-simple_0_6" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, bytestring-builder, case-insensitive, containers , cryptohash, filepath, hashable, HUnit, Only, postgresql-libpq , scientific, tasty, tasty-golden, tasty-hunit, template-haskell , text, time, transformers, uuid-types, vector @@ -169237,7 +166079,6 @@ self: { benchmarkHaskellDepends = [ base vector ]; description = "Mid-Level PostgreSQL client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-simple-bind" = callPackage @@ -169267,8 +166108,8 @@ self: { }: mkDerivation { pname = "postgresql-simple-migration"; - version = "0.1.13.0"; - sha256 = "0rpcl6s1hwb5z0lkcrahh6ljx5zcb0aq8mrk691hfwazlhbv01zk"; + version = "0.1.13.1"; + sha256 = "0xblb0k3xnsbvdqrl5k3i6jimj4cskgip6w021byirn8i73s7j8a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -170586,8 +167427,8 @@ self: { }: mkDerivation { pname = "pretty-show"; - version = "1.7"; - sha256 = "0br7pkxqqqhby2j2v1g847lgqsrasx56g1jw3dhmjh4flzs6warq"; + version = "1.9.4"; + sha256 = "00gpniygx45yczhkf6ayqik5kraa2c436ragx07mqp3mp383ab5r"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -170600,27 +167441,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pretty-show_1_9_2" = callPackage - ({ mkDerivation, array, base, filepath, ghc-prim, happy - , haskell-lexer, pretty, text - }: - mkDerivation { - pname = "pretty-show"; - version = "1.9.2"; - sha256 = "01vqa5z364cgj73360rpb4rcysfgfyil9l7gxfp96vzcca3gi37a"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base filepath ghc-prim haskell-lexer pretty text - ]; - libraryToolDepends = [ happy ]; - executableHaskellDepends = [ base ]; - description = "Tools for working with derived `Show` instances and generic inspection of values"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pretty-show-ansi-wl" = callPackage ({ mkDerivation, ansi-wl-pprint, array, base, ghc-prim, happy , haskell-lexer @@ -170638,25 +167458,6 @@ self: { }) {}; "pretty-simple" = callPackage - ({ mkDerivation, ansi-terminal, base, containers, criterion - , doctest, Glob, mtl, parsec, text, transformers - }: - mkDerivation { - pname = "pretty-simple"; - version = "2.1.0.1"; - sha256 = "1lfkbjpcgyiv915xvhpirhx8x7ng1jgrlxd6zlilcvnpkkm2xacs"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal base containers mtl parsec text transformers - ]; - testHaskellDepends = [ base doctest Glob ]; - benchmarkHaskellDepends = [ base criterion text ]; - description = "pretty printer for data types with a 'Show' instance"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pretty-simple_2_2_0_1" = callPackage ({ mkDerivation, ansi-terminal, base, criterion, doctest, Glob, mtl , text, transformers }: @@ -170673,7 +167474,6 @@ self: { benchmarkHaskellDepends = [ base criterion text ]; description = "pretty printer for data types with a 'Show' instance"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pretty-sop" = callPackage @@ -171005,18 +167805,6 @@ self: { ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { pname = "primitive"; - version = "0.6.3.0"; - sha256 = "0mcmbnj08wd6zfwn7xk6zf5hy5zwbla5v78pw0dpymqg9s0gzpnd"; - libraryHaskellDepends = [ base ghc-prim transformers ]; - testHaskellDepends = [ base ghc-prim ]; - description = "Primitive memory-related operations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "primitive_0_6_4_0" = callPackage - ({ mkDerivation, base, ghc-prim, transformers }: - mkDerivation { - pname = "primitive"; version = "0.6.4.0"; sha256 = "0r0cda7acvplgwaxy69kviv4jp7kkfi038by68gj4yfx4iwszgjc"; revision = "1"; @@ -171024,7 +167812,6 @@ self: { libraryHaskellDepends = [ base ghc-prim transformers ]; description = "Primitive memory-related operations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "primitive-checked" = callPackage @@ -171896,24 +168683,6 @@ self: { }: mkDerivation { pname = "profunctors"; - version = "5.2.2"; - sha256 = "0s1pwjidbn761xk43pmzyvn99hm3psdifjd78ylki7f97aiyd0g9"; - revision = "2"; - editedCabalFile = "1ywlg9z8nlhd2avgb8c6gbkv8zyk7hvc25926bafyg0m0k8y1amq"; - libraryHaskellDepends = [ - base base-orphans bifunctors comonad contravariant distributive - semigroups tagged transformers - ]; - description = "Profunctors"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "profunctors_5_3" = callPackage - ({ mkDerivation, base, base-orphans, bifunctors, comonad - , contravariant, distributive, semigroups, tagged, transformers - }: - mkDerivation { - pname = "profunctors"; version = "5.3"; sha256 = "1dx3nkc27yxsrbrhh3iwhq7dl1xn6bj7n62yx6nh8vmpbg62lqvl"; libraryHaskellDepends = [ @@ -171922,7 +168691,6 @@ self: { ]; description = "Profunctors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "progress" = callPackage @@ -172220,8 +168988,8 @@ self: { }: mkDerivation { pname = "prologue"; - version = "3.2.4"; - sha256 = "0smh3g9k2l4ic9gh1i7aq541nnacipvvc9c0v04xq5rk0rzrswmv"; + version = "3.2.6"; + sha256 = "0xic2d3b7ya0qrb8r4q0v6f9zgbh7sw0l7rpbmz09i8pkx7bj90y"; libraryHaskellDepends = [ base bifunctors binary comonad cond container convert data-default deepseq deriving-compat either errors exceptions functor-utils @@ -172253,30 +169021,6 @@ self: { "prometheus-client" = callPackage ({ mkDerivation, atomic-primops, base, bytestring, clock - , containers, criterion, doctest, hspec, mtl, QuickCheck, random - , random-shuffle, stm, transformers, utf8-string - }: - mkDerivation { - pname = "prometheus-client"; - version = "0.3.0"; - sha256 = "0nyh90ixf4g54q8qy315fv310rn0sw6rypkj37876isdhq5w8a2z"; - libraryHaskellDepends = [ - atomic-primops base bytestring clock containers mtl stm - transformers utf8-string - ]; - testHaskellDepends = [ - atomic-primops base bytestring clock containers doctest hspec mtl - QuickCheck random-shuffle stm transformers utf8-string - ]; - benchmarkHaskellDepends = [ - base bytestring criterion random utf8-string - ]; - description = "Haskell client library for http://prometheus.io."; - license = stdenv.lib.licenses.asl20; - }) {}; - - "prometheus-client_1_0_0" = callPackage - ({ mkDerivation, atomic-primops, base, bytestring, clock , containers, criterion, deepseq, doctest, exceptions, hspec, mtl , QuickCheck, random, random-shuffle, stm, text, transformers , transformers-compat, utf8-string @@ -172299,7 +169043,6 @@ self: { ]; description = "Haskell client library for http://prometheus.io."; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prometheus-effect" = callPackage @@ -172561,34 +169304,37 @@ self: { "proteome" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers - , data-default-class, deepseq, directory, filepath, hslogger, HTF - , lens, messagepack, MissingH, mtl, nvim-hs, pretty-terminal - , prettyprinter, process, resourcet, split, stm, strings, text - , time, transformers, unliftio, utf8-string + , data-default-class, deepseq, directory, either, filepath + , hslogger, HTF, lens, messagepack, MissingH, mtl, nvim-hs + , pretty-terminal, prettyprinter, process, resourcet, safe, split + , stm, strings, text, time, transformers, unliftio, utf8-string }: mkDerivation { pname = "proteome"; - version = "0.3.8.0"; - sha256 = "1lr0a5vyf305ikhzf8xqrdzksz48vjlikx7zvjxkp0wsarz07ikd"; + version = "0.3.16.0"; + sha256 = "1lnvc34xvxf10b41bv3c2gkpzhmckbd12199nfky8sk8z60sqpsh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal base bytestring containers data-default-class - deepseq directory filepath hslogger lens messagepack MissingH mtl - nvim-hs pretty-terminal prettyprinter process resourcet split stm - strings text time transformers unliftio utf8-string + deepseq directory either filepath hslogger lens messagepack + MissingH mtl nvim-hs pretty-terminal prettyprinter process + resourcet safe split stm strings text time transformers unliftio + utf8-string ]; executableHaskellDepends = [ aeson ansi-terminal base bytestring containers data-default-class - deepseq directory filepath hslogger lens messagepack MissingH mtl - nvim-hs pretty-terminal prettyprinter process resourcet split stm - strings text time transformers unliftio utf8-string + deepseq directory either filepath hslogger lens messagepack + MissingH mtl nvim-hs pretty-terminal prettyprinter process + resourcet safe split stm strings text time transformers unliftio + utf8-string ]; testHaskellDepends = [ aeson ansi-terminal base bytestring containers data-default-class - deepseq directory filepath hslogger HTF lens messagepack MissingH - mtl nvim-hs pretty-terminal prettyprinter process resourcet split - stm strings text time transformers unliftio utf8-string + deepseq directory either filepath hslogger HTF lens messagepack + MissingH mtl nvim-hs pretty-terminal prettyprinter process + resourcet safe split stm strings text time transformers unliftio + utf8-string ]; description = "neovim project manager"; license = stdenv.lib.licenses.mit; @@ -172613,24 +169359,6 @@ self: { }) {}; "proto-lens" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers - , data-default-class, deepseq, lens-family, lens-labels, parsec - , pretty, text, transformers, void - }: - mkDerivation { - pname = "proto-lens"; - version = "0.3.1.0"; - sha256 = "1awlp7101vhqf2hhz3h93mf38lyyfx5ay3gvrdna0k3msykimgw7"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - attoparsec base bytestring containers data-default-class deepseq - lens-family lens-labels parsec pretty text transformers void - ]; - description = "A lens-based implementation of protocol buffers in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "proto-lens_0_4_0_1" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq , lens-family, lens-labels, parsec, pretty, text, transformers , void @@ -172646,7 +169374,6 @@ self: { ]; description = "A lens-based implementation of protocol buffers in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proto-lens-arbitrary" = callPackage @@ -172655,21 +169382,6 @@ self: { }: mkDerivation { pname = "proto-lens-arbitrary"; - version = "0.1.2.2"; - sha256 = "128r7g82yx4rs38yd9s4bwcpyiqm5yr4lyci3z88bhqsvkn4438i"; - libraryHaskellDepends = [ - base bytestring containers lens-family proto-lens QuickCheck text - ]; - description = "Arbitrary instances for proto-lens"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "proto-lens-arbitrary_0_1_2_5" = callPackage - ({ mkDerivation, base, bytestring, containers, lens-family - , proto-lens, QuickCheck, text - }: - mkDerivation { - pname = "proto-lens-arbitrary"; version = "0.1.2.5"; sha256 = "13cd9r9r2g913p3d3m7ljgv97wsdlr0v6js1r7k2w6npclgj13hd"; libraryHaskellDepends = [ @@ -172677,32 +169389,9 @@ self: { ]; description = "Arbitrary instances for proto-lens"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proto-lens-combinators" = callPackage - ({ mkDerivation, base, Cabal, data-default-class, HUnit - , lens-family, lens-family-core, proto-lens, proto-lens-protoc - , test-framework, test-framework-hunit, transformers - }: - mkDerivation { - pname = "proto-lens-combinators"; - version = "0.1.0.11"; - sha256 = "1i2rbvhdvglqg6b4iwr5a0pk7iq78nap491bqg77y4dwd45ipcpb"; - setupHaskellDepends = [ base Cabal proto-lens-protoc ]; - libraryHaskellDepends = [ - base data-default-class lens-family proto-lens-protoc transformers - ]; - testHaskellDepends = [ - base HUnit lens-family lens-family-core proto-lens - proto-lens-protoc test-framework test-framework-hunit - ]; - description = "Utilities functions to proto-lens"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "proto-lens-combinators_0_4_0_1" = callPackage ({ mkDerivation, base, Cabal, HUnit, lens-family, lens-family-core , proto-lens, proto-lens-runtime, proto-lens-setup, test-framework , test-framework-hunit, transformers @@ -172773,23 +169462,6 @@ self: { }) {inherit (pkgs) protobuf;}; "proto-lens-protobuf-types" = callPackage - ({ mkDerivation, base, Cabal, lens-family, proto-lens - , proto-lens-protoc, protobuf, text - }: - mkDerivation { - pname = "proto-lens-protobuf-types"; - version = "0.3.0.1"; - sha256 = "0630yl73s11dnfripbz5pa25mzpsnjzd278qcm5yiy6zmcz0a6ca"; - setupHaskellDepends = [ base Cabal proto-lens-protoc ]; - libraryHaskellDepends = [ - base lens-family proto-lens proto-lens-protoc text - ]; - libraryToolDepends = [ protobuf ]; - description = "Basic protocol buffer message types"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) protobuf;}; - - "proto-lens-protobuf-types_0_4_0_1" = callPackage ({ mkDerivation, base, Cabal, lens-labels, proto-lens , proto-lens-runtime, proto-lens-setup, protobuf, text }: @@ -172804,7 +169476,6 @@ self: { libraryToolDepends = [ protobuf ]; description = "Basic protocol buffer message types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) protobuf;}; "proto-lens-protoc_0_2_2_3" = callPackage @@ -172835,39 +169506,13 @@ self: { }) {inherit (pkgs) protobuf;}; "proto-lens-protoc" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers - , data-default-class, deepseq, directory, filepath - , haskell-src-exts, lens-family, lens-labels, pretty, process - , proto-lens, protobuf, temporary, text - }: - mkDerivation { - pname = "proto-lens-protoc"; - version = "0.3.1.2"; - sha256 = "15qypl2z5mccmxhq2bl86frzdalpcnsjiw6vypvnr6gxlr7mwhm7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring Cabal containers data-default-class deepseq - directory filepath haskell-src-exts lens-family lens-labels pretty - process proto-lens temporary text - ]; - libraryToolDepends = [ protobuf ]; - executableHaskellDepends = [ - base bytestring containers data-default-class deepseq filepath - haskell-src-exts lens-family proto-lens text - ]; - description = "Protocol buffer compiler for the proto-lens library"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) protobuf;}; - - "proto-lens-protoc_0_4_0_1" = callPackage ({ mkDerivation, base, bytestring, containers, filepath , haskell-src-exts, lens-family, pretty, proto-lens, protobuf, text }: mkDerivation { pname = "proto-lens-protoc"; - version = "0.4.0.1"; - sha256 = "1vigmy8aq65yaspgq803a4vxsq5v3zwlaq95yrf47zrvcx1lw3ni"; + version = "0.4.0.2"; + sha256 = "1kvbv7c42qcynh25mh1vzwdzk4fhvjai031hwmsrmpqywgbgknmm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172880,7 +169525,6 @@ self: { ]; description = "Protocol buffer compiler for the proto-lens library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) protobuf;}; "proto-lens-runtime" = callPackage @@ -172988,22 +169632,6 @@ self: { }) {}; "protocol-buffers" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , directory, filepath, mtl, parsec, syb, utf8-string - }: - mkDerivation { - pname = "protocol-buffers"; - version = "2.4.11"; - sha256 = "1s41iprw4w6g56phrgali2b59isn2s67nzfwr38yfgib3lm4kjs7"; - libraryHaskellDepends = [ - array base binary bytestring containers directory filepath mtl - parsec syb utf8-string - ]; - description = "Parse Google Protocol Buffer specifications"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "protocol-buffers_2_4_12" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, binary , bytestring, containers, directory, filepath, mtl, parsec, syb , text, utf8-string, vector @@ -173018,27 +169646,12 @@ self: { ]; description = "Parse Google Protocol Buffer specifications"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "protocol-buffers-descriptor" = callPackage ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { pname = "protocol-buffers-descriptor"; - version = "2.4.11"; - sha256 = "06k8sz0i021mizdgh01rx7v08wc767njwppimgmm2hyg6k4bv450"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers protocol-buffers - ]; - description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "protocol-buffers-descriptor_2_4_12" = callPackage - ({ mkDerivation, base, bytestring, containers, protocol-buffers }: - mkDerivation { - pname = "protocol-buffers-descriptor"; version = "2.4.12"; sha256 = "0h4c1pgl51h7xrsm76mz6wd1l41ps93y3nvdl0p7mks9w7wlpccn"; enableSeparateDataOutput = true; @@ -173047,7 +169660,6 @@ self: { ]; description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "protocol-buffers-descriptor-fork" = callPackage @@ -173124,23 +169736,6 @@ self: { }: mkDerivation { pname = "protolude"; - version = "0.2.2"; - sha256 = "0z251xxv8rhds981acdf6dr34ac2kc062mbq9gl2nj339grhqpb8"; - libraryHaskellDepends = [ - array async base bytestring containers deepseq ghc-prim hashable - mtl mtl-compat stm text transformers transformers-compat - ]; - description = "A small prelude"; - license = stdenv.lib.licenses.mit; - }) {}; - - "protolude_0_2_3" = callPackage - ({ mkDerivation, array, async, base, bytestring, containers - , deepseq, ghc-prim, hashable, mtl, mtl-compat, stm, text - , transformers, transformers-compat - }: - mkDerivation { - pname = "protolude"; version = "0.2.3"; sha256 = "0zzkyxz0vmcbncpid7gp72fpjj0fla3gqhlfkij5c5lg12skjgfj"; libraryHaskellDepends = [ @@ -173149,7 +169744,6 @@ self: { ]; description = "A small prelude"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "protolude-lifted" = callPackage @@ -173463,21 +170057,6 @@ self: { }: mkDerivation { pname = "publicsuffix"; - version = "0.20180513"; - sha256 = "0wq9hz1z924a5pk17zyaf9nyz5z5fyrlf806rypdxnpvi4q1j7xm"; - libraryHaskellDepends = [ base filepath template-haskell ]; - testHaskellDepends = [ base hspec ]; - benchmarkHaskellDepends = [ base criterion random ]; - description = "The publicsuffix list exposed as proper Haskell types"; - license = stdenv.lib.licenses.mit; - }) {}; - - "publicsuffix_0_20180825" = callPackage - ({ mkDerivation, base, criterion, filepath, hspec, random - , template-haskell - }: - mkDerivation { - pname = "publicsuffix"; version = "0.20180825"; sha256 = "0wyni1f9v647zb7hg70da4s30dplv6whywd0jwghph1vqdlzlbma"; libraryHaskellDepends = [ base filepath template-haskell ]; @@ -173485,7 +170064,6 @@ self: { benchmarkHaskellDepends = [ base criterion random ]; description = "The publicsuffix list exposed as proper Haskell types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "publicsuffixlist" = callPackage @@ -173917,6 +170495,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "purebred-email" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring + , case-insensitive, concise, deepseq, lens, QuickCheck + , quickcheck-instances, semigroupoids, semigroups, stringsearch + , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text, time + }: + mkDerivation { + pname = "purebred-email"; + version = "0.1.0.0"; + sha256 = "01r6pzv0c49lk2z68jz6z9fppdhdjyg7igl6ji44w1rmgpiaircj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base base64-bytestring bytestring case-insensitive + concise deepseq lens semigroupoids semigroups stringsearch text + time + ]; + testHaskellDepends = [ + attoparsec base bytestring case-insensitive lens QuickCheck + quickcheck-instances semigroups tasty tasty-golden tasty-hunit + tasty-quickcheck text time + ]; + description = "types and parser for email messages (including MIME)"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "purescript" = callPackage ({ mkDerivation, aeson, aeson-better-errors, ansi-terminal , ansi-wl-pprint, base, base-compat, blaze-html, bower-json, boxes @@ -175349,21 +171953,21 @@ self: { }) {}; "quickcheck-classes" = callPackage - ({ mkDerivation, aeson, base, bifunctors, containers, primitive - , QuickCheck, semigroupoids, semigroups, semirings, tagged - , transformers, vector + ({ mkDerivation, aeson, base, base-orphans, bifunctors, containers + , fail, primitive, QuickCheck, semigroupoids, semigroups, semirings + , tagged, tasty, tasty-quickcheck, transformers, vector }: mkDerivation { pname = "quickcheck-classes"; - version = "0.5.0.0"; - sha256 = "1jg4wkysz2hdfkl9ah9lyvasnr01dvp3lfzzn1cin2ac6b1inj6v"; + version = "0.6.0.0"; + sha256 = "02ssvvhi87ggyxi3jsg2h1xirwqyydda88n5ax4imfljvig366cy"; libraryHaskellDepends = [ - aeson base bifunctors containers primitive QuickCheck semigroupoids - semigroups semirings tagged transformers + aeson base base-orphans bifunctors containers fail primitive + QuickCheck semigroupoids semigroups semirings tagged transformers ]; testHaskellDepends = [ - aeson base containers primitive QuickCheck semigroupoids tagged - transformers vector + aeson base base-orphans containers primitive QuickCheck + semigroupoids tagged tasty tasty-quickcheck transformers vector ]; description = "QuickCheck common typeclasses"; license = stdenv.lib.licenses.bsd3; @@ -176196,8 +172800,8 @@ self: { }: mkDerivation { pname = "radius"; - version = "0.5.0.2"; - sha256 = "08y57j4235ajkf3z05p8lcixgr2x1m6mih5l0bfic4gxfvs818wc"; + version = "0.6.0.0"; + sha256 = "02jvlbj3w5ww59ms37l24crr8vib7ghzr9y79bip3p4mhpi4c32l"; libraryHaskellDepends = [ base binary bytestring cryptonite iproute memory ]; @@ -177030,25 +173634,6 @@ self: { }: mkDerivation { pname = "rank2classes"; - version = "1.1.0.1"; - sha256 = "1iw2xanyv7rw995sy3c0dvkjl3js4bd7n2hz0x509pkz8hzsa93w"; - libraryHaskellDepends = [ - base distributive template-haskell transformers - ]; - testHaskellDepends = [ - base distributive doctest tasty tasty-hunit - ]; - description = "standard type constructor class hierarchy, only with methods of rank 2 types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "rank2classes_1_2" = callPackage - ({ mkDerivation, base, distributive, doctest, tasty, tasty-hunit - , template-haskell, transformers - }: - mkDerivation { - pname = "rank2classes"; version = "1.2"; sha256 = "1qaqsg4xfvhdvffr42y1r95lkvm2spj27pwxz4vrhkxq56fkbj2p"; libraryHaskellDepends = [ @@ -177417,36 +174002,6 @@ self: { "rattletrap" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits - , bytestring, containers, filepath, http-client, http-client-tls - , HUnit, template-haskell, temporary, text, transformers - }: - mkDerivation { - pname = "rattletrap"; - version = "4.1.2"; - sha256 = "0zmacxdf1k5mnvmrrkkvgjghzr4h948z5g73lavhmfg56i6vpkb2"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base binary binary-bits bytestring containers - filepath http-client http-client-tls template-haskell text - transformers - ]; - executableHaskellDepends = [ - aeson aeson-pretty base binary binary-bits bytestring containers - filepath http-client http-client-tls template-haskell text - transformers - ]; - testHaskellDepends = [ - aeson aeson-pretty base binary binary-bits bytestring containers - filepath http-client http-client-tls HUnit template-haskell - temporary text transformers - ]; - description = "Parse and generate Rocket League replays"; - license = stdenv.lib.licenses.mit; - }) {}; - - "rattletrap_6_0_2" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits , bytestring, clock, containers, filepath, http-client , http-client-tls, HUnit, template-haskell, temporary, text , transformers @@ -177474,7 +174029,6 @@ self: { ]; description = "Parse and generate Rocket League replays"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "raven-haskell" = callPackage @@ -177826,19 +174380,6 @@ self: { ({ mkDerivation, base, bytestring, HUnit, re2, vector }: mkDerivation { pname = "re2"; - version = "0.2"; - sha256 = "0qfmiwy4kc87a736fpzh4cscvldiywq641gb9kvn4hc3sq7dh1k9"; - libraryHaskellDepends = [ base bytestring vector ]; - librarySystemDepends = [ re2 ]; - testHaskellDepends = [ base bytestring HUnit vector ]; - description = "Bindings to the re2 regular expression library"; - license = stdenv.lib.licenses.mit; - }) {inherit (pkgs) re2;}; - - "re2_0_3" = callPackage - ({ mkDerivation, base, bytestring, HUnit, re2, vector }: - mkDerivation { - pname = "re2"; version = "0.3"; sha256 = "0slrbgpqccnxywy0aqlg65w6kzvfiqsf0n273m8cv3c32wvkw8nb"; libraryHaskellDepends = [ base bytestring vector ]; @@ -177846,7 +174387,6 @@ self: { testHaskellDepends = [ base bytestring HUnit vector ]; description = "Bindings to the re2 regular expression library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) re2;}; "react-flux" = callPackage @@ -178477,27 +175017,6 @@ self: { }: mkDerivation { pname = "rebase"; - version = "1.2.4"; - sha256 = "1gah2qwfpzwamnikbc5h4nv6dgvv9h16di9ka7946za3nibyasya"; - libraryHaskellDepends = [ - base base-prelude bifunctors bytestring containers contravariant - contravariant-extras deepseq dlist either fail hashable mtl - profunctors scientific semigroupoids semigroups stm text time - transformers unordered-containers uuid vector void - ]; - description = "A more progressive alternative to the \"base\" package"; - license = stdenv.lib.licenses.mit; - }) {}; - - "rebase_1_3" = callPackage - ({ mkDerivation, base, base-prelude, bifunctors, bytestring - , containers, contravariant, contravariant-extras, deepseq, dlist - , either, fail, hashable, mtl, profunctors, scientific - , semigroupoids, semigroups, stm, text, time, transformers - , unordered-containers, uuid, vector, void - }: - mkDerivation { - pname = "rebase"; version = "1.3"; sha256 = "02g14vv4qbzq9vakkr55960r386jmkivgm5ld782b1bqyvpfsfh7"; revision = "1"; @@ -178510,7 +175029,6 @@ self: { ]; description = "A more progressive alternative to the \"base\" package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rebindable" = callPackage @@ -178715,8 +175233,8 @@ self: { ({ mkDerivation, base, composition-prelude }: mkDerivation { pname = "recursion"; - version = "2.2.0.0"; - sha256 = "075rmdrfvaq14p6c3fpg8svf3klrxi5a43a4cgl2j61q5yhhgb3a"; + version = "2.2.0.1"; + sha256 = "0xf8d9gjqmnp9scz5q06kx473y498iy7kql5200zr4mnr62c2pqj"; libraryHaskellDepends = [ base composition-prelude ]; description = "A recursion schemes library for GHC"; license = stdenv.lib.licenses.bsd3; @@ -178728,10 +175246,8 @@ self: { }: mkDerivation { pname = "recursion-schemes"; - version = "5.0.3"; - sha256 = "17x0kjl3yqanx234mb838yy21gw4if6qgzpi5l0b17m8llvp086v"; - revision = "3"; - editedCabalFile = "05fvpi3dc44h2a097fb9cq1jqdjq2b3sdf5hzfn9g00bid37bb5q"; + version = "5.1"; + sha256 = "1lpk8mkh3vd2j56f0fmaj64indgf5m1db9355fgimcb4xfw13nq1"; libraryHaskellDepends = [ base base-orphans comonad free template-haskell th-abstraction transformers @@ -179198,22 +175714,6 @@ self: { }) {}; "refined" = callPackage - ({ mkDerivation, base, containers, exceptions, mtl, prettyprinter - , template-haskell, these, transformers - }: - mkDerivation { - pname = "refined"; - version = "0.2.3.0"; - sha256 = "1xc4qg2xibf2j0k6dwjj2sp5s58cj4dwcri6zrn42460wxnvyjk6"; - libraryHaskellDepends = [ - base containers exceptions mtl prettyprinter template-haskell these - transformers - ]; - description = "Refinement types with static and runtime checking"; - license = stdenv.lib.licenses.mit; - }) {}; - - "refined_0_3_0_0" = callPackage ({ mkDerivation, base, deepseq, exceptions, mtl, prettyprinter , template-haskell, transformers }: @@ -179227,7 +175727,6 @@ self: { ]; description = "Refinement types with static and runtime checking"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reflection" = callPackage @@ -179662,8 +176161,8 @@ self: { }: mkDerivation { pname = "regex"; - version = "1.0.1.4"; - sha256 = "15kdlb8wgdv72wsxd0av7j085vd3hg6lhpnx4wn3q659f43g6ahc"; + version = "1.0.2.0"; + sha256 = "1f2z025hif1fr24b5khq3qxxyvpxrnhyx8xmbms332arw28rpkda"; libraryHaskellDepends = [ array base base-compat bytestring containers hashable regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text template-haskell text @@ -179814,8 +176313,8 @@ self: { }: mkDerivation { pname = "regex-examples"; - version = "1.0.1.4"; - sha256 = "0lxwp1kqacw7dvhbrzy7kl0w5g79gp22b9143m6cgd2f2z7bgzqp"; + version = "1.0.2.0"; + sha256 = "0qpf4b2zxdlih1smlhybs923n2gjaxhx8i1rgjw6v7ng13vnriiy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -180119,8 +176618,8 @@ self: { }: mkDerivation { pname = "regex-with-pcre"; - version = "1.0.1.4"; - sha256 = "0pgy9bym4450kzhrzy3amw8dhswzvmqnj5i8pn33l8rvsyr37zp7"; + version = "1.0.2.0"; + sha256 = "19vn5w4vhgxv9s6nhlmj4xl8pa16d1a2ygxxyd5b0qg3q27vvisk"; libraryHaskellDepends = [ base base-compat bytestring containers regex regex-base regex-pcre-builtin regex-pcre-text regex-tdfa template-haskell text @@ -180333,8 +176832,8 @@ self: { }: mkDerivation { pname = "registry"; - version = "0.1.2.0"; - sha256 = "1y2fvb5qf2gz3nzw983v7r1xgdxxxg0n62sambngf7w8pww5p27d"; + version = "0.1.2.2"; + sha256 = "1knhdrjj5y9p8974am4z31k163yjz3123lvjjk1ml4ba65afqhc7"; libraryHaskellDepends = [ base exceptions mtl protolude resourcet text transformers-base ]; @@ -180742,33 +177241,6 @@ self: { ({ mkDerivation, base, bytestring, containers, deepseq, doctest , gauge, ghc-prim, Glob, hashable, hedgehog, mtl, stm, tasty , tasty-hedgehog, text, transformers, unordered-containers - , utf8-string - }: - mkDerivation { - pname = "relude"; - version = "0.1.1"; - sha256 = "034hldd9rsqqhhxmnpfabh6v2by47qc5kx1qv77bl8k73fybf9a0"; - revision = "1"; - editedCabalFile = "18vil2wa8xzpf0y5r5zdfylsqmphlappzc7a2ac9lmxngfkbzwyc"; - libraryHaskellDepends = [ - base bytestring containers deepseq ghc-prim hashable mtl stm text - transformers unordered-containers utf8-string - ]; - testHaskellDepends = [ - base bytestring doctest Glob hedgehog tasty tasty-hedgehog text - utf8-string - ]; - benchmarkHaskellDepends = [ - base containers gauge unordered-containers - ]; - description = "Custom prelude from Kowainik"; - license = stdenv.lib.licenses.mit; - }) {}; - - "relude_0_4_0" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, doctest - , gauge, ghc-prim, Glob, hashable, hedgehog, mtl, stm, tasty - , tasty-hedgehog, text, transformers, unordered-containers }: mkDerivation { pname = "relude"; @@ -180786,7 +177258,6 @@ self: { ]; description = "Custom prelude from Kowainik"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "remark" = callPackage @@ -181390,23 +177861,11 @@ self: { ({ mkDerivation, base, containers, haskeline, mtl, process }: mkDerivation { pname = "repline"; - version = "0.1.7.0"; - sha256 = "1pjmkr5lnc6vdy8g90wnxlh1rzq6f3sc0j1facfc42iqi9fh6fjh"; - libraryHaskellDepends = [ base containers haskeline mtl process ]; - description = "Haskeline wrapper for GHCi-like REPL interfaces"; - license = stdenv.lib.licenses.mit; - }) {}; - - "repline_0_2_0_0" = callPackage - ({ mkDerivation, base, containers, haskeline, mtl, process }: - mkDerivation { - pname = "repline"; version = "0.2.0.0"; sha256 = "1ph21kbbanlcs8n5lwk16g9vqkb98mkbz5mzwrp8j2rls2921izc"; libraryHaskellDepends = [ base containers haskeline mtl process ]; description = "Haskeline wrapper for GHCi-like REPL interfaces"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "repo-based-blog" = callPackage @@ -181553,38 +178012,6 @@ self: { }: mkDerivation { pname = "req"; - version = "1.1.0"; - sha256 = "08jfq1fsqd57l7csw4fg22wppq06wddh8qxxms5z6bay55nqikc7"; - revision = "1"; - editedCabalFile = "1qb458sldda1msrx8hyp31a5ybny2kdymsxhmsyk9i9c5gk0qqib"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson authenticate-oauth base blaze-builder bytestring - case-insensitive connection data-default-class http-api-data - http-client http-client-tls http-types monad-control mtl retry text - time transformers transformers-base - ]; - testHaskellDepends = [ - aeson base blaze-builder bytestring case-insensitive - data-default-class hspec hspec-core http-client http-types - monad-control mtl QuickCheck text time unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - doCheck = false; - description = "Easy-to-use, type-safe, expandable, high-level HTTP client library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "req_1_2_1" = callPackage - ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder - , bytestring, case-insensitive, connection, data-default-class - , hspec, hspec-core, hspec-discover, http-api-data, http-client - , http-client-tls, http-types, monad-control, mtl, QuickCheck - , retry, text, time, transformers, transformers-base - , unordered-containers - }: - mkDerivation { - pname = "req"; version = "1.2.1"; sha256 = "1s8gjifc9jixl4551hay013fwyhlamcyrxjb00qr76wwikqa0g8k"; revision = "1"; @@ -181605,7 +178032,6 @@ self: { doCheck = false; description = "Easy-to-use, type-safe, expandable, high-level HTTP client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "req-conduit" = callPackage @@ -181703,32 +178129,6 @@ self: { }) {}; "require" = callPackage - ({ mkDerivation, base, bytestring, criterion, megaparsec, tasty - , tasty-hspec, text, universum - }: - mkDerivation { - pname = "require"; - version = "0.2.1"; - sha256 = "0cf19mcjmqn50gz2fc32b67s8za6bb7i2k0h6sj25b457xv9rdx2"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring megaparsec text universum - ]; - executableHaskellDepends = [ - base bytestring megaparsec text universum - ]; - testHaskellDepends = [ - base bytestring megaparsec tasty tasty-hspec text universum - ]; - benchmarkHaskellDepends = [ - base bytestring criterion megaparsec text universum - ]; - description = "Scrap your qualified import clutter"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "require_0_4_0" = callPackage ({ mkDerivation, base, bytestring, criterion, directory, inliterate , megaparsec, optparse-generic, tasty, tasty-hspec, text, universum }: @@ -181756,7 +178156,6 @@ self: { ]; description = "Scrap your qualified import clutter"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rerebase" = callPackage @@ -182847,23 +179246,6 @@ self: { }) {}; "rhine" = callPackage - ({ mkDerivation, base, containers, dunai, free, time, transformers - }: - mkDerivation { - pname = "rhine"; - version = "0.4.0.1"; - sha256 = "00xmq61bgq84z8kvnjrh30zffm4q108gbxbndfkl6v63jl0346yj"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers dunai free time transformers - ]; - executableHaskellDepends = [ base ]; - description = "Functional Reactive Programming with type-level clocks"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "rhine_0_5_0_1" = callPackage ({ mkDerivation, base, containers, deepseq, dunai, free, time , transformers, vector-sized }: @@ -182876,7 +179258,6 @@ self: { ]; description = "Functional Reactive Programming with type-level clocks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rhine-gloss" = callPackage @@ -184556,37 +180937,6 @@ self: { }: mkDerivation { pname = "rss-conduit"; - version = "0.4.2.2"; - sha256 = "1qaz3a9fjq5dqky6jvnnk68xbarrqng7bas9r10qzdpy7g1v17ps"; - revision = "3"; - editedCabalFile = "1fay2p90wx49b2yky0r6x70az3f0c1b2hwy3rzayza8am2i5r0bn"; - libraryHaskellDepends = [ - atom-conduit base conduit conduit-combinators containers - dublincore-xml-conduit lens-simple safe safe-exceptions singletons - text time timerep uri-bytestring vinyl xml-conduit xml-types - ]; - testHaskellDepends = [ - atom-conduit base blaze-builder bytestring conduit - conduit-combinators data-default dublincore-xml-conduit lens-simple - mono-traversable QuickCheck quickcheck-instances resourcet - safe-exceptions singletons tasty tasty-hunit tasty-quickcheck text - time uri-bytestring vinyl xml-conduit xml-types - ]; - description = "Streaming parser/renderer for the RSS standard"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "rss-conduit_0_4_3_0" = callPackage - ({ mkDerivation, atom-conduit, base, blaze-builder, bytestring - , conduit, conduit-combinators, containers, data-default - , dublincore-xml-conduit, lens-simple, mono-traversable, QuickCheck - , quickcheck-instances, resourcet, safe, safe-exceptions - , singletons, tasty, tasty-hunit, tasty-quickcheck, text, time - , timerep, uri-bytestring, vinyl, xml-conduit, xml-types - }: - mkDerivation { - pname = "rss-conduit"; version = "0.4.3.0"; sha256 = "003crn6pczr8x3r0j9nkx22gqwq0fvy4mkksmng8vp7qbvycvzvz"; revision = "1"; @@ -185273,28 +181623,6 @@ self: { }) {}; "safe-money" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, cereal - , constraints, deepseq, hashable, serialise, store, tasty - , tasty-hunit, tasty-quickcheck, text, vector-space, xmlbf - }: - mkDerivation { - pname = "safe-money"; - version = "0.6"; - sha256 = "1l8gn9vscng92s1dkfj2fa55k63jnzcnw590r5a8n7dqwaycpz7r"; - libraryHaskellDepends = [ - aeson base binary cereal constraints deepseq hashable serialise - store text vector-space xmlbf - ]; - testHaskellDepends = [ - aeson base binary bytestring cereal constraints deepseq hashable - serialise store tasty tasty-hunit tasty-quickcheck text - vector-space xmlbf - ]; - description = "Type-safe and lossless encoding and manipulation of money, fiat currencies, crypto currencies and precious metals"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "safe-money_0_7" = callPackage ({ mkDerivation, base, binary, bytestring, constraints, deepseq , hashable, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text , vector-space @@ -185313,7 +181641,6 @@ self: { ]; description = "Type-safe and lossless encoding and manipulation of money, fiat currencies, crypto currencies and precious metals"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safe-money-aeson" = callPackage @@ -185696,6 +182023,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "salak_0_2_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory + , filepath, hspec, QuickCheck, scientific, text + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "salak"; + version = "0.2.0"; + sha256 = "0jxyg5kyjax6q75zgrgb60zp54i4p131hymqszk590nc3qca2csm"; + libraryHaskellDepends = [ + aeson base directory filepath scientific text unordered-containers + vector yaml + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring directory filepath hspec + QuickCheck scientific text unordered-containers vector yaml + ]; + description = "Configuration Loader"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "saltine" = callPackage ({ mkDerivation, base, bytestring, libsodium, profunctors , QuickCheck, semigroups, test-framework @@ -186274,32 +182623,6 @@ self: { }: mkDerivation { pname = "sbp"; - version = "2.3.17"; - sha256 = "1zwxq0x9g2l2nkyhbsdgz42wsnr1skm99x3vhd7f7azx17kv3lg6"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson array base base64-bytestring basic-prelude binary bytestring - data-binary-ieee754 lens lens-aeson monad-loops template-haskell - text - ]; - executableHaskellDepends = [ - aeson base basic-prelude binary-conduit bytestring conduit - conduit-extra resourcet time yaml - ]; - testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; - description = "SwiftNav's SBP Library"; - license = stdenv.lib.licenses.lgpl3; - }) {}; - - "sbp_2_4_0" = callPackage - ({ mkDerivation, aeson, array, base, base64-bytestring - , basic-prelude, binary, binary-conduit, bytestring, conduit - , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops - , resourcet, tasty, tasty-hunit, template-haskell, text, time, yaml - }: - mkDerivation { - pname = "sbp"; version = "2.4.0"; sha256 = "13g14lj3ihn55v3cf40hzhp8ypzrl9a6lzarlsmqhr76g6szlpg8"; isLibrary = true; @@ -186316,7 +182639,6 @@ self: { testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; description = "SwiftNav's SBP Library"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sbp2udp" = callPackage @@ -186342,24 +182664,24 @@ self: { "sbv" = callPackage ({ mkDerivation, array, async, base, bytestring, containers , crackNum, deepseq, directory, doctest, filepath, generic-deriving - , ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random - , reinterpret-cast, syb, tasty, tasty-golden, tasty-hunit - , tasty-quickcheck, template-haskell, time, z3 + , ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random, syb + , tasty, tasty-golden, tasty-hunit, tasty-quickcheck + , template-haskell, time, z3 }: mkDerivation { pname = "sbv"; - version = "7.12"; - sha256 = "1lbihjy2nbr77xm1jnvqdjqkabpxjlbdddsdvsr7n9a60bjcr2yx"; + version = "7.13"; + sha256 = "0bk400swnb4s98c5p71ml1px6jndaiqhf5dj7zmnliyplqcgpfik"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers crackNum deepseq directory filepath - generic-deriving ghc mtl pretty process QuickCheck random - reinterpret-cast syb template-haskell time + generic-deriving ghc mtl pretty process QuickCheck random syb + template-haskell time ]; testHaskellDepends = [ - base bytestring containers directory doctest filepath Glob hlint - mtl QuickCheck random reinterpret-cast syb tasty tasty-golden - tasty-hunit tasty-quickcheck template-haskell + base bytestring containers crackNum directory doctest filepath Glob + hlint mtl QuickCheck random syb tasty tasty-golden tasty-hunit + tasty-quickcheck template-haskell ]; testSystemDepends = [ z3 ]; description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; @@ -186431,7 +182753,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "scalendar_1_1_1" = callPackage + "scalendar" = callPackage ({ mkDerivation, base, containers, hspec, QuickCheck, text, time }: mkDerivation { pname = "scalendar"; @@ -186445,23 +182767,6 @@ self: { ]; description = "This is a library for handling calendars and resource availability based on the \"top-nodes algorithm\" and set operations"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "scalendar" = callPackage - ({ mkDerivation, base, containers, hspec, QuickCheck, SCalendar - , text, time - }: - mkDerivation { - pname = "scalendar"; - version = "1.2.0"; - sha256 = "1b33w7fh9jfsr9wrdvnhc7nvn7km69f4qb03d0hb4zlylf6mxj7m"; - libraryHaskellDepends = [ base containers text time ]; - testHaskellDepends = [ - base containers hspec QuickCheck SCalendar text time - ]; - description = "A library for handling calendars and resource availability over time"; - license = stdenv.lib.licenses.mit; }) {}; "scalp-webhooks" = callPackage @@ -186569,23 +182874,6 @@ self: { }: mkDerivation { pname = "scanner"; - version = "0.2"; - sha256 = "1sd5czkfncadyxlbr13is44ad3kkk6rfwm9fqw8m4aipl1l0s0is"; - libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ base bytestring hspec ]; - benchmarkHaskellDepends = [ - attoparsec base bytestring cereal criterion text - ]; - description = "Fast non-backtracking incremental combinator parsing for bytestrings"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "scanner_0_3" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, cereal, criterion - , hspec, text - }: - mkDerivation { - pname = "scanner"; version = "0.3"; sha256 = "0yshznbp784d4gk2qz5jlw5ikc1s1h58h7vck2yksi4ynm3m3y57"; libraryHaskellDepends = [ base bytestring ]; @@ -186595,7 +182883,6 @@ self: { ]; description = "Fast non-backtracking incremental combinator parsing for bytestrings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scanner-attoparsec" = callPackage @@ -188230,22 +184517,6 @@ self: { }: mkDerivation { pname = "selda"; - version = "0.2.0.0"; - sha256 = "1l9ad4d1m0ylfihg0hpfxanxil09c658jl1bmgzn8268akqay9nj"; - libraryHaskellDepends = [ - base bytestring exceptions hashable mtl psqueues text time - unordered-containers - ]; - description = "Multi-backend, high-level EDSL for interacting with SQL databases"; - license = stdenv.lib.licenses.mit; - }) {}; - - "selda_0_3_4_0" = callPackage - ({ mkDerivation, base, bytestring, exceptions, hashable, mtl - , psqueues, text, time, unordered-containers - }: - mkDerivation { - pname = "selda"; version = "0.3.4.0"; sha256 = "1ww4v30ywmdshcf4fpgqj5ycd9c197xdlvnby366hzsm7byqq8wj"; libraryHaskellDepends = [ @@ -188254,7 +184525,6 @@ self: { ]; description = "Multi-backend, high-level EDSL for interacting with SQL databases"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "selda-postgresql" = callPackage @@ -188263,23 +184533,6 @@ self: { }: mkDerivation { pname = "selda-postgresql"; - version = "0.1.7.2"; - sha256 = "06z5zrika018433p5l011wxc308zw7l9ilnkgwcykagsnmai4y7z"; - revision = "1"; - editedCabalFile = "08f2xdfpmbwhrwkjaqfmd9k25c3xn3p477d7a1mnnn7kf7328782"; - libraryHaskellDepends = [ - base bytestring exceptions postgresql-libpq selda text - ]; - description = "PostgreSQL backend for the Selda database EDSL"; - license = stdenv.lib.licenses.mit; - }) {}; - - "selda-postgresql_0_1_7_3" = callPackage - ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq - , selda, text - }: - mkDerivation { - pname = "selda-postgresql"; version = "0.1.7.3"; sha256 = "0ardh6ds8fmqy09y74nflsb8r5y4cvl2ddxcla0vzaf5xppx4czc"; revision = "2"; @@ -188289,7 +184542,6 @@ self: { ]; description = "PostgreSQL backend for the Selda database EDSL"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "selda-sqlite" = callPackage @@ -188298,23 +184550,6 @@ self: { }: mkDerivation { pname = "selda-sqlite"; - version = "0.1.6.0"; - sha256 = "1473igqgjs5282rykqj1zg7420mfh3sbqy74nx1cwbm82j8shyy6"; - revision = "2"; - editedCabalFile = "198pg9i0lfx3fwf7b7cw0x5kial6vbf0dqwh18jnh7na3pyn1jr6"; - libraryHaskellDepends = [ - base direct-sqlite directory exceptions selda text - ]; - description = "SQLite backend for the Selda database EDSL"; - license = stdenv.lib.licenses.mit; - }) {}; - - "selda-sqlite_0_1_6_1" = callPackage - ({ mkDerivation, base, direct-sqlite, directory, exceptions, selda - , text - }: - mkDerivation { - pname = "selda-sqlite"; version = "0.1.6.1"; sha256 = "1qqrgqzcfwqzlcklm0qjvdy3ndn3zg8s5mp8744v76bd6z2xwq4d"; revision = "2"; @@ -188324,7 +184559,6 @@ self: { ]; description = "SQLite backend for the Selda database EDSL"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "select" = callPackage @@ -188521,29 +184755,6 @@ self: { }: mkDerivation { pname = "semigroupoids"; - version = "5.2.2"; - sha256 = "17i96y4iqj8clcs090lf6k0ij3j16nj14vsfwz0mm9nd6i4gbpp4"; - revision = "4"; - editedCabalFile = "0pqfrxzypjq6z8lgdkzq4vhcyqkpk5326hny0r6snpc3gm78r4ij"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base base-orphans bifunctors comonad containers contravariant - distributive hashable semigroups tagged template-haskell - transformers transformers-compat unordered-containers - ]; - testHaskellDepends = [ base doctest ]; - description = "Semigroupoids: Category sans id"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "semigroupoids_5_3_1" = callPackage - ({ mkDerivation, base, base-orphans, bifunctors, Cabal - , cabal-doctest, comonad, containers, contravariant, distributive - , doctest, hashable, semigroups, tagged, template-haskell - , transformers, transformers-compat, unordered-containers - }: - mkDerivation { - pname = "semigroupoids"; version = "5.3.1"; sha256 = "13iqjckq3jzp6rxldrf3bcvk3061ssvsr6y0g5y9jq32z1hyr2fd"; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -188555,7 +184766,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Semigroupoids: Category sans id"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "semigroupoids-syntax" = callPackage @@ -188608,8 +184818,8 @@ self: { }: mkDerivation { pname = "semilattices"; - version = "0.0.0.2"; - sha256 = "1f4xy2kl8mqvlrzv8y0qs2i3c095iprbzpa4j424sifsmms3ya89"; + version = "0.0.0.3"; + sha256 = "089vgwbcwa3hj53hh9djmilwfknsd9g9z9q1gbl0dad4lr39062f"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; @@ -189313,36 +185523,6 @@ self: { }) {}; "servant" = callPackage - ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat - , bytestring, Cabal, cabal-doctest, case-insensitive, doctest - , hspec, hspec-discover, http-api-data, http-media, http-types - , mmorph, mtl, natural-transformation, network-uri, QuickCheck - , quickcheck-instances, singleton-bool, string-conversions, tagged - , text, vault - }: - mkDerivation { - pname = "servant"; - version = "0.14.1"; - sha256 = "083layvq76llq3y49k27cdqzxka6mjgw541jhzndxx4avlcjzym7"; - revision = "1"; - editedCabalFile = "1n9lwm77w0xi6jzqrhyn6akf71z140wngj4s5x2zkndq8wmg4rg4"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson attoparsec base base-compat bytestring case-insensitive - http-api-data http-media http-types mmorph mtl - natural-transformation network-uri singleton-bool - string-conversions tagged text vault - ]; - testHaskellDepends = [ - aeson aeson-compat base base-compat bytestring doctest hspec - QuickCheck quickcheck-instances string-conversions text - ]; - testToolDepends = [ hspec-discover ]; - description = "A family of combinators for defining webservices APIs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant_0_15" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors , bytestring, Cabal, cabal-doctest, case-insensitive, doctest , hspec, hspec-discover, http-api-data, http-media, http-types @@ -189368,7 +185548,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A family of combinators for defining webservices APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-JuicyPixels" = callPackage @@ -189561,42 +185740,10 @@ self: { }: mkDerivation { pname = "servant-auth-server"; - version = "0.4.0.1"; - sha256 = "196dcnh1ycb23x6wb5m1p3iy8bws2grlx5i9mnnsav9n95yf15n9"; - revision = "1"; - editedCabalFile = "0l35r80yf1i3hjwls9cvhmzrjkgxfs103qcb1m650y77w1h3xr9p"; - libraryHaskellDepends = [ - aeson base base64-bytestring blaze-builder bytestring - bytestring-conversion case-insensitive cookie crypto-api - data-default-class entropy http-api-data http-types jose lens - monad-time mtl servant servant-auth servant-server tagged text time - unordered-containers wai - ]; - testHaskellDepends = [ - aeson base bytestring case-insensitive hspec http-client http-types - jose lens lens-aeson markdown-unlit mtl QuickCheck servant-auth - servant-server time transformers wai warp wreq - ]; - testToolDepends = [ hspec-discover markdown-unlit ]; - description = "servant-server/servant-auth compatibility"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-auth-server_0_4_2_0" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder - , bytestring, bytestring-conversion, case-insensitive, cookie - , crypto-api, data-default-class, entropy, hspec, hspec-discover - , http-api-data, http-client, http-types, jose, lens, lens-aeson - , markdown-unlit, monad-time, mtl, QuickCheck, servant - , servant-auth, servant-server, tagged, text, time, transformers - , unordered-containers, wai, warp, wreq - }: - mkDerivation { - pname = "servant-auth-server"; version = "0.4.2.0"; sha256 = "000szizds1c8amxm7gl75gpwrlj38gv665bhp59d35wcq03na4ap"; - revision = "2"; - editedCabalFile = "188chzggs5ahc2v1mxrr5cda5dqjwwar8b85yz7ysvlvbxb1zsb3"; + revision = "3"; + editedCabalFile = "1zjxqlfyw3wwlyq2faiq9gqhfixn2mvfsv8dapalxs9fph7a2nzj"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring bytestring-conversion case-insensitive cookie crypto-api @@ -189612,7 +185759,6 @@ self: { testToolDepends = [ hspec-discover markdown-unlit ]; description = "servant-server/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-swagger" = callPackage @@ -189761,6 +185907,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-auth-wordpress" = callPackage + ({ mkDerivation, base, mtl, servant-server, text, time, wai + , wordpress-auth + }: + mkDerivation { + pname = "servant-auth-wordpress"; + version = "1.0.0.0"; + sha256 = "0ns744n58irm2la9xz4nqxz3yyb69vwbw2h9nqcfhr66dmqd80ar"; + libraryHaskellDepends = [ + base mtl servant-server text time wai wordpress-auth + ]; + description = "Authenticate Routes Using Wordpress Cookies"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-blaze" = callPackage ({ mkDerivation, base, blaze-html, http-media, servant , servant-server, wai, warp @@ -189848,38 +186009,6 @@ self: { "servant-client" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring, containers - , exceptions, generics-sop, hspec, hspec-discover, http-api-data - , http-client, http-media, http-types, HUnit, markdown-unlit - , monad-control, mtl, network, QuickCheck, semigroupoids, servant - , servant-client-core, servant-server, stm, text, time - , transformers, transformers-base, transformers-compat, wai, warp - }: - mkDerivation { - pname = "servant-client"; - version = "0.14"; - sha256 = "0jr2057y7vp6d2jcnisawkajinnqm68h024crh929r9fdka0p1n6"; - revision = "3"; - editedCabalFile = "1rjjqxyyf51bjq8li8yilng5pjd9a5n3d8zniqmfw3hys6dz8n8g"; - libraryHaskellDepends = [ - base base-compat bytestring containers exceptions http-client - http-media http-types monad-control mtl semigroupoids - servant-client-core stm text time transformers transformers-base - transformers-compat - ]; - testHaskellDepends = [ - aeson base base-compat bytestring generics-sop hspec http-api-data - http-client http-types HUnit markdown-unlit mtl network QuickCheck - servant servant-client-core servant-server text transformers - transformers-compat wai warp - ]; - testToolDepends = [ hspec-discover markdown-unlit ]; - description = "automatical derivation of querying functions for servant webservices"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "servant-client_0_15" = callPackage - ({ mkDerivation, aeson, base, base-compat, bytestring, containers , deepseq, entropy, exceptions, generics-sop, hspec, hspec-discover , http-api-data, http-client, http-media, http-types, HUnit , kan-extensions, markdown-unlit, monad-control, mtl, network @@ -189911,29 +186040,6 @@ self: { }) {}; "servant-client-core" = callPackage - ({ mkDerivation, base, base-compat, base64-bytestring, bytestring - , containers, deepseq, exceptions, free, generics-sop, hspec - , hspec-discover, http-api-data, http-media, http-types - , network-uri, QuickCheck, safe, servant, text - }: - mkDerivation { - pname = "servant-client-core"; - version = "0.14.1"; - sha256 = "0qfpakwl6yj6l2br9wa9zs0v7nzmj4bngspw6p536swx39npnkn2"; - revision = "2"; - editedCabalFile = "02pvrccfwvvy53gma56jcqnbia3pm1pncyghdkjp519bwff9iwvb"; - libraryHaskellDepends = [ - base base-compat base64-bytestring bytestring containers exceptions - free generics-sop http-api-data http-media http-types network-uri - safe servant text - ]; - testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ]; - testToolDepends = [ hspec-discover ]; - description = "Core functionality and class for client function generation for servant APIs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-client-core_0_15" = callPackage ({ mkDerivation, aeson, base, base-compat, base64-bytestring , bytestring, containers, deepseq, exceptions, free, generics-sop , hspec, hspec-discover, http-media, http-types, network-uri @@ -189952,7 +186058,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Core functionality and class for client function generation for servant APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-conduit" = callPackage @@ -190059,36 +186164,6 @@ self: { "servant-docs" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring - , case-insensitive, control-monad-omega, hashable, hspec - , hspec-discover, http-media, http-types, lens, servant - , string-conversions, text, unordered-containers - }: - mkDerivation { - pname = "servant-docs"; - version = "0.11.2"; - sha256 = "1x6lvpvlm1lh51y2pmldrjdjjrs5qnq44m2abczr75fjjy6hla3b"; - revision = "6"; - editedCabalFile = "0w9yi4rmfq4irmnia9rl9pb66ix086ic9nd0grspnk54ib7970cl"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base base-compat bytestring case-insensitive - control-monad-omega hashable http-media http-types lens servant - string-conversions text unordered-containers - ]; - executableHaskellDepends = [ - aeson base lens servant string-conversions text - ]; - testHaskellDepends = [ - aeson base hspec lens servant string-conversions - ]; - testToolDepends = [ hspec-discover ]; - description = "generate API docs for your servant webservice"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-docs_0_11_3" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring , case-insensitive, control-monad-omega, hashable, http-media , http-types, lens, servant, string-conversions, tasty , tasty-golden, tasty-hunit, text, transformers @@ -190114,7 +186189,6 @@ self: { ]; description = "generate API docs for your servant webservice"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-ede" = callPackage @@ -190246,25 +186320,6 @@ self: { }: mkDerivation { pname = "servant-foreign"; - version = "0.11.1"; - sha256 = "01cq938b4szvnapf8c4ir8j09aq25jwgnp3jbfxnja027c1v3735"; - revision = "4"; - editedCabalFile = "1alal6ps1lwl8yd2vwkpmkn4a69blr1ws2cba7mc7a2w63lg1pyz"; - libraryHaskellDepends = [ - base base-compat http-types lens servant text - ]; - testHaskellDepends = [ base hspec servant ]; - testToolDepends = [ hspec-discover ]; - description = "Helpers for generating clients for servant APIs in any programming language"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-foreign_0_15" = callPackage - ({ mkDerivation, base, base-compat, hspec, hspec-discover - , http-types, lens, servant, text - }: - mkDerivation { - pname = "servant-foreign"; version = "0.15"; sha256 = "0wxx9drycam46vcmf3kxp2lq1drlpxb1b6fxbxyb6dd7349py6gi"; libraryHaskellDepends = [ @@ -190274,7 +186329,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Helpers for generating clients for servant APIs in any programming language"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-generate" = callPackage @@ -190476,32 +186530,6 @@ self: { }: mkDerivation { pname = "servant-js"; - version = "0.9.3.2"; - sha256 = "1p37520x85rg7rnhazby0x6qas2sh5d79gygmaa5f7jalhkyrq02"; - revision = "3"; - editedCabalFile = "0j5kmqzhkyb1wmvyxz0r20473myzp9bqcdgjbi8i4k1lfvcjsigq"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat charset lens servant servant-foreign text - ]; - testHaskellDepends = [ - base base-compat hspec hspec-expectations language-ecmascript lens - QuickCheck servant text - ]; - testToolDepends = [ hspec-discover ]; - description = "Automatically derive javascript functions to query servant webservices"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "servant-js_0_9_4" = callPackage - ({ mkDerivation, base, base-compat, charset, hspec, hspec-discover - , hspec-expectations, language-ecmascript, lens, QuickCheck - , servant, servant-foreign, text - }: - mkDerivation { - pname = "servant-js"; version = "0.9.4"; sha256 = "041wigqgn5ygcs49ndc39rk66j5bcvgpihshxk678jk470ysfszq"; isLibrary = true; @@ -190624,36 +186652,6 @@ self: { }: mkDerivation { pname = "servant-mock"; - version = "0.8.4"; - sha256 = "1705fw63lrzw79w1ypcdlf35d8qxx247q8isiqh28wzmc4j3kmnr"; - revision = "3"; - editedCabalFile = "13sbgnzr0yfrbrbvzc6v66lxrgvg3pb7h9alvmg77kmm95gmx8mm"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat bytestring http-types QuickCheck servant - servant-server transformers wai - ]; - executableHaskellDepends = [ - aeson base QuickCheck servant-server warp - ]; - testHaskellDepends = [ - aeson base bytestring-conversion hspec hspec-wai QuickCheck servant - servant-server wai - ]; - testToolDepends = [ hspec-discover ]; - description = "Derive a mock server for free from your servant API types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-mock_0_8_5" = callPackage - ({ mkDerivation, aeson, base, base-compat, bytestring - , bytestring-conversion, hspec, hspec-discover, hspec-wai - , http-types, QuickCheck, servant, servant-server, transformers - , wai, warp - }: - mkDerivation { - pname = "servant-mock"; version = "0.8.5"; sha256 = "10bvqwyp5ca53k47a1xfbihdv22gjlj97spr1bn5plf5vlk70m5f"; isLibrary = true; @@ -190672,7 +186670,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Derive a mock server for free from your servant API types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-multipart" = callPackage @@ -191028,27 +187025,12 @@ self: { }: mkDerivation { pname = "servant-ruby"; - version = "0.8.0.2"; - sha256 = "11h70gpar931qh3v1llp8zzk5922p31bmmfp5ynp7nzxv3zdrim6"; - libraryHaskellDepends = [ base casing servant-foreign text ]; - testHaskellDepends = [ base doctest QuickCheck ]; - description = "Generate a Ruby client from a Servant API with Net::HTTP"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-ruby_0_9_0_0" = callPackage - ({ mkDerivation, base, casing, doctest, QuickCheck, servant-foreign - , text - }: - mkDerivation { - pname = "servant-ruby"; version = "0.9.0.0"; sha256 = "1x1746k97i3y836mr5h29l70ldzrg8akhfmg2qicwbwz6qs7hy33"; libraryHaskellDepends = [ base casing servant-foreign text ]; testHaskellDepends = [ base doctest QuickCheck ]; description = "Generate a Ruby client from a Servant API with Net::HTTP"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-scotty" = callPackage @@ -191082,44 +187064,6 @@ self: { }: mkDerivation { pname = "servant-server"; - version = "0.14.1"; - sha256 = "1fnxmy6k0ml11035ac4x2knvpraxpc0g076wx3a9k013xyqi0h02"; - revision = "1"; - editedCabalFile = "028vqbmqkc9gjsk34n74ssi0xfn085v26zdvpixgfi5yd7cvfg03"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base base-compat base64-bytestring bytestring containers exceptions - filepath http-api-data http-media http-types monad-control mtl - network network-uri resourcet servant string-conversions tagged - text transformers transformers-base transformers-compat wai - wai-app-static word8 - ]; - executableHaskellDepends = [ aeson base servant text wai warp ]; - testHaskellDepends = [ - aeson base base-compat base64-bytestring bytestring directory - doctest hspec hspec-wai http-types mtl QuickCheck resourcet safe - servant should-not-typecheck string-conversions temporary text - transformers transformers-compat wai wai-extra - ]; - testToolDepends = [ hspec-discover ]; - description = "A family of combinators for defining webservices APIs and serving them"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-server_0_15" = callPackage - ({ mkDerivation, aeson, base, base-compat, base64-bytestring - , bytestring, Cabal, cabal-doctest, containers, directory, doctest - , exceptions, filepath, hspec, hspec-discover, hspec-wai - , http-api-data, http-media, http-types, monad-control, mtl - , network, network-uri, QuickCheck, resourcet, safe, servant - , should-not-typecheck, string-conversions, tagged, temporary, text - , transformers, transformers-base, transformers-compat, wai - , wai-app-static, wai-extra, warp, word8 - }: - mkDerivation { - pname = "servant-server"; version = "0.15"; sha256 = "1qlkdgls2z71sx09lbkrqcxwx1wam3hn7dnyps6z2i7qixhlw0wq"; isLibrary = true; @@ -191143,7 +187087,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A family of combinators for defining webservices APIs and serving them"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-smsc-ru" = callPackage @@ -191377,32 +187320,6 @@ self: { }: mkDerivation { pname = "servant-swagger"; - version = "1.1.6"; - sha256 = "1gx61328ciprc6ps8xzawfj483s28h5z21zmqczqqh3wfvc8h77w"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson aeson-pretty base bytestring hspec http-media - insert-ordered-containers lens QuickCheck servant singleton-bool - swagger2 text unordered-containers - ]; - testHaskellDepends = [ - aeson base base-compat directory doctest filepath hspec lens - QuickCheck servant swagger2 template-haskell text time utf8-string - ]; - testToolDepends = [ hspec-discover ]; - description = "Generate Swagger specification for your servant API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-swagger_1_1_7" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring - , Cabal, cabal-doctest, directory, doctest, filepath, hspec - , hspec-discover, http-media, insert-ordered-containers, lens - , QuickCheck, servant, singleton-bool, swagger2, template-haskell - , text, time, unordered-containers, utf8-string - }: - mkDerivation { - pname = "servant-swagger"; version = "1.1.7"; sha256 = "0dnyh4g55x70cb6xwksm0rk23v5lawdws5bxgq27ja1walh106p3"; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -191418,7 +187335,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Generate Swagger specification for your servant API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-swagger-ui" = callPackage @@ -191427,24 +187343,6 @@ self: { }: mkDerivation { pname = "servant-swagger-ui"; - version = "0.3.0.3.13.2"; - sha256 = "0llkcag9bnhvni6ddar966i0pwql93s5icvw6pxa9ra5v14v7p5n"; - revision = "2"; - editedCabalFile = "0sz08w56f7p74saass6xdzmbpyk78hpa9d79kkd2nclwinajpkgr"; - libraryHaskellDepends = [ - base bytestring file-embed-lzma servant servant-server - servant-swagger-ui-core swagger2 text - ]; - description = "Servant swagger ui"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-swagger-ui_0_3_2_3_19_3" = callPackage - ({ mkDerivation, base, bytestring, file-embed-lzma, servant - , servant-server, servant-swagger-ui-core, swagger2, text - }: - mkDerivation { - pname = "servant-swagger-ui"; version = "0.3.2.3.19.3"; sha256 = "0s2y6fhm26gzs344ig86nh6d1sy2dxfqpwpgz6c2dcg65jcbbpc7"; revision = "1"; @@ -191455,7 +187353,6 @@ self: { ]; description = "Servant swagger ui"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-swagger-ui-core" = callPackage @@ -191465,26 +187362,6 @@ self: { }: mkDerivation { pname = "servant-swagger-ui-core"; - version = "0.3.1"; - sha256 = "05lnm9p86rd9rxsz7f1zm5vkqzjcq2fd8an7c8y5fk4kxj6rydxb"; - revision = "1"; - editedCabalFile = "10p5yjzvfdn764mszlsx49kb55ygzi5m2mq32l9m91imvj1926b1"; - libraryHaskellDepends = [ - base blaze-markup bytestring http-media servant servant-blaze - servant-server swagger2 text transformers transformers-compat - wai-app-static - ]; - description = "Servant swagger ui core components"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-swagger-ui-core_0_3_2" = callPackage - ({ mkDerivation, base, blaze-markup, bytestring, http-media - , servant, servant-blaze, servant-server, swagger2, text - , transformers, transformers-compat, wai-app-static - }: - mkDerivation { - pname = "servant-swagger-ui-core"; version = "0.3.2"; sha256 = "1a1wk90vm6mq8byxz4syr03l1rf6qj8zhda7lnp23pn5d270xkd2"; revision = "1"; @@ -191496,7 +187373,6 @@ self: { ]; description = "Servant swagger ui core components"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-swagger-ui-jensoleg" = callPackage @@ -191611,27 +187487,6 @@ self: { }: mkDerivation { pname = "servant-yaml"; - version = "0.1.0.0"; - sha256 = "011jxvr2i65bf0kmdn0sxkqgfz628a0sfhzphr1rqsmh8sqdj5y9"; - revision = "22"; - editedCabalFile = "1mi52j2c7960k0qmxqd7238yxgbccb0xgfj3ahh0zfckficn9bk7"; - libraryHaskellDepends = [ - base bytestring http-media servant yaml - ]; - testHaskellDepends = [ - aeson base base-compat bytestring http-media servant servant-server - wai warp yaml - ]; - description = "Servant support for yaml"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-yaml_0_1_0_1" = callPackage - ({ mkDerivation, aeson, base, base-compat, bytestring, http-media - , servant, servant-server, wai, warp, yaml - }: - mkDerivation { - pname = "servant-yaml"; version = "0.1.0.1"; sha256 = "00gnbdlcq6cvmhsga8h0csd35pnfib038rqlhm445l4wa0cp8m01"; libraryHaskellDepends = [ @@ -191643,7 +187498,6 @@ self: { ]; description = "Servant support for yaml"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-zeppelin" = callPackage @@ -191747,23 +187601,24 @@ self: { "serverless-haskell" = callPackage ({ mkDerivation, aeson, aeson-casing, aeson-extra, amazonka-core , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive - , hspec, hspec-discover, http-types, iproute, lens, raw-strings-qq - , text, time, unix, unordered-containers + , hspec, hspec-discover, http-types, iproute, lens, network + , network-simple, raw-strings-qq, text, time, unix + , unordered-containers }: mkDerivation { pname = "serverless-haskell"; - version = "0.6.7"; - sha256 = "0p34wd3g1gg7c6yp018164ky1rqz67wq5fcax6fis0hn3g8qgjm9"; + version = "0.8.4"; + sha256 = "0hbva555n2xypq7sby6frkrwhn6xxx1hdq7hgdi07cx60vs8b6l4"; libraryHaskellDepends = [ aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-types iproute - lens text time unix unordered-containers + lens network network-simple text time unix unordered-containers ]; testHaskellDepends = [ aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive hspec hspec-discover - http-types iproute lens raw-strings-qq text time unix - unordered-containers + http-types iproute lens network network-simple raw-strings-qq text + time unix unordered-containers ]; testToolDepends = [ hspec-discover ]; description = "Deploying Haskell code onto AWS Lambda using Serverless"; @@ -191771,7 +187626,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "serverless-haskell_0_8_4" = callPackage + "serverless-haskell_0_8_5" = callPackage ({ mkDerivation, aeson, aeson-casing, aeson-extra, amazonka-core , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive , hspec, hspec-discover, http-types, iproute, lens, network @@ -191780,8 +187635,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.8.4"; - sha256 = "0hbva555n2xypq7sby6frkrwhn6xxx1hdq7hgdi07cx60vs8b6l4"; + version = "0.8.5"; + sha256 = "0jnq2z5h7bqzbrppznw38vq9ibbijddw3jkx3vhrf0jzvk50gqqg"; libraryHaskellDepends = [ aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-types iproute @@ -193340,8 +189195,8 @@ self: { ({ mkDerivation, base, containers, text, unix }: mkDerivation { pname = "shell-monad"; - version = "0.6.6"; - sha256 = "1z3anvjcix25i2zzwnln2hnpzacwiss95xhyc0mclc33v0j5k038"; + version = "0.6.7"; + sha256 = "101ivifq9gcfafj295l773wpv0c0cqmh8zjzg65r1fhblhbd30f7"; libraryHaskellDepends = [ base containers text unix ]; description = "shell monad"; license = stdenv.lib.licenses.bsd3; @@ -193721,8 +189576,8 @@ self: { ({ mkDerivation, base, text }: mkDerivation { pname = "shortcut-links"; - version = "0.4.2.0"; - sha256 = "09sh6c1cwhs9x49mim8z1pafb0sh1z3im0k5wvigkpagx72pasqy"; + version = "0.4.2.1"; + sha256 = "1zyy4jma61vg684sa66mpdlq9ylfrfv23d8m0163lbcfpkxfqdhd"; libraryHaskellDepends = [ base text ]; description = "Link shortcuts for use in text markup"; license = stdenv.lib.licenses.bsd3; @@ -195259,26 +191114,6 @@ self: { }) {}; "singletons" = callPackage - ({ mkDerivation, base, containers, directory, filepath, ghc-boot-th - , mtl, process, syb, tasty, tasty-golden, template-haskell, text - , th-desugar, transformers - }: - mkDerivation { - pname = "singletons"; - version = "2.4.1"; - sha256 = "1kzrl9njvkbvxylk9jg61vy3ksmxmzymci5hdp0ilpsah4620yjx"; - libraryHaskellDepends = [ - base containers ghc-boot-th mtl syb template-haskell text - th-desugar transformers - ]; - testHaskellDepends = [ - base directory filepath process tasty tasty-golden - ]; - description = "A framework for generating singleton types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "singletons_2_5_1" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath , ghc-boot-th, mtl, pretty, process, syb, tasty, tasty-golden , template-haskell, text, th-desugar, transformers @@ -195295,7 +191130,6 @@ self: { testHaskellDepends = [ base filepath process tasty tasty-golden ]; description = "A framework for generating singleton types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "singnal" = callPackage @@ -195750,6 +191584,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "skip-var" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "skip-var"; + version = "0.1.0.0"; + sha256 = "1xwbr25nsjkjvwjh62inr3ja7lp7carmc4nd68ybkyxmcfp1ivmc"; + libraryHaskellDepends = [ base ]; + description = "Skip variables"; + license = stdenv.lib.licenses.mit; + }) {}; + + "skip-var_0_1_1_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "skip-var"; + version = "0.1.1.0"; + sha256 = "07nljfjd45fagisd99pqz2jhznfapk9cgd9lyy9cija7pmxfbg5z"; + libraryHaskellDepends = [ base ]; + description = "Skip variables"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "skulk" = callPackage ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { @@ -195939,6 +191796,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "slack-verify" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite + , hspec + }: + mkDerivation { + pname = "slack-verify"; + version = "0.1.0.0"; + sha256 = "0rkanwf4q9mlhsxmxhpnn5svnrz0hkd9iw4yczjidm5mb0xrdqs1"; + libraryHaskellDepends = [ + base base16-bytestring bytestring cryptonite + ]; + testHaskellDepends = [ + base base16-bytestring bytestring cryptonite hspec + ]; + description = "Slack API Request Verification HMAC"; + license = stdenv.lib.licenses.mit; + }) {}; + "slack-web" = callPackage ({ mkDerivation, aeson, base, containers, errors, hspec , http-api-data, http-client, http-client-tls, megaparsec, mtl @@ -195991,27 +191866,6 @@ self: { }) {}; "slave-thread" = callPackage - ({ mkDerivation, base, base-prelude, HTF, list-t, mmorph - , partial-handler, QuickCheck, quickcheck-instances, SafeSemaphore - , stm-containers, transformers - }: - mkDerivation { - pname = "slave-thread"; - version = "1.0.2"; - sha256 = "04sbbdgzsi1ww642b9fgbhx348c0a4qim4ak6bivwpnnimcj0wg4"; - libraryHaskellDepends = [ - base base-prelude list-t mmorph partial-handler stm-containers - transformers - ]; - testHaskellDepends = [ - base base-prelude HTF QuickCheck quickcheck-instances SafeSemaphore - ]; - description = "A principal solution to ghost threads and silent exceptions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "slave-thread_1_0_3" = callPackage ({ mkDerivation, base, deferred-folds, focus, foldl, QuickCheck , quickcheck-instances, rerebase, SafeSemaphore, stm-containers , tasty, tasty-hunit, tasty-quickcheck @@ -196745,27 +192599,27 @@ self: { "snap" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring, cereal , clientsession, configurator, containers, deepseq, directory - , directory-tree, dlist, filepath, hashable, heist, http-streams - , HUnit, lens, lifted-base, map-syntax, monad-control, mtl - , mwc-random, pwstore-fast, QuickCheck, smallcheck, snap-core + , directory-tree, dlist, fail, filepath, hashable, heist + , http-streams, HUnit, lens, lifted-base, map-syntax, monad-control + , mtl, mwc-random, pwstore-fast, QuickCheck, smallcheck, snap-core , snap-server, stm, syb, test-framework, test-framework-hunit , test-framework-quickcheck2, test-framework-smallcheck, text, time , transformers, transformers-base, unordered-containers, xmlhtml }: mkDerivation { pname = "snap"; - version = "1.1.1.0"; - sha256 = "08kgvry18kfkspif2xn8j7w9jfinhrnl33g6ap74fz7rsrg68jz7"; + version = "1.1.2.0"; + sha256 = "05da0dg0p6djcsinycih50hjnircibmicarwg2vr14a7zbrhynps"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal clientsession configurator - containers directory directory-tree dlist filepath hashable heist - lens lifted-base map-syntax monad-control mtl mwc-random + containers directory directory-tree dlist fail filepath hashable + heist lens lifted-base map-syntax monad-control mtl mwc-random pwstore-fast snap-core snap-server stm text time transformers transformers-base unordered-containers xmlhtml ]; testHaskellDepends = [ aeson async attoparsec base bytestring cereal clientsession - configurator containers deepseq directory directory-tree dlist + configurator containers deepseq directory directory-tree dlist fail filepath hashable heist http-streams HUnit lens lifted-base map-syntax monad-control mtl mwc-random pwstore-fast QuickCheck smallcheck snap-core snap-server stm syb test-framework @@ -196998,8 +192852,8 @@ self: { pname = "snap-loader-dynamic"; version = "1.0.0.0"; sha256 = "12zvmdkypwflmc81i0sxbfmb3ja0vydycmaliyvrw0z32kg705wg"; - revision = "3"; - editedCabalFile = "0kk3viaz5hikj9815ja9l3fqq3653vx7q9jamkz68hyfxyvf8qxh"; + revision = "4"; + editedCabalFile = "19bi4vh6pvcm0qc4wz0ydhs9flii6hyzg7z3iiijfcyhdcc9iah9"; libraryHaskellDepends = [ base directory directory-tree hint mtl snap-core template-haskell time unix @@ -200113,25 +195967,24 @@ self: { "sproxy2" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder - , bytestring, cereal, conduit, containers, cookie, docopt, entropy - , Glob, http-client, http-conduit, http-types - , interpolatedstring-perl6, network, postgresql-simple - , resource-pool, SHA, sqlite-simple, text, time, unix - , unordered-containers, wai, wai-conduit, warp, warp-tls, word8 - , yaml + , bytestring, cereal, conduit, cookie, docopt, entropy, Glob + , http-client, http-conduit, http-types, interpolatedstring-perl6 + , network, postgresql-simple, resource-pool, SHA, sqlite-simple + , text, time, unix, unordered-containers, wai, wai-conduit, warp + , warp-tls, word8, yaml }: mkDerivation { pname = "sproxy2"; - version = "1.96.0"; - sha256 = "0wzkh312d7h957vkf2qqsbnf9xm98vm8y5kzray87rn6rdc5k5x6"; + version = "1.97.0"; + sha256 = "1in8sb41bl46xwk49904xkm3k5s59xikvmyyani1p60l0zfrb2jk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring cereal - conduit containers cookie docopt entropy Glob http-client - http-conduit http-types interpolatedstring-perl6 network - postgresql-simple resource-pool SHA sqlite-simple text time unix - unordered-containers wai wai-conduit warp warp-tls word8 yaml + conduit cookie docopt entropy Glob http-client http-conduit + http-types interpolatedstring-perl6 network postgresql-simple + resource-pool SHA sqlite-simple text time unix unordered-containers + wai wai-conduit warp warp-tls word8 yaml ]; description = "Secure HTTP proxy for authenticating users via OAuth2"; license = stdenv.lib.licenses.mit; @@ -200419,37 +196272,6 @@ self: { "squeal-postgresql" = callPackage ({ mkDerivation, aeson, base, binary-parser, bytestring - , bytestring-strict-builder, deepseq, doctest, generics-sop - , lifted-base, mmorph, monad-control, mtl, network-ip - , postgresql-binary, postgresql-libpq, profunctors, resource-pool - , scientific, text, time, transformers, transformers-base - , uuid-types, vector - }: - mkDerivation { - pname = "squeal-postgresql"; - version = "0.3.2.0"; - sha256 = "022bh32r5cgkiical5jc7ax9im5a3nfl8v2cxc7v1rkq6ag2rclq"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base binary-parser bytestring bytestring-strict-builder - deepseq generics-sop lifted-base mmorph monad-control mtl - network-ip postgresql-binary postgresql-libpq profunctors - resource-pool scientific text time transformers transformers-base - uuid-types vector - ]; - executableHaskellDepends = [ - base bytestring generics-sop mtl text transformers - transformers-base vector - ]; - testHaskellDepends = [ base doctest ]; - description = "Squeal PostgreSQL Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "squeal-postgresql_0_4_0_0" = callPackage - ({ mkDerivation, aeson, base, binary-parser, bytestring , bytestring-strict-builder, deepseq, doctest, generics-sop, hspec , lifted-base, mmorph, monad-control, mtl, network-ip , postgresql-binary, postgresql-libpq, records-sop, resource-pool @@ -200879,34 +196701,6 @@ self: { "stache" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion - , deepseq, directory, file-embed, filepath, hspec, hspec-megaparsec - , megaparsec, mtl, template-haskell, text, unordered-containers - , vector, yaml - }: - mkDerivation { - pname = "stache"; - version = "1.2.1"; - sha256 = "0fqipjyin2hpklm0gaab4qhcfj9gzkpb2g948sqzf1n6alkxvyvb"; - revision = "8"; - editedCabalFile = "0jz9cg3w71nvxc4y6hrwjayxl2291q5xm5r4qrhz1ag1lvzk26yn"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring containers deepseq directory filepath - megaparsec mtl template-haskell text unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers file-embed hspec hspec-megaparsec - megaparsec template-haskell text yaml - ]; - benchmarkHaskellDepends = [ - aeson base criterion deepseq megaparsec text - ]; - description = "Mustache templates for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "stache_2_0_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, directory, file-embed, filepath, hspec, hspec-discover , hspec-megaparsec, megaparsec, mtl, template-haskell, text , unordered-containers, vector, yaml @@ -200932,7 +196726,6 @@ self: { ]; description = "Mustache templates for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stack" = callPackage @@ -201253,6 +197046,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stack2cabal" = callPackage + ({ mkDerivation, base, bytestring, Cabal, directory, extra + , filepath, hpack, stackage-to-hackage, text + }: + mkDerivation { + pname = "stack2cabal"; + version = "1.0.2"; + sha256 = "0zdyjf55zda465ai6bjp13a4f4khgz59smmaa2nlbbrjknlb1kbl"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring Cabal directory extra filepath hpack + stackage-to-hackage text + ]; + description = "Convert stack projects to cabal.project + cabal.project.freeze"; + license = stdenv.lib.licenses.gpl3Plus; + }) {}; + "stack2nix" = callPackage ({ mkDerivation, async, base, Cabal, cabal2nix, containers , directory, distribution-nixpkgs, filepath, hackage-db, hspec @@ -201529,19 +197340,22 @@ self: { "stackage-to-hackage" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory - , extra, filepath, HsOpenSSL, HsYAML, http-streams, network-uri - , optparse-applicative, semigroupoids, text + , extra, filepath, HsYAML, http-client, http-client-tls + , optparse-applicative, text }: mkDerivation { pname = "stackage-to-hackage"; - version = "1.0.2"; - sha256 = "0s474q0hwz917vhh9hmx33j9jjbgm58ajgl0wacw8hfbs8awwk20"; - isLibrary = false; + version = "1.1.0"; + sha256 = "165g5vyxck8hh2523v4h0cwjl3yvp4wwzlsdrs9wvg9ca3ij0v85"; + isLibrary = true; isExecutable = true; + libraryHaskellDepends = [ + base bytestring Cabal containers directory extra filepath HsYAML + http-client http-client-tls text + ]; executableHaskellDepends = [ - base bytestring Cabal containers directory extra filepath HsOpenSSL - HsYAML http-streams network-uri optparse-applicative semigroupoids - text + base bytestring Cabal containers directory extra filepath + optparse-applicative text ]; description = "Convert stack.yaml to cabal.project + cabal.project.freeze"; license = stdenv.lib.licenses.gpl3Plus; @@ -202102,33 +197916,6 @@ self: { }) {}; "statistics" = callPackage - ({ mkDerivation, aeson, base, base-orphans, binary, deepseq, erf - , HUnit, ieee754, math-functions, monad-par, mwc-random, primitive - , QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, vector, vector-algorithms - , vector-binary-instances, vector-th-unbox - }: - mkDerivation { - pname = "statistics"; - version = "0.14.0.2"; - sha256 = "0y27gafkib0x0fn39qfn2rkgsfrm09ng35sbb5dwr7rclhnxz59l"; - revision = "2"; - editedCabalFile = "1bx70yqkn62ii17fjv3pig4hklrzkqd09zj67zzjiyjzmn04fir3"; - libraryHaskellDepends = [ - aeson base base-orphans binary deepseq erf math-functions monad-par - mwc-random primitive vector vector-algorithms - vector-binary-instances vector-th-unbox - ]; - testHaskellDepends = [ - aeson base binary erf HUnit ieee754 math-functions mwc-random - primitive QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 vector vector-algorithms - ]; - description = "A library of statistical types, data, and functions"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "statistics_0_15_0_0" = callPackage ({ mkDerivation, aeson, base, base-orphans, binary , data-default-class, deepseq, dense-linear-algebra, erf, HUnit , ieee754, math-functions, monad-par, mwc-random, primitive @@ -202153,7 +197940,6 @@ self: { ]; description = "A library of statistical types, data, and functions"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "statistics-dirichlet" = callPackage @@ -202680,35 +198466,6 @@ self: { }) {}; "stm-containers" = callPackage - ({ mkDerivation, async, base, base-prelude, containers, criterion - , focus, free, hashable, hashtables, HTF, list-t, loch-th, mtl - , mtl-prelude, mwc-random, mwc-random-monad, placeholders - , primitive, QuickCheck, text, transformers, unordered-containers - , vector - }: - mkDerivation { - pname = "stm-containers"; - version = "0.2.16"; - sha256 = "0bsha98j8ryzcrcs3n1iyrvx7b37ipc66f7qxkhnkp3wch32y139"; - libraryHaskellDepends = [ - base base-prelude focus hashable list-t primitive transformers - ]; - testHaskellDepends = [ - base base-prelude focus free hashable HTF list-t loch-th mtl - mtl-prelude placeholders primitive QuickCheck transformers - unordered-containers - ]; - benchmarkHaskellDepends = [ - async base base-prelude containers criterion focus free hashable - hashtables list-t loch-th mtl mtl-prelude mwc-random - mwc-random-monad placeholders text unordered-containers vector - ]; - description = "Containers for STM"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "stm-containers_1_1_0_2" = callPackage ({ mkDerivation, base, deferred-folds, focus, foldl, free, hashable , HTF, list-t, QuickCheck, quickcheck-text, rerebase, stm-hamt , transformers @@ -203303,8 +199060,8 @@ self: { }: mkDerivation { pname = "stratosphere"; - version = "0.24.4"; - sha256 = "0n4gry4vgqb64vy9ncyz3hcsjv31a869al5kbwgzi7pd7rp61zla"; + version = "0.29.0"; + sha256 = "0zncpgjklm649fzrjjy0bri0ivybrc7lvys8yq72b4dpb8ksp5zs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -203320,31 +199077,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_28_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers - , hashable, hspec, hspec-discover, lens, template-haskell, text - , unordered-containers - }: - mkDerivation { - pname = "stratosphere"; - version = "0.28.1"; - sha256 = "1brypavqh8049adidzgsjsrfd2sxbv387cckwxl4kkm4s49zrx18"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base bytestring containers hashable lens - template-haskell text unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-pretty base bytestring containers hashable hspec - hspec-discover lens template-haskell text unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - description = "EDSL for AWS CloudFormation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "stratum-tool" = callPackage ({ mkDerivation, aeson, async, base, bytestring, bytestring-builder , cmdargs, connection, containers, curl, curl-aeson, network, stm @@ -203994,29 +199726,6 @@ self: { }) {}; "streamly" = callPackage - ({ mkDerivation, atomic-primops, base, containers, deepseq - , exceptions, gauge, heaps, hspec, lockfree-queue, monad-control - , mtl, QuickCheck, random, transformers, transformers-base - }: - mkDerivation { - pname = "streamly"; - version = "0.3.0"; - sha256 = "0ssp66w8qbfbx9p6hdgvddp3d82i1b4b0n9jbji6cyvf7v8b7m1k"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - atomic-primops base containers exceptions heaps lockfree-queue - monad-control mtl transformers transformers-base - ]; - testHaskellDepends = [ - base containers exceptions hspec mtl QuickCheck random transformers - ]; - benchmarkHaskellDepends = [ base deepseq gauge random ]; - description = "Beautiful Streaming, Concurrent and Reactive Composition"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "streamly_0_5_2" = callPackage ({ mkDerivation, atomic-primops, base, clock, containers, deepseq , exceptions, gauge, ghc-prim, heaps, hspec, lockfree-queue , monad-control, mtl, QuickCheck, random, transformers @@ -204042,7 +199751,6 @@ self: { ]; description = "Beautiful Streaming, Concurrent and Reactive Composition"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streamproc" = callPackage @@ -204621,6 +200329,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "stripe-concepts" = callPackage + ({ mkDerivation, base, bytestring, text }: + mkDerivation { + pname = "stripe-concepts"; + version = "1.0.0.0"; + sha256 = "0s518mlb181407w2gmlhaayaf3ypn03lzw3fmkzkiqz2c89kd1rw"; + libraryHaskellDepends = [ base bytestring text ]; + description = "Types for the Stripe API"; + license = stdenv.lib.licenses.mit; + }) {}; + "stripe-core" = callPackage ({ mkDerivation, aeson, base, bytestring, mtl, text, time , transformers, unordered-containers @@ -204691,6 +200410,40 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "stripe-scotty" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-types, scotty + , stripe-concepts, stripe-signature, text, unordered-containers + }: + mkDerivation { + pname = "stripe-scotty"; + version = "1.0.0.0"; + sha256 = "195v1a3sl5skz2jr71r1b4za033s6hib7ld59f4fdrfdr5658sbs"; + revision = "1"; + editedCabalFile = "0c3r39217650yjxxs1523ywvyiirrh2f209gl4hfznyigkx2kg41"; + libraryHaskellDepends = [ + aeson base bytestring http-types scotty stripe-concepts + stripe-signature text unordered-containers + ]; + description = "Listen for Stripe webhook events with Scotty"; + license = stdenv.lib.licenses.mit; + }) {}; + + "stripe-signature" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, hex-text, memory + , stripe-concepts, text + }: + mkDerivation { + pname = "stripe-signature"; + version = "1.0.0.0"; + sha256 = "0hg5l9fyfr6yhna2awcyrfr38zlpd1q58b6q6fc3aq8qhbwk8zps"; + libraryHaskellDepends = [ + base bytestring cryptonite hex-text memory stripe-concepts text + ]; + testHaskellDepends = [ base bytestring text ]; + description = "Verification of Stripe webhook signatures"; + license = stdenv.lib.licenses.mit; + }) {}; + "stripe-tests" = callPackage ({ mkDerivation, aeson, base, bytestring, free, hspec, hspec-core , mtl, random, stripe-core, text, time, transformers @@ -204709,6 +200462,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "stripe-wreq" = callPackage + ({ mkDerivation, aeson, base, bytestring, lens, stripe-concepts + , text, unordered-containers, wreq + }: + mkDerivation { + pname = "stripe-wreq"; + version = "1.0.0.0"; + sha256 = "1cm9fvkpanxydbbrk9s1yj3bkxd7wcschi40a4dhmh8h3wr89y8s"; + libraryHaskellDepends = [ + aeson base bytestring lens stripe-concepts text + unordered-containers wreq + ]; + description = "Use the Stripe API via Wreq"; + license = stdenv.lib.licenses.mit; + }) {}; + "strips" = callPackage ({ mkDerivation, base, containers, hspec, mtl }: mkDerivation { @@ -205739,14 +201508,16 @@ self: { }) {}; "supervisors" = callPackage - ({ mkDerivation, async, base, containers, hspec, stm, unliftio }: + ({ mkDerivation, async, base, containers, hspec, safe-exceptions + , stm + }: mkDerivation { pname = "supervisors"; - version = "0.1.0.0"; - sha256 = "1sxralp0hcz2zn5byn67xq612nzmpm890gnjs827sidvr7r7h31j"; - revision = "2"; - editedCabalFile = "08qz4qbfrj7hpk3pgyjy3r149dz48jpxajyjs10fgiz16xg11zyl"; - libraryHaskellDepends = [ async base containers stm unliftio ]; + version = "0.2.0.0"; + sha256 = "0q6r211sbb9dyrplr61xajbwcfvz7z93401mhqxhw3pz55vyrg8i"; + libraryHaskellDepends = [ + async base containers safe-exceptions stm + ]; testHaskellDepends = [ base hspec ]; description = "Monitor groups of threads with non-hierarchical lifetimes"; license = stdenv.lib.licenses.mit; @@ -206151,39 +201922,6 @@ self: { }) {}; "swagger2" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, base-compat-batteries - , bytestring, Cabal, cabal-doctest, containers, doctest - , generics-sop, Glob, hashable, hspec, hspec-discover, http-media - , HUnit, insert-ordered-containers, lens, mtl, network, QuickCheck - , quickcheck-instances, scientific, template-haskell, text, time - , transformers, transformers-compat, unordered-containers - , uuid-types, vector - }: - mkDerivation { - pname = "swagger2"; - version = "2.2.2"; - sha256 = "1jkfmfrldqrfqqnjf0g4spd03w9xjmi35k33xnhsmfj122455lw2"; - revision = "3"; - editedCabalFile = "187jl8slpyr6blcxnhdp7wf85ab54pgqnbl11n816xg6fyqy7ylk"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson base base-compat-batteries bytestring containers generics-sop - hashable http-media insert-ordered-containers lens mtl network - scientific template-haskell text time transformers - transformers-compat unordered-containers uuid-types vector - ]; - testHaskellDepends = [ - aeson aeson-qq base base-compat-batteries bytestring containers - doctest Glob hashable hspec HUnit insert-ordered-containers lens - mtl QuickCheck quickcheck-instances text time unordered-containers - vector - ]; - testToolDepends = [ hspec-discover ]; - description = "Swagger 2.0 data model"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "swagger2_2_3_1" = callPackage ({ mkDerivation, aeson, base, base-compat-batteries, bytestring , Cabal, cabal-doctest, containers, cookie, doctest, generics-sop , Glob, hashable, hspec, hspec-discover, http-media, HUnit @@ -206213,7 +201951,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Swagger 2.0 data model"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "swapper" = callPackage @@ -206289,31 +202026,6 @@ self: { }: mkDerivation { pname = "swish"; - version = "0.9.2.1"; - sha256 = "0zrzihgwn5lg23zmg2iqwilpfj6r77rh1am8g6rwkyf42bgvwhzg"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base containers directory filepath hashable intern mtl network-uri - old-locale polyparse semigroups text time - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base containers hashable HUnit network-uri old-locale semigroups - test-framework test-framework-hunit text time - ]; - description = "A semantic web toolkit"; - license = stdenv.lib.licenses.lgpl21; - }) {}; - - "swish_0_10_0_1" = callPackage - ({ mkDerivation, base, containers, directory, filepath, hashable - , HUnit, intern, mtl, network-uri, old-locale, polyparse - , semigroups, test-framework, test-framework-hunit, text, time - }: - mkDerivation { - pname = "swish"; version = "0.10.0.1"; sha256 = "1ikqqyra9r79vw2s969kyqh1vgijcr33y7irriylsp51n7pspagk"; isLibrary = true; @@ -206330,7 +202042,6 @@ self: { ]; description = "A semantic web toolkit"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sws" = callPackage @@ -207922,23 +203633,6 @@ self: { }) {}; "tagged" = callPackage - ({ mkDerivation, base, deepseq, template-haskell, transformers - , transformers-compat - }: - mkDerivation { - pname = "tagged"; - version = "0.8.5"; - sha256 = "16cdzh0bw16nvjnyyy5j9s60malhz4nnazw96vxb0xzdap4m2z74"; - revision = "2"; - editedCabalFile = "0r2knfcq0b4s652vlvlnfwxlc2mkc2ra9kl8bp4zdn1awmfy0ia5"; - libraryHaskellDepends = [ - base deepseq template-haskell transformers transformers-compat - ]; - description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tagged_0_8_6" = callPackage ({ mkDerivation, base, deepseq, template-haskell, transformers }: mkDerivation { pname = "tagged"; @@ -207949,7 +203643,6 @@ self: { ]; description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tagged-binary" = callPackage @@ -208581,31 +204274,6 @@ self: { }: mkDerivation { pname = "tar-conduit"; - version = "0.2.5"; - sha256 = "0gnklkw9qv496m8nxm1mlfddyiw8c5lsj5pcshxv7c6rv9n3vva3"; - libraryHaskellDepends = [ - base bytestring conduit conduit-combinators directory filepath - safe-exceptions text unix - ]; - testHaskellDepends = [ - base bytestring conduit conduit-combinators conduit-extra - containers deepseq directory filepath hspec QuickCheck weigh - ]; - benchmarkHaskellDepends = [ - base bytestring conduit conduit-combinators containers criterion - deepseq directory filepath hspec - ]; - description = "Extract and create tar files using conduit for streaming"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tar-conduit_0_3_1" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-combinators - , conduit-extra, containers, criterion, deepseq, directory - , filepath, hspec, QuickCheck, safe-exceptions, text, unix, weigh - }: - mkDerivation { - pname = "tar-conduit"; version = "0.3.1"; sha256 = "15w1qs276x2j13s3dg5a0d8jjcs3rf8hhnfa2m6p8jm7kjirvahm"; libraryHaskellDepends = [ @@ -208622,7 +204290,6 @@ self: { ]; description = "Extract and create tar files using conduit for streaming"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tardis" = callPackage @@ -208781,23 +204448,6 @@ self: { }: mkDerivation { pname = "tasty"; - version = "1.1.0.4"; - sha256 = "1gzf1gqi5p78m8rc21g9a8glc69r68igxr9n4qn4bs6wqyi3ykiv"; - libraryHaskellDepends = [ - ansi-terminal async base clock containers mtl optparse-applicative - stm tagged unbounded-delays unix wcwidth - ]; - description = "Modern and extensible testing framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tasty_1_2" = callPackage - ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl - , optparse-applicative, stm, tagged, unbounded-delays, unix - , wcwidth - }: - mkDerivation { - pname = "tasty"; version = "1.2"; sha256 = "05w3bl5kah238pds818sxp9x58rp1nszbiicb1l21hf9k83mw66n"; libraryHaskellDepends = [ @@ -208806,7 +204456,6 @@ self: { ]; description = "Modern and extensible testing framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-ant-xml" = callPackage @@ -208816,8 +204465,8 @@ self: { }: mkDerivation { pname = "tasty-ant-xml"; - version = "1.1.4"; - sha256 = "0v0gsb90kh6hwlgxbclzawsskywc6yf7n8xhiifia97l4y0yx2m8"; + version = "1.1.5"; + sha256 = "1px562a9c3vn0qxy8zs8mkp73nfqca17hdwhv5p7qgawpjafxk32"; libraryHaskellDepends = [ base containers directory filepath generic-deriving ghc-prim mtl stm tagged tasty transformers xml @@ -209294,6 +204943,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tasty-test-vector" = callPackage + ({ mkDerivation, base, tasty }: + mkDerivation { + pname = "tasty-test-vector"; + version = "0"; + sha256 = "1kgz9mp1h391rqj9n78bfvxl8pd3bxanbnwkc5l9gvlygly3fz8j"; + libraryHaskellDepends = [ base tasty ]; + description = "Test vector support for tasty"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tasty-th" = callPackage ({ mkDerivation, base, haskell-src-exts, tasty, tasty-hunit , template-haskell @@ -210556,8 +206216,8 @@ self: { }: mkDerivation { pname = "terminal-text"; - version = "1.1.1"; - sha256 = "1jgdxqck3ck65mppi694w0f5x0547148y5agi100zggp8r3yxsy3"; + version = "1.1.2"; + sha256 = "1cfxkx3mfjxw8fh3gw4wqk5wwf10hi1aldhn6xc75mwfa6x7djjq"; libraryHaskellDepends = [ ansi-terminal base container layered-state prologue text ]; @@ -211469,28 +207129,6 @@ self: { "text-builder" = callPackage ({ mkDerivation, base, base-prelude, bytestring, criterion - , QuickCheck, quickcheck-instances, rerebase, semigroups, tasty - , tasty-hunit, tasty-quickcheck, text - }: - mkDerivation { - pname = "text-builder"; - version = "0.5.4.3"; - sha256 = "1xcyi3bw44anzah5c4c0wm18vnyqsr3q7ww2kp2psk41ql6gan2h"; - libraryHaskellDepends = [ - base base-prelude bytestring semigroups text - ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - benchmarkHaskellDepends = [ criterion rerebase ]; - description = "An efficient strict text builder"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "text-builder_0_6_4" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, criterion , deferred-folds, QuickCheck, quickcheck-instances, rerebase , semigroups, tasty, tasty-hunit, tasty-quickcheck, text , transformers @@ -212046,40 +207684,6 @@ self: { }: mkDerivation { pname = "text-show"; - version = "3.7.4"; - sha256 = "068yp74k4ybhvycivnr7x238dl1qdnkjdzf25pcz127294rn9yry"; - revision = "2"; - editedCabalFile = "10hmmrm5qjc1lhrqgbh7yyyij9v0rpsv9fakynm5myfcc2ayif82"; - libraryHaskellDepends = [ - array base base-compat-batteries bifunctors bytestring - bytestring-builder containers contravariant generic-deriving - ghc-boot-th ghc-prim integer-gmp nats semigroups tagged - template-haskell text th-abstraction th-lift transformers - transformers-compat void - ]; - testHaskellDepends = [ - array base base-compat-batteries base-orphans bytestring - bytestring-builder deriving-compat generic-deriving ghc-prim hspec - nats QuickCheck quickcheck-instances semigroups tagged - template-haskell text transformers transformers-compat - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; - description = "Efficient conversion of values into Text"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "text-show_3_7_5" = callPackage - ({ mkDerivation, array, base, base-compat-batteries, base-orphans - , bifunctors, bytestring, bytestring-builder, containers - , contravariant, criterion, deepseq, deriving-compat - , generic-deriving, ghc-boot-th, ghc-prim, hspec, hspec-discover - , integer-gmp, nats, QuickCheck, quickcheck-instances, semigroups - , tagged, template-haskell, text, th-abstraction, th-lift - , transformers, transformers-compat, void - }: - mkDerivation { - pname = "text-show"; version = "3.7.5"; sha256 = "1by89i3c6qyjh7jjld06wb2sphb236rbvwb1mmvq8f6mxliiyf1r"; revision = "1"; @@ -212101,48 +207705,11 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; description = "Efficient conversion of values into Text"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-show-instances" = callPackage ({ mkDerivation, base, base-compat-batteries, bifunctors, binary , containers, directory, generic-deriving, ghc-boot-th, ghc-prim - , haskeline, hoopl, hpc, hspec, hspec-discover, old-locale - , old-time, pretty, QuickCheck, quickcheck-instances, random - , semigroups, tagged, template-haskell, terminfo, text, text-show - , th-orphans, time, transformers, transformers-compat, unix - , unordered-containers, vector, xhtml - }: - mkDerivation { - pname = "text-show-instances"; - version = "3.6.5"; - sha256 = "0hljqh31m3199w8ppcihggcya8cj4zmrav5z6fvcn6xn2hzz1cql"; - revision = "2"; - editedCabalFile = "1lqvwm9ciazk13jabyr81rl4hsmwksjmks7ckxrdgz3jk201yr6i"; - libraryHaskellDepends = [ - base base-compat-batteries bifunctors binary containers directory - ghc-boot-th haskeline hoopl hpc old-locale old-time pretty random - semigroups tagged template-haskell terminfo text text-show time - transformers transformers-compat unix unordered-containers vector - xhtml - ]; - testHaskellDepends = [ - base base-compat-batteries bifunctors binary containers directory - generic-deriving ghc-boot-th ghc-prim haskeline hoopl hpc hspec - old-locale old-time pretty QuickCheck quickcheck-instances random - tagged template-haskell terminfo text-show th-orphans time - transformers transformers-compat unix unordered-containers vector - xhtml - ]; - testToolDepends = [ hspec-discover ]; - description = "Additional instances for text-show"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "text-show-instances_3_7" = callPackage - ({ mkDerivation, base, base-compat-batteries, bifunctors, binary - , containers, directory, generic-deriving, ghc-boot-th, ghc-prim , haskeline, hpc, hspec, hspec-discover, old-locale, old-time , pretty, QuickCheck, quickcheck-instances, random, semigroups , tagged, template-haskell, terminfo, text, text-show, th-orphans @@ -212492,10 +208059,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim, template-haskell }: mkDerivation { pname = "th-abstraction"; - version = "0.2.8.0"; - sha256 = "0n17w4q2ykd0nica4sck2wng6md56rfad8x0icl0l8vnzb9nn4ya"; - revision = "1"; - editedCabalFile = "0yr4bj9ypbls0ysmwrgn2nsjb1xpsb12bjaiwbkzp6nf3kljwnnv"; + version = "0.2.10.0"; + sha256 = "1bql46ylr111g0pncdsf5mbhn6cpaw9xlqby89bz417dlk5gzny9"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -212600,28 +208165,6 @@ self: { }: mkDerivation { pname = "th-desugar"; - version = "1.8"; - sha256 = "0nbsgf3lxmjj43f1xdjb1z486h8av47mym6v1y5pzdv39wgiykdv"; - revision = "1"; - editedCabalFile = "13jvl6ijxjwbd7df0cq5pnijs3wrs8x5r9ykyyj180dak66909wd"; - libraryHaskellDepends = [ - base containers mtl syb template-haskell th-expand-syns th-lift - th-orphans - ]; - testHaskellDepends = [ - base containers hspec HUnit mtl syb template-haskell th-expand-syns - th-lift th-orphans - ]; - description = "Functions to desugar Template Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-desugar_1_9" = callPackage - ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb - , template-haskell, th-expand-syns, th-lift, th-orphans - }: - mkDerivation { - pname = "th-desugar"; version = "1.9"; sha256 = "1vxg0jvc239ngmv53yx564b7wkgd0b10xvx5phxvnnpm9n2pljpi"; libraryHaskellDepends = [ @@ -212634,7 +208177,6 @@ self: { ]; description = "Functions to desugar Template Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-dict-discovery" = callPackage @@ -212865,27 +208407,6 @@ self: { }) {}; "th-printf" = callPackage - ({ mkDerivation, ansi-wl-pprint, attoparsec, base, bytestring - , charset, containers, criterion, hspec, HUnit, QuickCheck - , template-haskell, text, transformers, trifecta, utf8-string - }: - mkDerivation { - pname = "th-printf"; - version = "0.5.1"; - sha256 = "0dgi93pb3zci1isxjmnzhn6apm4pyg12ayz8l1gxlilli8q1z4l6"; - libraryHaskellDepends = [ - ansi-wl-pprint attoparsec base charset containers template-haskell - text transformers trifecta utf8-string - ]; - testHaskellDepends = [ - base bytestring hspec HUnit QuickCheck template-haskell text - ]; - benchmarkHaskellDepends = [ base criterion text ]; - description = "Compile-time printf"; - license = stdenv.lib.licenses.mit; - }) {}; - - "th-printf_0_6_0" = callPackage ({ mkDerivation, base, charset, containers, hspec, HUnit , microlens-platform, mtl, parsec, QuickCheck, semigroups , template-haskell, th-lift, transformers @@ -212903,7 +208424,6 @@ self: { ]; description = "Quasiquoters for printf"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-reify-compat" = callPackage @@ -213290,6 +208810,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "thread-hierarchy_0_3_0_1" = callPackage + ({ mkDerivation, base, containers, hspec, stm }: + mkDerivation { + pname = "thread-hierarchy"; + version = "0.3.0.1"; + sha256 = "0d2wbm75f59vj1h18afdhb1wqyclv5gpgj6pyrhbcnf7aa2490c1"; + libraryHaskellDepends = [ base containers stm ]; + testHaskellDepends = [ base containers hspec stm ]; + description = "Simple Haskel thread management in hierarchical manner"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "thread-local-storage" = callPackage ({ mkDerivation, atomic-primops, base, containers, criterion }: mkDerivation { @@ -213728,26 +209261,6 @@ self: { }: mkDerivation { pname = "tibetan-utils"; - version = "0.1.1.5"; - sha256 = "09bqix2a2js98rhp748qx2i0vnxya3c6zvpjizbbnf5fwpspy01q"; - revision = "2"; - editedCabalFile = "17zyhdxwnq85kr60bnxirmyvw3b1679j5mhm3i30ri65896pjdwf"; - libraryHaskellDepends = [ - base composition-prelude either megaparsec text text-show - ]; - testHaskellDepends = [ - base hspec hspec-megaparsec megaparsec text - ]; - description = "Parse and display tibetan numerals"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tibetan-utils_0_1_1_9" = callPackage - ({ mkDerivation, base, composition-prelude, either, hspec - , hspec-megaparsec, megaparsec, text, text-show - }: - mkDerivation { - pname = "tibetan-utils"; version = "0.1.1.9"; sha256 = "04xpncn9nnc51mzyvw1naydk47acbpkzpxipq1fgvvgclzda2gn8"; libraryHaskellDepends = [ @@ -213758,7 +209271,6 @@ self: { ]; description = "Parse and display tibetan numerals"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tic-tac-toe" = callPackage @@ -213826,19 +209338,19 @@ self: { }) {}; "tidal" = callPackage - ({ mkDerivation, base, colour, containers, hashable, hosc - , mersenne-random-pure64, monad-loops, mtl, parsec, safe, tasty - , tasty-hunit, text, time, websockets + ({ mkDerivation, base, bifunctors, colour, containers, hashable + , hosc, microspec, monad-loops, mtl, mwc-random, network, parsec + , random, safe, text, time, vector }: mkDerivation { pname = "tidal"; - version = "0.9.10"; - sha256 = "1fgana79fwmn2s3b50vs9wlri6z4f2b8lad5m4n4ggc4rginvlkw"; + version = "1.0.5"; + sha256 = "07wx1p2avr731xmi5i0sx4k7xp4ayszz3j32y2i83wnv5kvf8szs"; libraryHaskellDepends = [ - base colour containers hashable hosc mersenne-random-pure64 - monad-loops mtl parsec safe text time websockets + base bifunctors colour containers hashable hosc monad-loops mtl + mwc-random network parsec random safe text time vector ]; - testHaskellDepends = [ base tasty tasty-hunit ]; + testHaskellDepends = [ base containers microspec parsec ]; description = "Pattern language for improvised music"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -215490,6 +211002,8 @@ self: { pname = "tokenizer-monad"; version = "0.1.0.0"; sha256 = "1n31n3wql93ljjgzfxpl5qd7kdb3dmr00yw0sz0wkkfgh2id1m99"; + revision = "1"; + editedCabalFile = "0ahl0aj1xrpnd8m7aa9bp94lid0ypnmwi4cishrr1ixnwl2bdlnx"; libraryHaskellDepends = [ base text ]; description = "An efficient and easy-to-use tokenizer monad"; license = stdenv.lib.licenses.gpl3; @@ -215598,34 +211112,6 @@ self: { }) {}; "tomland" = callPackage - ({ mkDerivation, base, hashable, hedgehog, hspec-megaparsec - , megaparsec, mtl, parser-combinators, tasty, tasty-discover - , tasty-hedgehog, tasty-hspec, text, time, transformers - , unordered-containers - }: - mkDerivation { - pname = "tomland"; - version = "0.3.1"; - sha256 = "0kpgcqix32m0nik54rynpphm4mpd8r05mspypjiwj9sidjxn11gw"; - revision = "1"; - editedCabalFile = "0pxc2065zjvsw3qwxhj2iw4d08f4j6y40nr51k6nxkz1px855gyk"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base hashable megaparsec mtl parser-combinators text time - transformers unordered-containers - ]; - executableHaskellDepends = [ base text time unordered-containers ]; - testHaskellDepends = [ - base hedgehog hspec-megaparsec megaparsec tasty tasty-hedgehog - tasty-hspec text time unordered-containers - ]; - testToolDepends = [ tasty-discover ]; - description = "TOML parser"; - license = stdenv.lib.licenses.mpl20; - }) {}; - - "tomland_0_5_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , gauge, hashable, hedgehog, hspec-megaparsec, htoml , htoml-megaparsec, megaparsec, mtl, parsec, parser-combinators @@ -215653,7 +211139,6 @@ self: { ]; description = "Bidirectional TOML parser"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tomlcheck" = callPackage @@ -217245,26 +212730,6 @@ self: { }: mkDerivation { pname = "triplesec"; - version = "0.1.2.0"; - sha256 = "0qvhsn5l35mmm71j5g0kv955hfjyzywvwgnjfjl8illgf2g79f46"; - libraryHaskellDepends = [ - base cryptonite memory mtl transformers - ]; - testHaskellDepends = [ - base bytestring doctest memory QuickCheck tasty tasty-hunit - tasty-quickcheck - ]; - description = "TripleSec is a simple, triple-paranoid, symmetric encryption library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "triplesec_0_2_2_0" = callPackage - ({ mkDerivation, base, bytestring, cryptonite, doctest, memory, mtl - , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, transformers - }: - mkDerivation { - pname = "triplesec"; version = "0.2.2.0"; sha256 = "1gxks45hjr3a1lnr2v75cl0iwsmlzaq3yzd3p9s0pn5227f34zh7"; libraryHaskellDepends = [ @@ -217985,8 +213450,8 @@ self: { }: mkDerivation { pname = "turtle"; - version = "1.5.12"; - sha256 = "0hacgsgs64fgp8k562gyly8i19zz18fj0v1v2m5g26vaj356ys5k"; + version = "1.5.13"; + sha256 = "1124yhw0l8924cwkmap1qn2z0hf4vn3r73h4pmi9icahg8zpc1hg"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions foldl hostname managed optional-args @@ -219052,6 +214517,8 @@ self: { pname = "type-level-sets"; version = "0.8.9.0"; sha256 = "1acsr7g9ssli9yil9kws47gc6h3csmk2afncyki41pipa1vsriv4"; + revision = "1"; + editedCabalFile = "0cc0ws2plharq0gvindgmkp1fs82zd43zijkh7wf0ilfnr2l17z2"; libraryHaskellDepends = [ base ghc-prim ]; description = "Type-level sets and finite maps (with value-level counterparts)"; license = stdenv.lib.licenses.bsd3; @@ -219087,8 +214554,8 @@ self: { }: mkDerivation { pname = "type-map"; - version = "0.1.3.0"; - sha256 = "146kc36z6fljcgmgl9vii1pmf3hs80v2vz21r84p823znrqjs8gc"; + version = "0.1.5.0"; + sha256 = "12kamygfjaja0bk9fbc658hrr5zh4iadq3m1hwxfkk0gkr98pw0b"; libraryHaskellDepends = [ base containers ghc-prim vector ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit @@ -219116,27 +214583,6 @@ self: { }) {}; "type-of-html" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, criterion, deepseq - , double-conversion, ghc, ghc-paths, ghc-prim, hspec, QuickCheck - , random, temporary, text, weigh - }: - mkDerivation { - pname = "type-of-html"; - version = "1.4.1.0"; - sha256 = "05c9rsbfivw7dsjmci7rnv08i4xmyg59kqghqi0f3dr5hrvas8dv"; - libraryHaskellDepends = [ - base bytestring double-conversion ghc-prim text - ]; - testHaskellDepends = [ base hspec QuickCheck ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring criterion deepseq ghc ghc-paths random - temporary text weigh - ]; - description = "High performance type driven html generation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "type-of-html_1_5_0_0" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers , criterion, deepseq, double-conversion, ghc, ghc-paths, ghc-prim , hspec, QuickCheck, random, temporary, text, weigh @@ -219155,7 +214601,6 @@ self: { ]; description = "High performance type driven html generation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-of-html-static" = callPackage @@ -219402,8 +214847,8 @@ self: { }: mkDerivation { pname = "typed-spreadsheet"; - version = "1.1.3"; - sha256 = "1y59kd92f5v116y26dlznvqi5kcb6y89rliwcs8ay9sk76606fa6"; + version = "1.1.4"; + sha256 = "16xbzwaiakimwwkbb0q0nxa08j7842z3894p04ijjvksllkdrlna"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -219527,8 +214972,8 @@ self: { }: mkDerivation { pname = "typelevel"; - version = "1.2.2"; - sha256 = "0baigk89rd5cdy35v3abvdwh7g11fnz2rpnzfy4ahr0q1lj395f5"; + version = "1.2.3"; + sha256 = "02bvzgl0331xa4pwdclw08wyq8canmw06ps3xvgvhb5miy93rrwz"; libraryHaskellDepends = [ base constraints convert exceptions lens mtl pretty pretty-show primitive transformers @@ -219670,8 +215115,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.7.1.1"; - sha256 = "1csg945w81qqa5fipj9fyzqy1f2n6blf55cjcqg7gm1k1jln768k"; + version = "0.7.2.1"; + sha256 = "1fdn7l9dayaii03n63cv3jgaqmblhskfyq3g3qrqw79z1jl755bk"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -220327,6 +215772,45 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "unbeliever" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, Cabal + , chronologique, containers, deepseq, directory, exceptions + , fingertree, gauge, hashable, hourglass, hspec, mtl, prettyprinter + , prettyprinter-ansi-terminal, safe-exceptions, scientific, stm + , template-haskell, terminal-size, text, text-short, transformers + , unix, unordered-containers, vector + }: + mkDerivation { + pname = "unbeliever"; + version = "0.8.0.0"; + sha256 = "1cq7w09320nz6jcdg8gcapbsajlihx1836502m36rgm4w9vbxvqi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bytestring Cabal chronologique containers deepseq + directory exceptions fingertree hashable hourglass mtl + prettyprinter prettyprinter-ansi-terminal safe-exceptions + scientific stm template-haskell terminal-size text text-short + transformers unix unordered-containers vector + ]; + testHaskellDepends = [ + aeson async base bytestring Cabal chronologique containers deepseq + directory exceptions fingertree hashable hourglass hspec mtl + prettyprinter prettyprinter-ansi-terminal safe-exceptions + scientific stm template-haskell terminal-size text text-short + transformers unix unordered-containers vector + ]; + benchmarkHaskellDepends = [ + aeson async base bytestring Cabal chronologique containers deepseq + directory exceptions fingertree gauge hashable hourglass mtl + prettyprinter prettyprinter-ansi-terminal safe-exceptions + scientific stm template-haskell terminal-size text text-short + transformers unix unordered-containers vector + ]; + description = "Opinionated Haskell Interoperability"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "unbound" = callPackage ({ mkDerivation, base, binary, containers, mtl, parsec, pretty , QuickCheck, RepLib, template-haskell, transformers @@ -220355,28 +215839,6 @@ self: { }: mkDerivation { pname = "unbound-generics"; - version = "0.3.4"; - sha256 = "01g8zhf9plgl3fcj57fkma3rkdwmh28rla3r1cr0bfmbd03q3fva"; - libraryHaskellDepends = [ - ansi-wl-pprint base containers contravariant deepseq exceptions mtl - profunctors template-haskell transformers transformers-compat - ]; - testHaskellDepends = [ - base mtl QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ base criterion deepseq ]; - description = "Support for programming with names and binders using GHC Generics"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "unbound-generics_0_4_0" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, containers, contravariant - , criterion, deepseq, exceptions, mtl, profunctors, QuickCheck - , tasty, tasty-hunit, tasty-quickcheck, template-haskell - , transformers, transformers-compat - }: - mkDerivation { - pname = "unbound-generics"; version = "0.4.0"; sha256 = "04amv54wrabzdmlig1mxi51ikq1lmfcm504184y0nm0xjahfssmx"; libraryHaskellDepends = [ @@ -220389,7 +215851,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Support for programming with names and binders using GHC Generics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unbounded-delays" = callPackage @@ -220492,6 +215953,8 @@ self: { pname = "unescaping-print"; version = "0.1"; sha256 = "0a1ryvnpgsk668wagwwapksi7i9kbhhjfpqlvmg2z9kv1anr6mp5"; + revision = "1"; + editedCabalFile = "0w8fw1nymnj34lnm2q8nj1ymcbzw6q6jpp4c1h2w5b0q4rdw41jv"; libraryHaskellDepends = [ base ]; description = "Tiny package providing unescaping versions of show and print"; license = stdenv.lib.licenses.bsd3; @@ -221371,33 +216834,6 @@ self: { ({ mkDerivation, base, bytestring, containers, deepseq, doctest , gauge, ghc-prim, Glob, hashable, hedgehog, microlens , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog - , text, transformers, type-operators, unordered-containers - , utf8-string, vector - }: - mkDerivation { - pname = "universum"; - version = "1.2.0"; - sha256 = "0645gvj1p33d0fnlk09i74l11sv11bidyv44hyb2m0dls22hr89p"; - libraryHaskellDepends = [ - base bytestring containers deepseq ghc-prim hashable microlens - microlens-mtl mtl safe-exceptions stm text transformers - type-operators unordered-containers utf8-string vector - ]; - testHaskellDepends = [ - base bytestring doctest Glob hedgehog tasty tasty-hedgehog text - utf8-string - ]; - benchmarkHaskellDepends = [ - base containers gauge unordered-containers - ]; - description = "Custom prelude used in Serokell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "universum_1_5_0" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, doctest - , gauge, ghc-prim, Glob, hashable, hedgehog, microlens - , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog , text, transformers, unordered-containers, utf8-string, vector }: mkDerivation { @@ -221418,7 +216854,6 @@ self: { ]; description = "Custom prelude used in Serokell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unix_2_7_2_2" = callPackage @@ -221545,13 +216980,14 @@ self: { }) {}; "unix-time" = callPackage - ({ mkDerivation, base, binary, bytestring, doctest, hspec - , old-locale, old-time, QuickCheck, time + ({ mkDerivation, base, binary, bytestring, Cabal, cabal-doctest + , doctest, hspec, old-locale, old-time, QuickCheck, time }: mkDerivation { pname = "unix-time"; - version = "0.3.8"; - sha256 = "051slgpid5cxiaw203ky0ql3823h28fcjs08axkzd4265wrvv8fw"; + version = "0.4.3"; + sha256 = "0h95vmsk7qyk9nbgjm5vi32ikdw07p1z0l7k6b5hbsv3wavivm53"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base binary bytestring old-time ]; testHaskellDepends = [ base bytestring doctest hspec old-locale old-time QuickCheck time @@ -221560,14 +216996,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "unix-time_0_4_0" = callPackage - ({ mkDerivation, base, binary, bytestring, doctest, hspec - , old-locale, old-time, QuickCheck, time + "unix-time_0_4_4" = callPackage + ({ mkDerivation, base, binary, bytestring, Cabal, cabal-doctest + , doctest, hspec, old-locale, old-time, QuickCheck, time }: mkDerivation { pname = "unix-time"; - version = "0.4.0"; - sha256 = "0fb9mdg596db9wbxsr5m3zc3wasvwblb32fsva0zrac93c9rq51r"; + version = "0.4.4"; + sha256 = "1hgh7v2xcscd69hdbnijp0bh0h1gg9y4qygp7bzwapmlckk3cihx"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base binary bytestring old-time ]; testHaskellDepends = [ base bytestring doctest hspec old-locale old-time QuickCheck time @@ -221626,28 +217063,6 @@ self: { }) {}; "unliftio" = callPackage - ({ mkDerivation, async, base, deepseq, directory, filepath, hspec - , process, stm, time, transformers, unix, unliftio-core - }: - mkDerivation { - pname = "unliftio"; - version = "0.2.8.1"; - sha256 = "18v8rzm2nxpck5xvg8qixkarhliy16yswgvj6vbjzq8bn4n6nydz"; - revision = "1"; - editedCabalFile = "1zx2h1mnjcjszjdchg17gqrnj3d56x46947jm92snmdjw8x231wg"; - libraryHaskellDepends = [ - async base deepseq directory filepath process stm time transformers - unix unliftio-core - ]; - testHaskellDepends = [ - async base deepseq directory filepath hspec process stm time - transformers unix unliftio-core - ]; - description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; - license = stdenv.lib.licenses.mit; - }) {}; - - "unliftio_0_2_9_0" = callPackage ({ mkDerivation, async, base, deepseq, directory, filepath, gauge , hspec, process, QuickCheck, stm, time, transformers, unix , unliftio-core @@ -221670,7 +217085,6 @@ self: { ]; description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unliftio-core" = callPackage @@ -221889,6 +217303,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unpacked-maybe-numeric" = callPackage + ({ mkDerivation, base, primitive, QuickCheck, quickcheck-classes }: + mkDerivation { + pname = "unpacked-maybe-numeric"; + version = "0.1.0.0"; + sha256 = "19jz91jkbvnldy56kv9wb1nmbwvlxjh7nqlxc99nq6yi4whsh8gj"; + libraryHaskellDepends = [ base primitive ]; + testHaskellDepends = [ base QuickCheck quickcheck-classes ]; + description = "maybes of numeric values with fewer indirections"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "unpacked-these" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, QuickCheck , quickcheck-classes, these, unpacked-maybe @@ -222578,26 +218004,6 @@ self: { }: mkDerivation { pname = "urlpath"; - version = "9.0.0"; - sha256 = "1ysjhb42sk34j29xy7hgf9b4qp90p6hrkqcmwdalvsasbwk8kgwh"; - libraryHaskellDepends = [ - attoparsec-uri base exceptions mmorph monad-control - monad-control-aligned monad-logger mtl path path-extra resourcet - split strict text transformers transformers-base vector - ]; - description = "Painfully simple URL deployment"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "urlpath_9_0_1" = callPackage - ({ mkDerivation, attoparsec-uri, base, exceptions, mmorph - , monad-control, monad-control-aligned, monad-logger, mtl, path - , path-extra, resourcet, split, strict, text, transformers - , transformers-base, vector - }: - mkDerivation { - pname = "urlpath"; version = "9.0.1"; sha256 = "0acflpvb0imf2qc2gqbqziv4lk6a5p9gxkvbm0mv3kszqslh7rrg"; libraryHaskellDepends = [ @@ -223276,8 +218682,8 @@ self: { pname = "uuid-crypto"; version = "1.4.0.0"; sha256 = "191da0bdgzbpibh7v2n2cg13gkq2vchsybad0qy9qixk0rzi1cvn"; - revision = "4"; - editedCabalFile = "1rzvpkvjbvzwvks795998k8232pc41yvcblrq7f29abrvd0587xp"; + revision = "6"; + editedCabalFile = "146jxyrsnrcwsll6mhq8a67ms1wpbbbxmkbq7sh9wza6c4g2fbwy"; libraryHaskellDepends = [ base binary bytestring cryptoids cryptoids-class cryptoids-types exceptions uuid @@ -223438,6 +218844,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "vabal" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cassava, deepseq + , directory, filepath, http-client, http-client-tls, http-types + , optparse-applicative, process, tar, unix, vector + }: + mkDerivation { + pname = "vabal"; + version = "1.0.0"; + sha256 = "01sfg1rwh1qrawqpzn2b9fg415ha029lgfsrxy4xqkpdpxpkajrk"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring Cabal cassava directory filepath http-client + http-client-tls http-types vector + ]; + executableHaskellDepends = [ + base bytestring Cabal cassava directory filepath + optparse-applicative process + ]; + testHaskellDepends = [ + base bytestring Cabal deepseq directory filepath process tar unix + ]; + doHaddock = false; + description = "the cabal companion"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "vacuum" = callPackage ({ mkDerivation, array, base, containers, ghc-prim }: mkDerivation { @@ -223670,25 +219103,12 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "validity"; - version = "0.7.0.0"; - sha256 = "0xribw98amafihw87ddajk6vlirp7w9b26lrnjgq7jfm4710j95f"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec ]; - description = "Validity typeclass"; - license = stdenv.lib.licenses.mit; - }) {}; - - "validity_0_9_0_0" = callPackage - ({ mkDerivation, base, hspec }: - mkDerivation { - pname = "validity"; version = "0.9.0.0"; sha256 = "1rm0gw049v7f9i5rqn8f8ps4ksawmmggmhw9yclgh4qhhql7gz3q"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Validity typeclass"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validity-aeson" = callPackage @@ -223711,23 +219131,11 @@ self: { ({ mkDerivation, base, bytestring, validity }: mkDerivation { pname = "validity-bytestring"; - version = "0.3.0.2"; - sha256 = "0bwixp9fcblqy6b8kxvzg9l2i9lksn9g71243m2zcan1kh7a1qb2"; - libraryHaskellDepends = [ base bytestring validity ]; - description = "Validity instances for bytestring"; - license = stdenv.lib.licenses.mit; - }) {}; - - "validity-bytestring_0_4_0_0" = callPackage - ({ mkDerivation, base, bytestring, validity }: - mkDerivation { - pname = "validity-bytestring"; version = "0.4.0.0"; sha256 = "0zf722rm2s5p64bs1vl7fw1swa2svz2lk8w51bh235zds8bg11jc"; libraryHaskellDepends = [ base bytestring validity ]; description = "Validity instances for bytestring"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validity-containers" = callPackage @@ -224346,24 +219754,6 @@ self: { }) {}; "vector-algorithms" = callPackage - ({ mkDerivation, base, bytestring, containers, primitive - , QuickCheck, vector - }: - mkDerivation { - pname = "vector-algorithms"; - version = "0.7.0.4"; - sha256 = "0mfa8ig9v69l41p2vb5jl4qmaln5y1rlzarr2mlgm8g1nvq8qqdg"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base bytestring primitive vector ]; - testHaskellDepends = [ - base bytestring containers QuickCheck vector - ]; - description = "Efficient algorithms for vector arrays"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vector-algorithms_0_8_0_1" = callPackage ({ mkDerivation, base, bytestring, containers, mwc-random , primitive, QuickCheck, vector }: @@ -224378,7 +219768,6 @@ self: { benchmarkHaskellDepends = [ base mwc-random vector ]; description = "Efficient algorithms for vector arrays"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-binary" = callPackage @@ -224647,61 +220036,31 @@ self: { }) {}; "vector-sized" = callPackage - ({ mkDerivation, adjunctions, base, deepseq, distributive - , finite-typelits, indexed-list-literals, primitive, vector - }: - mkDerivation { - pname = "vector-sized"; - version = "1.0.4.0"; - sha256 = "1rdryc5ykqvdpjgx3a895cx2i14ixg0ryhppn89fjzhann79mgk4"; - libraryHaskellDepends = [ - adjunctions base deepseq distributive finite-typelits - indexed-list-literals primitive vector - ]; - description = "Size tagged vectors"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vector-sized_1_1_1_0" = callPackage ({ mkDerivation, adjunctions, base, comonad, deepseq, distributive - , finite-typelits, indexed-list-literals, primitive, vector + , finite-typelits, hashable, indexed-list-literals, primitive + , vector }: mkDerivation { pname = "vector-sized"; - version = "1.1.1.0"; - sha256 = "05rrfiy0zzcq5jmr1kfbpv1p6f35pqsd5k6zf78byznzjwk758nb"; + version = "1.2.0.0"; + sha256 = "04r43b30vayg56n88b5r3b5krh2kjxnqgmr4kx052bgpl8k6zh54"; libraryHaskellDepends = [ adjunctions base comonad deepseq distributive finite-typelits - indexed-list-literals primitive vector + hashable indexed-list-literals primitive vector ]; description = "Size tagged vectors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-space" = callPackage ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: mkDerivation { pname = "vector-space"; - version = "0.13"; - sha256 = "05yn93vnhzhpp2i6qb4b3dasvmpk71rab6vhssqvpb3qhdvxb482"; - revision = "2"; - editedCabalFile = "1p9vibym0ggr1rjyak0wphswdl4vik2b2w85afgvyj9zn32w28bw"; - libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; - description = "Vector & affine spaces, linear maps, and derivatives"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vector-space_0_15" = callPackage - ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: - mkDerivation { - pname = "vector-space"; version = "0.15"; sha256 = "03swlbn0x8gfb7bilxmh3zckprjc6v64bildmhwzlimjvd1v8jb8"; libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; description = "Vector & affine spaces, linear maps, and derivatives"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-space-map" = callPackage @@ -224793,8 +220152,8 @@ self: { }: mkDerivation { pname = "vector-text"; - version = "1.1.5"; - sha256 = "1gd7dg9icr1211rf298ny60yjgyyxbxa62l16q28yd5z160sr3ir"; + version = "1.1.6"; + sha256 = "14ms8ach15c1pyaih92qi703vj9aanbrmcsfwzxb55vwfpbbm2f4"; libraryHaskellDepends = [ base binary prologue text vector vector-binary-instances ]; @@ -224997,24 +220356,6 @@ self: { }: mkDerivation { pname = "versions"; - version = "3.4.0.1"; - sha256 = "0r7crjnzllip9ya3lgf7cckfgz57daq379sh19z7adlzj8rxhimg"; - libraryHaskellDepends = [ base deepseq hashable megaparsec text ]; - testHaskellDepends = [ - base base-prelude checkers megaparsec microlens QuickCheck tasty - tasty-hunit tasty-quickcheck text - ]; - description = "Types and parsers for software version numbers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "versions_3_5_0" = callPackage - ({ mkDerivation, base, base-prelude, checkers, deepseq, hashable - , megaparsec, microlens, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, text - }: - mkDerivation { - pname = "versions"; version = "3.5.0"; sha256 = "1g6db0ah78yk1m5wyxp0az7bzlbxsfkychqjcj423wzx90z7ww4w"; revision = "1"; @@ -225026,7 +220367,6 @@ self: { ]; description = "Types and parsers for software version numbers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vfr-waypoints" = callPackage @@ -225141,8 +220481,8 @@ self: { }: mkDerivation { pname = "viewprof"; - version = "0.0.0.25"; - sha256 = "0k3mlivbkir5jwqkpbka2fvihkw2ck4549kvl1hcqr1h48zjr5ws"; + version = "0.0.0.26"; + sha256 = "11nd137135jq19l58g5fkxzznbv2hdrfyy231fy9s8hifm2rz14d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -225283,28 +220623,6 @@ self: { }) {}; "vinyl" = callPackage - ({ mkDerivation, array, base, criterion, doctest, ghc-prim, hspec - , lens, linear, microlens, mwc-random, primitive - , should-not-typecheck, singletons, tagged, vector - }: - mkDerivation { - pname = "vinyl"; - version = "0.8.1.1"; - sha256 = "0gwgsk7xf64291s6crvzlry1bvcvwaqmvxpl605id4bb099kqfnh"; - revision = "1"; - editedCabalFile = "0mb694y03r185r0p473zh6bl4j0l4na9km0r3x8czjil7x9yb0vr"; - libraryHaskellDepends = [ array base ghc-prim ]; - testHaskellDepends = [ - base doctest hspec lens microlens should-not-typecheck singletons - ]; - benchmarkHaskellDepends = [ - base criterion linear microlens mwc-random primitive tagged vector - ]; - description = "Extensible Records"; - license = stdenv.lib.licenses.mit; - }) {}; - - "vinyl_0_10_0_1" = callPackage ({ mkDerivation, aeson, array, base, criterion, doctest, ghc-prim , hspec, lens, lens-aeson, linear, microlens, mtl, mwc-random , primitive, should-not-typecheck, singletons, tagged, text @@ -225324,7 +220642,6 @@ self: { ]; description = "Extensible Records"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vinyl-gl" = callPackage @@ -225553,25 +220870,6 @@ self: { }) {}; "vivid" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , hashable, MonadRandom, mtl, network, process, random - , random-shuffle, split, stm, time, transformers, utf8-string - , vivid-osc, vivid-supercollider - }: - mkDerivation { - pname = "vivid"; - version = "0.3.0.2"; - sha256 = "16dvg5yq26fkrq01mn3c4byz32xld3alxa8h9m16gi4g04f99q00"; - libraryHaskellDepends = [ - base bytestring containers directory filepath hashable MonadRandom - mtl network process random random-shuffle split stm time - transformers utf8-string vivid-osc vivid-supercollider - ]; - description = "Sound synthesis with SuperCollider"; - license = "GPL"; - }) {}; - - "vivid_0_4_2_3" = callPackage ({ mkDerivation, base, binary, bytestring, containers, directory , filepath, hashable, MonadRandom, mtl, network, process, random , random-shuffle, split, stm, time, transformers, utf8-string @@ -225588,23 +220886,9 @@ self: { ]; description = "Sound synthesis with SuperCollider"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vivid-osc" = callPackage - ({ mkDerivation, base, binary, bytestring, cereal, microspec, time - }: - mkDerivation { - pname = "vivid-osc"; - version = "0.3.0.0"; - sha256 = "152ai2j75hbjvws9k1ii2h32nnj8ak44agwpdcfkdf7nc1fgha57"; - libraryHaskellDepends = [ base binary bytestring cereal time ]; - testHaskellDepends = [ base bytestring cereal microspec time ]; - description = "Open Sound Control encode/decode"; - license = "GPL"; - }) {}; - - "vivid-osc_0_5_0_0" = callPackage ({ mkDerivation, base, bytestring, cereal, microspec, time }: mkDerivation { pname = "vivid-osc"; @@ -225614,7 +220898,6 @@ self: { testHaskellDepends = [ base bytestring cereal microspec time ]; description = "Open Sound Control encode/decode"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vivid-supercollider" = callPackage @@ -225623,27 +220906,8 @@ self: { }: mkDerivation { pname = "vivid-supercollider"; - version = "0.3.0.0"; - sha256 = "15fkqjf3hfhc262slr5znh4f320lw68h318wr4sdprml0sy9xdw3"; - libraryHaskellDepends = [ - base binary bytestring cereal split utf8-string vivid-osc - ]; - testHaskellDepends = [ - base binary bytestring cereal microspec QuickCheck utf8-string - vivid-osc - ]; - description = "Implementation of SuperCollider server specifications"; - license = "GPL"; - }) {}; - - "vivid-supercollider_0_4_1_1" = callPackage - ({ mkDerivation, base, binary, bytestring, cereal, microspec - , QuickCheck, split, utf8-string, vivid-osc - }: - mkDerivation { - pname = "vivid-supercollider"; - version = "0.4.1.1"; - sha256 = "1qf4hnslcmqkahxs5d55iljiybn46is41a5kikjd2vnbns4va0fb"; + version = "0.4.1.2"; + sha256 = "1jr132l3zgwxz3vnnqbm1ycms29izsbn6kdddq7204zz9y7hx96j"; libraryHaskellDepends = [ base binary bytestring cereal split utf8-string vivid-osc ]; @@ -225653,7 +220917,6 @@ self: { ]; description = "Implementation of SuperCollider server specifications"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vk-aws-route53" = callPackage @@ -225877,40 +221140,6 @@ self: { }: mkDerivation { pname = "vty"; - version = "5.21"; - sha256 = "0nvsjc5awr6kwrsv02sz64vgza6g8phk9g6g07dx1sm2yfsvhyas"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-builder bytestring containers deepseq directory filepath - hashable microlens microlens-mtl microlens-th mtl parallel parsec - stm terminfo text transformers unix utf8-string vector - ]; - executableHaskellDepends = [ - base containers microlens microlens-mtl mtl - ]; - testHaskellDepends = [ - base blaze-builder bytestring Cabal containers deepseq HUnit - microlens microlens-mtl mtl QuickCheck quickcheck-assertions random - smallcheck stm string-qq terminfo test-framework - test-framework-hunit test-framework-smallcheck text unix - utf8-string vector - ]; - description = "A simple terminal UI library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vty_5_25_1" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers - , deepseq, directory, filepath, hashable, HUnit, microlens - , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck - , quickcheck-assertions, random, smallcheck, stm, string-qq - , terminfo, test-framework, test-framework-hunit - , test-framework-smallcheck, text, transformers, unix, utf8-string - , vector - }: - mkDerivation { - pname = "vty"; version = "5.25.1"; sha256 = "1x15jlf9x6c8nhdbp6alr17vigclkaf5qy5jpp14g5n568p7karw"; isLibrary = true; @@ -225932,7 +221161,6 @@ self: { ]; description = "A simple terminal UI library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vty-examples" = callPackage @@ -226040,8 +221268,8 @@ self: { }: mkDerivation { pname = "waargonaut"; - version = "0.4.2.0"; - sha256 = "19zfzff6cp57xv220yyxfi0j36x1qic7v4sa93yclshyjmhm7vnm"; + version = "0.5.0.0"; + sha256 = "0xa9ql4583z9cwkn76sf41igk0ny8yp8fcgs6lwbk7kfbb54kk4b"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bifunctors bytestring containers contravariant digit @@ -226616,20 +221844,38 @@ self: { }) {}; "wai-logger" = callPackage - ({ mkDerivation, base, byteorder, bytestring, case-insensitive - , doctest, fast-logger, http-types, network, unix, unix-time, wai + ({ mkDerivation, base, byteorder, bytestring, Cabal, cabal-doctest + , doctest, fast-logger, http-types, network, wai }: mkDerivation { pname = "wai-logger"; - version = "2.3.2"; - sha256 = "0w5ldq4gplc16zzk5ikmbbjw79imaqvw8p6lylaw3hlsbn3zzm4d"; + version = "2.3.3"; + sha256 = "1i200kn3cnd1b3hf53982y6rddwrf3z1acbclf1xc15632df73wx"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base byteorder bytestring fast-logger http-types network wai + ]; + testHaskellDepends = [ base doctest ]; + description = "A logging system for WAI"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "wai-logger_2_3_4" = callPackage + ({ mkDerivation, base, byteorder, bytestring, Cabal, cabal-doctest + , doctest, fast-logger, http-types, network, wai + }: + mkDerivation { + pname = "wai-logger"; + version = "2.3.4"; + sha256 = "004ng1r1qij0frlsyps0nz9b0ijn0zlk3i6qbb7lq1f4209ikzlk"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base byteorder bytestring case-insensitive fast-logger http-types - network unix unix-time wai + base byteorder bytestring fast-logger http-types network wai ]; testHaskellDepends = [ base doctest ]; description = "A logging system for WAI"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-logger-buffered" = callPackage @@ -227850,6 +223096,8 @@ self: { pname = "warc"; version = "1.0.4"; sha256 = "1mxfm8kdvm0l1lnzma4n9mriz94ypckxqcz1f34fa3n1j3ckc45b"; + revision = "1"; + editedCabalFile = "1mdd3r1lg92rchy1zv4jwvrsn6x3wnplhbnwavpx0nivf3xp7m8q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -228576,33 +223824,6 @@ self: { ({ mkDerivation, aeson, async, base, basement, bytestring, cereal , cryptonite, data-default, exceptions, generics-sop, hspec , hspec-contrib, hspec-discover, hspec-expectations, http-client - , machines, memory, mtl, parsec, split, stm, tagged - , template-haskell, text, time, transformers - }: - mkDerivation { - pname = "web3"; - 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 - tagged template-haskell text transformers - ]; - testHaskellDepends = [ - async base bytestring data-default generics-sop hspec hspec-contrib - hspec-discover hspec-expectations memory split stm tagged text time - transformers - ]; - testToolDepends = [ hspec-discover ]; - description = "Ethereum API for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "web3_0_8_2_1" = callPackage - ({ mkDerivation, aeson, async, base, basement, bytestring, cereal - , cryptonite, data-default, exceptions, generics-sop, hspec - , hspec-contrib, hspec-discover, hspec-expectations, http-client , http-client-tls, machines, memory, microlens, microlens-aeson , microlens-mtl, microlens-th, mtl, OneTuple, parsec, random , relapse, secp256k1-haskell, split, stm, tagged, template-haskell @@ -229979,22 +225200,6 @@ self: { "witherable" = callPackage ({ mkDerivation, base, base-orphans, containers, hashable - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "witherable"; - version = "0.2"; - sha256 = "0bga2vx3bkg1m6pwdvnxbqjbljpwr6mxyq94fi87j3zy08mmmnwx"; - libraryHaskellDepends = [ - base base-orphans containers hashable transformers - unordered-containers vector - ]; - description = "filterable traversable"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "witherable_0_3" = callPackage - ({ mkDerivation, base, base-orphans, containers, hashable , transformers, transformers-compat, unordered-containers, vector }: mkDerivation { @@ -230007,7 +225212,6 @@ self: { ]; description = "filterable traversable"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "witness" = callPackage @@ -230516,6 +225720,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wordpress-auth" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, cookie + , cryptohash-md5, cryptohash-sha256, hs-php-session, http-types + , mtl, text, time, uri-encode + }: + mkDerivation { + pname = "wordpress-auth"; + version = "1.0.0.0"; + sha256 = "150rri8lrl6j3f9q7wc34ajg06rakgk8a5npzz7vdap64994wy5c"; + libraryHaskellDepends = [ + base base16-bytestring bytestring cookie cryptohash-md5 + cryptohash-sha256 hs-php-session http-types mtl text time + uri-encode + ]; + description = "Validate Wordpress Cookies & Nonces; Build Wordpress Hashes & Salts"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "words" = callPackage ({ mkDerivation, base, directory, text }: mkDerivation { @@ -230847,44 +226069,6 @@ self: { }: mkDerivation { pname = "wreq"; - version = "0.5.3.0"; - sha256 = "1bi78y0jzm8mvwbfc4mphg8iyjz5v1f4ziqpk1dskvb1f3ysw3d9"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson attoparsec authenticate-oauth base base16-bytestring - bytestring case-insensitive containers cryptonite exceptions - ghc-prim hashable http-client http-client-tls http-types lens - lens-aeson memory mime-types psqueues template-haskell text time - time-locale-compat unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-pretty base base64-bytestring bytestring - case-insensitive containers directory doctest filepath hashable - http-client http-types HUnit lens lens-aeson network-info - QuickCheck snap-core snap-server temporary test-framework - test-framework-hunit test-framework-quickcheck2 text time - transformers unix-compat unordered-containers uuid vector - ]; - description = "An easy-to-use HTTP client library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wreq_0_5_3_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec - , authenticate-oauth, base, base16-bytestring, base64-bytestring - , bytestring, Cabal, cabal-doctest, case-insensitive, containers - , cryptonite, directory, doctest, exceptions, filepath, ghc-prim - , hashable, http-client, http-client-tls, http-types, HUnit, lens - , lens-aeson, memory, mime-types, network-info, psqueues - , QuickCheck, snap-core, snap-server, template-haskell, temporary - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, time, time-locale-compat, transformers, unix-compat - , unordered-containers, uuid, vector - }: - mkDerivation { - pname = "wreq"; version = "0.5.3.1"; sha256 = "1i2f2bxx84l8qzkz9v3qhx5sbl78ysc3vqadfhrxk3h0ljklwfz3"; isLibrary = true; @@ -230907,7 +226091,6 @@ self: { ]; description = "An easy-to-use HTTP client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wreq-sb" = callPackage @@ -231123,31 +226306,6 @@ self: { }: mkDerivation { pname = "ws"; - version = "0.0.4"; - sha256 = "00jz7a7x260ix2rg46bmp6c3rjnra9c7j4p0in7cpk2iap28106q"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - async attoparsec-uri base bytestring exceptions haskeline mtl - network text websockets wuss - ]; - executableHaskellDepends = [ - async attoparsec attoparsec-uri base bytestring exceptions - haskeline mtl network optparse-applicative strict text vector - websockets wuss - ]; - description = "A simple CLI utility for interacting with a websocket"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "ws_0_0_5" = callPackage - ({ mkDerivation, async, attoparsec, attoparsec-uri, base - , bytestring, exceptions, haskeline, mtl, network - , optparse-applicative, strict, text, vector, websockets, wuss - }: - mkDerivation { - pname = "ws"; version = "0.0.5"; sha256 = "1qj4yq2z7ml88jgcqfy8i1cn1cbmdv56vg7v6b2inh4b4h41yax6"; isLibrary = true; @@ -231232,8 +226390,8 @@ self: { }: mkDerivation { pname = "wsjtx-udp"; - version = "0.1.3.4"; - sha256 = "0krn5ams62dh4f0gfyx7ss7ymm438s9bf4m329pqnhj11p2fiazf"; + version = "0.1.3.5"; + sha256 = "1x2975pj2i0c4w1s00s4qc24sa24y29magilfxbhy8v1w1hfqcv7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -233119,8 +228277,8 @@ self: { }: mkDerivation { pname = "xmobar"; - version = "0.29.3"; - sha256 = "1bg8nj9k8r7i7328djnf6bgqzdq7lgx9yjgvl9fqq76bkxzkgx0a"; + version = "0.29.4"; + sha256 = "08kis4pxw073cixpfv9ccnarxl425mxszsni5cqzbns1gl8qydsr"; configureFlags = [ "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus" "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris" @@ -233292,8 +228450,8 @@ self: { }: mkDerivation { pname = "xmonad-extras"; - version = "0.15"; - sha256 = "0yi6p4s9vl92bnr0sbcvm80x37n4fyglm4x3lrc9l8mapbpxjr02"; + version = "0.15.1"; + sha256 = "1x61s81rnmh26i8bwd7jlpsa5jn7fsas2fsibg46bsszs5ln225q"; configureFlags = [ "-f-with_hlist" "-fwith_parsec" "-fwith_split" ]; @@ -233901,6 +229059,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "yam" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, data-default + , hspec, monad-logger, mtl, persistent, persistent-sqlite + , QuickCheck, random, reflection, resource-pool, resourcet, salak + , servant-server, servant-swagger, servant-swagger-ui, text, time + , unliftio-core, vault, wai, wai-extra, warp + }: + mkDerivation { + pname = "yam"; + version = "0.4.0"; + sha256 = "1kapdqz6pn1x95xffm5w0wclj3hdyazmvvgmgir8kjlchfmdanmi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit data-default monad-logger mtl + persistent random reflection resource-pool resourcet salak + servant-server servant-swagger servant-swagger-ui text + unliftio-core vault wai warp + ]; + executableHaskellDepends = [ + aeson base bytestring conduit data-default monad-logger mtl + persistent persistent-sqlite random reflection resource-pool + resourcet salak servant-server servant-swagger servant-swagger-ui + text time unliftio-core vault wai wai-extra warp + ]; + testHaskellDepends = [ + aeson base bytestring conduit data-default hspec monad-logger mtl + persistent QuickCheck random reflection resource-pool resourcet + salak servant-server servant-swagger servant-swagger-ui text + unliftio-core vault wai warp + ]; + description = "Yam Web"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "yam-app" = callPackage ({ mkDerivation, aeson, base, conduit, containers, ctrie , data-default, directory, exceptions, fast-logger, monad-control @@ -234073,34 +229266,6 @@ self: { "yaml" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring - , conduit, containers, directory, filepath, hspec, HUnit, mockery - , resourcet, scientific, semigroups, template-haskell, temporary - , text, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "yaml"; - version = "0.8.32"; - sha256 = "0cbsyh4ilvjzq1q7pxls43k6pdqxg1l85xzibcwpbvmlvrizh86w"; - configureFlags = [ "-f-system-libyaml" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring conduit containers directory - filepath resourcet scientific semigroups template-haskell text - transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson attoparsec base base-compat bytestring conduit containers - directory filepath hspec HUnit mockery resourcet scientific - semigroups template-haskell temporary text transformers - unordered-containers vector - ]; - description = "Support for parsing and rendering YAML documents"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "yaml_0_11_0_0" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring , conduit, containers, directory, filepath, hspec, HUnit, libyaml , mockery, mtl, raw-strings-qq, resourcet, scientific , template-haskell, temporary, text, transformers @@ -234126,7 +229291,6 @@ self: { ]; description = "Support for parsing and rendering YAML documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yaml-combinators" = callPackage @@ -235286,8 +230450,8 @@ self: { pname = "yesod-bin"; version = "1.6.0.3"; sha256 = "1p5f6bl4gynm47m1xg1x1xh9nz913i83iprh2xd207359idjknz4"; - revision = "3"; - editedCabalFile = "0v3bwg26ghxa1wdvwyvrffd8wwxhv1qk9g8f64ax1n8gz53k6an7"; + revision = "4"; + editedCabalFile = "1iw9m3z6m4n9dlwamf1kwr7pp2wpk6awf1m63zjkgw5j4vwxlcpg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -235762,23 +230926,11 @@ self: { ({ mkDerivation, base, text, yesod-core, yesod-form }: mkDerivation { pname = "yesod-form-bootstrap4"; - version = "1.0.2"; - sha256 = "0y68k6xnb8i7wa2c1c0msc3p69azs4z0iwjdgkr0kaqzahw56scq"; - libraryHaskellDepends = [ base text yesod-core yesod-form ]; - description = "renderBootstrap4"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-form-bootstrap4_2_1_0" = callPackage - ({ mkDerivation, base, text, yesod-core, yesod-form }: - mkDerivation { - pname = "yesod-form-bootstrap4"; version = "2.1.0"; sha256 = "1wf1jbhfs4f75977rnrrkahgysxqrcas4qi1ay1ggq29hp1z4hic"; libraryHaskellDepends = [ base text yesod-core yesod-form ]; description = "renderBootstrap4"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-form-bulma" = callPackage @@ -236372,22 +231524,6 @@ self: { }) {}; "yesod-recaptcha2" = callPackage - ({ mkDerivation, base, classy-prelude-yesod, http-conduit - , yesod-auth - }: - mkDerivation { - pname = "yesod-recaptcha2"; - version = "0.2.4"; - sha256 = "1aw104i2v9m6dc5z5iqzihjfybfxg90l0rj0pazb672qzp9yqj18"; - libraryHaskellDepends = [ - base classy-prelude-yesod http-conduit yesod-auth - ]; - description = "yesod recaptcha2"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "yesod-recaptcha2_0_3_0" = callPackage ({ mkDerivation, aeson, base, classy-prelude, http-conduit , yesod-auth, yesod-core, yesod-form }: @@ -237176,33 +232312,6 @@ self: { }: mkDerivation { pname = "yi-language"; - version = "0.17.1"; - sha256 = "17mnjfhxr6vhpfx7l4zg606f2vffjr39ga4j5qmnp7cf4y5n5vja"; - libraryHaskellDepends = [ - array base binary containers data-default hashable - microlens-platform oo-prototypes pointedlist regex-base regex-tdfa - template-haskell transformers-base unordered-containers - ]; - libraryToolDepends = [ alex ]; - testHaskellDepends = [ - array base binary containers data-default hashable - microlens-platform pointedlist regex-base regex-tdfa tasty - tasty-hspec tasty-quickcheck template-haskell transformers-base - unordered-containers - ]; - description = "Collection of language-related Yi libraries"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "yi-language_0_18_0" = callPackage - ({ mkDerivation, alex, array, base, binary, containers - , data-default, hashable, microlens-platform, oo-prototypes - , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec - , tasty-quickcheck, template-haskell, transformers-base - , unordered-containers - }: - mkDerivation { - pname = "yi-language"; version = "0.18.0"; sha256 = "0w647h1v1mjhqxnq9a7zwh42ry8dfd8franr9p8k8662q3lalvp8"; libraryHaskellDepends = [ @@ -237219,7 +232328,6 @@ self: { ]; description = "Collection of language-related Yi libraries"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-misc-modes" = callPackage @@ -237737,6 +232845,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yx" = callPackage + ({ mkDerivation, array, base, bytestring, hspec }: + mkDerivation { + pname = "yx"; + version = "0.0.2.0"; + sha256 = "05xh7x02ddh87kwslgckzh3g5i22r01vfrb160gns3zl6fv8sj2z"; + libraryHaskellDepends = [ array base bytestring ]; + testHaskellDepends = [ array base bytestring hspec ]; + description = "Row-major coordinates"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "yxdb-utils" = callPackage ({ mkDerivation, array, attoparsec, base, bimap, binary , binary-conduit, bytestring, Codec-Compression-LZF, conduit @@ -238350,31 +233470,6 @@ self: { }: mkDerivation { pname = "zip"; - version = "1.1.0"; - sha256 = "1p6r4rmagq2x44wizpxk3844vh5nv2k51wl3h6vx5xnf5im2v535"; - libraryHaskellDepends = [ - base bytestring bzlib-conduit case-insensitive cereal conduit - conduit-extra containers digest directory dlist exceptions filepath - monad-control mtl resourcet text time transformers - transformers-base - ]; - testHaskellDepends = [ - base bytestring conduit containers directory dlist exceptions - filepath hspec QuickCheck temporary text time transformers - ]; - description = "Operations on zip archives"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "zip_1_2_0" = callPackage - ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive - , cereal, conduit, conduit-extra, containers, digest, directory - , dlist, exceptions, filepath, hspec, monad-control, mtl - , QuickCheck, resourcet, temporary, text, time, transformers - , transformers-base - }: - mkDerivation { - pname = "zip"; version = "1.2.0"; sha256 = "1jbxnbiizdklv0pw8f22h38xbmk6d4wggy27w8injdsfi18f27dn"; revision = "1"; @@ -238394,38 +233489,12 @@ self: { ]; description = "Operations on zip archives"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zip-archive" = callPackage - ({ mkDerivation, array, base, binary, bytestring, Cabal, containers - , digest, directory, filepath, HUnit, mtl, pretty, process - , temporary, text, time, unix, unzip, zlib - }: - mkDerivation { - pname = "zip-archive"; - version = "0.3.3"; - sha256 = "0kf8xyac168bng8a0za2jwrbss7a4ralvci9g54hnvl0gkkxx2lq"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ - array base binary bytestring containers digest directory filepath - mtl pretty text time unix zlib - ]; - testHaskellDepends = [ - base bytestring directory filepath HUnit process temporary time - unix - ]; - testToolDepends = [ unzip ]; - description = "Library for creating and modifying zip archives"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) unzip;}; - - "zip-archive_0_4" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , digest, directory, filepath, HUnit, mtl, pretty, process - , temporary, text, time, unix, unzip, zlib + , temporary, text, time, unix, unzip, which, zlib }: mkDerivation { pname = "zip-archive"; @@ -238441,11 +233510,10 @@ self: { base bytestring directory filepath HUnit process temporary time unix ]; - testToolDepends = [ unzip ]; + testToolDepends = [ unzip which ]; description = "Library for creating and modifying zip archives"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) unzip;}; + }) {inherit (pkgs) unzip; inherit (pkgs) which;}; "zip-conduit" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra @@ -238480,29 +233548,6 @@ self: { "zip-stream" = callPackage ({ mkDerivation, base, binary, binary-conduit, bytestring, conduit , conduit-extra, digest, directory, exceptions, filepath, mtl - , primitive, resourcet, time, transformers, transformers-base, zlib - }: - mkDerivation { - pname = "zip-stream"; - version = "0.1.1"; - sha256 = "1wnjj1sp5y24iqd1ffmz6lmsvh0527v05zhzygqaf65j8sny535q"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary binary-conduit bytestring conduit conduit-extra digest - exceptions mtl primitive resourcet time transformers-base zlib - ]; - executableHaskellDepends = [ - base bytestring conduit conduit-extra directory filepath resourcet - time transformers - ]; - description = "ZIP archive streaming using conduits"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "zip-stream_0_2_0_1" = callPackage - ({ mkDerivation, base, binary, binary-conduit, bytestring, conduit - , conduit-extra, digest, directory, exceptions, filepath, mtl , primitive, resourcet, text, time, transformers, transformers-base , zlib }: @@ -238522,7 +233567,6 @@ self: { ]; description = "ZIP archive streaming using conduits"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zipedit" = callPackage @@ -238988,6 +234032,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "zsyntax" = callPackage + ({ mkDerivation, base, constraints, containers, mtl, multiset }: + mkDerivation { + pname = "zsyntax"; + version = "0.2.0.0"; + sha256 = "1pv2slz9r305lal25gh5zhr0lnkf4nzsg6vib6i576m83d3pcsgx"; + libraryHaskellDepends = [ + base constraints containers mtl multiset + ]; + testHaskellDepends = [ base containers mtl multiset ]; + description = "Automated theorem prover for the Zsyntax biochemical calculus"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ztail" = callPackage ({ mkDerivation, array, base, bytestring, filepath, hinotify , process, regex-posix, time, unix, unordered-containers diff --git a/pkgs/development/idris-modules/tparsec.nix b/pkgs/development/idris-modules/tparsec.nix index 00d4adba5dc..fcf25f0fb93 100644 --- a/pkgs/development/idris-modules/tparsec.nix +++ b/pkgs/development/idris-modules/tparsec.nix @@ -4,15 +4,15 @@ }: build-idris-package { name = "tparsec"; - version = "2018-06-26"; + version = "2018-11-09"; ipkgName = "TParsec"; src = fetchFromGitHub { owner = "gallais"; repo = "idris-tparsec"; - rev = "ca32d1a83f3de95f8979d48016e79d010f47b3c2"; - sha256 = "1zjzk8xjmyyx1qwrdwwg7yjzcgj5wkbwpx8a3wpbj5sv4b5s2r30"; + rev = "fc5bc1e0bf21a53ec854990ed799c4c73e304b06"; + sha256 = "0ladks6x1qhs884w4rsxnzpq8dpijyqfqbvhk55kq10xh6w1smrz"; }; meta = { diff --git a/pkgs/development/interpreters/angelscript/2.22.nix b/pkgs/development/interpreters/angelscript/2.22.nix index c9097bec5dc..0449572da02 100644 --- a/pkgs/development/interpreters/angelscript/2.22.nix +++ b/pkgs/development/interpreters/angelscript/2.22.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.zlib ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; + badPlatforms = [ "aarch64-linux" ]; downloadPage = "http://www.angelcode.com/angelscript/downloads.html"; homepage="http://www.angelcode.com/angelscript/"; }; diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 845b5b1f1c0..001f7c9abee 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "clojure-${version}"; - version = "1.9.0.391"; + version = "1.10.0.403"; src = fetchurl { url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "1720nbp891mhdjp37z1ns7rg8yapk3a7h1a1rkzhx7abngpwwjcz"; + sha256 = "0jsyd0vr1qfqs0dz560hyfya553jhr4m4msf5x0n610yzvbqym4c"; }; buildInputs = [ makeWrapper ]; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { substituteInPlace clojure --replace PREFIX $prefix install -Dt $out/bin clj clojure - wrapProgram $out/bin/clj --prefix PATH : ${binPath} - wrapProgram $out/bin/clojure --prefix PATH : ${binPath} + wrapProgram $out/bin/clj --prefix PATH : $out/bin:${binPath} + wrapProgram $out/bin/clojure --prefix PATH : $out/bin:${binPath} ''; meta = with stdenv.lib; { diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix index 2478493d41d..5481c4e7d05 100644 --- a/pkgs/development/interpreters/gauche/default.nix +++ b/pkgs/development/interpreters/gauche/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gauche-${version}"; - version = "0.9.6"; + version = "0.9.7"; src = fetchurl { url = "mirror://sourceforge/gauche/Gauche-${version}.tgz"; - sha256 = "1bwwwvyxsrp2a4cfib6hn0hcgwzmp2znylm088w09f331miji2fd"; + sha256 = "181nycikma0rwrb1h6mi3kys11f8628pq8g5r3fg5hiz5sabscrd"; }; nativeBuildInputs = [ pkgconfig texinfo ]; diff --git a/pkgs/development/interpreters/python/cpython/2.7/boot.nix b/pkgs/development/interpreters/python/cpython/2.7/boot.nix index 976d30819db..ccb366903c5 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/boot.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/boot.nix @@ -77,8 +77,6 @@ stdenv.mkDerivation rec { '' ln -s $out/share/man/man1/{python2.7.1.gz,python.1.gz} - paxmark E $out/bin/python2.7 - rm "$out"/lib/python*/plat-*/regen # refers to glibc.dev ''; diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 63dad3bf42f..ff1497a24e4 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -229,8 +229,6 @@ in stdenv.mkDerivation ({ ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion} ln -s $out/share/man/man1/{python2.7.1.gz,python.1.gz} - paxmark E $out/bin/python${majorVersion} - # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index 92c277aacd4..19e9f3169c7 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -143,7 +143,6 @@ in stdenv.mkDerivation { touch $out/lib/python${majorVersion}/test/__init__.py ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" - paxmark E $out/bin/python${majorVersion} # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index 4c9d0c2a896..a36965a7801 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -26,7 +26,7 @@ with stdenv.lib; let majorVersion = "3.6"; - minorVersion = "7"; + minorVersion = "8"; minorVersionSuffix = ""; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; libPrefix = "python${majorVersion}"; @@ -51,7 +51,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "0zgp8nvz3rkiz5cxd42vgpah4rvw3kmg9qz9lfq36rfnm40i9zc1"; + sha256 = "14qi6n5gpcjnwy165wi9hkfcmbadc95ny6bxxldknxwmx50n4i1m"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; @@ -69,12 +69,6 @@ in stdenv.mkDerivation { patches = [ ./no-ldconfig.patch - ] ++ optionals stdenv.isDarwin [ - # Fix for https://bugs.python.org/issue24658 - (fetchpatch { - url = "https://bugs.python.org/file45178/issue24658-3-3.6.diff"; - sha256 = "1x060hs80nl34mcl2ji2i7l4shxkmxwgq8h8lcmav8rjqqz1nb4a"; - }) ] ++ optionals (x11Support && stdenv.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch ] ++ optionals hasDistutilsCxxPatch [ @@ -83,8 +77,8 @@ in stdenv.mkDerivation { # only works for GCC and Apple Clang. This makes distutils to call C++ # compiler when needed. (fetchpatch { - url = "https://bugs.python.org/file47669/python-3.8-distutils-C++.patch"; - sha256 = "0s801d7ww9yrk6ys053jvdhl0wicbznx08idy36f1nrrxsghb3ii"; + url = "https://bugs.python.org/file48016/python-3.x-distutils-C++.patch"; + sha256 = "1h18lnpx539h5lfxyk379dxwr8m2raigcjixkf133l4xy3f4bzi2"; }) ]; @@ -164,7 +158,6 @@ in stdenv.mkDerivation { touch $out/lib/python${majorVersion}/test/__init__.py ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" - paxmark E $out/bin/python${majorVersion} # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py diff --git a/pkgs/development/interpreters/python/cpython/3.7/default.nix b/pkgs/development/interpreters/python/cpython/3.7/default.nix index d1403ba95e4..1d8b1c0eadf 100644 --- a/pkgs/development/interpreters/python/cpython/3.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.7/default.nix @@ -14,6 +14,7 @@ , self , CF, configd , python-setup-hook +, nukeReferences # For the Python package set , packageOverrides ? (self: super: {}) , buildPackages @@ -27,14 +28,14 @@ with stdenv.lib; let majorVersion = "3.7"; - minorVersion = "1"; + minorVersion = "2"; minorVersionSuffix = ""; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; libPrefix = "python${majorVersion}"; sitePackages = "lib/${libPrefix}/site-packages"; buildInputs = filter (p: p != null) [ - zlib bzip2 expat lzma libffi gdbm sqlite readline ncurses openssl ] + zlib bzip2 expat lzma libffi gdbm sqlite readline ncurses openssl nukeReferences ] ++ optionals x11Support [ tcl tk libX11 xproto ] ++ optionals stdenv.isDarwin [ CF configd ]; @@ -56,7 +57,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "0v9x4h22rh5cwpsq1mwpdi3c9lc9820lzp2nmn9g20llij72nzps"; + sha256 = "1fzi9d2gibh0wzwidyckzbywsxcsbckgsl05ryxlifxia77fhgyq"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; @@ -82,8 +83,8 @@ in stdenv.mkDerivation { # only works for GCC and Apple Clang. This makes distutils to call C++ # compiler when needed. (fetchpatch { - url = "https://bugs.python.org/file47669/python-3.8-distutils-C++.patch"; - sha256 = "0s801d7ww9yrk6ys053jvdhl0wicbznx08idy36f1nrrxsghb3ii"; + url = "https://bugs.python.org/file48016/python-3.x-distutils-C++.patch"; + sha256 = "1h18lnpx539h5lfxyk379dxwr8m2raigcjixkf133l4xy3f4bzi2"; }) ]; @@ -154,7 +155,6 @@ in stdenv.mkDerivation { touch $out/lib/python${majorVersion}/test/__init__.py ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" - paxmark E $out/bin/python${majorVersion} # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py @@ -174,9 +174,14 @@ in stdenv.mkDerivation { # some $TMPDIR references to improve binary reproducibility. # Note that the .pyc file of _sysconfigdata.py should be regenerated! for i in $out/lib/python${majorVersion}/_sysconfigdata*.py $out/lib/python${majorVersion}/config-${majorVersion}m*/Makefile; do - sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g" + sed -i $i -e "s|$TMPDIR|/no-such-path|g" + nuke-refs $i done + # Further get rid of references. https://github.com/NixOS/nixpkgs/issues/51668 + find $out/lib/python*/config-*-* -type f -print -exec nuke-refs '{}' + + find $out/lib -name '_sysconfigdata_m*.py*' -print -exec nuke-refs '{}' + + # Determinism: rebuild all bytecode # We exclude lib2to3 because that's Python 2 code which fails # We rebuild three times, once for each optimization level @@ -187,6 +192,10 @@ in stdenv.mkDerivation { find $out -name "*.py" | ${pythonForBuild} -OO -m compileall -q -f -x "lib2to3" -i - ''; + # Enforce that we don't have references to the OpenSSL -dev package, which we + # explicitly specify in our configure flags above. + disallowedReferences = [ openssl.dev ]; + passthru = let pythonPackages = callPackage ../../../../../top-level/python-packages.nix { python = self; diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index eb913e1a375..b9a6835908f 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -110,12 +110,7 @@ let self = toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attr } // meta; })); -passthru = { - updateScript = let +passthru.updateScript = let filename = builtins.head (lib.splitString ":" self.meta.position); - in writeScript "update-python" '' - #!${python.stdenv.shell} - ${update-python-libraries} ${filename} - ''; -}; + in attrs.passthru.updateScript or [ update-python-libraries filename ]; in lib.extendDerivation true passthru self diff --git a/pkgs/development/interpreters/python/pypy/3/default.nix b/pkgs/development/interpreters/python/pypy/3/default.nix new file mode 100644 index 00000000000..23e239d925b --- /dev/null +++ b/pkgs/development/interpreters/python/pypy/3/default.nix @@ -0,0 +1,138 @@ +{ stdenv, substituteAll, fetchurl +, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi +, sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11 +, makeWrapper, callPackage, self, gdbm, db, lzma +, python-setup-hook +# For the Python package set +, packageOverrides ? (self: super: {}) +}: + +assert zlibSupport -> zlib != null; + +let + version = "6.0.0"; + pythonVersion = "3.5"; + libPrefix = "pypy${pythonVersion}"; + sitePackages = "site-packages"; + + pythonForPypy = python.withPackages (ppkgs: [ ppkgs.pycparser ]); + +in stdenv.mkDerivation rec { + name = "pypy3-${version}"; + inherit version pythonVersion; + + src = fetchurl { + url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2"; + sha256 = "0lwq8nn0r5yj01bwmkk5p7xvvrp4s550l8184mkmn74d3gphrlwg"; + }; + + nativeBuildInputs = [ pkgconfig makeWrapper ]; + buildInputs = [ + bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 gdbm db lzma + ] ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc + ++ stdenv.lib.optional zlibSupport zlib; + + hardeningDisable = stdenv.lib.optional stdenv.isi686 "pic"; + + C_INCLUDE_PATH = stdenv.lib.makeSearchPathOutput "dev" "include" buildInputs; + LIBRARY_PATH = stdenv.lib.makeLibraryPath buildInputs; + LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath (stdenv.lib.filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs); + + patches = [ + (substituteAll { + src = ./tk_tcl_paths.patch; + inherit tk tcl; + tk_dev = tk.dev; + tcl_dev = tcl; + tk_libprefix = tk.libPrefix; + tcl_libprefix = tcl.libPrefix; + }) + ]; + + postPatch = '' + substituteInPlace "lib-python/3/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" + + # hint pypy to find nix ncurses + substituteInPlace pypy/module/_minimal_curses/fficurses.py \ + --replace "/usr/include/ncurses/curses.h" "${ncurses.dev}/include/curses.h" \ + --replace "ncurses/curses.h" "${ncurses.dev}/include/curses.h" \ + --replace "ncurses/term.h" "${ncurses.dev}/include/term.h" \ + --replace "libraries=['curses']" "libraries=['ncurses']" + + sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite.dev}/include'], library_dirs=['${sqlite.out}/lib']@" lib_pypy/_sqlite3_build.py + ''; + + buildPhase = '' + ${pythonForPypy.interpreter} rpython/bin/rpython \ + --make-jobs="$NIX_BUILD_CORES" \ + -Ojit \ + --batch pypy/goal/targetpypystandalone.py + ''; + + setupHook = python-setup-hook sitePackages; + + doCheck = true; + checkPhase = '' + export TERMINFO="${ncurses.out}/share/terminfo/"; + export TERM="xterm"; + export HOME="$TMPDIR"; + # disable asyncio due to https://github.com/NixOS/nix/issues/1238 + # disable os due to https://github.com/NixOS/nixpkgs/issues/10496 + # disable pathlib due to https://bitbucket.org/pypy/pypy/pull-requests/594 + # disable shutils because it assumes gid 0 exists + # disable socket because it has two actual network tests that fail + # disable tarfile because it assumes gid 0 exists + ${pythonForPypy.interpreter} ./pypy/test_all.py --pypy=./pypy3-c -k 'not ( test_asyncio or test_os or test_pathlib or test_shutil or test_socket or test_tarfile )' lib-python + ''; + + installPhase = '' + mkdir -p $out/{bin,include,lib,pypy3-c} + + cp -R {include,lib_pypy,lib-python,pypy3-c} $out/pypy3-c + cp libpypy3-c.so $out/lib/ + ln -s $out/pypy3-c/pypy3-c $out/bin/pypy3 + + # other packages expect to find stuff according to libPrefix + ln -s $out/pypy3-c/include $out/include/${libPrefix} + ln -s $out/pypy3-c/lib-python/3 $out/lib/${libPrefix} + + # We must wrap the original, not the symlink. + # PyPy uses argv[0] to find its standard library, and while it knows + # how to follow symlinks, it doesn't know about wrappers. So, it + # will think the wrapper is the original. As long as the wrapper has + # the same path as the original, this is OK. + wrapProgram "$out/pypy3-c/pypy3-c" \ + --set LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:$out/lib" \ + --set LIBRARY_PATH "${LIBRARY_PATH}:$out/lib" + + # verify cffi modules + $out/bin/pypy3 -c "import tkinter;import sqlite3;import curses;import lzma" + + # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 + echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py + ''; + + passthru = let + pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + in rec { + inherit zlibSupport libPrefix sitePackages; + executable = "pypy3"; + isPypy = true; + isPy3 = true; + isPy35 = true; + buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; }; + interpreter = "${self}/bin/${executable}"; + withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; + pkgs = pythonPackages; + }; + + enableParallelBuilding = true; # almost no parallelization without STM + + meta = with stdenv.lib; { + homepage = http://pypy.org/; + description = "Fast, compliant alternative implementation of the Python language (3.5.3)"; + license = licenses.mit; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ andersk ]; + }; +} diff --git a/pkgs/development/interpreters/python/pypy/3/tk_tcl_paths.patch b/pkgs/development/interpreters/python/pypy/3/tk_tcl_paths.patch new file mode 100644 index 00000000000..92bbfc557b3 --- /dev/null +++ b/pkgs/development/interpreters/python/pypy/3/tk_tcl_paths.patch @@ -0,0 +1,17 @@ +--- pypy-pypy-84a2f3e6a7f8.org/lib_pypy/_tkinter/tklib_build.py 2017-10-03 11:49:20.000000000 +0100 ++++ pypy-pypy-84a2f3e6a7f8/lib_pypy/_tkinter/tklib_build.py 2017-11-21 13:20:51.398607530 +0000 +@@ -24,11 +24,11 @@ + else: + # On some Linux distributions, the tcl and tk libraries are + # stored in /usr/include, so we must check this case also +- libdirs = [] ++ libdirs = ["@tcl@/lib", "@tk@/lib"] + found = False + for _ver in ['', '8.6', '8.5']: +- incdirs = ['/usr/include/tcl' + _ver] +- linklibs = ['tcl' + _ver, 'tk' + _ver] ++ incdirs = ['@tcl_dev@/include', '@tk_dev@/include'] ++ linklibs = ['@tcl_libprefix@', '@tk_libprefix@'] + if os.path.isdir(incdirs[0]): + found = True + break diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 1ee5c0b57ac..7365cd52273 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -32,7 +32,7 @@ let generic = { version, sha256 }: let ver = version; tag = ver.gitTag; - isRuby25 = ver.majMin == "2.5"; + atLeast25 = lib.versionAtLeast ver.majMin "2.5"; baseruby = self.override { useRailsExpress = false; }; self = lib.makeOverridable ( { stdenv, buildPackages, lib @@ -56,7 +56,7 @@ let rev = tag; sha256 = sha256.git; } else fetchurl { - url = "http://cache.ruby-lang.org/pub/ruby/${ver.majMin}/ruby-${ver}.tar.gz"; + url = "https://cache.ruby-lang.org/pub/ruby/${ver.majMin}/ruby-${ver}.tar.gz"; sha256 = sha256.src; }; in @@ -83,6 +83,7 @@ let ++ (op opensslSupport openssl) ++ (op gdbmSupport gdbm) ++ (op yamlSupport libyaml) + ++ (op atLeast25 autoconf) # Looks like ruby fails to build on darwin without readline even if curses # support is not enabled, so add readline to the build inputs if curses # support is disabled (if it's enabled, we already have it) and we're @@ -105,7 +106,7 @@ let popd ''; - postPatch = if isRuby25 then '' + postPatch = if atLeast25 then '' sed -i configure.ac -e '/config.guess/d' cp --remove-destination ${config}/config.guess tool/ cp --remove-destination ${config}/config.sub tool/ @@ -220,4 +221,12 @@ in { git = "0r9mgvqk6gj8pc9q6qmy7j2kbln7drc8wy67sb2ij8ciclcw9nn2"; }; }; + + ruby_2_6 = generic { + version = rubyVersion "2" "6" "0" ""; + sha256 = { + src = "0wn0gxlx6xhhqrm2caxp0h6cj4nw7knnv5gh27qqzj0i9a95phzk"; + git = "0bwbl4hz18dd5aij2l4s6xy90dc17d03kk577gdl34l9mbd9m7mn"; + }; + }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index c87cb120b40..8afc64edb3f 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -16,4 +16,6 @@ rec { "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch" ]; + "2.6.0" = ops useRailsExpress [ # no Rails Express patchset yet (2018-12-26) + ]; } diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix index 46637195586..9c81b230ada 100644 --- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix +++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # so the failure of that test does not matter much. configureFlags = [ "--enable-threadsafe" "--with-system-nspr" ] ++ stdenv.lib.optionals (stdenv.hostPlatform.system == "armv5tel-linux") [ - "--with-cpu-arch=armv5t" + "--with-cpu-arch=armv5t" "--disable-tracejit" ]; # hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393 @@ -59,9 +59,6 @@ stdenv.mkDerivation rec { preCheck = '' rm jit-test/tests/sunspider/check-date-format-tofte.js # https://bugzil.la/600522 - - paxmark mr shell/js - paxmark mr jsapi-tests/jsapi-tests ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix index 0f0e30ef0f3..76e49768d53 100644 --- a/pkgs/development/libraries/adns/default.nix +++ b/pkgs/development/libraries/adns/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { preConfigure = stdenv.lib.optionalString stdenv.isDarwin "sed -i -e 's|-Wl,-soname=$(SHLIBSONAME)||' configure"; - # http://thread.gmane.org/gmane.linux.distributions.nixos/1328 for details. + # https://www.mail-archive.com/nix-dev@cs.uu.nl/msg01347.html for details. doCheck = false; postInstall = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/aften/default.nix b/pkgs/development/libraries/aften/default.nix index fb16c71fd19..22e91ee61d7 100644 --- a/pkgs/development/libraries/aften/default.nix +++ b/pkgs/development/libraries/aften/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { description = "An audio encoder which generates compressed audio streams based on ATSC A/52 specification"; homepage = "http://aften.sourceforge.net/"; license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.unix; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 5e82a1a3c6b..269a139a3d6 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, texinfo, libXext, xextproto, libX11, xproto +{ stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xextproto, libX11, xproto , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis , libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto , xf86vidmodeproto, libXxf86vm, openal, libGLU_combined, kbproto, libjpeg, flac @@ -28,7 +28,15 @@ stdenv.mkDerivation rec { libpulseaudio libpthreadstubs ]; - patchPhase = '' + patches = [ + # fix compilation with mesa 18.2.5 + (fetchpatch { + url = "https://github.com/liballeg/allegro5/commit/a40d30e21802ecf5c9382cf34af9b01bd3781e47.patch"; + sha256 = "1f1xlj5y2vr6wzmcz04s8kxn8cfdwrg9kjlnvpz9dix1z3qjnd4m"; + }) + ]; + + postPatch = '' sed -e 's@/XInput2.h@/XI2.h@g' -i CMakeLists.txt "src/"*.c ''; diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index f53b63472cc..aded6945cb1 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "appstream-${version}"; - version = "0.12.3"; + version = "0.12.4"; src = fetchFromGitHub { owner = "ximion"; repo = "appstream"; rev = "APPSTREAM_${stdenv.lib.replaceStrings ["."] ["_"] version}"; - sha256 = "154yfn10vm5v7vwa2jz60bgpcznzm3nkjg31g92rm9b39rd2y1ja"; + sha256 = "1ag00w13fqvv584svcml7cykvgy0mi709qsm5mgy2ygy9d8r2vfw"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 96259dc6694..f9d8736ea20 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, symlinkJoin, fetchurl, fetchFromGitHub, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, which, zlib, zstd }: +{ stdenv, symlinkJoin, fetchurl, fetchFromGitHub, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest_static, lz4, perl, python, rapidjson, snappy, thrift, which, zlib, zstd }: let parquet-testing = fetchFromGitHub { @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { FLATBUFFERS_HOME = flatbuffers; GFLAGS_HOME = gflags; GLOG_HOME = glog; - GTEST_HOME = gtest; + GTEST_HOME = symlinkJoin { name="gtest-wrap"; paths = [ gtest_static gtest_static.dev ]; }; LZ4_HOME = symlinkJoin { name="lz4-wrap"; paths = [ lz4 lz4.dev ]; }; RAPIDJSON_HOME = rapidjson; SNAPPY_HOME = symlinkJoin { name="snappy-wrap"; paths = [ snappy snappy.dev ]; }; diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix index 9ec9e6284f8..5338aa683a7 100644 --- a/pkgs/development/libraries/atkmm/default.nix +++ b/pkgs/development/libraries/atkmm/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, atk, glibmm, pkgconfig }: -let - ver_maj = "2.24"; - ver_min = "2"; -in +{ stdenv, fetchurl, atk, glibmm, pkgconfig, gnome3 }: + stdenv.mkDerivation rec { - name = "atkmm-${ver_maj}.${ver_min}"; + pname = "atkmm"; + version = "2.28.0"; src = fetchurl { - url = "mirror://gnome/sources/atkmm/${ver_maj}/${name}.tar.xz"; - sha256 = "ff95385759e2af23828d4056356f25376cfabc41e690ac1df055371537e458bd"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0fnxrspxkhhbrjphqrpvl3zjm66n50s4cywrrrwkhbflgy8zqk2c"; }; outputs = [ "out" "dev" ]; @@ -19,6 +17,12 @@ stdenv.mkDerivation rec { doCheck = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = { description = "C++ wrappers for ATK accessibility toolkit"; license = stdenv.lib.licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index 971637bc787..fc67035ce20 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -1,5 +1,6 @@ { fetchurl, stdenv, pkgconfig, libdaemon, dbus, perlPackages , expat, gettext, intltool, glib, libiconv +, gtk3Support ? false, gtk3 ? null , qt4 ? null , qt4Support ? false , withLibdnssdCompat ? false }: @@ -19,13 +20,15 @@ stdenv.mkDerivation rec { buildInputs = [ libdaemon dbus glib expat libiconv ] ++ (with perlPackages; [ perl XMLParser ]) + ++ (stdenv.lib.optional gtk3Support gtk3) ++ (stdenv.lib.optional qt4Support qt4); nativeBuildInputs = [ pkgconfig gettext intltool glib ]; configureFlags = [ "--disable-qt3" "--disable-gdbm" "--disable-mono" - "--disable-gtk" "--disable-gtk3" + "--disable-gtk" + (stdenv.lib.enableFeature gtk3Support "gtk3") "--${if qt4Support then "enable" else "disable"}-qt4" "--disable-python" "--localstatedir=/var" "--with-distro=none" # A systemd unit is provided by the avahi-daemon NixOS module diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix index 02c67d7dbf8..ba6fc7cb541 100644 --- a/pkgs/development/libraries/beignet/default.nix +++ b/pkgs/development/libraries/beignet/default.nix @@ -107,5 +107,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; maintainers = with maintainers; [ artuuge zimbatm ]; platforms = platforms.linux; + # Requires libdrm_intel + badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index c79b874ecb6..3e488acee74 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -111,7 +111,8 @@ stdenv.mkDerivation { description = "Collection of C++ libraries"; license = stdenv.lib.licenses.boost; - platforms = (if versionOlder version "1.59" then remove "aarch64-linux" else id) (platforms.unix ++ platforms.windows); + platforms = (platforms.unix ++ platforms.windows); + badPlatforms = stdenv.lib.optional (versionOlder version "1.59") "aarch64-linux"; maintainers = with maintainers; [ peti wkennington ]; }; diff --git a/pkgs/development/libraries/bootil/default.nix b/pkgs/development/libraries/bootil/default.nix index 0ed223832b6..3c27281571a 100644 --- a/pkgs/development/libraries/bootil/default.nix +++ b/pkgs/development/libraries/bootil/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.free; maintainers = [ stdenv.lib.maintainers.abigailbuccaneer ]; platforms = stdenv.lib.platforms.all; + # Build uses `-msse` and `-mfpmath=sse` + badPlatforms = [ "aarch64-linux" ]; }; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/pkgs/development/libraries/dbus-sharp/default.nix index 2704ef2de9f..14db5baea3f 100644 --- a/pkgs/development/libraries/dbus-sharp/default.nix +++ b/pkgs/development/libraries/dbus-sharp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, pkgconfig, mono48, autoreconfHook }: +{stdenv, fetchFromGitHub, pkgconfig, mono4, autoreconfHook }: stdenv.mkDerivation rec { name = "dbus-sharp-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged # See: https://github.com/NixOS/nixpkgs/pull/46060 - buildInputs = [ mono48 ]; + buildInputs = [ mono4 ]; dontStrip = true; diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix index 903f43b1e68..9b7cea3ebbc 100644 --- a/pkgs/development/libraries/fdk-aac/default.nix +++ b/pkgs/development/libraries/fdk-aac/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "fdk-aac-${version}"; - version = "0.1.6"; + version = "2.0.0"; src = fetchurl { url = "mirror://sourceforge/opencore-amr/fdk-aac/${name}.tar.gz"; - sha256 = "1bfkpqba0v2jgxqwaf9xsrr63a089wckrir497lm6nbbmi11pdma"; + sha256 = "0v6rbyw9f9lpfvcg3v1qyapga5hqfnb3wp3x5yaxpwcgjw7ydmpp"; }; configureFlags = [ ] diff --git a/pkgs/desktops/gnome-3/core/folks/default.nix b/pkgs/development/libraries/folks/default.nix index 2eb33cde975..2ce50a92ea3 100644 --- a/pkgs/desktops/gnome-3/core/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -1,20 +1,19 @@ { fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool, gobject-introspection -, vala, sqlite, libxml2, dbus-glib, libsoup, nss, dbus +, vala, sqlite, libxml2, dbus-glib, libsoup, nss, dbus, libgee , telepathy-glib, evolution-data-server, libsecret, db }: # TODO: enable more folks backends -let +stdenv.mkDerivation rec { + pname = "folks"; version = "0.11.4"; -in stdenv.mkDerivation rec { - name = "folks-${version}"; src = fetchurl { - url = "mirror://gnome/sources/folks/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "16hqh2gxlbx0b0hgq216hndr1m72vj54jvryzii9zqkk0g9kxc57"; }; - propagatedBuildInputs = [ glib gnome3.libgee sqlite ]; + propagatedBuildInputs = [ glib libgee sqlite ]; # dbus_daemon needed for tests buildInputs = [ dbus-glib telepathy-glib evolution-data-server dbus @@ -33,19 +32,15 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { - packageName = "folks"; - attrPath = "gnome3.folks"; + packageName = pname; versionPolicy = "none"; }; }; meta = { - description = "Folks"; - + description = "A library that aggregates people from multiple sources to create metacontacts"; homepage = https://wiki.gnome.org/Projects/Folks; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = gnome3.maintainers; platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 03324d54899..7ad5680c75c 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { name = "freetds-${version}"; - version = "1.00.104"; + version = "1.00.109"; src = fetchurl { url = "http://www.freetds.org/files/stable/${name}.tar.bz2"; - sha256 = "0mlg027mppv2348f4wwdpxpac9baqkdsg7xqx21kyx5dx5kmr71g"; + sha256 = "0d00ixf78jzkyhccxjsaspz7yvlwk0xvrfcqfca4cwnwvnyb54ry"; }; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index 2cfdb518dfa..56c52e1e368 100644 --- a/pkgs/desktops/gnome-3/core/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, pkgconfig, intltool, gnupg, p11-kit, glib -, libgcrypt, libtasn1, dbus-glib, gtk, pango, gdk_pixbuf, atk +, libgcrypt, libtasn1, dbus-glib, gtk3, pango, gdk_pixbuf, atk , gobject-introspection, makeWrapper, libxslt, vala, gnome3 , python2 }: stdenv.mkDerivation rec { - name = "gcr-${version}"; + pname = "gcr"; version = "3.28.0"; src = fetchurl { - url = "mirror://gnome/sources/gcr/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "02xgky22xgvhgd525khqh64l5i21ca839fj9jzaqdi3yvb8pbq8m"; }; passthru = { - updateScript = gnome3.updateScript { packageName = "gcr"; attrPath = "gnome3.gcr"; }; + updateScript = gnome3.updateScript { packageName = pname; }; }; postPatch = '' @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { gpg libgcrypt libtasn1 dbus-glib pango gdk_pixbuf atk ]; - propagatedBuildInputs = [ glib gtk p11-kit ]; + propagatedBuildInputs = [ glib gtk3 p11-kit ]; checkInputs = [ python2 ]; doCheck = false; # fails 21 out of 603 tests, needs dbus daemon diff --git a/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch b/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch new file mode 100644 index 00000000000..629ea102971 --- /dev/null +++ b/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch @@ -0,0 +1,55 @@ +--- a/data/meson.build ++++ b/data/meson.build +@@ -7,7 +7,7 @@ + conf.set('demo_agent', '') + endif + +- conf_dir = join_paths(get_option('sysconfdir'), 'geoclue') ++ conf_dir = join_paths(sysconfdir_install, 'geoclue') + configure_file(output: 'geoclue.conf', + input: 'geoclue.conf.in', + configuration: conf, +@@ -26,7 +26,7 @@ + # DBus Service policy file + dbus_service_dir = get_option('dbus-sys-dir') + if dbus_service_dir == '' +- dbus_service_dir = join_paths(get_option('sysconfdir'), 'dbus-1', 'system.d') ++ dbus_service_dir = join_paths(sysconfdir_install, 'dbus-1', 'system.d') + endif + configure_file(output: 'org.freedesktop.GeoClue2.conf', + input: 'org.freedesktop.GeoClue2.conf.in', +--- a/demo/meson.build ++++ b/demo/meson.build +@@ -56,8 +56,7 @@ + install_dir: desktop_dir) + + # Also install in the autostart directory. +- autostart_dir = join_paths(get_option('prefix'), +- get_option('sysconfdir'), ++ autostart_dir = join_paths(sysconfdir_install, + 'xdg', 'autostart') + meson.add_install_script('install-file.py', + desktop_file.full_path(), +--- a/meson.build ++++ b/meson.build +@@ -22,6 +22,11 @@ + datadir = join_paths(get_option('prefix'), get_option('datadir')) + conf.set_quoted('LOCALEDIR', datadir + '/locale') + conf.set_quoted('SYSCONFDIR', get_option('sysconfdir')) ++if get_option('sysconfdir_install') != '' ++ sysconfdir_install = join_paths(get_option('prefix'), get_option('sysconfdir_install')) ++else ++ sysconfdir_install = get_option('sysconfdir') ++endif + + configure_file(output: 'config.h', configuration : conf) + configinc = include_directories('.') +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -34,3 +34,6 @@ + option('dbus-srv-user', + type: 'string', value: 'root', + description: 'The user (existing) as which the service will run') ++option('sysconfdir_install', ++ type: 'string', value: '', ++ description: 'sysconfdir to use during installation') diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index f2eeb9ae40b..5e83ba71c1b 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { sha256 = "0vww6irijw5ss7vawkdi5z5wdpcgw4iqljn5vs3vbd4y3d0lzrbs"; }; + patches = [ + ./add-option-for-installation-sysconfdir.patch + ]; + outputs = [ "out" "dev" "devdoc" ]; nativeBuildInputs = [ @@ -36,6 +40,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dsystemd-system-unit-dir=${placeholder "out"}/etc/systemd/system" "-Ddemo-agent=${if withDemoAgent then "true" else "false"}" + "--sysconfdir=/etc" + "-Dsysconfdir_install=${placeholder "out"}/etc" ] ++ optionals stdenv.isDarwin [ "-D3g-source=false" "-Dcdma-source=false" diff --git a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix b/pkgs/development/libraries/geocode-glib/default.nix index ce5f46534c7..2d308add87a 100644 --- a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix +++ b/pkgs/development/libraries/geocode-glib/default.nix @@ -1,13 +1,13 @@ { fetchurl, stdenv, meson, ninja, pkgconfig, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib }: stdenv.mkDerivation rec { - name = "geocode-glib-${version}"; + pname = "geocode-glib"; version = "3.26.0"; - outputs = [ "out" "dev" "installedTests" ]; + outputs = [ "out" "dev" "devdoc" "installedTests" ]; src = fetchurl { - url = "mirror://gnome/sources/geocode-glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/geocode-glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1vmydxs5xizcmaxpkfrq75xpj6pqrpdjizxyb30m00h54yqqch7a"; }; @@ -24,8 +24,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { - packageName = "geocode-glib"; - attrPath = "gnome3.geocode-glib"; + packageName = pname; }; }; diff --git a/pkgs/desktops/gnome-3/core/geocode-glib/installed-tests-path.patch b/pkgs/development/libraries/geocode-glib/installed-tests-path.patch index 499c6800808..499c6800808 100644 --- a/pkgs/desktops/gnome-3/core/geocode-glib/installed-tests-path.patch +++ b/pkgs/development/libraries/geocode-glib/installed-tests-path.patch diff --git a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix index d74faf09fb7..74311525f1e 100644 --- a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix +++ b/pkgs/development/libraries/gexiv2/default.nix @@ -1,29 +1,29 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, exiv2, glib, gnome3, gobject-introspection, vala }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, exiv2, glib, gnome3, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: -let +stdenv.mkDerivation rec { pname = "gexiv2"; version = "0.10.9"; -in -stdenv.mkDerivation rec { - name = "${pname}-${version}"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1vf0zv92p9hybdhn7zx53h3ia53ph97a21xz8rfk877xlr5261l8"; }; - preConfigure = '' - patchShebangs . - ''; - - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala ]; + nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; buildInputs = [ glib ]; propagatedBuildInputs = [ exiv2 ]; + mesonFlags = [ + "-Denable-gtk-doc=true" # TODO: change to gtk_doc in a next release + ]; + + doCheck = true; + passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix b/pkgs/development/libraries/gfbgraph/default.nix index f4c0d6134c0..1bdcb7d8b28 100644 --- a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix +++ b/pkgs/development/libraries/gfbgraph/default.nix @@ -1,22 +1,20 @@ -{ stdenv, fetchurl, pkgconfig, glib +{ stdenv, fetchurl, pkgconfig, glib, librest , gnome3, libsoup, json-glib, gobject-introspection }: -let +stdenv.mkDerivation rec { pname = "gfbgraph"; version = "0.2.3"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1dp0v8ia35fxs9yhnqpxj3ir5lh018jlbiwifjfn8ayy7h47j4fs"; }; nativeBuildInputs = [ pkgconfig gobject-introspection ]; buildInputs = [ glib gnome3.gnome-online-accounts ]; - propagatedBuildInputs = [ libsoup json-glib gnome3.rest ]; + propagatedBuildInputs = [ libsoup json-glib librest ]; configureFlags = [ "--enable-introspection" ]; @@ -25,11 +23,11 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; }; }; meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/GFBGraph; description = "GLib/GObject wrapper for the Facebook Graph API"; maintainers = gnome3.maintainers; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 22acd530093..37275489cc3 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, meson, ninja, pkgconfig, perl, python3, glibcLocales +{ stdenv, fetchurl, fetchpatch, gettext, meson, ninja, pkgconfig, perl, python3, glibcLocales , libiconv, zlib, libffi, pcre, libelf, gnome3, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45 # use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib) , utillinuxMinimal ? null @@ -44,7 +44,7 @@ let ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true ''; - version = "2.58.1"; + version = "2.58.2"; in stdenv.mkDerivation rec { @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1mnp4vankish8bqxymdl591p9v1ynk7pfc5dmpx3vamn4vcskmlp"; + sha256 = "0jrxfm4gn1qz3y1450z709v74ys2bkjr8yffkgy106kgagb4xcn7"; }; patches = optional stdenv.isDarwin ./darwin-compilation.patch @@ -64,6 +64,12 @@ stdenv.mkDerivation rec { ./schema-override-variable.patch # Require substituteInPlace in postPatch ./fix-gio-launch-desktop-path.patch + # https://gitlab.gnome.org/GNOME/glib/issues/1626 + # https://gitlab.gnome.org/GNOME/glib/merge_requests/557 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/glib/commit/85c4031696add9797e2334ced20678edcd96c869.patch; + sha256 = "1hmyvhx89wip2a26gk1rvd87k0pjfia51s0ysybjyzf5f1pzw877"; + }) ]; outputs = [ "bin" "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index ee77f4b498e..10d5ee27500 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -1,27 +1,16 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, gnum4, glib, libsigcxx }: +{ stdenv, fetchurl, pkgconfig, gnum4, glib, libsigcxx, gnome3 }: -let - ver_maj = "2.56"; - ver_min = "0"; -in stdenv.mkDerivation rec { - name = "glibmm-${ver_maj}.${ver_min}"; + pname = "glibmm"; + version = "2.58.0"; src = fetchurl { - url = "mirror://gnome/sources/glibmm/${ver_maj}/${name}.tar.xz"; - sha256 = "1abrkqhca5p8n6ly3vp1232rny03s7lrd8f8iz2m2m141nxgqx3f"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0idnaii4h3mdym2a55gkavipyxigwvbgfmzmwql85s4rgciqjhfk"; }; outputs = [ "out" "dev" ]; - patchFlags = "-p0"; - patches = [ - (fetchpatch { - url = "https://raw.githubusercontent.com/macports/macports-ports/e864b2340be9ef003d8ff4aef92e7151d06287dd/devel/glibmm/files/0001-ustring-Fix-wchar-conversion-on-macOS-with-libc.patch"; - sha256 = "02qvnailw1i59cjbj3cy7y02kfcivsvkdjrf4njkp4plarayyqp9"; - }) - ]; - nativeBuildInputs = [ pkgconfig gnum4 ]; propagatedBuildInputs = [ glib libsigcxx ]; @@ -29,6 +18,12 @@ stdenv.mkDerivation rec { doCheck = false; # fails. one test needs the net, another /etc/fstab + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { description = "C++ interface to the GLib library"; diff --git a/pkgs/desktops/gnome-3/core/gnome-menus/default.nix b/pkgs/development/libraries/gnome-menus/default.nix index 9d49eb5e007..0538b8ec06b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-menus/default.nix +++ b/pkgs/development/libraries/gnome-menus/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, intltool, pkgconfig, glib, gobject-introspection }: stdenv.mkDerivation rec { - name = "gnome-menus-${version}"; + pname = "gnome-menus"; version = "3.10.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-menus/3.10/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6"; }; @@ -16,8 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://www.gnome.org; - description = "Gnome menu specification"; - + description = "Library that implements freedesktops's Desktop Menu Specification in GNOME"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/gnome-sharp/Makefile.in.patch b/pkgs/development/libraries/gnome-sharp/Makefile.in.patch deleted file mode 100644 index 46b644f2471..00000000000 --- a/pkgs/development/libraries/gnome-sharp/Makefile.in.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/sample/gnomevfs/Makefile.in 2009-03-03 16:09:52.000000000 +0000 -+++ b/sample/gnomevfs/Makefile.in 2014-10-14 13:35:51.020427244 +0100 -@@ -218,7 +218,7 @@ - - @ENABLE_GNOMEVFS_FALSE@EXTRA_TARGETS = - @ENABLE_GNOMEVFS_TRUE@@ENABLE_MONOGETOPTIONS_FALSE@EXTRA_TARGETS = --@ENABLE_GNOMEVFS_TRUE@@ENABLE_MONOGETOPTIONS_TRUE@EXTRA_TARGETS = TestXfer.exe -+@ENABLE_GNOMEVFS_TRUE@@ENABLE_MONOGETOPTIONS_TRUE@EXTRA_TARGETS = - assemblies = ../../gnomevfs/gnome-vfs-sharp.dll - references = $(GTKSHARP_LIBS) $(addprefix /r:, $(assemblies)) - noinst_SCRIPTS = $(TARGETS) $(EXTRA_TARGETS) diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix index d80144b3d71..db93bdf27af 100644 --- a/pkgs/development/libraries/gnome-sharp/default.nix +++ b/pkgs/development/libraries/gnome-sharp/default.nix @@ -1,17 +1,35 @@ -{stdenv, fetchurl, pkgconfig, gtk2, mono, gtk-sharp-2_0, gnome2}: +{ stdenv +, lib +, fetchFromGitHub +, pkgconfig +, gtk2 +, mono +, gtk-sharp-2_0 +, gnome2 +, autoconf +, automake +, libtool +, which +}: -stdenv.mkDerivation { - name = "gnome-sharp-2.24.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.24/gnome-sharp-2.24.1.tar.gz; - sha256 = "0cfvs7hw67fp0wimskqd0gdfx323gv6hi0c5pf59krnmhdrl6z8p"; +stdenv.mkDerivation rec { + name = "gnome-sharp-${version}"; + version = "2.24.4"; + + src = fetchFromGitHub { + owner = "mono"; + repo = "gnome-sharp"; + rev = "${version}"; + sha256 = "15jsm6n0sih0nf3w8vmvik97q7l3imz4vkdzmp9k7bssiz4glj1z"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoconf automake libtool which ]; buildInputs = [ gtk2 mono gtk-sharp-2_0 ] - ++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui]); + ++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui ]); - patches = [ ./Makefile.in.patch ]; + preConfigure = '' + ./bootstrap-${lib.versions.majorMinor version} + ''; dontStrip = true; diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index 9a3775a79bd..3d3275b041f 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -1,18 +1,21 @@ -{ fetchurl, stdenv, pkgconfig, intltool, glib, gtk3 -, libgsf, libxml2, libxslt, cairo, pango, librsvg }: +{ fetchurl, stdenv, pkgconfig, intltool, glib, gtk3, lasem +, libgsf, libxml2, libxslt, cairo, pango, librsvg, gnome3 }: stdenv.mkDerivation rec { - name = "goffice-0.10.44"; + pname = "goffice"; + version = "0.10.44"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1fd7cm6j0g0mqgpqs4y22b4gd2ll4mcyvg4d0q22d5ndjapl4q3d"; }; nativeBuildInputs = [ pkgconfig intltool ]; - propagatedBuildInputs = [ # ToDo lasem library for MathML, opt. introspection? - glib gtk3 libxml2 cairo pango libgsf + propagatedBuildInputs = [ + glib gtk3 libxml2 cairo pango libgsf lasem ]; buildInputs = [ libxslt librsvg ]; @@ -20,6 +23,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = { description = "A Glib/GTK+ set of document centric objects and utilities"; diff --git a/pkgs/development/libraries/goocanvasmm/default.nix b/pkgs/development/libraries/goocanvasmm/default.nix new file mode 100644 index 00000000000..b7f56837686 --- /dev/null +++ b/pkgs/development/libraries/goocanvasmm/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, pkgconfig, goocanvas2, gtkmm3, gnome3 }: + +stdenv.mkDerivation rec { + pname = "goocanvasmm"; + version = "1.90.11"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0vpdfrj59nwzwj8bk4s0h05iyql62pxjzsxh72g3vry07s3i3zw0"; + }; + nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ gtkmm3 goocanvas2 ]; + + enableParallelBuilding = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + description = "C++ bindings for GooCanvas"; + homepage = https://wiki.gnome.org/Projects/GooCanvas; + license = licenses.lgpl2; + maintainers = with maintainers; [ ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/granite/02-datetime-clock-format-gsettings.patch b/pkgs/development/libraries/granite/02-datetime-clock-format-gsettings.patch new file mode 100644 index 00000000000..7b7c9871133 --- /dev/null +++ b/pkgs/development/libraries/granite/02-datetime-clock-format-gsettings.patch @@ -0,0 +1,129 @@ +From 698e34dd6e8d98a1818ae00d3313b69a86340771 Mon Sep 17 00:00:00 2001 +From: Fabio Valentini <decathorpe@gmail.com> +Date: Mon, 17 Dec 2018 14:58:14 +0100 +Subject: DateTime: include "clock-format" gsettings key here + +--- + data/io.elementary.granite.gschema.xml | 15 +++++++++++++++ + data/meson.build | 4 ++++ + lib/DateTime.vala | 4 ++-- + meson.build | 11 +++++++++++ + meson/post_install.py | 5 +++++ + 5 files changed, 37 insertions(+), 2 deletions(-) + create mode 100644 data/io.elementary.granite.gschema.xml + create mode 100644 data/meson.build + +diff --git a/data/io.elementary.granite.gschema.xml b/data/io.elementary.granite.gschema.xml +new file mode 100644 +index 0000000..1540fb0 +--- /dev/null ++++ b/data/io.elementary.granite.gschema.xml +@@ -0,0 +1,15 @@ ++<?xml version="1.0" encoding="UTF-8"?> ++<schemalist> ++ <enum id="io.elementary.granite.clock-formats"> ++ <value nick="12h" value="0" /> ++ <value nick="24h" value="1" /> ++ <value nick="ISO8601" value="2" /> ++ </enum> ++ <schema id="io.elementary.granite" path="/io/elementary/granite/"> ++ <key name="clock-format" enum="io.elementary.granite.clock-formats"> ++ <default>"12h"</default> ++ <summary>Whether the clock displays in 12h or 24h format</summary> ++ <description>Whether the clock displays in 12h or 24h format</description> ++ </key> ++ </schema> ++</schemalist> +diff --git a/data/meson.build b/data/meson.build +new file mode 100644 +index 0000000..96cc3b1 +--- /dev/null ++++ b/data/meson.build +@@ -0,0 +1,4 @@ ++install_data( ++ rdnn + '.gschema.xml', ++ install_dir: schema_dir ++) +diff --git a/lib/DateTime.vala b/lib/DateTime.vala +index aea2ec6..3d81191 100644 +--- a/lib/DateTime.vala ++++ b/lib/DateTime.vala +@@ -104,13 +104,13 @@ namespace Granite.DateTime { + } + + /** +- * Gets the //clock-format// key from //org.gnome.desktop.interface// schema ++ * Gets the //clock-format// key from //io.elementary.granite// schema + * and determines if the clock format is 12h based + * + * @return true if the clock format is 12h based, false otherwise. + */ + private static bool is_clock_format_12h () { +- var h24_settings = new Settings ("io.elementary.desktop.wingpanel.datetime"); ++ var h24_settings = new Settings ("io.elementary.granite"); + var format = h24_settings.get_string ("clock-format"); + return (format.contains ("12h")); + } +diff --git a/meson.build b/meson.build +index 8b98eeb..f0abcdf 100644 +--- a/meson.build ++++ b/meson.build +@@ -4,6 +4,8 @@ project( + version: '5.2.2' + ) + ++rdnn = 'io.elementary.' + meson.project_name() ++ + if meson.get_compiler('vala').version().version_compare('<0.40.0') + error('vala compiler version 0.40.0 or newer is required.') + endif +@@ -52,10 +54,18 @@ icons_dir = join_paths( + 'hicolor' + ) + ++schema_dir = join_paths( ++ get_option('prefix'), ++ get_option('datadir'), ++ 'glib-2.0', ++ 'schemas' ++) ++ + pkgconfig = import('pkgconfig') + i18n = import('i18n') + + subdir('lib') ++subdir('data') + subdir('demo') + subdir('icons') + subdir('po') +@@ -68,5 +78,6 @@ endif + meson.add_install_script( + join_paths(meson.current_source_dir(), 'meson', 'post_install.py'), + '--iconsdir', icons_dir, ++ '--schemadir', schema_dir, + ) + +diff --git a/meson/post_install.py b/meson/post_install.py +index 1864515..5313f96 100755 +--- a/meson/post_install.py ++++ b/meson/post_install.py +@@ -6,11 +6,16 @@ import subprocess + + parser = argparse.ArgumentParser() + parser.add_argument("--iconsdir", action="store", required=True) ++parser.add_argument("--schemadir", action="store", required=True) + args = vars(parser.parse_args()) + + icons_dir = args["iconsdir"] ++schema_dir = args["schemadir"] + + if not os.environ.get('DESTDIR'): + print('Compiling icon cache ...') + subprocess.run(['gtk-update-icon-cache', icons_dir]) + ++ print('Compiling GSettings schemas ...') ++ subprocess.run(['glib-compile-schemas', schema_dir]) ++ +-- +2.20.1 + diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix index 2113b4f690b..eacb84e3361 100644 --- a/pkgs/development/libraries/granite/default.nix +++ b/pkgs/development/libraries/granite/default.nix @@ -1,38 +1,54 @@ -{ stdenv, fetchFromGitHub, cmake, ninja, vala_0_40, pkgconfig, gobject-introspection, gnome3, gtk3, glib, gettext }: +{ stdenv, fetchFromGitHub, fetchpatch, python3, meson, ninja, vala_0_40, pkgconfig, gobject-introspection, gnome3, gtk3, glib, gettext, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "granite"; - version = "5.2.1"; - - name = "${pname}-${version}"; + version = "5.2.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "18rw1lv6zk5w2cq8bv6b869z3cdikn9gzk30gw1s9f8n06bh737h"; + sha256 = "1zp0pp5v3j8k6ail724p7h5jj2zmznj0a2ybwfw5sspfdw5bfydh"; }; - cmakeFlags = [ - "-DINTROSPECTION_GIRDIR=share/gir-1.0/" - "-DINTROSPECTION_TYPELIBDIR=lib/girepository-1.0" + patches = [ + # Add Meson support that hit after 5.2.2 + (fetchpatch { + url = "https://github.com/elementary/granite/commit/2066b377226cf327cb2d5399b6b40a2d36d47b11.patch"; + sha256 = "1bxjgq8wvl1sb79cwhmh9kwawnkkfn7c5q67cyz1fjxmamwyyi85"; + }) + (fetchpatch { + url = "https://github.com/elementary/granite/commit/f1b29f52e3aaf0f5d6bba44c42617da265f679c8.patch"; + sha256 = "0cdp9ny6fj1lpcirab641p1qn1rbsvnsaa03hnr6zsdpim96jlvs"; + }) + # Resolve the circular dependency between granite and the datetime wingpanel indicator + # See: https://github.com/elementary/granite/pull/242 + ./02-datetime-clock-format-gsettings.patch ]; nativeBuildInputs = [ - cmake gettext gobject-introspection + meson ninja pkgconfig + python3 vala_0_40 # should be `elementary.vala` when elementary attribute set is merged + wrapGAppsHook ]; buildInputs = [ glib - gnome3.libgee gtk3 + hicolor-icon-theme + gnome3.libgee ]; + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + meta = with stdenv.lib; { description = "An extension to GTK+ used by elementary OS"; longDescription = '' diff --git a/pkgs/development/libraries/gsl/gsl-1_16.nix b/pkgs/development/libraries/gsl/gsl-1_16.nix index f569d9c3ea1..69fe1b0db55 100644 --- a/pkgs/development/libraries/gsl/gsl-1_16.nix +++ b/pkgs/development/libraries/gsl/gsl-1_16.nix @@ -36,5 +36,7 @@ stdenv.mkDerivation rec { extensive test suite. ''; platforms = stdenv.lib.platforms.unix; + # Failing "eigen" tests on aarch64. + badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/desktops/gnome-3/core/gsound/default.nix b/pkgs/development/libraries/gsound/default.nix index b0384c1ebb0..337a2472bab 100644 --- a/pkgs/desktops/gnome-3/core/gsound/default.nix +++ b/pkgs/development/libraries/gsound/default.nix @@ -1,13 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, libcanberra, gobject-introspection, libtool, gnome3 }: -let +stdenv.mkDerivation rec { pname = "gsound"; version = "1.0.2"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53"; }; @@ -17,7 +15,6 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; }; }; diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix index d4d4082509e..96c9d8e0c8e 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix @@ -36,8 +36,6 @@ stdenv.mkDerivation rec { postInstall = '' # Hm, apparently --disable-gtk-doc is ignored... rm -rf $out/share/gtk-doc - - paxmark m $out/bin/gst-launch* $out/libexec/gstreamer-*/gst-plugin-scanner ''; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index cf4069871d1..9ceb571983e 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -1,8 +1,12 @@ -{ stdenv, cmake, ninja, fetchFromGitHub }: +{ stdenv, cmake, ninja, fetchFromGitHub +, static ? false }: + stdenv.mkDerivation rec { name = "gtest-${version}"; version = "1.8.1"; + outputs = [ "out" "dev" ]; + src = fetchFromGitHub { owner = "google"; repo = "googletest"; @@ -10,8 +14,14 @@ stdenv.mkDerivation rec { sha256 = "0270msj6n7mggh4xqqjp54kswbl7mkcc8px1p5dqdpmw5ngh9fzk"; }; + patches = [ + ./fix-cmake-config-includedir.patch + ]; + nativeBuildInputs = [ cmake ninja ]; + cmakeFlags = stdenv.lib.optional (!static) "-DBUILD_SHARED_LIBS=ON"; + meta = with stdenv.lib; { description = "Google's framework for writing C++ tests"; homepage = https://github.com/google/googletest; diff --git a/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch b/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch new file mode 100644 index 00000000000..c05e3a9326a --- /dev/null +++ b/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch @@ -0,0 +1,30 @@ +--- a/googlemock/CMakeLists.txt ++++ b/googlemock/CMakeLists.txt +@@ -106,10 +106,10 @@ + if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") + target_include_directories(gmock SYSTEM INTERFACE + "$<BUILD_INTERFACE:${gmock_build_include_dirs}>" +- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") ++ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>") + target_include_directories(gmock_main SYSTEM INTERFACE + "$<BUILD_INTERFACE:${gmock_build_include_dirs}>" +- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") ++ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>") + endif() + + ######################################################################## +--- a/googletest/CMakeLists.txt ++++ b/googletest/CMakeLists.txt +@@ -126,10 +126,10 @@ + if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") + target_include_directories(gtest SYSTEM INTERFACE + "$<BUILD_INTERFACE:${gtest_build_include_dirs}>" +- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") ++ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>") + target_include_directories(gtest_main SYSTEM INTERFACE + "$<BUILD_INTERFACE:${gtest_build_include_dirs}>" +- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") ++ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>") + endif() + target_link_libraries(gtest_main PUBLIC gtest) + diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 421029a9d55..5c6cd2c7eda 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl, makeWrapper, shared-mime-info +{ stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl, makeWrapper, shared-mime-info, isocodes , expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobject-introspection , xorg, epoxy, json-glib, libxkbcommon, gmp, gnome3 , x11Support ? stdenv.isLinux @@ -13,14 +13,14 @@ assert cupsSupport -> cups != null; with stdenv.lib; let - version = "3.24.1"; + version = "3.24.2"; in stdenv.mkDerivation rec { name = "gtk+3-${version}"; src = fetchurl { url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "0bxhsp7cjph7szg1iyv16nwi60bz59x1smjkqv6sv6mr0zipnf38"; + sha256 = "14l8mimdm44r3h5pn5hzigl1z25jna8jxvb16l88v4nc4zj0afsv"; }; outputs = [ "out" "dev" ]; @@ -35,9 +35,14 @@ stdenv.mkDerivation rec { url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123"; sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; }) + # https://gitlab.gnome.org/GNOME/gtk/issues/1521 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gtk/commit/2905fc861acda3d134a198e56ef2f6c962ad3061.patch; + sha256 = "0y8ljny59kgdhrcfpimi2r082bax60d5kflw1qj9k1mnzjcvjjwl"; + }) ]; - buildInputs = [ libxkbcommon epoxy json-glib ] + buildInputs = [ libxkbcommon epoxy json-glib isocodes ] ++ optional stdenv.isDarwin AppKit; propagatedBuildInputs = with xorg; with stdenv.lib; [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gnome3.gsettings-desktop-schemas diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix index c037db97c04..659dc14800e 100644 --- a/pkgs/development/libraries/gtk-sharp/2.0.nix +++ b/pkgs/development/libraries/gtk-sharp/2.0.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, mono +{ stdenv +, lib +, fetchFromGitHub +, pkgconfig +, mono , glib , pango , gtk2 @@ -12,32 +16,44 @@ , libgnomeprintui ? null , libxml2 , monoDLLFixer +, autoconf +, automake +, libtool +, which }: -stdenv.mkDerivation { - name = "gtk-sharp-2.12.10"; +stdenv.mkDerivation rec { + name = "gtk-sharp-${version}"; + version = "2.12.45"; builder = ./builder.sh; - src = fetchurl { - url = mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.gz; - sha256 = "1y55vc2cp4lggmbil2lb28d0gn71iq6wfyja1l9mya5xll8svzwc"; + src = fetchFromGitHub { + owner = "mono"; + repo = "gtk-sharp"; + rev = version; + sha256 = "1vy6yfwkfv6bb45bzf4g6dayiqkvqqvlr02rsnhd10793hlpqlgg"; }; - # patches = [ ./dllmap-glue.patch ]; - - # patch bad usage of glib, which wasn't tolerated anymore - prePatch = '' - for f in glib/glue/{thread,list,slist}.c; do - sed -i 's,#include <glib/.*\.h>,#include <glib.h>,g' "$f" + postInstall = '' + pushd $out/bin + for f in gapi2-* + do + substituteInPlace $f --replace mono ${mono}/bin/mono done + popd ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoconf automake libtool which ]; + buildInputs = [ mono glib pango gtk2 GConf libglade libgnomecanvas libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 ]; + preConfigure = '' + ./bootstrap-${lib.versions.majorMinor version} + ''; + dontStrip = true; inherit monoDLLFixer; diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index 66ba526f08e..780b00f9d9a 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchzip, atk, cairo, dmd, gdk_pixbuf, gnome3, gst_all_1, librsvg -, pango, pkgconfig, which }: +, pango, pkgconfig, which, vte }: stdenv.mkDerivation rec { name = "gtkd-${version}"; @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { dontStrip = true; inherit atk cairo gdk_pixbuf librsvg pango; - inherit (gnome3) glib gtk3 gtksourceview libgda libpeas vte; + inherit (gnome3) glib gtk3 gtksourceview libgda libpeas; inherit (gst_all_1) gstreamer; gst_plugins_base = gst_all_1.gst-plugins-base; diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 7845143ebeb..ba20af1caf5 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -1,15 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy }: +{ stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome3 }: -let - ver_maj = "3.22"; - ver_min = "2"; -in stdenv.mkDerivation rec { - name = "gtkmm-${ver_maj}.${ver_min}"; + pname = "gtkmm"; + version = "3.24.0"; src = fetchurl { - url = "mirror://gnome/sources/gtkmm/${ver_maj}/${name}.tar.xz"; - sha256 = "91afd98a31519536f5f397c2d79696e3d53143b80b75778521ca7b48cb280090"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0hxaq4x9jqj8vvnv3sb6nwapz83v8lclbm887qqci0g50llcjpyg"; }; outputs = [ "out" "dev" ]; @@ -24,6 +21,13 @@ stdenv.mkDerivation rec { # https://bugzilla.gnome.org/show_bug.cgi?id=764521 doCheck = false; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "${pname}3"; + }; + }; + meta = with stdenv.lib; { description = "C++ interface to the GTK+ graphical user interface library"; diff --git a/pkgs/development/libraries/gtksourceviewmm/4.x.nix b/pkgs/development/libraries/gtksourceviewmm/4.x.nix new file mode 100644 index 00000000000..d60bb29c47a --- /dev/null +++ b/pkgs/development/libraries/gtksourceviewmm/4.x.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig, gtkmm3, glibmm, gtksourceview4, gnome3 }: + +stdenv.mkDerivation rec { + pname = "gtksourceviewmm"; + version = "3.91.1"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "088p2ch1b4fvzl9416nw3waj0pqgp31cd5zj4lx5hzzrq2afgapy"; + }; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "none"; + }; + }; + + nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ glibmm gtkmm3 gtksourceview4 ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + homepage = https://developer.gnome.org/gtksourceviewmm/; + description = "C++ wrapper for gtksourceview"; + license = licenses.lgpl2; + maintainers = gnome3.maintainers; + }; +} + diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 03f4b0fe687..05f11580455 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -2,7 +2,7 @@ , glib, libgudev, udisks2, libgcrypt, libcap, polkit , libgphoto2, avahi, libarchive, fuse, libcdio , libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp -, gnomeSupport ? false, gnome, makeWrapper +, gnomeSupport ? false, gnome, makeWrapper, gcr , libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh , libsecret, libgdata, python3 }: diff --git a/pkgs/development/libraries/icu/63.nix b/pkgs/development/libraries/icu/63.nix new file mode 100644 index 00000000000..719318990c6 --- /dev/null +++ b/pkgs/development/libraries/icu/63.nix @@ -0,0 +1,14 @@ +{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, nativeBuildRoot }: + +import ./base.nix { + version = "63.1"; + sha256 = "17fbk0lm2clsxbmjzvyp245ayx0n4chji3ky1f3fbz2ljjv91i05"; + patches = [ + # https://bugzilla.mozilla.org/show_bug.cgi?id=1499398 + (fetchpatch { + url = https://github.com/unicode-org/icu/commit/8baff8f03e07d8e02304d0c888d0bb21ad2eeb01.patch; + sha256 = "1awfa98ljcf95a85cssahw6bvdnpbq5brf1kgspy14w4mlmhd0jb"; + }) + ]; + patchFlags = [ "-p3" ]; +} { inherit stdenv lib fetchurl fixDarwinDylibNames nativeBuildRoot; } diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index 8ad58c5f90b..0a8cb7d4684 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -1,5 +1,5 @@ { version, sha256, patches ? [], patchFlags ? "" }: -{ stdenv, fetchurl, fixDarwinDylibNames +{ stdenv, lib, fetchurl, fixDarwinDylibNames # Cross-compiled icu4c requires a build-root of a native compile , buildRootOnly ? false, nativeBuildRoot }: @@ -20,7 +20,7 @@ let ''; # https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27 - postPatch = if (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl") + postPatch = if (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl") && lib.versionOlder version "62.1" then "substituteInPlace i18n/digitlst.cpp --replace '<xlocale.h>' '<locale.h>'" else null; # won't find locale_t on darwin diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index f61c507c764..61d7b067ae8 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "intel-gmmlib-${version}"; - version = "18.3.0"; + version = "18.4.1"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = name; - sha256 = "1x1p4xvi870vjka2ag6rmmw897hl7zhav1sgwhnrzrggsx9jrw80"; + sha256 = "1nxbz54a0md9hf0asdbyglvi6kiggksy24ffmk4wzvkai6vinm17"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/lasem/default.nix b/pkgs/development/libraries/lasem/default.nix new file mode 100644 index 00000000000..aa1172029d2 --- /dev/null +++ b/pkgs/development/libraries/lasem/default.nix @@ -0,0 +1,38 @@ +{ fetchurl, stdenv, pkgconfig, intltool, gobject-introspection, glib, gdk_pixbuf +, libxml2, cairo, pango, gnome3 }: + +stdenv.mkDerivation rec { + pname = "lasem"; + version = "0.4.3"; + + outputs = [ "bin" "out" "dev" "man" "doc" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "13ym5pm2y3wk5hh9zb2535i3lnhnzyzs0na1knxwgvwxazwm1ng7"; + }; + + nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; + + propagatedBuildInputs = [ + glib gdk_pixbuf libxml2 cairo pango + ]; + + enableParallelBuilding = true; + doCheck = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = { + description = "SVG and MathML rendering library"; + + homepage = https://wiki.gnome.org/Projects/Lasem; + license = stdenv.lib.licenses.gpl2Plus; + + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index 6dec972e249..e016484e677 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, cmake, pkgconfig, udev, libcec_platform }: -let version = "4.0.3"; in +let version = "4.0.4"; in stdenv.mkDerivation { name = "libcec-${version}"; src = fetchurl { url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz"; - sha256 = "1713qs4nrynkcr3mgs1i7xj10lcyaxqipwiz9p0lfn4xrzjdd47g"; + sha256 = "02j09y06csaic4m0fyb4dr9l3hl15nxbbniwq0i1qlccpxjak0j3"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libcollectdclient/default.nix b/pkgs/development/libraries/libcollectdclient/default.nix index 4f4007649d0..0f1cbeb2f96 100644 --- a/pkgs/development/libraries/libcollectdclient/default.nix +++ b/pkgs/development/libraries/libcollectdclient/default.nix @@ -5,11 +5,7 @@ collectd.overrideAttrs (oldAttrs: { name = "libcollectdclient-${collectd.version}"; buildInputs = [ ]; - NIX_CFLAGS_COMPILE = oldAttrs.NIX_CFLAGS_COMPILE ++ [ - "-Wno-error=unused-function" - ]; - - configureFlags = oldAttrs.configureFlags ++ [ + configureFlags = (oldAttrs.configureFlags or []) ++ [ "--disable-daemon" "--disable-all-plugins" ]; diff --git a/pkgs/desktops/gnome-3/core/libcroco/default.nix b/pkgs/development/libraries/libcroco/default.nix index 312231f648f..dc4a967e7ac 100644 --- a/pkgs/desktops/gnome-3/core/libcroco/default.nix +++ b/pkgs/development/libraries/libcroco/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, pkgconfig, libxml2, glib, fetchpatch, gnome3 }: -let + +stdenv.mkDerivation rec { pname = "libcroco"; version = "0.6.12"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0q7qhi7z64i26zabg9dbs5706fa8pmzp1qhpa052id4zdiabbi6x"; }; diff --git a/pkgs/development/libraries/libdeflate/default.nix b/pkgs/development/libraries/libdeflate/default.nix new file mode 100644 index 00000000000..0328a2215b4 --- /dev/null +++ b/pkgs/development/libraries/libdeflate/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "libdeflate-${version}"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "ebiggers"; + repo = "libdeflate"; + rev = "v${version}"; + sha256 = "1wqxwza6rwmhrsy9sw86pdcd0w742gbzsy9qxnq6kk59m6h1dbsb"; + }; + + postPatch = '' + substituteInPlace Makefile --replace /usr $out + ''; + + configurePhase = '' + make programs/config.h + ''; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Fast DEFLATE/zlib/gzip compressor and decompressor"; + license = licenses.mit; + homepage = https://github.com/ebiggers/libdeflate; + platforms = platforms.linux; + maintainers = with maintainers; [ orivej ]; + }; +} diff --git a/pkgs/development/libraries/libepc/default.nix b/pkgs/development/libraries/libepc/default.nix new file mode 100644 index 00000000000..59780699fd1 --- /dev/null +++ b/pkgs/development/libraries/libepc/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk-doc, glib, avahi, gnutls, libuuid, libsoup, gtk3, gnome3 }: + +let + avahiWithGtk = avahi.override { gtk3Support = true; }; +in stdenv.mkDerivation rec { + pname = "libepc"; + version = "0.4.6"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1s3svb2slqjsrqfv50c2ymnqcijcxb5gnx6bfibwh9l5ga290n91"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + gtk-doc + ]; + buildInputs = [ + glib + libuuid + gtk3 + ]; + propagatedBuildInputs = [ + avahiWithGtk + gnutls + libsoup + ]; + + enableParallelBuilding = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + description = "Easy Publish and Consume Library"; + homepage = https://wiki.gnome.org/Projects/libepc; + license = licenses.lgpl21Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index 796c03dab5e..a0323481be9 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -9,23 +9,29 @@ stdenv.mkDerivation rec { name = if extraOnly then "libfm-extra-${version}" else "libfm-${version}"; - version = "1.3.0.2"; + version = "1.3.1"; src = fetchurl { url = "mirror://sourceforge/pcmanfm/libfm-${version}.tar.xz"; - sha256 = "0wkwbi1nyvqza3r1dhrq846axiiq0fy0dqgngnagh76fjrwnzl0q"; + sha256 = "1r6gl49xrykldwz8y4h2s7gjarxigg3bbkrj0gphxjj1vr5j9ccn"; }; nativeBuildInputs = [ vala pkgconfig intltool ]; buildInputs = [ glib gtk pango ] ++ optional (!extraOnly) menu-cache; - configureFlags = optional extraOnly "--with-extra-only" + configureFlags = [ + "--sysconfdir=/etc" + ] ++ optional extraOnly "--with-extra-only" ++ optional withGtk3 "--with-gtk=3"; + installFlags = [ + "sysconfdir=${placeholder "out"}/etc" + ]; + enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://blog.lxde.org/?cat=28/; + homepage = https://blog.lxde.org/category/pcmanfm/; license = licenses.lgpl21Plus; description = "A glib-based library for file management"; maintainers = [ maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index ee9323ebc5c..9bf03f25c9c 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, vala +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala , overrideCC, gcc6 , mysqlSupport ? false, mysql ? null , postgresSupport ? false, postgresql ? null @@ -23,7 +23,7 @@ assert postgresSupport -> postgresql != null; hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig intltool itstool libxml2 vala ]; + nativeBuildInputs = [ pkgconfig intltool itstool libxml2 gobject-introspection vala ]; buildInputs = with stdenv.lib; [ gtk3 openssl gnome3.libgee ] ++ optional (mysqlSupport) mysql.connector-c ++ optional (postgresSupport) postgresql; diff --git a/pkgs/development/libraries/libgdamm/default.nix b/pkgs/development/libraries/libgdamm/default.nix new file mode 100644 index 00000000000..012400a49ab --- /dev/null +++ b/pkgs/development/libraries/libgdamm/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, pkgconfig, glibmm, libgda, libxml2, gnome3 +, mysqlSupport ? false, mysql ? null +, postgresSupport ? false, postgresql ? null }: + +let + gda = libgda.override { + inherit mysqlSupport postgresSupport; + }; +in stdenv.mkDerivation rec { + pname = "libgdamm"; + version = "4.99.11"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1fyh15b3f8hmwbswalxk1g4l04yvvybksn5nm7gznn5jl5q010p9"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glibmm libxml2 ]; + propagatedBuildInputs = [ gda ]; + + enableParallelBuilding = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + description = "C++ bindings for libgda"; + homepage = http://www.gnome-db.org/; + license = licenses.lgpl21Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/core/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix index 4cbf0a78d89..f22cc568a97 100644 --- a/pkgs/desktops/gnome-3/core/libgdata/default.nix +++ b/pkgs/development/libraries/libgdata/default.nix @@ -1,30 +1,27 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, json-glib +{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, json-glib, gcr , gobject-introspection, liboauth, gnome3, p11-kit, openssl, uhttpmock }: -let +stdenv.mkDerivation rec { pname = "libgdata"; version = "0.17.9"; -in -stdenv.mkDerivation rec { - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0fj54yqxdapdppisqm1xcyrpgcichdmipq0a0spzz6009ikzgi45"; }; - NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup.dev}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1"; + NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup.dev}/include/libsoup-gnome-2.4/ -I${gcr}/include/gcr-3 -I${gcr}/include/gck-1"; + + nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; buildInputs = with gnome3; - [ pkgconfig libsoup intltool libxml2 glib gobject-introspection - liboauth gcr gnome-online-accounts p11-kit openssl uhttpmock ]; + [ libsoup libxml2 glib liboauth gcr gnome-online-accounts p11-kit openssl uhttpmock ]; propagatedBuildInputs = [ json-glib ]; passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; versionPolicy = "none"; # Stable version has not been updated for a long time. }; }; @@ -36,5 +33,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.lgpl21Plus; }; - } diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index d54f9203d23..70353d68ca7 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -1,31 +1,40 @@ -{ stdenv, fetchurl, pkgconfig, glib, cairo, Carbon, fontconfig +{ stdenv, fetchFromGitHub, pkgconfig, glib, cairo, Carbon, fontconfig , libtiff, giflib, libjpeg, libpng -, libXrender, libexif }: +, libXrender, libexif, autoreconfHook, fetchpatch }: stdenv.mkDerivation rec { - name = "libgdiplus-2.10.9"; + name = "libgdiplus-5.6"; - src = fetchurl { - url = "https://download.mono-project.com/sources/libgdiplus/${name}.tar.bz2"; - sha256 = "0klnbly2q0yx5p0l5z8da9lhqsjj9xqj06kdw2v7rnms4z1vdpkd"; + src = fetchFromGitHub { + owner = "mono"; + repo = "libgdiplus"; + rev = "5.6"; + sha256 = "11xr84kng74j3pd8sx74q80a71k6dw0a502qgibcxlyqh666lfb7"; }; NIX_LDFLAGS = "-lgif"; - patches = - [ (fetchurl { - url = "https://raw.github.com/MagicGroup/MagicSpecLib/master/libgdiplus/libgdiplus-2.10.1-libpng15.patch"; - sha256 = "130r0jm065pjvbz5dkx96w37vj1wqc8fakmi2znribs14g0bl65f"; - }) - ./giflib.patch - ]; - - patchFlags = "-p0"; + patches = [ # Series of patches cherry-picked from master, all fixes various sigsegv (or required by other patch) + (fetchpatch { + url = "https://github.com/mono/libgdiplus/commit/d33a2580a94701ff33abe28c22881d6173be57d0.patch"; + sha256 = "0rr54jylscn4icqjprqhwrncyr92r0d7kmfrrq3myskplpqv1c11"; + }) + (fetchpatch { + url ="https://github.com/mono/libgdiplus/commit/aa6aa53906935572f52f519fe4ab9ebedc051d08.patch"; + sha256 = "1wg0avm8qv5cb4vk80baflfzszm6q7ydhn89c3h6kq68hg6zsf1f"; + }) + (fetchpatch { + url = "https://github.com/mono/libgdiplus/commit/81e45a1d5a3ac3cf035bcc3fabb2859818b6cc04.patch"; + sha256 = "07wmc88cd1lqifs5x6npryni65jyy9gi8lgr2i1lb7v0fhvlyswg"; + }) + ]; hardeningDisable = [ "format" ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = - [ pkgconfig glib cairo fontconfig libtiff giflib + [ glib cairo fontconfig libtiff giflib libjpeg libpng libXrender libexif ] ++ stdenv.lib.optional stdenv.isDarwin Carbon; @@ -34,6 +43,10 @@ stdenv.mkDerivation rec { ln -s $out/lib/libgdiplus.0.dylib $out/lib/libgdiplus.so ''; + checkPhase = '' + make check -w + ''; + meta = with stdenv.lib; { description = "Mono library that provides a GDI+-compatible API on non-Windows operating systems"; homepage = https://www.mono-project.com/docs/gui/libgdiplus/; diff --git a/pkgs/development/libraries/libgdiplus/giflib.patch b/pkgs/development/libraries/libgdiplus/giflib.patch deleted file mode 100644 index 7b90d9863fd..00000000000 --- a/pkgs/development/libraries/libgdiplus/giflib.patch +++ /dev/null @@ -1,143 +0,0 @@ -diff -Naur libgdiplus-2.10.9-orig/src/gifcodec.c libgdiplus-2.10.9/src/gifcodec.c ---- src/gifcodec.c -+++ src/gifcodec.c -@@ -39,8 +39,10 @@ - - #include "gifcodec.h" - -+#if GIFLIB_MAJOR < 5 - /* giflib declares this incorrectly as EgifOpen */ - extern GifFileType *EGifOpen(void *userData, OutputFunc writeFunc); -+#endif - - /* Data structure used for callback */ - typedef struct -@@ -105,7 +107,7 @@ - */ - - static int --AddExtensionBlockMono(SavedImage *New, int Len, BYTE ExtData[]) -+AddExtensionBlockMono(SavedImage *New, int Len, int func, BYTE ExtData[]) - { - ExtensionBlock *ep; - -@@ -129,7 +131,7 @@ - - if (ExtData) { - memcpy(ep->Bytes, ExtData, Len); -- ep->Function = New->Function; -+ ep->Function = func; - } - - return (GIF_OK); -@@ -232,20 +234,20 @@ - } - - case EXTENSION_RECORD_TYPE: { -- if (DGifGetExtension(GifFile, &temp_save.Function, &ExtData) == GIF_ERROR) { -+ int func; -+ if (DGifGetExtension(GifFile, &func, &ExtData) == GIF_ERROR) { - return (GIF_ERROR); - } - - while (ExtData != NULL) { - /* Create an extension block with our data */ -- if (AddExtensionBlockMono(&temp_save, ExtData[0], &ExtData[1]) == GIF_ERROR) { -+ if (AddExtensionBlockMono(&temp_save, func, ExtData[0], &ExtData[1]) == GIF_ERROR) { - return (GIF_ERROR); - } - - if (DGifGetExtensionNext(GifFile, &ExtData) == GIF_ERROR) { - return (GIF_ERROR); - } -- temp_save.Function = 0; - } - break; - } -@@ -303,12 +305,19 @@ - result = NULL; - loop_counter = FALSE; - -+#if GIFLIB_MAJOR < 5 - if (from_file) { - gif = DGifOpen(stream, &gdip_gif_fileinputfunc); - } else { - gif = DGifOpen (stream, &gdip_gif_inputfunc); - } -- -+#else -+ if (from_file) -+ gif = DGifOpen(stream, &gdip_gif_fileinputfunc, NULL); -+ else -+ gif = DGifOpen(stream, &gdip_gif_inputfunc, NULL); -+#endif -+ - if (gif == NULL) { - goto error; - } -@@ -581,7 +590,7 @@ - } - - FreeExtensionMono(&global_extensions); -- DGifCloseFile (gif); -+ DGifCloseFile (gif, NULL); - - *image = result; - return Ok; -@@ -597,7 +606,7 @@ - - if (gif != NULL) { - FreeExtensionMono (&global_extensions); -- DGifCloseFile (gif); -+ DGifCloseFile (gif, NULL); - } - - *image = NULL; -@@ -660,11 +669,22 @@ - return InvalidParameter; - } - -+#if GIFLIB_MAJOR < 5 - if (from_file) { - fp = EGifOpenFileName (stream, 0); - } else { - fp = EGifOpen (stream, gdip_gif_outputfunc); - } -+#else -+ if (from_file) -+ fp = EGifOpenFileName (stream, 0, NULL); -+ else -+ fp = EGifOpen (stream, gdip_gif_outputfunc, NULL); -+#define MakeMapObject GifMakeMapObject -+#define FreeMapObject GifFreeMapObject -+#define QuantizeBuffer GifQuantizeBuffer -+#define BitSize GifBitSize -+#endif - - if (!fp) { - return FileNotFound; -@@ -848,8 +868,15 @@ - Buffer[0] = 1; - Buffer[1] = ptr[0]; - Buffer[2] = ptr[1]; -+#if GIFLIB_MAJOR < 5 - EGifPutExtensionFirst(fp, APPLICATION_EXT_FUNC_CODE, 11, "NETSCAPE2.0"); - EGifPutExtensionLast(fp, APPLICATION_EXT_FUNC_CODE, 3, Buffer); -+#else -+ EGifPutExtensionLeader(fp, APPLICATION_EXT_FUNC_CODE); -+ EGifPutExtensionBlock(fp, 11, "NETSCAPE2.0"); -+ EGifPutExtensionBlock(fp, 3, Buffer); -+ EGifPutExtensionTrailer(fp); -+#endif - } - } - -@@ -923,7 +950,7 @@ - } - } - -- EGifCloseFile (fp); -+ EGifCloseFile (fp, NULL); - - return Ok; - diff --git a/pkgs/desktops/gnome-3/core/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix index 2de8b430843..260c3a3d97b 100644 --- a/pkgs/desktops/gnome-3/core/libgee/default.nix +++ b/pkgs/development/libraries/libgee/default.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobject-introspection, gnome3 }: -let + +stdenv.mkDerivation rec { pname = "libgee"; version = "0.20.1"; -in -stdenv.mkDerivation rec { - name = "${pname}-${version}"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0c26x8gi3ivmhlbqcmiag4jwrkvcy28ld24j55nqr3jikb904a5v"; }; @@ -24,7 +22,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/core/libgepub/default.nix b/pkgs/development/libraries/libgepub/default.nix index 26531a61ffa..70ec222f88f 100644 --- a/pkgs/desktops/gnome-3/core/libgepub/default.nix +++ b/pkgs/development/libraries/libgepub/default.nix @@ -1,14 +1,12 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobject-introspection, gnome3 , webkitgtk, libsoup, libxml2, libarchive }: -let +stdenv.mkDerivation rec { pname = "libgepub"; version = "0.6.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "16dkyywqdnfngmwsgbyga0kl9vcnzczxi3lmhm27pifrq5f3k2n7"; }; @@ -20,7 +18,6 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; versionPolicy = "none"; }; }; diff --git a/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix b/pkgs/development/libraries/libgnomekbd/default.nix index a9b27fa65a4..20a9bb91604 100644 --- a/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix +++ b/pkgs/development/libraries/libgnomekbd/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper, gnome3 }: stdenv.mkDerivation rec { - name = "libgnomekbd-${version}"; + pname = "libgnomekbd"; version = "3.26.0"; src = fetchurl { - url = "mirror://gnome/sources/libgnomekbd/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "ea3b418c57c30615f7ee5b6f718def7c9d09ce34637324361150744258968875"; }; passthru = { - updateScript = gnome3.updateScript { packageName = "libgnomekbd"; attrPath = "gnome3.libgnomekbd"; }; + updateScript = gnome3.updateScript { packageName = pname; }; }; nativeBuildInputs = [ pkgconfig file intltool makeWrapper ]; diff --git a/pkgs/development/libraries/libgrss/default.nix b/pkgs/development/libraries/libgrss/default.nix index 430ebcfd309..8fc44fb6a8d 100644 --- a/pkgs/development/libraries/libgrss/default.nix +++ b/pkgs/development/libraries/libgrss/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "none"; }; }; diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index bcd37396bf7..4e7ff031438 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,12 +1,13 @@ { fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2 -, python, perl, gdk_pixbuf, libiconv, libintl }: +, python, perl, gdk_pixbuf, libiconv, libintl, gnome3 }: stdenv.mkDerivation rec { - name = "libgsf-1.14.44"; + pname = "libgsf"; + version = "1.14.45"; src = fetchurl { - url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz"; - sha256 = "1ppzfk3zmmgrg9jh8vc4dacddbfngjslq2wpj94pcr3i0c8dxgk8"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1yk91ccf7z9b8d8ac6vip3gc5c0pkwgabqy6l0pj0kf43l7jrg2w"; }; nativeBuildInputs = [ pkgconfig intltool libintl ]; @@ -21,6 +22,12 @@ stdenv.mkDerivation rec { doCheck = true; preCheck = "patchShebangs ./tests/"; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { description = "GNOME's Structured File Library"; homepage = https://www.gnome.org/projects/libgsf; diff --git a/pkgs/desktops/gnome-3/core/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index f9feb21749a..b5fda25a8c5 100644 --- a/pkgs/desktops/gnome-3/core/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -1,21 +1,19 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, libxml2, glib, gtk, gettext, libsoup +{ stdenv, fetchurl, meson, ninja, pkgconfig, libxml2, glib, gtk3, gettext, libsoup , gtk-doc, docbook_xsl, docbook_xml_dtd_43, gobject-introspection, python3, tzdata, geocode-glib, vala, gnome3 }: -let +stdenv.mkDerivation rec { pname = "libgweather"; version = "3.28.2"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0xfy5ghwvnz2g9074dy6512m4z2pv66pmja14vhi9imgacbfh708"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ]; - buildInputs = [ glib gtk libsoup libxml2 geocode-glib ]; + buildInputs = [ glib gtk3 libsoup libxml2 geocode-glib ]; postPatch = '' chmod +x meson/meson_post_install.py @@ -31,7 +29,6 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/core/libgxps/default.nix b/pkgs/development/libraries/libgxps/default.nix index 852a546f4bf..3b7f29de573 100644 --- a/pkgs/desktops/gnome-3/core/libgxps/default.nix +++ b/pkgs/development/libraries/libgxps/default.nix @@ -2,14 +2,12 @@ , libarchive, freetype, libjpeg, libtiff, gnome3, fetchpatch }: -let +stdenv.mkDerivation rec { pname = "libgxps"; version = "0.3.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "412b1343bd31fee41f7204c47514d34c563ae34dafa4cc710897366bd6cd0fae"; }; @@ -38,7 +36,6 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; versionPolicy = "none"; }; }; diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 7e80ec817d1..1d07fe6ca26 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -6,7 +6,7 @@ let pname = "libhandy"; - version = "0.0.5"; + version = "0.0.6"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { owner = "Librem5"; repo = pname; rev = "v${version}"; - sha256 = "0h25ckdfx3slc2mn4vi06bhw42nrqpzn75i9d7wby9iq0cl13l08"; + sha256 = "0gmqsxkpi288qjfdczfrbvjqyy9sbn3gligqwgqj27ask95zl1q5"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/misc/libmediaart/default.nix b/pkgs/development/libraries/libmediaart/default.nix index fac5db94387..48bd959009a 100644 --- a/pkgs/desktops/gnome-3/misc/libmediaart/default.nix +++ b/pkgs/development/libraries/libmediaart/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, gobject-introspection, gnome3 }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk_pixbuf, gobject-introspection, gnome3 }: -let +stdenv.mkDerivation rec { pname = "libmediaart"; version = "1.9.4"; -in -stdenv.mkDerivation rec { - name = "${pname}-${version}"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d"; }; - nativeBuildInputs = [ pkgconfig gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkgconfig vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ]; buildInputs = [ glib gdk_pixbuf ]; + doCheck = true; + passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; versionPolicy = "none"; }; }; diff --git a/pkgs/desktops/gnome-3/core/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index fdbeb94c505..314d5884501 100644 --- a/pkgs/desktops/gnome-3/core/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -1,32 +1,34 @@ { stdenv, fetchurl, pkgconfig, intltool, gnome3 -, glib, gtk3, gobject-introspection, python3Packages, ncurses +, glib, gtk3, gobject-introspection, python3, ncurses }: stdenv.mkDerivation rec { - name = "libpeas-${version}"; + pname = "libpeas"; version = "1.22.0"; src = fetchurl { - url = "mirror://gnome/sources/libpeas/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0qm908kisyjzjxvygdl18hjqxvvgkq9w0phs2g55pck277sw0bsv"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "libpeas"; attrPath = "gnome3.libpeas"; }; - }; - configureFlags = [ "--enable-python3" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool glib gtk3 gnome3.defaultIconTheme ncurses python3Packages.python python3Packages.pygobject3 ]; + nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; + buildInputs = [ glib gtk3 ncurses python3 python3.pkgs.pygobject3 ]; propagatedBuildInputs = [ # Required by libpeas-1.0.pc gobject-introspection ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { description = "A GObject-based plugins engine"; - homepage = http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/; + homepage = https://wiki.gnome.org/Projects/Libpeas; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = gnome3.maintainers; diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index 36e99c8cd91..d64591273bc 100644 --- a/pkgs/development/libraries/libpfm/default.nix +++ b/pkgs/development/libraries/libpfm/default.nix @@ -9,9 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0jabhjx77yppr7x38bkfww6n2a480gj62rw0qp7prhdmg19mf766"; }; - installFlags = "DESTDIR=\${out} PREFIX= LDCONFIG=true"; - makeFlags = [ + "PREFIX=${placeholder "out"}" + "LDCONFIG=true" "ARCH=${stdenv.targetPlatform.uname.processor}" "SYS=${stdenv.targetPlatform.uname.system}" ]; diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix index 2f20150ad16..db9c2946935 100644 --- a/pkgs/development/libraries/libqmatrixclient/default.nix +++ b/pkgs/development/libraries/libqmatrixclient/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "libqmatrixclient-${version}"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "QMatrixClient"; repo = "libqmatrixclient"; rev = "v${version}"; - sha256 = "1llzqjagvp91kcg26q5c4qw9aaz7wna3rh6k06rc3baivrjqf3cn"; + sha256 = "16hi2xqlb4afspqw31c5w63qp0j4gkd6sl7j637b8cac2yigbbns"; }; buildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 766c0dcf00e..0487010d11e 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "librealsense-${version}"; - version = "2.16.4"; + version = "2.17.0"; src = fetchFromGitHub { owner = "IntelRealSense"; repo = "librealsense"; rev = "v${version}"; - sha256 = "0664lsdw9a3s3apqiv9kkzfnz86ai9wdc8y00qyxrmxq9lpjsq11"; + sha256 = "1ac580yhxmvxpdvlzdzpcdffysr6z3dl8dykndnq5758alkyspd7"; }; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/rest/default.nix b/pkgs/development/libraries/librest/default.nix index 70cc31cd706..e70ac9a5362 100644 --- a/pkgs/desktops/gnome-3/core/rest/default.nix +++ b/pkgs/development/libraries/librest/default.nix @@ -1,29 +1,28 @@ { stdenv, fetchurl, pkgconfig, glib, libsoup, gobject-introspection, gnome3 }: -let +stdenv.mkDerivation rec { pname = "rest"; version = "0.8.1"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib libsoup gobject-introspection]; + nativeBuildInputs = [ pkgconfig gobject-introspection ]; + buildInputs = [ glib libsoup ]; configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ]; passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "librest"; }; }; meta = with stdenv.lib; { + description = "Helper library for RESTful services"; homepage = https://wiki.gnome.org/Projects/Librest; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix index 5be9a2de94e..a592fd86257 100644 --- a/pkgs/development/libraries/librime/default.nix +++ b/pkgs/development/libraries/librime/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "librime-${version}"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "rime"; repo = "librime"; rev = "${version}"; - sha256 = "1y0h3nnz97smx9z8h5fzk4c27mvrwv8kajxffqc43bhyvxvb2jd6"; + sha256 = "06q10cv7a3i6d8l3sq79nasw3p1njvmjgh4jq2hqw9abcx351m1r"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index 8eba5377bc3..434dbfb9f72 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -1,20 +1,25 @@ -{ stdenv, fetchurl, pkgconfig, gnum4 }: -let - ver_maj = "2.10"; # odd major numbers are unstable - ver_min = "0"; -in +{ stdenv, fetchurl, pkgconfig, gnum4, gnome3 }: + stdenv.mkDerivation rec { - name = "libsigc++-${ver_maj}.${ver_min}"; + pname = "libsigc++"; + version = "2.10.1"; src = fetchurl { - url = "mirror://gnome/sources/libsigc++/${ver_maj}/${name}.tar.xz"; - sha256 = "f843d6346260bfcb4426259e314512b99e296e8ca241d771d21ac64f28298d81"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "00v08km4wwzbh6vjxb21388wb9dm6g2xh14rgwabnv4c2wk5z8n9"; }; nativeBuildInputs = [ pkgconfig gnum4 ]; doCheck = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "libsigcxx"; + }; + }; + meta = with stdenv.lib; { homepage = https://libsigcplusplus.github.io/libsigcplusplus/; description = "A typesafe callback system for standard C++"; diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/development/libraries/libuchardet/default.nix index 52bc0ac5cfd..5aa26a749e4 100644 --- a/pkgs/development/libraries/libuchardet/default.nix +++ b/pkgs/development/libraries/libuchardet/default.nix @@ -1,25 +1,31 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "libuchardet-${version}"; + pname = "uchardet"; + version = "0.0.6"; - version = "0.0.5"; + outputs = [ "bin" "out" "man" "dev" ]; - src = fetchFromGitHub { - owner = "BYVoid"; - repo = "uchardet"; - rev = "v${version}"; - sha256 = "0rkym5bhq3hn7623fy0fggw0qaghha71k8bi41ywqd2lchpahrrm"; + src = fetchurl { + url = "https://www.freedesktop.org/software/${pname}/releases/${pname}-${version}.tar.xz"; + sha256 = "0q9c02b6nmw41yfsiqsnphgc3f0yg3fj31wkccp47cmwvy634lc3"; }; buildInputs = [ cmake ]; - doCheck = false; # fails all the tests (ctest) + cmakeFlags = [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests + # TODO: move the following to CMake setup hook + "-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin" + "-DCMAKE_INSTALL_MANDIR=${placeholder "man"}/share/man" + ]; + + doCheck = true; meta = with stdenv.lib; { description = "Mozilla's Universal Charset Detector C/C++ API"; - homepage = https://www.byvoid.com/zht/project/uchardet; - license = licenses.mpl11; + homepage = https://www.freedesktop.org/wiki/Software/uchardet/; + license = licenses.mpl11; maintainers = with maintainers; [ cstrahan ]; platforms = with platforms; unix; }; diff --git a/pkgs/desktops/gnome-3/core/libzapojit/default.nix b/pkgs/development/libraries/libzapojit/default.nix index 5c029176787..2ad017dc90b 100644 --- a/pkgs/desktops/gnome-3/core/libzapojit/default.nix +++ b/pkgs/development/libraries/libzapojit/default.nix @@ -1,30 +1,28 @@ -{ stdenv, fetchurl, pkgconfig, glib, intltool, json-glib, rest, libsoup, gnome-online-accounts, gnome3, gobject-introspection }: -let +{ stdenv, fetchurl, pkgconfig, glib, intltool, json-glib, librest, libsoup, gnome3, gobject-introspection }: + +stdenv.mkDerivation rec { pname = "libzapojit"; version = "0.0.3"; -in -stdenv.mkDerivation rec { - name = "${pname}-${version}"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x"; }; nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; - propagatedBuildInputs = [ glib json-glib rest libsoup gnome-online-accounts ]; # zapojit-0.0.pc + propagatedBuildInputs = [ glib json-glib librest libsoup gnome3.gnome-online-accounts ]; # zapojit-0.0.pc passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; }; }; meta = with stdenv.lib; { description = "GObject wrapper for the SkyDrive and Hotmail REST APIs"; + homepage = https://wiki.gnome.org/Projects/Zapojit; license = licenses.lgpl21Plus; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index ef187a15efc..047a74f0840 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "lmdb-${version}"; - version = "0.9.22"; + version = "0.9.23"; src = fetchFromGitHub { owner = "LMDB"; repo = "lmdb"; rev = "LMDB_${version}"; - sha256 = "0lng4ra2qrbqcf8klvqp68qarha0z4bkqhhv8lhh45agsxyrhfkj"; + sha256 = "0ag7l5180ajvm73y59m7sn3p52xm8m972d08cshxhpwgwa4v35k6"; }; postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix index 7a390021d1f..7fb79c549be 100644 --- a/pkgs/development/libraries/log4cplus/default.nix +++ b/pkgs/development/libraries/log4cplus/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl }: let - name = "log4cplus-2.0.2"; + name = "log4cplus-2.0.3"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/log4cplus/${name}.tar.bz2"; - sha256 = "0y9yy32lhgrcss8i2gcc9incdy55rcrr16dx051gkia1vdzfkay4"; + sha256 = "0rwzwskvv94cqg2nn7jsvzlak7y01k37v345fcm040klrjvkbc3w"; }; meta = { diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index 367c4e96384..c7794b1a8bf 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "mailcore2-${version}"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "MailCore"; repo = "mailcore2"; rev = version; - sha256 = "1d0wmnkk9vnjqc28i79z3fwaaycdbprfspagik4mzdkgval5r5pm"; + sha256 = "0yxynvfmifpw9hdhv499a813hb2ynan74r353lhcdajkkm7w8br5"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix index c92b6a4e728..d64b7f12312 100644 --- a/pkgs/development/libraries/menu-cache/default.nix +++ b/pkgs/development/libraries/menu-cache/default.nix @@ -14,9 +14,9 @@ stdenv.mkDerivation { buildInputs = [ glib libfm-extra ]; meta = with stdenv.lib; { - homepage = http://blog.lxde.org/?tag=menu-cache; - license = licenses.gpl2Plus; description = "Library to read freedesktop.org menu files"; + homepage = https://blog.lxde.org/tag/menu-cache/; + license = licenses.gpl2Plus; maintainers = [ maintainers.ttuegel ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/libraries/mm-common/default.nix b/pkgs/development/libraries/mm-common/default.nix new file mode 100644 index 00000000000..78ae8875fcf --- /dev/null +++ b/pkgs/development/libraries/mm-common/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, gnome3 }: + +stdenv.mkDerivation rec { + pname = "mm-common"; + version = "0.9.12"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "02vwgv404b56wxy0gnm9xq9fvzgn9dhfqcy2hhl78ljv3v7drzyf"; + }; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "none"; + }; + }; + + meta = with stdenv.lib; { + description = "Common build files of GLib/GTK+ C++ bindings"; + longDescription = '' + The mm-common module provides the build infrastructure and utilities + shared among the GNOME C++ binding libraries. It is only a required + dependency for building the C++ bindings from the gnome.org version + control repository. An installation of mm-common is not required for + building tarball releases, unless configured to use maintainer-mode. + ''; + homepage = http://www.gtkmm.org; + license = licenses.gpl2Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix index ca72557242f..43311c29659 100644 --- a/pkgs/development/libraries/mono-addins/default.nix +++ b/pkgs/development/libraries/mono-addins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono48, gtk-sharp-2_0 }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono4, gtk-sharp-2_0 }: stdenv.mkDerivation rec { name = "mono-addins-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook ]; # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged - buildInputs = [ mono48 gtk-sharp-2_0 ]; + buildInputs = [ mono4 gtk-sharp-2_0 ]; dontStrip = true; diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index bab52e0fbe0..ffe6b5edf96 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -23,17 +23,18 @@ stdenv.mkDerivation rec { doCheck = true; preFixup = '' + # Ensure the default compilers are the ones mpich was built with + sed -i 's:CC="gcc":CC=${stdenv.cc}/bin/gcc:' $out/bin/mpicc + sed -i 's:CXX="g++":CXX=${stdenv.cc}/bin/g++:' $out/bin/mpicxx + sed -i 's:FC="gfortran":FC=${gfortran}/bin/gfortran:' $out/bin/mpifort + '' + + stdenv.lib.optionalString (!stdenv.isDarwin) '' # /tmp/nix-build... ends up in the RPATH, fix it manually for entry in $out/bin/mpichversion $out/bin/mpivars; do echo "fix rpath: $entry" patchelf --set-rpath "$out/lib" $entry done - - # Ensure the default compilers are the ones mpich was built with - sed -i 's:CC="gcc":CC=${stdenv.cc}/bin/gcc:' $out/bin/mpicc - sed -i 's:CXX="g++":CXX=${stdenv.cc}/bin/g++:' $out/bin/mpicxx - sed -i 's:FC="gfortran":FC=${gfortran}/bin/gfortran:' $out/bin/mpifort - ''; + ''; meta = with stdenv.lib; { description = "Implementation of the Message Passing Interface (MPI) standard"; @@ -49,6 +50,6 @@ stdenv.mkDerivation rec { fullName = "MPICH license (permissive)"; }; maintainers = [ maintainers.markuskowa ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index d57461853d3..eb737c0757d 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "nlohmann_json-${version}"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "nlohmann"; repo = "json"; rev = "v${version}"; - sha256 = "1140gz5za7yvfcphdgxaq1dm4b1vxy1m8d1w0s0smv4vvdvl26ym"; + sha256 = "1jq522d48bvfrxr4f6jnijwx2dwqfb8w9k636j4kxlg1hka27lji"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix index bfbf6f1212f..81754ffad4d 100644 --- a/pkgs/development/libraries/openbabel/default.nix +++ b/pkgs/development/libraries/openbabel/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkgconfig }: +{stdenv, fetchurl, fetchpatch, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkgconfig }: stdenv.mkDerivation rec { name = "openbabel-${version}"; @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "0xm7y859ivq2cp0q08mwshfxm0jq31xkyr4x8s0j6l7khf57yk2r"; }; + patches = [ + # ARM / AArch64 fixes. + (fetchpatch { + url = https://github.com/openbabel/openbabel/commit/ee11c98a655296550710db1207b294f00e168216.patch; + sha256 = "0wjqjrkr4pfirzzicdvlyr591vppydk572ix28jd2sagnfnf566g"; + }) + ]; + # TODO : perl & python bindings; # TODO : wxGTK: I have no time to compile # TODO : separate lib and apps diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index f948cbb062f..cca820e2f37 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -35,20 +35,20 @@ }: let - version = "3.4.4"; + version = "3.4.5"; src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; rev = version; - sha256 = "1xzbv0922r2zq4fgpkc1ldyq3kxp4c6x6dizydbspka18jrrxqlr"; + sha256 = "0hz9316ys2qi0lx9dcbsk3mkn8cn08q12hc96p6zz2d4is6d5wsc"; }; contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; rev = version; - sha256 = "0ylsljkmgfj5vam05cv0z3qwkqwjwz5fs5f5yif3pwvb99lxlbib"; + sha256 = "1fw7qwgibiznqal2dg4alkw8hrrrpjc0jaicf2406604rjm2lx6h"; }; # Contrib must be built in order to enable Tesseract support: @@ -147,13 +147,6 @@ stdenv.mkDerivation rec { cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib" ''; - patches = - # https://github.com/opencv/opencv/pull/13254 - lib.optional enablePython (fetchpatch { - url = https://github.com/opencv/opencv/commit/ad35b79e3f98b4ce30481e0299cca550ed77aef0.patch; - sha256 = "0rkvg6wm5fyncszfpd83wa4lvsb8srvk21r1jcld758i4f334sws"; - }); - # This prevents cmake from using libraries in impure paths (which # causes build failure on non NixOS) # Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 407070506ab..3f21ee15bf3 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -1,5 +1,5 @@ { lib, stdenv -, fetchurl, fetchFromGitHub, fetchpatch +, fetchurl, fetchFromGitHub , cmake, pkgconfig, unzip, zlib, pcre, hdf5 , glog, boost, google-gflags, protobuf , config @@ -35,20 +35,20 @@ }: let - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; rev = version; - sha256 = "1r2hszm4044dfx65wv69rcs419jjd7bqllhnpcwk3n28f5ahln50"; + sha256 = "1f0n2a57sn47w55vaxlwhr3g6xgchvr3gxicxbkyzai3pvj55k48"; }; contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; rev = version; - sha256 = "1g4pzw7hv1v9jp1nrqjxqwpi1byl3mxkj6w6ibq6ydsn0138p66z"; + sha256 = "0svw8f6nvnzmrc0baj6priq4hbijla4kl6gzy8yif1jfvcwb1syy"; }; # Contrib must be built in order to enable Tesseract support: @@ -160,21 +160,6 @@ stdenv.mkDerivation rec { cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib" ''; - patches = - # Fixes issue: https://github.com/opencv/opencv_contrib/issues/1923 - # PR: https://github.com/opencv/opencv_contrib/pull/1913 - lib.optional buildContrib (fetchpatch { - url = https://github.com/opencv/opencv_contrib/commit/e068b62a1432d4d5688693a9e20bf175dfaa9a3e.patch; - sha256 = "102mq1qgmla40hhj8mda70inhakdazm9agyah98kq9931scvf0c9"; - stripLen = 2; - extraPrefix = "opencv_contrib/"; - }) ++ - # https://github.com/opencv/opencv/pull/13254 - lib.optional enablePython (fetchpatch { - url = https://github.com/opencv/opencv/commit/ad35b79e3f98b4ce30481e0299cca550ed77aef0.patch; - sha256 = "0rkvg6wm5fyncszfpd83wa4lvsb8srvk21r1jcld758i4f334sws"; - }); - # This prevents cmake from using libraries in impure paths (which # causes build failure on non NixOS) # Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with diff --git a/pkgs/development/libraries/openjpeg/2.x.nix b/pkgs/development/libraries/openjpeg/2.x.nix index fd9c7eea8c2..3aa2fdf0dd2 100644 --- a/pkgs/development/libraries/openjpeg/2.x.nix +++ b/pkgs/development/libraries/openjpeg/2.x.nix @@ -6,6 +6,11 @@ callPackage ./generic.nix (args // rec { revision = "v${version}"; sha256 = "08plxrnfl33sn2vh5nwbsngyv6b1sfpplvx881crm1v1ai10m2lz"; + extraFlags = [ + "-DOPENJPEG_INSTALL_INCLUDE_DIR=${placeholder "dev"}/include/openjpeg-${branch}" + "-DOPENJPEG_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/openjpeg-${branch}" + ]; + patches = [ (fetchpatch { name = "CVE-2018-7648.patch"; @@ -17,5 +22,10 @@ callPackage ./generic.nix (args // rec { url = "https://github.com/uclouvain/openjpeg/commit/92023cd6c377e0384a7725949b25655d4d94dced.patch"; sha256 = "0rrxxqcp3vjkmvywxj9ac766m3fppy0x0nszrkf8irrqy1gnp38k"; }) + (fetchpatch { + url = https://github.com/uclouvain/openjpeg/commit/24fd3ce777a64b8b315cfe1ee642ec7b1cc6aa97.patch; + sha256 = "1sl5wplgdfiqw8qbd8s5j5hq3ynbwgsnv8nxqfrk5s7vyrzx9pxv"; + }) + ./fix-cmake-config-includedir.patch ]; }) diff --git a/pkgs/development/libraries/openjpeg/fix-cmake-config-includedir.patch b/pkgs/development/libraries/openjpeg/fix-cmake-config-includedir.patch new file mode 100644 index 00000000000..6ff720ead4e --- /dev/null +++ b/pkgs/development/libraries/openjpeg/fix-cmake-config-includedir.patch @@ -0,0 +1,55 @@ +--- a/cmake/OpenJPEGConfig.cmake.in ++++ b/cmake/OpenJPEGConfig.cmake.in +@@ -32,7 +32,7 @@ + set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@") + file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}") + +- get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE) ++ get_filename_component(OPENJPEG_INCLUDE_DIRS "@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE) + + else() + if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake) +--- a/src/lib/openjp2/libopenjp2.pc.cmake.in ++++ b/src/lib/openjp2/libopenjp2.pc.cmake.in +@@ -3,7 +3,7 @@ + mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ + docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ + libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ +-includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ ++includedir=@OPENJPEG_INSTALL_INCLUDE_DIR@ + + Name: openjp2 + Description: JPEG2000 library (Part 1 and 2) +--- a/src/lib/openjp3d/libopenjp3d.pc.cmake.in ++++ b/src/lib/openjp3d/libopenjp3d.pc.cmake.in +@@ -3,7 +3,7 @@ + mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ + docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ + libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ +-includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ ++includedir=@OPENJPEG_INSTALL_INCLUDE_DIR@ + + Name: openjp3d + Description: JPEG2000 Extensions for three-dimensional data (Part 10) +--- a/src/lib/openjpip/libopenjpip.pc.cmake.in ++++ b/src/lib/openjpip/libopenjpip.pc.cmake.in +@@ -3,7 +3,7 @@ + mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ + docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ + libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ +-includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ ++includedir=@OPENJPEG_INSTALL_INCLUDE_DIR@ + + Name: openjpip + Description: JPEG2000 Interactivity tools, APIs and protocols (Part 9) +--- a/src/lib/openjpwl/libopenjpwl.pc.cmake.in ++++ b/src/lib/openjpwl/libopenjpwl.pc.cmake.in +@@ -3,7 +3,7 @@ + mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ + docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ + libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ +-includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ ++includedir=@OPENJPEG_INSTALL_INCLUDE_DIR@ + + Name: openjpwl + Description: JPEG2000 Wireless library (Part 11) diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix index 96cf0451ebf..d3130a64b03 100644 --- a/pkgs/development/libraries/openjpeg/generic.nix +++ b/pkgs/development/libraries/openjpeg/generic.nix @@ -11,7 +11,7 @@ , testsSupport ? false , jdk ? null # Inherit generics -, branch, version, revision, sha256, patches ? [], ... +, branch, version, revision, sha256, patches ? [], extraFlags ? [], ... }: assert jpipServerSupport -> jpipLibSupport && curl != null && fcgi != null; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { (mkFlag jp3dSupport "BUILD_JP3D") (mkFlag thirdPartySupport "BUILD_THIRDPARTY") (mkFlag testsSupport "BUILD_TESTING") - ]; + ] ++ extraFlags; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index 93c2501a620..064ebf71cc3 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -1,16 +1,13 @@ -{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm +{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, gnome3 , ApplicationServices }: -let - ver_maj = "2.40"; - ver_min = "1"; -in stdenv.mkDerivation rec { - name = "pangomm-${ver_maj}.${ver_min}"; + pname = "pangomm"; + version= "2.42.0"; src = fetchurl { - url = "mirror://gnome/sources/pangomm/${ver_maj}/${name}.tar.xz"; - sha256 = "9762ee2a2d5781be6797448d4dd2383ce14907159b30bc12bf6b08e7227be3af"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0mmzxp3wniaafkxr30sb22mq9x44xckb5d60h1bl99lkzxks0vfa"; }; outputs = [ "out" "dev" ]; @@ -22,6 +19,12 @@ stdenv.mkDerivation rec { doCheck = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { description = "C++ interface to the Pango text rendering library"; homepage = https://www.pango.org/; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 8093aec6bcc..83f19e442c6 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -72,13 +72,6 @@ stdenv.mkDerivation rec { makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0 INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; - # The following is required on grsecurity/PaX due to spidermonkey's JIT - postBuild = stdenv.lib.optionalString stdenv.isLinux '' - paxmark mr src/polkitbackend/.libs/polkitd - '' + stdenv.lib.optionalString (stdenv.isLinux && doCheck) '' - paxmark mr test/polkitbackend/.libs/polkitbackendjsauthoritytest - ''; - installFlags=["datadir=$(out)/share" "sysconfdir=$(out)/etc"]; inherit doCheck; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 53ed04527a8..e5b469f7395 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -8,7 +8,7 @@ }: let # beware: updates often break cups-filters build - version = "0.67.0"; + version = "0.72.0"; mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; in stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "1yb6agmcxf0ixqm65d4aknl0hgmswf94x0k59ic0qqav1wd4yjm3"; + sha256 = "0lfs1b1jfamxl13zbl5n448dqvl9n8frbv8180y7b7kfyaw7wx61"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/qmlbox2d/default.nix b/pkgs/development/libraries/qmlbox2d/default.nix index 630f606c2e5..083e0a51b81 100644 --- a/pkgs/development/libraries/qmlbox2d/default.nix +++ b/pkgs/development/libraries/qmlbox2d/default.nix @@ -1,11 +1,11 @@ {stdenv, qtdeclarative, fetchFromGitHub, qmake }: stdenv.mkDerivation rec { - name = "qml-box2d-2018-03-16"; + name = "qml-box2d-2018-04-06"; src = fetchFromGitHub { owner = "qml-box2d"; repo = "qml-box2d"; - sha256 = "1fbsvv28b4r0szcv8bk5gxpf8v534jp2axyfp438384sy757wsq2"; - rev = "21e57f1"; + sha256 = "0gb8limy6ck23z3k0k2j7c4c4s95p40f6lbzk4szq7fjnnw22kb7"; + rev = "b7212d5640701f93f0cd88fbd3a32c619030ae62"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix index 6f90f1cea7f..5fbab32acda 100644 --- a/pkgs/development/libraries/qt-5/5.11/default.nix +++ b/pkgs/development/libraries/qt-5/5.11/default.nix @@ -61,7 +61,6 @@ let qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; qttools = [ ./qttools.patch ]; - qtwebengine = optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; qtwebkit = [ ./qtwebkit.patch ]; }; diff --git a/pkgs/development/libraries/qt-5/5.11/qtwebengine-paxmark-mksnapshot.patch b/pkgs/development/libraries/qt-5/5.11/qtwebengine-paxmark-mksnapshot.patch deleted file mode 100644 index e1621b005c6..00000000000 --- a/pkgs/development/libraries/qt-5/5.11/qtwebengine-paxmark-mksnapshot.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/src/3rdparty/chromium/v8/src/v8.gyp b/chromium/v8/src/v8.gyp -index e7e19f5059..934448c7d8 100644 ---- a/src/3rdparty/chromium/v8/src/v8.gyp -+++ b/src/3rdparty/chromium/v8/src/v8.gyp -@@ -35,6 +35,7 @@ - 'v8_extra_library_files%': [], - 'v8_experimental_extra_library_files%': [], - 'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)', -+ 'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)', - 'v8_os_page_size%': 0, - }, - 'includes': ['../gypfiles/toolchain.gypi', '../gypfiles/features.gypi', 'inspector/inspector.gypi'], -@@ -2576,7 +2577,7 @@ - ] - }, - { -- 'target_name': 'mksnapshot', -+ 'target_name': 'mksnapshot_u', - 'type': 'executable', - 'dependencies': [ - 'v8_base', -@@ -2606,5 +2607,26 @@ - }], - ], - }, -+ { -+ 'target_name': 'mksnapshot', -+ 'type': 'executable', -+ 'dependencies': ['mksnapshot_u'], -+ 'actions': [ -+ { -+ 'action_name': 'paxmark_m_mksnapshot', -+ 'inputs': [ -+ '<(mksnapshot_u_exec)', -+ ], -+ 'outputs': [ -+ '<(mksnapshot_exec)', -+ ], -+ 'action': [ -+ 'sh', -+ '-c', -+ 'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxctl -czexm <(mksnapshot_exec)', -+ ], -+ }, -+ ], -+ }, - ], - } diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index e815cc8f70f..9391999f1e9 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -51,8 +51,7 @@ let qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; qttools = [ ./qttools.patch ]; - qtwebengine = [ ./qtwebengine-seccomp.patch ] - ++ optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; + qtwebengine = [ ./qtwebengine-seccomp.patch ]; qtwebkit = [ ./qtwebkit.patch ]; }; diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebengine-paxmark-mksnapshot.patch b/pkgs/development/libraries/qt-5/5.6/qtwebengine-paxmark-mksnapshot.patch deleted file mode 100644 index b3316188f7d..00000000000 --- a/pkgs/development/libraries/qt-5/5.6/qtwebengine-paxmark-mksnapshot.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- qtwebengine-opensource-src-5.6.0-orig/src/3rdparty/chromium/v8/tools/gyp/v8.gyp 2016-03-04 01:48:36.000000000 +1100 -+++ qtwebengine-opensource-src-5.6.0/src/3rdparty/chromium/v8/tools/gyp/v8.gyp 2016-05-01 19:15:44.052770543 +1000 -@@ -33,6 +33,7 @@ - 'embed_script%': "", - 'v8_extra_library_files%': [], - 'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)', -+ 'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)', - 'remove_v8base_debug_symbols%': 0, - }, - 'includes': ['../../build/toolchain.gypi', '../../build/features.gypi'], -@@ -1913,7 +1914,7 @@ - ] - }, - { -- 'target_name': 'mksnapshot', -+ 'target_name': 'mksnapshot_u', - 'type': 'executable', - 'dependencies': ['v8_base', 'v8_nosnapshot', 'v8_libplatform'], - 'include_dirs+': [ -@@ -1936,5 +1937,26 @@ - }], - ], - }, -+ { -+ 'target_name': 'mksnapshot', -+ 'type': 'executable', -+ 'dependencies': ['mksnapshot_u'], -+ 'actions': [ -+ { -+ 'action_name': 'paxmark_m_mksnapshot', -+ 'inputs': [ -+ '<(mksnapshot_u_exec)', -+ ], -+ 'outputs': [ -+ '<(mksnapshot_exec)', -+ ], -+ 'action': [ -+ 'sh', -+ '-c', -+ 'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxctl -czexm <(mksnapshot_exec)', -+ ], -+ }, -+ ], -+ }, - ], - } diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index 6fcb7a0dc5e..4acc6a6393f 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -43,7 +43,6 @@ let qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; qttools = [ ./qttools.patch ]; - qtwebengine = optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; qtwebkit = [ ./qtwebkit.patch ]; }; diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebengine-paxmark-mksnapshot.patch b/pkgs/development/libraries/qt-5/5.9/qtwebengine-paxmark-mksnapshot.patch deleted file mode 100644 index 5e170567ce5..00000000000 --- a/pkgs/development/libraries/qt-5/5.9/qtwebengine-paxmark-mksnapshot.patch +++ /dev/null @@ -1,48 +0,0 @@ -Index: qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/v8/src/v8.gyp -=================================================================== ---- qtwebengine-opensource-src-5.9.0.orig/src/3rdparty/chromium/v8/src/v8.gyp -+++ qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/v8/src/v8.gyp -@@ -36,6 +36,7 @@ - 'v8_experimental_extra_library_files%': [], - 'v8_enable_inspector%': 0, - 'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)', -+ 'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)', - 'mkpeephole_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkpeephole<(EXECUTABLE_SUFFIX)', - 'v8_os_page_size%': 0, - }, -@@ -2432,7 +2433,7 @@ - ] - }, - { -- 'target_name': 'mksnapshot', -+ 'target_name': 'mksnapshot_u', - 'type': 'executable', - 'dependencies': [ - 'v8_base', -@@ -2485,5 +2486,26 @@ - }], - ], - }, -+ { -+ 'target_name': 'mksnapshot', -+ 'type': 'executable', -+ 'dependencies': ['mksnapshot_u'], -+ 'actions': [ -+ { -+ 'action_name': 'paxmark_m_mksnapshot', -+ 'inputs': [ -+ '<(mksnapshot_u_exec)', -+ ], -+ 'outputs': [ -+ '<(mksnapshot_exec)', -+ ], -+ 'action': [ -+ 'sh', -+ '-c', -+ 'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxctl -czexm <(mksnapshot_exec)', -+ ], -+ }, -+ ], -+ }, - ], - } diff --git a/pkgs/development/libraries/qt-5/README.md b/pkgs/development/libraries/qt-5/README.md index c13b172e82a..b2ef74d0aef 100644 --- a/pkgs/development/libraries/qt-5/README.md +++ b/pkgs/development/libraries/qt-5/README.md @@ -5,7 +5,7 @@ Let `$major` be the major version number, e.g. `5.9`. 1. Change the version number in the `$major/fetch.sh`. -2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/qt-5/$major` +2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$major` from the top of the Nixpkgs tree. See below if it is necessary to update any patches. @@ -16,7 +16,7 @@ Let `$major` be the new major version number, e.g. `5.10`. 1. Copy the subdirectory from the previous major version to `$major`. 2. Change the version number in `$major/fetch.sh`. -3. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/qt-5/$major` +3. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$major` from the top of the Nixpkgs tree. 4. Add a top-level attribute in `pkgs/top-level/all-packages.nix` for the new major version. diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 71ecde66a1f..a80488bad5e 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -14,7 +14,7 @@ , enableProprietaryCodecs ? true , gn, darwin, openbsm , ffmpeg ? null -, lib, stdenv # lib.optional, needsPax +, lib, stdenv }: with stdenv.lib; @@ -181,7 +181,6 @@ EOF [Paths] Prefix = .. EOF - paxmark m $out/libexec/QtWebEngineProcess ''; meta = with lib; { diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index 37814047f97..0801238fb12 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -1,21 +1,8 @@ { stdenvNoCC, writeText, fetchurl, rpmextract, undmg }: /* - Some (but not all) mkl functions require openmp, but Intel does not add these - to SO_NEEDED and instructs users to put openmp on their LD_LIBRARY_PATH. If - you are using mkl and your library/application is using some of the functions - that require openmp, add a setupHook like this to your package: - - setupHook = writeText "setup-hook.sh" '' - addOpenmp() { - addToSearchPath LD_LIBRARY_PATH ${openmp}/lib - } - addEnvHooks "$targetOffset" addOpenmp - ''; - - We do not add the setup hook here, because avoiding it allows this large - package to be a fixed-output derivation with better cache efficiency. - */ - + For details on using mkl as a blas provider for python packages such as numpy, + numexpr, scipy, etc., see the Python section of the NixPkgs manual. +*/ stdenvNoCC.mkDerivation rec { name = "mkl-${version}"; version = "${date}.${rel}"; @@ -43,16 +30,23 @@ stdenvNoCC.mkDerivation rec { '' else '' rpmextract rpm/intel-mkl-common-c-${date}-${rel}-${date}-${rel}.noarch.rpm rpmextract rpm/intel-mkl-core-rt-${date}-${rel}-${date}-${rel}.x86_64.rpm + rpmextract rpm/intel-openmp-19.0.0-${rel}-19.0.0-${rel}.x86_64.rpm ''; installPhase = if stdenvNoCC.isDarwin then '' mkdir -p $out/lib + cp -r compilers_and_libraries_${version}/mac/mkl/include $out/ - cp -r compilers_and_libraries_${version}/mac/mkl/lib/* $out/lib/ + cp -r compilers_and_libraries_${version}/licensing/mkl/en/license.txt $out/lib/ + cp -r compilers_and_libraries_${version}/mac/compiler/lib/* $out/lib/ + cp -r compilers_and_libraries_${version}/mac/mkl/lib/* $out/lib/ '' else '' mkdir -p $out/lib + cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/include $out/ + + cp -r opt/intel/compilers_and_libraries_${version}/linux/compiler/lib/intel64_lin/* $out/lib/ cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/lib/intel64_lin/* $out/lib/ cp license.txt $out/lib/ ''; @@ -66,8 +60,8 @@ stdenvNoCC.mkDerivation rec { outputHashAlgo = "sha256"; outputHashMode = "recursive"; outputHash = if stdenvNoCC.isDarwin - then "1224dln7n8px1rk8biiggf77wjhxh8mzw0hd8zlyjm8i6j8w7i12" - else "0d8ai0wi8drp071acqkm1wv6vyg12010y843y56zzi1pql81xqvx"; + then "00d49ls9vcjan1ngq2wx2q4p6lnm05zwh67hsmj7bnq43ykrfibw" + else "1amagcaan0hk3x9v7gg03gkw02n066v4kmjb32yyzsy5rfrivb1a"; meta = with stdenvNoCC.lib; { description = "Intel Math Kernel Library"; @@ -78,7 +72,7 @@ stdenvNoCC.mkDerivation rec { threading models. ''; homepage = https://software.intel.com/en-us/mkl; - license = [ licenses.issl licenses.unfreeRedistributable ]; + license = licenses.issl; platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = [ maintainers.bhipple ]; }; diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 532a26481af..120fa25090a 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -89,6 +89,15 @@ stdenv.mkDerivation rec { inherit blas64; + patches = [ + # Fixes build on x86_64-darwin. See: + # https://github.com/xianyi/OpenBLAS/issues/1926 + (fetchpatch { + url = https://github.com/xianyi/OpenBLAS/commit/701ea88347461e4c5d896765438dc870281b3834.patch; + sha256 = "18rcfgkjsijl9d2510jn961wqvz7zdlz2fgy1yjmax29kvv8fqd9"; + }) + ]; + # Some hardening features are disabled due to sporadic failures in # OpenBLAS-based programs. The problem may not be with OpenBLAS itself, but # with how these flags interact with hardening measures used downstream. @@ -118,8 +127,6 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "musl") "NO_AFFINITY=1" ++ mapAttrsToList (var: val: var + "=" + val) config; - patches = []; - doCheck = true; checkTarget = "tests"; diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix b/pkgs/development/libraries/totem-pl-parser/default.nix index baf42b88e15..4c052a5c02f 100644 --- a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix +++ b/pkgs/development/libraries/totem-pl-parser/default.nix @@ -1,16 +1,18 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gmime, libxml2, gobject-introspection, gnome3 }: stdenv.mkDerivation rec { - name = "totem-pl-parser-${version}"; + pname = "totem-pl-parser"; version = "3.26.1"; src = fetchurl { - url = "mirror://gnome/sources/totem-pl-parser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0k5pnka907invgds48d73c1xx1a366v5dcld3gr2l1dgmjwc9qka"; }; passthru = { - updateScript = gnome3.updateScript { packageName = "totem-pl-parser"; attrPath = "gnome3.totem-pl-parser"; }; + updateScript = gnome3.updateScript { + packageName = pname; + }; }; nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection ]; diff --git a/pkgs/desktops/gnome-3/core/vte/2.90.nix b/pkgs/development/libraries/vte/2.90.nix index 52bf198f29c..4b2b74c5e1d 100644 --- a/pkgs/desktops/gnome-3/core/vte/2.90.nix +++ b/pkgs/development/libraries/vte/2.90.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobject-introspection }: +{ stdenv, fetchurl, intltool, pkgconfig, gnome3, glib, gtk3, ncurses, gobject-introspection }: stdenv.mkDerivation rec { versionMajor = "0.36"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gobject-introspection intltool gnome3.glib gnome3.gtk3 ncurses ]; + buildInputs = [ gobject-introspection intltool glib gtk3 ncurses ]; configureFlags = [ "--enable-introspection" ]; diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 904bdd323d8..97bb961c4bc 100644 --- a/pkgs/desktops/gnome-3/core/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -1,27 +1,27 @@ { stdenv, fetchurl, intltool, pkgconfig -, gnome3, ncurses, gobject-introspection, vala, libxml2, gnutls +, gnome3, glib, gtk3, ncurses, gobject-introspection, vala, libxml2, gnutls , gperf, pcre2 }: stdenv.mkDerivation rec { - name = "vte-${version}"; + pname = "vte"; version = "0.54.3"; src = fetchurl { - url = "mirror://gnome/sources/vte/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1zgb8jgi6sr4km58zfml8zkm24qipbngl2h7s5razhi5a0a84dk9"; }; passthru = { - updateScript = gnome3.updateScript { packageName = "vte"; attrPath = "gnome3.vte"; }; + updateScript = gnome3.updateScript { packageName = pname; }; }; nativeBuildInputs = [ gobject-introspection intltool pkgconfig vala gperf libxml2 ]; - buildInputs = [ gnome3.glib gnome3.gtk3 ncurses ]; + buildInputs = [ glib gtk3 ncurses ]; propagatedBuildInputs = [ # Required by vte-2.91.pc. - gnome3.gtk3 + gtk3 gnutls pcre2 ]; diff --git a/pkgs/desktops/gnome-3/core/vte/ng.nix b/pkgs/development/libraries/vte/ng.nix index e6dc005fe58..3aee9e9dcdf 100644 --- a/pkgs/desktops/gnome-3/core/vte/ng.nix +++ b/pkgs/development/libraries/vte/ng.nix @@ -1,6 +1,6 @@ -{ gnome3, fetchFromGitHub, autoconf, automake, gtk-doc, gettext, libtool, gperf }: +{ vte, fetchFromGitHub, autoconf, automake, gtk-doc, gettext, libtool, gperf }: -gnome3.vte.overrideAttrs (oldAttrs: rec { +vte.overrideAttrs (oldAttrs: rec { name = "vte-ng-${version}"; version = "0.50.2.a"; diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index efe7214ab6a..92e8bded875 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -2,28 +2,11 @@ , wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa_noglu , libpng, ffmpeg_4 -, python3Packages # TODO: Temporary }: let pname = "wlroots"; version = "0.2"; - meson480 = meson.overrideAttrs (oldAttrs: rec { - name = pname + "-" + version; - pname = "meson"; - version = "0.48.0"; - - src = python3Packages.fetchPypi { - inherit pname version; - sha256 = "0qawsm6px1vca3babnqwn0hmkzsxy4w0gi345apd2qk3v0cv7ipc"; - }; - # Remove gir-fallback-path.patch and - # a87496addd9160300837aa50193f4798c6f1d251.patch (already in 0.48.0): - patches = builtins.filter - (str: !(stdenv.lib.hasSuffix "gir-fallback-path.patch" str - || stdenv.lib.hasSuffix "a87496addd9160300837aa50193f4798c6f1d251.patch" str)) - oldAttrs.patches; - }); in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -43,7 +26,7 @@ in stdenv.mkDerivation rec { # programs (in examples) AND rootston outputs = [ "out" "bin" "examples" ]; - nativeBuildInputs = [ meson480 ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ wayland libGL wayland-protocols libinput libxkbcommon pixman diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index aec64c9c33c..e1c339d1e0f 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -48,7 +48,7 @@ in { }; wt4 = generic { - version = "4.0.4"; - sha256 = "17kq9fxc0xqx7q7kyryiph3mg0d3hnd3jw0rl55zvzfsdd71220w"; + version = "4.0.5"; + sha256 = "1gn8f30mjmn9aaxdazk49wijz37nglfww15ydrjiyhl6v5xhsjdv"; }; } diff --git a/pkgs/development/mobile/adb-sync/default.nix b/pkgs/development/mobile/adb-sync/default.nix index ee6ff3cecd5..b6d35051733 100644 --- a/pkgs/development/mobile/adb-sync/default.nix +++ b/pkgs/development/mobile/adb-sync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, python3, androidsdk, makeWrapper }: +{ stdenv, fetchgit, python3, platform-tools, makeWrapper }: stdenv.mkDerivation rec { name = "adb-sync-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1y016bjky5sn58v91jyqfz7vw8qfqnfhb9s9jd32k8y29hy5vy4d"; }; - buildInputs = [ python3 androidsdk makeWrapper ]; + buildInputs = [ python3 platform-tools makeWrapper ]; phases = "installPhase"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp $src/adb-channel $src/adb-sync $out/bin/ patchShebangs $out/bin - wrapProgram $out/bin/adb-sync --suffix PATH : ${androidsdk}/bin + wrapProgram $out/bin/adb-sync --suffix PATH : ${platform-tools}/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/development/mobile/adbfs-rootless/default.nix b/pkgs/development/mobile/adbfs-rootless/default.nix index 18ad3048d83..fffe2fbbcbe 100644 --- a/pkgs/development/mobile/adbfs-rootless/default.nix +++ b/pkgs/development/mobile/adbfs-rootless/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { postPatch = '' # very ugly way of replacing the adb calls - sed -e 's|"adb |"${stdenv.lib.getBin adb}/bin/adb |g' \ + sed -e 's|"adb |"${adb}/bin/adb |g' \ -i adbfs.cpp ''; diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml deleted file mode 100644 index 68792038d00..00000000000 --- a/pkgs/development/mobile/androidenv/addon.xml +++ /dev/null @@ -1,1614 +0,0 @@ -<?xml version="1.0" ?> -<sdk:sdk-addon xmlns:sdk="http://schemas.android.com/sdk/android/addon/7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <!--Generated on 2018-09-27 12:07:52.862255 with ADRT.--> - <sdk:license id="android-sdk-license" type="text">Terms and Conditions - -This is the Android Software Development Kit License Agreement - -1. Introduction - -1.1 The Android Software Development Kit (referred to in the License Agreement as the "SDK" and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK. - -1.2 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time. - -1.3 A "compatible implementation" means any Android device that (i) complies with the Android Compatibility Definition document, which can be found at the Android compatibility website (http://source.android.com/compatibility) and which may be updated from time to time; and (ii) successfully passes the Android Compatibility Test Suite (CTS). - -1.4 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States. - - -2. Accepting the License Agreement - -2.1 In order to use the SDK, you must first agree to the License Agreement. You may not use the SDK if you do not accept the License Agreement. - -2.2 By clicking to accept, you hereby agree to the terms of the License Agreement. - -2.3 You may not use the SDK and may not accept the License Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries, including the country in which you are resident or from which you use the SDK. - -2.4 If you are agreeing to be bound by the License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the SDK on behalf of your employer or other entity. - - -3. SDK License from Google - -3.1 Subject to the terms of the License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable, non-exclusive, and non-sublicensable license to use the SDK solely to develop applications for compatible implementations of Android. - -3.2 You may not use this SDK to develop applications for other platforms (including non-compatible implementations of Android) or to develop another SDK. You are of course free to develop applications for other platforms, including non-compatible implementations of Android, provided that this SDK is not used for that purpose. - -3.3 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you. - -3.4 You may not use the SDK for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK. - -3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. - -3.6 You agree that the form and nature of the SDK that Google provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Google may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Google's sole discretion, without prior notice to you. - -3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features. - -3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK. - - -4. Use of the SDK by You - -4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications. - -4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) the License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries). - -4.3 You agree that if you use the SDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so. - -4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google or any mobile communications carrier. - -4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so. - -4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach. - -5. Your Developer Credentials - -5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials. - -6. Privacy and Information - -6.1 In order to continually innovate and improve the SDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the SDK are being used and how they are being used. Before any of this information is collected, the SDK will notify you and seek your consent. If you withhold consent, the information will not be collected. - -6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy. - - -7. Third Party Applications - -7.1 If you use the SDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources. - -7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners. - -7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, the License Agreement does not affect your legal relationship with these third parties. - - -8. Using Android APIs - -8.1 Google Data APIs - -8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service. - -8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. - - -9. Terminating the License Agreement - -9.1 The License Agreement will continue to apply until terminated by either you or Google as set out below. - -9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials. - -9.3 Google may at any time, terminate the License Agreement with you if: -(A) you have breached any provision of the License Agreement; or -(B) Google is required to do so by law; or -(C) the partner with whom Google offered certain parts of SDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the SDK to you; or -(D) Google decides to no longer provide the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service, or the provision of the SDK or certain SDK services to you by Google is, in Google's sole discretion, no longer commercially viable. - -9.4 When the License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst the License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely. - - -10. DISCLAIMER OF WARRANTIES - -10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE SDK IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE. - -10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. - -10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. - - -11. LIMITATION OF LIABILITY - -11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING. - - -12. Indemnification - -12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with the License Agreement. - - -13. Changes to the License Agreement - -13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available. - - -14. General Legal Terms - -14.1 The License Agreement constitutes the whole legal agreement between you and Google and governs your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the SDK. - -14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google. - -14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable. - -14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement. - -14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE. - -14.6 The rights granted in the License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under the License Agreement without the prior written approval of the other party. - -14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction. - - -November 20, 2015</sdk:license> - <sdk:license id="android-sdk-preview-license" type="text">To get started with the Android SDK Preview, you must agree to the following terms and conditions. -As described below, please note that this is a preview version of the Android SDK, subject to change, that you use at your own risk. The Android SDK Preview is not a stable release, and may contain errors and defects that can result in serious damage to your computer systems, devices and data. - -This is the Android SDK Preview License Agreement (the "License Agreement"). - -1. Introduction - -1.1 The Android SDK Preview (referred to in the License Agreement as the “Preview” and specifically including the Android system files, packaged APIs, and Preview library files, if and when they are made available) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the Preview. - -1.2 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time. - -1.3 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States. - -2. Accepting the License Agreement - -2.1 In order to use the Preview, you must first agree to the License Agreement. You may not use the Preview if you do not accept the License Agreement. - -2.2 By clicking to accept and/or using the Preview, you hereby agree to the terms of the License Agreement. - -2.3 You may not use the Preview and may not accept the License Agreement if you are a person barred from receiving the Preview under the laws of the United States or other countries including the country in which you are resident or from which you use the Preview. - -2.4 If you will use the Preview internally within your company or organization you agree to be bound by the License Agreement on behalf of your employer or other entity, and you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the Preview on behalf of your employer or other entity. - -3. Preview License from Google - -3.1 Subject to the terms of the License Agreement, Google grants you a royalty-free, non-assignable, non-exclusive, non-sublicensable, limited, revocable license to use the Preview, personally or internally within your company or organization, solely to develop applications to run on the Android platform. - -3.2 You agree that Google or third parties owns all legal right, title and interest in and to the Preview, including any Intellectual Property Rights that subsist in the Preview. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you. - -3.3 You may not use the Preview for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the Preview or any part of the Preview; or (b) load any part of the Preview onto a mobile handset or any other hardware device except a personal computer, combine any part of the Preview with other software, or distribute any software or device incorporating a part of the Preview. - -3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the Preview. - -3.5 Use, reproduction and distribution of components of the Preview licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. You agree to remain a licensee in good standing in regard to such open source software licenses under all the rights granted and to refrain from any actions that may terminate, suspend, or breach such rights. - -3.6 You agree that the form and nature of the Preview that Google provides may change without prior notice to you and that future versions of the Preview may be incompatible with applications developed on previous versions of the Preview. You agree that Google may stop (permanently or temporarily) providing the Preview (or any features within the Preview) to you or to users generally at Google's sole discretion, without prior notice to you. - -3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features. - -3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the Preview. - -4. Use of the Preview by You - -4.1 Google agrees that nothing in the License Agreement gives Google any right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the Preview, including any intellectual property rights that subsist in those applications. - -4.2 You agree to use the Preview and write applications only for purposes that are permitted by (a) the License Agreement, and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries). - -4.3 You agree that if you use the Preview to develop applications, you will protect the privacy and legal rights of users. If users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If users provide you with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, each user has given you permission to do so. - -4.4 You agree that you will not engage in any activity with the Preview, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of Google or any third party. - -4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so. - -4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach. - -4.7 The Preview is in development, and your testing and feedback are an important part of the development process. By using the Preview, you acknowledge that implementation of some features are still under development and that you should not rely on the Preview having the full functionality of a stable release. You agree not to publicly distribute or ship any application using this Preview as this Preview will no longer be supported after the official Android SDK is released. - -5. Your Developer Credentials - -5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials. - -6. Privacy and Information - -6.1 In order to continually innovate and improve the Preview, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the Preview are being used and how they are being used. Before any of this information is collected, the Preview will notify you and seek your consent. If you withhold consent, the information will not be collected. - -6.2 The data collected is examined in the aggregate to improve the Preview and is maintained in accordance with Google's Privacy Policy located at http://www.google.com/policies/privacy/. - -7. Third Party Applications - -7.1 If you use the Preview to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources. - -7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners. - -7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. - -8. Using Google APIs - -8.1 Google APIs - -8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service. - -8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. - -9. Terminating the License Agreement - -9.1 the License Agreement will continue to apply until terminated by either you or Google as set out below. - -9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the Preview and any relevant developer credentials. - -9.3 Google may at any time, terminate the License Agreement, with or without cause, upon notice to you. - -9.4 The License Agreement will automatically terminate without notice or other action upon the earlier of: -(A) when Google ceases to provide the Preview or certain parts of the Preview to users in the country in which you are resident or from which you use the service; and -(B) Google issues a final release version of the Android SDK. - -9.5 When the License Agreement is terminated, the license granted to you in the License Agreement will terminate, you will immediately cease all use of the Preview, and the provisions of paragraphs 10, 11, 12 and 14 shall survive indefinitely. - -10. DISCLAIMERS - -10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE PREVIEW IS AT YOUR SOLE RISK AND THAT THE PREVIEW IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE. - -10.2 YOUR USE OF THE PREVIEW AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE PREVIEW IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. WITHOUT LIMITING THE FOREGOING, YOU UNDERSTAND THAT THE PREVIEW IS NOT A STABLE RELEASE AND MAY CONTAIN ERRORS, DEFECTS AND SECURITY VULNERABILITIES THAT CAN RESULT IN SIGNIFICANT DAMAGE, INCLUDING THE COMPLETE, IRRECOVERABLE LOSS OF USE OF YOUR COMPUTER SYSTEM OR OTHER DEVICE. - -10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. - -11. LIMITATION OF LIABILITY - -11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING. - -12. Indemnification - -12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys’ fees) arising out of or accruing from (a) your use of the Preview, (b) any application you develop on the Preview that infringes any Intellectual Property Rights of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you of the License Agreement. - -13. Changes to the License Agreement - -13.1 Google may make changes to the License Agreement as it distributes new versions of the Preview. When these changes are made, Google will make a new version of the License Agreement available on the website where the Preview is made available. - -14. General Legal Terms - -14.1 the License Agreement constitutes the whole legal agreement between you and Google and governs your use of the Preview (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the Preview. - -14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google. - -14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable. - -14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement. - -14.5 EXPORT RESTRICTIONS. THE PREVIEW IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE PREVIEW. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE. - -14.6 The License Agreement may not be assigned or transferred by you without the prior written approval of Google, and any attempted assignment without such approval will be void. You shall not delegate your responsibilities or obligations under the License Agreement without the prior written approval of Google. - -14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction. - -June 2014.</sdk:license> - <sdk:license id="android-googletv-license" type="text">Terms and Conditions - -This is the Google TV Add-on for the Android Software Development Kit License Agreement. - -1. Introduction - -1.1 The Google TV Add-on for the Android Software Development Kit (referred to in this License Agreement as the "Google TV Add-on" and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the Google TV Add-on. - -1.2 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States. - -2. Accepting this License Agreement - -2.1 In order to use the Google TV Add-on, you must first agree to this License Agreement. You may not use the Google TV Add-on if you do not accept this License Agreement. - -2.2 You can accept this License Agreement by: - -(A) clicking to accept or agree to this License Agreement, where this option is made available to you; or - -(B) by actually using the Google TV Add-on. In this case, you agree that use of the Google TV Add-on constitutes acceptance of the License Agreement from that point onwards. - -2.3 You may not use the Google TV Add-on and may not accept the Licensing Agreement if you are a person barred from receiving the Google TV Add-on under the laws of the United States or other countries including the country in which you are resident or from which you use the Google TV Add-on. - -2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to this License Agreement. If you do not have the requisite authority, you may not accept the Licensing Agreement or use the Google TV Add-on on behalf of your employer or other entity. - -3. Google TV Add-on License from Google - -3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non- assignable and non-exclusive license to use the Google TV Add-on solely to develop applications to run on the Google TV platform. - -3.2 You agree that Google or third parties own all legal right, title and interest in and to the Google TV Add-on, including any Intellectual Property Rights that subsist in the Google TV Add-on. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you. - -3.3 Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the Google TV Add-on or any part of the Google TV Add-on. Except to the extent required by applicable third party licenses, you may not load any part of the Google TV Add-on onto a mobile handset, television, or any other hardware device except a personal computer, combine any part of the Google TV Add-on with other software, or distribute any software or device incorporating a part of the Google TV Add-on. - -3.4 Use, reproduction and distribution of components of the Google TV Add-on licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement. - -3.5 You agree that the form and nature of the Google TV Add-on that Google provides may change without prior notice to you and that future versions of the Google TV Add-on may be incompatible with applications developed on previous versions of the Google TV Add-on. You agree that Google may stop (permanently or temporarily) providing the Google TV Add-on (or any features within the Google TV Add-on) to you or to users generally at Google's sole discretion, without prior notice to you. - -3.6 Nothing in this License Agreement gives you a right to use any of Google's or it’s licensors’ trade names, trademarks, service marks, logos, domain names, or other distinctive brand features. - -3.7 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the Google TV Add-on. - -4. Use of the Google TV Add-on by You - -4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the Google TV Add-on, including any intellectual property rights that subsist in those applications. - -4.2 You agree to use the Google TV Add-on and write applications only for purposes that are permitted by (a) this License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries). - -4.3 You agree that if you use the Google TV Add-on to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, your must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you explicit permission to do so. - -4.4 You agree that you will not engage in any activity with the Google TV Add-on, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google, Multichannel Video Program Distributors or any mobile communications carrier. - -4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through the Google TV platform and/or applications for the Google TV platform, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so. - -4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under this License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach. - -5. Your Developer Credentials - -5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials. - -6. Privacy and Information - -6.1 In order to continually innovate and improve the Google TV Add-on, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the Google TV Add-on are being used and how they are being used. Before any of this information is collected, the Google TV Add-on will notify you and seek your consent. If you withhold consent, the information will not be collected. - -6.2 The data collected is examined in the aggregate to improve the Google TV Add-on and is maintained in accordance with Google's Privacy Policy. - -7. Third Party Applications for the Google TV Platform - -7.1 If you use the Google TV Add-on to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources. - -7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners. - -7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, this License Agreement does not affect your legal relationship with these third parties. - -8. Using Google TV APIs - -8.1 If you use any Google TV API to retrieve data from Google, you acknowledge that the data (“Google TV API Content”) may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service. Some portions of the Google TV API Content are licensed to Google by third parties, including but not limited to Tribune Media Services - -8.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. - -8.3 Except as explicitly permitted in Section 3 (Google TV Add-on License from Google), you must: - -(a) not modify nor format the Google TV API Content except to the extent reasonably and technically necessary to optimize the display such Google TV API Content in your application; - -(b) not edit the Google TV API Content in a manner that renders the Google TV API Content inaccurate of alters its inherent meaning (provided that displaying excerpts will not violate the foregoing); or - -(c) not create any commercial audience measurement tool or service using the Google TV API Content - -9. Terminating this License Agreement - -9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below. - -9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the Google TV Add-on and any relevant developer credentials. - -9.3 Google may at any time, terminate this License Agreement with you if: - -(A) you have breached any provision of this License Agreement; or - -(B) Google is required to do so by law; or - -(C) the partner with whom Google offered certain parts of Google TV Add-on (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the Google TV Add-on to you; or - -(D) Google decides to no longer providing the Google TV Add-on or certain parts of the Google TV Add-on to users in the country in which you are resident or from which you use the service, or the provision of the Google TV Add-on or certain Google TV Add-on services to you by Google is, in Google's sole discretion, no longer commercially viable. - -9.4 When this License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst this License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely. - -10. DISCLAIMER OF WARRANTIES - -10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE GOOGLE TV ADD-ON IS AT YOUR SOLE RISK AND THAT THE GOOGLE TV ADD-ON IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE. - -10.2 YOUR USE OF THE GOOGLE TV ADD-ON AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE GOOGLE TV ADD-ON IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. - -10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. - -11. LIMITATION OF LIABILITY - -11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING. - -12. Indemnification - -12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the Google TV Add-on, (b) any application you develop on the Google TV Add-on that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with this License Agreement. - -13. Changes to the License Agreement - -13.1 Google may make changes to the License Agreement as it distributes new versions of the Google TV Add-on. - -14. General Legal Terms - -14.1 This License Agreement constitute the whole legal agreement between you and Google and govern your use of the Google TV Add-on (excluding any services which Google may provide to you under a separate written agreement), and completely replace any prior agreements between you and Google in relation to the Google TV Add-on. - -14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in this License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google. - -14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of this License Agreement is invalid, then that provision will be removed from this License Agreement without affecting the rest of this License Agreement. The remaining provisions of this License Agreement will continue to be valid and enforceable. - -14.4 You acknowledge and agree that Google’s API data licensors and each member of the group of companies of which Google is the parent shall be third party beneficiaries to this License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of this License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to this License Agreement. - -14.5 EXPORT RESTRICTIONS. THE GOOGLE TV ADD-ON IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE GOOGLE TV ADD-ON. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE. - -14.6 The rights granted in this License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under this License Agreement without the prior written approval of the other party. - -14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction. - - -August 15, 2011</sdk:license> - <sdk:license id="google-gdk-license" type="text">This is a Developer Preview of the GDK that is subject to change. - -Terms and Conditions - -This is the Glass Development Kit License Agreement. - -1. Introduction - -1.1 The Glass Development Kit (referred to in this License Agreement as the "GDK" and specifically including the Android system files, packaged APIs, and GDK library files, if and when they are made available) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the GDK. - -1.2 "Glass" means Glass devices and the Glass software stack for use on Glass devices. - - -1.3 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time. - -1.4 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States. - -2. Accepting this License Agreement - -2.1 In order to use the GDK, you must first agree to this License Agreement. You may not use the GDK if you do not accept this License Agreement. - -2.2 By clicking to accept, you hereby agree to the terms of this License Agreement. - -2.3 You may not use the GDK and may not accept the License Agreement if you are a person barred from receiving the GDK under the laws of the United States or other countries including the country in which you are resident or from which you use the GDK. - -2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to this License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the GDK on behalf of your employer or other entity. - -3. GDK License from Google - -3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable and non-exclusive license to use the GDK solely to develop applications to run on the Glass platform for Glass devices. - -3.2 You agree that Google or third parties own all legal right, title and interest in and to the GDK, including any Intellectual Property Rights that subsist in the GDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you. - -3.3 You may not use the GDK for any purpose not expressly permitted by this License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the GDK or any part of the GDK; or (b) load any part of the GDK onto a mobile handset or wearable computing device or any other hardware device except a Glass device personal computer, combine any part of the GDK with other software, or distribute any software or device incorporating a part of the GDK. - -3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Glass, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the GDK. - -3.5 Use, reproduction and distribution of components of the GDK licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement. - -3.6 You agree that the form and nature of the GDK that Google provides may change without prior notice to you and that future versions of the GDK may be incompatible with applications developed on previous versions of the GDK. You agree that Google may stop (permanently or temporarily) providing the GDK (or any features within the GDK) to you or to users generally at Google's sole discretion, without prior notice to you. - -3.7 Nothing in this License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features. - -3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the GDK. - - -3.9 Your use of any Android system files, packaged APIs, or other components of the GDK which are part of the Android Software Development Kit is subject to the terms of the Android Software Development Kit License Agreement located at http://developer.android.com/sdk/terms.html. These terms are hereby incorporated by reference into this License Agreement. - -4. Use of the GDK by You - -4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the GDK, including any intellectual property rights that subsist in those applications. - -4.2 You agree to use the GDK and write applications only for purposes that are permitted by (a) this License Agreement, (b) the Glass Platform Developer Policies (located at https://developers.google.com/glass/policies, and hereby incorporated into this License Agreement by reference), and (c) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries). - -4.3 You agree that if you use the GDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so. - -4.4 You agree that you will not engage in any activity with the GDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google. - -4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Glass and/or applications for Glass, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so. - -4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under this License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach. - - -4.7 The GDK is in development, and your testing and feedback are an important part of the development process. By using the GDK, you acknowledge that implementation of some features are still under development and that you should not rely on the GDK, Glass devices, Glass system software, Google Mirror API, or Glass services having the full functionality of a stable release. - -5. Your Developer Credentials - -5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials. - -6. Privacy and Information - - -6.1 In order to continually innovate and improve the GDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the GDK are being used and how they are being used. Before any of this information is collected, the GDK will notify you and seek your consent. If you withhold consent, the information will not be collected. - -6.2 The data collected is examined in the aggregate to improve the GDK and is maintained in accordance with Google's Privacy Policy. - -7. Third Party Applications - -7.1 If you use the GDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources. - -7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners. - -7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, this License Agreement does not affect your legal relationship with these third parties. - -8. Using Google APIs - -8.1 Google APIs - -8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service. - -8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. - -9. Terminating this License Agreement - -9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below. - -9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the GDK and any relevant developer credentials. - -9.3 Google may at any time, terminate this License Agreement with you if: -(A) you have breached any provision of this License Agreement; or -(B) Google is required to do so by law; or -(C) the partner with whom Google offered certain parts of GDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the GDK to you; or -(D) Google decides to no longer provide the GDK or certain parts of the GDK to users in the country in which you are resident or from which you use the service, or the provision of the GDK or certain GDK services to you by Google is, in Google's sole discretion, no longer commercially viable. - -9.4 When this License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst this License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely. - -10. DISCLAIMER OF WARRANTIES - -10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE GDK IS AT YOUR SOLE RISK AND THAT THE GDK IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE. - -10.2 YOUR USE OF THE GDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE GDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. - -10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. - -11. LIMITATION OF LIABILITY - -11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING. - -12. Indemnification - -12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the GDK, (b) any application you develop on the GDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with this License Agreement. - -13. Changes to the License Agreement - -13.1 Google may make changes to the License Agreement as it distributes new versions of the GDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the GDK is made available. - -14. General Legal Terms - -14.1 This License Agreement constitutes the whole legal agreement between you and Google and governs your use of the GDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the GDK. - -14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in this License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google. - -14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of this License Agreement is invalid, then that provision will be removed from this License Agreement without affecting the rest of this License Agreement. The remaining provisions of this License Agreement will continue to be valid and enforceable. - -14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to this License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of this License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to this License Agreement. - -14.5 EXPORT RESTRICTIONS. THE GDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE GDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE. - -14.6 The rights granted in this License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under this License Agreement without the prior written approval of the other party. - -14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction. - -November 19, 2013</sdk:license> - <sdk:license id="intel-android-extra-license" type="text">Intel (R) Hardware Accelerated Execution Manager -End-User License Agreement - -Copyright (c) 2012 Intel Corporation. -All rights reserved. - -Redistribution. Redistribution and use in binary form, without modification, are permitted provided that the following conditions are met: - -1.Redistributions must reproduce the above copyright notice and the following disclaimer in the documentation and/or other materials provided with the distribution. - -2.Neither the name of Intel Corporation nor the names of its suppliers may be used to endorse or promote products derived from this software without specific prior written permission. - -3.No reverse engineering, de-compilation, or disassembly of this software is permitted. Limited patent license. Intel Corporation grants a world-wide, royalty-free, non-exclusive license under patents it now or hereafter owns or controls to make, have made, use, import, offer to sell and sell ("Utilize") this software, but solely to the extent that any such patent is necessary to Utilize the software alone. The patent license shall not apply to any combinations which include this software. No hardware per se is licensed hereunder. - -DISCLAIMER. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</sdk:license> - <sdk:add-on> - <!--Generated from bid:12617722, branch:perforce--> - <sdk:obsolete/> - <sdk:revision>3</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sat May 19 22:41:19 2018.--> - <sdk:size>34908058</sdk:size> - <sdk:checksum type="sha1">1f92abf3a76be66ae8032257fc7620acbd2b2e3a</sdk:checksum> - <sdk:url>google_apis-3-r03.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:name-id>google_apis</sdk:name-id> - <sdk:name-display>Google APIs</sdk:name-display> - <sdk:api-level>3</sdk:api-level> - <sdk:description>Android + Google APIs</sdk:description> - <sdk:desc-url>http://developer.android.com/</sdk:desc-url> - <sdk:libs> - <sdk:lib> - <sdk:name>com.google.android.maps</sdk:name> - <sdk:description>API for Google Maps</sdk:description> - </sdk:lib> - </sdk:libs> - </sdk:add-on> - <sdk:add-on> - <!--Generated from bid:13752552, branch:perforce--> - <sdk:obsolete/> - <sdk:revision>2</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sun Jun 3 14:03:04 2018.--> - <sdk:size>42435735</sdk:size> - <sdk:checksum type="sha1">9b6e86d8568558de4d606a7debc4f6049608dbd0</sdk:checksum> - <sdk:url>google_apis-4_r02.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:name-id>google_apis</sdk:name-id> - <sdk:name-display>Google APIs</sdk:name-display> - <sdk:api-level>4</sdk:api-level> - <sdk:description>Android + Google APIs</sdk:description> - <sdk:desc-url>http://developer.android.com/</sdk:desc-url> - <sdk:libs> - <sdk:lib> - <sdk:name>com.google.android.maps</sdk:name> - <sdk:description>API for Google Maps</sdk:description> - </sdk:lib> - </sdk:libs> - </sdk:add-on> - <sdk:add-on> - <!--Generated from bid:13245770, branch:perforce--> - <sdk:obsolete/> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue Jun 5 17:50:33 2018.--> - <sdk:size>49123776</sdk:size> - <sdk:checksum type="sha1">46eaeb56b645ee7ffa24ede8fa17f3df70db0503</sdk:checksum> - <sdk:url>google_apis-5_r01.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:name-id>google_apis</sdk:name-id> - <sdk:name-display>Google APIs</sdk:name-display> - <sdk:api-level>5</sdk:api-level> - <sdk:description>Android + Google APIs</sdk:description> - <sdk:desc-url>http://developer.android.com/</sdk:desc-url> - <sdk:libs> - <sdk:lib> - <sdk:name>com.google.android.maps</sdk:name> - <sdk:description>API for Google Maps</sdk:description> - </sdk:lib> - </sdk:libs> - </sdk:add-on> - <sdk:add-on> - <!--Generated from bid:13752552, branch:perforce--> - <sdk:obsolete/> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sun Jun 10 12:37:49 2018.--> - <sdk:size>53382941</sdk:size> - <sdk:checksum type="sha1">5ff545d96e031e09580a6cf55713015c7d4936b2</sdk:checksum> - <sdk:url>google_apis-6_r01.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:name-id>google_apis</sdk:name-id> - <sdk:name-display>Google APIs</sdk:name-display> - <sdk:api-level>6</sdk:api-level> - <sdk:description>Android + Google APIs</sdk:description> - <sdk:desc-url>http://developer.android.com/</sdk:desc-url> - <sdk:libs> - <sdk:lib> - <sdk:name>com.google.android.maps</sdk:name> - <sdk:description>API for Google Maps</sdk:description> - </sdk:lib> - </sdk:libs> - </sdk:add-on> - <sdk:add-on> - <!--Generated from bid:14140606, branch:perforce--> - <sdk:obsolete/> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Wed May 30 22:32:20 2018.--> - <sdk:size>53691339</sdk:size> - <sdk:checksum type="sha1">2e7f91e0fe34fef7f58aeced973c6ae52361b5ac</sdk:checksum> - <sdk:url>google_apis-7_r01.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:name-id>google_apis</sdk:name-id> - <sdk:name-display>Google APIs</sdk:name-display> - <sdk:api-level>7</sdk:api-level> - <sdk:description>Android + Google APIs</sdk:description> - <sdk:desc-url>http://developer.android.com/</sdk:desc-url> - <sdk:libs> - <sdk:lib> - <sdk:name>com.google.android.maps</sdk:name> - <sdk:description>API for Google Maps</sdk:description> - </sdk:lib> - </sdk:libs> - </sdk:add-on> - <sdk:add-on> - <!--Generated from bid:16286500, branch:perforce--> - <sdk:obsolete/> - <sdk:revision>2</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Mon Jun 11 03:39:55 2018.--> - <sdk:size>59505020</sdk:size> - <sdk:checksum type="sha1">3079958e7ec87222cac1e6b27bc471b27bf2c352</sdk:checksum> - <sdk:url>google_apis-8_r02.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:name-id>google_apis</sdk:name-id> - <sdk:name-display>Google APIs</sdk:name-display> - <sdk:api-level>8</sdk:api-level> - <sdk:description>Android + Google APIs</sdk:description> - <sdk:desc-url>http://developer.android.com/</sdk:desc-url> - <sdk:libs> - <sdk:lib> - <sdk:name>com.google.android.maps</sdk:name> - <sdk:description>API for Google Maps</sdk:description> - </sdk:lib> - </sdk:libs> - </sdk:add-on> - <sdk:add-on> - <!--Generated from bid:19092731, branch:perforce--> - <sdk:obsolete/> - <sdk:revision>2</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Wed May 23 15:52:14 2018.--> - <sdk:size>63401546</sdk:size> - <sdk:checksum type="sha1">78664645a1e9accea4430814f8694291a7f1ea5d</sdk:checksum> - <sdk:url>google_apis-9_r02.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:name-id>google_apis</sdk:name-id> - <sdk:name-display>Google APIs</sdk:name-display> - <sdk:api-level>9</sdk:api-level> - <sdk:description>Android + Google APIs</sdk:description> - <sdk:desc-url>http://developer.android.com/</sdk:desc-url> - <sdk:libs> - <sdk:lib> - <sdk:name>com.google.android.maps</sdk:name> - <sdk:description>API for Google Maps</sdk:description> - </sdk:lib> - </sdk:libs> - </sdk:add-on> - <sdk:add-on> - <!--Generated from bid:21121559, branch:perforce--> - <sdk:obsolete/> - <sdk:revision>2</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue May 29 03:55:38 2018.--> - <sdk:size>65781578</sdk:size> - <sdk:checksum type="sha1">cc0711857c881fa7534f90cf8cc09b8fe985484d</sdk:checksum> - <sdk:url>google_apis-10_r02.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:name-id>google_apis</sdk:name-id> - <sdk:name-display>Google APIs</sdk:name-display> - <sdk:api-level>10</sdk:api-level> - <sdk:description>Android + Google APIs</sdk:description> - <sdk:desc-url>http://developer.android.com/</sdk:desc-url> - <sdk:libs> - <sdk:lib> - <sdk:name>com.google.android.maps</sdk:name> - <sdk:description>API for Google Maps</sdk:description> - </sdk:lib> - <sdk:lib> - <sdk:name>com.android.future.usb.accessory</sdk:name> - <sdk:description>API for USB Accessories</sdk:description> - </sdk:lib> - </sdk:libs> - </sdk:add-on> - <sdk:add-on> - <!--Generated from bid:19633933, branch:perforce--> - <sdk:obsolete/> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Thu Jun 14 15:13:30 2018.--> - <sdk:size>83477179</sdk:size> - <sdk:checksum type="sha1">5eab5e81addee9f3576d456d205208314b5146a5</sdk:checksum> - <sdk:url>google_apis-11_r01.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:name-id>google_apis</sdk:name-id> - <sdk:name-display>Google APIs</sdk:name-display> - <sdk:api-level>11</sdk:api-level> - <sdk:description>Android + Google APIs</sdk:description> - <sdk:desc-url>http://developer.android.com/</sdk:desc-url> - <sdk:libs> - <sdk:lib> - <sdk:name>com.google.android.maps</sdk:name> - <sdk:description>API for Google Maps</sdk:description> - </sdk:lib> - </sdk:libs> - </sdk:add-on> - <sdk:add-on> - <!--Generated from bid:21121559, branch:perforce--> - <sdk:obsolete/> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Mon Jun 11 10:52:20 2018.--> - <sdk:size>86099835</sdk:size> - <sdk:checksum type="sha1">e9999f4fa978812174dfeceec0721c793a636e5d</sdk:checksum> - <sdk:url>google_apis-12_r01.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:name-id>google_apis</sdk:name-id> - <sdk:name-display>Google APIs</sdk:name-display> - <sdk:api-level>12</sdk:api-level> - <sdk:description>Android + Google APIs</sdk:description> - <sdk:desc-url>http://developer.android.com/</sdk:desc-url> - <sdk:libs> - <sdk:lib> - <sdk:name>com.google.android.maps</sdk:name> - <sdk:description>API for Google Maps</sdk:description> - </sdk:lib> - <sdk:lib> - <sdk:name>com.android.future.usb.accessory</sdk:name> - <sdk:description>API for USB Accessories</sdk:description> - </sdk:lib> - </sdk:libs> - </sdk:add-on> - <sdk:add-on> - <!--Generated from bid:22531000, branch:perforce--> - <sdk:obsolete/> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sun May 27 03:09:43 2018.--> - <sdk:size>88615525</sdk:size> - <sdk:checksum type="sha1">3b153edd211c27dc736c893c658418a4f9041417</sdk:checksum> - <sdk:url>google_apis-13_r01.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:name-id>google_apis</sdk:name-id> - <sdk:name-display>Google APIs</sdk:name-display> - <sdk:api-level>13</sdk:api-level> - <sdk:description>Android + Google APIs</sdk:description> - <sdk:desc-url>http://developer.android.com/</sdk:desc-url> - <sdk:libs> - <sdk:lib> - <sdk:name>com.google.android.maps</sdk:name> - <sdk:description>API for Google Maps</sdk:description> - </sdk:lib> - <sdk:lib> - <sdk:name>com.android.future.usb.accessory</sdk:name> - <sdk:description>API for USB Accessories</sdk:description> - </sdk:lib> - </sdk:libs> - </sdk:add-on> - <sdk:add-on> - <!--Generated from bid:26085354, branch:perforce--> - <sdk:obsolete/> - <sdk:revision>2</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Wed Jun 13 22:44:43 2018.--> - <sdk:size>106533714</sdk:size> - <sdk:checksum type="sha1">f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39</sdk:checksum> - <sdk:url>google_apis-14_r02.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:name-id>google_apis</sdk:name-id> - <sdk:name-display>Google APIs</sdk:name-display> - <sdk:api-level>14</sdk:api-level> - <sdk:description>Android + Google APIs</sdk:description> - <sdk:libs> - <sdk:lib> - <sdk:name>com.google.android.maps</sdk:name> - <sdk:description>API for Google Maps</sdk:description> - </sdk:lib> - <sdk:lib> - <sdk:name>com.android.future.usb.accessory</sdk:name> - <sdk:description>API for USB Accessories</sdk:description> - </sdk:lib> - </sdk:libs> - </sdk:add-on> - <sdk:add-on> - <!--Generated from bid:95160078, branch:perforce--> - <sdk:revision>3</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Fri Jun 15 19:37:58 2018.--> - <sdk:size>106624396</sdk:size> - <sdk:checksum type="sha1">d0d2bf26805eb271693570a1aaec33e7dc3f45e9</sdk:checksum> - <sdk:url>google_apis-15_r03.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:name-id>google_apis</sdk:name-id> - <sdk:name-display>Google APIs</sdk:name-display> - <sdk:api-level>15</sdk:api-level> - <sdk:description>Android + Google APIs</sdk:description> - <sdk:libs> - <sdk:lib> - <sdk:name>com.google.android.maps</sdk:name> - <sdk:description>API for Google Maps</sdk:description> - </sdk:lib> - <sdk:lib> - <sdk:name>com.android.future.usb.accessory</sdk:name> - <sdk:description>API for USB Accessories</sdk:description> - </sdk:lib> - <sdk:lib> - <sdk:name>com.google.android.media.effects</sdk:name> - <sdk:description>Collection of video effects</sdk:description> - </sdk:lib> - </sdk:libs> - </sdk:add-on> - <sdk:add-on> - <!--Generated from bid:95160078, branch:perforce--> - <sdk:revision>4</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sun Jun 10 20:07:39 2018.--> - <sdk:size>127341982</sdk:size> - <sdk:checksum type="sha1">ee6acf1b01020bfa8a8e24725dbc4478bee5e792</sdk:checksum> - <sdk:url>google_apis-16_r04.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:name-id>google_apis</sdk:name-id> - <sdk:name-display>Google APIs</sdk:name-display> - <sdk:api-level>16</sdk:api-level> - <sdk:description>Android + Google APIs</sdk:description> - <sdk:libs> - <sdk:lib> - <sdk:name>com.google.android.maps</sdk:name> - <sdk:description>API for Google Maps</sdk:description> - </sdk:lib> - <sdk:lib> - <sdk:name>com.android.future.usb.accessory</sdk:name> - <sdk:description>API for USB Accessories</sdk:description> - </sdk:lib> - <sdk:lib> - <sdk:name>com.google.android.media.effects</sdk:name> - <sdk:description>Collection of video effects</sdk:description> - </sdk:lib> - </sdk:libs> - </sdk:add-on> - <sdk:add-on> - <!--Generated from bid:94805340, branch:perforce--> - <sdk:revision>4</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Wed May 30 17:17:51 2018.--> - <sdk:size>137231243</sdk:size> - <sdk:checksum type="sha1">a076be0677f38df8ca5536b44dfb411a0c808c4f</sdk:checksum> - <sdk:url>google_apis-17_r04.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:name-id>google_apis</sdk:name-id> - <sdk:name-display>Google APIs</sdk:name-display> - <sdk:api-level>17</sdk:api-level> - <sdk:description>Android + Google APIs</sdk:description> - <sdk:libs> - <sdk:lib> - <sdk:name>com.google.android.maps</sdk:name> - <sdk:description>API for Google Maps</sdk:description> - </sdk:lib> - <sdk:lib> - <sdk:name>com.android.future.usb.accessory</sdk:name> - <sdk:description>API for USB Accessories</sdk:description> - </sdk:lib> - <sdk:lib> - <sdk:name>com.google.android.media.effects</sdk:name> - <sdk:description>Collection of video effects</sdk:description> - </sdk:lib> - </sdk:libs> - </sdk:add-on> - <sdk:add-on> - <!--Generated from bid:94805340, branch:perforce--> - <sdk:revision>4</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sun May 27 23:13:56 2018.--> - <sdk:size>143195183</sdk:size> - <sdk:checksum type="sha1">6109603409debdd40854d4d4a92eaf8481462c8b</sdk:checksum> - <sdk:url>google_apis-18_r04.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:name-id>google_apis</sdk:name-id> - <sdk:name-display>Google APIs</sdk:name-display> - <sdk:api-level>18</sdk:api-level> - <sdk:description>Android + Google APIs</sdk:description> - <sdk:libs> - <sdk:lib> - <sdk:name>com.google.android.maps</sdk:name> - <sdk:description>API for Google Maps</sdk:description> - </sdk:lib> - <sdk:lib> - <sdk:name>com.android.future.usb.accessory</sdk:name> - <sdk:description>API for USB Accessories</sdk:description> - </sdk:lib> - <sdk:lib> - <sdk:name>com.google.android.media.effects</sdk:name> - <sdk:description>Collection of video effects</sdk:description> - </sdk:lib> - </sdk:libs> - </sdk:add-on> - <sdk:add-on> - <!--Generated from bid:2884604, branch:git_klp-emu-release--> - <sdk:revision>20</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sat Jun 2 14:21:02 2018.--> - <sdk:size>147081</sdk:size> - <sdk:checksum type="sha1">5b933abe830b2f25b4c0f171d45e9e0651e56311</sdk:checksum> - <sdk:url>google_apis-19_r20.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:name-id>google_apis</sdk:name-id> - <sdk:name-display>Google APIs</sdk:name-display> - <sdk:api-level>19</sdk:api-level> - <sdk:description>Android + Google APIs</sdk:description> - <sdk:libs> - <sdk:lib> - <sdk:name>com.google.android.maps</sdk:name> - <sdk:description>API for Google Maps</sdk:description> - </sdk:lib> - <sdk:lib> - <sdk:name>com.android.future.usb.accessory</sdk:name> - <sdk:description>API for USB Accessories</sdk:description> - </sdk:lib> - <sdk:lib> - <sdk:name>com.google.android.media.effects</sdk:name> - <sdk:description>Collection of video effects</sdk:description> - </sdk:lib> - </sdk:libs> - </sdk:add-on> - <sdk:add-on> - <!--Generated from bid:3249234, branch:git_nyc-emu-release--> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Fri Jun 1 04:12:18 2018.--> - <sdk:size>154865</sdk:size> - <sdk:checksum type="sha1">31361c2868f27343ee917fbd259c1463821b6145</sdk:checksum> - <sdk:url>google_apis-24_r1.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:name-id>google_apis</sdk:name-id> - <sdk:name-display>Google APIs</sdk:name-display> - <sdk:api-level>24</sdk:api-level> - <sdk:description>Android + Google APIs</sdk:description> - <sdk:libs> - <sdk:lib> - <sdk:name>com.google.android.maps</sdk:name> - <sdk:description>API for Google Maps</sdk:description> - </sdk:lib> - <sdk:lib> - <sdk:name>com.android.future.usb.accessory</sdk:name> - <sdk:description>API for USB Accessories</sdk:description> - </sdk:lib> - <sdk:lib> - <sdk:name>com.google.android.media.effects</sdk:name> - <sdk:description>Collection of video effects</sdk:description> - </sdk:lib> - </sdk:libs> - </sdk:add-on> - <sdk:add-on> - <!--Generated from bid:3756122, branch:git_nyc-mr1-emu-release--> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue Jun 12 20:09:06 2018.--> - <sdk:size>154871</sdk:size> - <sdk:checksum type="sha1">550e83eea9513ab11c44919ac6da54b36084a9f3</sdk:checksum> - <sdk:url>google_apis-25_r1.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:name-id>google_apis</sdk:name-id> - <sdk:name-display>Google APIs</sdk:name-display> - <sdk:api-level>23</sdk:api-level> - <sdk:description>Android + Google APIs</sdk:description> - <sdk:libs> - <sdk:lib> - <sdk:name>com.google.android.maps</sdk:name> - <sdk:description>API for Google Maps</sdk:description> - </sdk:lib> - <sdk:lib> - <sdk:name>com.android.future.usb.accessory</sdk:name> - <sdk:description>API for USB Accessories</sdk:description> - </sdk:lib> - <sdk:lib> - <sdk:name>com.google.android.media.effects</sdk:name> - <sdk:description>Collection of video effects</sdk:description> - </sdk:lib> - </sdk:libs> - </sdk:add-on> - <sdk:add-on> - <!--Generated from bid:77907680, branch:perforce--> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Mon Jun 11 05:08:59 2018.--> - <sdk:size>179499</sdk:size> - <sdk:checksum type="sha1">66a754efb24e9bb07cc51648426443c7586c9d4a</sdk:checksum> - <sdk:url>google_apis-21_r01.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:name-id>google_apis</sdk:name-id> - <sdk:name-display>Google APIs</sdk:name-display> - <sdk:api-level>21</sdk:api-level> - <sdk:description>Android + Google APIs</sdk:description> - <sdk:libs> - <sdk:lib> - <sdk:name>com.google.android.maps</sdk:name> - <sdk:description>API for Google Maps</sdk:description> - </sdk:lib> - <sdk:lib> - <sdk:name>com.android.future.usb.accessory</sdk:name> - <sdk:description>API for USB Accessories</sdk:description> - </sdk:lib> - <sdk:lib> - <sdk:name>com.google.android.media.effects</sdk:name> - <sdk:description>Collection of video effects</sdk:description> - </sdk:lib> - </sdk:libs> - </sdk:add-on> - <sdk:add-on> - <!--Generated from bid:87569863, branch:perforce--> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Fri Jun 15 06:11:24 2018.--> - <sdk:size>179259</sdk:size> - <sdk:checksum type="sha1">5def0f42160cba8acff51b9c0c7e8be313de84f5</sdk:checksum> - <sdk:url>google_apis-22_r01.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:name-id>google_apis</sdk:name-id> - <sdk:name-display>Google APIs</sdk:name-display> - <sdk:api-level>22</sdk:api-level> - <sdk:description>Android + Google APIs</sdk:description> - <sdk:libs> - <sdk:lib> - <sdk:name>com.google.android.maps</sdk:name> - <sdk:description>API for Google Maps</sdk:description> - </sdk:lib> - <sdk:lib> - <sdk:name>com.android.future.usb.accessory</sdk:name> - <sdk:description>API for USB Accessories</sdk:description> - </sdk:lib> - <sdk:lib> - <sdk:name>com.google.android.media.effects</sdk:name> - <sdk:description>Collection of video effects</sdk:description> - </sdk:lib> - </sdk:libs> - </sdk:add-on> - <sdk:add-on> - <!--Generated from bid:100722913, branch:perforce--> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sun Jun 10 08:57:09 2018.--> - <sdk:size>179900</sdk:size> - <sdk:checksum type="sha1">04c5cc1a7c88967250ebba9561d81e24104167db</sdk:checksum> - <sdk:url>google_apis-23_r01.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:name-id>google_apis</sdk:name-id> - <sdk:name-display>Google APIs</sdk:name-display> - <sdk:api-level>23</sdk:api-level> - <sdk:description>Android + Google APIs</sdk:description> - <sdk:libs> - <sdk:lib> - <sdk:name>com.google.android.maps</sdk:name> - <sdk:description>API for Google Maps</sdk:description> - </sdk:lib> - <sdk:lib> - <sdk:name>com.android.future.usb.accessory</sdk:name> - <sdk:description>API for USB Accessories</sdk:description> - </sdk:lib> - <sdk:lib> - <sdk:name>com.google.android.media.effects</sdk:name> - <sdk:description>Collection of video effects</sdk:description> - </sdk:lib> - </sdk:libs> - </sdk:add-on> - <sdk:add-on> - <!--Generated from bid:24379226, branch:perforce--> - <sdk:obsolete/> - <sdk:revision>2</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sun May 27 03:16:19 2018.--> - <sdk:size>78266751</sdk:size> - <sdk:checksum type="sha1">92128a12e7e8b0fb5bac59153d7779b717e7b840</sdk:checksum> - <sdk:url>google_tv-12_r02.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-googletv-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:name-id>google_tv_addon</sdk:name-id> - <sdk:name-display>Google TV Addon</sdk:name-display> - <sdk:api-level>12</sdk:api-level> - <sdk:description></sdk:description> - <sdk:desc-url>http://developer.android.com/</sdk:desc-url> - <sdk:libs/> - </sdk:add-on> - <sdk:add-on> - <!--Generated from bid:41196280, branch:perforce--> - <sdk:obsolete/> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue Jun 19 05:04:20 2018.--> - <sdk:size>87721879</sdk:size> - <sdk:checksum type="sha1">b73f7c66011ac8180b44aa4e83b8d78c66ea9a09</sdk:checksum> - <sdk:url>google_tv-13_r01.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-googletv-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:name-id>google_tv_addon</sdk:name-id> - <sdk:name-display>Google TV Addon</sdk:name-display> - <sdk:api-level>13</sdk:api-level> - <sdk:description></sdk:description> - <sdk:desc-url>http://developer.android.com/</sdk:desc-url> - <sdk:libs/> - </sdk:add-on> - <sdk:extra> - <!--Generated from bid:3841166, branch:git_nyc-support-release--> - <sdk:revision> - <sdk:major>47</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>0</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Mon Jun 11 04:51:54 2018.--> - <sdk:size>355529608</sdk:size> - <sdk:checksum type="sha1">a0d22beacc106a6977321f2b07d692ce4979e96a</sdk:checksum> - <sdk:url>android_m2repository_r47.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>android</sdk:vendor-id> - <sdk:vendor-display>Android</sdk:vendor-display> - <sdk:description>Local Maven repository for Support Libraries</sdk:description> - <sdk:name-display>Android Support Repository</sdk:name-display> - <sdk:path>m2repository</sdk:path> - </sdk:extra> - <sdk:extra> - <!--Generated from bid:167710051, branch:perforce--> - <sdk:revision> - <sdk:major>58</sdk:major> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Mon Jun 11 11:10:27 2018.--> - <sdk:size>215426029</sdk:size> - <sdk:checksum type="sha1">05086add9e3a0eb1b67111108d7757a4337c3f10</sdk:checksum> - <sdk:url>google_m2repository_gms_v11_3_rc05_wear_2_0_5.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:description>Local Maven repository for Support Libraries</sdk:description> - <sdk:name-display>Google Repository</sdk:name-display> - <sdk:path>m2repository</sdk:path> - </sdk:extra> - <sdk:extra> - <!--Generated from bid:28113395, branch:perforce--> - <sdk:revision> - <sdk:major>1</sdk:major> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sun Jun 10 01:20:16 2018.--> - <sdk:size>75109</sdk:size> - <sdk:checksum type="sha1">355e8dc304a92a5616db235af8ee7bd554356254</sdk:checksum> - <sdk:url>market_licensing-r02.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display></sdk:vendor-display> - <sdk:description>Android Market Licensing client library</sdk:description> - <sdk:desc-url>http://developer.android.com/guide/publishing/licensing.html</sdk:desc-url> - <sdk:name-display>Google Play Licensing Library</sdk:name-display> - <sdk:path>market_licensing</sdk:path> - </sdk:extra> - <sdk:extra> - <!--Generated from bid:42096985, branch:perforce--> - <sdk:revision> - <sdk:major>1</sdk:major> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sun Jun 17 19:31:02 2018.--> - <sdk:size>110201</sdk:size> - <sdk:checksum type="sha1">5305399dc1a56814e86b8459ce24871916f78b8c</sdk:checksum> - <sdk:url>market_apk_expansion-r03.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:description>Android Market APK Expansion library</sdk:description> - <sdk:desc-url>http://developer.android.com/guide/market/expansion-files.html</sdk:desc-url> - <sdk:name-display>Google Play APK Expansion library</sdk:name-display> - <sdk:path>market_apk_expansion</sdk:path> - </sdk:extra> - <sdk:extra> - <!--Generated from bid:52571120, branch:perforce--> - <sdk:obsolete/> - <sdk:revision> - <sdk:major>12</sdk:major> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sun May 27 10:44:16 2018.--> - <sdk:size>5265389</sdk:size> - <sdk:checksum type="sha1">92558dbc380bba3d55d0ec181167fb05ce7c79d9</sdk:checksum> - <sdk:url>google_play_services_3265130_r12.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:description>Google Play services client library and sample code</sdk:description> - <sdk:desc-url>https://developers.google.com/android/google-play-services/index</sdk:desc-url> - <sdk:name-display>Google Play services for Froyo</sdk:name-display> - <sdk:path>google_play_services_froyo</sdk:path> - </sdk:extra> - <sdk:extra> - <!--Generated from bid:189640690, branch:perforce--> - <sdk:revision> - <sdk:major>49</sdk:major> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Mon Jun 11 08:08:54 2018.--> - <sdk:size>15456884</sdk:size> - <sdk:checksum type="sha1">f95bf19634e2ab0430923247fe2c50246432d2e9</sdk:checksum> - <sdk:url>google_play_services_v16_1_rc09.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:description>Google Play services Javadocs and sample code</sdk:description> - <sdk:desc-url>https://developers.google.com/android/google-play-services/index</sdk:desc-url> - <sdk:name-display>Google Play services</sdk:name-display> - <sdk:path>google_play_services</sdk:path> - </sdk:extra> - <sdk:extra> - <!--Generated from bid:75820409, branch:perforce--> - <sdk:revision> - <sdk:major>11</sdk:major> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Thu Jun 7 01:53:27 2018.--> - <sdk:size>8682859</sdk:size> - <sdk:checksum type="sha1">dc8a2ed2fbd7246d4caf9ab10ffe7749dc35d1cc</sdk:checksum> - <sdk:url>usb_driver_r11-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:description>USB Driver for Windows, revision 11</sdk:description> - <sdk:desc-url>http://developer.android.com/</sdk:desc-url> - <sdk:name-display>Google USB Driver</sdk:name-display> - <sdk:path>usb_driver</sdk:path> - </sdk:extra> - <sdk:extra> - <!--Generated from bid:45484492, branch:perforce--> - <sdk:obsolete/> - <sdk:revision> - <sdk:major>11</sdk:major> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Thu Jun 7 11:48:51 2018.--> - <sdk:size>704512</sdk:size> - <sdk:checksum type="sha1">0102859d9575baa0bf4fd5eb422af2ad0fe6cb82</sdk:checksum> - <sdk:url>GoogleAdMobAdsSdkAndroid-6.4.1.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:description>AdMob Ads SDK</sdk:description> - <sdk:desc-url>https://developers.google.com/mobile-ads-sdk/docs/</sdk:desc-url> - <sdk:name-display>Google AdMob Ads SDK</sdk:name-display> - <sdk:path>admob_ads_sdk</sdk:path> - </sdk:extra> - <sdk:extra> - <!--Generated from bid:44867123, branch:perforce--> - <sdk:obsolete/> - <sdk:revision> - <sdk:major>3</sdk:major> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue Jun 5 05:29:27 2018.--> - <sdk:size>211432</sdk:size> - <sdk:checksum type="sha1">dc14026bf0ce78315cb5dd00552607de0894de83</sdk:checksum> - <sdk:url>GoogleAnalyticsAndroid_2.0beta5.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:description>Analytics App Tracking SDK</sdk:description> - <sdk:desc-url>http://developers.google.com/analytics/devguides/collection/</sdk:desc-url> - <sdk:name-display>Google Analytics App Tracking SDK</sdk:name-display> - <sdk:path>analytics_sdk_v2</sdk:path> - </sdk:extra> - <sdk:extra> - <!--Generated from bid:25118237, branch:perforce--> - <sdk:revision> - <sdk:major>2</sdk:major> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Thu May 31 20:21:33 2018.--> - <sdk:size>4055193</sdk:size> - <sdk:checksum type="sha1">13f3a3b2670a5fc04a7342861644be9a01b07e38</sdk:checksum> - <sdk:url>webdriver_r02.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:description></sdk:description> - <sdk:desc-url>http://selenium.googlecode.com</sdk:desc-url> - <sdk:name-display>Google Web Driver</sdk:name-display> - <sdk:path>webdriver</sdk:path> - </sdk:extra> - <sdk:extra> - <!--Generated from bid:32432700, branch:perforce--> - <sdk:obsolete/> - <sdk:revision> - <sdk:major>3</sdk:major> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sun May 27 10:27:10 2018.--> - <sdk:size>5901400</sdk:size> - <sdk:checksum type="sha1">ad066fd0dc7fc99d8aadac09c65a3c2519fbc7bf</sdk:checksum> - <sdk:url>gcm_r03.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:description>GCM library has been moved to Google Play Services (com.google.android.gms.gcm) and this standalone version is no longer supported</sdk:description> - <sdk:desc-url>https://developers.google.com/android/gcm/index</sdk:desc-url> - <sdk:name-display>Google Cloud Messaging for Android Library</sdk:name-display> - <sdk:path>gcm</sdk:path> - </sdk:extra> - <sdk:extra> - <!--Generated from bid:80165500, branch:perforce--> - <sdk:revision> - <sdk:major>1</sdk:major> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue Jun 5 14:06:56 2018.--> - <sdk:size>2167286</sdk:size> - <sdk:checksum type="sha1">4fb5344e34e8faab4db18af07dace44c50db26a7</sdk:checksum> - <sdk:url>simulator_r01.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:description>Android Auto API testing simulators</sdk:description> - <sdk:desc-url>http://developer.android.com/auto</sdk:desc-url> - <sdk:name-display>Android Auto API Simulators</sdk:name-display> - <sdk:path>simulators</sdk:path> - </sdk:extra> - <sdk:extra> - <!--Generated from bid:107062527, branch:perforce--> - <sdk:revision> - <sdk:major>1</sdk:major> - <sdk:minor>1</sdk:minor> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sat Jun 16 20:44:31 2018.--> - <sdk:size>1346009</sdk:size> - <sdk:checksum type="sha1">202a6e1b3009a0eb815f8c672d2d5b3717de6169</sdk:checksum> - <sdk:url>desktop-head-unit-linux_r01.1.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Tue Jun 12 06:56:07 2018.--> - <sdk:size>2375533</sdk:size> - <sdk:checksum type="sha1">8179cbb3914493ebc5eb65b731cba061582f2e84</sdk:checksum> - <sdk:url>desktop-head-unit-macosx_r01.1.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Tue Jun 12 13:47:09 2018.--> - <sdk:size>2691901</sdk:size> - <sdk:checksum type="sha1">99c4a7172d73673552119347bc24c58b47da177b</sdk:checksum> - <sdk:url>desktop-head-unit-windows_r01.1.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:description>Head unit emulator for developers targeting the Android Auto platform.</sdk:description> - <sdk:desc-url>http://developer.android.com/tools/help/desktop-head-unit.html</sdk:desc-url> - <sdk:name-display>Android Auto Desktop Head Unit emulator</sdk:name-display> - <sdk:path>auto</sdk:path> - </sdk:extra> - <sdk:extra> - <!--Generated from bid:214678223, branch:perforce--> - <sdk:revision> - <sdk:major>1</sdk:major> - <sdk:minor>5</sdk:minor> - <sdk:micro>0</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Wed Sep 26 15:20:22 2018.--> - <sdk:size>33351418</sdk:size> - <sdk:checksum type="sha1">6c282b9c686e819fe7f5ac8f2249d2479acb63b4</sdk:checksum> - <sdk:url>iasdk-1.5.0-1538000167.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:vendor-id>google</sdk:vendor-id> - <sdk:vendor-display>Google Inc.</sdk:vendor-display> - <sdk:description>Google Play Instant Development SDK</sdk:description> - <sdk:desc-url>https://developer.android.com/topic/google-play-instant/</sdk:desc-url> - <sdk:name-display>Google Play Instant Development SDK</sdk:name-display> - <sdk:path>instantapps</sdk:path> - </sdk:extra> -</sdk:sdk-addon> diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix deleted file mode 100644 index 1a8e2d32a4b..00000000000 --- a/pkgs/development/mobile/androidenv/addons.nix +++ /dev/null @@ -1,321 +0,0 @@ - -# This file is generated from generate-addons.sh. DO NOT EDIT. -# Execute generate-addons.sh or fetch.sh to update the file. -{stdenv, fetchurl, unzip}: - -let - buildGoogleApis = args: - stdenv.mkDerivation (args // { - buildInputs = [ unzip ]; - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - }); -in -{ - - google_apis_3 = buildGoogleApis { - name = "google_apis-3"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-3-r03.zip; - sha1 = "1f92abf3a76be66ae8032257fc7620acbd2b2e3a"; - }; - meta = { - description = "Android + Google APIs"; - url = http://developer.android.com/; - }; - }; - - google_apis_4 = buildGoogleApis { - name = "google_apis-4"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-4_r02.zip; - sha1 = "9b6e86d8568558de4d606a7debc4f6049608dbd0"; - }; - meta = { - description = "Android + Google APIs"; - url = http://developer.android.com/; - }; - }; - - google_apis_5 = buildGoogleApis { - name = "google_apis-5"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-5_r01.zip; - sha1 = "46eaeb56b645ee7ffa24ede8fa17f3df70db0503"; - }; - meta = { - description = "Android + Google APIs"; - url = http://developer.android.com/; - }; - }; - - google_apis_6 = buildGoogleApis { - name = "google_apis-6"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-6_r01.zip; - sha1 = "5ff545d96e031e09580a6cf55713015c7d4936b2"; - }; - meta = { - description = "Android + Google APIs"; - url = http://developer.android.com/; - }; - }; - - google_apis_7 = buildGoogleApis { - name = "google_apis-7"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-7_r01.zip; - sha1 = "2e7f91e0fe34fef7f58aeced973c6ae52361b5ac"; - }; - meta = { - description = "Android + Google APIs"; - url = http://developer.android.com/; - }; - }; - - google_apis_8 = buildGoogleApis { - name = "google_apis-8"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-8_r02.zip; - sha1 = "3079958e7ec87222cac1e6b27bc471b27bf2c352"; - }; - meta = { - description = "Android + Google APIs"; - url = http://developer.android.com/; - }; - }; - - google_apis_9 = buildGoogleApis { - name = "google_apis-9"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-9_r02.zip; - sha1 = "78664645a1e9accea4430814f8694291a7f1ea5d"; - }; - meta = { - description = "Android + Google APIs"; - url = http://developer.android.com/; - }; - }; - - google_apis_10 = buildGoogleApis { - name = "google_apis-10"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-10_r02.zip; - sha1 = "cc0711857c881fa7534f90cf8cc09b8fe985484d"; - }; - meta = { - description = "Android + Google APIs"; - url = http://developer.android.com/; - }; - }; - - google_apis_11 = buildGoogleApis { - name = "google_apis-11"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-11_r01.zip; - sha1 = "5eab5e81addee9f3576d456d205208314b5146a5"; - }; - meta = { - description = "Android + Google APIs"; - url = http://developer.android.com/; - }; - }; - - google_apis_12 = buildGoogleApis { - name = "google_apis-12"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-12_r01.zip; - sha1 = "e9999f4fa978812174dfeceec0721c793a636e5d"; - }; - meta = { - description = "Android + Google APIs"; - url = http://developer.android.com/; - }; - }; - - google_apis_13 = buildGoogleApis { - name = "google_apis-13"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-13_r01.zip; - sha1 = "3b153edd211c27dc736c893c658418a4f9041417"; - }; - meta = { - description = "Android + Google APIs"; - url = http://developer.android.com/; - }; - }; - - google_apis_14 = buildGoogleApis { - name = "google_apis-14"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-14_r02.zip; - sha1 = "f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39"; - }; - meta = { - description = "Android + Google APIs"; - - }; - }; - - google_apis_15 = buildGoogleApis { - name = "google_apis-15"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-15_r03.zip; - sha1 = "d0d2bf26805eb271693570a1aaec33e7dc3f45e9"; - }; - meta = { - description = "Android + Google APIs"; - - }; - }; - - google_apis_16 = buildGoogleApis { - name = "google_apis-16"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-16_r04.zip; - sha1 = "ee6acf1b01020bfa8a8e24725dbc4478bee5e792"; - }; - meta = { - description = "Android + Google APIs"; - - }; - }; - - google_apis_17 = buildGoogleApis { - name = "google_apis-17"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-17_r04.zip; - sha1 = "a076be0677f38df8ca5536b44dfb411a0c808c4f"; - }; - meta = { - description = "Android + Google APIs"; - - }; - }; - - google_apis_18 = buildGoogleApis { - name = "google_apis-18"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-18_r04.zip; - sha1 = "6109603409debdd40854d4d4a92eaf8481462c8b"; - }; - meta = { - description = "Android + Google APIs"; - - }; - }; - - google_apis_19 = buildGoogleApis { - name = "google_apis-19"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-19_r20.zip; - sha1 = "5b933abe830b2f25b4c0f171d45e9e0651e56311"; - }; - meta = { - description = "Android + Google APIs"; - - }; - }; - - google_apis_21 = buildGoogleApis { - name = "google_apis-21"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-21_r01.zip; - sha1 = "66a754efb24e9bb07cc51648426443c7586c9d4a"; - }; - meta = { - description = "Android + Google APIs"; - - }; - }; - - google_apis_22 = buildGoogleApis { - name = "google_apis-22"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-22_r01.zip; - sha1 = "5def0f42160cba8acff51b9c0c7e8be313de84f5"; - }; - meta = { - description = "Android + Google APIs"; - - }; - }; - - google_apis_23 = buildGoogleApis { - name = "google_apis-23"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-23_r01.zip; - sha1 = "04c5cc1a7c88967250ebba9561d81e24104167db"; - }; - meta = { - description = "Android + Google APIs"; - - }; - }; - - google_apis_24 = buildGoogleApis { - name = "google_apis-24"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-24_r1.zip; - sha1 = "31361c2868f27343ee917fbd259c1463821b6145"; - }; - meta = { - description = "Android + Google APIs"; - - }; - }; - - google_apis_25 = buildGoogleApis { - name = "google_apis-25"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-25_r1.zip; - sha1 = "550e83eea9513ab11c44919ac6da54b36084a9f3"; - }; - meta = { - description = "Android + Google APIs"; - - }; - }; - - android_support_extra = buildGoogleApis { - name = "android_support_extra"; - src = fetchurl { - url = https://dl.google.com/android/repository/support_r23.2.1.zip; - sha1 = "41121bbc412c2fce0be170d589d20cfa3e78e857"; - }; - meta = { - description = "Android Support Library"; - url = http://developer.android.com/; - }; - }; - - - google_play_services = buildGoogleApis { - name = "google_play_services"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_play_services_v16_1_rc09.zip; - sha1 = "f95bf19634e2ab0430923247fe2c50246432d2e9"; - }; - meta = { - description = "Google Play services client library and sample code"; - url = http://developer.android.com/; - }; - }; - - instant_apps = buildGoogleApis { - name = "instant_apps_sdk"; - src = fetchurl { - url = https://dl.google.com/android/repository/iasdk-1.5.0-1538000167.zip; - sha1 = "6c282b9c686e819fe7f5ac8f2249d2479acb63b4"; - }; - meta = { - description = "Android Instant Apps Development SDK"; - url = "https://developer.android.com/"; - }; - }; - - -} diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix deleted file mode 100644 index 23ae4378dc6..00000000000 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ /dev/null @@ -1,120 +0,0 @@ -{ stdenv, fetchurl, zlib, ncurses5, unzip, lib, makeWrapper -, coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which -, platformTools, python3, libcxx, version, sha1s, bash, runCommand -, fullNDK ? false # set to true if you want other parts of the NDK - # that is not used by Nixpkgs like sources, - # examples, docs, or LLVM toolchains -}: - -let - makeStandaloneToolchain = api: arch: let - full_ndk = (ndk true); - in runCommand "makeStandaloneToolchain-${version}" {} '' - ${full_ndk}/libexec/${full_ndk.name}/build/tools/make_standalone_toolchain.py --api ${toString api} --arch ${arch} --install-dir $out - ''; - ndk = fullNDK: stdenv.mkDerivation rec { - name = "android-ndk-r${version}"; - inherit version; - - src = fetchurl { - url = "https://dl.google.com/android/repository/${name}-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}.zip"; - sha1 = sha1s.${stdenv.hostPlatform.system} or (throw "platform ${stdenv.hostPlatform.system} not supported!"); - }; - - phases = "buildPhase"; - - nativeBuildInputs = [ unzip makeWrapper file ]; - - buildCommand = let - bin_path = "$out/bin"; - pkg_path = "$out/libexec/${name}"; - sed_script_1 = - "'s|^PROGDIR=`dirname $0`" + - "|PROGDIR=`dirname $(readlink -f $(which $0))`|'"; - runtime_paths = (lib.makeBinPath [ - coreutils file findutils - gawk gnugrep gnused - jdk python3 which - ]) + ":${platformTools}/platform-tools"; - in '' - mkdir -pv $out/libexec - cd $out/libexec - unzip -qq $src - - # so that it doesn't fail because of read-only permissions set - cd - - ${if (version == "10e") then - '' - patch -p1 \ - --no-backup-if-mismatch \ - -d $out/libexec/${name} < ${ ./make-standalone-toolchain_r10e.patch } - '' - else - '' - patch -p1 \ - --no-backup-if-mismatch \ - -d $out/libexec/${name} < ${ ./. + "/make_standalone_toolchain.py_" + "${version}" + ".patch" } - - sed -i 's,#!/usr/bin/env python,#!${python3}/bin/python,g' ${pkg_path}/build/tools/make_standalone_toolchain.py - sed -i 's,#!/bin/bash,#!${bash}/bin/bash,g' ${pkg_path}/build/tools/make_standalone_toolchain.py - wrapProgram ${pkg_path}/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}" - '' - } - - patchShebangs ${pkg_path} - - cd ${pkg_path} - - '' + lib.optionalString (!fullNDK) '' - # Steps to reduce output size - rm -rf docs sources tests - # We only support cross compiling with gcc for now - rm -rf toolchains/*-clang* toolchains/llvm* - '' + - - '' - find ${pkg_path}/toolchains \( \ - \( -type f -a -name "*.so*" \) -o \ - \( -type f -a -perm -0100 \) \ - \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libcxx zlib ncurses5 ]} {} \; - # fix ineffective PROGDIR / MYNDKDIR determination - for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py"} - do - sed -i -e ${sed_script_1} $i - done - - # wrap - for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py ndk-which"} - do - wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}" - done - - ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' - for i in ${pkg_path}/prebuilt/linux-x86_64/bin/* - do - if ! isELF $i; then continue; fi - patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64 $i - done - ''} - - # make some executables available in PATH - mkdir -pv ${bin_path} - for i in \ - ndk-build ${lib.optionalString (version == "10e") "ndk-depends ndk-gdb ndk-gdb-py ndk-gdb.py ndk-stack ndk-which"} - do - ln -sf ${pkg_path}/$i ${bin_path}/$i - done - ''; - - meta = { - platforms = builtins.attrNames sha1s; - hydraPlatforms = []; - license = stdenv.lib.licenses.asl20; - }; - }; - passthru = { - inherit makeStandaloneToolchain; - }; -in lib.extendDerivation true passthru (ndk fullNDK) diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix deleted file mode 100644 index 68d2150f972..00000000000 --- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ stdenv, fetchurl, zlib, ncurses, lib, makeWrapper -, coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which -, platformTools -, fullNDK ? false # set to true if you want other parts of the NDK - # that is not used by Nixpkgs like sources, - # examples, docs, or LLVM toolchains -}: - -stdenv.mkDerivation rec { - name = "android-ndk-r8e"; - - src = if stdenv.hostPlatform.system == "i686-linux" - then fetchurl { - url = "http://dl.google.com/android/ndk/${name}-linux-x86.tar.bz2"; - sha256 = "c2c4e0c8b3037149a0f5dbb08d72f814a52af4da9fff9d80328c675457e95a98"; - } - else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "http://dl.google.com/android/ndk/${name}-linux-x86_64.tar.bz2"; - sha256 = "093gf55zbh38p2gk5bdykj1vg9p5l774wjdzw5mhk4144jm1wdq7"; - } - else throw "platform ${stdenv.hostPlatform.system} not supported!"; - - phases = "buildPhase"; - - nativeBuildInputs = [ makeWrapper ]; - - buildCommand = let - bin_path = "$out/bin"; - pkg_path = "$out/libexec/${name}"; - sed_script_1 = - "'s|^PROGDIR=`dirname $0`" + - "|PROGDIR=`dirname $(readlink -f $(which $0))`|'"; - sed_script_2 = - "'s|^MYNDKDIR=`dirname $0`" + - "|MYNDKDIR=`dirname $(readlink -f $(which $0))`|'"; - runtime_paths = (lib.makeBinPath [ - coreutils file findutils - gawk gnugrep gnused - jdk - which - ]) + ":${platformTools}/platform-tools"; - in '' - set -x - mkdir -pv $out/libexec - cd $out/libexec - tar -xjf $src - - # so that it doesn't fail because of read-only permissions set - cd - - patch -p1 \ - --no-backup-if-mismatch \ - -d $out/libexec/${name} < ${ ./make-standalone-toolchain_r8e.patch } - cd ${pkg_path} - - '' + lib.optionalString (!fullNDK) '' - # Steps to reduce output size - rm -rf docs sources tests - # We only support cross compiling with gcc for now - rm -rf toolchains/*-clang* toolchains/llvm-* - - '' + '' - find ${pkg_path}/toolchains \( \ - \( -type f -a -name "*.so*" \) -o \ - \( -type f -a -perm -0100 \) \ - \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \ - --set-rpath ${stdenv.lib.makeLibraryPath [ zlib ncurses ]} {} \; - # fix ineffective PROGDIR / MYNDKDIR determination - for i in ndk-build ndk-gdb ndk-gdb-py - do - sed -i -e ${sed_script_1} $i - done - sed -i -e ${sed_script_2} ndk-which - # a bash script - patchShebangs ndk-which - # wrap - for i in ndk-build ndk-gdb ndk-gdb-py ndk-which - do - wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}" - done - # make some executables available in PATH - mkdir -pv ${bin_path} - for i in \ - ndk-build ndk-depends ndk-gdb ndk-gdb-py ndk-gdb.py ndk-stack ndk-which - do - ln -sf ${pkg_path}/$i ${bin_path}/$i - done - ''; -} diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix deleted file mode 100644 index 26750aed6cf..00000000000 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ /dev/null @@ -1,296 +0,0 @@ -{ stdenv, stdenv_32bit, fetchurl, fetchzip, unzip, makeWrapper -, platformTools, buildTools, support, supportRepository, platforms, sysimages, addons, sources -, libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, libGLU_combined, alsaLib -, freetype, fontconfig, glib, gtk2, atk, file, jdk, coreutils, libpulseaudio, dbus -, zlib, glxinfo, xkeyboardconfig -, includeSources -, licenseAccepted -}: -{ platformVersions, abiVersions, useGoogleAPIs, buildToolsVersions ? [], useExtraSupportLibs ? false -, useGooglePlayServices ? false, useInstantApps ? false }: - -if !licenseAccepted then throw '' - You must accept the Android Software Development Kit License Agreement at - https://developer.android.com/studio/terms - by setting nixpkgs config option 'android_sdk.accept_license = true;' - '' -else assert licenseAccepted; - -let inherit (stdenv.lib) makeLibraryPath; - - googleRepository = let version = "gms_v9_rc41_wear_2_0_rc6"; - in fetchzip rec { - url = "https://dl-ssl.google.com/android/repository/google_m2repository_${version}.zip"; - sha256 = "0k99xmynv0k62d301zx5jnjkddflr51i5lb02l9incg7m5cn8kzx"; - }; - -in - -stdenv.mkDerivation rec { - name = "android-sdk-${version}"; - version = "26.1.1"; - - src = if (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") - then fetchurl { - url = "https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip"; - sha256 = "1yfy0qqxz1ixpsci1pizls1nrncmi8p16wcb9rimdn4q3mdfxzwj"; - } - else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl { - url = "https://dl.google.com/android/repository/sdk-tools-darwin-4333796.zip"; - sha256 = "0gl5c30m40kx0vvrpbaa8cw8wq2vb89r14hgzb1df4qgpic97cpc"; - } - else throw "platform not ${stdenv.hostPlatform.system} supported!"; - - emulator = fetchurl { - url = "https://dl.google.com/android/repository/emulator-linux-4969155.zip"; - sha256 = "0iw0j6j3w9zpfalsa7xq2czz4vzgq96zk2zddjhanwwx4p8fhrfd"; - }; - - buildCommand = '' - mkdir -p $out/libexec - cd $out/libexec - unpackFile $src - unpackFile $emulator - cd tools - - for f in monitor bin/monkeyrunner bin/uiautomatorviewer - do - sed -i -e "s|/bin/ls|${coreutils}/bin/ls|" "$f" - done - - ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") - '' - # There are a number of native binaries. We must patch them to let them find the interpreter and libstdc++ - - for i in mksdcard - do - patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 $i - patchelf --set-rpath ${stdenv_32bit.cc.cc.lib}/lib $i - done - - # The following scripts used SWT and wants to dynamically load some GTK+ stuff. - # Creating these wrappers ensure that they can be found: - - wrapProgram `pwd`/android \ - --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ glib gtk2 libXtst ]} - - wrapProgram `pwd`/bin/uiautomatorviewer \ - --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]} - - # The emulators need additional libraries, which are dynamically loaded => let's wrap them - - ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' - cd .. - for i in emulator/emulator* emulator/qemu/linux-x86_64/qemu-system-* - do - patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i - wrapProgram `pwd`/$i \ - --prefix PATH : ${stdenv.lib.makeBinPath [ file glxinfo ]} \ - --suffix LD_LIBRARY_PATH : `pwd`/lib:${makeLibraryPath [ stdenv.cc.cc libX11 libxcb libXau libXdmcp libXext libGLU_combined alsaLib zlib libpulseaudio dbus.lib ]} \ - --suffix QT_XKB_CONFIG_ROOT : ${xkeyboardconfig}/share/X11/xkb - done - cd tools - ''} - ''} - - patchShebangs . - - ${if stdenv.hostPlatform.system == "i686-linux" then - '' - # The monitor requires some more patching - - cd lib/monitor-x86 - patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 monitor - patchelf --set-rpath ${makeLibraryPath [ libX11 libXext libXrender freetype fontconfig ]} libcairo-swt.so - - wrapProgram `pwd`/monitor \ - --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ gtk2 atk stdenv.cc.cc libXtst ]} - - cd ../.. - '' - else if stdenv.hostPlatform.system == "x86_64-linux" then - '' - # The monitor requires some more patching - - cd lib/monitor-x86_64 - patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 monitor - patchelf --set-rpath ${makeLibraryPath [ libX11 libXext libXrender freetype fontconfig ]} libcairo-swt.so - - wrapProgram `pwd`/monitor \ - --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ gtk2 atk stdenv.cc.cc libXtst ]} - - cd ../.. - '' - else ""} - - # Symlink the other sub packages - - cd .. - ln -s ${platformTools}/platform-tools - ln -s ${support}/support - - mkdir -p build-tools - cd build-tools - - ${stdenv.lib.concatMapStrings - (v: "ln -s ${builtins.getAttr "v${builtins.replaceStrings ["."] ["_"] v}" buildTools}/build-tools/*") - (if (builtins.length buildToolsVersions) == 0 then platformVersions else buildToolsVersions)} - - cd .. - - # Symlink required Google API add-ons - - mkdir -p add-ons - cd add-ons - - ${if useGoogleAPIs then - stdenv.lib.concatMapStrings (platformVersion: - if (builtins.hasAttr ("google_apis_"+platformVersion) addons) then - let - googleApis = builtins.getAttr ("google_apis_"+platformVersion) addons; - in - "ln -s ${googleApis}/* addon-google_apis-${platformVersion}\n" - else "") platformVersions - else ""} - - cd .. - - # Symlink required extras - - mkdir -p extras/android - cd extras/android - - ln -s ${supportRepository}/m2repository - - ${if useExtraSupportLibs then - "ln -s ${addons.android_support_extra}/support ." - else ""} - - cd .. - mkdir -p google - cd google - - ${if useGooglePlayServices then - "ln -s ${addons.google_play_services}/google-play-services google_play_services" - else ""} - - ${stdenv.lib.optionalString useInstantApps - "ln -s ${addons.instant_apps}/whsdk instantapps"} - - ln -s ${googleRepository} m2repository - - cd ../.. - - # Symlink required sources - mkdir -p sources - cd sources - - ${if includeSources then - stdenv.lib.concatMapStrings (platformVersion: - if (builtins.hasAttr ("source_"+platformVersion) sources) then - let - source = builtins.getAttr ("source_"+platformVersion) sources; - in - "ln -s ${source}/* android-${platformVersion}\n" - else "") platformVersions - else ""} - - cd .. - - # Symlink required platforms - - mkdir -p platforms - cd platforms - - ${stdenv.lib.concatMapStrings (platformVersion: - if (builtins.hasAttr ("platform_"+platformVersion) platforms) then - let - platform = builtins.getAttr ("platform_"+platformVersion) platforms; - in - "ln -s ${platform}/* android-${platformVersion}\n" - else "" - ) platformVersions} - - cd .. - - # Symlink required system images - - mkdir -p system-images - cd system-images - - ${stdenv.lib.concatMapStrings (abiVersion: - stdenv.lib.concatMapStrings (platformVersion: - if (builtins.hasAttr ("sysimg_" + abiVersion + "_" + platformVersion) sysimages) then - let - sysimg = builtins.getAttr ("sysimg_" + abiVersion + "_" + platformVersion) sysimages; - in - '' - mkdir -p android-${platformVersion} - cd android-${platformVersion} - ln -s ${sysimg}/* - cd .. - '' - else "" - ) platformVersions - ) abiVersions} - - # Create wrappers to the most important tools and platform tools so that we can run them if the SDK is in our PATH - - mkdir -p $out/bin - - for i in $out/libexec/tools/* - do - if [ ! -d $i ] && [ -x $i ] - then - ln -sf $i $out/bin/$(basename $i) - fi - done - - for i in $out/libexec/tools/bin/* - do - if [ ! -d $i ] && [ -x $i ] - then - ln -sf $i $out/bin/$(basename $i) - fi - done - - for i in $out/libexec/platform-tools/* - do - if [ ! -d $i ] && [ -x $i ] - then - ln -sf $i $out/bin/$(basename $i) - fi - done - - for i in $out/libexec/build-tools/*/* - do - if [ ! -d $i ] && [ -x $i ] - then - ln -sf $i $out/bin/$(basename $i) - fi - done - - for i in $out/libexec/emulator/* - do - if [ ! -d $i ] && [ -x $i ] - then - ln -sf $i $out/bin/$(basename $i) - fi - done - - wrapProgram $out/bin/sdkmanager \ - --set JAVA_HOME ${jdk} - - yes | ANDROID_SDK_HOME=$(mktemp -d) $out/bin/sdkmanager --licenses || true - ''; - - buildInputs = [ unzip makeWrapper ]; - - meta = { - platforms = stdenv.lib.platforms.unix; - hydraPlatforms = []; - license = stdenv.lib.licenses.unfree; - }; -} diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix index 20b3ff3b8f5..62cdeb43032 100644 --- a/pkgs/development/mobile/androidenv/build-app.nix +++ b/pkgs/development/mobile/androidenv/build-app.nix @@ -1,28 +1,26 @@ -{ stdenv, androidsdk, jdk, ant, androidndk, gnumake, gawk, file, which }: -args@{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false, antFlags ? "" +{ composeAndroidPackages, stdenv, ant, jdk, gnumake, gawk }: + +{ name , release ? false, keyStore ? null, keyAlias ? null, keyStorePassword ? null, keyAliasPassword ? null -, useNDK ? false, ... -}: +, antFlags ? "" +, ... +}@args: assert release -> keyStore != null && keyAlias != null && keyStorePassword != null && keyAliasPassword != null; let - androidsdkComposition = androidsdk { - inherit platformVersions useGoogleAPIs; - abiVersions = []; - }; + androidSdkFormalArgs = builtins.functionArgs composeAndroidPackages; + androidArgs = builtins.intersectAttrs androidSdkFormalArgs args; + androidsdk = (composeAndroidPackages androidArgs).androidsdk; + + extraArgs = removeAttrs args ([ "name" ] ++ builtins.attrNames androidSdkFormalArgs); in stdenv.mkDerivation ({ - name = stdenv.lib.replaceChars [" "] [""] name; - - ANDROID_HOME = "${androidsdkComposition}/libexec"; - - buildInputs = [ jdk ant ] ++ - stdenv.lib.optional useNDK [ androidndk gnumake gawk file which ]; - + name = stdenv.lib.replaceChars [" "] [""] name; # Android APKs may contain white spaces in their names, but Nix store paths cannot + ANDROID_HOME = "${androidsdk}/libexec/android-sdk"; + buildInputs = [ jdk ant ]; buildPhase = '' ${stdenv.lib.optionalString release '' - # Provide key singing attributes ( echo "key.store=${keyStore}" echo "key.alias=${keyAlias}" @@ -32,20 +30,19 @@ stdenv.mkDerivation ({ ''} export ANDROID_SDK_HOME=`pwd` # Key files cannot be stored in the user's home directory. This overrides it. - ${if useNDK then '' - export GNUMAKE=${gnumake}/bin/make - export NDK_HOST_AWK=${gawk}/bin/gawk - ${androidndk}/bin/ndk-build - '' else ""} + + ${stdenv.lib.optionalString (args ? includeNDK && args.includeNDK) '' + export GNUMAKE=${gnumake}/bin/make + export NDK_HOST_AWK=${gawk}/bin/gawk + ${androidsdk}/libexec/android-sdk/ndk-bundle/ndk-build + ''} ant ${antFlags} ${if release then "release" else "debug"} ''; - installPhase = '' mkdir -p $out mv bin/*-${if release then "release" else "debug"}.apk $out - + mkdir -p $out/nix-support echo "file binary-dist \"$(echo $out/*.apk)\"" > $out/nix-support/hydra-build-products ''; -} // -builtins.removeAttrs args ["name"]) +} // extraArgs) diff --git a/pkgs/development/mobile/androidenv/build-gradle-app.nix b/pkgs/development/mobile/androidenv/build-gradle-app.nix deleted file mode 100644 index d6a39146324..00000000000 --- a/pkgs/development/mobile/androidenv/build-gradle-app.nix +++ /dev/null @@ -1,108 +0,0 @@ -{ stdenv, androidsdk, jdk, androidndk, gnumake, gawk, file -, which, gradle, fetchurl, buildEnv, runCommand }: - -args@{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false - , useExtraSupportLibs ? false, useGooglePlayServices ? false - , release ? false, keyStore ? null, keyAlias ? null - , keyStorePassword ? null, keyAliasPassword ? null - , useNDK ? false, buildInputs ? [], mavenDeps, gradleTask - , buildDirectory ? "./.", acceptAndroidSdkLicenses ? false }: - -assert release -> keyStore != null; -assert release -> keyAlias != null; -assert release -> keyStorePassword != null; -assert release -> keyAliasPassword != null; -assert acceptAndroidSdkLicenses; - -let - inherit (stdenv.lib) optionalString; - - m2install = { repo, version, artifactId, groupId - , jarSha256, pomSha256, aarSha256, suffix ? "" }: - let m2Name = "${artifactId}-${version}"; - m2Path = "${builtins.replaceStrings ["."] ["/"] groupId}/${artifactId}/${version}"; - in runCommand m2Name {} ('' - mkdir -p $out/m2/${m2Path} - '' + optionalString (jarSha256 != null) '' - install -D ${fetchurl { - url = "${repo}${m2Path}/${m2Name}${suffix}.jar"; - sha256 = jarSha256; - }} $out/m2/${m2Path}/${m2Name}${suffix}.jar - '' + optionalString (pomSha256 != null) '' - install -D ${fetchurl { - url = "${repo}${m2Path}/${m2Name}${suffix}.pom"; - sha256 = pomSha256; - }} $out/m2/${m2Path}/${m2Name}${suffix}.pom - '' + optionalString (aarSha256 != null) '' - install -D ${fetchurl { - url = "${repo}${m2Path}/${m2Name}${suffix}.aar"; - sha256 = aarSha256; - }} $out/m2/${m2Path}/${m2Name}${suffix}.aar - ''); - - androidsdkComposition = androidsdk { - inherit platformVersions useGoogleAPIs - useExtraSupportLibs useGooglePlayServices; - abiVersions = [ "armeabi-v7a" ]; - }; -in -stdenv.mkDerivation ({ - name = stdenv.lib.replaceChars [" "] [""] name; - - ANDROID_HOME = "${androidsdkComposition}/libexec"; - ANDROID_NDK_HOME = "${androidndk}/libexec/${androidndk.name}"; - - buildInputs = [ jdk gradle ] ++ - stdenv.lib.optional useNDK [ androidndk gnumake gawk file which ] ++ - buildInputs; - - DEPENDENCIES = buildEnv { name = "${name}-maven-deps"; - paths = map m2install mavenDeps; - }; - - buildPhase = '' - ${optionalString release '' - # Provide key signing attributes - ( echo "RELEASE_STORE_FILE=${keyStore}" - echo "RELEASE_KEY_ALIAS=${keyAlias}" - echo "RELEASE_STORE_PASSWORD=${keyStorePassword}" - echo "RELEASE_KEY_PASSWORD=${keyAliasPassword}" - ) >> gradle.properties - ''} - buildDir=`pwd` - cp -r $ANDROID_HOME $buildDir/local_sdk - chmod -R 755 local_sdk - export ANDROID_HOME=$buildDir/local_sdk - # Key files cannot be stored in the user's home directory. This - # overrides it. - export ANDROID_SDK_HOME=`pwd` - - mkdir -p "$ANDROID_HOME/licenses" - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license" - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license" - - export APP_HOME=`pwd` - - mkdir -p .m2/repository - if [ -d "$DEPENDENCIES/m2" ] ; then - cp -RL "$DEPENDENCIES"/m2/* .m2/repository/ - fi - chmod -R 755 .m2 - mkdir -p .m2/repository/com/android/support - cp -RL local_sdk/extras/android/m2repository/com/android/support/* .m2/repository/com/android/support/ - cp -RL local_sdk/extras/google/m2repository/* .m2/repository/ - gradle ${gradleTask} --offline --no-daemon -g ./tmp -Dmaven.repo.local=`pwd`/.m2/repository - ''; - - installPhase = '' - mkdir -p $out - mv ${buildDirectory}/build/outputs/apk/*.apk $out - - mkdir -p $out/nix-support - echo "file binary-dist \"$(echo $out/*.apk)\"" > $out/nix-support/hydra-build-products - ''; - - meta = { - license = stdenv.lib.licenses.unfree; - }; -} // builtins.removeAttrs args ["name" "mavenDeps"]) diff --git a/pkgs/development/mobile/androidenv/build-tools-srcs-linux.nix b/pkgs/development/mobile/androidenv/build-tools-srcs-linux.nix deleted file mode 100644 index 3c2960755e7..00000000000 --- a/pkgs/development/mobile/androidenv/build-tools-srcs-linux.nix +++ /dev/null @@ -1,376 +0,0 @@ - -# This file is generated from generate-tools.sh. DO NOT EDIT. -# Execute generate-tools.sh or fetch.sh to update the file. -{ fetchurl }: - -{ - - v17 = { - version = "17.0.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r17-linux.zip; - sha1 = "2c2872bc3806aabf16a12e3959c2183ddc866e6d"; - }; - }; - - v18_0_1 = { - version = "18.0.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r18.0.1-linux.zip; - sha1 = "f11618492b0d2270c332325d45d752d3656a9640"; - }; - }; - - v18_1_0 = { - version = "18.1.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r18.1-linux.zip; - sha1 = "f314a0599e51397f0886fe888b50dd98f2f050d8"; - }; - }; - - v18_1_1 = { - version = "18.1.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r18.1.1-linux.zip; - sha1 = "68c9acbfc0cec2d51b19efaed39831a17055d998"; - }; - }; - - v19 = { - version = "19.0.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r19-linux.zip; - sha1 = "55c1a6cf632e7d346f0002b275ec41fd3137fd83"; - }; - }; - - v19_0_1 = { - version = "19.0.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r19.0.1-linux.zip; - sha1 = "18d2312dc4368858914213087f4e61445aca4517"; - }; - }; - - v19_0_2 = { - version = "19.0.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r19.0.2-linux.zip; - sha1 = "a03a6bdea0091aea32e1b35b90a7294c9f04e3dd"; - }; - }; - - v19_0_3 = { - version = "19.0.3"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r19.0.3-linux.zip; - sha1 = "c2d6055478e9d2d4fba476ee85f99181ddd1160c"; - }; - }; - - v19_1_0 = { - version = "19.1.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r19.1-linux.zip; - sha1 = "1ff20ac15fa47a75d00346ec12f180d531b3ca89"; - }; - }; - - v20 = { - version = "20.0.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r20-linux.zip; - sha1 = "b688905526a5584d1327a662d871a635ff502758"; - }; - }; - - v21 = { - version = "21.0.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21-linux.zip; - sha1 = "4933328fdeecbd554a29528f254f4993468e1cf4"; - }; - }; - - v21_0_1 = { - version = "21.0.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21.0.1-linux.zip; - sha1 = "e573069eea3e5255e7a65bedeb767f4fd0a5f49a"; - }; - }; - - v21_0_2 = { - version = "21.0.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21.0.2-linux.zip; - sha1 = "e1236ab8897b62b57414adcf04c132567b2612a5"; - }; - }; - - v21_1_0 = { - version = "21.1.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21.1-linux.zip; - sha1 = "b7455e543784d52a8925f960bc880493ed1478cb"; - }; - }; - - v21_1_1 = { - version = "21.1.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21.1.1-linux.zip; - sha1 = "1c712ee3a1ba5a8b0548f9c32f17d4a0ddfd727d"; - }; - }; - - v21_1_2 = { - version = "21.1.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21.1.2-linux.zip; - sha1 = "5e35259843bf2926113a38368b08458735479658"; - }; - }; - - v22 = { - version = "22.0.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r22-linux.zip; - sha1 = "a8a1619dd090e44fac957bce6842e62abf87965b"; - }; - }; - - v22_0_1 = { - version = "22.0.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r22.0.1-linux.zip; - sha1 = "da8b9c5c3ede39298e6cf0283c000c2ee9029646"; - }; - }; - - v23 = { - version = "23.0.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r23-linux.zip; - sha1 = "c1d6209212b01469f80fa804e0c1d39a06bc9060"; - }; - }; - - v23_0_1 = { - version = "23.0.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r23.0.1-linux.zip; - sha1 = "b6ba7c399d5fa487d95289d8832e4ad943aed556"; - }; - }; - - v23_0_2 = { - version = "23.0.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r23.0.2-linux.zip; - sha1 = "8a9f2b37f6fcf7a9fa784dc21aeaeb41bbb9f2c3"; - }; - }; - - v23_0_3 = { - version = "23.0.3"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r23.0.3-linux.zip; - sha1 = "368f2600feac7e9b511b82f53d1f2240ae4a91a3"; - }; - }; - - v24 = { - version = "24.0.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r24-linux.zip; - sha1 = "c6271c4d78a5612ea6c7150688bcd5b7313de8d1"; - }; - }; - - v24_0_1 = { - version = "24.0.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r24.0.1-linux.zip; - sha1 = "84f18c392919a074fcbb9b1d967984e6b2fef8b4"; - }; - }; - - v24_0_2 = { - version = "24.0.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r24.0.2-linux.zip; - sha1 = "f199a7a788c3fefbed102eea34d6007737b803cf"; - }; - }; - - v24_0_3 = { - version = "24.0.3"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r24.0.3-linux.zip; - sha1 = "9e8cc49d66e03fa1a8ecc1ac3e58f1324f5da304"; - }; - }; - - v25 = { - version = "25.0.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r25-linux.zip; - sha1 = "f2bbda60403e75cabd0f238598c3b4dfca56ea44"; - }; - }; - - v25_0_1 = { - version = "25.0.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r25.0.1-linux.zip; - sha1 = "ff063d252ab750d339f5947d06ff782836f22bac"; - }; - }; - - v25_0_2 = { - version = "25.0.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r25.0.2-linux.zip; - sha1 = "ff953c0177e317618fda40516f3e9d95fd43c7ae"; - }; - }; - - v25_0_3 = { - version = "25.0.3"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r25.0.3-linux.zip; - sha1 = "db95f3a0ae376534d4d69f4cdb6fad20649f3509"; - }; - }; - - v26 = { - version = "26.0.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26-linux.zip; - sha1 = "1cbe72929876f8a872ab1f1b1040a9f720261f59"; - }; - }; - - v26_rc1 = { - version = "26.0.0-rc1"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26-rc1-linux.zip; - sha1 = "8cd6388dc96db2d7a49d06159cf990d3bbc78d04"; - }; - }; - - v26_rc2 = { - version = "26.0.0-rc2"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26-rc2-linux.zip; - sha1 = "629bbd8d2e415bf64871fb0b4c0540fd6d0347a0"; - }; - }; - - v26_0_1 = { - version = "26.0.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26.0.1-linux.zip; - sha1 = "5378c2c78091b414d0eac40a6bd37f2faa31a365"; - }; - }; - - v26_0_2 = { - version = "26.0.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26.0.2-linux.zip; - sha1 = "5b2b7b66c7bf2151f2af183b5b50a17808850592"; - }; - }; - - v26_0_3 = { - version = "26.0.3"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26.0.3-linux.zip; - sha1 = "8a2e6c1bcd845844523a68aa17e5442f0dce328c"; - }; - }; - - v27 = { - version = "27.0.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r27-linux.zip; - sha1 = "28542332ba97cf4a08c3eddfcf5edd70e3cf1260"; - }; - }; - - v27_0_1 = { - version = "27.0.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r27.0.1-linux.zip; - sha1 = "7f4eedb1077ef948b848040dcd15de9e8a759f4a"; - }; - }; - - v27_0_2 = { - version = "27.0.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r27.0.2-linux.zip; - sha1 = "b687ddf6be84f11607871138aad32cf857d0b837"; - }; - }; - - v27_0_3 = { - version = "27.0.3"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r27.0.3-linux.zip; - sha1 = "d85e7a6320eddffe7eeace3437605079dac938ca"; - }; - }; - - v28 = { - version = "28.0.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28-linux.zip; - sha1 = "d9f8a754d833ccd334f56fcc6089c5925cd82abb"; - }; - }; - - v28_rc1 = { - version = "28.0.0-rc1"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28-rc1-linux.zip; - sha1 = "1601977fae25fd478bcfaa0481ca5ea3c609d840"; - }; - }; - - v28_rc2 = { - version = "28.0.0-rc2"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28-rc2-linux.zip; - sha1 = "efe9c0dde0646a07544c864276390ca6e96b24dc"; - }; - }; - - v28_0_1 = { - version = "28.0.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28.0.1-linux.zip; - sha1 = "ee70dfa1fccb58b37cebc9544830511f36a137a0"; - }; - }; - - v28_0_2 = { - version = "28.0.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28.0.2-linux.zip; - sha1 = "b4492209810a3fd48deaa982f9852fef12433d55"; - }; - }; - - v28_0_3 = { - version = "28.0.3"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28.0.3-linux.zip; - sha1 = "ea6f2f7103cd9da9ff0bdf6e37fbbba548fa4165"; - }; - }; - -} diff --git a/pkgs/development/mobile/androidenv/build-tools-srcs-macosx.nix b/pkgs/development/mobile/androidenv/build-tools-srcs-macosx.nix deleted file mode 100644 index 1e15aa7c873..00000000000 --- a/pkgs/development/mobile/androidenv/build-tools-srcs-macosx.nix +++ /dev/null @@ -1,376 +0,0 @@ - -# This file is generated from generate-tools.sh. DO NOT EDIT. -# Execute generate-tools.sh or fetch.sh to update the file. -{ fetchurl }: - -{ - - v17 = { - version = "17.0.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r17-macosx.zip; - sha1 = "602ee709be9dbb8f179b1e4075148a57f9419930"; - }; - }; - - v18_0_1 = { - version = "18.0.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r18.0.1-macosx.zip; - sha1 = "d84f5692fb44d60fc53e5b2507cebf9f24626902"; - }; - }; - - v18_1_0 = { - version = "18.1.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r18.1-macosx.zip; - sha1 = "16ddb299b8b43063e5bb3387ec17147c5053dfd8"; - }; - }; - - v18_1_1 = { - version = "18.1.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r18.1.1-macosx.zip; - sha1 = "a9d9d37f6ddf859e57abc78802a77aaa166e48d4"; - }; - }; - - v19 = { - version = "19.0.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r19-macosx.zip; - sha1 = "86ec1c12db1bc446b7bcaefc5cc14eb361044e90"; - }; - }; - - v19_0_1 = { - version = "19.0.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r19.0.1-macosx.zip; - sha1 = "efaf50fb19a3edb8d03efbff76f89a249ad2920b"; - }; - }; - - v19_0_2 = { - version = "19.0.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r19.0.2-macosx.zip; - sha1 = "145bc43065d45f756d99d87329d899052b9a9288"; - }; - }; - - v19_0_3 = { - version = "19.0.3"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r19.0.3-macosx.zip; - sha1 = "651cf8754373b2d52e7f6aab2c52eabffe4e9ea4"; - }; - }; - - v19_1_0 = { - version = "19.1.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r19.1-macosx.zip; - sha1 = "0d11aae3417de1efb4b9a0e0a7855904a61bcec1"; - }; - }; - - v20 = { - version = "20.0.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r20-macosx.zip; - sha1 = "1240f629411c108a714c4ddd756937c7fab93f83"; - }; - }; - - v21 = { - version = "21.0.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21-macosx.zip; - sha1 = "9bef7989b51436bd4e5114d8a0330359f077cbfa"; - }; - }; - - v21_0_1 = { - version = "21.0.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21.0.1-macosx.zip; - sha1 = "b60c8f9b810c980abafa04896706f3911be1ade7"; - }; - }; - - v21_0_2 = { - version = "21.0.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21.0.2-macosx.zip; - sha1 = "f17471c154058f3734729ef3cc363399b1cd3de1"; - }; - }; - - v21_1_0 = { - version = "21.1.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21.1-macosx.zip; - sha1 = "df619356c2359aa5eacdd48699d15b335d9bd246"; - }; - }; - - v21_1_1 = { - version = "21.1.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21.1.1-macosx.zip; - sha1 = "836a146eab0504aa9387a5132e986fe7c7381571"; - }; - }; - - v21_1_2 = { - version = "21.1.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21.1.2-macosx.zip; - sha1 = "e7c906b4ba0eea93b32ba36c610dbd6b204bff48"; - }; - }; - - v22 = { - version = "22.0.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r22-macosx.zip; - sha1 = "af95429b24088d704bc5db9bd606e34ac1b82c0d"; - }; - }; - - v22_0_1 = { - version = "22.0.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r22.0.1-macosx.zip; - sha1 = "53dad7f608e01d53b17176ba11165acbfccc5bbf"; - }; - }; - - v23 = { - version = "23.0.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r23-macosx.zip; - sha1 = "90ba6e716f7703a236cd44b2e71c5ff430855a03"; - }; - }; - - v23_0_1 = { - version = "23.0.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r23.0.1-macosx.zip; - sha1 = "d96ec1522721e9a179ae2c591c99f75d31d39718"; - }; - }; - - v23_0_2 = { - version = "23.0.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r23.0.2-macosx.zip; - sha1 = "482c4cbceef8ff58aefd92d8155a38610158fdaf"; - }; - }; - - v23_0_3 = { - version = "23.0.3"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r23.0.3-macosx.zip; - sha1 = "fbc98cd303fd15a31d472de6c03bd707829f00b0"; - }; - }; - - v24 = { - version = "24.0.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r24-macosx.zip; - sha1 = "97fc4ed442f23989cc488d02c1d1de9bdde241de"; - }; - }; - - v24_0_1 = { - version = "24.0.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r24.0.1-macosx.zip; - sha1 = "5c6457fcdfa07724fb086d8ff4e8316fc0742848"; - }; - }; - - v24_0_2 = { - version = "24.0.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r24.0.2-macosx.zip; - sha1 = "8bb8fc575477491d5957de743089df412de55cda"; - }; - }; - - v24_0_3 = { - version = "24.0.3"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r24.0.3-macosx.zip; - sha1 = "a01c15f1b105c34595681075e1895d58b3fff48c"; - }; - }; - - v25 = { - version = "25.0.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r25-macosx.zip; - sha1 = "273c5c29a65cbed00e44f3aa470bbd7dce556606"; - }; - }; - - v25_0_1 = { - version = "25.0.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r25.0.1-macosx.zip; - sha1 = "7bf7f22d7d48ef20b6ab0e3d7a2912e5c088340f"; - }; - }; - - v25_0_2 = { - version = "25.0.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r25.0.2-macosx.zip; - sha1 = "12a5204bb3b6e39437535469fde7ddf42da46b16"; - }; - }; - - v25_0_3 = { - version = "25.0.3"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r25.0.3-macosx.zip; - sha1 = "160d2fefb5ce68e443427fc30a793a703b63e26e"; - }; - }; - - v26 = { - version = "26.0.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26-macosx.zip; - sha1 = "d01a1aeca03747245f1f5936b3cb01759c66d086"; - }; - }; - - v26_rc1 = { - version = "26.0.0-rc1"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26-rc1-macosx.zip; - sha1 = "5c5a1de7d5f4f000d36ae349229fe0be846d6137"; - }; - }; - - v26_rc2 = { - version = "26.0.0-rc2"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26-rc2-macosx.zip; - sha1 = "cb1eb738a1f7003025af267a9b8cc2d259533c70"; - }; - }; - - v26_0_1 = { - version = "26.0.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26.0.1-macosx.zip; - sha1 = "cbde59de198916b390777dd0227921bfa2120832"; - }; - }; - - v26_0_2 = { - version = "26.0.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26.0.2-macosx.zip; - sha1 = "d9ed7c7f149ce38be5dc08979aea8acec1459ca0"; - }; - }; - - v26_0_3 = { - version = "26.0.3"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26.0.3-macosx.zip; - sha1 = "5bb90ed935d99e5bc90686f43b852e68c5ad40df"; - }; - }; - - v27 = { - version = "27.0.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r27-macosx.zip; - sha1 = "fb4e8d7e6b8d29a77090e34024077a80458d5ae1"; - }; - }; - - v27_0_1 = { - version = "27.0.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r27.0.1-macosx.zip; - sha1 = "1edd07bfdbadd95652d093040e16d858f7489594"; - }; - }; - - v27_0_2 = { - version = "27.0.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r27.0.2-macosx.zip; - sha1 = "6d5d9cf2a47877f273f4b742b19e712a051a31be"; - }; - }; - - v27_0_3 = { - version = "27.0.3"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r27.0.3-macosx.zip; - sha1 = "61d9fb18790c68d66ff73bf1e7ad56bc1f1eef2d"; - }; - }; - - v28 = { - version = "28.0.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28-macosx.zip; - sha1 = "72088d32d1d82cc3c2cf7cf6618b6130c0c84ade"; - }; - }; - - v28_rc1 = { - version = "28.0.0-rc1"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28-rc1-macosx.zip; - sha1 = "2c77821967a2330b7b227072d0b1c02ef19fe2fc"; - }; - }; - - v28_rc2 = { - version = "28.0.0-rc2"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28-rc2-macosx.zip; - sha1 = "0d0314b353589feb10e528b44c5a685b6658d797"; - }; - }; - - v28_0_1 = { - version = "28.0.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28.0.1-macosx.zip; - sha1 = "aeef42ad953f1630dd6f5d71eefdc0b825211462"; - }; - }; - - v28_0_2 = { - version = "28.0.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28.0.2-macosx.zip; - sha1 = "c10dd5a7825578622fb362a8a34f76eb3ba0c0a9"; - }; - }; - - v28_0_3 = { - version = "28.0.3"; - src = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28.0.3-macosx.zip; - sha1 = "f8c333a2991b1ab05a671bc6248b78e00edcd83a"; - }; - }; - -} diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index b362dc2dca5..976ef141627 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -1,53 +1,19 @@ -{stdenv, lib, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit, file, zlib, ncurses, coreutils, buildToolsSources}: - -let buildBuildTools = name: { version, src }: - stdenv.mkDerivation rec { - inherit version src; - name = "android-build-tools-r${version}"; - buildCommand = '' - mkdir -p $out/build-tools - cd $out/build-tools - unzip $src - mv android-* ${version} - - cd ${version} - - for f in $(grep -Rl /bin/ls .); do - sed -i -e "s|/bin/ls|${coreutils}/bin/ls|" "$f" - done - - ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") - '' - - ln -s ${ncurses.out}/lib/libncurses.so.5 `pwd`/lib64/libtinfo.so.5 - - find . -type f -print0 | while IFS= read -r -d "" file - do - type=$(file "$file") - ## Patch 64-bit binaries - if grep -q "ELF 64-bit" <<< "$type" - then - if grep -q "interpreter" <<< "$type" - then - patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 "$file" - fi - patchelf --set-rpath `pwd`/lib64:${stdenv.cc.cc.lib.out}/lib:${zlib.out}/lib:${ncurses.out}/lib "$file" - ## Patch 32-bit binaries - elif grep -q "ELF 32-bit" <<< "$type" - then - if grep -q "interpreter" <<< "$type" - then - patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 "$file" - fi - patchelf --set-rpath ${stdenv_32bit.cc.cc.lib.out}/lib:${zlib_32bit.out}/lib:${ncurses_32bit.out}/lib "$file" - fi - done - ''} - - patchShebangs . - ''; - - buildInputs = [ unzip file ]; - }; -in - lib.mapAttrs buildBuildTools buildToolsSources +{deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgs_i686}: + +deployAndroidPackage { + inherit package os; + buildInputs = [ autoPatchelfHook makeWrapper ] ++ + lib.optional (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs_i686.glibc pkgs_i686.zlib pkgs_i686.ncurses5 ]; + patchInstructions = '' + ${lib.optionalString (os == "linux") '' + addAutoPatchelfSearchPath $packageBaseDir/lib + addAutoPatchelfSearchPath $packageBaseDir/lib64 + autoPatchelf --no-recurse $packageBaseDir/lib64 + autoPatchelf --no-recurse $packageBaseDir + ''} + + wrapProgram $PWD/mainDexClasses \ + --prefix PATH : ${pkgs.jdk8}/bin + ''; + noAuditTmpdir = true; # The checker script gets confused by the build-tools path that is incorrectly identified as a reference to /build +} diff --git a/pkgs/development/mobile/androidenv/cmake.nix b/pkgs/development/mobile/androidenv/cmake.nix new file mode 100644 index 00000000000..1aeef467642 --- /dev/null +++ b/pkgs/development/mobile/androidenv/cmake.nix @@ -0,0 +1,10 @@ +{deployAndroidPackage, lib, package, os, autoPatchelfHook, pkgs}: + +deployAndroidPackage { + inherit package os; + buildInputs = [ autoPatchelfHook ] + ++ lib.optional (os == "linux") [ pkgs.stdenv.glibc pkgs.stdenv.cc.cc ]; + patchInstructions = lib.optionalString (os == "linux") '' + autoPatchelf $packageBaseDir/bin + ''; +} diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix new file mode 100644 index 00000000000..690f9712a10 --- /dev/null +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -0,0 +1,262 @@ +{stdenv, fetchurl, requireFile, makeWrapper, unzip, autoPatchelfHook, pkgs, pkgs_i686, licenseAccepted ? false}: + +{ toolsVersion ? "25.2.5" +, platformToolsVersion ? "28.0.1" +, buildToolsVersions ? [ "28.0.3" ] +, includeEmulator ? false +, emulatorVersion ? "28.0.14" +, platformVersions ? [] +, includeSources ? false +, includeDocs ? false +, includeSystemImages ? false +, systemImageTypes ? [ "default" ] +, abiVersions ? [ "armeabi-v7a" ] +, lldbVersions ? [ ] +, cmakeVersions ? [ ] +, includeNDK ? false +, ndkVersion ? "18.1.5063045" +, useGoogleAPIs ? false +, useGoogleTVAddOns ? false +, includeExtras ? [] +}: + +if !licenseAccepted then throw '' + You must accept the Android Software Development Kit License Agreement at + https://developer.android.com/studio/terms + by setting nixpkgs config option 'android_sdk.accept_license = true;' + '' +else assert licenseAccepted; + +let + inherit (pkgs) stdenv fetchurl makeWrapper unzip; + + # Determine the Android os identifier from Nix's system identifier + os = if stdenv.system == "x86_64-linux" then "linux" + else if stdenv.system == "x86_64-darwin" then "macosx" + else "No tarballs found for system architecture: ${stdenv.system}"; + + # Generated Nix packages + packages = import ./generated/packages.nix { + inherit fetchurl; + }; + + # Generated system images + system-images-packages-android = import ./generated/system-images-android.nix { + inherit fetchurl; + }; + + system-images-packages-android-tv = import ./generated/system-images-android-tv.nix { + inherit fetchurl; + }; + + system-images-packages-android-wear = import ./generated/system-images-android-wear.nix { + inherit fetchurl; + }; + + system-images-packages-android-wear-cn = import ./generated/system-images-android-wear-cn.nix { + inherit fetchurl; + }; + + system-images-packages-google_apis = import ./generated/system-images-google_apis.nix { + inherit fetchurl; + }; + + system-images-packages-google_apis_playstore = import ./generated/system-images-google_apis_playstore.nix { + inherit fetchurl; + }; + + system-images-packages = + stdenv.lib.recursiveUpdate + system-images-packages-android + (stdenv.lib.recursiveUpdate system-images-packages-android-tv + (stdenv.lib.recursiveUpdate system-images-packages-android-wear + (stdenv.lib.recursiveUpdate system-images-packages-android-wear-cn + (stdenv.lib.recursiveUpdate system-images-packages-google_apis system-images-packages-google_apis_playstore)))); + + # Generated addons + addons = import ./generated/addons.nix { + inherit fetchurl; + }; +in +rec { + deployAndroidPackage = import ./deploy-androidpackage.nix { + inherit stdenv unzip; + }; + + platform-tools = import ./platform-tools.nix { + inherit deployAndroidPackage os autoPatchelfHook pkgs; + inherit (stdenv) lib; + package = packages.platform-tools."${platformToolsVersion}"; + }; + + build-tools = map (version: + import ./build-tools.nix { + inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgs_i686; + inherit (stdenv) lib; + package = packages.build-tools."${version}"; + } + ) buildToolsVersions; + + docs = deployAndroidPackage { + inherit os; + package = packages.docs."1"; + }; + + emulator = import ./emulator.nix { + inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgs_i686; + inherit (stdenv) lib; + package = packages.emulator."${emulatorVersion}"."${os}"; + }; + + platforms = map (version: + deployAndroidPackage { + inherit os; + package = packages.platforms."${version}"; + } + ) platformVersions; + + sources = map (version: + deployAndroidPackage { + inherit os; + package = packages.sources."${version}"; + } + ) platformVersions; + + system-images = stdenv.lib.flatten (map (apiVersion: + map (type: + map (abiVersion: + deployAndroidPackage { + inherit os; + package = system-images-packages.${apiVersion}.${type}.${abiVersion}; + } + ) abiVersions + ) systemImageTypes + ) platformVersions); + + lldb = map (version: + import ./lldb.nix { + inherit deployAndroidPackage os autoPatchelfHook pkgs; + inherit (stdenv) lib; + package = packages.lldb."${version}"; + } + ) lldbVersions; + + cmake = map (version: + import ./cmake.nix { + inherit deployAndroidPackage os autoPatchelfHook pkgs; + inherit (stdenv) lib; + package = packages.cmake."${version}"; + } + ) cmakeVersions; + + ndk-bundle = import ./ndk-bundle { + inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs platform-tools; + inherit (stdenv) lib; + package = packages.ndk-bundle."${ndkVersion}"; + }; + + google-apis = map (version: + deployAndroidPackage { + inherit os; + package = addons.addons."${version}".google_apis; + } + ) (builtins.filter (platformVersion: platformVersion < "26") platformVersions); # API level 26 and higher include Google APIs by default + + google-tv-addons = map (version: + deployAndroidPackage { + inherit os; + package = addons.addons."${version}".google_tv_addon; + } + ) platformVersions; + + # Function that automatically links all plugins for which multiple versions can coexist + linkPlugins = {name, plugins}: + stdenv.lib.optionalString (plugins != []) '' + mkdir -p ${name} + ${stdenv.lib.concatMapStrings (plugin: '' + ln -s ${plugin}/libexec/android-sdk/${name}/* ${name} + '') plugins} + ''; + + # Function that automatically links a plugin for which only one version exists + linkPlugin = {name, plugin, check ? true}: + stdenv.lib.optionalString check '' + ln -s ${plugin}/libexec/android-sdk/* ${name} + ''; + + # Links all plugins related to a requested platform + linkPlatformPlugins = {name, plugins, check}: + stdenv.lib.optionalString check '' + mkdir -p ${name} + ${stdenv.lib.concatMapStrings (plugin: '' + ln -s ${plugin}/libexec/android-sdk/${name}/* ${name} + '') plugins} + ''; # */ + + # This derivation deploys the tools package and symlinks all the desired + # plugins that we want to use. + + androidsdk = import ./tools.nix { + inherit deployAndroidPackage requireFile packages toolsVersion autoPatchelfHook makeWrapper os pkgs pkgs_i686; + inherit (stdenv) lib; + + postInstall = '' + # Symlink all requested plugins + + ${linkPlugin { name = "platform-tools"; plugin = platform-tools; }} + ${linkPlugins { name = "build-tools"; plugins = build-tools; }} + ${linkPlugin { name = "emulator"; plugin = emulator; check = includeEmulator; }} + ${linkPlugin { name = "docs"; plugin = docs; check = includeDocs; }} + ${linkPlugins { name = "platforms"; plugins = platforms; }} + ${linkPlatformPlugins { name = "sources"; plugins = sources; check = includeSources; }} + ${linkPlugins { name = "lldb"; plugins = lldb; }} + ${linkPlugins { name = "cmake"; plugins = cmake; }} + ${linkPlugin { name = "ndk-bundle"; plugin = ndk-bundle; check = includeNDK; }} + + ${stdenv.lib.optionalString includeSystemImages '' + mkdir -p system-images + ${stdenv.lib.concatMapStrings (system-image: '' + apiVersion=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*)) + type=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*/*)) + mkdir -p system-images/$apiVersion/$type + ln -s ${system-image}/libexec/android-sdk/system-images/$apiVersion/$type/* system-images/$apiVersion/$type + '') system-images} + ''} + + ${linkPlatformPlugins { name = "add-ons"; plugins = google-apis; check = useGoogleAPIs; }} + ${linkPlatformPlugins { name = "add-ons"; plugins = google-apis; check = useGoogleTVAddOns; }} + + # Link extras + ${stdenv.lib.concatMapStrings (identifier: + let + path = addons.extras."${identifier}".path; + addon = deployAndroidPackage { + inherit os; + package = addons.extras."${identifier}"; + }; + in + '' + targetDir=$(dirname ${path}) + mkdir -p $targetDir + ln -s ${addon}/libexec/android-sdk/${path} $targetDir + '') includeExtras} + + # Expose common executables in bin/ + mkdir -p $out/bin + find $PWD/tools -not -path '*/\.*' -type f -executable -mindepth 1 -maxdepth 1 | while read i + do + ln -s $i $out/bin + done + + find $PWD/tools/bin -not -path '*/\.*' -type f -executable -mindepth 1 -maxdepth 1 | while read i + do + ln -s $i $out/bin + done + + for i in ${platform-tools}/bin/* + do + ln -s $i $out/bin + done + ''; + }; +} diff --git a/pkgs/development/mobile/androidenv/convertaddons.xsl b/pkgs/development/mobile/androidenv/convertaddons.xsl new file mode 100644 index 00000000000..73f58ff5cde --- /dev/null +++ b/pkgs/development/mobile/androidenv/convertaddons.xsl @@ -0,0 +1,128 @@ +<?xml version="1.0"?> + +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:addon="http://schemas.android.com/sdk/android/repo/addon2/01" + xmlns:sdk="http://schemas.android.com/repository/android/common/01" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + + <xsl:output omit-xml-declaration="yes" indent="no" /> + + <!-- Template that puts a google HTTP prefix in front of relative URLs --> + <xsl:template name="repository-url"> + <xsl:variable name="raw-url" select="complete/url"/> + <xsl:choose> + <xsl:when test="starts-with($raw-url, 'http')"> + <xsl:value-of select="$raw-url"/> + </xsl:when> + <xsl:otherwise> + <xsl:text>https://dl.google.com/android/repository/</xsl:text> + <xsl:value-of select="$raw-url"/> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + + <xsl:template match="/addon:sdk-addon"> +{fetchurl}: + +{ + addons = { + <!-- Convert all addons, but skip the entry for google APIs version 25 because it is inconsistent with the spec --> + <xsl:for-each select="remotePackage[type-details/@xsi:type='addon:addonDetailsType' and archives/archive/complete/url != 'google_apis-25_r1.zip' ]"><xsl:sort select="@path" /> + "<xsl:value-of select="type-details/api-level" />"."<xsl:value-of select="type-details/tag/id" />" = { + name = "<xsl:value-of select="type-details/tag/id" />"; + path = "<xsl:value-of select="translate(@path, ';', '/')" />"; + revision = "<xsl:value-of select="type-details/api-level" />"; + displayName = "<xsl:value-of select="display-name" />"; + archives = { + <xsl:for-each select="archives/archive[not(host-os)]"> + all = fetchurl { + url = <xsl:call-template name="repository-url"/>; + sha1 = "<xsl:value-of select="complete/checksum" />"; + }; + </xsl:for-each> + <xsl:for-each select="archives/archive[host-os and not(host-os = 'windows')]"> + <xsl:value-of select="host-os" /> = fetchurl { + url = <xsl:call-template name="repository-url"/>; + sha1 = "<xsl:value-of select="complete/checksum" />"; + }; + </xsl:for-each> + }; + }; + </xsl:for-each> + + <!-- Workaround to make google APIs version 25 work. Hopefully, we can get rid of this at some point --> + <xsl:for-each select="remotePackage[type-details/@xsi:type='addon:addonDetailsType' and archives/archive/complete/url = 'google_apis-25_r1.zip' ]"> + "<xsl:value-of select="25" />"."<xsl:value-of select="type-details/tag/id" />" = { + name = "<xsl:value-of select="type-details/tag/id" />"; + path = "add-ons/addon-google_apis-google-25"; + revision = "<xsl:value-of select="25" />"; + displayName = "<xsl:value-of select="display-name" />"; + archives = { + <xsl:for-each select="archives/archive[not(host-os)]"> + all = fetchurl { + url = <xsl:call-template name="repository-url"/>; + sha1 = "<xsl:value-of select="complete/checksum" />"; + }; + </xsl:for-each> + <xsl:for-each select="archives/archive[host-os and not(host-os = 'windows')]"> + <xsl:value-of select="host-os" /> = fetchurl { + url = <xsl:call-template name="repository-url"/>; + sha1 = "<xsl:value-of select="complete/checksum" />"; + }; + </xsl:for-each> + }; + }; + </xsl:for-each> + }; + + extras = { + <!-- Convert all extras and maven artefacts --> + <xsl:for-each select="remotePackage[type-details/@xsi:type='addon:extraDetailsType' or type-details/@xsi:type='addon:mavenType']"><xsl:sort select="@path" /> + + <!-- Compose revision string from revision attributes --> + <xsl:variable name="revision"> + <xsl:choose> + <xsl:when test="revision/major"> + <xsl:value-of select="revision/major" /> + </xsl:when> + </xsl:choose> + <xsl:choose> + <xsl:when test="revision/minor">.<xsl:value-of select="revision/minor" /> + </xsl:when> + </xsl:choose> + <xsl:choose> + <xsl:when test="revision/micro">.<xsl:value-of select="revision/micro" /> + </xsl:when> + </xsl:choose> + <xsl:choose> + <xsl:when test="revision/preview">-rc<xsl:value-of select="revision/preview" /> + </xsl:when> + </xsl:choose> + </xsl:variable> + + "<xsl:value-of select="@path" />" = { + name = "<xsl:value-of select="translate(@path, ';', '-')" />"; + path = "<xsl:value-of select="translate(@path, ';', '/')" />"; + revision = "<xsl:value-of select="$revision" />"; + displayName = "<xsl:value-of select="display-name" />"; + archives = { + <xsl:for-each select="archives/archive[not(host-os)]"> + all = fetchurl { + url = <xsl:call-template name="repository-url"/>; + sha1 = "<xsl:value-of select="complete/checksum" />"; + }; + </xsl:for-each> + <xsl:for-each select="archives/archive[host-os and not(host-os = 'windows')]"> + <xsl:value-of select="host-os" /> = fetchurl { + url = <xsl:call-template name="repository-url"/>; + sha1 = "<xsl:value-of select="complete/checksum" />"; + }; + </xsl:for-each> + }; + }; + </xsl:for-each> + }; +} + </xsl:template> + +</xsl:stylesheet> diff --git a/pkgs/development/mobile/androidenv/convertpackages.xsl b/pkgs/development/mobile/androidenv/convertpackages.xsl new file mode 100644 index 00000000000..9623e01abcd --- /dev/null +++ b/pkgs/development/mobile/androidenv/convertpackages.xsl @@ -0,0 +1,116 @@ +<?xml version="1.0"?> + +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:common="http://schemas.android.com/repository/android/common/01" + xmlns:generic="http://schemas.android.com/repository/android/generic/01" + xmlns:sdk="http://schemas.android.com/sdk/android/repo/repository2/01" + xmlns:sdk-common="http://schemas.android.com/sdk/android/repo/common/01" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + + <xsl:output omit-xml-declaration="yes" indent="no" /> + + <!-- Template that puts a google HTTP prefix in front of relative URLs --> + <xsl:template name="repository-url"> + <xsl:variable name="raw-url" select="complete/url"/> + <xsl:choose> + <xsl:when test="starts-with($raw-url, 'http')"> + <xsl:value-of select="$raw-url"/> + </xsl:when> + <xsl:otherwise> + <xsl:text>https://dl.google.com/android/repository/</xsl:text> + <xsl:value-of select="$raw-url"/> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + + <xsl:template match="/sdk:sdk-repository"> +{fetchurl}: + +{ + <!-- Convert all remote packages --> + <xsl:for-each select="remotePackage"><xsl:sort select="@path" /> + + <!-- Extract the package name from the path --> + <xsl:variable name="name"> + <xsl:choose> + <xsl:when test="contains(@path, ';')"> + <xsl:value-of select="substring-before(@path, ';')" /> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="@path" /> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <!-- Compose version string from version attributes --> + <xsl:variable name="revision"> + <xsl:choose> + <!-- Compose revision for a generic package from the revision attributes --> + <xsl:when test="type-details/@xsi:type='generic:genericDetailsType'"> + <xsl:choose> + <xsl:when test="revision/major"> + <xsl:value-of select="revision/major" /> + </xsl:when> + </xsl:choose> + <xsl:choose> + <xsl:when test="revision/minor">.<xsl:value-of select="revision/minor" /> + </xsl:when> + </xsl:choose> + <xsl:choose> + <xsl:when test="revision/micro">.<xsl:value-of select="revision/micro" /> + </xsl:when> + </xsl:choose> + <xsl:choose> + <xsl:when test="revision/preview">-rc<xsl:value-of select="revision/preview" /> + </xsl:when> + </xsl:choose> + </xsl:when> + <!-- Compose revision of a platform SDK from the API-level or codename if the latter exists --> + <xsl:when test="type-details/@xsi:type='sdk:platformDetailsType'"> + <xsl:choose> + <xsl:when test="not(type-details/codename='')"> + <xsl:value-of select="type-details/codename" /> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="type-details/api-level" /> + </xsl:otherwise> + </xsl:choose> + </xsl:when> + <!-- Compose revision of a source SDK from the API-level --> + <xsl:when test="type-details/@xsi:type='sdk:sourceDetailsType'"> + <xsl:value-of select="type-details/api-level" /> + </xsl:when> + </xsl:choose> + </xsl:variable> + + <xsl:choose> + <xsl:when test="@path='emulator'"> <!-- An emulator package provides one archive per operating system but the same versions --> + "<xsl:value-of select="$name" />"."<xsl:value-of select="$revision" />".<xsl:value-of select="archives/archive/host-os" /> = { + </xsl:when> + <xsl:otherwise> + "<xsl:value-of select="$name" />"."<xsl:value-of select="$revision" />" = { + </xsl:otherwise> + </xsl:choose> + name = "<xsl:value-of select="$name" />"; + path = "<xsl:value-of select="translate(@path, ';', '/')" />"; + revision = "<xsl:value-of select="$revision" />"; + displayName = "<xsl:value-of select="display-name" />"; + archives = { + <xsl:for-each select="archives/archive[not(host-os)]"> + all = fetchurl { + url = <xsl:call-template name="repository-url"/>; + sha1 = "<xsl:value-of select="complete/checksum" />"; + }; + </xsl:for-each> + <xsl:for-each select="archives/archive[host-os and not(host-os = 'windows')]"> + <xsl:value-of select="host-os" /> = fetchurl { + url = <xsl:call-template name="repository-url"/>; + sha1 = "<xsl:value-of select="complete/checksum" />"; + }; + </xsl:for-each> + }; + }; + </xsl:for-each> +} + </xsl:template> +</xsl:stylesheet> diff --git a/pkgs/development/mobile/androidenv/convertsystemimages.xsl b/pkgs/development/mobile/androidenv/convertsystemimages.xsl new file mode 100644 index 00000000000..42d19cb6965 --- /dev/null +++ b/pkgs/development/mobile/androidenv/convertsystemimages.xsl @@ -0,0 +1,47 @@ +<?xml version="1.0"?> + +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:sys-img="http://schemas.android.com/sdk/android/repo/sys-img2/01" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + + <xsl:param name="imageType" /> + + <xsl:output omit-xml-declaration="yes" indent="no" /> + + <xsl:template name="repository-url"> + <xsl:variable name="raw-url" select="complete/url"/> + <xsl:choose> + <xsl:when test="starts-with($raw-url, 'http')"> + <xsl:value-of select="$raw-url"/> + </xsl:when> + <xsl:otherwise> + https://dl.google.com/android/repository/sys-img/<xsl:value-of select="$imageType" />/<xsl:value-of select="$raw-url"/> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + + <xsl:template match="/sys-img:sdk-sys-img"> +{fetchurl}: + +{ + <xsl:for-each select="remotePackage[starts-with(@path, 'system-images;')]"> + <xsl:variable name="revision"> + <xsl:value-of select="type-details/api-level" />-<xsl:value-of select="type-details/tag/id" />-<xsl:value-of select="type-details/abi" /> + </xsl:variable> + + "<xsl:value-of select="type-details/api-level" />".<xsl:value-of select="type-details/tag/id" />."<xsl:value-of select="type-details/abi" />" = { + name = "system-image-<xsl:value-of select="$revision" />"; + path = "<xsl:value-of select="translate(@path, ';', '/')" />"; + revision = "<xsl:value-of select="$revision" />"; + displayName = "<xsl:value-of select="display-name" />"; + archives.all = fetchurl { + <xsl:for-each select="archives/archive"> + url = <xsl:call-template name="repository-url"/>; + sha1 = "<xsl:value-of select="complete/checksum" />"; + </xsl:for-each> + }; + }; + </xsl:for-each> +} + </xsl:template> +</xsl:stylesheet> diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 282924047aa..92560105422 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -1,380 +1,26 @@ -{ buildPackages, pkgs, pkgs_i686, targetPackages -, includeSources ? true, licenseAccepted ? false +{ pkgs ? import <nixpkgs> {} +, pkgs_i686 ? import <nixpkgs> { system = "i686-linux"; } +, licenseAccepted ? false }: -# TODO: use callPackage instead of import to avoid so many inherits - rec { - platformTools = import ./platform-tools.nix { - inherit buildPackages pkgs; - }; - - buildToolsSources = let - system = pkgs.stdenv.hostPlatform.system; - path = if (system == "i686-linux" || system == "x86_64-linux") - then ./build-tools-srcs-linux.nix - else if system == "x86_64-darwin" - then ./build-tools-srcs-macosx.nix - else throw "System: ${system} not supported!"; - in - import path { inherit (pkgs) fetchurl; }; - - buildTools = import ./build-tools.nix { - inherit (pkgs) stdenv lib fetchurl unzip zlib file coreutils; - inherit buildToolsSources; - stdenv_32bit = pkgs_i686.stdenv; - zlib_32bit = pkgs_i686.zlib; - ncurses_32bit = pkgs_i686.ncurses5; - ncurses = pkgs.ncurses5; - }; - - support = import ./support.nix { - inherit (pkgs) stdenv fetchurl unzip; - }; - - supportRepository = import ./support-repository.nix { - inherit (pkgs) stdenv fetchurl unzip; - }; - - platforms = if (pkgs.stdenv.hostPlatform.system == "i686-linux" || pkgs.stdenv.hostPlatform.system == "x86_64-linux") - then import ./platforms-linux.nix { - inherit (pkgs) stdenv fetchurl unzip; - } - else if pkgs.stdenv.hostPlatform.system == "x86_64-darwin" - then import ./platforms-macosx.nix { - inherit (pkgs) stdenv fetchurl unzip; - } - else throw "Platform: ${pkgs.stdenv.hostPlatform.system} not supported!"; - - sysimages = import ./sysimages.nix { - inherit (pkgs) stdenv fetchurl unzip; - }; - - addons = import ./addons.nix { - inherit (pkgs) stdenv fetchurl unzip; - }; - - sources = import ./sources.nix { - inherit (pkgs) stdenv fetchurl unzip; - }; - - androidsdk = import ./androidsdk.nix { - inherit (pkgs) stdenv fetchurl unzip makeWrapper zlib - glxinfo freetype fontconfig glib gtk2 atk - libGLU_combined file alsaLib jdk coreutils - libpulseaudio dbus fetchzip; - inherit (pkgs.xorg) libX11 libXext libXrender - libxcb libXau libXdmcp libXtst xkeyboardconfig; - - inherit platformTools buildTools support - supportRepository platforms sysimages - addons sources includeSources licenseAccepted; - - stdenv_32bit = pkgs_i686.stdenv; - }; - - androidsdk_2_1 = androidsdk { - platformVersions = [ "7" ]; - abiVersions = [ "armeabi-v7a" ]; - useGoogleAPIs = true; - }; - - androidsdk_2_2 = androidsdk { - platformVersions = [ "8" ]; - abiVersions = [ "armeabi-v7a" ]; - useGoogleAPIs = true; - }; - - androidsdk_2_3_3 = androidsdk { - platformVersions = [ "10" ]; - abiVersions = [ "armeabi-v7a" ]; - useGoogleAPIs = true; - }; - - androidsdk_3_0 = androidsdk { - platformVersions = [ "11" ]; - abiVersions = [ "armeabi-v7a" ]; - useGoogleAPIs = true; - }; - - androidsdk_3_1 = androidsdk { - platformVersions = [ "12" ]; - abiVersions = [ "armeabi-v7a" ]; - useGoogleAPIs = true; - }; - - androidsdk_3_2 = androidsdk { - platformVersions = [ "13" ]; - abiVersions = [ "armeabi-v7a" ]; - useGoogleAPIs = true; - }; - - androidsdk_4_0 = androidsdk { - platformVersions = [ "14" ]; - abiVersions = [ "armeabi-v7a" ]; - useGoogleAPIs = true; - }; - - androidsdk_4_0_3 = androidsdk { - platformVersions = [ "15" ]; - abiVersions = [ "armeabi-v7a" ]; - useGoogleAPIs = true; - }; - - androidsdk_4_1 = androidsdk { - platformVersions = [ "16" ]; - abiVersions = [ "armeabi-v7a" ]; - useGoogleAPIs = true; - }; - - androidsdk_4_2 = androidsdk { - platformVersions = [ "17" ]; - abiVersions = [ "armeabi-v7a" ]; - useGoogleAPIs = true; - }; - - androidsdk_4_3 = androidsdk { - platformVersions = [ "18" ]; - abiVersions = [ "armeabi-v7a" "x86" ]; - useGoogleAPIs = true; - }; - - androidsdk_4_4 = androidsdk { - platformVersions = [ "19" ]; - abiVersions = [ "armeabi-v7a" "x86" ]; - useGoogleAPIs = true; - }; - - androidsdk_5_0_1 = androidsdk { - platformVersions = [ "21" ]; - abiVersions = [ "armeabi-v7a" "x86" ]; - useGoogleAPIs = true; - }; - - androidsdk_5_0_1_extras = androidsdk { - platformVersions = [ "21" ]; - abiVersions = [ "armeabi-v7a" "x86" ]; - useGoogleAPIs = true; - useExtraSupportLibs = true; - useGooglePlayServices = true; - }; - - androidsdk_5_1_1 = androidsdk { - platformVersions = [ "22" ]; - abiVersions = [ "armeabi-v7a" "x86" "x86_64"]; - useGoogleAPIs = true; - }; - - androidsdk_5_1_1_extras = androidsdk { - platformVersions = [ "22" ]; - abiVersions = [ "armeabi-v7a" "x86" "x86_64"]; - useGoogleAPIs = true; - useExtraSupportLibs = true; - useGooglePlayServices = true; - }; - - androidsdk_6_0 = androidsdk { - platformVersions = [ "23" ]; - abiVersions = [ "armeabi-v7a" "x86" "x86_64"]; - useGoogleAPIs = true; - }; - - androidsdk_6_0_extras = androidsdk { - platformVersions = [ "23" ]; - abiVersions = [ "armeabi-v7a" "x86" "x86_64"]; - useGoogleAPIs = true; - useExtraSupportLibs = true; - useGooglePlayServices = true; - useInstantApps = true; - }; - - androidsdk_7_0 = androidsdk { - platformVersions = [ "24" ]; - abiVersions = [ "x86" "x86_64"]; - useGoogleAPIs = true; - }; - - androidsdk_7_0_extras = androidsdk { - platformVersions = [ "24" ]; - abiVersions = [ "x86" "x86_64"]; - useGoogleAPIs = true; - useExtraSupportLibs = true; - useGooglePlayServices = true; - useInstantApps = true; - }; - - androidsdk_7_1_1 = androidsdk { - platformVersions = [ "25" ]; - abiVersions = [ "x86" "x86_64"]; - useGoogleAPIs = true; - }; - - androidsdk_7_1_1_extras = androidsdk { - platformVersions = [ "25" ]; - abiVersions = [ "x86" "x86_64"]; - useGoogleAPIs = true; - useExtraSupportLibs = true; - useGooglePlayServices = true; - useInstantApps = true; - }; - - androidsdk_8_0 = androidsdk { - platformVersions = [ "26" ]; - abiVersions = [ "x86" "x86_64"]; - useGoogleAPIs = true; - }; - - androidsdk_8_0_extras = androidsdk { - platformVersions = [ "26" ]; - abiVersions = [ "x86" "x86_64"]; - useGoogleAPIs = true; - useExtraSupportLibs = true; - useGooglePlayServices = true; - useInstantApps = true; - }; - - androidsdk_8_1 = androidsdk { - platformVersions = [ "27" ]; - abiVersions = [ "x86" "x86_64"]; - useGoogleAPIs = true; - }; - - androidsdk_8_1_extras = androidsdk { - platformVersions = [ "27" ]; - abiVersions = [ "x86" "x86_64"]; - useGoogleAPIs = true; - useExtraSupportLibs = true; - useGooglePlayServices = true; - useInstantApps = true; - }; - - androidsdk_9_0 = androidsdk { - platformVersions = [ "28" ]; - abiVersions = [ "x86" "x86_64"]; - useGoogleAPIs = true; - }; - - androidsdk_9_0_extras = androidsdk { - platformVersions = [ "28" ]; - abiVersions = [ "x86" "x86_64"]; - useGoogleAPIs = true; - useExtraSupportLibs = true; - useGooglePlayServices = true; - useInstantApps = true; - }; - - androidsdk_latest = androidsdk_9_0; - - androidndk_10e = pkgs.callPackage ./androidndk.nix { - inherit (buildPackages) - unzip makeWrapper; - inherit (pkgs) - stdenv fetchurl zlib ncurses5 lib python3 libcxx - coreutils file findutils gawk gnugrep gnused jdk which; - inherit platformTools; - version = "10e"; - sha1s = { - x86_64-darwin = "6be8598e4ed3d9dd42998c8cb666f0ee502b1294"; - x86_64-linux = "f692681b007071103277f6edc6f91cb5c5494a32"; - }; - }; - - androidndk_16b = pkgs.callPackage ./androidndk.nix { - inherit (buildPackages) - unzip makeWrapper; - inherit (pkgs) - stdenv fetchurl zlib ncurses5 lib python3 libcxx - coreutils file findutils gawk gnugrep gnused jdk which; - inherit platformTools; - version = "16b"; - sha1s = { - x86_64-darwin = "e51e615449b98c716cf912057e2682e75d55e2de"; - x86_64-linux = "42aa43aae89a50d1c66c3f9fdecd676936da6128"; - }; - }; - - androidndk_17c = pkgs.callPackage ./androidndk.nix { - inherit (buildPackages) - unzip makeWrapper; - inherit (pkgs) - stdenv fetchurl zlib ncurses5 lib python3 libcxx - coreutils file findutils gawk gnugrep gnused jdk which; - inherit platformTools; - version = "17c"; - sha1s = { - x86_64-darwin = "f97e3d7711497e3b4faf9e7b3fa0f0da90bb649c"; - x86_64-linux = "12cacc70c3fd2f40574015631c00f41fb8a39048"; - }; - }; - - androidndk_18b = pkgs.callPackage ./androidndk.nix { - inherit (buildPackages) - unzip makeWrapper; - inherit (pkgs) - stdenv fetchurl zlib ncurses5 lib python3 libcxx - coreutils file findutils gawk gnugrep gnused jdk which; - inherit platformTools; - version = "18b"; - sha1s = { - x86_64-darwin = "98cb9909aa8c2dab32db188bbdc3ac6207e09440"; - x86_64-linux = "500679655da3a86aecf67007e8ab230ea9b4dd7b"; - }; - }; - androidndk = androidndk_18b; - - androidndk_r8e = import ./androidndk_r8e.nix { - inherit (buildPackages) - makeWrapper; - inherit (pkgs) - stdenv fetchurl zlib ncurses lib - coreutils file findutils gawk gnugrep gnused jdk which; - inherit platformTools; + composeAndroidPackages = import ./compose-android-packages.nix { + inherit (pkgs) stdenv fetchurl requireFile makeWrapper unzip autoPatchelfHook; + inherit pkgs pkgs_i686 licenseAccepted; }; buildApp = import ./build-app.nix { - inherit (pkgs) stdenv jdk ant gnumake gawk file which; - inherit androidsdk androidndk; + inherit (pkgs) stdenv jdk ant gnumake gawk; + inherit composeAndroidPackages; }; emulateApp = import ./emulate-app.nix { inherit (pkgs) stdenv; - inherit androidsdk; + inherit composeAndroidPackages; }; - androidndkPkgs_17c = import ./androidndk-pkgs.nix { - inherit (buildPackages) - makeWrapper; - inherit (pkgs) - lib stdenv - runCommand wrapBintoolsWith wrapCCWith; - # buildPackages.foo rather than buildPackages.buildPackages.foo would work, - # but for splicing messing up on infinite recursion for the variants we - # *dont't* use. Using this workaround, but also making a test to ensure - # these two really are the same. - buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk_17c; - androidndk = androidndk_17c; - targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs_17c; - }; - androidndkPkgs = androidndkPkgs_17c; - - androidndkPkgs_10e = import ./androidndk-pkgs.nix { - inherit (buildPackages) - makeWrapper; - inherit (pkgs) - lib stdenv - runCommand wrapBintoolsWith wrapCCWith; - # buildPackages.foo rather than buildPackages.buildPackages.foo would work, - # but for splicing messing up on infinite recursion for the variants we - # *dont't* use. Using this workaround, but also making a test to ensure - # these two really are the same. - buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk_10e; - androidndk = androidndk_10e; - targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs_10e; - }; - - buildGradleApp = import ./build-gradle-app.nix { - inherit (pkgs) stdenv jdk gnumake gawk file runCommand - which gradle fetchurl buildEnv; - inherit androidsdk androidndk; + androidPkgs_9_0 = composeAndroidPackages { + platformVersions = [ "28" ]; + abiVersions = [ "x86" "x86_64"]; }; } diff --git a/pkgs/development/mobile/androidenv/deploy-androidpackage.nix b/pkgs/development/mobile/androidenv/deploy-androidpackage.nix new file mode 100644 index 00000000000..97fd197cb7d --- /dev/null +++ b/pkgs/development/mobile/androidenv/deploy-androidpackage.nix @@ -0,0 +1,44 @@ +{stdenv, unzip}: +{package, os ? null, buildInputs ? [], patchInstructions ? "", meta ? {}, ...}@args: + +let + extraParams = removeAttrs args [ "package" "os" "buildInputs" "patchInstructions" ]; +in +stdenv.mkDerivation ({ + name = package.name + "-" + package.revision; + src = if os != null && builtins.hasAttr os package.archives then package.archives.${os} else package.archives.all; + buildInputs = [ unzip ] ++ buildInputs; + + # Most Android Zip packages have a root folder, but some don't. We unpack + # the zip file in a folder and we try to discover whether it has a single root + # folder. If this is the case, we adjust the current working folder. + unpackPhase = '' + mkdir extractedzip + cd extractedzip + unpackFile "$src" + if [ "$(find . -mindepth 1 -maxdepth 1 -type d | wc -l)" -eq 1 ] + then + cd "$(find . -mindepth 1 -maxdepth 1 -type d)" + fi + sourceRoot="$PWD" + ''; + + installPhase = '' + packageBaseDir=$out/libexec/android-sdk/${package.path} + mkdir -p $packageBaseDir + cd $packageBaseDir + cp -av $sourceRoot/* . + ${patchInstructions} + ''; + + # We never attempt to strip. This is not required since we're doing binary + # deployments. Moreover, some executables that have been patched with patchelf + # may not work any longer after they have been stripped. + dontStrip = true; + dontPatchELF = true; + dontAutoPatchelf = true; + + meta = { + description = package.displayName; + } // meta; +} // extraParams) diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix index 2fc753c047a..01669024b3b 100644 --- a/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/pkgs/development/mobile/androidenv/emulate-app.nix @@ -1,33 +1,41 @@ -{stdenv, androidsdk}: +{ composeAndroidPackages, stdenv }: { name, app ? null -, platformVersion ? "8", abiVersion ? "armeabi-v7a", useGoogleAPIs ? false +, platformVersion ? "16", abiVersion ? "armeabi-v7a", systemImageType ? "default", useGoogleAPIs ? false , enableGPU ? false, extraAVDFiles ? [] , package ? null, activity ? null , avdHomeDir ? null -}: +}@args: let - androidsdkComposition = androidsdk { - inherit useGoogleAPIs; + androidSdkArgNames = builtins.attrNames (builtins.functionArgs composeAndroidPackages); + extraParams = removeAttrs args ([ "name" ] ++ androidSdkArgNames); + + # Extract the parameters meant for the Android SDK + androidParams = { platformVersions = [ platformVersion ]; + includeEmulator = true; + includeSystemImages = true; + systemImageTypes = [ systemImageType ]; abiVersions = [ abiVersion ]; }; + + androidsdkComposition = (composeAndroidPackages androidParams).androidsdk; in stdenv.mkDerivation { inherit name; - + buildCommand = '' mkdir -p $out/bin - + cat > $out/bin/run-test-emulator << "EOF" #! ${stdenv.shell} -e - + # We need a TMPDIR if [ "$TMPDIR" = "" ] then export TMPDIR=/tmp fi - + ${if avdHomeDir == null then '' # Store the virtual devices somewhere else, instead of polluting a user's HOME directory export ANDROID_SDK_HOME=$(mktemp -d $TMPDIR/nix-android-vm-XXXX) @@ -35,20 +43,23 @@ stdenv.mkDerivation { mkdir -p "${avdHomeDir}" export ANDROID_SDK_HOME="${avdHomeDir}" ''} - + + # We need to specify the location of the Android SDK root folder + export ANDROID_SDK_ROOT=${androidsdkComposition}/libexec/android-sdk + # We have to look for a free TCP port - + echo "Looking for a free TCP port in range 5554-5584" >&2 - + for i in $(seq 5554 2 5584) do - if [ -z "$(${androidsdkComposition}/libexec/platform-tools/adb devices | grep emulator-$i)" ] + if [ -z "$(${androidsdkComposition}/libexec/android-sdk/platform-tools/adb devices | grep emulator-$i)" ] then port=$i break fi done - + if [ -z "$port" ] then echo "Unfortunately, the emulator port space is exhausted!" >&2 @@ -56,57 +67,57 @@ stdenv.mkDerivation { else echo "We have a free TCP port: $port" >&2 fi - + export ANDROID_SERIAL="emulator-$port" - + # Create a virtual android device for testing if it does not exists - - if [ "$(${androidsdkComposition}/libexec/tools/android list avd | grep 'Name: device')" = "" ] + ${androidsdkComposition}/libexec/android-sdk/tools/android list targets + + if [ "$(${androidsdkComposition}/libexec/android-sdk/tools/android list avd | grep 'Name: device')" = "" ] then # Create a virtual android device - yes "" | ${androidsdkComposition}/libexec/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion} $NIX_ANDROID_AVD_FLAGS - + yes "" | ${androidsdkComposition}/libexec/android-sdk/tools/android create avd -n device -t 1 --abi ${systemImageType}/${abiVersion} $NIX_ANDROID_AVD_FLAGS + ${stdenv.lib.optionalString enableGPU '' # Enable GPU acceleration echo "hw.gpu.enabled=yes" >> $ANDROID_SDK_HOME/.android/avd/device.avd/config.ini ''} - + ${stdenv.lib.concatMapStrings (extraAVDFile: '' ln -sf ${extraAVDFile} $ANDROID_SDK_HOME/.android/avd/device.avd '') extraAVDFiles} fi - + # Launch the emulator - ${androidsdkComposition}/libexec/tools/emulator -avd device -no-boot-anim -port $port $NIX_ANDROID_EMULATOR_FLAGS & + ${androidsdkComposition}/libexec/android-sdk/emulator/emulator -avd device -no-boot-anim -port $port $NIX_ANDROID_EMULATOR_FLAGS & # Wait until the device has completely booted - echo "Waiting until the emulator has booted the device and the package manager is ready..." >&2 - - ${androidsdkComposition}/libexec/platform-tools/adb -s emulator-$port wait-for-device - + + ${androidsdkComposition}/libexec/android-sdk/platform-tools/adb -s emulator-$port wait-for-device + echo "Device state has been reached" >&2 - - while [ -z "$(${androidsdkComposition}/libexec/platform-tools/adb -s emulator-$port shell getprop dev.bootcomplete | grep 1)" ] + + while [ -z "$(${androidsdkComposition}/libexec/android-sdk/platform-tools/adb -s emulator-$port shell getprop dev.bootcomplete | grep 1)" ] do sleep 5 done - + echo "dev.bootcomplete property is 1" >&2 - - #while [ -z "$(${androidsdkComposition}/libexec/platform-tools/adb -s emulator-$port shell getprop sys.boot_completed | grep 1)" ] + + #while [ -z "$(${androidsdkComposition}/libexec/android-sdk/platform-tools/adb -s emulator-$port shell getprop sys.boot_completed | grep 1)" ] #do #sleep 5 #done - + #echo "sys.boot_completed property is 1" >&2 - + echo "ready" >&2 - + ${stdenv.lib.optionalString (app != null) '' # Install the App through the debugger, if it has not been installed yet - - if [ -z "${package}" ] || [ "$(${androidsdkComposition}/libexec/platform-tools/adb -s emulator-$port shell pm list packages | grep package:${package})" = "" ] + + if [ -z "${package}" ] || [ "$(${androidsdkComposition}/libexec/android-sdk/platform-tools/adb -s emulator-$port shell pm list packages | grep package:${package})" = "" ] then if [ -d "${app}" ] then @@ -114,13 +125,13 @@ stdenv.mkDerivation { else appPath="${app}" fi - - ${androidsdkComposition}/libexec/platform-tools/adb -s emulator-$port install "$appPath" + + ${androidsdkComposition}/libexec/android-sdk/platform-tools/adb -s emulator-$port install "$appPath" fi - + # Start the application ${stdenv.lib.optionalString (package != null && activity != null) '' - ${androidsdkComposition}/libexec/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/${activity} + ${androidsdkComposition}/libexec/android-sdk/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/${activity} ''} ''} EOF diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix new file mode 100644 index 00000000000..7ba74eb900f --- /dev/null +++ b/pkgs/development/mobile/androidenv/emulator.nix @@ -0,0 +1,20 @@ +{deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgs_i686}: + +deployAndroidPackage { + inherit package os; + buildInputs = [ autoPatchelfHook makeWrapper ] + ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xlibs.libX11 pkgs.xlibs.libXext pkgs.xlibs.libXdamage pkgs.xlibs.libXfixes pkgs.xlibs.libxcb pkgs.libGL pkgs.libpulseaudio pkgs.zlib pkgs.ncurses5 pkgs.stdenv.cc.cc pkgs_i686.glibc ]; + patchInstructions = lib.optionalString (os == "linux") '' + addAutoPatchelfSearchPath $packageBaseDir/lib + addAutoPatchelfSearchPath $packageBaseDir/lib64 + addAutoPatchelfSearchPath $packageBaseDir/lib64/qt/lib + autoPatchelf $out + + # Wrap emulator so that it can load libdbus-1.so at runtime and it no longer complains about XKB keymaps + wrapProgram $out/libexec/android-sdk/emulator/emulator \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.dbus ]} \ + --set QT_XKB_CONFIG_ROOT ${pkgs.xkeyboard_config}/share/X11/xkb \ + --set QTCOMPOSE ${pkgs.xorg.libX11.out}/share/X11/locale + ''; + dontMoveLib64 = true; +} diff --git a/pkgs/development/mobile/androidenv/fetch.sh b/pkgs/development/mobile/androidenv/fetch.sh deleted file mode 100755 index ef15e8eaeda..00000000000 --- a/pkgs/development/mobile/androidenv/fetch.sh +++ /dev/null @@ -1,14 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash --pure -p curl libxslt - -# we skip the intel addons, as they are Windows+osX only -# we skip the default sys-img (arm?) because it is empty -curl -o repository-11.xml https://dl.google.com/android/repository/repository-11.xml -curl -o addon.xml https://dl.google.com/android/repository/addon.xml -curl -o sys-img.xml https://dl.google.com/android/repository/sys-img/android/sys-img.xml - -./generate-addons.sh -./generate-platforms.sh -./generate-sysimages.sh -./generate-sources.sh -./generate-tools.sh diff --git a/pkgs/development/mobile/androidenv/generate-addons.sh b/pkgs/development/mobile/androidenv/generate-addons.sh deleted file mode 100755 index 9b2cf34eabc..00000000000 --- a/pkgs/development/mobile/androidenv/generate-addons.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -e - -xsltproc generate-addons.xsl addon.xml > addons.nix diff --git a/pkgs/development/mobile/androidenv/generate-addons.xsl b/pkgs/development/mobile/androidenv/generate-addons.xsl deleted file mode 100644 index d32ad717cd7..00000000000 --- a/pkgs/development/mobile/androidenv/generate-addons.xsl +++ /dev/null @@ -1,82 +0,0 @@ -<?xml version="1.0"?> - -<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:sdk="http://schemas.android.com/sdk/android/addon/7"> - - <xsl:output omit-xml-declaration="yes" indent="no" /> - <xsl:template match="/sdk:sdk-addon"> -# This file is generated from generate-addons.sh. DO NOT EDIT. -# Execute generate-addons.sh or fetch.sh to update the file. -{stdenv, fetchurl, unzip}: - -let - buildGoogleApis = args: - stdenv.mkDerivation (args // { - buildInputs = [ unzip ]; - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - }); -in -{ -<xsl:for-each select="sdk:add-on[sdk:name-id='google_apis']"><xsl:sort select="sdk:api-level" data-type="number"/><xsl:sort select="sdk:revision" data-type="number"/> - google_apis_<xsl:value-of select="sdk:api-level" /> = buildGoogleApis { - name = "<xsl:value-of select="sdk:name-id" />-<xsl:value-of select="sdk:api-level" />"; - src = fetchurl { - url = https://dl.google.com/android/repository/<xsl:value-of select="sdk:archives/sdk:archive/sdk:url" />; - sha1 = "<xsl:value-of select="sdk:archives/sdk:archive/sdk:checksum[@type='sha1']" />"; - }; - meta = { - description = "<xsl:value-of select="sdk:description" />"; -<xsl:for-each select="sdk:desc-url"> url = <xsl:value-of select="." />;</xsl:for-each> - }; - }; -</xsl:for-each> - -<xsl:for-each select="sdk:extra[sdk:path='support']"> - android_support_extra = buildGoogleApis { - name = "android_support_extra"; - src = fetchurl { - url = https://dl.google.com/android/repository/<xsl:value-of select="sdk:archives/sdk:archive/sdk:url"/>; - sha1 = "<xsl:value-of select="sdk:archives/sdk:archive/sdk:checksum[@type='sha1']" />"; - }; - meta = { - description = "Android Support Library"; - url = http://developer.android.com/; - }; - }; -</xsl:for-each><xsl:for-each select="sdk:extra[sdk:path='google_play_services']"> - google_play_services = buildGoogleApis { - name = "google_play_services"; - src = fetchurl { - url = https://dl.google.com/android/repository/<xsl:value-of select="sdk:archives/sdk:archive/sdk:url"/>; - sha1 = "<xsl:value-of select="sdk:archives/sdk:archive/sdk:checksum[@type='sha1']" />"; - }; - meta = { - description = "Google Play services client library and sample code"; - url = http://developer.android.com/; - }; - }; -</xsl:for-each> - -<!-- Instant apps --> -<xsl:for-each select="sdk:extra[sdk:path='instantapps']"> - instant_apps = buildGoogleApis { - name = "instant_apps_sdk"; - src = fetchurl { - url = https://dl.google.com/android/repository/<xsl:value-of select="sdk:archives/sdk:archive/sdk:url"/>; - sha1 = "<xsl:value-of select="sdk:archives/sdk:archive/sdk:checksum[@type='sha1']" />"; - }; - meta = { - description = "Android Instant Apps Development SDK"; - url = "https://developer.android.com/"; - }; - }; -</xsl:for-each> - -} -</xsl:template> - -</xsl:stylesheet> diff --git a/pkgs/development/mobile/androidenv/generate-platforms.sh b/pkgs/development/mobile/androidenv/generate-platforms.sh deleted file mode 100755 index ce89f6a8036..00000000000 --- a/pkgs/development/mobile/androidenv/generate-platforms.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -e - -xsltproc --stringparam os linux generate-platforms.xsl repository-11.xml > platforms-linux.nix -xsltproc --stringparam os macosx generate-platforms.xsl repository-11.xml > platforms-macosx.nix diff --git a/pkgs/development/mobile/androidenv/generate-platforms.xsl b/pkgs/development/mobile/androidenv/generate-platforms.xsl deleted file mode 100644 index 54a165d21e4..00000000000 --- a/pkgs/development/mobile/androidenv/generate-platforms.xsl +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0"?> - -<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:sdk="http://schemas.android.com/sdk/android/repository/11"> - - <xsl:param name="os" /> - <xsl:output omit-xml-declaration="yes" indent="no" /> - - <xsl:template name="repository-url"> - <xsl:variable name="raw-url" select="sdk:archives/sdk:archive[sdk:host-os=$os or count(sdk:host-os) = 0]/sdk:url"/> - <xsl:choose> - <xsl:when test="starts-with($raw-url, 'http')"> - <xsl:value-of select="$raw-url"/> - </xsl:when> - <xsl:otherwise> - <xsl:text>https://dl.google.com/android/repository/</xsl:text> - <xsl:value-of select="$raw-url"/> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - - <xsl:template match="/sdk:sdk-repository"> -# This file is generated from generate-platforms.sh. DO NOT EDIT. -# Execute generate-platforms.sh or fetch.sh to update the file. -{stdenv, fetchurl, unzip}: - -let - buildPlatform = args: - stdenv.mkDerivation (args // { - buildInputs = [ unzip ]; - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - }); -in -{ - <xsl:for-each select="sdk:platform"><xsl:sort select="sdk:api-level" data-type="number"/> - platform_<xsl:value-of select="sdk:api-level" /> = buildPlatform { - name = "android-platform-<xsl:value-of select="sdk:version" />"; - src = fetchurl { - url = <xsl:call-template name="repository-url"/>; - sha1 = "<xsl:value-of select="sdk:archives/sdk:archive[sdk:host-os=$os or count(sdk:host-os) = 0]/sdk:checksum[@type='sha1']" />"; - }; - meta = { - description = "<xsl:value-of select="sdk:description" />"; -<xsl:for-each select="sdk:desc-url"> homepage = <xsl:value-of select="." />;</xsl:for-each> - }; - }; -</xsl:for-each> -} -</xsl:template> -</xsl:stylesheet> diff --git a/pkgs/development/mobile/androidenv/generate-sources.sh b/pkgs/development/mobile/androidenv/generate-sources.sh deleted file mode 100755 index 861fbbf9d2e..00000000000 --- a/pkgs/development/mobile/androidenv/generate-sources.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -e - -xsltproc generate-sources.xsl repository-11.xml > sources.nix diff --git a/pkgs/development/mobile/androidenv/generate-sources.xsl b/pkgs/development/mobile/androidenv/generate-sources.xsl deleted file mode 100644 index ad76369b2be..00000000000 --- a/pkgs/development/mobile/androidenv/generate-sources.xsl +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0"?> - -<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:sdk="http://schemas.android.com/sdk/android/repository/11"> - - <xsl:output omit-xml-declaration="yes" indent="no" /> - - <xsl:template name="repository-url"> - <xsl:variable name="raw-url" select="sdk:archives/sdk:archive/sdk:url"/> - <xsl:choose> - <xsl:when test="starts-with($raw-url, 'http')"> - <xsl:value-of select="$raw-url"/> - </xsl:when> - <xsl:otherwise> - <xsl:text>https://dl.google.com/android/repository/</xsl:text> - <xsl:value-of select="$raw-url"/> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - - <xsl:template match="/sdk:sdk-repository"> -# This file is generated from generate-sources.sh. DO NOT EDIT. -# Execute generate-sources.sh or fetch.sh to update the file. -{stdenv, fetchurl, unzip}: - -let - buildSource = args: - stdenv.mkDerivation (args // { - buildInputs = [ unzip ]; - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - }); -in -{ -<xsl:for-each select="sdk:source"><xsl:sort select="sdk:api-level" data-type="number"/> - source_<xsl:value-of select="sdk:api-level" /> = buildSource { - name = "android-source-<xsl:value-of select="sdk:api-level" />"; - src = fetchurl { - url = <xsl:call-template name="repository-url"/>; - sha1 = "<xsl:value-of select="sdk:archives/sdk:archive/sdk:checksum[@type='sha1']" />"; - }; - meta = { - description = "Source code for Android API <xsl:value-of select="sdk:api-level" />"; - }; - }; -</xsl:for-each> -} -</xsl:template> -</xsl:stylesheet> diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.sh b/pkgs/development/mobile/androidenv/generate-sysimages.sh deleted file mode 100755 index 586381e8ba6..00000000000 --- a/pkgs/development/mobile/androidenv/generate-sysimages.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -e - -cat > sysimages.nix << "EOF" -# This file is generated from generate-sysimages.sh. DO NOT EDIT. -# Execute generate-sysimages.sh or fetch.sh to update the file. -{stdenv, fetchurl, unzip}: - -let - buildSystemImage = args: - stdenv.mkDerivation (args // { - buildInputs = [ unzip ]; - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - }); -in -{ -EOF - -xsltproc generate-sysimages.xsl sys-img.xml >> sysimages.nix - -cat >> sysimages.nix << "EOF" -} -EOF diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.xsl b/pkgs/development/mobile/androidenv/generate-sysimages.xsl deleted file mode 100644 index 302c7d9deea..00000000000 --- a/pkgs/development/mobile/androidenv/generate-sysimages.xsl +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0"?> - -<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:str="http://exslt.org/strings" - xmlns:sdk="http://schemas.android.com/sdk/android/sys-img/3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - <xsl:output omit-xml-declaration="yes" indent="no" /> - - <xsl:template match="/sdk:sdk-sys-img"> - <xsl:for-each select="sdk:system-image"><xsl:sort select="sdk:api-level" data-type="number"/><xsl:sort select="sdk:abi"/> - sysimg_<xsl:value-of select="sdk:abi" />_<xsl:value-of select="sdk:api-level" /> = buildSystemImage { - name = "sysimg-<xsl:value-of select="sdk:abi" />-<xsl:value-of select="sdk:api-level" />"; - src = fetchurl { - url = <xsl:if test="not(starts-with(sdk:archives/sdk:archive/sdk:url, 'https://'))">https://dl.google.com/android/repository/sys-img/android/</xsl:if><xsl:value-of select="sdk:archives/sdk:archive/sdk:url" />; - sha1 = "<xsl:value-of select="sdk:archives/sdk:archive/sdk:checksum[@type='sha1']" />"; - }; - }; -</xsl:for-each> - </xsl:template> -</xsl:stylesheet> diff --git a/pkgs/development/mobile/androidenv/generate-tools.sh b/pkgs/development/mobile/androidenv/generate-tools.sh deleted file mode 100755 index 5799894fd45..00000000000 --- a/pkgs/development/mobile/androidenv/generate-tools.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -e - -xsltproc --stringparam os linux generate-tools.xsl repository-11.xml > build-tools-srcs-linux.nix -xsltproc --stringparam os macosx generate-tools.xsl repository-11.xml > build-tools-srcs-macosx.nix diff --git a/pkgs/development/mobile/androidenv/generate-tools.xsl b/pkgs/development/mobile/androidenv/generate-tools.xsl deleted file mode 100644 index 814bad12988..00000000000 --- a/pkgs/development/mobile/androidenv/generate-tools.xsl +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0"?> - -<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:sdk="http://schemas.android.com/sdk/android/repository/11"> - - <xsl:param name="os" /> - <xsl:output omit-xml-declaration="yes" indent="no" /> - - <xsl:template name="repository-url"> - <xsl:variable name="raw-url" select="sdk:archives/sdk:archive[sdk:host-os=$os or count(sdk:host-os) = 0]/sdk:url"/> - <xsl:choose> - <xsl:when test="starts-with($raw-url, 'http')"> - <xsl:value-of select="$raw-url"/> - </xsl:when> - <xsl:otherwise> - <xsl:text>https://dl.google.com/android/repository/</xsl:text> - <xsl:value-of select="$raw-url"/> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - - <xsl:template match="/sdk:sdk-repository"> -# This file is generated from generate-tools.sh. DO NOT EDIT. -# Execute generate-tools.sh or fetch.sh to update the file. -{ fetchurl }: - -{ - <xsl:for-each select="sdk:build-tool"> - <xsl:sort select="sdk:revision/sdk:major" data-type="number"/> - <xsl:sort select="sdk:revision/sdk:minor" data-type="number"/> - <xsl:sort select="sdk:revision/sdk:micro" data-type="number"/> - <xsl:sort select="sdk:revision/sdk:preview" data-type="number"/> - v<xsl:value-of select="sdk:revision/sdk:major"/><xsl:if test="sdk:revision/sdk:minor + sdk:revision/sdk:micro > 0">_<xsl:value-of select="sdk:revision/sdk:minor" />_<xsl:value-of select="sdk:revision/sdk:micro"/></xsl:if><xsl:if test="sdk:revision/sdk:preview > 0">_rc<xsl:value-of select="sdk:revision/sdk:preview"/></xsl:if> = { - version = "<xsl:value-of select="sdk:revision/sdk:major"/>.<xsl:value-of select="sdk:revision/sdk:minor" />.<xsl:value-of select="sdk:revision/sdk:micro"/><xsl:if test="sdk:revision/sdk:preview > 0">-rc<xsl:value-of select="sdk:revision/sdk:preview"/></xsl:if>"; - src = fetchurl { - url = <xsl:call-template name="repository-url"/>; - sha1 = "<xsl:value-of select="sdk:archives/sdk:archive[sdk:host-os=$os or count(sdk:host-os) = 0]/sdk:checksum[@type='sha1']" />"; - }; - }; -</xsl:for-each> -} -</xsl:template> -</xsl:stylesheet> diff --git a/pkgs/development/mobile/androidenv/generate.sh b/pkgs/development/mobile/androidenv/generate.sh new file mode 100644 index 00000000000..1c55734f5f4 --- /dev/null +++ b/pkgs/development/mobile/androidenv/generate.sh @@ -0,0 +1,16 @@ +#!/bin/sh -e + +# Convert base packages +curl https://dl.google.com/android/repository/repository2-1.xml -o xml/repository2-1.xml +xsltproc convertpackages.xsl xml/repository2-1.xml > generated/packages.nix + +# Convert system images +for img in android android-tv android-wear android-wear-cn google_apis google_apis_playstore +do + curl https://dl.google.com/android/repository/sys-img/$img/sys-img2-1.xml -o xml/$img-sys-img2-1.xml + xsltproc --stringparam imageType $img convertsystemimages.xsl xml/$img-sys-img2-1.xml > generated/system-images-$img.nix +done + +# Convert system addons +curl https://dl.google.com/android/repository/addon2-1.xml -o xml/addon2-1.xml +xsltproc convertaddons.xsl xml/addon2-1.xml > generated/addons.nix diff --git a/pkgs/development/mobile/androidenv/generated/addons.nix b/pkgs/development/mobile/androidenv/generated/addons.nix new file mode 100644 index 00000000000..d902b111665 --- /dev/null +++ b/pkgs/development/mobile/androidenv/generated/addons.nix @@ -0,0 +1,1145 @@ + +{fetchurl}: + +{ + addons = { + + "10"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-10"; + revision = "10"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-10_r02.zip; + sha1 = "cc0711857c881fa7534f90cf8cc09b8fe985484d"; + }; + + }; + }; + + "11"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-11"; + revision = "11"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-11_r01.zip; + sha1 = "5eab5e81addee9f3576d456d205208314b5146a5"; + }; + + }; + }; + + "12"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-12"; + revision = "12"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-12_r01.zip; + sha1 = "e9999f4fa978812174dfeceec0721c793a636e5d"; + }; + + }; + }; + + "13"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-13"; + revision = "13"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-13_r01.zip; + sha1 = "3b153edd211c27dc736c893c658418a4f9041417"; + }; + + }; + }; + + "14"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-14"; + revision = "14"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-14_r02.zip; + sha1 = "f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39"; + }; + + }; + }; + + "15"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-15"; + revision = "15"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-15_r03.zip; + sha1 = "d0d2bf26805eb271693570a1aaec33e7dc3f45e9"; + }; + + }; + }; + + "16"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-16"; + revision = "16"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-16_r04.zip; + sha1 = "ee6acf1b01020bfa8a8e24725dbc4478bee5e792"; + }; + + }; + }; + + "17"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-17"; + revision = "17"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-17_r04.zip; + sha1 = "a076be0677f38df8ca5536b44dfb411a0c808c4f"; + }; + + }; + }; + + "18"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-18"; + revision = "18"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-18_r04.zip; + sha1 = "6109603409debdd40854d4d4a92eaf8481462c8b"; + }; + + }; + }; + + "19"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-19"; + revision = "19"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-19_r20.zip; + sha1 = "5b933abe830b2f25b4c0f171d45e9e0651e56311"; + }; + + }; + }; + + "21"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-21"; + revision = "21"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-21_r01.zip; + sha1 = "66a754efb24e9bb07cc51648426443c7586c9d4a"; + }; + + }; + }; + + "22"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-22"; + revision = "22"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-22_r01.zip; + sha1 = "5def0f42160cba8acff51b9c0c7e8be313de84f5"; + }; + + }; + }; + + "23"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-23"; + revision = "23"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-23_r01.zip; + sha1 = "04c5cc1a7c88967250ebba9561d81e24104167db"; + }; + + }; + }; + + "24"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-24"; + revision = "24"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-24_r1.zip; + sha1 = "31361c2868f27343ee917fbd259c1463821b6145"; + }; + + }; + }; + + "3"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-3"; + revision = "3"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-3-r03.zip; + sha1 = "1f92abf3a76be66ae8032257fc7620acbd2b2e3a"; + }; + + }; + }; + + "4"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-4"; + revision = "4"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-4_r02.zip; + sha1 = "9b6e86d8568558de4d606a7debc4f6049608dbd0"; + }; + + }; + }; + + "5"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-5"; + revision = "5"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-5_r01.zip; + sha1 = "46eaeb56b645ee7ffa24ede8fa17f3df70db0503"; + }; + + }; + }; + + "6"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-6"; + revision = "6"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-6_r01.zip; + sha1 = "5ff545d96e031e09580a6cf55713015c7d4936b2"; + }; + + }; + }; + + "7"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-7"; + revision = "7"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-7_r01.zip; + sha1 = "2e7f91e0fe34fef7f58aeced973c6ae52361b5ac"; + }; + + }; + }; + + "8"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-8"; + revision = "8"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-8_r02.zip; + sha1 = "3079958e7ec87222cac1e6b27bc471b27bf2c352"; + }; + + }; + }; + + "9"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-9"; + revision = "9"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-9_r02.zip; + sha1 = "78664645a1e9accea4430814f8694291a7f1ea5d"; + }; + + }; + }; + + "12"."google_tv_addon" = { + name = "google_tv_addon"; + path = "add-ons/addon-google_tv_addon-google-12"; + revision = "12"; + displayName = "Google TV Addon"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_tv-12_r02.zip; + sha1 = "92128a12e7e8b0fb5bac59153d7779b717e7b840"; + }; + + }; + }; + + "13"."google_tv_addon" = { + name = "google_tv_addon"; + path = "add-ons/addon-google_tv_addon-google-13"; + revision = "13"; + displayName = "Google TV Addon"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_tv-13_r01.zip; + sha1 = "b73f7c66011ac8180b44aa4e83b8d78c66ea9a09"; + }; + + }; + }; + + "25"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-25"; + revision = "25"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-25_r1.zip; + sha1 = "550e83eea9513ab11c44919ac6da54b36084a9f3"; + }; + + }; + }; + + }; + + extras = { + + + "extras;android;gapid;1" = { + name = "extras-android-gapid-1"; + path = "extras/android/gapid/1"; + revision = "1.0.3"; + displayName = "GPU Debugging tools"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/gapid_r01_linux.zip; + sha1 = "7c9ef7544cf0aea030bcc29bd8e12c04fd53e653"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/gapid_r01_osx.zip; + sha1 = "597eb271349d890566274861eba2770a84ee4c69"; + }; + + }; + }; + + + "extras;android;gapid;3" = { + name = "extras-android-gapid-3"; + path = "extras/android/gapid/3"; + revision = "3.1.0"; + displayName = "GPU Debugging tools"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/gapid_2994895_linux.zip; + sha1 = "e40371ba191f617e4e79bc760d0ab2948ba8cf46"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/gapid_2994895_osx.zip; + sha1 = "ad86a2350b7b9908300277bf03d41649659de384"; + }; + + }; + }; + + + "extras;android;m2repository" = { + name = "extras-android-m2repository"; + path = "extras/android/m2repository"; + revision = "47.0.0"; + displayName = "Android Support Repository"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android_m2repository_r47.zip; + sha1 = "a0d22beacc106a6977321f2b07d692ce4979e96a"; + }; + + }; + }; + + + "extras;google;admob_ads_sdk" = { + name = "extras-google-admob_ads_sdk"; + path = "extras/google/admob_ads_sdk"; + revision = "11"; + displayName = "Google AdMob Ads SDK"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/GoogleAdMobAdsSdkAndroid-6.4.1.zip; + sha1 = "0102859d9575baa0bf4fd5eb422af2ad0fe6cb82"; + }; + + }; + }; + + + "extras;google;analytics_sdk_v2" = { + name = "extras-google-analytics_sdk_v2"; + path = "extras/google/analytics_sdk_v2"; + revision = "3"; + displayName = "Google Analytics App Tracking SDK"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/GoogleAnalyticsAndroid_2.0beta5.zip; + sha1 = "dc14026bf0ce78315cb5dd00552607de0894de83"; + }; + + }; + }; + + + "extras;google;auto" = { + name = "extras-google-auto"; + path = "extras/google/auto"; + revision = "1.1"; + displayName = "Android Auto Desktop Head Unit emulator"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/desktop-head-unit-linux_r01.1.zip; + sha1 = "202a6e1b3009a0eb815f8c672d2d5b3717de6169"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/desktop-head-unit-macosx_r01.1.zip; + sha1 = "8179cbb3914493ebc5eb65b731cba061582f2e84"; + }; + + }; + }; + + + "extras;google;gcm" = { + name = "extras-google-gcm"; + path = "extras/google/gcm"; + revision = "3"; + displayName = "Google Cloud Messaging for Android Library"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/gcm_r03.zip; + sha1 = "ad066fd0dc7fc99d8aadac09c65a3c2519fbc7bf"; + }; + + }; + }; + + + "extras;google;google_play_services" = { + name = "extras-google-google_play_services"; + path = "extras/google/google_play_services"; + revision = "49"; + displayName = "Google Play services"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_play_services_v16_1_rc09.zip; + sha1 = "f95bf19634e2ab0430923247fe2c50246432d2e9"; + }; + + }; + }; + + + "extras;google;google_play_services_froyo" = { + name = "extras-google-google_play_services_froyo"; + path = "extras/google/google_play_services_froyo"; + revision = "12"; + displayName = "Google Play services for Froyo"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_play_services_3265130_r12.zip; + sha1 = "92558dbc380bba3d55d0ec181167fb05ce7c79d9"; + }; + + }; + }; + + + "extras;google;instantapps" = { + name = "extras-google-instantapps"; + path = "extras/google/instantapps"; + revision = "1.5.0"; + displayName = "Google Play Instant Development SDK"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/iasdk-1.5.0-1538000167.zip; + sha1 = "6c282b9c686e819fe7f5ac8f2249d2479acb63b4"; + }; + + }; + }; + + + "extras;google;m2repository" = { + name = "extras-google-m2repository"; + path = "extras/google/m2repository"; + revision = "58"; + displayName = "Google Repository"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_m2repository_gms_v11_3_rc05_wear_2_0_5.zip; + sha1 = "05086add9e3a0eb1b67111108d7757a4337c3f10"; + }; + + }; + }; + + + "extras;google;market_apk_expansion" = { + name = "extras-google-market_apk_expansion"; + path = "extras/google/market_apk_expansion"; + revision = "1"; + displayName = "Google Play APK Expansion library"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/market_apk_expansion-r03.zip; + sha1 = "5305399dc1a56814e86b8459ce24871916f78b8c"; + }; + + }; + }; + + + "extras;google;market_licensing" = { + name = "extras-google-market_licensing"; + path = "extras/google/market_licensing"; + revision = "1"; + displayName = "Google Play Licensing Library"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/market_licensing-r02.zip; + sha1 = "355e8dc304a92a5616db235af8ee7bd554356254"; + }; + + }; + }; + + + "extras;google;simulators" = { + name = "extras-google-simulators"; + path = "extras/google/simulators"; + revision = "1"; + displayName = "Android Auto API Simulators"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/simulator_r01.zip; + sha1 = "4fb5344e34e8faab4db18af07dace44c50db26a7"; + }; + + }; + }; + + + "extras;google;usb_driver" = { + name = "extras-google-usb_driver"; + path = "extras/google/usb_driver"; + revision = "11"; + displayName = "Google USB Driver"; + archives = { + + }; + }; + + + "extras;google;webdriver" = { + name = "extras-google-webdriver"; + path = "extras/google/webdriver"; + revision = "2"; + displayName = "Google Web Driver"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/webdriver_r02.zip; + sha1 = "13f3a3b2670a5fc04a7342861644be9a01b07e38"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0"; + revision = "1"; + displayName = "Solver for ConstraintLayout 1.0.0"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0.zip; + sha1 = "b621b9d5adf273bb0725948589863e60e96eeaf1"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha2" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha2"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha2"; + revision = "1"; + displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha2"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha2.zip; + sha1 = "2e7fd5d8d158f4517ba52af824f84466ffede879"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha3" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha3"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha3"; + revision = "1"; + displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha3"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha3.zip; + sha1 = "cd1cbbb2621c9034b835e9b69243dc558cdee4dc"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4"; + revision = "1"; + displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip; + sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha5" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha5"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha5"; + revision = "1"; + displayName = "Solver for ConstraintLayout 1.0.0-alpha5"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha5.zip; + sha1 = "7ba6c82c7645ac023cf45c1e27a6ae3added308a"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha6" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha6"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha6"; + revision = "1"; + displayName = "Solver for ConstraintLayout 1.0.0-alpha6"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha6.zip; + sha1 = "b7e390f940704f4f78e1eaa5f5a5dba3bc3e81ad"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha7" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha7"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha7"; + revision = "1"; + displayName = "Solver for ConstraintLayout 1.0.0-alpha7"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha7.zip; + sha1 = "f08be3c306bf878de31c465e46a266c52014a13f"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha8" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha8"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha8"; + revision = "1"; + displayName = "Solver for ConstraintLayout 1.0.0-alpha8"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha8.zip; + sha1 = "cd13d16a8f0198c1d6040ec8b1d0d4e5bb7feb6a"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha9" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha9"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha9"; + revision = "1"; + displayName = "Solver for ConstraintLayout 1.0.0-alpha9"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha9.zip; + sha1 = "2c52ddd883d83230a17042b8f4ba03669f0f5f40"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta1" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta1"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta1"; + revision = "1"; + displayName = "Solver for ConstraintLayout 1.0.0-beta1"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta1.zip; + sha1 = "042c25575e7650e96f0f5f5d1d3c54ed38eb821a"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta2" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta2"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta2"; + revision = "1"; + displayName = "Solver for ConstraintLayout 1.0.0-beta2"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta2.zip; + sha1 = "28492fd42b20ae1586591ff906556d459cfdaae8"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta3" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta3"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta3"; + revision = "1"; + displayName = "Solver for ConstraintLayout 1.0.0-beta3"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta3.zip; + sha1 = "268e763fa64bd217d8d830e59ce76be19aaba631"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta4" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta4"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta4"; + revision = "1"; + displayName = "Solver for ConstraintLayout 1.0.0-beta4"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta4.zip; + sha1 = "2213bf37e7a2869db2635895b8e90ca6841e79d2"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta5" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta5"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta5"; + revision = "1"; + displayName = "Solver for ConstraintLayout 1.0.0-beta5"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta5.zip; + sha1 = "3918cfef73e64048d0b3e048068e208b414e7e91"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.1"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.1"; + revision = "1"; + displayName = "Solver for ConstraintLayout 1.0.1"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.1.zip; + sha1 = "76f8823def9a6da8954a54737762a6820bc1d043"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.2"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.2"; + revision = "1"; + displayName = "Solver for ConstraintLayout 1.0.2"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.2.zip; + sha1 = "96d7ff669f0e808e9833b2c2e320702826ccc8be"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0"; + revision = "1"; + displayName = "ConstraintLayout for Android 1.0.0"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0.zip; + sha1 = "70acf99689b933bc6735645d5c3d92b91954b6cb"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha2" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha2"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha2"; + revision = "1"; + displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha2"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha2.zip; + sha1 = "2edb4fc33745cc9d69d985f29fd48fefcd0aa9f0"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha3" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha3"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha3"; + revision = "1"; + displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha3"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha3.zip; + sha1 = "1a26fb79d98421f315ead7ad15be167727533026"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4"; + revision = "1"; + displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha4"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip; + sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha5" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha5"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha5"; + revision = "1"; + displayName = "ConstraintLayout for Android 1.0.0-alpha5"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha5.zip; + sha1 = "24f78daf491dcad74bcb2acfa79ea2d8e906f53b"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha6" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha6"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha6"; + revision = "1"; + displayName = "ConstraintLayout for Android 1.0.0-alpha6"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha6.zip; + sha1 = "cb60e9ad4f6d3cc3c5b1b98cd3610c8d3204e651"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha7" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha7"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha7"; + revision = "1"; + displayName = "ConstraintLayout for Android 1.0.0-alpha7"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha7.zip; + sha1 = "17ac210c85d24d7e8ace62847f05e4e45b640b73"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha8" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha8"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha8"; + revision = "1"; + displayName = "ConstraintLayout for Android 1.0.0-alpha8"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha8.zip; + sha1 = "7912ba03b04831f918f523648f118c4ee4da7604"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha9" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha9"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha9"; + revision = "1"; + displayName = "ConstraintLayout for Android 1.0.0-alpha9"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha9.zip; + sha1 = "89c2bbc005d4731c7a830a4d5aa98dae121a46a4"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta1" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta1"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta1"; + revision = "1"; + displayName = "ConstraintLayout for Android 1.0.0-beta1"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta1.zip; + sha1 = "11f2f5cec4ff02986bad75435e5be77b704b4c64"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta2" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta2"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta2"; + revision = "1"; + displayName = "ConstraintLayout for Android 1.0.0-beta2"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta2.zip; + sha1 = "623939865ede2e5c2c975dc55963e0d182bcce95"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta3" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta3"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta3"; + revision = "1"; + displayName = "ConstraintLayout for Android 1.0.0-beta3"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta3.zip; + sha1 = "d78bb6a8ce92005fb1e4ed55d892a65b4258c60b"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta4" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta4"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta4"; + revision = "1"; + displayName = "ConstraintLayout for Android 1.0.0-beta4"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta4.zip; + sha1 = "dc60844aab93a09a54a3c107685a77b18d7c1c39"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta5" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta5"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta5"; + revision = "1"; + displayName = "ConstraintLayout for Android 1.0.0-beta5"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta5.zip; + sha1 = "4660f6c7a576ea1364f0c3225db71c29ca660d9a"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.1"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.1"; + revision = "1"; + displayName = "ConstraintLayout for Android 1.0.1"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.1.zip; + sha1 = "342b0894b8651fff37586f80f383733e97aba9f9"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.2"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.2"; + revision = "1"; + displayName = "ConstraintLayout for Android 1.0.2"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.2.zip; + sha1 = "3d9688a50fe0ed7348275f85d1b02278f616d8a4"; + }; + + }; + }; + + }; +} + \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/generated/packages.nix b/pkgs/development/mobile/androidenv/generated/packages.nix new file mode 100644 index 00000000000..db1f7f1b8d3 --- /dev/null +++ b/pkgs/development/mobile/androidenv/generated/packages.nix @@ -0,0 +1,1910 @@ + +{fetchurl}: + +{ + + "build-tools"."17.0.0" = { + + name = "build-tools"; + path = "build-tools/17.0.0"; + revision = "17.0.0"; + displayName = "Android SDK Build-Tools 17"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r17-linux.zip; + sha1 = "2c2872bc3806aabf16a12e3959c2183ddc866e6d"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r17-macosx.zip; + sha1 = "602ee709be9dbb8f179b1e4075148a57f9419930"; + }; + + }; + }; + + "build-tools"."18.0.1" = { + + name = "build-tools"; + path = "build-tools/18.0.1"; + revision = "18.0.1"; + displayName = "Android SDK Build-Tools 18.0.1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r18.0.1-linux.zip; + sha1 = "f11618492b0d2270c332325d45d752d3656a9640"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r18.0.1-macosx.zip; + sha1 = "d84f5692fb44d60fc53e5b2507cebf9f24626902"; + }; + + }; + }; + + "build-tools"."18.1.0" = { + + name = "build-tools"; + path = "build-tools/18.1.0"; + revision = "18.1.0"; + displayName = "Android SDK Build-Tools 18.1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r18.1-linux.zip; + sha1 = "f314a0599e51397f0886fe888b50dd98f2f050d8"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r18.1-macosx.zip; + sha1 = "16ddb299b8b43063e5bb3387ec17147c5053dfd8"; + }; + + }; + }; + + "build-tools"."18.1.1" = { + + name = "build-tools"; + path = "build-tools/18.1.1"; + revision = "18.1.1"; + displayName = "Android SDK Build-Tools 18.1.1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r18.1.1-linux.zip; + sha1 = "68c9acbfc0cec2d51b19efaed39831a17055d998"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r18.1.1-macosx.zip; + sha1 = "a9d9d37f6ddf859e57abc78802a77aaa166e48d4"; + }; + + }; + }; + + "build-tools"."19.0.0" = { + + name = "build-tools"; + path = "build-tools/19.0.0"; + revision = "19.0.0"; + displayName = "Android SDK Build-Tools 19"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r19-linux.zip; + sha1 = "55c1a6cf632e7d346f0002b275ec41fd3137fd83"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r19-macosx.zip; + sha1 = "86ec1c12db1bc446b7bcaefc5cc14eb361044e90"; + }; + + }; + }; + + "build-tools"."19.0.1" = { + + name = "build-tools"; + path = "build-tools/19.0.1"; + revision = "19.0.1"; + displayName = "Android SDK Build-Tools 19.0.1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r19.0.1-linux.zip; + sha1 = "18d2312dc4368858914213087f4e61445aca4517"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r19.0.1-macosx.zip; + sha1 = "efaf50fb19a3edb8d03efbff76f89a249ad2920b"; + }; + + }; + }; + + "build-tools"."19.0.2" = { + + name = "build-tools"; + path = "build-tools/19.0.2"; + revision = "19.0.2"; + displayName = "Android SDK Build-Tools 19.0.2"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r19.0.2-linux.zip; + sha1 = "a03a6bdea0091aea32e1b35b90a7294c9f04e3dd"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r19.0.2-macosx.zip; + sha1 = "145bc43065d45f756d99d87329d899052b9a9288"; + }; + + }; + }; + + "build-tools"."19.0.3" = { + + name = "build-tools"; + path = "build-tools/19.0.3"; + revision = "19.0.3"; + displayName = "Android SDK Build-Tools 19.0.3"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r19.0.3-linux.zip; + sha1 = "c2d6055478e9d2d4fba476ee85f99181ddd1160c"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r19.0.3-macosx.zip; + sha1 = "651cf8754373b2d52e7f6aab2c52eabffe4e9ea4"; + }; + + }; + }; + + "build-tools"."19.1.0" = { + + name = "build-tools"; + path = "build-tools/19.1.0"; + revision = "19.1.0"; + displayName = "Android SDK Build-Tools 19.1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r19.1-linux.zip; + sha1 = "1ff20ac15fa47a75d00346ec12f180d531b3ca89"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r19.1-macosx.zip; + sha1 = "0d11aae3417de1efb4b9a0e0a7855904a61bcec1"; + }; + + }; + }; + + "build-tools"."20.0.0" = { + + name = "build-tools"; + path = "build-tools/20.0.0"; + revision = "20.0.0"; + displayName = "Android SDK Build-Tools 20"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r20-linux.zip; + sha1 = "b688905526a5584d1327a662d871a635ff502758"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r20-macosx.zip; + sha1 = "1240f629411c108a714c4ddd756937c7fab93f83"; + }; + + }; + }; + + "build-tools"."21.0.0" = { + + name = "build-tools"; + path = "build-tools/21.0.0"; + revision = "21.0.0"; + displayName = "Android SDK Build-Tools 21"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21-linux.zip; + sha1 = "4933328fdeecbd554a29528f254f4993468e1cf4"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21-macosx.zip; + sha1 = "9bef7989b51436bd4e5114d8a0330359f077cbfa"; + }; + + }; + }; + + "build-tools"."21.0.1" = { + + name = "build-tools"; + path = "build-tools/21.0.1"; + revision = "21.0.1"; + displayName = "Android SDK Build-Tools 21.0.1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21.0.1-linux.zip; + sha1 = "e573069eea3e5255e7a65bedeb767f4fd0a5f49a"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21.0.1-macosx.zip; + sha1 = "b60c8f9b810c980abafa04896706f3911be1ade7"; + }; + + }; + }; + + "build-tools"."21.0.2" = { + + name = "build-tools"; + path = "build-tools/21.0.2"; + revision = "21.0.2"; + displayName = "Android SDK Build-Tools 21.0.2"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21.0.2-linux.zip; + sha1 = "e1236ab8897b62b57414adcf04c132567b2612a5"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21.0.2-macosx.zip; + sha1 = "f17471c154058f3734729ef3cc363399b1cd3de1"; + }; + + }; + }; + + "build-tools"."21.1.0" = { + + name = "build-tools"; + path = "build-tools/21.1.0"; + revision = "21.1.0"; + displayName = "Android SDK Build-Tools 21.1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21.1-linux.zip; + sha1 = "b7455e543784d52a8925f960bc880493ed1478cb"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21.1-macosx.zip; + sha1 = "df619356c2359aa5eacdd48699d15b335d9bd246"; + }; + + }; + }; + + "build-tools"."21.1.1" = { + + name = "build-tools"; + path = "build-tools/21.1.1"; + revision = "21.1.1"; + displayName = "Android SDK Build-Tools 21.1.1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21.1.1-linux.zip; + sha1 = "1c712ee3a1ba5a8b0548f9c32f17d4a0ddfd727d"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21.1.1-macosx.zip; + sha1 = "836a146eab0504aa9387a5132e986fe7c7381571"; + }; + + }; + }; + + "build-tools"."21.1.2" = { + + name = "build-tools"; + path = "build-tools/21.1.2"; + revision = "21.1.2"; + displayName = "Android SDK Build-Tools 21.1.2"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21.1.2-linux.zip; + sha1 = "5e35259843bf2926113a38368b08458735479658"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21.1.2-macosx.zip; + sha1 = "e7c906b4ba0eea93b32ba36c610dbd6b204bff48"; + }; + + }; + }; + + "build-tools"."22.0.0" = { + + name = "build-tools"; + path = "build-tools/22.0.0"; + revision = "22.0.0"; + displayName = "Android SDK Build-Tools 22"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r22-linux.zip; + sha1 = "a8a1619dd090e44fac957bce6842e62abf87965b"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r22-macosx.zip; + sha1 = "af95429b24088d704bc5db9bd606e34ac1b82c0d"; + }; + + }; + }; + + "build-tools"."22.0.1" = { + + name = "build-tools"; + path = "build-tools/22.0.1"; + revision = "22.0.1"; + displayName = "Android SDK Build-Tools 22.0.1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r22.0.1-linux.zip; + sha1 = "da8b9c5c3ede39298e6cf0283c000c2ee9029646"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r22.0.1-macosx.zip; + sha1 = "53dad7f608e01d53b17176ba11165acbfccc5bbf"; + }; + + }; + }; + + "build-tools"."23.0.0" = { + + name = "build-tools"; + path = "build-tools/23.0.0"; + revision = "23.0.0"; + displayName = "Android SDK Build-Tools 23"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r23-linux.zip; + sha1 = "c1d6209212b01469f80fa804e0c1d39a06bc9060"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r23-macosx.zip; + sha1 = "90ba6e716f7703a236cd44b2e71c5ff430855a03"; + }; + + }; + }; + + "build-tools"."23.0.1" = { + + name = "build-tools"; + path = "build-tools/23.0.1"; + revision = "23.0.1"; + displayName = "Android SDK Build-Tools 23.0.1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r23.0.1-linux.zip; + sha1 = "b6ba7c399d5fa487d95289d8832e4ad943aed556"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r23.0.1-macosx.zip; + sha1 = "d96ec1522721e9a179ae2c591c99f75d31d39718"; + }; + + }; + }; + + "build-tools"."23.0.2" = { + + name = "build-tools"; + path = "build-tools/23.0.2"; + revision = "23.0.2"; + displayName = "Android SDK Build-Tools 23.0.2"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r23.0.2-linux.zip; + sha1 = "8a9f2b37f6fcf7a9fa784dc21aeaeb41bbb9f2c3"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r23.0.2-macosx.zip; + sha1 = "482c4cbceef8ff58aefd92d8155a38610158fdaf"; + }; + + }; + }; + + "build-tools"."23.0.3" = { + + name = "build-tools"; + path = "build-tools/23.0.3"; + revision = "23.0.3"; + displayName = "Android SDK Build-Tools 23.0.3"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r23.0.3-linux.zip; + sha1 = "368f2600feac7e9b511b82f53d1f2240ae4a91a3"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r23.0.3-macosx.zip; + sha1 = "fbc98cd303fd15a31d472de6c03bd707829f00b0"; + }; + + }; + }; + + "build-tools"."24.0.0" = { + + name = "build-tools"; + path = "build-tools/24.0.0"; + revision = "24.0.0"; + displayName = "Android SDK Build-Tools 24"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r24-linux.zip; + sha1 = "c6271c4d78a5612ea6c7150688bcd5b7313de8d1"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r24-macosx.zip; + sha1 = "97fc4ed442f23989cc488d02c1d1de9bdde241de"; + }; + + }; + }; + + "build-tools"."24.0.1" = { + + name = "build-tools"; + path = "build-tools/24.0.1"; + revision = "24.0.1"; + displayName = "Android SDK Build-Tools 24.0.1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r24.0.1-linux.zip; + sha1 = "84f18c392919a074fcbb9b1d967984e6b2fef8b4"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r24.0.1-macosx.zip; + sha1 = "5c6457fcdfa07724fb086d8ff4e8316fc0742848"; + }; + + }; + }; + + "build-tools"."24.0.2" = { + + name = "build-tools"; + path = "build-tools/24.0.2"; + revision = "24.0.2"; + displayName = "Android SDK Build-Tools 24.0.2"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r24.0.2-linux.zip; + sha1 = "f199a7a788c3fefbed102eea34d6007737b803cf"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r24.0.2-macosx.zip; + sha1 = "8bb8fc575477491d5957de743089df412de55cda"; + }; + + }; + }; + + "build-tools"."24.0.3" = { + + name = "build-tools"; + path = "build-tools/24.0.3"; + revision = "24.0.3"; + displayName = "Android SDK Build-Tools 24.0.3"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r24.0.3-linux.zip; + sha1 = "9e8cc49d66e03fa1a8ecc1ac3e58f1324f5da304"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r24.0.3-macosx.zip; + sha1 = "a01c15f1b105c34595681075e1895d58b3fff48c"; + }; + + }; + }; + + "build-tools"."25.0.0" = { + + name = "build-tools"; + path = "build-tools/25.0.0"; + revision = "25.0.0"; + displayName = "Android SDK Build-Tools 25"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r25-linux.zip; + sha1 = "f2bbda60403e75cabd0f238598c3b4dfca56ea44"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r25-macosx.zip; + sha1 = "273c5c29a65cbed00e44f3aa470bbd7dce556606"; + }; + + }; + }; + + "build-tools"."25.0.1" = { + + name = "build-tools"; + path = "build-tools/25.0.1"; + revision = "25.0.1"; + displayName = "Android SDK Build-Tools 25.0.1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r25.0.1-linux.zip; + sha1 = "ff063d252ab750d339f5947d06ff782836f22bac"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r25.0.1-macosx.zip; + sha1 = "7bf7f22d7d48ef20b6ab0e3d7a2912e5c088340f"; + }; + + }; + }; + + "build-tools"."25.0.2" = { + + name = "build-tools"; + path = "build-tools/25.0.2"; + revision = "25.0.2"; + displayName = "Android SDK Build-Tools 25.0.2"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r25.0.2-linux.zip; + sha1 = "ff953c0177e317618fda40516f3e9d95fd43c7ae"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r25.0.2-macosx.zip; + sha1 = "12a5204bb3b6e39437535469fde7ddf42da46b16"; + }; + + }; + }; + + "build-tools"."25.0.3" = { + + name = "build-tools"; + path = "build-tools/25.0.3"; + revision = "25.0.3"; + displayName = "Android SDK Build-Tools 25.0.3"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r25.0.3-linux.zip; + sha1 = "db95f3a0ae376534d4d69f4cdb6fad20649f3509"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r25.0.3-macosx.zip; + sha1 = "160d2fefb5ce68e443427fc30a793a703b63e26e"; + }; + + }; + }; + + "build-tools"."26.0.0" = { + + name = "build-tools"; + path = "build-tools/26.0.0"; + revision = "26.0.0"; + displayName = "Android SDK Build-Tools 26"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26-linux.zip; + sha1 = "1cbe72929876f8a872ab1f1b1040a9f720261f59"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26-macosx.zip; + sha1 = "d01a1aeca03747245f1f5936b3cb01759c66d086"; + }; + + }; + }; + + "build-tools"."26.0.0-rc1" = { + + name = "build-tools"; + path = "build-tools/26.0.0-rc1"; + revision = "26.0.0-rc1"; + displayName = "Android SDK Build-Tools 26-rc1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26-rc1-linux.zip; + sha1 = "8cd6388dc96db2d7a49d06159cf990d3bbc78d04"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26-rc1-macosx.zip; + sha1 = "5c5a1de7d5f4f000d36ae349229fe0be846d6137"; + }; + + }; + }; + + "build-tools"."26.0.0-rc2" = { + + name = "build-tools"; + path = "build-tools/26.0.0-rc2"; + revision = "26.0.0-rc2"; + displayName = "Android SDK Build-Tools 26-rc2"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26-rc2-linux.zip; + sha1 = "629bbd8d2e415bf64871fb0b4c0540fd6d0347a0"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26-rc2-macosx.zip; + sha1 = "cb1eb738a1f7003025af267a9b8cc2d259533c70"; + }; + + }; + }; + + "build-tools"."26.0.1" = { + + name = "build-tools"; + path = "build-tools/26.0.1"; + revision = "26.0.1"; + displayName = "Android SDK Build-Tools 26.0.1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26.0.1-linux.zip; + sha1 = "5378c2c78091b414d0eac40a6bd37f2faa31a365"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26.0.1-macosx.zip; + sha1 = "cbde59de198916b390777dd0227921bfa2120832"; + }; + + }; + }; + + "build-tools"."26.0.2" = { + + name = "build-tools"; + path = "build-tools/26.0.2"; + revision = "26.0.2"; + displayName = "Android SDK Build-Tools 26.0.2"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26.0.2-linux.zip; + sha1 = "5b2b7b66c7bf2151f2af183b5b50a17808850592"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26.0.2-macosx.zip; + sha1 = "d9ed7c7f149ce38be5dc08979aea8acec1459ca0"; + }; + + }; + }; + + "build-tools"."26.0.3" = { + + name = "build-tools"; + path = "build-tools/26.0.3"; + revision = "26.0.3"; + displayName = "Android SDK Build-Tools 26.0.3"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26.0.3-linux.zip; + sha1 = "8a2e6c1bcd845844523a68aa17e5442f0dce328c"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26.0.3-macosx.zip; + sha1 = "5bb90ed935d99e5bc90686f43b852e68c5ad40df"; + }; + + }; + }; + + "build-tools"."27.0.0" = { + + name = "build-tools"; + path = "build-tools/27.0.0"; + revision = "27.0.0"; + displayName = "Android SDK Build-Tools 27"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r27-linux.zip; + sha1 = "28542332ba97cf4a08c3eddfcf5edd70e3cf1260"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r27-macosx.zip; + sha1 = "fb4e8d7e6b8d29a77090e34024077a80458d5ae1"; + }; + + }; + }; + + "build-tools"."27.0.1" = { + + name = "build-tools"; + path = "build-tools/27.0.1"; + revision = "27.0.1"; + displayName = "Android SDK Build-Tools 27.0.1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r27.0.1-linux.zip; + sha1 = "7f4eedb1077ef948b848040dcd15de9e8a759f4a"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r27.0.1-macosx.zip; + sha1 = "1edd07bfdbadd95652d093040e16d858f7489594"; + }; + + }; + }; + + "build-tools"."27.0.2" = { + + name = "build-tools"; + path = "build-tools/27.0.2"; + revision = "27.0.2"; + displayName = "Android SDK Build-Tools 27.0.2"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r27.0.2-linux.zip; + sha1 = "b687ddf6be84f11607871138aad32cf857d0b837"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r27.0.2-macosx.zip; + sha1 = "6d5d9cf2a47877f273f4b742b19e712a051a31be"; + }; + + }; + }; + + "build-tools"."27.0.3" = { + + name = "build-tools"; + path = "build-tools/27.0.3"; + revision = "27.0.3"; + displayName = "Android SDK Build-Tools 27.0.3"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r27.0.3-linux.zip; + sha1 = "d85e7a6320eddffe7eeace3437605079dac938ca"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r27.0.3-macosx.zip; + sha1 = "61d9fb18790c68d66ff73bf1e7ad56bc1f1eef2d"; + }; + + }; + }; + + "build-tools"."28.0.0" = { + + name = "build-tools"; + path = "build-tools/28.0.0"; + revision = "28.0.0"; + displayName = "Android SDK Build-Tools 28"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28-linux.zip; + sha1 = "d9f8a754d833ccd334f56fcc6089c5925cd82abb"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28-macosx.zip; + sha1 = "72088d32d1d82cc3c2cf7cf6618b6130c0c84ade"; + }; + + }; + }; + + "build-tools"."28.0.0-rc1" = { + + name = "build-tools"; + path = "build-tools/28.0.0-rc1"; + revision = "28.0.0-rc1"; + displayName = "Android SDK Build-Tools 28-rc1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28-rc1-linux.zip; + sha1 = "1601977fae25fd478bcfaa0481ca5ea3c609d840"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28-rc1-macosx.zip; + sha1 = "2c77821967a2330b7b227072d0b1c02ef19fe2fc"; + }; + + }; + }; + + "build-tools"."28.0.0-rc2" = { + + name = "build-tools"; + path = "build-tools/28.0.0-rc2"; + revision = "28.0.0-rc2"; + displayName = "Android SDK Build-Tools 28-rc2"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28-rc2-linux.zip; + sha1 = "efe9c0dde0646a07544c864276390ca6e96b24dc"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28-rc2-macosx.zip; + sha1 = "0d0314b353589feb10e528b44c5a685b6658d797"; + }; + + }; + }; + + "build-tools"."28.0.1" = { + + name = "build-tools"; + path = "build-tools/28.0.1"; + revision = "28.0.1"; + displayName = "Android SDK Build-Tools 28.0.1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28.0.1-linux.zip; + sha1 = "ee70dfa1fccb58b37cebc9544830511f36a137a0"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28.0.1-macosx.zip; + sha1 = "aeef42ad953f1630dd6f5d71eefdc0b825211462"; + }; + + }; + }; + + "build-tools"."28.0.2" = { + + name = "build-tools"; + path = "build-tools/28.0.2"; + revision = "28.0.2"; + displayName = "Android SDK Build-Tools 28.0.2"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28.0.2-linux.zip; + sha1 = "b4492209810a3fd48deaa982f9852fef12433d55"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28.0.2-macosx.zip; + sha1 = "c10dd5a7825578622fb362a8a34f76eb3ba0c0a9"; + }; + + }; + }; + + "build-tools"."28.0.3" = { + + name = "build-tools"; + path = "build-tools/28.0.3"; + revision = "28.0.3"; + displayName = "Android SDK Build-Tools 28.0.3"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28.0.3-linux.zip; + sha1 = "ea6f2f7103cd9da9ff0bdf6e37fbbba548fa4165"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28.0.3-macosx.zip; + sha1 = "f8c333a2991b1ab05a671bc6248b78e00edcd83a"; + }; + + }; + }; + + "cmake"."3.10.2" = { + + name = "cmake"; + path = "cmake/3.10.2.4988404"; + revision = "3.10.2"; + displayName = "CMake 3.10.2.4988404"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/cmake-3.10.2-darwin-x86_64.zip; + sha1 = "f227a85cb53dcb927ac52a5a717f647c4a29bf3b"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/cmake-3.10.2-linux-x86_64.zip; + sha1 = "439e8799bf59f724f104bf62784b2985f1bfe561"; + }; + + }; + }; + + "cmake"."3.6.4111459" = { + + name = "cmake"; + path = "cmake/3.6.4111459"; + revision = "3.6.4111459"; + displayName = "CMake 3.6.4111459"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/cmake-3.6.4111459-darwin-x86_64.zip; + sha1 = "c9b02d630079783c6d67cb91488b622cfcd9765c"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/cmake-3.6.4111459-linux-x86_64.zip; + sha1 = "71c539b9c33f0943e9ad6251fea0b161c0b70782"; + }; + + }; + }; + + "docs"."1" = { + + name = "docs"; + path = "docs"; + revision = "1"; + displayName = "Documentation for Android SDK"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/docs-24_r01.zip; + sha1 = "eef58238949ee9544876cb3e002f2d58e4ee7b5d"; + }; + + }; + }; + + "emulator"."27.3.10".linux = { + + name = "emulator"; + path = "emulator"; + revision = "27.3.10"; + displayName = "Android Emulator"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/emulator-linux-4969155.zip; + sha1 = "5b037b25bc6567fda3071457f0009c057670d9e8"; + }; + + }; + }; + + "emulator"."27.3.10".macosx = { + + name = "emulator"; + path = "emulator"; + revision = "27.3.10"; + displayName = "Android Emulator"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/emulator-darwin-4969155.zip; + sha1 = "28d2b51ee5c84bc544deee433419f33dc9e05b66"; + }; + + }; + }; + + "emulator"."27.3.10".windows = { + + name = "emulator"; + path = "emulator"; + revision = "27.3.10"; + displayName = "Android Emulator"; + archives = { + + }; + }; + + "emulator"."28.0.14".linux = { + + name = "emulator"; + path = "emulator"; + revision = "28.0.14"; + displayName = "Android Emulator"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/emulator-linux-5092175.zip; + sha1 = "062ef9a1f6759481de897d6c5602d9d66e958a0b"; + }; + + }; + }; + + "emulator"."28.0.14".macosx = { + + name = "emulator"; + path = "emulator"; + revision = "28.0.14"; + displayName = "Android Emulator"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/emulator-darwin-5092175.zip; + sha1 = "6dc13599bddd5c2acdb559b25201c92a801d157c"; + }; + + }; + }; + + "emulator"."28.0.14".windows = { + + name = "emulator"; + path = "emulator"; + revision = "28.0.14"; + displayName = "Android Emulator"; + archives = { + + }; + }; + + "lldb"."2.0.2558144" = { + + name = "lldb"; + path = "lldb/2.0"; + revision = "2.0.2558144"; + displayName = "LLDB 2.0"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/lldb-2.0.2558144-darwin-x86_64.zip; + sha1 = "d92e2f4c8284413eed4f27986e62b167d947033c"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/lldb-2.0.2558144-linux-x86_64.zip; + sha1 = "e7060d9b2ba58b28fd7b1a0ea85a151c8371a326"; + }; + + }; + }; + + "lldb"."2.1.2852477" = { + + name = "lldb"; + path = "lldb/2.1"; + revision = "2.1.2852477"; + displayName = "LLDB 2.1"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/lldb-2.1.2852477-darwin-x86_64.zip; + sha1 = "d1e33880a53f1aa8c7e73534adef83a06f091185"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/lldb-2.1.2852477-linux-x86_64.zip; + sha1 = "eb9b96d320210fdfe82495b0597ad43e77f1c240"; + }; + + }; + }; + + "lldb"."2.2.3271982" = { + + name = "lldb"; + path = "lldb/2.2"; + revision = "2.2.3271982"; + displayName = "LLDB 2.2"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/lldb-2.2.3271982-darwin-x86_64.zip; + sha1 = "62089f4e35775e6cedb82d1fa377fdc1de898005"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/lldb-2.2.3271982-linux-x86_64.zip; + sha1 = "413649617d97dd9ef163528f64c0500e1b7c4113"; + }; + + }; + }; + + "lldb"."2.3.3614996" = { + + name = "lldb"; + path = "lldb/2.3"; + revision = "2.3.3614996"; + displayName = "LLDB 2.3"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/lldb-2.3.3614996-darwin-x86_64.zip; + sha1 = "6b0df112c7b9fa41654497fde2fcce990c831e52"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/lldb-2.3.3614996-linux-x86_64.zip; + sha1 = "d7abe655650efe9f6989df31835fa3b3f95c2d13"; + }; + + }; + }; + + "lldb"."3.0.4213617" = { + + name = "lldb"; + path = "lldb/3.0"; + revision = "3.0.4213617"; + displayName = "LLDB 3.0"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/lldb-3.0.4213617-darwin-x86_64.zip; + sha1 = "2492651690a215317b86c755cd4d584ec9838677"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/lldb-3.0.4213617-linux-x86_64.zip; + sha1 = "61d49b6a58953faa61546d631409af5f60d8d9db"; + }; + + }; + }; + + "lldb"."3.1.4508709" = { + + name = "lldb"; + path = "lldb/3.1"; + revision = "3.1.4508709"; + displayName = "LLDB 3.1"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/lldb-3.1.4508709-darwin-x86_64.zip; + sha1 = "2b37aa55b81a7e5b8a369febf1ac0bad6c7c5d58"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/lldb-3.1.4508709-linux-x86_64.zip; + sha1 = "462711c9ee94fec9ff8be5fa8180afec04d1af6f"; + }; + + }; + }; + + "ndk-bundle"."18.1.5063045" = { + + name = "ndk-bundle"; + path = "ndk-bundle"; + revision = "18.1.5063045"; + displayName = "NDK"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r18b-darwin-x86_64.zip; + sha1 = "98cb9909aa8c2dab32db188bbdc3ac6207e09440"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip; + sha1 = "500679655da3a86aecf67007e8ab230ea9b4dd7b"; + }; + + }; + }; + + "patcher"."1" = { + + name = "patcher"; + path = "patcher/v4"; + revision = "1"; + displayName = "SDK Patch Applier v4"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/3534162-studio.sdk-patcher.zip.bak; + sha1 = "046699c5e2716ae11d77e0bad814f7f33fab261e"; + }; + + }; + }; + + "platform-tools"."28.0.1" = { + + name = "platform-tools"; + path = "platform-tools"; + revision = "28.0.1"; + displayName = "Android SDK Platform-Tools"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/platform-tools_r28.0.1-darwin.zip; + sha1 = "ed1edad4a48c27655ce98d0a5821e7296e9de145"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/platform-tools_r28.0.1-linux.zip; + sha1 = "74ff83bc203f01c4f04bd9316ab5a2573f023fd1"; + }; + + }; + }; + + "platforms"."10" = { + + name = "platforms"; + path = "platforms/android-10"; + revision = "10"; + displayName = "Android SDK Platform 10"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android-2.3.3_r02.zip; + sha1 = "887e37783ec32f541ea33c2c649dda648e8e6fb3"; + }; + + }; + }; + + "platforms"."11" = { + + name = "platforms"; + path = "platforms/android-11"; + revision = "11"; + displayName = "Android SDK Platform 11"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android-3.0_r02.zip; + sha1 = "2c7d4bd13f276e76f6bbd87315fe27aba351dd37"; + }; + + }; + }; + + "platforms"."12" = { + + name = "platforms"; + path = "platforms/android-12"; + revision = "12"; + displayName = "Android SDK Platform 12"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android-3.1_r03.zip; + sha1 = "4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf"; + }; + + }; + }; + + "platforms"."13" = { + + name = "platforms"; + path = "platforms/android-13"; + revision = "13"; + displayName = "Android SDK Platform 13"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android-3.2_r01.zip; + sha1 = "6189a500a8c44ae73a439604363de93591163cd9"; + }; + + }; + }; + + "platforms"."14" = { + + name = "platforms"; + path = "platforms/android-14"; + revision = "14"; + displayName = "Android SDK Platform 14"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android-14_r04.zip; + sha1 = "d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c"; + }; + + }; + }; + + "platforms"."15" = { + + name = "platforms"; + path = "platforms/android-15"; + revision = "15"; + displayName = "Android SDK Platform 15"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android-15_r05.zip; + sha1 = "69ab4c443b37184b2883af1fd38cc20cbeffd0f3"; + }; + + }; + }; + + "platforms"."16" = { + + name = "platforms"; + path = "platforms/android-16"; + revision = "16"; + displayName = "Android SDK Platform 16"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android-16_r05.zip; + sha1 = "12a5ce6235a76bc30f62c26bda1b680e336abd07"; + }; + + }; + }; + + "platforms"."17" = { + + name = "platforms"; + path = "platforms/android-17"; + revision = "17"; + displayName = "Android SDK Platform 17"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android-17_r03.zip; + sha1 = "dbe14101c06e6cdb34e300393e64e64f8c92168a"; + }; + + }; + }; + + "platforms"."18" = { + + name = "platforms"; + path = "platforms/android-18"; + revision = "18"; + displayName = "Android SDK Platform 18"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android-18_r03.zip; + sha1 = "e6b09b3505754cbbeb4a5622008b907262ee91cb"; + }; + + }; + }; + + "platforms"."19" = { + + name = "platforms"; + path = "platforms/android-19"; + revision = "19"; + displayName = "Android SDK Platform 19"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android-19_r04.zip; + sha1 = "2ff20d89e68f2f5390981342e009db5a2d456aaa"; + }; + + }; + }; + + "platforms"."2" = { + + name = "platforms"; + path = "platforms/android-2"; + revision = "2"; + displayName = "Android SDK Platform 2"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/android-1.1_r1-linux.zip; + sha1 = "c054d25c9b4c6251fa49c2f9c54336998679d3fe"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-1.1_r1-macosx.zip; + sha1 = "e21dbcff45b7356657449ebb3c7e941be2bb5ebe"; + }; + + }; + }; + + "platforms"."20" = { + + name = "platforms"; + path = "platforms/android-20"; + revision = "20"; + displayName = "Android SDK Platform 20"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android-20_r02.zip; + sha1 = "a9251f8a3f313ab05834a07a963000927637e01d"; + }; + + }; + }; + + "platforms"."21" = { + + name = "platforms"; + path = "platforms/android-21"; + revision = "21"; + displayName = "Android SDK Platform 21"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android-21_r02.zip; + sha1 = "53536556059bb29ae82f414fd2e14bc335a4eb4c"; + }; + + }; + }; + + "platforms"."22" = { + + name = "platforms"; + path = "platforms/android-22"; + revision = "22"; + displayName = "Android SDK Platform 22"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android-22_r02.zip; + sha1 = "5d1bd10fea962b216a0dece1247070164760a9fc"; + }; + + }; + }; + + "platforms"."23" = { + + name = "platforms"; + path = "platforms/android-23"; + revision = "23"; + displayName = "Android SDK Platform 23"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/platform-23_r03.zip; + sha1 = "027fede3de6aa1649115bbd0bffff30ccd51c9a0"; + }; + + }; + }; + + "platforms"."24" = { + + name = "platforms"; + path = "platforms/android-24"; + revision = "24"; + displayName = "Android SDK Platform 24"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/platform-24_r02.zip; + sha1 = "8912da3d4bfe7a9f28f0e5ce92d3a8dc96342aee"; + }; + + }; + }; + + "platforms"."25" = { + + name = "platforms"; + path = "platforms/android-25"; + revision = "25"; + displayName = "Android SDK Platform 25"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/platform-25_r03.zip; + sha1 = "00c2c5765e8988504be10a1eb66ed71fcdbd7fe8"; + }; + + }; + }; + + "platforms"."26" = { + + name = "platforms"; + path = "platforms/android-26"; + revision = "26"; + displayName = "Android SDK Platform 26"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/platform-26_r02.zip; + sha1 = "e4ae5d7aa557a3c827135838ee400da8443ac4ef"; + }; + + }; + }; + + "platforms"."27" = { + + name = "platforms"; + path = "platforms/android-27"; + revision = "27"; + displayName = "Android SDK Platform 27"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/platform-27_r03.zip; + sha1 = "35f747e7e70b2d16e0e4246876be28d15ea1c353"; + }; + + }; + }; + + "platforms"."28" = { + + name = "platforms"; + path = "platforms/android-28"; + revision = "28"; + displayName = "Android SDK Platform 28"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/platform-28_r06.zip; + sha1 = "9a4e52b1d55bd2e24216b150aafae2503d3efba6"; + }; + + }; + }; + + "platforms"."3" = { + + name = "platforms"; + path = "platforms/android-3"; + revision = "3"; + displayName = "Android SDK Platform 3"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/android-1.5_r04-linux.zip; + sha1 = "5c134b7df5f4b8bd5b61ba93bdaebada8fa3468c"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-1.5_r04-macosx.zip; + sha1 = "d3a67c2369afa48b6c3c7624de5031c262018d1e"; + }; + + }; + }; + + "platforms"."4" = { + + name = "platforms"; + path = "platforms/android-4"; + revision = "4"; + displayName = "Android SDK Platform 4"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/android-1.6_r03-linux.zip; + sha1 = "483ed088e45bbdf3444baaf9250c8b02e5383cb0"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-1.6_r03-macosx.zip; + sha1 = "bdafad44f5df9f127979bdb21a1fdd87ee3cd625"; + }; + + }; + }; + + "platforms"."5" = { + + name = "platforms"; + path = "platforms/android-5"; + revision = "5"; + displayName = "Android SDK Platform 5"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/android-2.0_r01-linux.zip; + sha1 = "be9be6a99ca32875c96ec7f91160ca9fce7e3c7d"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-2.0_r01-macosx.zip; + sha1 = "2a866d0870dbba18e0503cd41e5fae988a21b314"; + }; + + }; + }; + + "platforms"."6" = { + + name = "platforms"; + path = "platforms/android-6"; + revision = "6"; + displayName = "Android SDK Platform 6"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/android-2.0.1_r01-linux.zip; + sha1 = "ce2c971dce352aa28af06bda92a070116aa5ae1a"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-2.0.1_r01-macosx.zip; + sha1 = "c3096f80d75a6fc8cb38ef8a18aec920e53d42c0"; + }; + + }; + }; + + "platforms"."7" = { + + name = "platforms"; + path = "platforms/android-7"; + revision = "7"; + displayName = "Android SDK Platform 7"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android-2.1_r03.zip; + sha1 = "5ce51b023ac19f8738500b1007a1da5de2349a1e"; + }; + + }; + }; + + "platforms"."8" = { + + name = "platforms"; + path = "platforms/android-8"; + revision = "8"; + displayName = "Android SDK Platform 8"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android-2.2_r03.zip; + sha1 = "231262c63eefdff8fd0386e9ccfefeb27a8f9202"; + }; + + }; + }; + + "platforms"."9" = { + + name = "platforms"; + path = "platforms/android-9"; + revision = "9"; + displayName = "Android SDK Platform 9"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android-2.3.1_r02.zip; + sha1 = "209f8a7a8b2cb093fce858b8b55fed3ba5206773"; + }; + + }; + }; + + "sources"."14" = { + + name = "sources"; + path = "sources/android-14"; + revision = "14"; + displayName = "Sources for Android 14"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/sources-14_r01.zip; + sha1 = "eaf4ed7dcac46e68516a1b4aa5b0d9e5a39a7555"; + }; + + }; + }; + + "sources"."15" = { + + name = "sources"; + path = "sources/android-15"; + revision = "15"; + displayName = "Sources for Android 15"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/sources-15_r02.zip; + sha1 = "e5992a5747c9590783fbbdd700337bf0c9f6b1fa"; + }; + + }; + }; + + "sources"."16" = { + + name = "sources"; + path = "sources/android-16"; + revision = "16"; + displayName = "Sources for Android 16"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/sources-16_r02.zip; + sha1 = "0f83c14ed333c45d962279ab5d6bc98a0269ef84"; + }; + + }; + }; + + "sources"."17" = { + + name = "sources"; + path = "sources/android-17"; + revision = "17"; + displayName = "Sources for Android 17"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/sources-17_r01.zip; + sha1 = "6f1f18cd2d2b1852d7f6892df9cee3823349d43a"; + }; + + }; + }; + + "sources"."18" = { + + name = "sources"; + path = "sources/android-18"; + revision = "18"; + displayName = "Sources for Android 18"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/sources-18_r01.zip; + sha1 = "8b49fdf7433f4881a2bfb559b5dd05d8ec65fb78"; + }; + + }; + }; + + "sources"."19" = { + + name = "sources"; + path = "sources/android-19"; + revision = "19"; + displayName = "Sources for Android 19"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/sources-19_r02.zip; + sha1 = "433a1d043ef77561571250e94cb7a0ef24a202e7"; + }; + + }; + }; + + "sources"."20" = { + + name = "sources"; + path = "sources/android-20"; + revision = "20"; + displayName = "Sources for Android 20"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/sources-20_r01.zip; + sha1 = "8da3e40f2625f9f7ef38b7e403f49f67226c0d76"; + }; + + }; + }; + + "sources"."21" = { + + name = "sources"; + path = "sources/android-21"; + revision = "21"; + displayName = "Sources for Android 21"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/sources-21_r01.zip; + sha1 = "137a5044915d32bea297a8c1552684802bbc2e25"; + }; + + }; + }; + + "sources"."22" = { + + name = "sources"; + path = "sources/android-22"; + revision = "22"; + displayName = "Sources for Android 22"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/sources-22_r01.zip; + sha1 = "98320e13976d11597a4a730a8d203ac9a03ed5a6"; + }; + + }; + }; + + "sources"."23" = { + + name = "sources"; + path = "sources/android-23"; + revision = "23"; + displayName = "Sources for Android 23"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/sources-23_r01.zip; + sha1 = "b0f15da2762b42f543c5e364c2b15b198cc99cc2"; + }; + + }; + }; + + "sources"."24" = { + + name = "sources"; + path = "sources/android-24"; + revision = "24"; + displayName = "Sources for Android 24"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/sources-24_r01.zip; + sha1 = "6b96115830a83d654479f32ce4b724ca9011148b"; + }; + + }; + }; + + "sources"."25" = { + + name = "sources"; + path = "sources/android-25"; + revision = "25"; + displayName = "Sources for Android 25"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/sources-25_r01.zip; + sha1 = "bbc72efd1a9bad87cc507e308f0d29aad438c52c"; + }; + + }; + }; + + "sources"."26" = { + + name = "sources"; + path = "sources/android-26"; + revision = "26"; + displayName = "Sources for Android 26"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/sources-26_r01.zip; + sha1 = "2af701ee3223d580409288540b1d06932fd8f9b9"; + }; + + }; + }; + + "sources"."27" = { + + name = "sources"; + path = "sources/android-27"; + revision = "27"; + displayName = "Sources for Android 27"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/sources-27_r01.zip; + sha1 = "7b714670561d08f54751af42aca929867b806596"; + }; + + }; + }; + + "sources"."28" = { + + name = "sources"; + path = "sources/android-28"; + revision = "28"; + displayName = "Sources for Android 28"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/sources-28_r01.zip; + sha1 = "5610e0c24235ee3fa343c899ddd551be30315255"; + }; + + }; + }; + + "tools"."25.2.5" = { + + name = "tools"; + path = "tools"; + revision = "25.2.5"; + displayName = "Android SDK Tools 25.2.5"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/tools_r25.2.5-linux.zip; + sha1 = "72df3aa1988c0a9003ccdfd7a13a7b8bd0f47fc1"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/tools_r25.2.5-macosx.zip; + sha1 = "d2168d963ac5b616e3d3ddaf21511d084baf3659"; + }; + + }; + }; + + "tools"."26.1.1" = { + + name = "tools"; + path = "tools"; + revision = "26.1.1"; + displayName = "Android SDK Tools"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/sdk-tools-darwin-4333796.zip; + sha1 = "ed85ea7b59bc3483ce0af4c198523ba044e083ad"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip; + sha1 = "8c7c28554a32318461802c1291d76fccfafde054"; + }; + + }; + }; + +} + \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix b/pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix new file mode 100644 index 00000000000..1aa49545254 --- /dev/null +++ b/pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix @@ -0,0 +1,157 @@ + +{fetchurl}: + +{ + + + "21".android-tv."x86" = { + name = "system-image-21-android-tv-x86"; + path = "system-images/android-21/android-tv/x86"; + revision = "21-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-tv/x86-21_r03.zip; + sha1 = "2f8a1988188d6abfd6c6395baeb4471a034dc1e8"; + + }; + }; + + + "21".android-tv."armeabi-v7a" = { + name = "system-image-21-android-tv-armeabi-v7a"; + path = "system-images/android-21/android-tv/armeabi-v7a"; + revision = "21-android-tv-armeabi-v7a"; + displayName = "Android TV ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-tv/armeabi-v7a-21_r03.zip; + sha1 = "b63e28a47f11b639dd94981a458b7abfa89ac331"; + + }; + }; + + + "22".android-tv."x86" = { + name = "system-image-22-android-tv-x86"; + path = "system-images/android-22/android-tv/x86"; + revision = "22-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-tv/x86-22_r03.zip; + sha1 = "c78efd5a155622eb490be9d326f5783993375c35"; + + }; + }; + + + "23".android-tv."x86" = { + name = "system-image-23-android-tv-x86"; + path = "system-images/android-23/android-tv/x86"; + revision = "23-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-tv/x86-23_r17.zip; + sha1 = "6d42eb8f07e1c49c000e530fdb7de894144ea19b"; + + }; + }; + + + "23".android-tv."armeabi-v7a" = { + name = "system-image-23-android-tv-armeabi-v7a"; + path = "system-images/android-23/android-tv/armeabi-v7a"; + revision = "23-android-tv-armeabi-v7a"; + displayName = "Android TV ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-tv/armeabi-v7a-23_r12.zip; + sha1 = "bd84678ae8caf71d584f5210e866b2807e7b4b52"; + + }; + }; + + + "24".android-tv."x86" = { + name = "system-image-24-android-tv-x86"; + path = "system-images/android-24/android-tv/x86"; + revision = "24-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-tv/x86-24_r19.zip; + sha1 = "478e7073f9fcd588bcce89946aa632fbf302ac6a"; + + }; + }; + + + "25".android-tv."x86" = { + name = "system-image-25-android-tv-x86"; + path = "system-images/android-25/android-tv/x86"; + revision = "25-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-tv/x86-25_r13.zip; + sha1 = "fda1743a87331b43b1ff35cd70f3276ae0b1836d"; + + }; + }; + + + "26".android-tv."x86" = { + name = "system-image-26-android-tv-x86"; + path = "system-images/android-26/android-tv/x86"; + revision = "26-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-tv/x86-26_r11.zip; + sha1 = "5c4b0b3c0b9d04a3364956a7ba31d30c33ea57e7"; + + }; + }; + + + "27".android-tv."x86" = { + name = "system-image-27-android-tv-x86"; + path = "system-images/android-27/android-tv/x86"; + revision = "27-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-tv/x86-27_r06.zip; + sha1 = "6b69f1e95a3db3d973e19a95ab5da1adc7750d54"; + + }; + }; + + + "28".android-tv."x86" = { + name = "system-image-28-android-tv-x86"; + path = "system-images/android-28/android-tv/x86"; + revision = "28-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-tv/x86-28_r07.zip; + sha1 = "3ed7e51036957cf350db7fa128cb485b61cbd061"; + + }; + }; + +} + \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix b/pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix new file mode 100644 index 00000000000..372a751f41c --- /dev/null +++ b/pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix @@ -0,0 +1,67 @@ + +{fetchurl}: + +{ + + + "25".android-wear."armeabi-v7a" = { + name = "system-image-25-android-wear-armeabi-v7a"; + path = "system-images/android-25/android-wear-cn/armeabi-v7a"; + revision = "25-android-wear-armeabi-v7a"; + displayName = "China version of Android Wear ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-wear-cn/armeabi-v7a-25_r04.zip; + sha1 = "02d7bc86df054d1e89fe5856b3af1d2c142cab41"; + + }; + }; + + + "25".android-wear."x86" = { + name = "system-image-25-android-wear-x86"; + path = "system-images/android-25/android-wear-cn/x86"; + revision = "25-android-wear-x86"; + displayName = "China version of Android Wear Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-25_r04.zip; + sha1 = "73eab14c7cf2f6941e1fee61e0038ead7a2c7f4d"; + + }; + }; + + + "26".android-wear."x86" = { + name = "system-image-26-android-wear-x86"; + path = "system-images/android-26/android-wear-cn/x86"; + revision = "26-android-wear-x86"; + displayName = "China version of Android Wear Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-26_r04.zip; + sha1 = "fdc8a313f889a2d6522de1fbc00ee9e13547d096"; + + }; + }; + + + "28".android-wear."x86" = { + name = "system-image-28-android-wear-x86"; + path = "system-images/android-P/android-wear-cn/x86"; + revision = "28-android-wear-x86"; + displayName = "China version of Wear OS Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-P_r02.zip; + sha1 = "a61a2e453a11f77ab15b3e0bf1e017e0bb9d1bcc"; + + }; + }; + +} + \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix b/pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix new file mode 100644 index 00000000000..0c45a1162fe --- /dev/null +++ b/pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix @@ -0,0 +1,97 @@ + +{fetchurl}: + +{ + + + "23".android-wear."armeabi-v7a" = { + name = "system-image-23-android-wear-armeabi-v7a"; + path = "system-images/android-23/android-wear/armeabi-v7a"; + revision = "23-android-wear-armeabi-v7a"; + displayName = "Android Wear ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-wear/armeabi-v7a-23_r06.zip; + sha1 = "0df5d34b1cdaaaa3805a2f06bb889901eabe2e71"; + + }; + }; + + + "23".android-wear."x86" = { + name = "system-image-23-android-wear-x86"; + path = "system-images/android-23/android-wear/x86"; + revision = "23-android-wear-x86"; + displayName = "Android Wear Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-wear/x86-23_r06.zip; + sha1 = "3b15c123f3f71459d5b60c1714d49c5d90a5525e"; + + }; + }; + + + "25".android-wear."armeabi-v7a" = { + name = "system-image-25-android-wear-armeabi-v7a"; + path = "system-images/android-25/android-wear/armeabi-v7a"; + revision = "25-android-wear-armeabi-v7a"; + displayName = "Android Wear ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-wear/armeabi-v7a-25_r03.zip; + sha1 = "76d3568a4e08023047af7d13025a35c9bf1d7e5c"; + + }; + }; + + + "25".android-wear."x86" = { + name = "system-image-25-android-wear-x86"; + path = "system-images/android-25/android-wear/x86"; + revision = "25-android-wear-x86"; + displayName = "Android Wear Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-wear/x86-25_r03.zip; + sha1 = "693fce7b487a65491a4e88e9f740959688c9dbe6"; + + }; + }; + + + "26".android-wear."x86" = { + name = "system-image-26-android-wear-x86"; + path = "system-images/android-26/android-wear/x86"; + revision = "26-android-wear-x86"; + displayName = "Android Wear Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-wear/x86-26_r04.zip; + sha1 = "fbffa91b936ca18fcc1e0bab2b52a8b0835cbb1c"; + + }; + }; + + + "28".android-wear."x86" = { + name = "system-image-28-android-wear-x86"; + path = "system-images/android-P/android-wear/x86"; + revision = "28-android-wear-x86"; + displayName = "Wear OS Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-wear/x86-P_r02.zip; + sha1 = "cd0d3a56e114dbb0a2a77d58942d344db464b514"; + + }; + }; + +} + \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android.nix b/pkgs/development/mobile/androidenv/generated/system-images-android.nix new file mode 100644 index 00000000000..915cceec546 --- /dev/null +++ b/pkgs/development/mobile/androidenv/generated/system-images-android.nix @@ -0,0 +1,547 @@ + +{fetchurl}: + +{ + + + "10".default."armeabi-v7a" = { + name = "system-image-10-default-armeabi-v7a"; + path = "system-images/android-10/default/armeabi-v7a"; + revision = "10-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/armv7-10_r04.zip; + sha1 = "54680383118eb5c95a11e1cc2a14aa572c86ee69"; + + }; + }; + + + "14".default."armeabi-v7a" = { + name = "system-image-14-default-armeabi-v7a"; + path = "system-images/android-14/default/armeabi-v7a"; + revision = "14-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-14_r02.zip; + sha1 = "d8991b0c06b18d7d6ed4169d67460ee1add6661b"; + + }; + }; + + + "15".default."armeabi-v7a" = { + name = "system-image-15-default-armeabi-v7a"; + path = "system-images/android-15/default/armeabi-v7a"; + revision = "15-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-15_r04.zip; + sha1 = "363223bd62f5afc0b2bd760b54ce9d26b31eacf1"; + + }; + }; + + + "16".default."armeabi-v7a" = { + name = "system-image-16-default-armeabi-v7a"; + path = "system-images/android-16/default/armeabi-v7a"; + revision = "16-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-16_r04.zip; + sha1 = "39c093ea755098f0ee79f607be7df9e54ba4943f"; + + }; + }; + + + "17".default."armeabi-v7a" = { + name = "system-image-17-default-armeabi-v7a"; + path = "system-images/android-17/default/armeabi-v7a"; + revision = "17-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-17_r05.zip; + sha1 = "7460e8110f4a87f9644f1bdb5511a66872d50fd9"; + + }; + }; + + + "18".default."armeabi-v7a" = { + name = "system-image-18-default-armeabi-v7a"; + path = "system-images/android-18/default/armeabi-v7a"; + revision = "18-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-18_r04.zip; + sha1 = "0bf34ecf4ddd53f6b1b7fe7dfa12f2887c17e642"; + + }; + }; + + + "19".default."armeabi-v7a" = { + name = "system-image-19-default-armeabi-v7a"; + path = "system-images/android-19/default/armeabi-v7a"; + revision = "19-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-19_r05.zip; + sha1 = "d1a5fd4f2e1c013c3d3d9bfe7e9db908c3ed56fa"; + + }; + }; + + + "21".default."armeabi-v7a" = { + name = "system-image-21-default-armeabi-v7a"; + path = "system-images/android-21/default/armeabi-v7a"; + revision = "21-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-21_r04.zip; + sha1 = "8c606f81306564b65e41303d2603e4c42ded0d10"; + + }; + }; + + + "22".default."armeabi-v7a" = { + name = "system-image-22-default-armeabi-v7a"; + path = "system-images/android-22/default/armeabi-v7a"; + revision = "22-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-22_r02.zip; + sha1 = "2114ec015dbf3a16cbcb4f63e8a84a1b206a07a1"; + + }; + }; + + + "23".default."armeabi-v7a" = { + name = "system-image-23-default-armeabi-v7a"; + path = "system-images/android-23/default/armeabi-v7a"; + revision = "23-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-23_r06.zip; + sha1 = "7cf2ad756e54a3acfd81064b63cb0cb9dff2798d"; + + }; + }; + + + "24".default."armeabi-v7a" = { + name = "system-image-24-default-armeabi-v7a"; + path = "system-images/android-24/default/armeabi-v7a"; + revision = "24-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-24_r07.zip; + sha1 = "3454546b4eed2d6c3dd06d47757d6da9f4176033"; + + }; + }; + + + "24".default."arm64-v8a" = { + name = "system-image-24-default-arm64-v8a"; + path = "system-images/android-24/default/arm64-v8a"; + revision = "24-default-arm64-v8a"; + displayName = "ARM 64 v8a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/arm64-v8a-24_r07.zip; + sha1 = "e8ab2e49e4efe4b064232b33b5eeaded61437d7f"; + + }; + }; + + + "16".default."mips" = { + name = "system-image-16-default-mips"; + path = "system-images/android-16/default/mips"; + revision = "16-default-mips"; + displayName = "MIPS System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/sysimg_mips-16_r04.zip; + sha1 = "67943c54fb3943943ffeb05fdd39c0b753681f6e"; + + }; + }; + + + "17".default."mips" = { + name = "system-image-17-default-mips"; + path = "system-images/android-17/default/mips"; + revision = "17-default-mips"; + displayName = "MIPS System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/sysimg_mips-17_r01.zip; + sha1 = "f0c6e153bd584c29e51b5c9723cfbf30f996a05d"; + + }; + }; + + + "10".default."x86" = { + name = "system-image-10-default-x86"; + path = "system-images/android-10/default/x86"; + revision = "10-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86-10_r04.zip; + sha1 = "655ffc5cc89dd45a3aca154b254009016e473aeb"; + + }; + }; + + + "15".default."x86" = { + name = "system-image-15-default-x86"; + path = "system-images/android-15/default/x86"; + revision = "15-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86-15_r04.zip; + sha1 = "e45c728b64881c0e86529a8f7ea9c103a3cd14c1"; + + }; + }; + + + "16".default."x86" = { + name = "system-image-16-default-x86"; + path = "system-images/android-16/default/x86"; + revision = "16-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86-16_r06.zip; + sha1 = "bf1bf8c5591346118d2235da1ad20e7be8a3e9cd"; + + }; + }; + + + "17".default."x86" = { + name = "system-image-17-default-x86"; + path = "system-images/android-17/default/x86"; + revision = "17-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86-17_r04.zip; + sha1 = "03c6d022ab2dcbbcf655d78ba5ccb0431cadcaec"; + + }; + }; + + + "18".default."x86" = { + name = "system-image-18-default-x86"; + path = "system-images/android-18/default/x86"; + revision = "18-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86-18_r03.zip; + sha1 = "03a0cb23465c3de15215934a1dbc9715b56e9458"; + + }; + }; + + + "19".default."x86" = { + name = "system-image-19-default-x86"; + path = "system-images/android-19/default/x86"; + revision = "19-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86-19_r06.zip; + sha1 = "2ac82153aae97f7eae4c5a0761224fe04321d03d"; + + }; + }; + + + "21".default."x86" = { + name = "system-image-21-default-x86"; + path = "system-images/android-21/default/x86"; + revision = "21-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86-21_r05.zip; + sha1 = "00f0eb0a1003efe3316347f762e20a85d8749cff"; + + }; + }; + + + "22".default."x86" = { + name = "system-image-22-default-x86"; + path = "system-images/android-22/default/x86"; + revision = "22-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86-22_r06.zip; + sha1 = "e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e"; + + }; + }; + + + "23".default."x86" = { + name = "system-image-23-default-x86"; + path = "system-images/android-23/default/x86"; + revision = "23-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86-23_r10.zip; + sha1 = "f6c3e3dd7bd951454795aa75c3a145fd05ac25bb"; + + }; + }; + + + "24".default."x86" = { + name = "system-image-24-default-x86"; + path = "system-images/android-24/default/x86"; + revision = "24-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86-24_r08.zip; + sha1 = "c1cae7634b0216c0b5990f2c144eb8ca948e3511"; + + }; + }; + + + "25".default."x86" = { + name = "system-image-25-default-x86"; + path = "system-images/android-25/default/x86"; + revision = "25-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86-25_r01.zip; + sha1 = "78ce7eb1387d598685633b9f7cbb300c3d3aeb5f"; + + }; + }; + + + "26".default."x86" = { + name = "system-image-26-default-x86"; + path = "system-images/android-26/default/x86"; + revision = "26-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86-26_r01.zip; + sha1 = "e613d6e0da668e30daf547f3c6627a6352846f90"; + + }; + }; + + + "27".default."x86" = { + name = "system-image-27-default-x86"; + path = "system-images/android-27/default/x86"; + revision = "27-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86-27_r01.zip; + sha1 = "4ec990fac7b62958decd12e18a4cd389dfe7c582"; + + }; + }; + + + "28".default."x86" = { + name = "system-image-28-default-x86"; + path = "system-images/android-28/default/x86"; + revision = "28-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86-28_r04.zip; + sha1 = "ce03c42d80c0fc6dc47f6455dbee7aa275d02780"; + + }; + }; + + + "21".default."x86_64" = { + name = "system-image-21-default-x86_64"; + path = "system-images/android-21/default/x86_64"; + revision = "21-default-x86_64"; + displayName = "Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86_64-21_r05.zip; + sha1 = "9078a095825a69e5e215713f0866c83cef65a342"; + + }; + }; + + + "22".default."x86_64" = { + name = "system-image-22-default-x86_64"; + path = "system-images/android-22/default/x86_64"; + revision = "22-default-x86_64"; + displayName = "Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86_64-22_r06.zip; + sha1 = "5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4"; + + }; + }; + + + "23".default."x86_64" = { + name = "system-image-23-default-x86_64"; + path = "system-images/android-23/default/x86_64"; + revision = "23-default-x86_64"; + displayName = "Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86_64-23_r10.zip; + sha1 = "7cbc291483ca07dc67b71268c5f08a5755f50f51"; + + }; + }; + + + "24".default."x86_64" = { + name = "system-image-24-default-x86_64"; + path = "system-images/android-24/default/x86_64"; + revision = "24-default-x86_64"; + displayName = "Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86_64-24_r08.zip; + sha1 = "f6559e1949a5879f31a9662f4f0e50ad60181684"; + + }; + }; + + + "25".default."x86_64" = { + name = "system-image-25-default-x86_64"; + path = "system-images/android-25/default/x86_64"; + revision = "25-default-x86_64"; + displayName = "Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86_64-25_r01.zip; + sha1 = "7093d7b39216020226ff430a3b7b81c94d31ad37"; + + }; + }; + + + "26".default."x86_64" = { + name = "system-image-26-default-x86_64"; + path = "system-images/android-26/default/x86_64"; + revision = "26-default-x86_64"; + displayName = "Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86_64-26_r01.zip; + sha1 = "432f149c048bffce7f9de526ec65b336daf7a0a3"; + + }; + }; + + + "27".default."x86_64" = { + name = "system-image-27-default-x86_64"; + path = "system-images/android-27/default/x86_64"; + revision = "27-default-x86_64"; + displayName = "Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86_64-27_r01.zip; + sha1 = "2878261011a59ca3de29dc5b457a495fdb268d60"; + + }; + }; + + + "28".default."x86_64" = { + name = "system-image-28-default-x86_64"; + path = "system-images/android-28/default/x86_64"; + revision = "28-default-x86_64"; + displayName = "Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86_64-28_r04.zip; + sha1 = "d47a85c8f4e9fd57df97814ad8884eeb0f3a0ef0"; + + }; + }; + +} + \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix b/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix new file mode 100644 index 00000000000..3b0303b86b4 --- /dev/null +++ b/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix @@ -0,0 +1,502 @@ + +{fetchurl}: + +{ + + + "10".google_apis."armeabi-v7a" = { + name = "system-image-10-google_apis-armeabi-v7a"; + path = "system-images/android-10/google_apis/armeabi-v7a"; + revision = "10-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-10_r05.zip; + sha1 = "cb60221d4ff6686ae96560970d48d9aa60e80b3f"; + + }; + }; + + + "10".google_apis."x86" = { + name = "system-image-10-google_apis-x86"; + path = "system-images/android-10/google_apis/x86"; + revision = "10-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86-10_r05.zip; + sha1 = "b8e8a4ab26890c4a395fb796bf9cb7ceb51c880e"; + + }; + }; + + + "15".google_apis."armeabi-v7a" = { + name = "system-image-15-google_apis-armeabi-v7a"; + path = "system-images/android-15/google_apis/armeabi-v7a"; + revision = "15-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-15_r05.zip; + sha1 = "1ec4e6f9014fcbe694511280f5b497aaf7dd750f"; + + }; + }; + + + "15".google_apis."x86" = { + name = "system-image-15-google_apis-x86"; + path = "system-images/android-15/google_apis/x86"; + revision = "15-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86-15_r05.zip; + sha1 = "f2b98baaf847ff5b82b82fdc6c396b229067307b"; + + }; + }; + + + "16".google_apis."x86" = { + name = "system-image-16-google_apis-x86"; + path = "system-images/android-16/google_apis/x86"; + revision = "16-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86-16_r05.zip; + sha1 = "7edc5c0836fa32f8d453788c002ca0ee1bc5a0a2"; + + }; + }; + + + "17".google_apis."armeabi-v7a" = { + name = "system-image-17-google_apis-armeabi-v7a"; + path = "system-images/android-17/google_apis/armeabi-v7a"; + revision = "17-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-17_r05.zip; + sha1 = "c990f2a81c24a61f9f1da5d5d205f2924ce548ae"; + + }; + }; + + + "17".google_apis."x86" = { + name = "system-image-17-google_apis-x86"; + path = "system-images/android-17/google_apis/x86"; + revision = "17-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86-17_r06.zip; + sha1 = "7864c34faf0402b8923d8c6e609a5339f74cc8d6"; + + }; + }; + + + "18".google_apis."armeabi-v7a" = { + name = "system-image-18-google_apis-armeabi-v7a"; + path = "system-images/android-18/google_apis/armeabi-v7a"; + revision = "18-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-18_r05.zip; + sha1 = "c4e69a96d4584f7e311e358fe4ad0e5d1bf1605b"; + + }; + }; + + + "18".google_apis."x86" = { + name = "system-image-18-google_apis-x86"; + path = "system-images/android-18/google_apis/x86"; + revision = "18-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86-18_r05.zip; + sha1 = "2b34741693eba9419cb6bf1a467596783234d37a"; + + }; + }; + + + "19".google_apis."x86" = { + name = "system-image-19-google_apis-x86"; + path = "system-images/android-19/google_apis/x86"; + revision = "19-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86-19_r37.zip; + sha1 = "f02473420a166b3df7821d8ae5a623524058b4b8"; + + }; + }; + + + "19".google_apis."armeabi-v7a" = { + name = "system-image-19-google_apis-armeabi-v7a"; + path = "system-images/android-19/google_apis/armeabi-v7a"; + revision = "19-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-19_r37.zip; + sha1 = "b388072493ed010fe2ddf607c8c4239f54ce1a0b"; + + }; + }; + + + "21".google_apis."x86" = { + name = "system-image-21-google_apis-x86"; + path = "system-images/android-21/google_apis/x86"; + revision = "21-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86-21_r29.zip; + sha1 = "1f5ac49e0ae603b0bfeda0c94cd7e0b850b9b50e"; + + }; + }; + + + "21".google_apis."x86_64" = { + name = "system-image-21-google_apis-x86_64"; + path = "system-images/android-21/google_apis/x86_64"; + revision = "21-google_apis-x86_64"; + displayName = "Google APIs Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86_64-21_r29.zip; + sha1 = "74ac387aec286fcee01259dcccd4762cbdb4b517"; + + }; + }; + + + "21".google_apis."armeabi-v7a" = { + name = "system-image-21-google_apis-armeabi-v7a"; + path = "system-images/android-21/google_apis/armeabi-v7a"; + revision = "21-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-21_r29.zip; + sha1 = "1d0c428ac7f5eb49c7389ad0beb09f07cb989b45"; + + }; + }; + + + "22".google_apis."x86" = { + name = "system-image-22-google_apis-x86"; + path = "system-images/android-22/google_apis/x86"; + revision = "22-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86-22_r23.zip; + sha1 = "4ceda9ffd69d5b827a8cc2f56ccac62e72982b33"; + + }; + }; + + + "22".google_apis."armeabi-v7a" = { + name = "system-image-22-google_apis-armeabi-v7a"; + path = "system-images/android-22/google_apis/armeabi-v7a"; + revision = "22-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-22_r23.zip; + sha1 = "0a11bdffa6132303baf87e4a531987a74d5f0792"; + + }; + }; + + + "22".google_apis."x86_64" = { + name = "system-image-22-google_apis-x86_64"; + path = "system-images/android-22/google_apis/x86_64"; + revision = "22-google_apis-x86_64"; + displayName = "Google APIs Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86_64-22_r23.zip; + sha1 = "1dfee1c382574c18e3aa2bc2047793169f3ab125"; + + }; + }; + + + "23".google_apis."x86" = { + name = "system-image-23-google_apis-x86"; + path = "system-images/android-23/google_apis/x86"; + revision = "23-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86-23_r30.zip; + sha1 = "1b8fd61e7e7c76d8c05a41b19370edfb015ed240"; + + }; + }; + + + "23".google_apis."x86_64" = { + name = "system-image-23-google_apis-x86_64"; + path = "system-images/android-23/google_apis/x86_64"; + revision = "23-google_apis-x86_64"; + displayName = "Google APIs Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86_64-23_r30.zip; + sha1 = "69a17c23c4e05e81a2820fe49884807fcebba546"; + + }; + }; + + + "23".google_apis."armeabi-v7a" = { + name = "system-image-23-google_apis-armeabi-v7a"; + path = "system-images/android-23/google_apis/armeabi-v7a"; + revision = "23-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-23_r30.zip; + sha1 = "c3966e3a25623a915902d879f90f6d9253dbb619"; + + }; + }; + + + "24".google_apis."x86" = { + name = "system-image-24-google_apis-x86"; + path = "system-images/android-24/google_apis/x86"; + revision = "24-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86-24_r24.zip; + sha1 = "7a1adb4aa13946830763644d014fc9c6cc1f921d"; + + }; + }; + + + "24".google_apis."x86_64" = { + name = "system-image-24-google_apis-x86_64"; + path = "system-images/android-24/google_apis/x86_64"; + revision = "24-google_apis-x86_64"; + displayName = "Google APIs Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86_64-24_r24.zip; + sha1 = "53b26e8868c7cd27dda31c71ee2bcf999d6b9ce2"; + + }; + }; + + + "24".google_apis."armeabi-v7a" = { + name = "system-image-24-google_apis-armeabi-v7a"; + path = "system-images/android-24/google_apis/armeabi-v7a"; + revision = "24-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-24_r24.zip; + sha1 = "85068d55673bbf9417db8d70107ceed0952b5a28"; + + }; + }; + + + "24".google_apis."arm64-v8a" = { + name = "system-image-24-google_apis-arm64-v8a"; + path = "system-images/android-24/google_apis/arm64-v8a"; + revision = "24-google_apis-arm64-v8a"; + displayName = "Google APIs ARM 64 v8a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-24_r24.zip; + sha1 = "93ab33d90fcdbb30ca2e927cd3eea447e933dfd9"; + + }; + }; + + + "25".google_apis."x86" = { + name = "system-image-25-google_apis-x86"; + path = "system-images/android-25/google_apis/x86"; + revision = "25-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86-25_r15.zip; + sha1 = "5948473077341265a0b21a53a7e0afc2f980187c"; + + }; + }; + + + "25".google_apis."x86_64" = { + name = "system-image-25-google_apis-x86_64"; + path = "system-images/android-25/google_apis/x86_64"; + revision = "25-google_apis-x86_64"; + displayName = "Google APIs Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86_64-25_r15.zip; + sha1 = "5a81fc218a7fe82cc6af01f7fae54a8000900443"; + + }; + }; + + + "25".google_apis."armeabi-v7a" = { + name = "system-image-25-google_apis-armeabi-v7a"; + path = "system-images/android-25/google_apis/armeabi-v7a"; + revision = "25-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-25_r15.zip; + sha1 = "813e25f9a5f6d775670ed6c5e67a39bffa1411bf"; + + }; + }; + + + "25".google_apis."arm64-v8a" = { + name = "system-image-25-google_apis-arm64-v8a"; + path = "system-images/android-25/google_apis/arm64-v8a"; + revision = "25-google_apis-arm64-v8a"; + displayName = "Google APIs ARM 64 v8a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-25_r15.zip; + sha1 = "c3049e32f031140757f71acb5b8f0179e6f27303"; + + }; + }; + + + "26".google_apis."x86" = { + name = "system-image-26-google_apis-x86"; + path = "system-images/android-26/google_apis/x86"; + revision = "26-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86-26_r12.zip; + sha1 = "167c83bcfd87127c7376ce986b34701f74fe87ff"; + + }; + }; + + + "26".google_apis."x86_64" = { + name = "system-image-26-google_apis-x86_64"; + path = "system-images/android-26/google_apis/x86_64"; + revision = "26-google_apis-x86_64"; + displayName = "Google APIs Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86_64-26_r12.zip; + sha1 = "fcd46121c3486e2a759d0707c015e0b12bbab9db"; + + }; + }; + + + "27".google_apis."x86" = { + name = "system-image-27-google_apis-x86"; + path = "system-images/android-27/google_apis/x86"; + revision = "27-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86-27_r08.zip; + sha1 = "623ee2638713b7dfde8044c91280c2afad5a1ade"; + + }; + }; + + + "28".google_apis."x86" = { + name = "system-image-28-google_apis-x86"; + path = "system-images/android-28/google_apis/x86"; + revision = "28-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86-28_r07.zip; + sha1 = "fe5d58355545ae82b0e6a55adc1d41573ac7dec1"; + + }; + }; + + + "28".google_apis."x86_64" = { + name = "system-image-28-google_apis-x86_64"; + path = "system-images/android-28/google_apis/x86_64"; + revision = "28-google_apis-x86_64"; + displayName = "Google APIs Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86_64-28_r07.zip; + sha1 = "068468683a56725326f741f75b6913ee1e7955ff"; + + }; + }; + +} + \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix b/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix new file mode 100644 index 00000000000..a8bea61ff54 --- /dev/null +++ b/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix @@ -0,0 +1,97 @@ + +{fetchurl}: + +{ + + + "24".google_apis_playstore."x86" = { + name = "system-image-24-google_apis_playstore-x86"; + path = "system-images/android-24/google_apis_playstore/x86"; + revision = "24-google_apis_playstore-x86"; + displayName = "Google Play Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-24_r19.zip; + sha1 = "b52e9593ffdde65c1a0970256a32e8967c89cc22"; + + }; + }; + + + "25".google_apis_playstore."x86" = { + name = "system-image-25-google_apis_playstore-x86"; + path = "system-images/android-25/google_apis_playstore/x86"; + revision = "25-google_apis_playstore-x86"; + displayName = "Google Play Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-25_r09.zip; + sha1 = "6f6668954f7fd52f896fe7528aa122028c9b026c"; + + }; + }; + + + "26".google_apis_playstore."x86" = { + name = "system-image-26-google_apis_playstore-x86"; + path = "system-images/android-26/google_apis_playstore/x86"; + revision = "26-google_apis_playstore-x86"; + displayName = "Google Play Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-26_r07.zip; + sha1 = "2c8bee7b97a309f099941532e63c42a7d4a06e19"; + + }; + }; + + + "27".google_apis_playstore."x86" = { + name = "system-image-27-google_apis_playstore-x86"; + path = "system-images/android-27/google_apis_playstore/x86"; + revision = "27-google_apis_playstore-x86"; + displayName = "Google Play Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-27_r03.zip; + sha1 = "eb5a944ceb691ca0648d0a6f0d93893a47223b5d"; + + }; + }; + + + "28".google_apis_playstore."x86" = { + name = "system-image-28-google_apis_playstore-x86"; + path = "system-images/android-28/google_apis_playstore/x86"; + revision = "28-google_apis_playstore-x86"; + displayName = "Google Play Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-28_r05.zip; + sha1 = "4c570d259e93b0b27f97bad1aca2ac47f1e9b51a"; + + }; + }; + + + "28".google_apis_playstore."x86_64" = { + name = "system-image-28-google_apis_playstore-x86_64"; + path = "system-images/android-28/google_apis_playstore/x86_64"; + revision = "28-google_apis_playstore-x86_64"; + displayName = "Google Play Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-28_r05.zip; + sha1 = "5f6b238e4c7de41fd2a1c66841093bcf517255a1"; + + }; + }; + +} + \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/lldb.nix b/pkgs/development/mobile/androidenv/lldb.nix new file mode 100644 index 00000000000..d812a679c02 --- /dev/null +++ b/pkgs/development/mobile/androidenv/lldb.nix @@ -0,0 +1,12 @@ +{deployAndroidPackage, lib, package, os, autoPatchelfHook, pkgs}: + +deployAndroidPackage { + inherit package os; + buildInputs = [ autoPatchelfHook ] + ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.zlib pkgs.openssl.out pkgs.ncurses5 ]; + patchInstructions = lib.optionalString (os == "linux") '' + addAutoPatchelfSearchPath $packageBaseDir/lib + autoPatchelf $packageBaseDir/lib + autoPatchelf $packageBaseDir/bin + ''; +} diff --git a/pkgs/development/mobile/androidenv/make-standalone-toolchain_r10e.patch b/pkgs/development/mobile/androidenv/make-standalone-toolchain_r10e.patch deleted file mode 100644 index 5eeadbbd12d..00000000000 --- a/pkgs/development/mobile/androidenv/make-standalone-toolchain_r10e.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru android-ndk-r10c.old/build/tools/make-standalone-toolchain.sh android-ndk-r10c/build/tools/make-standalone-toolchain.sh ---- android-ndk-r10c.old/build/tools/make-standalone-toolchain.sh 2014-10-16 03:46:32.000000000 +0200 -+++ android-ndk-r10c/build/tools/make-standalone-toolchain.sh 2014-10-24 23:46:22.544928306 +0200 -@@ -310,6 +310,9 @@ - # Now copy the GCC toolchain prebuilt binaries - run copy_directory "$TOOLCHAIN_PATH" "$TMPDIR" - -+# Making it writable again -+chmod -R +w "$TMPDIR" -+ - # Replace soft-link mcld by real file - ALL_LDS=`find $TMPDIR -name "*mcld"` - for LD in $ALL_LDS; do diff --git a/pkgs/development/mobile/androidenv/make-standalone-toolchain_r8e.patch b/pkgs/development/mobile/androidenv/make-standalone-toolchain_r8e.patch deleted file mode 100644 index 4a9f9a4a9dd..00000000000 --- a/pkgs/development/mobile/androidenv/make-standalone-toolchain_r8e.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru android-ndk-r8e.old/build/tools/make-standalone-toolchain.sh android-ndk-r8e/build/tools/make-standalone-toolchain.sh ---- android-ndk-r8e.old/build/tools/make-standalone-toolchain.sh 2014-10-16 03:46:32.000000000 +0200 -+++ android-ndk-r8e/build/tools/make-standalone-toolchain.sh 2014-10-24 23:46:22.544928306 +0200 -@@ -194,6 +194,9 @@ - # Now copy the GCC toolchain prebuilt binaries - run copy_directory "$TOOLCHAIN_PATH" "$TMPDIR" - -+# Making it writable again -+chmod -R +w "$TMPDIR" -+ - if [ -n "$LLVM_VERSION" ]; then - # Copy the clang/llvm toolchain prebuilt binaries - run copy_directory "$LLVM_TOOLCHAIN_PATH" "$TMPDIR" diff --git a/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_16b.patch b/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_16b.patch deleted file mode 100644 index 70b1f7e7f4a..00000000000 --- a/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_16b.patch +++ /dev/null @@ -1,119 +0,0 @@ -diff --git a/build/tools/make_standalone_toolchain.py b/build/tools/make_standalone_toolchain.py -index a6ae8448..2739912e 100755 ---- a/build/tools/make_standalone_toolchain.py -+++ b/build/tools/make_standalone_toolchain.py -@@ -398,7 +398,9 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - sysroot_path, stl, host_tag): - """Create a standalone toolchain.""" - copy_directory_contents(gcc_path, install_path) -+ os.system('chmod -R +w "{}"'.format(install_path)) - copy_directory_contents(clang_path, install_path) -+ os.system('chmod -R +w "{}"'.format(install_path)) - triple = get_triple(arch) - make_clang_scripts( - install_path, triple, api, host_tag.startswith('windows')) -@@ -406,23 +408,28 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - sysroot = os.path.join(NDK_DIR, 'sysroot') - install_sysroot = os.path.join(install_path, 'sysroot') - shutil.copytree(sysroot, install_sysroot) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - arch_headers = os.path.join(sysroot, 'usr/include', triple) - copy_directory_contents( - arch_headers, os.path.join(install_sysroot, 'usr/include')) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - lib_path = os.path.join(sysroot_path, 'usr/lib') - lib_install = os.path.join(install_sysroot, 'usr/lib') - if os.path.exists(lib_path): - shutil.copytree(lib_path, lib_install) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - lib64_path = os.path.join(sysroot_path, 'usr/lib64') - lib64_install = os.path.join(install_sysroot, 'usr/lib64') - if os.path.exists(lib64_path): - shutil.copytree(lib64_path, lib64_install) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - prebuilt_path = os.path.join(NDK_DIR, 'prebuilt', host_tag) - copy_directory_contents(prebuilt_path, install_path) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - toolchain_lib_dir = os.path.join(gcc_path, 'lib/gcc', triple) - dirs = os.listdir(toolchain_lib_dir) -@@ -444,29 +451,37 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - if stl == 'gnustl': - gnustl_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/gnu-libstdc++/4.9') - shutil.copytree(os.path.join(gnustl_dir, 'include'), cxx_headers) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - for abi in get_abis(arch): - copy_gnustl_abi_headers(gnustl_dir, install_path, gcc_ver, triple, - abi) -+ os.system('chmod -R +w "{}"'.format(install_path)) - copy_gnustl_libs(gnustl_dir, install_path, triple, abi) -+ os.system('chmod -R +w "{}"'.format(install_path)) - if arch == 'arm': - copy_gnustl_abi_headers(gnustl_dir, install_path, gcc_ver, - triple, abi, thumb=True) -+ os.system('chmod -R +w "{}"'.format(install_path)) - copy_gnustl_libs(gnustl_dir, install_path, triple, abi, - thumb=True) -+ os.system('chmod -R +w "{}"'.format(install_path)) - elif stl == 'libc++': - libcxx_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/llvm-libc++') - libcxxabi_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/llvm-libc++abi') - support_dir = os.path.join(NDK_DIR, 'sources/android/support') - copy_directory_contents(os.path.join(libcxx_dir, 'include'), - cxx_headers) -+ os.system('chmod -R +w "{}"'.format(install_path)) - copy_directory_contents(os.path.join(support_dir, 'include'), - support_headers) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - # I have no idea why we need this, but the old one does it too. - copy_directory_contents( - os.path.join(libcxxabi_dir, 'include'), - os.path.join(install_path, 'include/llvm-libc++abi/include')) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - headers = [ - 'cxxabi.h', -@@ -482,21 +497,25 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - dest_libdir = get_dest_libdir(install_path, triple, abi) - include_libunwind = arch == 'arm' - copy_libcxx_libs(src_libdir, dest_libdir, include_libunwind) -+ os.system('chmod -R +w "{}"'.format(install_path)) - if arch == 'arm': - thumb_libdir = os.path.join(dest_libdir, 'thumb') - copy_libcxx_libs(src_libdir, thumb_libdir, include_libunwind) -+ os.system('chmod -R +w "{}"'.format(install_path)) - elif stl == 'stlport': - stlport_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/stlport') - gabixx_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/gabi++') - - copy_directory_contents( - os.path.join(stlport_dir, 'stlport'), cxx_headers) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - # Same as for libc++. Not sure why we have this extra directory, but - # keep the cruft for diff. - copy_directory_contents( - os.path.join(gabixx_dir, 'include'), - os.path.join(install_path, 'include/gabi++/include')) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - headers = [ - 'cxxabi.h', -@@ -512,9 +531,11 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - - for abi in get_abis(arch): - copy_stlport_libs(stlport_dir, install_path, triple, abi) -+ os.system('chmod -R +w "{}"'.format(install_path)) - if arch == 'arm': - copy_stlport_libs(stlport_dir, install_path, triple, abi, - thumb=True) -+ os.system('chmod -R +w "{}"'.format(install_path)) - else: - raise ValueError(stl) - diff --git a/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_17c.patch b/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_17c.patch deleted file mode 100644 index 88ce69be3e8..00000000000 --- a/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_17c.patch +++ /dev/null @@ -1,119 +0,0 @@ -diff --git a/build/tools/make_standalone_toolchain.py b/build/tools/make_standalone_toolchain.py -index daba3351..424b7fef 100755 ---- a/build/tools/make_standalone_toolchain.py -+++ b/build/tools/make_standalone_toolchain.py -@@ -421,7 +421,9 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - platforms_path, stl, host_tag): - """Create a standalone toolchain.""" - copy_directory_contents(gcc_path, install_path) -+ os.system('chmod -R +w "{}"'.format(install_path)) - copy_directory_contents(clang_path, install_path) -+ os.system('chmod -R +w "{}"'.format(install_path)) - triple = get_triple(arch) - make_clang_scripts( - install_path, triple, api, host_tag.startswith('windows')) -@@ -432,9 +434,11 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - install_headers = os.path.join(install_sysroot, 'usr/include') - os.makedirs(os.path.dirname(install_headers)) - shutil.copytree(headers, install_headers) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - arch_headers = os.path.join(sysroot, 'usr/include', triple) - copy_directory_contents(arch_headers, os.path.join(install_headers)) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - for lib_suffix in ('', '64'): - lib_path = os.path.join(platforms_path, 'usr/lib{}'.format(lib_suffix)) -@@ -442,20 +446,24 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - install_sysroot, 'usr/lib{}'.format(lib_suffix)) - if os.path.exists(lib_path): - shutil.copytree(lib_path, lib_install) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - static_lib_path = os.path.join(sysroot, 'usr/lib', triple) - static_lib_install = os.path.join(install_sysroot, 'usr/lib') - if arch == 'x86_64': - static_lib_install += '64' - copy_directory_contents(static_lib_path, static_lib_install) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - prebuilt_path = os.path.join(NDK_DIR, 'prebuilt', host_tag) - copy_directory_contents(prebuilt_path, install_path) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - gdbserver_path = os.path.join( - NDK_DIR, 'prebuilt', 'android-' + arch, 'gdbserver') - gdbserver_install = os.path.join(install_path, 'share', 'gdbserver') - shutil.copytree(gdbserver_path, gdbserver_install) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - toolchain_lib_dir = os.path.join(gcc_path, 'lib/gcc', triple) - dirs = os.listdir(toolchain_lib_dir) -@@ -481,26 +489,33 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - for abi in get_abis(arch): - copy_gnustl_abi_headers(gnustl_dir, install_path, gcc_ver, triple, - abi) -+ os.system('chmod -R +w "{}"'.format(install_path)) - copy_gnustl_libs(gnustl_dir, install_path, triple, abi) -+ os.system('chmod -R +w "{}"'.format(install_path)) - if arch == 'arm': - copy_gnustl_abi_headers(gnustl_dir, install_path, gcc_ver, - triple, abi, thumb=True) -+ os.system('chmod -R +w "{}"'.format(install_path)) - copy_gnustl_libs(gnustl_dir, install_path, triple, abi, - thumb=True) -+ os.system('chmod -R +w "{}"'.format(install_path)) - elif stl == 'libc++': - libcxx_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/llvm-libc++') - libcxxabi_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/llvm-libc++abi') - copy_directory_contents(os.path.join(libcxx_dir, 'include'), - cxx_headers) -+ os.system('chmod -R +w "{}"'.format(install_path)) - if api < 21: - support_dir = os.path.join(NDK_DIR, 'sources/android/support') - copy_directory_contents(os.path.join(support_dir, 'include'), - support_headers) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - # I have no idea why we need this, but the old one does it too. - copy_directory_contents( - os.path.join(libcxxabi_dir, 'include'), - os.path.join(install_path, 'include/llvm-libc++abi/include')) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - headers = [ - 'cxxabi.h', -@@ -515,21 +530,25 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - src_libdir = get_src_libdir(libcxx_dir, abi) - dest_libdir = get_dest_libdir(install_path, triple, abi) - copy_libcxx_libs(src_libdir, dest_libdir, abi, api) -+ os.system('chmod -R +w "{}"'.format(install_path)) - if arch == 'arm': - thumb_libdir = os.path.join(dest_libdir, 'thumb') - copy_libcxx_libs(src_libdir, thumb_libdir, abi, api) -+ os.system('chmod -R +w "{}"'.format(install_path)) - elif stl == 'stlport': - stlport_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/stlport') - gabixx_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/gabi++') - - copy_directory_contents( - os.path.join(stlport_dir, 'stlport'), cxx_headers) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - # Same as for libc++. Not sure why we have this extra directory, but - # keep the cruft for diff. - copy_directory_contents( - os.path.join(gabixx_dir, 'include'), - os.path.join(install_path, 'include/gabi++/include')) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - headers = [ - 'cxxabi.h', -@@ -548,6 +567,7 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - if arch == 'arm': - copy_stlport_libs(stlport_dir, install_path, triple, abi, - thumb=True) -+ os.system('chmod -R +w "{}"'.format(install_path)) - else: - raise ValueError(stl) - diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix new file mode 100644 index 00000000000..5d70a9f0a1c --- /dev/null +++ b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -0,0 +1,51 @@ +{deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, platform-tools}: + +let + runtime_paths = lib.makeBinPath [ pkgs.coreutils pkgs.file pkgs.findutils pkgs.gawk pkgs.gnugrep pkgs.gnused pkgs.jdk pkgs.python3 pkgs.which ] + ":${platform-tools}/platform-tools"; +in +deployAndroidPackage { + inherit package os; + buildInputs = [ autoPatchelfHook makeWrapper pkgs.python2 ] + ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.ncurses5 pkgs.zlib pkgs.libcxx.out ]; + patchInstructions = lib.optionalString (os == "linux") '' + patchShebangs . + + patch -p1 \ + --no-backup-if-mismatch < ${./make_standalone_toolchain.py_18.patch} + wrapProgram $(pwd)/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}" + + # TODO: allow this stuff + rm -rf docs tests + + # Patch the executables of the toolchains, but not the libraries -- they are needed for crosscompiling + + addAutoPatchelfSearchPath $out/libexec/android-sdk/ndk-bundle/toolchains/renderscript/prebuilt/linux-x86_64/lib64 + find toolchains -type d -name bin | while read dir + do + autoPatchelf "$dir" + done + + # fix ineffective PROGDIR / MYNDKDIR determination + for i in ndk-build + do + sed -i -e 's|^PROGDIR=`dirname $0`|PROGDIR=`dirname $(readlink -f $(which $0))`|' $i + done + + # Patch executables + autoPatchelf prebuilt/linux-x86_64 + + # wrap + for i in ndk-build + do + wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}" + done + + # make some executables available in PATH + mkdir -p $out/bin + for i in ndk-build + do + ln -sf ../../libexec/android-sdk/ndk-bundle/$i $out/bin/$i + done + ''; + noAuditTmpdir = true; # Audit script gets invoked by the build/ component in the path for the make standalone script +} diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/make_standalone_toolchain.py_18.patch b/pkgs/development/mobile/androidenv/ndk-bundle/make_standalone_toolchain.py_18.patch new file mode 100644 index 00000000000..7af2d44a0f2 --- /dev/null +++ b/pkgs/development/mobile/androidenv/ndk-bundle/make_standalone_toolchain.py_18.patch @@ -0,0 +1,44 @@ +diff -Naur android-ndk-r18b/build/tools/make_standalone_toolchain.py android-ndk-r18b-new/build/tools/make_standalone_toolchain.py +--- android-ndk-r18b/build/tools/make_standalone_toolchain.py 2018-10-11 12:49:38.000000000 +0200 ++++ android-ndk-r18b-new/build/tools/make_standalone_toolchain.py 2018-11-20 21:55:52.689991420 +0100 +@@ -30,7 +30,7 @@ + import sys + import tempfile + import textwrap +- ++import subprocess + + THIS_DIR = os.path.realpath(os.path.dirname(__file__)) + NDK_DIR = os.path.realpath(os.path.join(THIS_DIR, '../..')) +@@ -173,6 +173,7 @@ + logger().debug('Copying %s', src_file) + shutil.copy2(src_file, dst_dir) + ++ subprocess.check_call(["chmod", "-R", "+w", dst]) + + def make_clang_scripts(install_dir, triple, api, windows): + """Creates Clang wrapper scripts. +@@ -365,6 +366,7 @@ + install_headers = os.path.join(install_sysroot, 'usr/include') + os.makedirs(os.path.dirname(install_headers)) + shutil.copytree(headers, install_headers) ++ subprocess.check_call(["chmod", "-R", "+w", install_path]) + + arch_headers = os.path.join(sysroot, 'usr/include', triple) + copy_directory_contents(arch_headers, os.path.join(install_headers)) +@@ -375,6 +377,7 @@ + install_sysroot, 'usr/lib{}'.format(lib_suffix)) + if os.path.exists(lib_path): + shutil.copytree(lib_path, lib_install) ++ subprocess.check_call(["chmod", "-R", "+w", install_path]) + + static_lib_path = os.path.join(sysroot, 'usr/lib', triple) + static_lib_install = os.path.join(install_sysroot, 'usr/lib') +@@ -389,6 +392,7 @@ + NDK_DIR, 'prebuilt', 'android-' + arch, 'gdbserver') + gdbserver_install = os.path.join(install_path, 'share', 'gdbserver') + shutil.copytree(gdbserver_path, gdbserver_install) ++ subprocess.check_call(["chmod", "-R", "+w", install_path]) + + toolchain_lib_dir = os.path.join(gcc_path, 'lib/gcc', triple) + dirs = os.listdir(toolchain_lib_dir) diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index 2cfb11bffbc..9d2f6eb6075 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -1,51 +1,19 @@ -{ buildPackages, pkgs }: +{deployAndroidPackage, lib, package, os, autoPatchelfHook, pkgs}: -let - inherit (buildPackages) fetchurl unzip; - inherit (pkgs) stdenv zlib; -in - -stdenv.mkDerivation rec { - version = "28.0.1"; - name = "android-platform-tools-r${version}"; - src = if (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") - then fetchurl { - url = "https://dl.google.com/android/repository/platform-tools_r${version}-linux.zip"; - sha256 = "14kkr9xib5drjjd0bclm0jn3f5xlmlg652mbv4xd83cv7a53a49y"; - } - else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl { - url = "https://dl.google.com/android/repository/platform-tools_r${version}-darwin.zip"; - sha256 = "117syrddq1haicwyjzd1p4pfphj0wldjs7w10fpk3n2b7yp37j1v"; - } - else throw "System ${stdenv.hostPlatform.system} not supported!"; - - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - cd platform-tools - - ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") - '' - for i in adb dmtracedump e2fsdroid fastboot hprof-conv make_f2fs mke2fs sload_f2fs sqlite3 - do - patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib:`pwd`/lib64 $i - done - - for i in etc1tool - do - patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib:${zlib.out}/lib:`pwd`/lib64 $i - done - ''} +deployAndroidPackage { + inherit package os; + buildInputs = [ autoPatchelfHook ] + ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 ]; + patchInstructions = lib.optionalString (os == "linux") '' + addAutoPatchelfSearchPath $packageBaseDir/lib64 + autoPatchelf --no-recurse $packageBaseDir/lib64 + autoPatchelf --no-recurse $packageBaseDir mkdir -p $out/bin - for i in adb fastboot + cd $out/bin + find $out/libexec/android-sdk/platform-tools -type f -executable -mindepth 1 -maxdepth 1 -not -name sqlite3 | while read i do - ln -sf $out/platform-tools/$i $out/bin/$i + ln -s $i done ''; - - nativeBuildInputs = [ unzip ]; } diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix deleted file mode 100644 index dbb295f8cf5..00000000000 --- a/pkgs/development/mobile/androidenv/platforms-linux.nix +++ /dev/null @@ -1,343 +0,0 @@ - -# This file is generated from generate-platforms.sh. DO NOT EDIT. -# Execute generate-platforms.sh or fetch.sh to update the file. -{stdenv, fetchurl, unzip}: - -let - buildPlatform = args: - stdenv.mkDerivation (args // { - buildInputs = [ unzip ]; - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - }); -in -{ - - platform_2 = buildPlatform { - name = "android-platform-1.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-1.1_r1-linux.zip; - sha1 = "c054d25c9b4c6251fa49c2f9c54336998679d3fe"; - }; - meta = { - description = "Android SDK Platform 2"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_3 = buildPlatform { - name = "android-platform-1.5"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-1.5_r04-linux.zip; - sha1 = "5c134b7df5f4b8bd5b61ba93bdaebada8fa3468c"; - }; - meta = { - description = "Android SDK Platform 3"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_4 = buildPlatform { - name = "android-platform-1.6"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-1.6_r03-linux.zip; - sha1 = "483ed088e45bbdf3444baaf9250c8b02e5383cb0"; - }; - meta = { - description = "Android SDK Platform 4"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_5 = buildPlatform { - name = "android-platform-2.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-2.0_r01-linux.zip; - sha1 = "be9be6a99ca32875c96ec7f91160ca9fce7e3c7d"; - }; - meta = { - description = "Android SDK Platform 5"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_6 = buildPlatform { - name = "android-platform-2.0.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-2.0.1_r01-linux.zip; - sha1 = "ce2c971dce352aa28af06bda92a070116aa5ae1a"; - }; - meta = { - description = "Android SDK Platform 6"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_7 = buildPlatform { - name = "android-platform-2.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-2.1_r03.zip; - sha1 = "5ce51b023ac19f8738500b1007a1da5de2349a1e"; - }; - meta = { - description = "Android SDK Platform 7"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_8 = buildPlatform { - name = "android-platform-2.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-2.2_r03.zip; - sha1 = "231262c63eefdff8fd0386e9ccfefeb27a8f9202"; - }; - meta = { - description = "Android SDK Platform 8"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_9 = buildPlatform { - name = "android-platform-2.3.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-2.3.1_r02.zip; - sha1 = "209f8a7a8b2cb093fce858b8b55fed3ba5206773"; - }; - meta = { - description = "Android SDK Platform 9"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_10 = buildPlatform { - name = "android-platform-2.3.3"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-2.3.3_r02.zip; - sha1 = "887e37783ec32f541ea33c2c649dda648e8e6fb3"; - }; - meta = { - description = "Android SDK Platform 10"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_11 = buildPlatform { - name = "android-platform-3.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-3.0_r02.zip; - sha1 = "2c7d4bd13f276e76f6bbd87315fe27aba351dd37"; - }; - meta = { - description = "Android SDK Platform 11"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_12 = buildPlatform { - name = "android-platform-3.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-3.1_r03.zip; - sha1 = "4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf"; - }; - meta = { - description = "Android SDK Platform 12"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_13 = buildPlatform { - name = "android-platform-3.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-3.2_r01.zip; - sha1 = "6189a500a8c44ae73a439604363de93591163cd9"; - }; - meta = { - description = "Android SDK Platform 13"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_14 = buildPlatform { - name = "android-platform-4.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-14_r04.zip; - sha1 = "d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c"; - }; - meta = { - description = "Android SDK Platform 14"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_15 = buildPlatform { - name = "android-platform-4.0.3"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-15_r05.zip; - sha1 = "69ab4c443b37184b2883af1fd38cc20cbeffd0f3"; - }; - meta = { - description = "Android SDK Platform 15"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_16 = buildPlatform { - name = "android-platform-4.1.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-16_r05.zip; - sha1 = "12a5ce6235a76bc30f62c26bda1b680e336abd07"; - }; - meta = { - description = "Android SDK Platform 16"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_17 = buildPlatform { - name = "android-platform-4.2.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-17_r03.zip; - sha1 = "dbe14101c06e6cdb34e300393e64e64f8c92168a"; - }; - meta = { - description = "Android SDK Platform 17"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_18 = buildPlatform { - name = "android-platform-4.3.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-18_r03.zip; - sha1 = "e6b09b3505754cbbeb4a5622008b907262ee91cb"; - }; - meta = { - description = "Android SDK Platform 18"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_19 = buildPlatform { - name = "android-platform-4.4.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-19_r04.zip; - sha1 = "2ff20d89e68f2f5390981342e009db5a2d456aaa"; - }; - meta = { - description = "Android SDK Platform 19"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_20 = buildPlatform { - name = "android-platform-4.4W.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-20_r02.zip; - sha1 = "a9251f8a3f313ab05834a07a963000927637e01d"; - }; - meta = { - description = "Android SDK Platform 20"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_21 = buildPlatform { - name = "android-platform-5.0.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-21_r02.zip; - sha1 = "53536556059bb29ae82f414fd2e14bc335a4eb4c"; - }; - meta = { - description = "Android SDK Platform 21"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_22 = buildPlatform { - name = "android-platform-5.1.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-22_r02.zip; - sha1 = "5d1bd10fea962b216a0dece1247070164760a9fc"; - }; - meta = { - description = "Android SDK Platform 22"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_23 = buildPlatform { - name = "android-platform-6.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/platform-23_r03.zip; - sha1 = "027fede3de6aa1649115bbd0bffff30ccd51c9a0"; - }; - meta = { - description = "Android SDK Platform 23"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_24 = buildPlatform { - name = "android-platform-7.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/platform-24_r02.zip; - sha1 = "8912da3d4bfe7a9f28f0e5ce92d3a8dc96342aee"; - }; - meta = { - description = "Android SDK Platform 24"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_25 = buildPlatform { - name = "android-platform-7.1.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/platform-25_r03.zip; - sha1 = "00c2c5765e8988504be10a1eb66ed71fcdbd7fe8"; - }; - meta = { - description = "Android SDK Platform 25"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_26 = buildPlatform { - name = "android-platform-8.0.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/platform-26_r02.zip; - sha1 = "e4ae5d7aa557a3c827135838ee400da8443ac4ef"; - }; - meta = { - description = "Android SDK Platform 26"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_27 = buildPlatform { - name = "android-platform-8.1.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/platform-27_r03.zip; - sha1 = "35f747e7e70b2d16e0e4246876be28d15ea1c353"; - }; - meta = { - description = "Android SDK Platform 27"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_28 = buildPlatform { - name = "android-platform-9"; - src = fetchurl { - url = https://dl.google.com/android/repository/platform-28_r06.zip; - sha1 = "9a4e52b1d55bd2e24216b150aafae2503d3efba6"; - }; - meta = { - description = "Android SDK Platform 28"; - homepage = http://developer.android.com/sdk/; - }; - }; - -} diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix deleted file mode 100644 index 30ed94e516a..00000000000 --- a/pkgs/development/mobile/androidenv/platforms-macosx.nix +++ /dev/null @@ -1,343 +0,0 @@ - -# This file is generated from generate-platforms.sh. DO NOT EDIT. -# Execute generate-platforms.sh or fetch.sh to update the file. -{stdenv, fetchurl, unzip}: - -let - buildPlatform = args: - stdenv.mkDerivation (args // { - buildInputs = [ unzip ]; - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - }); -in -{ - - platform_2 = buildPlatform { - name = "android-platform-1.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-1.1_r1-macosx.zip; - sha1 = "e21dbcff45b7356657449ebb3c7e941be2bb5ebe"; - }; - meta = { - description = "Android SDK Platform 2"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_3 = buildPlatform { - name = "android-platform-1.5"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-1.5_r04-macosx.zip; - sha1 = "d3a67c2369afa48b6c3c7624de5031c262018d1e"; - }; - meta = { - description = "Android SDK Platform 3"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_4 = buildPlatform { - name = "android-platform-1.6"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-1.6_r03-macosx.zip; - sha1 = "bdafad44f5df9f127979bdb21a1fdd87ee3cd625"; - }; - meta = { - description = "Android SDK Platform 4"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_5 = buildPlatform { - name = "android-platform-2.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-2.0_r01-macosx.zip; - sha1 = "2a866d0870dbba18e0503cd41e5fae988a21b314"; - }; - meta = { - description = "Android SDK Platform 5"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_6 = buildPlatform { - name = "android-platform-2.0.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-2.0.1_r01-macosx.zip; - sha1 = "c3096f80d75a6fc8cb38ef8a18aec920e53d42c0"; - }; - meta = { - description = "Android SDK Platform 6"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_7 = buildPlatform { - name = "android-platform-2.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-2.1_r03.zip; - sha1 = "5ce51b023ac19f8738500b1007a1da5de2349a1e"; - }; - meta = { - description = "Android SDK Platform 7"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_8 = buildPlatform { - name = "android-platform-2.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-2.2_r03.zip; - sha1 = "231262c63eefdff8fd0386e9ccfefeb27a8f9202"; - }; - meta = { - description = "Android SDK Platform 8"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_9 = buildPlatform { - name = "android-platform-2.3.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-2.3.1_r02.zip; - sha1 = "209f8a7a8b2cb093fce858b8b55fed3ba5206773"; - }; - meta = { - description = "Android SDK Platform 9"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_10 = buildPlatform { - name = "android-platform-2.3.3"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-2.3.3_r02.zip; - sha1 = "887e37783ec32f541ea33c2c649dda648e8e6fb3"; - }; - meta = { - description = "Android SDK Platform 10"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_11 = buildPlatform { - name = "android-platform-3.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-3.0_r02.zip; - sha1 = "2c7d4bd13f276e76f6bbd87315fe27aba351dd37"; - }; - meta = { - description = "Android SDK Platform 11"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_12 = buildPlatform { - name = "android-platform-3.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-3.1_r03.zip; - sha1 = "4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf"; - }; - meta = { - description = "Android SDK Platform 12"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_13 = buildPlatform { - name = "android-platform-3.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-3.2_r01.zip; - sha1 = "6189a500a8c44ae73a439604363de93591163cd9"; - }; - meta = { - description = "Android SDK Platform 13"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_14 = buildPlatform { - name = "android-platform-4.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-14_r04.zip; - sha1 = "d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c"; - }; - meta = { - description = "Android SDK Platform 14"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_15 = buildPlatform { - name = "android-platform-4.0.3"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-15_r05.zip; - sha1 = "69ab4c443b37184b2883af1fd38cc20cbeffd0f3"; - }; - meta = { - description = "Android SDK Platform 15"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_16 = buildPlatform { - name = "android-platform-4.1.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-16_r05.zip; - sha1 = "12a5ce6235a76bc30f62c26bda1b680e336abd07"; - }; - meta = { - description = "Android SDK Platform 16"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_17 = buildPlatform { - name = "android-platform-4.2.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-17_r03.zip; - sha1 = "dbe14101c06e6cdb34e300393e64e64f8c92168a"; - }; - meta = { - description = "Android SDK Platform 17"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_18 = buildPlatform { - name = "android-platform-4.3.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-18_r03.zip; - sha1 = "e6b09b3505754cbbeb4a5622008b907262ee91cb"; - }; - meta = { - description = "Android SDK Platform 18"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_19 = buildPlatform { - name = "android-platform-4.4.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-19_r04.zip; - sha1 = "2ff20d89e68f2f5390981342e009db5a2d456aaa"; - }; - meta = { - description = "Android SDK Platform 19"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_20 = buildPlatform { - name = "android-platform-4.4W.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-20_r02.zip; - sha1 = "a9251f8a3f313ab05834a07a963000927637e01d"; - }; - meta = { - description = "Android SDK Platform 20"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_21 = buildPlatform { - name = "android-platform-5.0.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-21_r02.zip; - sha1 = "53536556059bb29ae82f414fd2e14bc335a4eb4c"; - }; - meta = { - description = "Android SDK Platform 21"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_22 = buildPlatform { - name = "android-platform-5.1.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-22_r02.zip; - sha1 = "5d1bd10fea962b216a0dece1247070164760a9fc"; - }; - meta = { - description = "Android SDK Platform 22"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_23 = buildPlatform { - name = "android-platform-6.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/platform-23_r03.zip; - sha1 = "027fede3de6aa1649115bbd0bffff30ccd51c9a0"; - }; - meta = { - description = "Android SDK Platform 23"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_24 = buildPlatform { - name = "android-platform-7.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/platform-24_r02.zip; - sha1 = "8912da3d4bfe7a9f28f0e5ce92d3a8dc96342aee"; - }; - meta = { - description = "Android SDK Platform 24"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_25 = buildPlatform { - name = "android-platform-7.1.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/platform-25_r03.zip; - sha1 = "00c2c5765e8988504be10a1eb66ed71fcdbd7fe8"; - }; - meta = { - description = "Android SDK Platform 25"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_26 = buildPlatform { - name = "android-platform-8.0.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/platform-26_r02.zip; - sha1 = "e4ae5d7aa557a3c827135838ee400da8443ac4ef"; - }; - meta = { - description = "Android SDK Platform 26"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_27 = buildPlatform { - name = "android-platform-8.1.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/platform-27_r03.zip; - sha1 = "35f747e7e70b2d16e0e4246876be28d15ea1c353"; - }; - meta = { - description = "Android SDK Platform 27"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_28 = buildPlatform { - name = "android-platform-9"; - src = fetchurl { - url = https://dl.google.com/android/repository/platform-28_r06.zip; - sha1 = "9a4e52b1d55bd2e24216b150aafae2503d3efba6"; - }; - meta = { - description = "Android SDK Platform 28"; - homepage = http://developer.android.com/sdk/; - }; - }; - -} diff --git a/pkgs/development/mobile/androidenv/querypackages.sh b/pkgs/development/mobile/androidenv/querypackages.sh new file mode 100644 index 00000000000..0f31396b876 --- /dev/null +++ b/pkgs/development/mobile/androidenv/querypackages.sh @@ -0,0 +1,27 @@ +#!/bin/sh -e + +if [ "$1" = "" ] +then + echo "Please select a package set: 'packages', 'addons', 'system-images'" >&2 + exit 1 +fi + +if [ "$2" = "" ] +then + echo "Please select a package group:" >&2 + ( cat <<EOF +builtins.attrNames (import ./generated/$1.nix { + fetchurl = null; +}) +EOF +) | nix-instantiate --eval-only - + + exit 1 +fi + +( cat <<EOF +builtins.attrNames (import ./generated/$1.nix { + fetchurl = null; +}).$2 +EOF +) | nix-instantiate --eval-only - diff --git a/pkgs/development/mobile/androidenv/repository-11.xml b/pkgs/development/mobile/androidenv/repository-11.xml deleted file mode 100644 index 45ad16be57b..00000000000 --- a/pkgs/development/mobile/androidenv/repository-11.xml +++ /dev/null @@ -1,2834 +0,0 @@ -<?xml version="1.0" ?> -<!-- - * Copyright (C) 2009 The Android Open Source Project - * - * Licensed under the Apache License, version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. ---> -<sdk:sdk-repository xmlns:sdk="http://schemas.android.com/sdk/android/repository/11" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <!--Generated on 2018-10-17 16:21:19.063228 with ADRT.--> - <sdk:license id="android-sdk-license" type="text">Terms and Conditions - -This is the Android Software Development Kit License Agreement - -1. Introduction - -1.1 The Android Software Development Kit (referred to in the License Agreement as the "SDK" and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK. - -1.2 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time. - -1.3 A "compatible implementation" means any Android device that (i) complies with the Android Compatibility Definition document, which can be found at the Android compatibility website (http://source.android.com/compatibility) and which may be updated from time to time; and (ii) successfully passes the Android Compatibility Test Suite (CTS). - -1.4 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States. - - -2. Accepting the License Agreement - -2.1 In order to use the SDK, you must first agree to the License Agreement. You may not use the SDK if you do not accept the License Agreement. - -2.2 By clicking to accept, you hereby agree to the terms of the License Agreement. - -2.3 You may not use the SDK and may not accept the License Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries, including the country in which you are resident or from which you use the SDK. - -2.4 If you are agreeing to be bound by the License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the SDK on behalf of your employer or other entity. - - -3. SDK License from Google - -3.1 Subject to the terms of the License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable, non-exclusive, and non-sublicensable license to use the SDK solely to develop applications for compatible implementations of Android. - -3.2 You may not use this SDK to develop applications for other platforms (including non-compatible implementations of Android) or to develop another SDK. You are of course free to develop applications for other platforms, including non-compatible implementations of Android, provided that this SDK is not used for that purpose. - -3.3 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you. - -3.4 You may not use the SDK for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK. - -3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. - -3.6 You agree that the form and nature of the SDK that Google provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Google may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Google's sole discretion, without prior notice to you. - -3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features. - -3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK. - - -4. Use of the SDK by You - -4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications. - -4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) the License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries). - -4.3 You agree that if you use the SDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so. - -4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google or any mobile communications carrier. - -4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so. - -4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach. - -5. Your Developer Credentials - -5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials. - -6. Privacy and Information - -6.1 In order to continually innovate and improve the SDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the SDK are being used and how they are being used. Before any of this information is collected, the SDK will notify you and seek your consent. If you withhold consent, the information will not be collected. - -6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy. - - -7. Third Party Applications - -7.1 If you use the SDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources. - -7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners. - -7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, the License Agreement does not affect your legal relationship with these third parties. - - -8. Using Android APIs - -8.1 Google Data APIs - -8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service. - -8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. - - -9. Terminating the License Agreement - -9.1 The License Agreement will continue to apply until terminated by either you or Google as set out below. - -9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials. - -9.3 Google may at any time, terminate the License Agreement with you if: -(A) you have breached any provision of the License Agreement; or -(B) Google is required to do so by law; or -(C) the partner with whom Google offered certain parts of SDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the SDK to you; or -(D) Google decides to no longer provide the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service, or the provision of the SDK or certain SDK services to you by Google is, in Google's sole discretion, no longer commercially viable. - -9.4 When the License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst the License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely. - - -10. DISCLAIMER OF WARRANTIES - -10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE SDK IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE. - -10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. - -10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. - - -11. LIMITATION OF LIABILITY - -11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING. - - -12. Indemnification - -12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with the License Agreement. - - -13. Changes to the License Agreement - -13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available. - - -14. General Legal Terms - -14.1 The License Agreement constitutes the whole legal agreement between you and Google and governs your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the SDK. - -14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google. - -14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable. - -14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement. - -14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE. - -14.6 The rights granted in the License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under the License Agreement without the prior written approval of the other party. - -14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction. - - -November 20, 2015</sdk:license> - <sdk:license id="android-sdk-preview-license" type="text">To get started with the Android SDK Preview, you must agree to the following terms and conditions. -As described below, please note that this is a preview version of the Android SDK, subject to change, that you use at your own risk. The Android SDK Preview is not a stable release, and may contain errors and defects that can result in serious damage to your computer systems, devices and data. - -This is the Android SDK Preview License Agreement (the "License Agreement"). - -1. Introduction - -1.1 The Android SDK Preview (referred to in the License Agreement as the “Preview” and specifically including the Android system files, packaged APIs, and Preview library files, if and when they are made available) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the Preview. - -1.2 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time. - -1.3 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States. - -2. Accepting the License Agreement - -2.1 In order to use the Preview, you must first agree to the License Agreement. You may not use the Preview if you do not accept the License Agreement. - -2.2 By clicking to accept and/or using the Preview, you hereby agree to the terms of the License Agreement. - -2.3 You may not use the Preview and may not accept the License Agreement if you are a person barred from receiving the Preview under the laws of the United States or other countries including the country in which you are resident or from which you use the Preview. - -2.4 If you will use the Preview internally within your company or organization you agree to be bound by the License Agreement on behalf of your employer or other entity, and you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the Preview on behalf of your employer or other entity. - -3. Preview License from Google - -3.1 Subject to the terms of the License Agreement, Google grants you a royalty-free, non-assignable, non-exclusive, non-sublicensable, limited, revocable license to use the Preview, personally or internally within your company or organization, solely to develop applications to run on the Android platform. - -3.2 You agree that Google or third parties owns all legal right, title and interest in and to the Preview, including any Intellectual Property Rights that subsist in the Preview. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you. - -3.3 You may not use the Preview for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the Preview or any part of the Preview; or (b) load any part of the Preview onto a mobile handset or any other hardware device except a personal computer, combine any part of the Preview with other software, or distribute any software or device incorporating a part of the Preview. - -3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the Preview. - -3.5 Use, reproduction and distribution of components of the Preview licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. You agree to remain a licensee in good standing in regard to such open source software licenses under all the rights granted and to refrain from any actions that may terminate, suspend, or breach such rights. - -3.6 You agree that the form and nature of the Preview that Google provides may change without prior notice to you and that future versions of the Preview may be incompatible with applications developed on previous versions of the Preview. You agree that Google may stop (permanently or temporarily) providing the Preview (or any features within the Preview) to you or to users generally at Google's sole discretion, without prior notice to you. - -3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features. - -3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the Preview. - -4. Use of the Preview by You - -4.1 Google agrees that nothing in the License Agreement gives Google any right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the Preview, including any intellectual property rights that subsist in those applications. - -4.2 You agree to use the Preview and write applications only for purposes that are permitted by (a) the License Agreement, and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries). - -4.3 You agree that if you use the Preview to develop applications, you will protect the privacy and legal rights of users. If users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If users provide you with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, each user has given you permission to do so. - -4.4 You agree that you will not engage in any activity with the Preview, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of Google or any third party. - -4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so. - -4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach. - -4.7 The Preview is in development, and your testing and feedback are an important part of the development process. By using the Preview, you acknowledge that implementation of some features are still under development and that you should not rely on the Preview having the full functionality of a stable release. You agree not to publicly distribute or ship any application using this Preview as this Preview will no longer be supported after the official Android SDK is released. - -5. Your Developer Credentials - -5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials. - -6. Privacy and Information - -6.1 In order to continually innovate and improve the Preview, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the Preview are being used and how they are being used. Before any of this information is collected, the Preview will notify you and seek your consent. If you withhold consent, the information will not be collected. - -6.2 The data collected is examined in the aggregate to improve the Preview and is maintained in accordance with Google's Privacy Policy located at http://www.google.com/policies/privacy/. - -7. Third Party Applications - -7.1 If you use the Preview to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources. - -7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners. - -7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. - -8. Using Google APIs - -8.1 Google APIs - -8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service. - -8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. - -9. Terminating the License Agreement - -9.1 the License Agreement will continue to apply until terminated by either you or Google as set out below. - -9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the Preview and any relevant developer credentials. - -9.3 Google may at any time, terminate the License Agreement, with or without cause, upon notice to you. - -9.4 The License Agreement will automatically terminate without notice or other action upon the earlier of: -(A) when Google ceases to provide the Preview or certain parts of the Preview to users in the country in which you are resident or from which you use the service; and -(B) Google issues a final release version of the Android SDK. - -9.5 When the License Agreement is terminated, the license granted to you in the License Agreement will terminate, you will immediately cease all use of the Preview, and the provisions of paragraphs 10, 11, 12 and 14 shall survive indefinitely. - -10. DISCLAIMERS - -10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE PREVIEW IS AT YOUR SOLE RISK AND THAT THE PREVIEW IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE. - -10.2 YOUR USE OF THE PREVIEW AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE PREVIEW IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. WITHOUT LIMITING THE FOREGOING, YOU UNDERSTAND THAT THE PREVIEW IS NOT A STABLE RELEASE AND MAY CONTAIN ERRORS, DEFECTS AND SECURITY VULNERABILITIES THAT CAN RESULT IN SIGNIFICANT DAMAGE, INCLUDING THE COMPLETE, IRRECOVERABLE LOSS OF USE OF YOUR COMPUTER SYSTEM OR OTHER DEVICE. - -10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. - -11. LIMITATION OF LIABILITY - -11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING. - -12. Indemnification - -12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys’ fees) arising out of or accruing from (a) your use of the Preview, (b) any application you develop on the Preview that infringes any Intellectual Property Rights of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you of the License Agreement. - -13. Changes to the License Agreement - -13.1 Google may make changes to the License Agreement as it distributes new versions of the Preview. When these changes are made, Google will make a new version of the License Agreement available on the website where the Preview is made available. - -14. General Legal Terms - -14.1 the License Agreement constitutes the whole legal agreement between you and Google and governs your use of the Preview (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the Preview. - -14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google. - -14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable. - -14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement. - -14.5 EXPORT RESTRICTIONS. THE PREVIEW IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE PREVIEW. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE. - -14.6 The License Agreement may not be assigned or transferred by you without the prior written approval of Google, and any attempted assignment without such approval will be void. You shall not delegate your responsibilities or obligations under the License Agreement without the prior written approval of Google. - -14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction. - -June 2014.</sdk:license> - <sdk:ndk> - <!--Generated from bid:5063045, branch:aosp-ndk-release-r18--> - <sdk:description>NDK</sdk:description> - <sdk:revision>18</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Thu Oct 11 14:06:10 2018.--> - <sdk:size>542911996</sdk:size> - <sdk:checksum type="sha1">98cb9909aa8c2dab32db188bbdc3ac6207e09440</sdk:checksum> - <sdk:url>android-ndk-r18b-darwin-x86_64.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - <sdk:host-bits>64</sdk:host-bits> - </sdk:archive> - <sdk:archive> - <!--Built on: Thu Oct 11 14:06:26 2018.--> - <sdk:size>557038702</sdk:size> - <sdk:checksum type="sha1">500679655da3a86aecf67007e8ab230ea9b4dd7b</sdk:checksum> - <sdk:url>android-ndk-r18b-linux-x86_64.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - <sdk:host-bits>64</sdk:host-bits> - </sdk:archive> - <sdk:archive> - <!--Built on: Thu Oct 11 14:05:37 2018.--> - <sdk:size>504605336</sdk:size> - <sdk:checksum type="sha1">4b8b6a4edc0fa967b429c1d6d25adf69acc28803</sdk:checksum> - <sdk:url>android-ndk-r18b-windows-x86.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - <sdk:host-bits>32</sdk:host-bits> - </sdk:archive> - <sdk:archive> - <!--Built on: Thu Oct 11 14:05:53 2018.--> - <sdk:size>522489470</sdk:size> - <sdk:checksum type="sha1">6b6d4138aaaad7166679fdfa4780e177f95cee6f</sdk:checksum> - <sdk:url>android-ndk-r18b-windows-x86_64.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - <sdk:host-bits>64</sdk:host-bits> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:ndk> - <sdk:platform> - <!--Generated from bid:4913185, branch:pi-sdk-release--> - <sdk:version>9</sdk:version> - <sdk:api-level>28</sdk:api-level> - <sdk:description>Android SDK Platform 28</sdk:description> - <sdk:revision>6</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Wed Jul 25 20:19:20 2018.--> - <sdk:size>75565084</sdk:size> - <sdk:checksum type="sha1">9a4e52b1d55bd2e24216b150aafae2503d3efba6</sdk:checksum> - <sdk:url>platform-28_r06.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:min-tools-rev> - <sdk:major>22</sdk:major> - </sdk:min-tools-rev> - <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url> - <sdk:layoutlib> - <sdk:api>15</sdk:api> - <sdk:revision>1</sdk:revision> - </sdk:layoutlib> - </sdk:platform> - <sdk:platform> - <!--Generated from bid:4774931, branch:git_oc-mr1-sdk-release--> - <sdk:version>8.1.0</sdk:version> - <sdk:api-level>27</sdk:api-level> - <sdk:description>Android SDK Platform 27</sdk:description> - <sdk:revision>3</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Fri May 11 15:44:04 2018.--> - <sdk:size>65635348</sdk:size> - <sdk:checksum type="sha1">35f747e7e70b2d16e0e4246876be28d15ea1c353</sdk:checksum> - <sdk:url>platform-27_r03.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:min-tools-rev> - <sdk:major>22</sdk:major> - </sdk:min-tools-rev> - <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url> - <sdk:layoutlib> - <sdk:api>15</sdk:api> - <sdk:revision>1</sdk:revision> - </sdk:layoutlib> - </sdk:platform> - <sdk:platform> - <!--Generated from bid:4187382, branch:git_oc-release--> - <sdk:version>8.0.0</sdk:version> - <sdk:api-level>26</sdk:api-level> - <sdk:description>Android SDK Platform 26</sdk:description> - <sdk:revision>2</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Wed May 23 00:35:53 2018.--> - <sdk:size>63623734</sdk:size> - <sdk:checksum type="sha1">e4ae5d7aa557a3c827135838ee400da8443ac4ef</sdk:checksum> - <sdk:url>platform-26_r02.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:min-tools-rev> - <sdk:major>22</sdk:major> - </sdk:min-tools-rev> - <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url> - <sdk:layoutlib> - <sdk:api>15</sdk:api> - <sdk:revision>1</sdk:revision> - </sdk:layoutlib> - </sdk:platform> - <sdk:platform> - <!--Generated from bid:3544217, branch:git_nyc-mr1-sdk-dev--> - <sdk:version>7.1.1</sdk:version> - <sdk:api-level>25</sdk:api-level> - <sdk:description>Android SDK Platform 25</sdk:description> - <sdk:revision>3</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sat May 26 06:47:38 2018.--> - <sdk:size>85424763</sdk:size> - <sdk:checksum type="sha1">00c2c5765e8988504be10a1eb66ed71fcdbd7fe8</sdk:checksum> - <sdk:url>platform-25_r03.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:min-tools-rev> - <sdk:major>22</sdk:major> - </sdk:min-tools-rev> - <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url> - <sdk:layoutlib> - <sdk:api>16</sdk:api> - <sdk:revision>2</sdk:revision> - </sdk:layoutlib> - </sdk:platform> - <sdk:platform> - <!--Generated from bid:3209611, branch:git_nyc-sdk-dev--> - <sdk:version>7.0</sdk:version> - <sdk:api-level>24</sdk:api-level> - <sdk:description>Android SDK Platform 24</sdk:description> - <sdk:revision>2</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue Jun 5 15:00:21 2018.--> - <sdk:size>82648154</sdk:size> - <sdk:checksum type="sha1">8912da3d4bfe7a9f28f0e5ce92d3a8dc96342aee</sdk:checksum> - <sdk:url>platform-24_r02.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:min-tools-rev> - <sdk:major>22</sdk:major> - </sdk:min-tools-rev> - <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url> - <sdk:layoutlib> - <sdk:api>16</sdk:api> - <sdk:revision>2</sdk:revision> - </sdk:layoutlib> - </sdk:platform> - <sdk:platform> - <!--Generated from bid:2704002, branch:git_mnc-sdk-release--> - <sdk:version>6.0</sdk:version> - <sdk:api-level>23</sdk:api-level> - <sdk:description>Android SDK Platform 23</sdk:description> - <sdk:revision>3</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Mon May 21 15:53:43 2018.--> - <sdk:size>70433421</sdk:size> - <sdk:checksum type="sha1">027fede3de6aa1649115bbd0bffff30ccd51c9a0</sdk:checksum> - <sdk:url>platform-23_r03.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:min-tools-rev> - <sdk:major>22</sdk:major> - </sdk:min-tools-rev> - <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url> - <sdk:layoutlib> - <sdk:api>16</sdk:api> - <sdk:revision>3</sdk:revision> - </sdk:layoutlib> - </sdk:platform> - <sdk:platform> - <!--Generated from bid:1819727, branch:git_lmp-mr1-sdk-release--> - <sdk:version>5.1.1</sdk:version> - <sdk:api-level>22</sdk:api-level> - <sdk:description>Android SDK Platform 22</sdk:description> - <sdk:revision>2</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Mon May 21 03:54:34 2018.--> - <sdk:size>66852371</sdk:size> - <sdk:checksum type="sha1">5d1bd10fea962b216a0dece1247070164760a9fc</sdk:checksum> - <sdk:url>android-22_r02.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:min-tools-rev> - <sdk:major>22</sdk:major> - </sdk:min-tools-rev> - <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url> - <sdk:layoutlib> - <sdk:api>14</sdk:api> - <sdk:revision>2</sdk:revision> - </sdk:layoutlib> - </sdk:platform> - <sdk:platform> - <!--Generated from bid:1624448, branch:git_lmp-dev--> - <sdk:version>5.0.1</sdk:version> - <sdk:api-level>21</sdk:api-level> - <sdk:description>Android SDK Platform 21</sdk:description> - <sdk:revision>2</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue Jun 19 02:28:04 2018.--> - <sdk:size>65897960</sdk:size> - <sdk:checksum type="sha1">53536556059bb29ae82f414fd2e14bc335a4eb4c</sdk:checksum> - <sdk:url>android-21_r02.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:min-tools-rev> - <sdk:major>22</sdk:major> - </sdk:min-tools-rev> - <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url> - <sdk:layoutlib> - <sdk:api>12</sdk:api> - <sdk:revision>2</sdk:revision> - </sdk:layoutlib> - </sdk:platform> - <sdk:platform> - <!--Generated from bid:1537038, branch:git_klp-modular-dev--> - <sdk:version>4.4W.2</sdk:version> - <sdk:api-level>20</sdk:api-level> - <sdk:description>Android SDK Platform 20</sdk:description> - <sdk:revision>2</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sun Jun 3 18:11:51 2018.--> - <sdk:size>63567784</sdk:size> - <sdk:checksum type="sha1">a9251f8a3f313ab05834a07a963000927637e01d</sdk:checksum> - <sdk:url>android-20_r02.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:min-tools-rev> - <sdk:major>22</sdk:major> - </sdk:min-tools-rev> - <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url> - <sdk:layoutlib> - <sdk:api>12</sdk:api> - <sdk:revision>1</sdk:revision> - </sdk:layoutlib> - </sdk:platform> - <sdk:platform> - <!--Generated from bid:1456859, branch:git_klp-sdk-release--> - <sdk:version>4.4.2</sdk:version> - <sdk:api-level>19</sdk:api-level> - <sdk:description>Android SDK Platform 19</sdk:description> - <sdk:revision>4</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Fri May 25 15:40:05 2018.--> - <sdk:size>63871092</sdk:size> - <sdk:checksum type="sha1">2ff20d89e68f2f5390981342e009db5a2d456aaa</sdk:checksum> - <sdk:url>android-19_r04.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:min-tools-rev> - <sdk:major>22</sdk:major> - </sdk:min-tools-rev> - <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url> - <sdk:layoutlib> - <sdk:api>12</sdk:api> - <sdk:revision>1</sdk:revision> - </sdk:layoutlib> - </sdk:platform> - <sdk:platform> - <!--Generated from bid:1425645, branch:git_jb-mr2-dev--> - <sdk:version>4.3.1</sdk:version> - <sdk:api-level>18</sdk:api-level> - <sdk:description>Android SDK Platform 18</sdk:description> - <sdk:revision>3</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Fri May 18 13:24:37 2018.--> - <sdk:size>57771739</sdk:size> - <sdk:checksum type="sha1">e6b09b3505754cbbeb4a5622008b907262ee91cb</sdk:checksum> - <sdk:url>android-18_r03.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:min-tools-rev> - <sdk:major>21</sdk:major> - </sdk:min-tools-rev> - <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url> - <sdk:layoutlib> - <sdk:api>12</sdk:api> - <sdk:revision>1</sdk:revision> - </sdk:layoutlib> - </sdk:platform> - <sdk:platform> - <!--Generated from bid:1425461, branch:git_jb-mr1.1-dev--> - <sdk:version>4.2.2</sdk:version> - <sdk:api-level>17</sdk:api-level> - <sdk:description>Android SDK Platform 17</sdk:description> - <sdk:revision>3</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sat May 26 21:15:56 2018.--> - <sdk:size>57030216</sdk:size> - <sdk:checksum type="sha1">dbe14101c06e6cdb34e300393e64e64f8c92168a</sdk:checksum> - <sdk:url>android-17_r03.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:min-tools-rev> - <sdk:major>21</sdk:major> - </sdk:min-tools-rev> - <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url> - <sdk:layoutlib> - <sdk:api>12</sdk:api> - <sdk:revision>1</sdk:revision> - </sdk:layoutlib> - </sdk:platform> - <sdk:platform> - <!--Generated from bid:1425332, branch:git_jb-dev--> - <sdk:version>4.1.2</sdk:version> - <sdk:api-level>16</sdk:api-level> - <sdk:description>Android SDK Platform 16</sdk:description> - <sdk:revision>5</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Wed May 23 08:20:21 2018.--> - <sdk:size>48128695</sdk:size> - <sdk:checksum type="sha1">12a5ce6235a76bc30f62c26bda1b680e336abd07</sdk:checksum> - <sdk:url>android-16_r05.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:min-tools-rev> - <sdk:major>21</sdk:major> - </sdk:min-tools-rev> - <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url> - <sdk:layoutlib> - <sdk:api>12</sdk:api> - <sdk:revision>1</sdk:revision> - </sdk:layoutlib> - </sdk:platform> - <sdk:platform> - <!--Generated from bid:1406430, branch:git_ics-mr1--> - <sdk:version>4.0.3</sdk:version> - <sdk:api-level>15</sdk:api-level> - <sdk:description>Android SDK Platform 15</sdk:description> - <sdk:revision>5</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sat Jun 2 14:02:31 2018.--> - <sdk:size>44533475</sdk:size> - <sdk:checksum type="sha1">69ab4c443b37184b2883af1fd38cc20cbeffd0f3</sdk:checksum> - <sdk:url>android-15_r05.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:min-tools-rev> - <sdk:major>21</sdk:major> - </sdk:min-tools-rev> - <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url> - <sdk:layoutlib> - <sdk:api>12</sdk:api> - <sdk:revision>1</sdk:revision> - </sdk:layoutlib> - </sdk:platform> - <sdk:platform> - <!--Generated from bid:1406408, branch:git_ics-mr0--> - <sdk:version>4.0</sdk:version> - <sdk:api-level>14</sdk:api-level> - <sdk:description>Android SDK Platform 14</sdk:description> - <sdk:revision>4</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Mon Jun 4 10:33:42 2018.--> - <sdk:size>46038082</sdk:size> - <sdk:checksum type="sha1">d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c</sdk:checksum> - <sdk:url>android-14_r04.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url> - <sdk:layoutlib> - <sdk:api>12</sdk:api> - <sdk:revision>1</sdk:revision> - </sdk:layoutlib> - </sdk:platform> - <sdk:platform> - <!--Generated from bid:140714, branch:honeycomb-mr2-release--> - <sdk:version>3.2</sdk:version> - <sdk:api-level>13</sdk:api-level> - <sdk:description>Android SDK Platform 13</sdk:description> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sat Jun 2 07:27:36 2018.--> - <sdk:size>108426536</sdk:size> - <sdk:checksum type="sha1">6189a500a8c44ae73a439604363de93591163cd9</sdk:checksum> - <sdk:url>android-3.2_r01.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:min-tools-rev> - <sdk:major>12</sdk:major> - </sdk:min-tools-rev> - <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url> - <sdk:layoutlib> - <sdk:api>4</sdk:api> - </sdk:layoutlib> - </sdk:platform> - <sdk:platform> - <!--Generated from bid:123685, branch:honeycomb-mr1--> - <sdk:version>3.1</sdk:version> - <sdk:api-level>12</sdk:api-level> - <sdk:description>Android SDK Platform 12</sdk:description> - <sdk:revision>3</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Thu May 24 23:42:26 2018.--> - <sdk:size>106472351</sdk:size> - <sdk:checksum type="sha1">4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf</sdk:checksum> - <sdk:url>android-3.1_r03.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:min-tools-rev> - <sdk:major>11</sdk:major> - </sdk:min-tools-rev> - <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url> - <sdk:layoutlib> - <sdk:api>4</sdk:api> - </sdk:layoutlib> - </sdk:platform> - <sdk:platform> - <!--Generated from bid:104254, branch:honeycomb--> - <sdk:version>3.0</sdk:version> - <sdk:api-level>11</sdk:api-level> - <sdk:description>Android SDK Platform 11</sdk:description> - <sdk:revision>2</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sun Jun 17 05:58:58 2018.--> - <sdk:size>104513908</sdk:size> - <sdk:checksum type="sha1">2c7d4bd13f276e76f6bbd87315fe27aba351dd37</sdk:checksum> - <sdk:url>android-3.0_r02.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:min-tools-rev> - <sdk:major>10</sdk:major> - </sdk:min-tools-rev> - <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url> - <sdk:layoutlib> - <sdk:api>4</sdk:api> - </sdk:layoutlib> - </sdk:platform> - <sdk:platform> - <!--Generated from bid:101070, branch:gingerbread-release--> - <sdk:version>2.3.3</sdk:version> - <sdk:api-level>10</sdk:api-level> - <sdk:description>Android SDK Platform 10</sdk:description> - <sdk:revision>2</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Wed Jun 13 04:35:13 2018.--> - <sdk:size>85470907</sdk:size> - <sdk:checksum type="sha1">887e37783ec32f541ea33c2c649dda648e8e6fb3</sdk:checksum> - <sdk:url>android-2.3.3_r02.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:min-tools-rev> - <sdk:major>4</sdk:major> - </sdk:min-tools-rev> - <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url> - <sdk:layoutlib> - <sdk:api>4</sdk:api> - </sdk:layoutlib> - </sdk:platform> - <sdk:platform> - <!--Generated from bid:93351, branch:gingerbread-sdk-release--> - <sdk:version>2.3.1</sdk:version> - <sdk:api-level>9</sdk:api-level> - <sdk:description>Android SDK Platform 9</sdk:description> - <sdk:revision>2</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue Jun 19 00:10:28 2018.--> - <sdk:size>78732563</sdk:size> - <sdk:checksum type="sha1">209f8a7a8b2cb093fce858b8b55fed3ba5206773</sdk:checksum> - <sdk:url>android-2.3.1_r02.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:min-tools-rev> - <sdk:major>4</sdk:major> - </sdk:min-tools-rev> - <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url> - <sdk:layoutlib> - <sdk:api>4</sdk:api> - </sdk:layoutlib> - </sdk:platform> - <sdk:platform> - <!--Generated from bid:43546, branch:froyo-release--> - <sdk:version>2.2</sdk:version> - <sdk:api-level>8</sdk:api-level> - <sdk:description>Android SDK Platform 8</sdk:description> - <sdk:revision>3</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Mon Jun 11 13:26:30 2018.--> - <sdk:size>74652366</sdk:size> - <sdk:checksum type="sha1">231262c63eefdff8fd0386e9ccfefeb27a8f9202</sdk:checksum> - <sdk:url>android-2.2_r03.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:min-tools-rev> - <sdk:major>4</sdk:major> - </sdk:min-tools-rev> - <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url> - <sdk:layoutlib> - <sdk:api>4</sdk:api> - </sdk:layoutlib> - </sdk:platform> - <sdk:platform> - <!--Generated from bid:35983, branch:eclair--> - <sdk:version>2.1</sdk:version> - <sdk:api-level>7</sdk:api-level> - <sdk:description>Android SDK Platform 7</sdk:description> - <sdk:revision>3</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Fri May 25 18:43:17 2018.--> - <sdk:size>70142829</sdk:size> - <sdk:checksum type="sha1">5ce51b023ac19f8738500b1007a1da5de2349a1e</sdk:checksum> - <sdk:url>android-2.1_r03.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:min-tools-rev> - <sdk:major>8</sdk:major> - </sdk:min-tools-rev> - <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url> - <sdk:layoutlib> - <sdk:api>4</sdk:api> - </sdk:layoutlib> - </sdk:platform> - <sdk:platform> - <!--Generated from bid:20723, branch:unknown--> - <sdk:version>2.0.1</sdk:version> - <sdk:api-level>6</sdk:api-level> - <sdk:description>Android SDK Platform 6</sdk:description> - <sdk:obsolete/> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sun May 27 03:48:57 2018.--> - <sdk:size>79192618</sdk:size> - <sdk:checksum type="sha1">ce2c971dce352aa28af06bda92a070116aa5ae1a</sdk:checksum> - <sdk:url>android-2.0.1_r01-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Fri Jun 15 10:07:34 2018.--> - <sdk:size>79035527</sdk:size> - <sdk:checksum type="sha1">c3096f80d75a6fc8cb38ef8a18aec920e53d42c0</sdk:checksum> - <sdk:url>android-2.0.1_r01-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Fri Jun 8 14:23:45 2018.--> - <sdk:size>80385601</sdk:size> - <sdk:checksum type="sha1">255781ebe4509d9707d0e77edda2815e2bc216e6</sdk:checksum> - <sdk:url>android-2.0.1_r01-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:min-tools-rev> - <sdk:major>4</sdk:major> - </sdk:min-tools-rev> - <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url> - <sdk:layoutlib> - <sdk:api>4</sdk:api> - </sdk:layoutlib> - </sdk:platform> - <sdk:platform> - <!--Generated from bid:17704, branch:unknown--> - <sdk:version>2.0</sdk:version> - <sdk:api-level>5</sdk:api-level> - <sdk:description>Android SDK Platform 5</sdk:description> - <sdk:obsolete/> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sat May 19 10:03:45 2018.--> - <sdk:size>75095268</sdk:size> - <sdk:checksum type="sha1">be9be6a99ca32875c96ec7f91160ca9fce7e3c7d</sdk:checksum> - <sdk:url>android-2.0_r01-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Sat May 19 16:50:28 2018.--> - <sdk:size>74956356</sdk:size> - <sdk:checksum type="sha1">2a866d0870dbba18e0503cd41e5fae988a21b314</sdk:checksum> - <sdk:url>android-2.0_r01-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Thu Jun 14 00:45:58 2018.--> - <sdk:size>76288040</sdk:size> - <sdk:checksum type="sha1">aeb623217ff88b87216d6eb7dbc846ed53f68f57</sdk:checksum> - <sdk:url>android-2.0_r01-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:min-tools-rev> - <sdk:major>3</sdk:major> - </sdk:min-tools-rev> - <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url> - <sdk:layoutlib> - <sdk:api>4</sdk:api> - </sdk:layoutlib> - </sdk:platform> - <sdk:platform> - <!--Generated from bid:3, branch:unknown--> - <sdk:version>1.6</sdk:version> - <sdk:api-level>4</sdk:api-level> - <sdk:description>Android SDK Platform 4</sdk:description> - <sdk:obsolete/> - <sdk:revision>3</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sat May 26 23:29:51 2018.--> - <sdk:size>63454485</sdk:size> - <sdk:checksum type="sha1">483ed088e45bbdf3444baaf9250c8b02e5383cb0</sdk:checksum> - <sdk:url>android-1.6_r03-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Sat Jun 2 07:57:24 2018.--> - <sdk:size>62418496</sdk:size> - <sdk:checksum type="sha1">bdafad44f5df9f127979bdb21a1fdd87ee3cd625</sdk:checksum> - <sdk:url>android-1.6_r03-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Mon Jun 4 04:34:06 2018.--> - <sdk:size>64654625</sdk:size> - <sdk:checksum type="sha1">ce0b5e4ffaf12ca4fd07c2da71a8a1ab4a03dc22</sdk:checksum> - <sdk:url>android-1.6_r03-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:min-tools-rev> - <sdk:major>6</sdk:major> - </sdk:min-tools-rev> - <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url> - <sdk:layoutlib> - <sdk:api>4</sdk:api> - </sdk:layoutlib> - </sdk:platform> - <sdk:platform> - <!--Generated from bid:2, branch:unknown--> - <sdk:version>1.5</sdk:version> - <sdk:api-level>3</sdk:api-level> - <sdk:description>Android SDK Platform 3</sdk:description> - <sdk:obsolete/> - <sdk:revision>4</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Thu May 17 22:23:16 2018.--> - <sdk:size>53348669</sdk:size> - <sdk:checksum type="sha1">5c134b7df5f4b8bd5b61ba93bdaebada8fa3468c</sdk:checksum> - <sdk:url>android-1.5_r04-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Mon Jun 4 15:31:36 2018.--> - <sdk:size>52440607</sdk:size> - <sdk:checksum type="sha1">d3a67c2369afa48b6c3c7624de5031c262018d1e</sdk:checksum> - <sdk:url>android-1.5_r04-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Thu Jun 14 02:58:08 2018.--> - <sdk:size>54624370</sdk:size> - <sdk:checksum type="sha1">5bb106d2e40d481edd337b0833093843e15fe49a</sdk:checksum> - <sdk:url>android-1.5_r04-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:min-tools-rev> - <sdk:major>6</sdk:major> - </sdk:min-tools-rev> - <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url> - <sdk:layoutlib> - <sdk:api>4</sdk:api> - </sdk:layoutlib> - </sdk:platform> - <sdk:platform> - <!--Generated from bid:1, branch:unknown--> - <sdk:version>1.1</sdk:version> - <sdk:api-level>2</sdk:api-level> - <sdk:description>Android SDK Platform 2</sdk:description> - <sdk:obsolete/> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sun May 20 23:48:42 2018.--> - <sdk:size>45476658</sdk:size> - <sdk:checksum type="sha1">c054d25c9b4c6251fa49c2f9c54336998679d3fe</sdk:checksum> - <sdk:url>android-1.1_r1-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Sat May 19 16:29:20 2018.--> - <sdk:size>45584305</sdk:size> - <sdk:checksum type="sha1">e21dbcff45b7356657449ebb3c7e941be2bb5ebe</sdk:checksum> - <sdk:url>android-1.1_r1-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Fri Jun 8 18:57:19 2018.--> - <sdk:size>46828615</sdk:size> - <sdk:checksum type="sha1">a4060f29ed39fc929c302836d488998c53c3002e</sdk:checksum> - <sdk:url>android-1.1_r1-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:min-tools-rev> - <sdk:major>6</sdk:major> - </sdk:min-tools-rev> - <sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url> - <sdk:layoutlib> - <sdk:api>4</sdk:api> - </sdk:layoutlib> - </sdk:platform> - <sdk:source> - <!--Generated from bid:4898911, branch:git_pi-release--> - <sdk:api-level>28</sdk:api-level> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Wed Aug 8 15:54:23 2018.--> - <sdk:size>42552241</sdk:size> - <sdk:checksum type="sha1">5610e0c24235ee3fa343c899ddd551be30315255</sdk:checksum> - <sdk:url>sources-28_r01.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:source> - <sdk:source> - <!--Generated from bid:4402310, branch:git_oc-mr1-release--> - <sdk:api-level>27</sdk:api-level> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Fri Jun 8 01:46:30 2018.--> - <sdk:size>36997618</sdk:size> - <sdk:checksum type="sha1">7b714670561d08f54751af42aca929867b806596</sdk:checksum> - <sdk:url>sources-27_r01.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:source> - <sdk:source> - <!--Generated from bid:4187382, branch:git_oc-release--> - <sdk:api-level>26</sdk:api-level> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Fri Jun 8 01:15:38 2018.--> - <sdk:size>35138547</sdk:size> - <sdk:checksum type="sha1">2af701ee3223d580409288540b1d06932fd8f9b9</sdk:checksum> - <sdk:url>sources-26_r01.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:source> - <sdk:source> - <!--Generated from bid:3544217, branch:git_nyc-mr1-sdk-dev--> - <sdk:api-level>25</sdk:api-level> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue Jun 5 06:06:13 2018.--> - <sdk:size>30822685</sdk:size> - <sdk:checksum type="sha1">bbc72efd1a9bad87cc507e308f0d29aad438c52c</sdk:checksum> - <sdk:url>sources-25_r01.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:source> - <sdk:source> - <!--Generated from bid:3209611, branch:git_nyc-sdk-dev--> - <sdk:api-level>24</sdk:api-level> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Fri Jun 8 14:43:03 2018.--> - <sdk:size>30270410</sdk:size> - <sdk:checksum type="sha1">6b96115830a83d654479f32ce4b724ca9011148b</sdk:checksum> - <sdk:url>sources-24_r01.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:source> - <sdk:source> - <!--Generated from bid:2166767, branch:git_mnc-release--> - <sdk:api-level>23</sdk:api-level> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sun Jun 10 14:12:23 2018.--> - <sdk:size>31771965</sdk:size> - <sdk:checksum type="sha1">b0f15da2762b42f543c5e364c2b15b198cc99cc2</sdk:checksum> - <sdk:url>sources-23_r01.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:source> - <sdk:source> - <!--Generated from bid:1737576, branch:git_lmp-mr1-sdk-release--> - <sdk:api-level>22</sdk:api-level> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Mon Jun 4 23:43:02 2018.--> - <sdk:size>28861236</sdk:size> - <sdk:checksum type="sha1">98320e13976d11597a4a730a8d203ac9a03ed5a6</sdk:checksum> - <sdk:url>sources-22_r01.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:source> - <sdk:source> - <!--Generated from bid:1521886, branch:git_lmp-release--> - <sdk:api-level>21</sdk:api-level> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sat Jun 16 09:12:37 2018.--> - <sdk:size>28274751</sdk:size> - <sdk:checksum type="sha1">137a5044915d32bea297a8c1552684802bbc2e25</sdk:checksum> - <sdk:url>sources-21_r01.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:source> - <sdk:source> - <!--Generated from bid:1246132, branch:git_klp-modular-release--> - <sdk:api-level>20</sdk:api-level> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sat Jun 2 19:46:05 2018.--> - <sdk:size>23367603</sdk:size> - <sdk:checksum type="sha1">8da3e40f2625f9f7ef38b7e403f49f67226c0d76</sdk:checksum> - <sdk:url>sources-20_r01.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:source> - <sdk:source> - <!--Generated from bid:938007, branch:git_klp-dev--> - <sdk:api-level>19</sdk:api-level> - <sdk:revision>2</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue May 29 10:39:58 2018.--> - <sdk:size>21819439</sdk:size> - <sdk:checksum type="sha1">433a1d043ef77561571250e94cb7a0ef24a202e7</sdk:checksum> - <sdk:url>sources-19_r02.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:source> - <sdk:source> - <!--Generated from bid:737497, branch:git_jb-mr2-release--> - <sdk:api-level>18</sdk:api-level> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Fri May 18 03:14:54 2018.--> - <sdk:size>20226735</sdk:size> - <sdk:checksum type="sha1">8b49fdf7433f4881a2bfb559b5dd05d8ec65fb78</sdk:checksum> - <sdk:url>sources-18_r01.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:source> - <sdk:source> - <!--Generated from bid:526865, branch:git_jb-mr1-dev--> - <sdk:api-level>17</sdk:api-level> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Thu May 17 17:14:50 2018.--> - <sdk:size>18976816</sdk:size> - <sdk:checksum type="sha1">6f1f18cd2d2b1852d7f6892df9cee3823349d43a</sdk:checksum> - <sdk:url>sources-17_r01.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:source> - <sdk:source> - <!--Generated from bid:403059, branch:git_jb-release--> - <sdk:api-level>16</sdk:api-level> - <sdk:revision>2</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Wed May 30 05:17:35 2018.--> - <sdk:size>17876720</sdk:size> - <sdk:checksum type="sha1">0f83c14ed333c45d962279ab5d6bc98a0269ef84</sdk:checksum> - <sdk:url>sources-16_r02.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:source> - <sdk:source> - <!--Generated from bid:302030, branch:git_ics-mr1--> - <sdk:api-level>15</sdk:api-level> - <sdk:revision>2</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sat Jun 16 23:00:27 2018.--> - <sdk:size>16468746</sdk:size> - <sdk:checksum type="sha1">e5992a5747c9590783fbbdd700337bf0c9f6b1fa</sdk:checksum> - <sdk:url>sources-15_r02.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:source> - <sdk:source> - <!--Generated from bid:234950, branch:git_ics-mr0--> - <sdk:api-level>14</sdk:api-level> - <sdk:obsolete/> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sat Jun 9 09:00:50 2018.--> - <sdk:size>16152383</sdk:size> - <sdk:checksum type="sha1">eaf4ed7dcac46e68516a1b4aa5b0d9e5a39a7555</sdk:checksum> - <sdk:url>sources-14_r01.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:source> - <sdk:build-tool> - <!--Generated from bid:5016651, branch:pi-sdk-release--> - <sdk:revision> - <sdk:major>28</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>3</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue Sep 18 17:02:14 2018.--> - <sdk:size>57830695</sdk:size> - <sdk:checksum type="sha1">ea6f2f7103cd9da9ff0bdf6e37fbbba548fa4165</sdk:checksum> - <sdk:url>build-tools_r28.0.3-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Tue Sep 18 17:02:10 2018.--> - <sdk:size>57133581</sdk:size> - <sdk:checksum type="sha1">f8c333a2991b1ab05a671bc6248b78e00edcd83a</sdk:checksum> - <sdk:url>build-tools_r28.0.3-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Tue Sep 18 17:02:07 2018.--> - <sdk:size>58393729</sdk:size> - <sdk:checksum type="sha1">05bd35bb48d11c848da2b393c6f864eb609aacba</sdk:checksum> - <sdk:url>build-tools_r28.0.3-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:4913185, branch:pi-sdk-release--> - <sdk:revision> - <sdk:major>28</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>2</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Wed Jul 25 20:19:09 2018.--> - <sdk:size>57754663</sdk:size> - <sdk:checksum type="sha1">b4492209810a3fd48deaa982f9852fef12433d55</sdk:checksum> - <sdk:url>build-tools_r28.0.2-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Wed Jul 25 20:19:05 2018.--> - <sdk:size>57057554</sdk:size> - <sdk:checksum type="sha1">c10dd5a7825578622fb362a8a34f76eb3ba0c0a9</sdk:checksum> - <sdk:url>build-tools_r28.0.2-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Wed Jul 25 20:19:01 2018.--> - <sdk:size>58317692</sdk:size> - <sdk:checksum type="sha1">e9c570c568a0c2a32e88ee3204279019ebefd949</sdk:checksum> - <sdk:url>build-tools_r28.0.2-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:4860066, branch:pi-preview4-release--> - <sdk:revision> - <sdk:major>28</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>1</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue Jun 26 16:23:22 2018.--> - <sdk:size>57610954</sdk:size> - <sdk:checksum type="sha1">ee70dfa1fccb58b37cebc9544830511f36a137a0</sdk:checksum> - <sdk:url>build-tools_r28.0.1-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Tue Jun 26 16:23:20 2018.--> - <sdk:size>56913869</sdk:size> - <sdk:checksum type="sha1">aeef42ad953f1630dd6f5d71eefdc0b825211462</sdk:checksum> - <sdk:url>build-tools_r28.0.1-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Tue Jun 26 16:23:17 2018.--> - <sdk:size>58173989</sdk:size> - <sdk:checksum type="sha1">29c6342835734be25b9e458ab3fad5750ad6a355</sdk:checksum> - <sdk:url>build-tools_r28.0.1-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:4799589, branch:pi-preview3-release--> - <sdk:revision> - <sdk:major>28</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>0</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Wed May 23 16:22:51 2018.--> - <sdk:size>37157769</sdk:size> - <sdk:checksum type="sha1">d9f8a754d833ccd334f56fcc6089c5925cd82abb</sdk:checksum> - <sdk:url>build-tools_r28-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Wed May 23 16:22:49 2018.--> - <sdk:size>36458977</sdk:size> - <sdk:checksum type="sha1">72088d32d1d82cc3c2cf7cf6618b6130c0c84ade</sdk:checksum> - <sdk:url>build-tools_r28-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Wed May 23 16:22:47 2018.--> - <sdk:size>37718995</sdk:size> - <sdk:checksum type="sha1">d4b0638a877ed570e07876264e69fdbd86409610</sdk:checksum> - <sdk:url>build-tools_r28-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:4758566, branch:pi-preview2-release--> - <sdk:revision> - <sdk:major>28</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>0</sdk:micro> - <sdk:preview>2</sdk:preview> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Thu May 3 14:26:31 2018.--> - <sdk:size>37151124</sdk:size> - <sdk:checksum type="sha1">efe9c0dde0646a07544c864276390ca6e96b24dc</sdk:checksum> - <sdk:url>build-tools_r28-rc2-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Thu May 3 14:26:27 2018.--> - <sdk:size>36449480</sdk:size> - <sdk:checksum type="sha1">0d0314b353589feb10e528b44c5a685b6658d797</sdk:checksum> - <sdk:url>build-tools_r28-rc2-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Thu May 3 14:26:24 2018.--> - <sdk:size>37716459</sdk:size> - <sdk:checksum type="sha1">a94bfb52b4ec74b95c116236c3e382e923cad6c4</sdk:checksum> - <sdk:url>build-tools_r28-rc2-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:4614665, branch:git_pi-release--> - <sdk:revision> - <sdk:major>28</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>0</sdk:micro> - <sdk:preview>1</sdk:preview> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sat Jun 16 20:06:20 2018.--> - <sdk:size>38703535</sdk:size> - <sdk:checksum type="sha1">1601977fae25fd478bcfaa0481ca5ea3c609d840</sdk:checksum> - <sdk:url>build-tools_r28-rc1-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Sun Jun 10 21:05:54 2018.--> - <sdk:size>38004795</sdk:size> - <sdk:checksum type="sha1">2c77821967a2330b7b227072d0b1c02ef19fe2fc</sdk:checksum> - <sdk:url>build-tools_r28-rc1-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Sat Jun 9 11:13:53 2018.--> - <sdk:size>39273232</sdk:size> - <sdk:checksum type="sha1">fbf46c33d1268f6532911707b2a05033fd5c5b41</sdk:checksum> - <sdk:url>build-tools_r28-rc1-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:4507799, branch:git_oc-mr1-sdk-release--> - <sdk:revision> - <sdk:major>27</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>3</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Fri Jun 15 01:14:40 2018.--> - <sdk:size>54478554</sdk:size> - <sdk:checksum type="sha1">d85e7a6320eddffe7eeace3437605079dac938ca</sdk:checksum> - <sdk:url>build-tools_r27.0.3-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Fri Jun 15 02:46:10 2018.--> - <sdk:size>53867966</sdk:size> - <sdk:checksum type="sha1">61d9fb18790c68d66ff73bf1e7ad56bc1f1eef2d</sdk:checksum> - <sdk:url>build-tools_r27.0.3-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Mon Jun 18 21:09:43 2018.--> - <sdk:size>55194255</sdk:size> - <sdk:checksum type="sha1">0df61e11713a2838d2cc9a911219dddf5e6a2749</sdk:checksum> - <sdk:url>build-tools_r27.0.3-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:4458339, branch:git_oc-mr1-sdk-release--> - <sdk:revision> - <sdk:major>27</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>2</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Mon Jun 4 08:42:16 2018.--> - <sdk:size>54458153</sdk:size> - <sdk:checksum type="sha1">b687ddf6be84f11607871138aad32cf857d0b837</sdk:checksum> - <sdk:url>build-tools_r27.0.2-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Mon Jun 11 15:49:30 2018.--> - <sdk:size>53846615</sdk:size> - <sdk:checksum type="sha1">6d5d9cf2a47877f273f4b742b19e712a051a31be</sdk:checksum> - <sdk:url>build-tools_r27.0.2-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Mon May 21 01:11:23 2018.--> - <sdk:size>55173070</sdk:size> - <sdk:checksum type="sha1">b80466c13b75e3ebf3c546964f40775db5898b2a</sdk:checksum> - <sdk:url>build-tools_r27.0.2-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:4429804, branch:git_oc-mr1-release--> - <sdk:revision> - <sdk:major>27</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>1</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Wed Jun 13 21:53:36 2018.--> - <sdk:size>54450260</sdk:size> - <sdk:checksum type="sha1">7f4eedb1077ef948b848040dcd15de9e8a759f4a</sdk:checksum> - <sdk:url>build-tools_r27.0.1-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Thu May 17 21:44:36 2018.--> - <sdk:size>53838762</sdk:size> - <sdk:checksum type="sha1">1edd07bfdbadd95652d093040e16d858f7489594</sdk:checksum> - <sdk:url>build-tools_r27.0.1-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Sun Jun 10 07:28:26 2018.--> - <sdk:size>55171114</sdk:size> - <sdk:checksum type="sha1">18109db020c6d088d0157d1df201d31bc6970875</sdk:checksum> - <sdk:url>build-tools_r27.0.1-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:4402310, branch:git_oc-mr1-release--> - <sdk:revision> - <sdk:major>27</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>0</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sun Jun 3 03:24:44 2018.--> - <sdk:size>54441725</sdk:size> - <sdk:checksum type="sha1">28542332ba97cf4a08c3eddfcf5edd70e3cf1260</sdk:checksum> - <sdk:url>build-tools_r27-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Sat Jun 9 15:50:22 2018.--> - <sdk:size>53831513</sdk:size> - <sdk:checksum type="sha1">fb4e8d7e6b8d29a77090e34024077a80458d5ae1</sdk:checksum> - <sdk:url>build-tools_r27-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Wed Jun 13 05:13:49 2018.--> - <sdk:size>55163097</sdk:size> - <sdk:checksum type="sha1">4f1df22a6d99261d2160d624b81445da0a027dbe</sdk:checksum> - <sdk:url>build-tools_r27-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:4420879, branch:git_oc-mr1-release--> - <sdk:revision> - <sdk:major>26</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>3</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Fri May 18 19:01:05 2018.--> - <sdk:size>54449983</sdk:size> - <sdk:checksum type="sha1">8a2e6c1bcd845844523a68aa17e5442f0dce328c</sdk:checksum> - <sdk:url>build-tools_r26.0.3-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Sat May 26 11:11:32 2018.--> - <sdk:size>53839758</sdk:size> - <sdk:checksum type="sha1">5bb90ed935d99e5bc90686f43b852e68c5ad40df</sdk:checksum> - <sdk:url>build-tools_r26.0.3-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Mon Jun 4 23:32:18 2018.--> - <sdk:size>55170919</sdk:size> - <sdk:checksum type="sha1">460e511a9616b4661cc8dba0102d9d990ae60160</sdk:checksum> - <sdk:url>build-tools_r26.0.3-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:4355572, branch:git_oc-mr1-release--> - <sdk:revision> - <sdk:major>26</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>2</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Wed May 23 14:33:19 2018.--> - <sdk:size>54440678</sdk:size> - <sdk:checksum type="sha1">5b2b7b66c7bf2151f2af183b5b50a17808850592</sdk:checksum> - <sdk:url>build-tools_r26.0.2-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Wed Jun 6 07:17:54 2018.--> - <sdk:size>53830573</sdk:size> - <sdk:checksum type="sha1">d9ed7c7f149ce38be5dc08979aea8acec1459ca0</sdk:checksum> - <sdk:url>build-tools_r26.0.2-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Mon Jun 11 07:41:38 2018.--> - <sdk:size>55161474</sdk:size> - <sdk:checksum type="sha1">39ca02d3faa49859cd9d1bc0adc2f331017b699b</sdk:checksum> - <sdk:url>build-tools_r26.0.2-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:4187382, branch:git_oc-release--> - <sdk:revision> - <sdk:major>26</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>1</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Fri Jun 8 18:48:52 2018.--> - <sdk:size>54113329</sdk:size> - <sdk:checksum type="sha1">5378c2c78091b414d0eac40a6bd37f2faa31a365</sdk:checksum> - <sdk:url>build-tools_r26.0.1-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Wed Jun 13 12:42:53 2018.--> - <sdk:size>53266653</sdk:size> - <sdk:checksum type="sha1">cbde59de198916b390777dd0227921bfa2120832</sdk:checksum> - <sdk:url>build-tools_r26.0.1-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Tue Jun 5 10:41:28 2018.--> - <sdk:size>54936185</sdk:size> - <sdk:checksum type="sha1">02494c80ffbe65bfff0aaa7463c9692693327b7d</sdk:checksum> - <sdk:url>build-tools_r26.0.1-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:4062713, branch:git_oc-preview3-sdk--> - <sdk:revision> - <sdk:major>26</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>0</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sat May 26 02:59:29 2018.--> - <sdk:size>53854197</sdk:size> - <sdk:checksum type="sha1">1cbe72929876f8a872ab1f1b1040a9f720261f59</sdk:checksum> - <sdk:url>build-tools_r26-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Sat Jun 9 20:38:32 2018.--> - <sdk:size>53010814</sdk:size> - <sdk:checksum type="sha1">d01a1aeca03747245f1f5936b3cb01759c66d086</sdk:checksum> - <sdk:url>build-tools_r26-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Thu May 31 06:40:23 2018.--> - <sdk:size>54681641</sdk:size> - <sdk:checksum type="sha1">896ebd31117c09db220f7a3116cc0e5121c78b9d</sdk:checksum> - <sdk:url>build-tools_r26-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:4004883, branch:git_oc-preview2-sdk--> - <sdk:revision> - <sdk:major>26</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>0</sdk:micro> - <sdk:preview>2</sdk:preview> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue May 22 14:01:05 2018.--> - <sdk:size>53847560</sdk:size> - <sdk:checksum type="sha1">629bbd8d2e415bf64871fb0b4c0540fd6d0347a0</sdk:checksum> - <sdk:url>build-tools_r26-rc2-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Sat May 26 08:16:12 2018.--> - <sdk:size>53003874</sdk:size> - <sdk:checksum type="sha1">cb1eb738a1f7003025af267a9b8cc2d259533c70</sdk:checksum> - <sdk:url>build-tools_r26-rc2-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Mon Jun 18 00:43:07 2018.--> - <sdk:size>54678375</sdk:size> - <sdk:checksum type="sha1">ddaba77db0557a98f6330fbd579ad0bd12cbb152</sdk:checksum> - <sdk:url>build-tools_r26-rc2-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-preview-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:3821161, branch:git_oc-preview-release--> - <sdk:revision> - <sdk:major>26</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>0</sdk:micro> - <sdk:preview>1</sdk:preview> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sun May 27 22:43:40 2018.--> - <sdk:size>53648603</sdk:size> - <sdk:checksum type="sha1">8cd6388dc96db2d7a49d06159cf990d3bbc78d04</sdk:checksum> - <sdk:url>build-tools_r26-rc1-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Tue Jun 12 18:41:58 2018.--> - <sdk:size>52821129</sdk:size> - <sdk:checksum type="sha1">5c5a1de7d5f4f000d36ae349229fe0be846d6137</sdk:checksum> - <sdk:url>build-tools_r26-rc1-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Sat May 26 12:23:48 2018.--> - <sdk:size>54379108</sdk:size> - <sdk:checksum type="sha1">43c2ddad3b67a5c33712ae14331a60673e69be91</sdk:checksum> - <sdk:url>build-tools_r26-rc1-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-preview-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:3907386, branch:git_nyc-mr1-sdk-dev--> - <sdk:revision> - <sdk:major>25</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>3</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Mon Jun 4 10:03:34 2018.--> - <sdk:size>50757258</sdk:size> - <sdk:checksum type="sha1">db95f3a0ae376534d4d69f4cdb6fad20649f3509</sdk:checksum> - <sdk:url>build-tools_r25.0.3-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Sat Jun 16 17:57:45 2018.--> - <sdk:size>50545085</sdk:size> - <sdk:checksum type="sha1">160d2fefb5ce68e443427fc30a793a703b63e26e</sdk:checksum> - <sdk:url>build-tools_r25.0.3-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Sat Jun 2 16:26:03 2018.--> - <sdk:size>51337442</sdk:size> - <sdk:checksum type="sha1">1edcb109ae5133aebfed573cf0bc84e0c353c28d</sdk:checksum> - <sdk:url>build-tools_r25.0.3-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:3544217, branch:git_nyc-mr1-sdk-dev--> - <sdk:revision> - <sdk:major>25</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>2</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Wed Jun 13 09:54:19 2018.--> - <sdk:size>49880329</sdk:size> - <sdk:checksum type="sha1">ff953c0177e317618fda40516f3e9d95fd43c7ae</sdk:checksum> - <sdk:url>build-tools_r25.0.2-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Tue May 29 08:01:46 2018.--> - <sdk:size>49667185</sdk:size> - <sdk:checksum type="sha1">12a5204bb3b6e39437535469fde7ddf42da46b16</sdk:checksum> - <sdk:url>build-tools_r25.0.2-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Thu Jun 7 23:11:35 2018.--> - <sdk:size>50458908</sdk:size> - <sdk:checksum type="sha1">2fee3c0704d6ecc480570450d8b8069b2c4a2dd4</sdk:checksum> - <sdk:url>build-tools_r25.0.2-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:3485210, branch:git_nyc-mr1-sdk-dev--> - <sdk:revision> - <sdk:major>25</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>1</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Fri May 25 11:51:28 2018.--> - <sdk:size>49880178</sdk:size> - <sdk:checksum type="sha1">ff063d252ab750d339f5947d06ff782836f22bac</sdk:checksum> - <sdk:url>build-tools_r25.0.1-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Mon May 21 03:26:16 2018.--> - <sdk:size>49667353</sdk:size> - <sdk:checksum type="sha1">7bf7f22d7d48ef20b6ab0e3d7a2912e5c088340f</sdk:checksum> - <sdk:url>build-tools_r25.0.1-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Wed May 30 20:26:28 2018.--> - <sdk:size>50458759</sdk:size> - <sdk:checksum type="sha1">c6c61393565ccf46349e7f44511e5db7c1c6169d</sdk:checksum> - <sdk:url>build-tools_r25.0.1-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:3359293, branch:git_nyc-mr1-sdk-dev--> - <sdk:revision> - <sdk:major>25</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>0</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sun Jun 3 08:35:42 2018.--> - <sdk:size>49872921</sdk:size> - <sdk:checksum type="sha1">f2bbda60403e75cabd0f238598c3b4dfca56ea44</sdk:checksum> - <sdk:url>build-tools_r25-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Tue Jun 5 22:55:37 2018.--> - <sdk:size>49659466</sdk:size> - <sdk:checksum type="sha1">273c5c29a65cbed00e44f3aa470bbd7dce556606</sdk:checksum> - <sdk:url>build-tools_r25-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Fri Jun 1 02:28:01 2018.--> - <sdk:size>50451378</sdk:size> - <sdk:checksum type="sha1">f9258f2308ff8b62cfc4513d40cb961612d07b6a</sdk:checksum> - <sdk:url>build-tools_r25-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:3303571, branch:git_nyc-sdk-dev--> - <sdk:revision> - <sdk:major>24</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>3</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sun Jun 10 09:52:06 2018.--> - <sdk:size>49779151</sdk:size> - <sdk:checksum type="sha1">9e8cc49d66e03fa1a8ecc1ac3e58f1324f5da304</sdk:checksum> - <sdk:url>build-tools_r24.0.3-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Tue May 22 10:05:55 2018.--> - <sdk:size>49568967</sdk:size> - <sdk:checksum type="sha1">a01c15f1b105c34595681075e1895d58b3fff48c</sdk:checksum> - <sdk:url>build-tools_r24.0.3-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Thu May 17 23:44:20 2018.--> - <sdk:size>50354788</sdk:size> - <sdk:checksum type="sha1">8b960d693fd4163caeb8dc5f5f5f80b10987089c</sdk:checksum> - <sdk:url>build-tools_r24.0.3-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:3209611, branch:git_nyc-sdk-dev--> - <sdk:revision> - <sdk:major>24</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>2</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Fri Jun 15 23:52:09 2018.--> - <sdk:size>48936295</sdk:size> - <sdk:checksum type="sha1">f199a7a788c3fefbed102eea34d6007737b803cf</sdk:checksum> - <sdk:url>build-tools_r24.0.2-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Fri Jun 8 05:11:05 2018.--> - <sdk:size>48726190</sdk:size> - <sdk:checksum type="sha1">8bb8fc575477491d5957de743089df412de55cda</sdk:checksum> - <sdk:url>build-tools_r24.0.2-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Fri Jun 15 23:26:15 2018.--> - <sdk:size>49512513</sdk:size> - <sdk:checksum type="sha1">09586a1f1c39bcfa7db5205c9a07837247deb67e</sdk:checksum> - <sdk:url>build-tools_r24.0.2-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:3208200, branch:git_nyc-dev--> - <sdk:revision> - <sdk:major>24</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>1</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Mon May 28 07:24:53 2018.--> - <sdk:size>48936286</sdk:size> - <sdk:checksum type="sha1">84f18c392919a074fcbb9b1d967984e6b2fef8b4</sdk:checksum> - <sdk:url>build-tools_r24.0.1-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Thu Jun 14 02:41:05 2018.--> - <sdk:size>48726085</sdk:size> - <sdk:checksum type="sha1">5c6457fcdfa07724fb086d8ff4e8316fc0742848</sdk:checksum> - <sdk:url>build-tools_r24.0.1-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Tue Jun 12 21:59:52 2018.--> - <sdk:size>49511883</sdk:size> - <sdk:checksum type="sha1">ac4a7cea42c3ef74d7fbf1b992fad311c550034e</sdk:checksum> - <sdk:url>build-tools_r24.0.1-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:2964546, branch:git_nyc-preview-release--> - <sdk:revision> - <sdk:major>24</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>0</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Thu May 31 15:18:44 2018.--> - <sdk:size>48960919</sdk:size> - <sdk:checksum type="sha1">c6271c4d78a5612ea6c7150688bcd5b7313de8d1</sdk:checksum> - <sdk:url>build-tools_r24-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Sun Jun 10 20:05:01 2018.--> - <sdk:size>48747930</sdk:size> - <sdk:checksum type="sha1">97fc4ed442f23989cc488d02c1d1de9bdde241de</sdk:checksum> - <sdk:url>build-tools_r24-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Sun Jun 10 15:13:01 2018.--> - <sdk:size>49535326</sdk:size> - <sdk:checksum type="sha1">dc61b9e5b451a0c3ec42ae2b1ce27c4d3c8da9f7</sdk:checksum> - <sdk:url>build-tools_r24-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:2355899, branch:git_mnc-dev--> - <sdk:revision> - <sdk:major>23</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>2</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sat May 19 00:00:21 2018.--> - <sdk:size>39071201</sdk:size> - <sdk:checksum type="sha1">8a9f2b37f6fcf7a9fa784dc21aeaeb41bbb9f2c3</sdk:checksum> - <sdk:url>build-tools_r23.0.2-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Sun May 27 14:18:27 2018.--> - <sdk:size>38060914</sdk:size> - <sdk:checksum type="sha1">482c4cbceef8ff58aefd92d8155a38610158fdaf</sdk:checksum> - <sdk:url>build-tools_r23.0.2-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Mon Jun 18 16:23:02 2018.--> - <sdk:size>38217626</sdk:size> - <sdk:checksum type="sha1">fc3a92c744d3ba0a16ccb5d2b41eea5974ce0a96</sdk:checksum> - <sdk:url>build-tools_r23.0.2-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:2679779, branch:git_mnc-dev--> - <sdk:revision> - <sdk:major>23</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>3</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue Jun 12 12:39:27 2018.--> - <sdk:size>40733174</sdk:size> - <sdk:checksum type="sha1">368f2600feac7e9b511b82f53d1f2240ae4a91a3</sdk:checksum> - <sdk:url>build-tools_r23.0.3-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Fri Jun 8 14:28:55 2018.--> - <sdk:size>39679533</sdk:size> - <sdk:checksum type="sha1">fbc98cd303fd15a31d472de6c03bd707829f00b0</sdk:checksum> - <sdk:url>build-tools_r23.0.3-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Sat Jun 9 16:05:42 2018.--> - <sdk:size>39869945</sdk:size> - <sdk:checksum type="sha1">c6d8266c6a3243c8f1e41b786c0e3cee4c781263</sdk:checksum> - <sdk:url>build-tools_r23.0.3-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:2201634, branch:git_mnc-sdk-release--> - <sdk:revision> - <sdk:major>23</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>1</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sun Jun 17 12:24:05 2018.--> - <sdk:size>39069295</sdk:size> - <sdk:checksum type="sha1">b6ba7c399d5fa487d95289d8832e4ad943aed556</sdk:checksum> - <sdk:url>build-tools_r23.0.1-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Tue Jun 12 04:52:07 2018.--> - <sdk:size>38059328</sdk:size> - <sdk:checksum type="sha1">d96ec1522721e9a179ae2c591c99f75d31d39718</sdk:checksum> - <sdk:url>build-tools_r23.0.1-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Sat May 26 01:11:05 2018.--> - <sdk:size>38558889</sdk:size> - <sdk:checksum type="sha1">cc1d37231d228f7a6f130e1f8d8c940052f0f8ab</sdk:checksum> - <sdk:url>build-tools_r23.0.1-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:2166767, branch:git_mnc-release--> - <sdk:obsolete/> - <sdk:revision> - <sdk:major>23</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>0</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sat Jun 2 10:17:50 2018.--> - <sdk:size>39080519</sdk:size> - <sdk:checksum type="sha1">c1d6209212b01469f80fa804e0c1d39a06bc9060</sdk:checksum> - <sdk:url>build-tools_r23-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Wed Jun 13 23:09:27 2018.--> - <sdk:size>38070540</sdk:size> - <sdk:checksum type="sha1">90ba6e716f7703a236cd44b2e71c5ff430855a03</sdk:checksum> - <sdk:url>build-tools_r23-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Sat May 19 18:49:10 2018.--> - <sdk:size>38570715</sdk:size> - <sdk:checksum type="sha1">3874948f35f2f8946597679cc6e9151449f23b5d</sdk:checksum> - <sdk:url>build-tools_r23-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:1793126, branch:git_lmp-mr1-sdk-release--> - <sdk:revision> - <sdk:major>22</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>1</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Thu Jun 14 19:03:49 2018.--> - <sdk:size>33104577</sdk:size> - <sdk:checksum type="sha1">da8b9c5c3ede39298e6cf0283c000c2ee9029646</sdk:checksum> - <sdk:url>build-tools_r22.0.1-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Mon Jun 11 09:42:44 2018.--> - <sdk:size>33646102</sdk:size> - <sdk:checksum type="sha1">53dad7f608e01d53b17176ba11165acbfccc5bbf</sdk:checksum> - <sdk:url>build-tools_r22.0.1-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Sat Jun 2 09:57:53 2018.--> - <sdk:size>33254137</sdk:size> - <sdk:checksum type="sha1">61d8cbe069d9e0a57872a83e5e5abe164b7d52cf</sdk:checksum> - <sdk:url>build-tools_r22.0.1-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:1764203, branch:git_lmp-mr1-sdk-release--> - <sdk:obsolete/> - <sdk:revision> - <sdk:major>22</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>0</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Wed May 30 05:04:37 2018.--> - <sdk:size>33104280</sdk:size> - <sdk:checksum type="sha1">a8a1619dd090e44fac957bce6842e62abf87965b</sdk:checksum> - <sdk:url>build-tools_r22-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Sat May 26 11:13:48 2018.--> - <sdk:size>33646090</sdk:size> - <sdk:checksum type="sha1">af95429b24088d704bc5db9bd606e34ac1b82c0d</sdk:checksum> - <sdk:url>build-tools_r22-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Sat May 26 03:19:55 2018.--> - <sdk:size>33254114</sdk:size> - <sdk:checksum type="sha1">08fcca41e81b172bd9f570963b90d3a84929e043</sdk:checksum> - <sdk:url>build-tools_r22-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:1635773, branch:git_lmp-sdk-release--> - <sdk:revision> - <sdk:major>21</sdk:major> - <sdk:minor>1</sdk:minor> - <sdk:micro>2</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Wed Jun 13 11:02:29 2018.--> - <sdk:size>32637678</sdk:size> - <sdk:checksum type="sha1">5e35259843bf2926113a38368b08458735479658</sdk:checksum> - <sdk:url>build-tools_r21.1.2-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Tue May 29 13:57:42 2018.--> - <sdk:size>33152878</sdk:size> - <sdk:checksum type="sha1">e7c906b4ba0eea93b32ba36c610dbd6b204bff48</sdk:checksum> - <sdk:url>build-tools_r21.1.2-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Tue May 29 12:10:34 2018.--> - <sdk:size>32792587</sdk:size> - <sdk:checksum type="sha1">1d944759c47f60e634d2b8a1f3a4259be2f8d652</sdk:checksum> - <sdk:url>build-tools_r21.1.2-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:1559046, branch:git_lmp-sdk-release--> - <sdk:obsolete/> - <sdk:revision> - <sdk:major>21</sdk:major> - <sdk:minor>1</sdk:minor> - <sdk:micro>1</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sun Jun 3 21:41:00 2018.--> - <sdk:size>32642454</sdk:size> - <sdk:checksum type="sha1">1c712ee3a1ba5a8b0548f9c32f17d4a0ddfd727d</sdk:checksum> - <sdk:url>build-tools_r21.1.1-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Mon May 28 13:35:06 2018.--> - <sdk:size>33157676</sdk:size> - <sdk:checksum type="sha1">836a146eab0504aa9387a5132e986fe7c7381571</sdk:checksum> - <sdk:url>build-tools_r21.1.1-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Thu Jun 14 17:16:57 2018.--> - <sdk:size>32797356</sdk:size> - <sdk:checksum type="sha1">53fc4201237f899d5cd92f0b76ad41fb89da188b</sdk:checksum> - <sdk:url>build-tools_r21.1.1-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:1552913, branch:git_lmp-sdk-release--> - <sdk:obsolete/> - <sdk:revision> - <sdk:major>21</sdk:major> - <sdk:minor>1</sdk:minor> - <sdk:micro>0</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue Jun 12 23:37:47 2018.--> - <sdk:size>32642820</sdk:size> - <sdk:checksum type="sha1">b7455e543784d52a8925f960bc880493ed1478cb</sdk:checksum> - <sdk:url>build-tools_r21.1-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Sun Jun 3 03:22:22 2018.--> - <sdk:size>33158159</sdk:size> - <sdk:checksum type="sha1">df619356c2359aa5eacdd48699d15b335d9bd246</sdk:checksum> - <sdk:url>build-tools_r21.1-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Wed Jun 13 10:53:39 2018.--> - <sdk:size>32797810</sdk:size> - <sdk:checksum type="sha1">c79d63ac6b713a1e326ad4dae43f2ee76708a2f4</sdk:checksum> - <sdk:url>build-tools_r21.1-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:1532339, branch:git_lmp-release--> - <sdk:obsolete/> - <sdk:revision> - <sdk:major>21</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>2</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sat May 26 15:43:32 2018.--> - <sdk:size>22153122</sdk:size> - <sdk:checksum type="sha1">e1236ab8897b62b57414adcf04c132567b2612a5</sdk:checksum> - <sdk:url>build-tools_r21.0.2-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Sun Jun 10 08:07:31 2018.--> - <sdk:size>22668597</sdk:size> - <sdk:checksum type="sha1">f17471c154058f3734729ef3cc363399b1cd3de1</sdk:checksum> - <sdk:url>build-tools_r21.0.2-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Mon Jun 4 04:34:43 2018.--> - <sdk:size>22306371</sdk:size> - <sdk:checksum type="sha1">37496141b23cbe633167927b7abe6e22d9f1a1c1</sdk:checksum> - <sdk:url>build-tools_r21.0.2-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:1525922, branch:git_lmp-release--> - <sdk:obsolete/> - <sdk:revision> - <sdk:major>21</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>1</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Mon May 21 01:06:40 2018.--> - <sdk:size>22153013</sdk:size> - <sdk:checksum type="sha1">e573069eea3e5255e7a65bedeb767f4fd0a5f49a</sdk:checksum> - <sdk:url>build-tools_r21.0.1-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Sat Jun 9 12:04:35 2018.--> - <sdk:size>22668616</sdk:size> - <sdk:checksum type="sha1">b60c8f9b810c980abafa04896706f3911be1ade7</sdk:checksum> - <sdk:url>build-tools_r21.0.1-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Mon Jun 11 17:48:54 2018.--> - <sdk:size>22306243</sdk:size> - <sdk:checksum type="sha1">d68e7e6fd7a48c8759aa41d713c9d4f0e4c1c1df</sdk:checksum> - <sdk:url>build-tools_r21.0.1-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:1521886, branch:git_lmp-release--> - <sdk:obsolete/> - <sdk:revision> - <sdk:major>21</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>0</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue Jun 12 23:16:22 2018.--> - <sdk:size>22153145</sdk:size> - <sdk:checksum type="sha1">4933328fdeecbd554a29528f254f4993468e1cf4</sdk:checksum> - <sdk:url>build-tools_r21-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Mon Jun 4 10:47:41 2018.--> - <sdk:size>22668456</sdk:size> - <sdk:checksum type="sha1">9bef7989b51436bd4e5114d8a0330359f077cbfa</sdk:checksum> - <sdk:url>build-tools_r21-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Mon Jun 4 08:31:36 2018.--> - <sdk:size>22306371</sdk:size> - <sdk:checksum type="sha1">5bc8fd399bc0135a9bc91eec78ddc5af4f54bf32</sdk:checksum> - <sdk:url>build-tools_r21-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:1246132, branch:git_klp-modular-release--> - <sdk:revision> - <sdk:major>20</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>0</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Wed May 30 04:41:59 2018.--> - <sdk:size>21445463</sdk:size> - <sdk:checksum type="sha1">b688905526a5584d1327a662d871a635ff502758</sdk:checksum> - <sdk:url>build-tools_r20-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Thu Jun 7 14:45:22 2018.--> - <sdk:size>21650508</sdk:size> - <sdk:checksum type="sha1">1240f629411c108a714c4ddd756937c7fab93f83</sdk:checksum> - <sdk:url>build-tools_r20-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Mon Jun 4 07:14:07 2018.--> - <sdk:size>20828006</sdk:size> - <sdk:checksum type="sha1">cf20720e452b642d5eb59dabe05c0c729b36ec75</sdk:checksum> - <sdk:url>build-tools_r20-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:1153987, branch:git_klp-sdk-release--> - <sdk:revision> - <sdk:major>19</sdk:major> - <sdk:minor>1</sdk:minor> - <sdk:micro>0</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Mon May 21 21:37:00 2018.--> - <sdk:size>21490972</sdk:size> - <sdk:checksum type="sha1">1ff20ac15fa47a75d00346ec12f180d531b3ca89</sdk:checksum> - <sdk:url>build-tools_r19.1-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Tue May 29 05:26:30 2018.--> - <sdk:size>21590160</sdk:size> - <sdk:checksum type="sha1">0d11aae3417de1efb4b9a0e0a7855904a61bcec1</sdk:checksum> - <sdk:url>build-tools_r19.1-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Fri Jun 1 00:37:10 2018.--> - <sdk:size>20812533</sdk:size> - <sdk:checksum type="sha1">13b367fbdbff8132cb4356f716e8dc8a8df745c5</sdk:checksum> - <sdk:url>build-tools_r19.1-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:1035858, branch:git_klp-sdk-release--> - <sdk:obsolete/> - <sdk:revision> - <sdk:major>19</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>3</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sat May 26 14:59:05 2018.--> - <sdk:size>21462150</sdk:size> - <sdk:checksum type="sha1">c2d6055478e9d2d4fba476ee85f99181ddd1160c</sdk:checksum> - <sdk:url>build-tools_r19.0.3-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Sun May 20 19:28:53 2018.--> - <sdk:size>21563992</sdk:size> - <sdk:checksum type="sha1">651cf8754373b2d52e7f6aab2c52eabffe4e9ea4</sdk:checksum> - <sdk:url>build-tools_r19.0.3-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Wed Jun 13 12:26:28 2018.--> - <sdk:size>20730715</sdk:size> - <sdk:checksum type="sha1">cb46b433b67a0a6910ff00db84be8b527ea3102f</sdk:checksum> - <sdk:url>build-tools_r19.0.3-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:1009316, branch:git_klp-sdk-release--> - <sdk:obsolete/> - <sdk:revision> - <sdk:major>19</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>2</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Mon Jun 4 07:15:16 2018.--> - <sdk:size>21352552</sdk:size> - <sdk:checksum type="sha1">a03a6bdea0091aea32e1b35b90a7294c9f04e3dd</sdk:checksum> - <sdk:url>build-tools_r19.0.2-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Wed Jun 13 06:24:09 2018.--> - <sdk:size>21453726</sdk:size> - <sdk:checksum type="sha1">145bc43065d45f756d99d87329d899052b9a9288</sdk:checksum> - <sdk:url>build-tools_r19.0.2-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Sat May 19 22:57:09 2018.--> - <sdk:size>20621117</sdk:size> - <sdk:checksum type="sha1">af664672d0d709c9ae30937b1062317d3ade7f95</sdk:checksum> - <sdk:url>build-tools_r19.0.2-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:938007, branch:git_klp-dev--> - <sdk:obsolete/> - <sdk:revision> - <sdk:major>19</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>1</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sat Jun 2 09:30:45 2018.--> - <sdk:size>21229048</sdk:size> - <sdk:checksum type="sha1">18d2312dc4368858914213087f4e61445aca4517</sdk:checksum> - <sdk:url>build-tools_r19.0.1-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Fri Jun 15 19:07:47 2018.--> - <sdk:size>21450597</sdk:size> - <sdk:checksum type="sha1">efaf50fb19a3edb8d03efbff76f89a249ad2920b</sdk:checksum> - <sdk:url>build-tools_r19.0.1-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Sun Jun 10 05:45:57 2018.--> - <sdk:size>20500648</sdk:size> - <sdk:checksum type="sha1">5ef422bac5b28f4ced108319ed4a6bc7050a6234</sdk:checksum> - <sdk:url>build-tools_r19.0.1-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:886418, branch:git_klp-release--> - <sdk:obsolete/> - <sdk:revision> - <sdk:major>19</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>0</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Wed May 30 04:04:22 2018.--> - <sdk:size>21339943</sdk:size> - <sdk:checksum type="sha1">55c1a6cf632e7d346f0002b275ec41fd3137fd83</sdk:checksum> - <sdk:url>build-tools_r19-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Fri Jun 15 01:37:33 2018.--> - <sdk:size>21441270</sdk:size> - <sdk:checksum type="sha1">86ec1c12db1bc446b7bcaefc5cc14eb361044e90</sdk:checksum> - <sdk:url>build-tools_r19-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Wed Jun 6 05:47:57 2018.--> - <sdk:size>20611447</sdk:size> - <sdk:checksum type="sha1">6edf505c20f5ece9c48fa0aff9a90488f9654d52</sdk:checksum> - <sdk:url>build-tools_r19-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:867478, branch:git_jb-mr2-dev--> - <sdk:obsolete/> - <sdk:revision> - <sdk:major>18</sdk:major> - <sdk:minor>1</sdk:minor> - <sdk:micro>1</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Thu May 24 00:01:04 2018.--> - <sdk:size>20229760</sdk:size> - <sdk:checksum type="sha1">68c9acbfc0cec2d51b19efaed39831a17055d998</sdk:checksum> - <sdk:url>build-tools_r18.1.1-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Tue May 22 07:45:01 2018.--> - <sdk:size>20452157</sdk:size> - <sdk:checksum type="sha1">a9d9d37f6ddf859e57abc78802a77aaa166e48d4</sdk:checksum> - <sdk:url>build-tools_r18.1.1-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Sun May 27 16:32:56 2018.--> - <sdk:size>19660000</sdk:size> - <sdk:checksum type="sha1">c4605066e2f851387ea70bc1442b1968bd7b4a15</sdk:checksum> - <sdk:url>build-tools_r18.1.1-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:819563, branch:git_jb-mr2-dev--> - <sdk:obsolete/> - <sdk:revision> - <sdk:major>18</sdk:major> - <sdk:minor>1</sdk:minor> - <sdk:micro>0</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Mon Jun 4 05:17:04 2018.--> - <sdk:size>20229298</sdk:size> - <sdk:checksum type="sha1">f314a0599e51397f0886fe888b50dd98f2f050d8</sdk:checksum> - <sdk:url>build-tools_r18.1-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Sun Jun 17 12:29:46 2018.--> - <sdk:size>20451524</sdk:size> - <sdk:checksum type="sha1">16ddb299b8b43063e5bb3387ec17147c5053dfd8</sdk:checksum> - <sdk:url>build-tools_r18.1-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Thu Jun 14 15:56:37 2018.--> - <sdk:size>19659547</sdk:size> - <sdk:checksum type="sha1">3a9810fc8559ab03c09378f07531e8cae2f1db30</sdk:checksum> - <sdk:url>build-tools_r18.1-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:754669, branch:git_jb-mr2-dev--> - <sdk:obsolete/> - <sdk:revision> - <sdk:major>18</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>1</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sun Jun 10 13:17:31 2018.--> - <sdk:size>16627330</sdk:size> - <sdk:checksum type="sha1">f11618492b0d2270c332325d45d752d3656a9640</sdk:checksum> - <sdk:url>build-tools_r18.0.1-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Mon May 21 16:08:02 2018.--> - <sdk:size>16633121</sdk:size> - <sdk:checksum type="sha1">d84f5692fb44d60fc53e5b2507cebf9f24626902</sdk:checksum> - <sdk:url>build-tools_r18.0.1-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Fri Jun 1 08:16:51 2018.--> - <sdk:size>15413527</sdk:size> - <sdk:checksum type="sha1">a6c2afd0b6289d589351956d2f5212b37014ca7d</sdk:checksum> - <sdk:url>build-tools_r18.0.1-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:build-tool> - <!--Generated from bid:673949, branch:git_jb-mr1.1-dev--> - <sdk:obsolete/> - <sdk:revision> - <sdk:major>17</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>0</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sat Jun 2 14:13:23 2018.--> - <sdk:size>11696007</sdk:size> - <sdk:checksum type="sha1">2c2872bc3806aabf16a12e3959c2183ddc866e6d</sdk:checksum> - <sdk:url>build-tools_r17-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Tue Jun 19 09:33:42 2018.--> - <sdk:size>12208114</sdk:size> - <sdk:checksum type="sha1">602ee709be9dbb8f179b1e4075148a57f9419930</sdk:checksum> - <sdk:url>build-tools_r17-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Fri Jun 8 13:26:17 2018.--> - <sdk:size>11004914</sdk:size> - <sdk:checksum type="sha1">899897d327b0bad492d3a40d3db4d96119c15bc0</sdk:checksum> - <sdk:url>build-tools_r17-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:build-tool> - <sdk:platform-tool> - <!--Generated from bid:4986621, branch:aosp-sdk-release--> - <sdk:revision> - <sdk:major>28</sdk:major> - <sdk:minor>0</sdk:minor> - <sdk:micro>1</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Fri Aug 31 09:51:45 2018.--> - <sdk:size>6848749</sdk:size> - <sdk:checksum type="sha1">ed1edad4a48c27655ce98d0a5821e7296e9de145</sdk:checksum> - <sdk:url>platform-tools_r28.0.1-darwin.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Fri Aug 31 09:51:40 2018.--> - <sdk:size>6843966</sdk:size> - <sdk:checksum type="sha1">74ff83bc203f01c4f04bd9316ab5a2573f023fd1</sdk:checksum> - <sdk:url>platform-tools_r28.0.1-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Fri Aug 31 09:51:43 2018.--> - <sdk:size>6183783</sdk:size> - <sdk:checksum type="sha1">5a44d10d41725aa718c71b6e44bc2dea6f1a7f49</sdk:checksum> - <sdk:url>platform-tools_r28.0.1-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:platform-tool> - <sdk:tool> - <!--Generated from bid:3567187, branch:aosp-emu-2.2-release--> - <sdk:revision> - <sdk:major>25</sdk:major> - <sdk:minor>2</sdk:minor> - <sdk:micro>5</sdk:micro> - </sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Mon May 21 14:06:04 2018.--> - <sdk:size>277894900</sdk:size> - <sdk:checksum type="sha1">72df3aa1988c0a9003ccdfd7a13a7b8bd0f47fc1</sdk:checksum> - <sdk:url>tools_r25.2.5-linux.zip</sdk:url> - <sdk:host-os>linux</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Thu May 31 17:55:03 2018.--> - <sdk:size>200529982</sdk:size> - <sdk:checksum type="sha1">d2168d963ac5b616e3d3ddaf21511d084baf3659</sdk:checksum> - <sdk:url>tools_r25.2.5-macosx.zip</sdk:url> - <sdk:host-os>macosx</sdk:host-os> - </sdk:archive> - <sdk:archive> - <!--Built on: Thu Jun 7 09:09:48 2018.--> - <sdk:size>306785944</sdk:size> - <sdk:checksum type="sha1">a7f7ebeae1c8d8f62d3a8466e9c81baee7cc31ca</sdk:checksum> - <sdk:url>tools_r25.2.5-windows.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:min-platform-tools-rev> - <sdk:major>20</sdk:major> - </sdk:min-platform-tools-rev> - </sdk:tool> - <sdk:doc> - <!--Generated from bid:3249234, branch:git_nyc-emu-release--> - <sdk:api-level>24</sdk:api-level> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Thu Jun 14 09:35:24 2018.--> - <sdk:size>419477967</sdk:size> - <sdk:checksum type="sha1">eef58238949ee9544876cb3e002f2d58e4ee7b5d</sdk:checksum> - <sdk:url>docs-24_r01.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - </sdk:doc> -</sdk:sdk-repository> diff --git a/pkgs/development/mobile/androidenv/sources.nix b/pkgs/development/mobile/androidenv/sources.nix deleted file mode 100644 index cca132e2774..00000000000 --- a/pkgs/development/mobile/androidenv/sources.nix +++ /dev/null @@ -1,184 +0,0 @@ - -# This file is generated from generate-sources.sh. DO NOT EDIT. -# Execute generate-sources.sh or fetch.sh to update the file. -{stdenv, fetchurl, unzip}: - -let - buildSource = args: - stdenv.mkDerivation (args // { - buildInputs = [ unzip ]; - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - }); -in -{ - - source_14 = buildSource { - name = "android-source-14"; - src = fetchurl { - url = https://dl.google.com/android/repository/sources-14_r01.zip; - sha1 = "eaf4ed7dcac46e68516a1b4aa5b0d9e5a39a7555"; - }; - meta = { - description = "Source code for Android API 14"; - }; - }; - - source_15 = buildSource { - name = "android-source-15"; - src = fetchurl { - url = https://dl.google.com/android/repository/sources-15_r02.zip; - sha1 = "e5992a5747c9590783fbbdd700337bf0c9f6b1fa"; - }; - meta = { - description = "Source code for Android API 15"; - }; - }; - - source_16 = buildSource { - name = "android-source-16"; - src = fetchurl { - url = https://dl.google.com/android/repository/sources-16_r02.zip; - sha1 = "0f83c14ed333c45d962279ab5d6bc98a0269ef84"; - }; - meta = { - description = "Source code for Android API 16"; - }; - }; - - source_17 = buildSource { - name = "android-source-17"; - src = fetchurl { - url = https://dl.google.com/android/repository/sources-17_r01.zip; - sha1 = "6f1f18cd2d2b1852d7f6892df9cee3823349d43a"; - }; - meta = { - description = "Source code for Android API 17"; - }; - }; - - source_18 = buildSource { - name = "android-source-18"; - src = fetchurl { - url = https://dl.google.com/android/repository/sources-18_r01.zip; - sha1 = "8b49fdf7433f4881a2bfb559b5dd05d8ec65fb78"; - }; - meta = { - description = "Source code for Android API 18"; - }; - }; - - source_19 = buildSource { - name = "android-source-19"; - src = fetchurl { - url = https://dl.google.com/android/repository/sources-19_r02.zip; - sha1 = "433a1d043ef77561571250e94cb7a0ef24a202e7"; - }; - meta = { - description = "Source code for Android API 19"; - }; - }; - - source_20 = buildSource { - name = "android-source-20"; - src = fetchurl { - url = https://dl.google.com/android/repository/sources-20_r01.zip; - sha1 = "8da3e40f2625f9f7ef38b7e403f49f67226c0d76"; - }; - meta = { - description = "Source code for Android API 20"; - }; - }; - - source_21 = buildSource { - name = "android-source-21"; - src = fetchurl { - url = https://dl.google.com/android/repository/sources-21_r01.zip; - sha1 = "137a5044915d32bea297a8c1552684802bbc2e25"; - }; - meta = { - description = "Source code for Android API 21"; - }; - }; - - source_22 = buildSource { - name = "android-source-22"; - src = fetchurl { - url = https://dl.google.com/android/repository/sources-22_r01.zip; - sha1 = "98320e13976d11597a4a730a8d203ac9a03ed5a6"; - }; - meta = { - description = "Source code for Android API 22"; - }; - }; - - source_23 = buildSource { - name = "android-source-23"; - src = fetchurl { - url = https://dl.google.com/android/repository/sources-23_r01.zip; - sha1 = "b0f15da2762b42f543c5e364c2b15b198cc99cc2"; - }; - meta = { - description = "Source code for Android API 23"; - }; - }; - - source_24 = buildSource { - name = "android-source-24"; - src = fetchurl { - url = https://dl.google.com/android/repository/sources-24_r01.zip; - sha1 = "6b96115830a83d654479f32ce4b724ca9011148b"; - }; - meta = { - description = "Source code for Android API 24"; - }; - }; - - source_25 = buildSource { - name = "android-source-25"; - src = fetchurl { - url = https://dl.google.com/android/repository/sources-25_r01.zip; - sha1 = "bbc72efd1a9bad87cc507e308f0d29aad438c52c"; - }; - meta = { - description = "Source code for Android API 25"; - }; - }; - - source_26 = buildSource { - name = "android-source-26"; - src = fetchurl { - url = https://dl.google.com/android/repository/sources-26_r01.zip; - sha1 = "2af701ee3223d580409288540b1d06932fd8f9b9"; - }; - meta = { - description = "Source code for Android API 26"; - }; - }; - - source_27 = buildSource { - name = "android-source-27"; - src = fetchurl { - url = https://dl.google.com/android/repository/sources-27_r01.zip; - sha1 = "7b714670561d08f54751af42aca929867b806596"; - }; - meta = { - description = "Source code for Android API 27"; - }; - }; - - source_28 = buildSource { - name = "android-source-28"; - src = fetchurl { - url = https://dl.google.com/android/repository/sources-28_r01.zip; - sha1 = "5610e0c24235ee3fa343c899ddd551be30315255"; - }; - meta = { - description = "Source code for Android API 28"; - }; - }; - -} diff --git a/pkgs/development/mobile/androidenv/support-repository.nix b/pkgs/development/mobile/androidenv/support-repository.nix deleted file mode 100644 index 55c1b60e965..00000000000 --- a/pkgs/development/mobile/androidenv/support-repository.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl, unzip}: - -stdenv.mkDerivation rec { - version = "47"; - name = "android-support-repository-r${version}"; - src = fetchurl { - url = "http://dl.google.com/android/repository/android_m2repository_r${version}.zip"; - sha256 = "1l13a6myff6i8x99h1ky2j5sglwy8wc0rsbxfcbif375vh41iyd3"; - }; - - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - - buildInputs = [ unzip ]; -} diff --git a/pkgs/development/mobile/androidenv/support.nix b/pkgs/development/mobile/androidenv/support.nix deleted file mode 100644 index 8198e96f7e7..00000000000 --- a/pkgs/development/mobile/androidenv/support.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl, unzip}: - -stdenv.mkDerivation rec { - version = "23.2.1"; - name = "android-support-r${version}"; - src = fetchurl { - url = "https://dl.google.com/android/repository/support_r${version}.zip"; - sha1 = "azl7hgps1k98kmbhw45wwbrc86y1n4j1"; - }; - - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - - buildInputs = [ unzip ]; -} diff --git a/pkgs/development/mobile/androidenv/sys-img.xml b/pkgs/development/mobile/androidenv/sys-img.xml deleted file mode 100644 index d7c8dd9de9b..00000000000 --- a/pkgs/development/mobile/androidenv/sys-img.xml +++ /dev/null @@ -1,1026 +0,0 @@ -<?xml version="1.0" ?> -<sdk:sdk-sys-img xmlns:sdk="http://schemas.android.com/sdk/android/sys-img/3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <!--Generated on 2018-09-27 12:07:51.414125 with ADRT.--> - <sdk:license id="android-sdk-license" type="text">Terms and Conditions - -This is the Android Software Development Kit License Agreement - -1. Introduction - -1.1 The Android Software Development Kit (referred to in the License Agreement as the "SDK" and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK. - -1.2 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time. - -1.3 A "compatible implementation" means any Android device that (i) complies with the Android Compatibility Definition document, which can be found at the Android compatibility website (http://source.android.com/compatibility) and which may be updated from time to time; and (ii) successfully passes the Android Compatibility Test Suite (CTS). - -1.4 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States. - - -2. Accepting the License Agreement - -2.1 In order to use the SDK, you must first agree to the License Agreement. You may not use the SDK if you do not accept the License Agreement. - -2.2 By clicking to accept, you hereby agree to the terms of the License Agreement. - -2.3 You may not use the SDK and may not accept the License Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries, including the country in which you are resident or from which you use the SDK. - -2.4 If you are agreeing to be bound by the License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the SDK on behalf of your employer or other entity. - - -3. SDK License from Google - -3.1 Subject to the terms of the License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable, non-exclusive, and non-sublicensable license to use the SDK solely to develop applications for compatible implementations of Android. - -3.2 You may not use this SDK to develop applications for other platforms (including non-compatible implementations of Android) or to develop another SDK. You are of course free to develop applications for other platforms, including non-compatible implementations of Android, provided that this SDK is not used for that purpose. - -3.3 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you. - -3.4 You may not use the SDK for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK. - -3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. - -3.6 You agree that the form and nature of the SDK that Google provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Google may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Google's sole discretion, without prior notice to you. - -3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features. - -3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK. - - -4. Use of the SDK by You - -4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications. - -4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) the License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries). - -4.3 You agree that if you use the SDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so. - -4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google or any mobile communications carrier. - -4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so. - -4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach. - -5. Your Developer Credentials - -5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials. - -6. Privacy and Information - -6.1 In order to continually innovate and improve the SDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the SDK are being used and how they are being used. Before any of this information is collected, the SDK will notify you and seek your consent. If you withhold consent, the information will not be collected. - -6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy. - - -7. Third Party Applications - -7.1 If you use the SDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources. - -7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners. - -7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, the License Agreement does not affect your legal relationship with these third parties. - - -8. Using Android APIs - -8.1 Google Data APIs - -8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service. - -8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. - - -9. Terminating the License Agreement - -9.1 The License Agreement will continue to apply until terminated by either you or Google as set out below. - -9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials. - -9.3 Google may at any time, terminate the License Agreement with you if: -(A) you have breached any provision of the License Agreement; or -(B) Google is required to do so by law; or -(C) the partner with whom Google offered certain parts of SDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the SDK to you; or -(D) Google decides to no longer provide the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service, or the provision of the SDK or certain SDK services to you by Google is, in Google's sole discretion, no longer commercially viable. - -9.4 When the License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst the License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely. - - -10. DISCLAIMER OF WARRANTIES - -10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE SDK IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE. - -10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. - -10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. - - -11. LIMITATION OF LIABILITY - -11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING. - - -12. Indemnification - -12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with the License Agreement. - - -13. Changes to the License Agreement - -13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available. - - -14. General Legal Terms - -14.1 The License Agreement constitutes the whole legal agreement between you and Google and governs your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the SDK. - -14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google. - -14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable. - -14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement. - -14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE. - -14.6 The rights granted in the License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under the License Agreement without the prior written approval of the other party. - -14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction. - - -November 20, 2015</sdk:license> - <sdk:license id="android-sdk-preview-license" type="text">To get started with the Android SDK Preview, you must agree to the following terms and conditions. -As described below, please note that this is a preview version of the Android SDK, subject to change, that you use at your own risk. The Android SDK Preview is not a stable release, and may contain errors and defects that can result in serious damage to your computer systems, devices and data. - -This is the Android SDK Preview License Agreement (the "License Agreement"). - -1. Introduction - -1.1 The Android SDK Preview (referred to in the License Agreement as the “Preview” and specifically including the Android system files, packaged APIs, and Preview library files, if and when they are made available) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the Preview. - -1.2 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time. - -1.3 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States. - -2. Accepting the License Agreement - -2.1 In order to use the Preview, you must first agree to the License Agreement. You may not use the Preview if you do not accept the License Agreement. - -2.2 By clicking to accept and/or using the Preview, you hereby agree to the terms of the License Agreement. - -2.3 You may not use the Preview and may not accept the License Agreement if you are a person barred from receiving the Preview under the laws of the United States or other countries including the country in which you are resident or from which you use the Preview. - -2.4 If you will use the Preview internally within your company or organization you agree to be bound by the License Agreement on behalf of your employer or other entity, and you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the Preview on behalf of your employer or other entity. - -3. Preview License from Google - -3.1 Subject to the terms of the License Agreement, Google grants you a royalty-free, non-assignable, non-exclusive, non-sublicensable, limited, revocable license to use the Preview, personally or internally within your company or organization, solely to develop applications to run on the Android platform. - -3.2 You agree that Google or third parties owns all legal right, title and interest in and to the Preview, including any Intellectual Property Rights that subsist in the Preview. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you. - -3.3 You may not use the Preview for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the Preview or any part of the Preview; or (b) load any part of the Preview onto a mobile handset or any other hardware device except a personal computer, combine any part of the Preview with other software, or distribute any software or device incorporating a part of the Preview. - -3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the Preview. - -3.5 Use, reproduction and distribution of components of the Preview licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. You agree to remain a licensee in good standing in regard to such open source software licenses under all the rights granted and to refrain from any actions that may terminate, suspend, or breach such rights. - -3.6 You agree that the form and nature of the Preview that Google provides may change without prior notice to you and that future versions of the Preview may be incompatible with applications developed on previous versions of the Preview. You agree that Google may stop (permanently or temporarily) providing the Preview (or any features within the Preview) to you or to users generally at Google's sole discretion, without prior notice to you. - -3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features. - -3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the Preview. - -4. Use of the Preview by You - -4.1 Google agrees that nothing in the License Agreement gives Google any right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the Preview, including any intellectual property rights that subsist in those applications. - -4.2 You agree to use the Preview and write applications only for purposes that are permitted by (a) the License Agreement, and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries). - -4.3 You agree that if you use the Preview to develop applications, you will protect the privacy and legal rights of users. If users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If users provide you with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, each user has given you permission to do so. - -4.4 You agree that you will not engage in any activity with the Preview, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of Google or any third party. - -4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so. - -4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach. - -4.7 The Preview is in development, and your testing and feedback are an important part of the development process. By using the Preview, you acknowledge that implementation of some features are still under development and that you should not rely on the Preview having the full functionality of a stable release. You agree not to publicly distribute or ship any application using this Preview as this Preview will no longer be supported after the official Android SDK is released. - -5. Your Developer Credentials - -5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials. - -6. Privacy and Information - -6.1 In order to continually innovate and improve the Preview, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the Preview are being used and how they are being used. Before any of this information is collected, the Preview will notify you and seek your consent. If you withhold consent, the information will not be collected. - -6.2 The data collected is examined in the aggregate to improve the Preview and is maintained in accordance with Google's Privacy Policy located at http://www.google.com/policies/privacy/. - -7. Third Party Applications - -7.1 If you use the Preview to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources. - -7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners. - -7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. - -8. Using Google APIs - -8.1 Google APIs - -8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service. - -8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. - -9. Terminating the License Agreement - -9.1 the License Agreement will continue to apply until terminated by either you or Google as set out below. - -9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the Preview and any relevant developer credentials. - -9.3 Google may at any time, terminate the License Agreement, with or without cause, upon notice to you. - -9.4 The License Agreement will automatically terminate without notice or other action upon the earlier of: -(A) when Google ceases to provide the Preview or certain parts of the Preview to users in the country in which you are resident or from which you use the service; and -(B) Google issues a final release version of the Android SDK. - -9.5 When the License Agreement is terminated, the license granted to you in the License Agreement will terminate, you will immediately cease all use of the Preview, and the provisions of paragraphs 10, 11, 12 and 14 shall survive indefinitely. - -10. DISCLAIMERS - -10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE PREVIEW IS AT YOUR SOLE RISK AND THAT THE PREVIEW IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE. - -10.2 YOUR USE OF THE PREVIEW AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE PREVIEW IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. WITHOUT LIMITING THE FOREGOING, YOU UNDERSTAND THAT THE PREVIEW IS NOT A STABLE RELEASE AND MAY CONTAIN ERRORS, DEFECTS AND SECURITY VULNERABILITIES THAT CAN RESULT IN SIGNIFICANT DAMAGE, INCLUDING THE COMPLETE, IRRECOVERABLE LOSS OF USE OF YOUR COMPUTER SYSTEM OR OTHER DEVICE. - -10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. - -11. LIMITATION OF LIABILITY - -11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING. - -12. Indemnification - -12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys’ fees) arising out of or accruing from (a) your use of the Preview, (b) any application you develop on the Preview that infringes any Intellectual Property Rights of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you of the License Agreement. - -13. Changes to the License Agreement - -13.1 Google may make changes to the License Agreement as it distributes new versions of the Preview. When these changes are made, Google will make a new version of the License Agreement available on the website where the Preview is made available. - -14. General Legal Terms - -14.1 the License Agreement constitutes the whole legal agreement between you and Google and governs your use of the Preview (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the Preview. - -14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google. - -14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable. - -14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement. - -14.5 EXPORT RESTRICTIONS. THE PREVIEW IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE PREVIEW. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE. - -14.6 The License Agreement may not be assigned or transferred by you without the prior written approval of Google, and any attempted assignment without such approval will be void. You shall not delegate your responsibilities or obligations under the License Agreement without the prior written approval of Google. - -14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction. - -June 2014.</sdk:license> - <sdk:license id="intel-android-sysimage-license" type="text">Intel Corporation Internal Evaluation License Agreement for x86 Android* System Images for Android Software Development Kit (SDK) -This Internal Evaluation License Agreement (this "Agreement") is entered into by and between Intel and you (as an individual developer or a legal entity -- identified below as Recipient). Intel shall provide the Evaluation Software to Recipient as described in accordance with the Internal Evaluation License Terms and Conditions. - -Definitions. -These terms shall have the following meanings: - -"Intel" or "INTEL" -Intel Corporation -With an Address of: -2200 Mission College Blvd. -Santa Clara, CA 95052 -Office of the General Counsel -Mail Stop: RNB-4-51 -Attn: Software and Services Group Legal - -"Evaluation Software" -The x86 Android* emulator system images for Android Software Development Kit (SDK), as provided by Intel. - -INTERNAL EVALUATION LICENSE TERMS AND CONDITIONS - -1. DEFINITIONS. - -1.1 Additional Defined Terms. "Agreement", "Evaluation Software", "Intel", "Non-disclosure Agreement", "Recipient", and "Effective Date" shall have the meanings ascribed to them on the signature page(s) of this Agreement. - -1.2 Evaluation Materials means, collectively, the Evaluation Software (in source and/or object code form) and documentation (including, without limitation, any design documents, specifications and other related materials) related to the Evaluation Software. - -1.3 "Open Source Software" means any software that requires as a condition of use, modification and/or distribution of such software that such software or other software incorporated into, derived from or distributed with such software (a) be disclosed or distributed in source code form; or (b) be licensed by the user to third parties for the purpose of making and/or distributing derivative works; or (c) be redistributable at no charge. Open Source Software includes, without limitation, software licensed or distributed under any of the following licenses or distribution models, or licenses or distribution models substantially similar to any of the following: (a) GNUs General Public License (GPL) or Lesser/Library GPL (LGPL), (b) the Artistic License (e.g., PERL), (c) the Mozilla Public License, (d) the Netscape Public License, (e) the Sun Community Source License (SCSL), (f) the Sun Industry Source License (SISL), (g) the Apache Software license and (h) the Common Public License (CPL). - -1.4 "Pre-Release Materials" means "alpha" or "beta" designated pre-release features, which may not be fully functional, which Intel may substantially modify in producing any production version of the Evaluation Materials and/or is still under development by Intel and/or Intels suppliers. - -2. PURPOSE. Intel desires to provide the Evaluation Materials to Recipient solely for Recipient's internal evaluation of the Evaluation Software and other Intel products, to evaluate the desirability of cooperating with Intel in developing products based on the Evaluation Software and/or to advise Intel as to possible modifications to the Evaluation Software. Recipient may not disclose, distribute or make commercial use of the Evaluation Materials or any modifications to the Evaluation Materials. -THE EVALUATION MATERIALS ARE PROVIDED FOR EVALUATION PURPOSES ONLY AND MAY NOT BE DISTRIBUTED BY RECIPIENT OR INCORPORATED INTO RECIPIENTS PRODUCTS OR SOFTWARE. PLEASE CONTACT AN INTEL SALES REPRESENTATIVE TO LEARN ABOUT THE AVAILABILITY AND COST OF A COMMERICAL VERSION OF THE EVALUATION SOFTWARE. - -3. TITLE. Title to the Evaluation Materials remains with Intel or its suppliers. Recipient shall not mortgage, pledge or encumber the Evaluation Materials in any way. Recipient shall return all Evaluation Materials, keeping no copies, upon termination or expiration of this Agreement. - -4. LICENSE. Intel grants Recipient a royalty-free, personal, nontransferable, nonexclusive license under its copyrights to use the Evaluation Software only for the purposes described in paragraph 2 above. Unless otherwise communicated in writing by Intel to Recipient, to the extent the Evaluation Software is provided in more than one delivery or release (each, a "Release") the license grant in this Section 4 and the Evaluation Period shall apply to each Release. Recipient may not make modifications to the Evaluation Software. Recipient shall not disassemble, reverse-engineer, or decompile any software not provided to Recipient in source code form. -EXCEPT AS PROVIDED HEREIN, NO OTHER LICENSE, EXPRESS OR IMPLIED, BY ESTOPPEL OR OTHERWISE, TO ANY OTHER INTELLECTUAL PROPERTY RIGHTS IS GRANTED TO THE RECIPIENT. - -5. NO OBLIGATION. Recipient shall have no duty to purchase or license any product from Intel. Intel and its suppliers shall have no obligation to provide support for, or develop a non-evaluation version of, the Evaluation Software or to license any version of it. - -6. MODIFICATIONS. This Agreement does NOT obligate Recipient to provide Intel with comments or suggestions regarding Evaluation Materials. However, should Recipient provide Intel with comments or suggestions for the modification, correction, improvement or enhancement of (a) the Evaluation Materials or (b) Intel products or processes which may embody the Evaluation Materials, Recipient grants to Intel a non-exclusive, irrevocable, worldwide, royalty-free license, with the right to sublicense Intels licensees and customers, under Recipient intellectual property rights, the rights to use and disclose such comments and suggestions in any manner Intel chooses and to display, perform, copy, make, have made, use, sell, offer to sell, import, and otherwise dispose of Intels and its sublicensees products embodying such comments and suggestions in any manner and via any media Intel chooses, without reference to the source. - -7. WARRANTY DISCLAIMER. INTEL AND ITS SUPPLIERS MAKE NO WARRANTIES WITH RESPECT TO EVALUATION MATERIALS, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, OR ANY IMPLIED WARRANTY OF NONINFRINGEMENT. THE EVALUATION MATERIALS ARE PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND. - -8. LIMITATION OF LIABILITY. INTEL AND ITS SUPPLIERS SHALL NOT BE LIABLE FOR ANY PROPERTY DAMAGE, PERSONAL INJURY, LOSS OF PROFITS, INTERRUPTION OF BUSINESS OR ANY SPECIAL, CONSEQUENTIAL OR INCIDENTAL DAMAGES, HOWEVER CAUSED, WHETHER FOR BREACH OF WARRANTY, CONTRACT, STRICT LIABILITY OR OTHERWISE. INTEL AND ITS SUPPLIERS DISCLAIM ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS RELATING TO THE EVALUATION MATERIALS. - -9. EXPIRATION. Intel may terminate this Agreement immediately after a breach by Recipient. - -10. GENERAL. - -10.1 Controlling Law. Any claims arising under or relating to this Agreement shall be governed by the internal substantive laws of the State of Delaware or federal courts located in Delaware, without regard to principles of conflict of laws. Each party hereby agrees to jurisdiction and venue in the courts of the State of Delaware for all disputes and litigation arising under or relating to this Agreement. The parties agree that the United Nations Convention on Contracts for the International Sale of Goods is specifically excluded from application to this Agreement. The parties consent to the personal jurisdiction of the above courts. - -10.2 Remedies. Recipient acknowledges that any disclosure, commercialization, or public use of the Evaluation Materials would cause irreparable injury to Intel and consents to the grant of an injunction by any court of competent jurisdiction in the event of a threatened breach. - -10.3 Assignment. Recipient may not delegate, assign or transfer this Agreement, the license granted or any of Recipients rights or duties hereunder, expressly, by implication, by operation of law, by way of merger (regardless of whether Recipient is the surviving entity) or acquisition, or otherwise and any attempt to do so, without Intels express prior written consent, shall be null and void. Intel may assign this Agreement, and its rights and obligations hereunder, in its sole discretion. - -10.4 Entire Agreement. This Agreement constitutes the entire agreement between Recipient and Intel and supersedes in their entirety any and all oral or written agreements previously existing between Recipient and Intel with respect to the subject matter hereof. This Agreement supersedes any and all "click-to-accept" or shrink-wrapped licenses, in hard-copy or electronic form, embedded in or included with the Evaluation Materials. This Agreement may only be amended or supplemented by a writing that refers explicitly to this Agreement and that is signed by duly authorized representatives of Recipient and Intel. Without limiting the foregoing, terms and conditions on any purchase orders or similar materials submitted by Recipient to Intel, and any terms contained in Intels standard acknowledgment form that are in conflict with these terms, shall be of no force or effect. - -10.5 Severability. In the event that any provision of this Agreement shall be unenforceable or invalid under any applicable law or be so held by applicable court decision, such unenforceability or invalidity shall not render this Agreement unenforceable or invalid as a whole, and, in such event, such provision shall be changed and interpreted so as to best accomplish the objectives of such unenforceable or invalid provision within the limits of applicable law or applicable court decisions. - -10.6 Export Regulations / Export Control. Recipient shall not export, either directly or indirectly, any product, service or technical data or system incorporating the Evaluation Materials without first obtaining any required license or other approval from the U.S. Department of Commerce or any other agency or department of the United States Government. In the event any product is exported from the United States or re-exported from a foreign destination by Recipient, Recipient shall ensure that the distribution and export/re-export or import of the product is in compliance with all laws, regulations, orders, or other restrictions of the U.S. Export Administration Regulations and the appropriate foreign government. Recipient agrees that neither it nor any of its subsidiaries will export/re-export any technical data, process, product, or service, directly or indirectly, to any country for which the United States government or any agency thereof or the foreign government from where it is shipping requires an export license, or other governmental approval, without first obtaining such license or approval. Recipient also agrees to implement measures to ensure that foreign national employees are authorized to receive any information controlled by U.S. export control laws. An export is "deemed" to take place when information is released to a foreign national wherever located. - -10.7 Special Terms for Pre-Release Materials. If so indicated in the description of the Evaluation Software, the Evaluation Software may contain Pre-Release Materials. Recipient hereby understands, acknowledges and agrees that: (i) Pre-Release Materials may not be fully tested and may contain bugs or errors; (ii) Pre-Release materials are not suitable for commercial release in their current state; (iii) regulatory approvals for Pre-Release Materials (such as UL or FCC) have not been obtained, and Pre-Release Materials may therefore not be certified for use in certain countries or environments and (iv) Intel can provide no assurance that it will ever produce or make generally available a production version of the Pre-Release Materials . Intel is not under any obligation to develop and/or release or offer for sale or license a final product based upon the Pre-Release Materials and may unilaterally elect to abandon the Pre-Release Materials or any such development platform at any time and without any obligation or liability whatsoever to Recipient or any other person. - -10.8 Open Source Software. In the event Open Source software is included with Evaluation Software, such Open Source software is licensed pursuant to the applicable Open Source software license agreement identified in the Open Source software comments in the applicable source code file(s) and/or file header provided with Evaluation Software. Additional detail may be provided (where applicable) in the accompanying on-line documentation. With respect to the Open Source software, nothing in this Agreement limits any rights under, or grants rights that supersede, the terms of any applicable Open Source software license agreement. -ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED POSSIBLY WITH FAULTS</sdk:license> - <sdk:license id="mips-android-sysimage-license" type="text">MIPS Technologies, Inc. (“MIPS”) Internal Evaluation License Agreement for MIPS Android™ System Images for Android Software Development Kit (SDK): -This Internal Evaluation License Agreement (this "Agreement") is entered into by and between MIPS and you (as an individual developer or a legal entity -- identified below as “Recipient”). MIPS shall make the Evaluation Software available to Recipient as described in accordance with the terms and conditions set forth below. - -By clicking on the “Accept” button, downloading, installing, or otherwise using the Evaluation Materials (defined below), you agree to be bound by the terms of this Agreement effective as of the date you click “Accept” (the “Effective Date”), and if doing so on behalf of an entity, you represent that you are authorized to bind the entity to the terms and conditions of this Agreement. If you do not agree to be bound by the terms and conditions of this Agreement, do not download, install, or use the Evaluation Materials. - -1. DEFINITIONS. These terms shall have the following meanings: - -1.1 “MIPS” shall mean MIPS Technologies, Inc., a Delaware corporation having a principal place of business at: 955 East Arques Ave., Sunnyvale, CA 94085 - -1.2 “Evaluation Software” shall mean MIPS Android™ emulator system images for Android Software Development Kit (SDK), as made available to Recipient. - -1.3 “Evaluation Materials" means, collectively, the Evaluation Software (in source and/or object code form) and documentation (including, without limitation, any design documents, specifications, reference manuals, and other related materials) related to the Evaluation Software as made available to Recipient. - -1.4 “Open Source Software” means any software that requires (as a condition of use, modification and/or distribution of such software) that such software or other software incorporated into, derived from or distributed with such software (a) be disclosed or distributed in source code form; or (b) be licensed by the user to third parties for the purpose of making and/or distributing derivative works; or (c) be redistributable at no charge. Open Source Software includes, without limitation, software licensed or distributed under any of the following licenses or distribution models, or licenses or distribution models substantially similar to any of the following: (a) GNU’s General Public License (GPL) or Lesser/Library GPL (LGPL), (b) the Artistic License (e.g., PERL), (c) the Mozilla Public License, (d) the Netscape Public License, (e) the Sun Community Source License (SCSL), (f) the Sun Industry Source License (SISL), (g) the Apache Software license and (h) the Common Public License (CPL). - -1.5 “Pre-Release Materials” means “alpha” or “beta” designated pre-release features, which may not be fully functional, which MIPS may substantially modify in producing any production version of the Evaluation Materials, and/or which is still under development by MIPS and/or MIPS’ suppliers. - -2. PURPOSE. MIPS desires to make the Evaluation Materials available to Recipient solely for Recipient's internal evaluation of the Evaluation Software to evaluate the desirability of cooperating with MIPS in developing products that are compatible with the Evaluation Software and/or to advise MIPS as to possible modifications to the Evaluation Software. Recipient may not disclose, distribute, modify (except to facilitate the above-mentioned internal evaluation), or make commercial use of the Evaluation Materials or any modifications of the Evaluation Materials. - -THE EVALUATION MATERIALS ARE PROVIDED FOR EVALUATION PURPOSES ONLY AND MAY NOT BE MODIFIED (EXCEPT TO FACILITATE THE INTERNAL EVALUATION) OR DISTRIBUTED BY RECIPIENT OR INCORPORATED INTO RECIPIENT’S PRODUCTS OR SOFTWARE. PLEASE CONTACT A MIPS SALES REPRESENTATIVE TO LEARN ABOUT THE AVAILABILITY AND COST OF A COMMERCIAL VERSION OF THE EVALUATION SOFTWARE. - -3. TITLE. Title to the Evaluation Materials remains with MIPS or its suppliers. Recipient shall not mortgage, pledge or encumber the Evaluation Materials in any way. Recipient shall return all Evaluation Materials, keeping no copies, upon termination or expiration of this Agreement. - -4. LICENSE. MIPS grants Recipient a royalty-free, personal, nontransferable, nonexclusive license under its copyrights to use the Evaluation Software only for the purposes described in paragraph 2 above and only for a period beginning on the Effective Date and extending to the first anniversary of the Effective Date (the “Evaluation Period”). Unless otherwise communicated in writing by MIPS to Recipient, to the extent the Evaluation Software is provided in more than one delivery or release (each, a “Release”) the license grant in this Section 4 and the Evaluation Period shall apply to each Release, in which case the Evaluation Period shall begin on the date that the Release is made generally available and continue to the first anniversary of such date. Recipient may not make modifications to the Evaluation Software. Recipient shall not disassemble, reverse-engineer, or decompile any software that is not provided to Recipient in source code form. - - -EXCEPT AS PROVIDED HEREIN, NO OTHER LICENSE, EXPRESS OR IMPLIED, BY ESTOPPEL OR OTHERWISE, TO ANY OTHER MIPS INTELLECTUAL PROPERTY RIGHTS IS GRANTED TO THE RECIPIENT. OTHER THAN AS EXPLICITLY SET FORTH IN PARAGRAPH 2 ABOVE, NO RIGHT TO COPY, TO REPRODUCE, TO MODIFY, OR TO CREATE DERIVATIVE WORKS OF, THE EVALUATION MATERIALS IS GRANTED HEREIN. - -5. NO OBLIGATION. Recipient shall have no duty to purchase or license any product from MIPS. MIPS and its suppliers shall have no obligation to provide support for, or develop a non-evaluation version of, the Evaluation Software or to license any version of it. - -6. MODIFICATIONS. This Agreement does not obligate Recipient to provide MIPS with comments or suggestions regarding Evaluation Materials. However, should Recipient provide MIPS with comments or suggestions for the modification, correction, improvement or enhancement of (a) the Evaluation Materials or (b) MIPS products or processes which may embody the Evaluation Materials, then Recipient agrees to grant and hereby grants to MIPS a non-exclusive, irrevocable, worldwide, fully paid-up, royalty-free license, with the right to sublicense MIPS’ licensees and customers, under Recipient’s Intellectual property rights, to use and disclose such comments and suggestions in any manner MIPS chooses and to display, perform, copy, make, have made, use, sell, offer to sell, import, and otherwise dispose of MIPS’ and its sublicensee’s products embodying such comments and suggestions in any manner and via any media MIPS chooses, without reference to the source. - -7. WARRANTY DISCLAIMER. MIPS AND ITS SUPPLIERS MAKE NO WARRANTIES WITH RESPECT TO EVALUATION MATERIALS, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, OR ANY IMPLIED WARRANTY OF NONINFRINGEMENT WITH RESPECT TO THIRD PARTY INTELLECTUAL PROPERTY. RECIPIENT ACKNOWLEDGES AND AGREES THAT THE EVALUATION MATERIALS ARE PROVIDED “AS IS,” WITHOUT WARRANTY OF ANY KIND. - -8. LIMITATION OF LIABILITY. MIPS AND ITS SUPPLIERS SHALL NOT BE LIABLE FOR ANY PROPERTY DAMAGE, PERSONAL INJURY, LOSS OF PROFITS, INTERRUPTION OF BUSINESS OR FOR ANY DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL OR INCIDENTAL DAMAGES, HOWEVER CAUSED OR ALLEGED, WHETHER FOR BREACH OF WARRANTY, CONTRACT, STRICT LIABILITY OR OTHERWISE, INCLUDING WITHOUT LIMITATION, UNDER TORT OR OTHER LEGAL THEORY. MIPS AND ITS SUPPLIERS DISCLAIM ANY AND ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS OF ANY KIND RELATING TO THE EVALUATION MATERIALS. - -9. EXPIRATION. MIPS may terminate this Agreement immediately after a breach by Recipient or otherwise at MIPS’ reasonable discretion and upon five (5) business days’ notice to Recipient. - -10. GENERAL. - -10.1 Controlling Law. This Agreement shall be governed by California law excluding its choice of law rules. With the exception of MIPS’ rights to enforce its intellectual property rights and any confidentiality obligations under this Agreement or any licenses distributed with the Evaluation Materials, all disputes and any claims arising under or relating to this Agreement shall be subject to the exclusive jurisdiction and venue of the state and federal courts located in Santa Clara County, California. Each party hereby agrees to jurisdiction and venue in the courts set forth in the preceding sentence. The parties agree that the United Nations Convention on Contracts for the International Sale of Goods is specifically excluded from application to this Agreement. The parties consent to the personal jurisdiction of the above courts. - -10.2 Remedies. Recipient acknowledges and agrees that any breach of confidentiality obligations under this Agreement or any licenses distributed with the Evaluation Materials, as well as any disclosure, commercialization, or public use of the Evaluation Materials, would cause irreparable injury to MIPS, and therefore Recipient agrees to consent to, and hereby consents to, the grant of an injunction by any court of competent jurisdiction in the event of an actual or threatened breach. - -10.3 Assignment. Recipient may not delegate, assign or transfer this Agreement, the license granted or any of Recipient’s rights, obligations, or duties hereunder, expressly, by implication, by operation of law, by way of merger (regardless of whether Recipient is the surviving entity) or acquisition, or otherwise and any attempt to do so, without MIPS’ express prior written consent, shall be ineffective, null and void. MIPS may freely assign this Agreement, and its rights and obligations hereunder, in its sole discretion. - -10.4 Entire Agreement. This Agreement constitutes the entire agreement between Recipient and MIPS and supersedes in their entirety any and all oral or written agreements previously existing between Recipient and MIPS with respect to the subject matter hereof. This Agreement may only be amended or supplemented by a writing that refers explicitly to this Agreement and that is signed or otherwise accepted by duly authorized representatives of Recipient and MIPS. - -10.5 Severability. In the event that any provision of this Agreement is finally adjudicated to be unenforceable or invalid under any applicable law, such unenforceability or invalidity shall not render this Agreement unenforceable or invalid as a whole, and, in such event, such unenforceable or invalid provision shall be interpreted so as to best accomplish the objectives of such provision within the limits of applicable law or applicable court decisions. - -10.6 Export Regulations / Export Control. Recipient shall not export, either directly or indirectly, any product, service or technical data or system incorporating the Evaluation Materials without first obtaining any required license or other necessary approval from the U.S. Department of Commerce or any other governing agency or department of the United States Government. In the event any product is exported from the United States or re-exported from a foreign destination by Recipient, Recipient shall ensure that the distribution and export/re-export or import of the product is in compliance with all applicable laws, regulations, orders, or other restrictions of the U.S. Export Administration Regulations and the appropriate foreign government. Recipient agrees that neither it nor any of its subsidiaries will export/re-export any technical data, process, product, or service, directly or indirectly, to any country for which the United States government or any agency thereof or the foreign government from where it is shipping requires an export license, or other governmental approval, without first obtaining such license or approval. Recipient also agrees to implement measures to ensure that foreign national employees are authorized to receive any information controlled by U.S. export control laws. An export is "deemed" to take place when information is released to a foreign national wherever located. - -10.7 Special Terms for Pre-Release Materials. If so indicated in the description of the Evaluation Software, the Evaluation Software may contain Pre-Release Materials. Recipient hereby understands, acknowledges and agrees that: (i) Pre-Release Materials may not be fully tested and may contain bugs or errors; (ii) Pre-Release materials are not suitable for commercial release in their current state; (iii) regulatory approvals for Pre-Release Materials (such as UL or FCC) have not been obtained, and Pre-Release Materials may therefore not be certified for use in certain countries or environments or may not be suitable for certain applications and (iv) MIPS can provide no assurance that it will ever produce or make generally available a production version of the Pre-Release Materials . MIPS is not under any obligation to develop and/or release or offer for sale or license a final product based upon the Pre-Release Materials and may unilaterally elect to abandon the Pre-Release Materials or any such development platform at any time and without any obligation or liability whatsoever to Recipient or any other person. - -ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS” AND “AS AVAILABLE”, POSSIBLY WITH FAULTS, AND WITHOUT REPRESENTATION OR WARRANTY OF ANY KIND. - -10.8 Open Source Software. In the event Open Source software is included with Evaluation Software, such Open Source software is licensed pursuant to the applicable Open Source software license agreement identified in the Open Source software comments in the applicable source code file(s) and/or file header as indicated in the Evaluation Software. Additional detail may be available (where applicable) in the accompanying on-line documentation. With respect to the Open Source software, nothing in this Agreement limits any rights under, or grants rights that supersede, the terms of any applicable Open Source software license agreement. -</sdk:license> - <sdk:system-image> - <!--Generated from bid:3093079, branch:git_gb-emu-release--> - <sdk:api-level>10</sdk:api-level> - <sdk:description>ARM EABI v7a System Image</sdk:description> - <sdk:revision>4</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Fri Jul 27 08:50:45 2018.--> - <sdk:size>67918042</sdk:size> - <sdk:checksum type="sha1">54680383118eb5c95a11e1cc2a14aa572c86ee69</sdk:checksum> - <sdk:url>armv7-10_r04.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:abi>armeabi-v7a</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:229537, branch:git_ics-mr0--> - <sdk:api-level>14</sdk:api-level> - <sdk:description>ARM EABI v7a System Image</sdk:description> - <sdk:revision>2</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Thu Jul 26 20:46:32 2018.--> - <sdk:size>99621822</sdk:size> - <sdk:checksum type="sha1">d8991b0c06b18d7d6ed4169d67460ee1add6661b</sdk:checksum> - <sdk:url>sysimg_armv7a-14_r02.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:abi>armeabi-v7a</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:3462039, branch:git_ics-mr1-emu-release--> - <sdk:api-level>15</sdk:api-level> - <sdk:description>ARM EABI v7a System Image</sdk:description> - <sdk:revision>4</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Fri Jul 27 08:53:17 2018.--> - <sdk:size>102079727</sdk:size> - <sdk:checksum type="sha1">363223bd62f5afc0b2bd760b54ce9d26b31eacf1</sdk:checksum> - <sdk:url>armeabi-v7a-15_r04.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:abi>armeabi-v7a</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:1741836, branch:git_jb-dev--> - <sdk:api-level>16</sdk:api-level> - <sdk:description>ARM EABI v7a System Image</sdk:description> - <sdk:revision>4</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Thu Jul 26 16:01:22 2018.--> - <sdk:size>112608076</sdk:size> - <sdk:checksum type="sha1">39c093ea755098f0ee79f607be7df9e54ba4943f</sdk:checksum> - <sdk:url>sysimg_armv7a-16_r04.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:abi>armeabi-v7a</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:3453820, branch:git_jb-mr1.1-emu-release--> - <sdk:api-level>17</sdk:api-level> - <sdk:description>ARM EABI v7a System Image</sdk:description> - <sdk:revision>5</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Fri Jul 27 08:53:02 2018.--> - <sdk:size>124238679</sdk:size> - <sdk:checksum type="sha1">7460e8110f4a87f9644f1bdb5511a66872d50fd9</sdk:checksum> - <sdk:url>armeabi-v7a-17_r05.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:abi>armeabi-v7a</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:3462034, branch:git_jb-mr2-emu-release--> - <sdk:api-level>18</sdk:api-level> - <sdk:description>ARM EABI v7a System Image</sdk:description> - <sdk:revision>4</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Fri Jul 27 08:53:09 2018.--> - <sdk:size>130394401</sdk:size> - <sdk:checksum type="sha1">0bf34ecf4ddd53f6b1b7fe7dfa12f2887c17e642</sdk:checksum> - <sdk:url>armeabi-v7a-18_r04.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:abi>armeabi-v7a</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:3462041, branch:git_klp-emu-release--> - <sdk:api-level>19</sdk:api-level> - <sdk:description>ARM EABI v7a System Image</sdk:description> - <sdk:revision>5</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Fri Jul 27 08:53:25 2018.--> - <sdk:size>159871567</sdk:size> - <sdk:checksum type="sha1">d1a5fd4f2e1c013c3d3d9bfe7e9db908c3ed56fa</sdk:checksum> - <sdk:url>armeabi-v7a-19_r05.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:abi>armeabi-v7a</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:3079185, branch:git_lmp-emu-release--> - <sdk:api-level>21</sdk:api-level> - <sdk:description>ARM EABI v7a System Image</sdk:description> - <sdk:revision>4</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Fri Jul 27 08:50:26 2018.--> - <sdk:size>187163871</sdk:size> - <sdk:checksum type="sha1">8c606f81306564b65e41303d2603e4c42ded0d10</sdk:checksum> - <sdk:url>armeabi-v7a-21_r04.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:abi>armeabi-v7a</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:3079158, branch:git_lmp_mr1-emu-release--> - <sdk:api-level>22</sdk:api-level> - <sdk:description>ARM EABI v7a System Image</sdk:description> - <sdk:revision>2</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Fri Jul 27 08:50:08 2018.--> - <sdk:size>194596267</sdk:size> - <sdk:checksum type="sha1">2114ec015dbf3a16cbcb4f63e8a84a1b206a07a1</sdk:checksum> - <sdk:url>armeabi-v7a-22_r02.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:abi>armeabi-v7a</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:3079352, branch:git_mnc-emu-release--> - <sdk:api-level>23</sdk:api-level> - <sdk:description>ARM EABI v7a System Image</sdk:description> - <sdk:revision>6</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Fri Jul 27 08:50:36 2018.--> - <sdk:size>238333358</sdk:size> - <sdk:checksum type="sha1">7cf2ad756e54a3acfd81064b63cb0cb9dff2798d</sdk:checksum> - <sdk:url>armeabi-v7a-23_r06.zip</sdk:url> - <sdk:host-os>windows</sdk:host-os> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:abi>armeabi-v7a</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:3245079, branch:git_nyc-emu-release--> - <sdk:api-level>24</sdk:api-level> - <sdk:description>ARM EABI v7a System Image</sdk:description> - <sdk:revision>7</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Fri Jul 27 08:51:39 2018.--> - <sdk:size>283677512</sdk:size> - <sdk:checksum type="sha1">3454546b4eed2d6c3dd06d47757d6da9f4176033</sdk:checksum> - <sdk:url>armeabi-v7a-24_r07.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:abi>armeabi-v7a</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:3245079, branch:git_nyc-emu-release--> - <sdk:api-level>24</sdk:api-level> - <sdk:description>ARM 64 v8a System Image</sdk:description> - <sdk:revision>7</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Fri Jul 27 08:51:37 2018.--> - <sdk:size>384556503</sdk:size> - <sdk:checksum type="sha1">e8ab2e49e4efe4b064232b33b5eeaded61437d7f</sdk:checksum> - <sdk:url>arm64-v8a-24_r07.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:abi>arm64-v8a</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:1741836, branch:git_jb-dev--> - <sdk:api-level>16</sdk:api-level> - <sdk:description>MIPS System Image</sdk:description> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Thu Jul 26 16:01:28 2018.--> - <sdk:size>122482530</sdk:size> - <sdk:checksum type="sha1">67943c54fb3943943ffeb05fdd39c0b753681f6e</sdk:checksum> - <sdk:url>sysimg_mips-16_r04.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="mips-android-sysimage-license"/> - <sdk:abi>mips</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:1742939, branch:git_jb-mr1.1-dev--> - <sdk:api-level>17</sdk:api-level> - <sdk:description>MIPS System Image</sdk:description> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Thu Jul 26 16:01:38 2018.--> - <sdk:size>131781761</sdk:size> - <sdk:checksum type="sha1">f0c6e153bd584c29e51b5c9723cfbf30f996a05d</sdk:checksum> - <sdk:url>sysimg_mips-17_r01.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="mips-android-sysimage-license"/> - <sdk:abi>mips</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:3093079, branch:git_gb-emu-release--> - <sdk:api-level>10</sdk:api-level> - <sdk:description>Intel x86 Atom System Image</sdk:description> - <sdk:revision>4</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Fri Jul 27 08:50:47 2018.--> - <sdk:size>75382637</sdk:size> - <sdk:checksum type="sha1">655ffc5cc89dd45a3aca154b254009016e473aeb</sdk:checksum> - <sdk:url>x86-10_r04.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:abi>x86</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:3462039, branch:git_ics-mr1-emu-release--> - <sdk:api-level>15</sdk:api-level> - <sdk:description>Intel x86 Atom System Image</sdk:description> - <sdk:revision>4</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Fri Jul 27 08:53:18 2018.--> - <sdk:size>115324561</sdk:size> - <sdk:checksum type="sha1">e45c728b64881c0e86529a8f7ea9c103a3cd14c1</sdk:checksum> - <sdk:url>x86-15_r04.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:abi>x86</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:4875369, branch:git_jb-emu-release--> - <sdk:api-level>16</sdk:api-level> - <sdk:description>Intel x86 Atom System Image</sdk:description> - <sdk:revision>6</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue Jul 17 16:27:13 2018.--> - <sdk:size>134926152</sdk:size> - <sdk:checksum type="sha1">bf1bf8c5591346118d2235da1ad20e7be8a3e9cd</sdk:checksum> - <sdk:url>x86-16_r06.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:abi>x86</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:4875371, branch:git_jb-mr1.1-emu-release--> - <sdk:api-level>17</sdk:api-level> - <sdk:description>Intel x86 Atom System Image</sdk:description> - <sdk:revision>4</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue Jul 17 16:30:45 2018.--> - <sdk:size>143278662</sdk:size> - <sdk:checksum type="sha1">03c6d022ab2dcbbcf655d78ba5ccb0431cadcaec</sdk:checksum> - <sdk:url>x86-17_r04.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:abi>x86</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:3462034, branch:git_jb-mr2-emu-release--> - <sdk:api-level>18</sdk:api-level> - <sdk:description>Intel x86 Atom System Image</sdk:description> - <sdk:revision>3</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Fri Jul 27 08:53:12 2018.--> - <sdk:size>149657535</sdk:size> - <sdk:checksum type="sha1">03a0cb23465c3de15215934a1dbc9715b56e9458</sdk:checksum> - <sdk:url>x86-18_r03.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:abi>x86</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:4174703, branch:git_klp-emu-release--> - <sdk:api-level>19</sdk:api-level> - <sdk:description>Intel x86 Atom System Image</sdk:description> - <sdk:revision>6</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Wed Jun 13 18:42:22 2018.--> - <sdk:size>185886274</sdk:size> - <sdk:checksum type="sha1">2ac82153aae97f7eae4c5a0761224fe04321d03d</sdk:checksum> - <sdk:url>x86-19_r06.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:abi>x86</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:4174711, branch:git_lmp-emu-release--> - <sdk:api-level>21</sdk:api-level> - <sdk:description>Intel x86 Atom System Image</sdk:description> - <sdk:revision>5</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue May 22 03:41:51 2018.--> - <sdk:size>208212529</sdk:size> - <sdk:checksum type="sha1">00f0eb0a1003efe3316347f762e20a85d8749cff</sdk:checksum> - <sdk:url>x86-21_r05.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:abi>x86</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:4174727, branch:git_lmp-mr1-emu-release--> - <sdk:api-level>22</sdk:api-level> - <sdk:description>Intel x86 Atom System Image</sdk:description> - <sdk:revision>6</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sun May 20 00:45:19 2018.--> - <sdk:size>214268954</sdk:size> - <sdk:checksum type="sha1">e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e</sdk:checksum> - <sdk:url>x86-22_r06.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:abi>x86</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:4174734, branch:git_mnc-emu-release--> - <sdk:api-level>23</sdk:api-level> - <sdk:description>Intel x86 Atom System Image</sdk:description> - <sdk:revision>10</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue Jun 5 22:05:27 2018.--> - <sdk:size>260804863</sdk:size> - <sdk:checksum type="sha1">f6c3e3dd7bd951454795aa75c3a145fd05ac25bb</sdk:checksum> - <sdk:url>x86-23_r10.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:abi>x86</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:4174735, branch:git_nyc-emu-release--> - <sdk:api-level>24</sdk:api-level> - <sdk:description>Intel x86 Atom System Image</sdk:description> - <sdk:revision>8</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue May 22 10:30:01 2018.--> - <sdk:size>313489224</sdk:size> - <sdk:checksum type="sha1">c1cae7634b0216c0b5990f2c144eb8ca948e3511</sdk:checksum> - <sdk:url>x86-24_r08.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:abi>x86</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:4931657, branch:git_nyc-mr1-emu-release--> - <sdk:api-level>25</sdk:api-level> - <sdk:description>Intel x86 Atom System Image</sdk:description> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue Aug 7 14:04:45 2018.--> - <sdk:size>316695942</sdk:size> - <sdk:checksum type="sha1">78ce7eb1387d598685633b9f7cbb300c3d3aeb5f</sdk:checksum> - <sdk:url>x86-25_r01.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:abi>x86</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:4931640, branch:git_oc-emu-release--> - <sdk:api-level>26</sdk:api-level> - <sdk:description>Intel x86 Atom System Image</sdk:description> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue Aug 7 14:05:14 2018.--> - <sdk:size>350195807</sdk:size> - <sdk:checksum type="sha1">e613d6e0da668e30daf547f3c6627a6352846f90</sdk:checksum> - <sdk:url>x86-26_r01.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:abi>x86</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - <sdk:tag-display>Default Android System Image</sdk:tag-display> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:4931629, branch:git_oc-mr1-emu-release--> - <sdk:api-level>27</sdk:api-level> - <sdk:description>Intel x86 Atom System Image</sdk:description> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue Aug 7 14:05:43 2018.--> - <sdk:size>360984187</sdk:size> - <sdk:checksum type="sha1">4ec990fac7b62958decd12e18a4cd389dfe7c582</sdk:checksum> - <sdk:url>x86-27_r01.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:abi>x86</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - <sdk:tag-display>Default Android System Image</sdk:tag-display> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:4923214, branch:git_pi-emu-release--> - <sdk:api-level>28</sdk:api-level> - <sdk:description>Intel x86 Atom System Image</sdk:description> - <sdk:revision>4</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue Jul 31 17:43:13 2018.--> - <sdk:size>437320152</sdk:size> - <sdk:checksum type="sha1">ce03c42d80c0fc6dc47f6455dbee7aa275d02780</sdk:checksum> - <sdk:url>x86-28_r04.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-preview-license"/> - <sdk:abi>x86</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - <sdk:tag-display>Default Android System Image</sdk:tag-display> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:4174711, branch:git_lmp-emu-release--> - <sdk:api-level>21</sdk:api-level> - <sdk:description>Intel x86 Atom_64 System Image</sdk:description> - <sdk:revision>5</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Wed Jun 6 04:05:38 2018.--> - <sdk:size>292623982</sdk:size> - <sdk:checksum type="sha1">9078a095825a69e5e215713f0866c83cef65a342</sdk:checksum> - <sdk:url>x86_64-21_r05.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:abi>x86_64</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:4174727, branch:git_lmp-mr1-emu-release--> - <sdk:api-level>22</sdk:api-level> - <sdk:description>Intel x86 Atom_64 System Image</sdk:description> - <sdk:revision>6</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sun May 27 01:45:29 2018.--> - <sdk:size>299976630</sdk:size> - <sdk:checksum type="sha1">5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4</sdk:checksum> - <sdk:url>x86_64-22_r06.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:abi>x86_64</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:4174734, branch:git_mnc-emu-release--> - <sdk:api-level>23</sdk:api-level> - <sdk:description>Intel x86 Atom_64 System Image</sdk:description> - <sdk:revision>10</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue Jun 12 05:59:42 2018.--> - <sdk:size>365009313</sdk:size> - <sdk:checksum type="sha1">7cbc291483ca07dc67b71268c5f08a5755f50f51</sdk:checksum> - <sdk:url>x86_64-23_r10.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:abi>x86_64</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:4174735, branch:git_nyc-emu-release--> - <sdk:api-level>24</sdk:api-level> - <sdk:description>Intel x86 Atom_64 System Image</sdk:description> - <sdk:revision>8</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Sat Jun 16 05:29:19 2018.--> - <sdk:size>419261998</sdk:size> - <sdk:checksum type="sha1">f6559e1949a5879f31a9662f4f0e50ad60181684</sdk:checksum> - <sdk:url>x86_64-24_r08.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:abi>x86_64</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:4931657, branch:git_nyc-mr1-emu-release--> - <sdk:api-level>25</sdk:api-level> - <sdk:description>Intel x86 Atom_64 System Image</sdk:description> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue Aug 7 14:06:13 2018.--> - <sdk:size>422702097</sdk:size> - <sdk:checksum type="sha1">7093d7b39216020226ff430a3b7b81c94d31ad37</sdk:checksum> - <sdk:url>x86_64-25_r01.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:abi>x86_64</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:4931640, branch:git_oc-emu-release--> - <sdk:api-level>26</sdk:api-level> - <sdk:description>Intel x86 Atom_64 System Image</sdk:description> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue Aug 7 14:06:52 2018.--> - <sdk:size>474178332</sdk:size> - <sdk:checksum type="sha1">432f149c048bffce7f9de526ec65b336daf7a0a3</sdk:checksum> - <sdk:url>x86_64-26_r01.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:abi>x86_64</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - <sdk:tag-display>Default Android System Image</sdk:tag-display> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:4931629, branch:git_oc-mr1-emu-release--> - <sdk:api-level>27</sdk:api-level> - <sdk:description>Intel x86 Atom_64 System Image</sdk:description> - <sdk:revision>1</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue Aug 7 14:07:35 2018.--> - <sdk:size>491675204</sdk:size> - <sdk:checksum type="sha1">2878261011a59ca3de29dc5b457a495fdb268d60</sdk:checksum> - <sdk:url>x86_64-27_r01.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-license"/> - <sdk:abi>x86_64</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - <sdk:tag-display>Default Android System Image</sdk:tag-display> - </sdk:system-image> - <sdk:system-image> - <!--Generated from bid:4923214, branch:git_pi-emu-release--> - <sdk:api-level>28</sdk:api-level> - <sdk:description>Intel x86 Atom_64 System Image</sdk:description> - <sdk:revision>4</sdk:revision> - <sdk:archives> - <sdk:archive> - <!--Built on: Tue Jul 31 17:43:48 2018.--> - <sdk:size>564792723</sdk:size> - <sdk:checksum type="sha1">d47a85c8f4e9fd57df97814ad8884eeb0f3a0ef0</sdk:checksum> - <sdk:url>x86_64-28_r04.zip</sdk:url> - </sdk:archive> - </sdk:archives> - <sdk:uses-license ref="android-sdk-preview-license"/> - <sdk:abi>x86_64</sdk:abi> - <sdk:tag-id>default</sdk:tag-id> - <sdk:tag-display>Default Android System Image</sdk:tag-display> - </sdk:system-image> -</sdk:sdk-sys-img> diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix deleted file mode 100644 index 0ad09a02556..00000000000 --- a/pkgs/development/mobile/androidenv/sysimages.nix +++ /dev/null @@ -1,305 +0,0 @@ -# This file is generated from generate-sysimages.sh. DO NOT EDIT. -# Execute generate-sysimages.sh or fetch.sh to update the file. -{stdenv, fetchurl, unzip}: - -let - buildSystemImage = args: - stdenv.mkDerivation (args // { - buildInputs = [ unzip ]; - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - }); -in -{ - - sysimg_armeabi-v7a_10 = buildSystemImage { - name = "sysimg-armeabi-v7a-10"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/armv7-10_r04.zip; - sha1 = "54680383118eb5c95a11e1cc2a14aa572c86ee69"; - }; - }; - - sysimg_x86_10 = buildSystemImage { - name = "sysimg-x86-10"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-10_r04.zip; - sha1 = "655ffc5cc89dd45a3aca154b254009016e473aeb"; - }; - }; - - sysimg_armeabi-v7a_14 = buildSystemImage { - name = "sysimg-armeabi-v7a-14"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-14_r02.zip; - sha1 = "d8991b0c06b18d7d6ed4169d67460ee1add6661b"; - }; - }; - - sysimg_armeabi-v7a_15 = buildSystemImage { - name = "sysimg-armeabi-v7a-15"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-15_r04.zip; - sha1 = "363223bd62f5afc0b2bd760b54ce9d26b31eacf1"; - }; - }; - - sysimg_x86_15 = buildSystemImage { - name = "sysimg-x86-15"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-15_r04.zip; - sha1 = "e45c728b64881c0e86529a8f7ea9c103a3cd14c1"; - }; - }; - - sysimg_armeabi-v7a_16 = buildSystemImage { - name = "sysimg-armeabi-v7a-16"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-16_r04.zip; - sha1 = "39c093ea755098f0ee79f607be7df9e54ba4943f"; - }; - }; - - sysimg_mips_16 = buildSystemImage { - name = "sysimg-mips-16"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_mips-16_r04.zip; - sha1 = "67943c54fb3943943ffeb05fdd39c0b753681f6e"; - }; - }; - - sysimg_x86_16 = buildSystemImage { - name = "sysimg-x86-16"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-16_r06.zip; - sha1 = "bf1bf8c5591346118d2235da1ad20e7be8a3e9cd"; - }; - }; - - sysimg_armeabi-v7a_17 = buildSystemImage { - name = "sysimg-armeabi-v7a-17"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-17_r05.zip; - sha1 = "7460e8110f4a87f9644f1bdb5511a66872d50fd9"; - }; - }; - - sysimg_mips_17 = buildSystemImage { - name = "sysimg-mips-17"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_mips-17_r01.zip; - sha1 = "f0c6e153bd584c29e51b5c9723cfbf30f996a05d"; - }; - }; - - sysimg_x86_17 = buildSystemImage { - name = "sysimg-x86-17"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-17_r04.zip; - sha1 = "03c6d022ab2dcbbcf655d78ba5ccb0431cadcaec"; - }; - }; - - sysimg_armeabi-v7a_18 = buildSystemImage { - name = "sysimg-armeabi-v7a-18"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-18_r04.zip; - sha1 = "0bf34ecf4ddd53f6b1b7fe7dfa12f2887c17e642"; - }; - }; - - sysimg_x86_18 = buildSystemImage { - name = "sysimg-x86-18"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-18_r03.zip; - sha1 = "03a0cb23465c3de15215934a1dbc9715b56e9458"; - }; - }; - - sysimg_armeabi-v7a_19 = buildSystemImage { - name = "sysimg-armeabi-v7a-19"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-19_r05.zip; - sha1 = "d1a5fd4f2e1c013c3d3d9bfe7e9db908c3ed56fa"; - }; - }; - - sysimg_x86_19 = buildSystemImage { - name = "sysimg-x86-19"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-19_r06.zip; - sha1 = "2ac82153aae97f7eae4c5a0761224fe04321d03d"; - }; - }; - - sysimg_armeabi-v7a_21 = buildSystemImage { - name = "sysimg-armeabi-v7a-21"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-21_r04.zip; - sha1 = "8c606f81306564b65e41303d2603e4c42ded0d10"; - }; - }; - - sysimg_x86_21 = buildSystemImage { - name = "sysimg-x86-21"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-21_r05.zip; - sha1 = "00f0eb0a1003efe3316347f762e20a85d8749cff"; - }; - }; - - sysimg_x86_64_21 = buildSystemImage { - name = "sysimg-x86_64-21"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-21_r05.zip; - sha1 = "9078a095825a69e5e215713f0866c83cef65a342"; - }; - }; - - sysimg_armeabi-v7a_22 = buildSystemImage { - name = "sysimg-armeabi-v7a-22"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-22_r02.zip; - sha1 = "2114ec015dbf3a16cbcb4f63e8a84a1b206a07a1"; - }; - }; - - sysimg_x86_22 = buildSystemImage { - name = "sysimg-x86-22"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-22_r06.zip; - sha1 = "e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e"; - }; - }; - - sysimg_x86_64_22 = buildSystemImage { - name = "sysimg-x86_64-22"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-22_r06.zip; - sha1 = "5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4"; - }; - }; - - sysimg_armeabi-v7a_23 = buildSystemImage { - name = "sysimg-armeabi-v7a-23"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-23_r06.zip; - sha1 = "7cf2ad756e54a3acfd81064b63cb0cb9dff2798d"; - }; - }; - - sysimg_x86_23 = buildSystemImage { - name = "sysimg-x86-23"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-23_r10.zip; - sha1 = "f6c3e3dd7bd951454795aa75c3a145fd05ac25bb"; - }; - }; - - sysimg_x86_64_23 = buildSystemImage { - name = "sysimg-x86_64-23"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-23_r10.zip; - sha1 = "7cbc291483ca07dc67b71268c5f08a5755f50f51"; - }; - }; - - sysimg_arm64-v8a_24 = buildSystemImage { - name = "sysimg-arm64-v8a-24"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/arm64-v8a-24_r07.zip; - sha1 = "e8ab2e49e4efe4b064232b33b5eeaded61437d7f"; - }; - }; - - sysimg_armeabi-v7a_24 = buildSystemImage { - name = "sysimg-armeabi-v7a-24"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-24_r07.zip; - sha1 = "3454546b4eed2d6c3dd06d47757d6da9f4176033"; - }; - }; - - sysimg_x86_24 = buildSystemImage { - name = "sysimg-x86-24"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-24_r08.zip; - sha1 = "c1cae7634b0216c0b5990f2c144eb8ca948e3511"; - }; - }; - - sysimg_x86_64_24 = buildSystemImage { - name = "sysimg-x86_64-24"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-24_r08.zip; - sha1 = "f6559e1949a5879f31a9662f4f0e50ad60181684"; - }; - }; - - sysimg_x86_25 = buildSystemImage { - name = "sysimg-x86-25"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-25_r01.zip; - sha1 = "78ce7eb1387d598685633b9f7cbb300c3d3aeb5f"; - }; - }; - - sysimg_x86_64_25 = buildSystemImage { - name = "sysimg-x86_64-25"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-25_r01.zip; - sha1 = "7093d7b39216020226ff430a3b7b81c94d31ad37"; - }; - }; - - sysimg_x86_26 = buildSystemImage { - name = "sysimg-x86-26"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-26_r01.zip; - sha1 = "e613d6e0da668e30daf547f3c6627a6352846f90"; - }; - }; - - sysimg_x86_64_26 = buildSystemImage { - name = "sysimg-x86_64-26"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-26_r01.zip; - sha1 = "432f149c048bffce7f9de526ec65b336daf7a0a3"; - }; - }; - - sysimg_x86_27 = buildSystemImage { - name = "sysimg-x86-27"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-27_r01.zip; - sha1 = "4ec990fac7b62958decd12e18a4cd389dfe7c582"; - }; - }; - - sysimg_x86_64_27 = buildSystemImage { - name = "sysimg-x86_64-27"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-27_r01.zip; - sha1 = "2878261011a59ca3de29dc5b457a495fdb268d60"; - }; - }; - - sysimg_x86_28 = buildSystemImage { - name = "sysimg-x86-28"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-28_r04.zip; - sha1 = "ce03c42d80c0fc6dc47f6455dbee7aa275d02780"; - }; - }; - - sysimg_x86_64_28 = buildSystemImage { - name = "sysimg-x86_64-28"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-28_r04.zip; - sha1 = "d47a85c8f4e9fd57df97814ad8884eeb0f3a0ef0"; - }; - }; -} diff --git a/pkgs/development/mobile/androidenv/tools.nix b/pkgs/development/mobile/androidenv/tools.nix new file mode 100644 index 00000000000..9957168f7af --- /dev/null +++ b/pkgs/development/mobile/androidenv/tools.nix @@ -0,0 +1,26 @@ +{deployAndroidPackage, requireFile, lib, packages, toolsVersion, autoPatchelfHook, makeWrapper, os, pkgs, pkgs_i686, postInstall ? ""}: + +if toolsVersion == "26.0.1" then import ./tools/26.nix { + inherit deployAndroidPackage lib autoPatchelfHook makeWrapper os pkgs pkgs_i686 postInstall; + package = { + name = "tools"; + path = "tools"; + revision = "26.0.1"; + archives = { + linux = requireFile { + url = https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip; + sha256 = "185yq7qwxflw24ccm5d6zziwlc9pxmsm3f54pm9p7xm0ik724kj4"; + }; + macosx = requireFile { + url = https://dl.google.com/android/repository/sdk-tools-darwin-3859397.zip; + sha256 = "1ycx9gzdaqaw6n19yvxjawywacavn1jc6sadlz5qikhgfr57b0aa"; + }; + }; + }; +} else if toolsVersion == "26.1.1" then import ./tools/26.nix { + inherit deployAndroidPackage lib autoPatchelfHook makeWrapper os pkgs pkgs_i686 postInstall; + package = packages.tools."${toolsVersion}"; +} else import ./tools/25.nix { + inherit deployAndroidPackage lib autoPatchelfHook makeWrapper os pkgs pkgs_i686 postInstall; + package = packages.tools."${toolsVersion}"; +} diff --git a/pkgs/development/mobile/androidenv/tools/25.nix b/pkgs/development/mobile/androidenv/tools/25.nix new file mode 100644 index 00000000000..80b5858031d --- /dev/null +++ b/pkgs/development/mobile/androidenv/tools/25.nix @@ -0,0 +1,62 @@ +{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgs_i686, postInstall ? ""}: + +deployAndroidPackage { + name = "androidsdk"; + buildInputs = [ autoPatchelfHook makeWrapper ] + ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xlibs.libX11 pkgs.xlibs.libXext pkgs.xlibs.libXdamage pkgs.xlibs.libxcb pkgs.xlibs.libXfixes pkgs.xlibs.libXrender pkgs.fontconfig.lib pkgs.freetype pkgs.libGL pkgs.zlib pkgs.ncurses5 pkgs.libpulseaudio pkgs_i686.glibc pkgs_i686.xlibs.libX11 pkgs_i686.xlibs.libXrender pkgs_i686.fontconfig pkgs_i686.freetype pkgs_i686.zlib ]; + inherit package os; + + patchInstructions = '' + ${lib.optionalString (os == "linux") '' + # Auto patch all binaries + addAutoPatchelfSearchPath $PWD/lib64 + addAutoPatchelfSearchPath $PWD/lib64/libstdc++ + addAutoPatchelfSearchPath $PWD/lib64/qt/lib + addAutoPatchelfSearchPath $PWD/lib + addAutoPatchelfSearchPath $PWD/lib/libstdc++ + autoPatchelf . + ''} + + # Wrap all scripts that require JAVA_HOME + for i in bin + do + find $i -maxdepth 1 -type f -executable | while read program + do + if grep -q "JAVA_HOME" $program + then + wrapProgram $PWD/$program --prefix PATH : ${pkgs.jdk8}/bin + fi + done + done + + # Wrap programs that require java + for i in draw9patch jobb lint screenshot2 + do + wrapProgram $PWD/$i \ + --prefix PATH : ${pkgs.jdk8}/bin + done + + # Wrap programs that require java and SWT + for i in android ddms hierarchyviewer monitor monkeyrunner traceview uiautomatorviewer + do + wrapProgram $PWD/$i \ + --prefix PATH : ${pkgs.jdk8}/bin \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xlibs.libX11 pkgs.xlibs.libXtst ]} + done + + ${lib.optionalString (os == "linux") '' + wrapProgram $PWD/emulator \ + --prefix PATH : ${pkgs.file}/bin:${pkgs.glxinfo}/bin:${pkgs.pciutils}/bin \ + --set QT_XKB_CONFIG_ROOT ${pkgs.xkeyboard_config}/share/X11/xkb \ + --set QTCOMPOSE ${pkgs.xorg.libX11.out}/share/X11/locale + ''} + + # Patch all script shebangs + patchShebangs . + + cd .. + ${postInstall} + ''; + + meta.licenses = lib.licenses.unfree; +} diff --git a/pkgs/development/mobile/androidenv/tools/26.nix b/pkgs/development/mobile/androidenv/tools/26.nix new file mode 100644 index 00000000000..ed1dfe3d263 --- /dev/null +++ b/pkgs/development/mobile/androidenv/tools/26.nix @@ -0,0 +1,40 @@ +{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgs_i686, postInstall ? ""}: + +deployAndroidPackage { + name = "androidsdk"; + inherit os package; + buildInputs = [ autoPatchelfHook makeWrapper ] + ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xlibs.libX11 pkgs.xlibs.libXrender pkgs.xlibs.libXext pkgs.fontconfig pkgs.freetype pkgs_i686.glibc pkgs_i686.xlibs.libX11 pkgs_i686.xlibs.libXrender pkgs_i686.xlibs.libXext pkgs_i686.fontconfig pkgs_i686.freetype pkgs_i686.zlib ]; + + patchInstructions = '' + ${lib.optionalString (os == "linux") '' + # Auto patch all binaries + autoPatchelf . + ''} + + # Wrap all scripts that require JAVA_HOME + for i in bin + do + find $i -maxdepth 1 -type f -executable | while read program + do + if grep -q "JAVA_HOME" $program + then + wrapProgram $PWD/$program --prefix PATH : ${pkgs.jdk8}/bin + fi + done + done + + # Wrap monitor script + wrapProgram $PWD/monitor \ + --prefix PATH : ${pkgs.jdk8}/bin \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xlibs.libX11 pkgs.xlibs.libXtst ]} + + # Patch all script shebangs + patchShebangs . + + cd .. + ${postInstall} + ''; + + meta.licenses = lib.licenses.unfree; +} diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix index 601b0b319bc..f78a10d8266 100644 --- a/pkgs/development/mobile/flashtool/default.nix +++ b/pkgs/development/mobile/flashtool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, p7zip, jre, libusb1, platformTools, gtk2, glib, libXtst }: +{ stdenv, requireFile, p7zip, jre, libusb1, platform-tools, gtk2, glib, libXtst }: # TODO: # @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { ''; buildPhase = '' - ln -s ${platformTools}/platform-tools/adb x10flasher_lib/adb.linux - ln -s ${platformTools}/platform-tools/fastboot x10flasher_lib/fastboot.linux + ln -s ${platform-tools}/libexec/android-sdk/platform-tools/adb x10flasher_lib/adb.linux + ln -s ${platform-tools}/libexec/android-sdk/platform-tools/fastboot x10flasher_lib/fastboot.linux ln -s ${libusb1.out}/lib/libusb-1.0.so.0 ./x10flasher_lib/linux/lib32/libusbx-1.0.so chmod +x x10flasher_lib/unyaffs.linux.x86 x10flasher_lib/bin2elf x10flasher_lib/bin2sin diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 0250e5bf2e2..472f85fbc45 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -1,200 +1,181 @@ -{stdenv, androidsdk, titaniumsdk, titanium, alloy, xcodewrapper, jdk, python, nodejs, which, file, xcodeBaseDir}: -{ name, src, preBuild ? "", target, androidPlatformVersions ? [ "25" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null +{stdenv, composeAndroidPackages, composeXcodeWrapper, titaniumsdk, titanium, alloy, jdk, python, nodejs, which, file}: +{ name, src, preBuild ? "", target, tiVersion ? null , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null -, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "11.2" -, enableWirelessDistribution ? false, iosBuildStore ? false, installURL ? null -}: +, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "11.3", iosBuildStore ? false +, enableWirelessDistribution ? false, installURL ? null +, xcodeBaseDir ? "/Applications/Xcode.app" +, androidsdkArgs ? {} +, xcodewrapperArgs ? {} +, ... +}@args: assert (release && target == "android") -> androidKeyStore != null && androidKeyAlias != null && androidKeyStorePassword != null; assert (release && target == "iphone") -> iosMobileProvisioningProfile != null && iosCertificateName != null && iosCertificate != null && iosCertificatePassword != null; assert enableWirelessDistribution -> installURL != null; let - androidsdkComposition = androidsdk { - platformVersions = androidPlatformVersions; - abiVersions = androidAbiVersions; - useGoogleAPIs = true; - }; + realAndroidsdkArgs = { + platformVersions = [ "26" ]; + } // androidsdkArgs; + + androidsdk = (composeAndroidPackages realAndroidsdkArgs).androidsdk; + + realXcodewrapperArgs = { + inherit xcodeBaseDir; + } // xcodewrapperArgs; + + xcodewrapper = composeXcodeWrapper xcodewrapperArgs; deleteKeychain = '' - security default-keychain -s login.keychain - security delete-keychain $keychainName - rm -f $HOME/lock-keychain + if [ -f $HOME/lock-keychain ] + then + security default-keychain -s login.keychain + security delete-keychain $keychainName + rm -f $HOME/lock-keychain + fi ''; + + extraArgs = removeAttrs args [ "name" "preRebuild" "androidsdkArgs" "xcodewrapperArgs" ]; in -stdenv.mkDerivation { +stdenv.mkDerivation ({ name = stdenv.lib.replaceChars [" "] [""] name; - inherit src; - buildInputs = [ nodejs titanium alloy jdk python which file ] ++ stdenv.lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") xcodewrapper; - + buildInputs = [ nodejs titanium alloy python which file jdk ] + ++ stdenv.lib.optional (target == "iphone") xcodewrapper; + buildPhase = '' ${preBuild} - export HOME=$TMPDIR - + export HOME=${if target == "iphone" then "/Users/$(whoami)" else "$TMPDIR"} + ${stdenv.lib.optionalString (tiVersion != null) '' # Replace titanium version by the provided one sed -i -e "s|<sdk-version>[0-9a-zA-Z\.]*</sdk-version>|<sdk-version>${tiVersion}</sdk-version>|" tiapp.xml ''} - + # Simulate a login mkdir -p $HOME/.titanium cat > $HOME/.titanium/auth_session.json <<EOF { "loggedIn": true } EOF - + + # Configure the paths to the Titanium SDK and modules echo "{}" > $TMPDIR/config.json titanium --config-file $TMPDIR/config.json --no-colors config sdk.defaultInstallLocation ${titaniumsdk} titanium --config-file $TMPDIR/config.json --no-colors config paths.modules ${titaniumsdk} - + mkdir -p $out - - ${if target == "android" then - '' - titanium config --config-file $TMPDIR/config.json --no-colors android.sdkPath ${androidsdkComposition}/libexec - - export PATH=$(echo ${androidsdkComposition}/libexec/tools):$(echo ${androidsdkComposition}/libexec/build-tools/android-*):$PATH - export GRADLE_USER_HOME=$TMPDIR/gradle - - ${if release then - '' - ${stdenv.lib.optionalString stdenv.isDarwin '' - # Signing the app does not work with OpenJDK on macOS, use host SDK instead - export JAVA_HOME="$(/usr/libexec/java_home -v 1.8)" - ''} - titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --store-password ${androidKeyStorePassword} --output-dir $out - '' - else - ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target emulator --build-only -B foo --output $out''} - '' - else if target == "iphone" then - '' - ${if release then - '' - export HOME=/Users/$(whoami) - export keychainName=$(basename $out) - - # Create a keychain with the component hash name (should always be unique) - security create-keychain -p "" $keychainName - security default-keychain -s $keychainName - security unlock-keychain -p "" $keychainName - security import ${iosCertificate} -k $keychainName -P "${iosCertificatePassword}" -A - security set-key-partition-list -S apple-tool:,apple: -s -k "" $keychainName - provisioningId=$(grep UUID -A1 -a ${iosMobileProvisioningProfile} | grep -o "[-A-Za-z0-9]\{36\}") - - # Ensure that the requested provisioning profile can be found - - if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" ] - then - mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles" - cp ${iosMobileProvisioningProfile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" - fi - - # Simulate a login - mkdir -p $HOME/.titanium - cat > $HOME/.titanium/auth_session.json <<EOF - { "loggedIn": true } - EOF - - # Configure the path to Xcode - titanium --config-file $TMPDIR/config.json --no-colors config paths.xcode ${xcodeBaseDir} - - # Make plutil available - mkdir -p $TMPDIR/bin - ln -s /usr/bin/plutil $TMPDIR/bin - export PATH=$TMPDIR/bin:$PATH - - # Link the modules folder - if [ ! -e modules ] - then - ln -s ${titaniumsdk}/modules modules - fi - - # Take precautions to prevent concurrent builds blocking the keychain - while [ -f $HOME/lock-keychain ] - do - echo "Keychain locked, waiting for a couple of seconds, or remove $HOME/lock-keychain to unblock..." - sleep 3 - done - - touch $HOME/lock-keychain - - security default-keychain -s $keychainName - - # Do the actual build - titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target ${if iosBuildStore then "dist-appstore" else "dist-adhoc"} --pp-uuid $provisioningId --distribution-name "${iosCertificateName}" --keychain $HOME/Library/Keychains/$keychainName-db --device-family universal --ios-version ${iosVersion} --output-dir $out - - # Remove our generated keychain - ${deleteKeychain} - '' - else - '' - # Copy all sources to the output store directory. - # Why? Debug application include *.js files, which are symlinked into their - # sources. If they are not copied, we have dangling references to the - # temp folder. - - cp -av * $out - cd $out - - # We need to consult a real home directory to find the available simulators - export HOME=/Users/$(whoami) - - # Configure the path to Xcode - titanium --config-file $TMPDIR/config.json --no-colors config paths.xcode ${xcodeBaseDir} - - # Link the modules folder - if [ ! -e modules ] - then - ln -s ${titaniumsdk}/modules modules - createdModulesSymlink=1 - fi - - # Execute the build - titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target simulator --build-only --device-family universal --ios-version ${iosVersion} --output-dir $out - - # Remove the modules symlink - if [ "$createdModulesSymlink" = "1" ] - then - rm $out/modules - fi - ''} - '' - - else throw "Target: ${target} is not supported!"} + + ${if target == "android" then '' + titanium config --config-file $TMPDIR/config.json --no-colors android.sdkPath ${androidsdk}/libexec/android-sdk + + export PATH=${androidsdk}/libexec/android-sdk/tools:$(echo ${androidsdk}/libexec/android-sdk/build-tools/android-*):$PATH + export GRADLE_USER_HOME=$TMPDIR/gradle + + ${if release then '' + ${stdenv.lib.optionalString stdenv.isDarwin '' + # Signing the app does not work with OpenJDK on macOS, use host SDK instead + export JAVA_HOME="$(/usr/libexec/java_home -v 1.8)" + ''} + titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias "${androidKeyAlias}" --store-password "${androidKeyStorePassword}" --output-dir $out + '' else '' + titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target emulator --build-only -B foo --output $out + ''} + '' + else if target == "iphone" then '' + # Configure the path to Xcode + titanium --config-file $TMPDIR/config.json --no-colors config paths.xcode ${xcodeBaseDir} + + # Link the modules folder + if [ ! -e modules ] + then + ln -s ${titaniumsdk}/modules modules + createdModulesSymlink=1 + fi + + ${if release then '' + # Create a keychain with the component hash name (should always be unique) + export keychainName=$(basename $out) + + security create-keychain -p "" $keychainName + security default-keychain -s $keychainName + security unlock-keychain -p "" $keychainName + security import ${iosCertificate} -k $keychainName -P "${iosCertificatePassword}" -A + security set-key-partition-list -S apple-tool:,apple: -s -k "" $keychainName + provisioningId=$(grep UUID -A1 -a ${iosMobileProvisioningProfile} | grep -o "[-A-Za-z0-9]\{36\}") + + # Ensure that the requested provisioning profile can be found + + if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" ] + then + mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles" + cp ${iosMobileProvisioningProfile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" + fi + + # Take precautions to prevent concurrent builds blocking the keychain + while [ -f $HOME/lock-keychain ] + do + echo "Keychain locked, waiting for a couple of seconds, or remove $HOME/lock-keychain to unblock..." + sleep 3 + done + + touch $HOME/lock-keychain + + security default-keychain -s $keychainName + + # Do the actual build + titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target ${if iosBuildStore then "dist-appstore" else "dist-adhoc"} --pp-uuid $provisioningId --distribution-name "${iosCertificateName}" --keychain $HOME/Library/Keychains/$keychainName-db --device-family universal --ios-version ${iosVersion} --output-dir $out + + # Remove our generated keychain + ${deleteKeychain} + '' else '' + # Copy all sources to the output store directory. + # Why? Debug application include *.js files, which are symlinked into their + # sources. If they are not copied, we have dangling references to the + # temp folder. + + cp -av * $out + cd $out + + # Execute the build + titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target simulator --build-only --device-family universal --ios-version ${iosVersion} --output-dir $out + + # Remove the modules symlink + if [ "$createdModulesSymlink" = "1" ] + then + rm $out/modules + fi + ''} + '' else throw "Target: ${target} is not supported!"} ''; - + installPhase = '' - mkdir -p $out - - ${if target == "android" && release then "" - else - if target == "android" then - ''cp "$(ls build/android/bin/*.apk | grep -v '\-unsigned.apk')" $out'' - else if target == "iphone" && release then - '' - cp -av build/iphone/build/* $out - mkdir -p $out/nix-support - echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products - - ${stdenv.lib.optionalString enableWirelessDistribution '' - appname=$(basename $out/*.ipa .ipa) - bundleId=$(grep '<id>[a-zA-Z0-9.]*</id>' tiapp.xml | sed -e 's|<id>||' -e 's|</id>||' -e 's/ //g') - version=$(grep '<version>[a-zA-Z0-9.]*</version>' tiapp.xml | sed -e 's|<version>||' -e 's|</version>||' -e 's/ //g') - - sed -e "s|@INSTALL_URL@|${installURL}?bundleId=$bundleId\&version=$version\&title=$appname|" ${../xcodeenv/install.html.template} > "$out/$appname.html" - echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products - ''} - '' - else if target == "iphone" then "" - else throw "Target: ${target} is not supported!"} - ${if target == "android" then '' + ${if release then "" + else '' + cp "$(ls build/android/bin/*.apk | grep -v '\-unsigned.apk')" $out + ''} + + mkdir -p $out/nix-support + echo "file binary-dist \"$(ls $out/*.apk)\"" > $out/nix-support/hydra-build-products + '' + else if target == "iphone" then + if release then '' mkdir -p $out/nix-support - echo "file binary-dist \"$(ls $out/*.apk)\"" > $out/nix-support/hydra-build-products - '' else ""} + echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products + + ${stdenv.lib.optionalString enableWirelessDistribution '' + appname="$(basename "$out/*.ipa" .ipa)" + bundleId=$(grep '<id>[a-zA-Z0-9.]*</id>' tiapp.xml | sed -e 's|<id>||' -e 's|</id>||' -e 's/ //g') + version=$(grep '<version>[a-zA-Z0-9.]*</version>' tiapp.xml | sed -e 's|<version>||' -e 's|</version>||' -e 's/ //g') + + sed -e "s|@INSTALL_URL@|${installURL}?bundleId=$bundleId\&version=$version\&title=$appname|" ${../xcodeenv/install.html.template} > "$out/$appname.html" + echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products + ''} + '' + else "" + else throw "Target: ${target} is not supported!"} ''; - + failureHook = stdenv.lib.optionalString (release && target == "iphone") deleteKeychain; -} +} // extraArgs) diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index f411a8d61fd..e9f6344680b 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -1,27 +1,19 @@ -{pkgs, xcodeVersion ? "9.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "7.1.0.GA"}: +{pkgs, pkgs_i686, androidenv, xcodeenv, tiVersion ? "7.1.0.GA"}: rec { - androidenv = pkgs.androidenv; - - xcodeenv = if pkgs.stdenv.hostPlatform.system == "x86_64-darwin" then pkgs.xcodeenv.override { - version = xcodeVersion; - inherit xcodeBaseDir; - } else null; - titaniumsdk = let - titaniumSdkFile = if tiVersion == "6.3.1.GA" then ./titaniumsdk-6.3.nix - else if tiVersion == "7.1.0.GA" then ./titaniumsdk-7.1.nix + titaniumSdkFile = if tiVersion == "7.1.0.GA" then ./titaniumsdk-7.1.nix else throw "Titanium version not supported: "+tiVersion; in import titaniumSdkFile { - inherit (pkgs) stdenv fetchurl unzip makeWrapper python jdk; + inherit (pkgs) stdenv fetchurl unzip makeWrapper; }; - + buildApp = import ./build-app.nix { inherit (pkgs) stdenv python which file jdk nodejs; - inherit (pkgs.nodePackages_6_x) alloy titanium; - inherit (androidenv) androidsdk; - inherit (xcodeenv) xcodewrapper; - inherit titaniumsdk xcodeBaseDir; + inherit (pkgs.nodePackages_8_x) alloy titanium; + inherit (androidenv) composeAndroidPackages; + inherit (xcodeenv) composeXcodeWrapper; + inherit titaniumsdk; }; } diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix deleted file mode 100644 index 78f91dd39fb..00000000000 --- a/pkgs/development/mobile/titaniumenv/examples/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ nixpkgs ? <nixpkgs> -, systems ? [ "x86_64-linux" "x86_64-darwin" ] -, xcodeVersion ? "9.2" -, xcodeBaseDir ? "/Applications/Xcode.app" -, tiVersion ? "7.1.0.GA" -, rename ? false -, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "11.2" -, enableWirelessDistribution ? false, installURL ? null -}: - -let - pkgs = import nixpkgs {}; -in -rec { - kitchensink_android_debug = pkgs.lib.genAttrs systems (system: - let - pkgs = import nixpkgs { inherit system; }; - in - import ./kitchensink { - inherit (pkgs) fetchgit; - titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion xcodeBaseDir tiVersion; }; - inherit tiVersion; - target = "android"; - }); - - kitchensink_android_release = pkgs.lib.genAttrs systems (system: - let - pkgs = import nixpkgs { inherit system; }; - in - import ./kitchensink { - inherit (pkgs) fetchgit; - titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion xcodeBaseDir tiVersion; }; - inherit tiVersion; - target = "android"; - release = true; - }); - - emulate_kitchensink_debug = pkgs.lib.genAttrs systems (system: - let - pkgs = import nixpkgs { inherit system; }; - in - import ./emulate-kitchensink { - inherit (pkgs) androidenv; - kitchensink = builtins.getAttr system kitchensink_android_debug; - }); - - emulate_kitchensink_release = pkgs.lib.genAttrs systems (system: - let - pkgs = import nixpkgs { inherit system; }; - in - import ./emulate-kitchensink { - inherit (pkgs) androidenv; - kitchensink = builtins.getAttr system kitchensink_android_release; - }); - -} // (if builtins.elem "x86_64-darwin" systems then - let - pkgs = import nixpkgs { system = "x86_64-darwin"; }; - in - rec { - kitchensink_ios_development = import ./kitchensink { - inherit (pkgs) fetchgit; - titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion xcodeBaseDir tiVersion; }; - inherit tiVersion iosVersion; - target = "iphone"; - }; - - simulate_kitchensink = import ./simulate-kitchensink { - inherit (pkgs) stdenv; - xcodeenv = pkgs.xcodeenv.override { version = xcodeVersion; inherit xcodeBaseDir; }; - kitchensink = kitchensink_ios_development; - bundleId = if rename then newBundleId else "com.appcelerator.kitchensink"; - }; -} else {}) // (if rename then - let - pkgs = import nixpkgs { system = "x86_64-darwin"; }; - in - { - kitchensink_ipa = import ./kitchensink { - inherit (pkgs) stdenv fetchgit; - titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion xcodeBaseDir tiVersion; }; - target = "iphone"; - inherit tiVersion; - release = true; - rename = true; - inherit newBundleId iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword iosVersion; - inherit enableWirelessDistribution installURL; - }; - } - -else {}) diff --git a/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix deleted file mode 100644 index cad4503dc96..00000000000 --- a/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{androidenv, kitchensink}: - -androidenv.emulateApp { - name = "emulate-${kitchensink.name}"; - app = kitchensink; - platformVersion = "16"; - useGoogleAPIs = true; - package = "com.appcelerator.kitchensink"; - activity = ".KitchensinkActivity"; -} diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix deleted file mode 100644 index 70ab1b168c4..00000000000 --- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "25" "26" ], tiVersion ? "7.1.0.GA", release ? false -, rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null, iosVersion ? "11.2" -, enableWirelessDistribution ? false, installURL ? null -}: - -assert rename -> (stdenv != null && newBundleId != null && iosMobileProvisioningProfile != null && iosCertificate != null && iosCertificateName != null && iosCertificatePassword != null); - -let - src = fetchgit { - url = https://github.com/appcelerator/kitchensink-v2.git; - rev = "94364df2ef60a80bd354a4273e3cb5f4c5185537"; - sha256 = "0q4gzidpsq401frkngy4yk5kqvm8dz00ls74bw3fnpvg4714d6gf"; - }; - - # Rename the bundle id to something else - renamedSrc = stdenv.mkDerivation { - name = "KitchenSink-renamedsrc"; - inherit src; - buildPhase = '' - sed -i -e "s|com.appcelerator.kitchensink|${newBundleId}|" tiapp.xml - ''; - installPhase = '' - mkdir -p $out - mv * $out - ''; - }; -in -titaniumenv.buildApp { - name = "KitchenSink-${target}-${if release then "release" else "debug"}"; - src = if rename then renamedSrc else src; - preBuild = '' - sed -i -e "s|23|25|" tiapp.xml - ''; # Raise minimum android SDK from 23 to 25 - inherit tiVersion; - - inherit target androidPlatformVersions release; - - androidKeyStore = ./keystore; - androidKeyAlias = "myfirstapp"; - androidKeyStorePassword = "mykeystore"; - - inherit iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword iosVersion; - inherit enableWirelessDistribution installURL; -} diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/generatekeystore.sh b/pkgs/development/mobile/titaniumenv/examples/kitchensink/generatekeystore.sh deleted file mode 100755 index 57451e8a507..00000000000 --- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/generatekeystore.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -e - -( echo "John Doe" - echo "My Company" - echo "My Organization" - echo "My City" - echo "My State" - echo "US" - echo "yes" -) | keytool --genkeypair --alias myfirstapp --keystore ./keystore --storepass mykeystore diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/keystore b/pkgs/development/mobile/titaniumenv/examples/kitchensink/keystore deleted file mode 100644 index ee0a9c7989b..00000000000 --- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/keystore +++ /dev/null Binary files differdiff --git a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix deleted file mode 100644 index bbd94cb7882..00000000000 --- a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{xcodeenv, kitchensink, bundleId}: - -xcodeenv.simulateApp { - name = "simulate-${kitchensink.name}"; - inherit bundleId; - app = "${kitchensink}/build/iphone/build/Products/Debug-iphonesimulator"; -} diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix deleted file mode 100644 index b8c2688708b..00000000000 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix +++ /dev/null @@ -1,43 +0,0 @@ -{stdenv, fetchurl, unzip, makeWrapper}: - -stdenv.mkDerivation { - name = "mobilesdk-6.3.1.GA"; - src = if (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") then fetchurl { - url = http://builds.appcelerator.com/mobile/6_3_X/mobilesdk-6.3.1.v20171101154403-linux.zip; - sha256 = "0g8dqqf5ffa7ll3rqm5naywipnv2vvfxcj9fmqg1wnvvxf0rflqj"; - } - else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl { - url = http://builds.appcelerator.com/mobile/6_3_X/mobilesdk-6.3.1.v20171101154403-osx.zip; - sha256 = "00bm8vv70mg4kd7jvmxd1bfqafv6zdpdx816i0hvf801zwnak4nj"; - } - else throw "Platform: ${stdenv.hostPlatform.system} not supported!"; - - buildInputs = [ unzip makeWrapper ]; - - buildCommand = '' - mkdir -p $out - cd $out - (yes y | unzip $src) || true - - # Rename ugly version number - cd mobilesdk/* - mv * 6.3.1.GA - cd * - ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-darwin") '' - # Fixes a bad archive copying error when generating an IPA file - sed -i -e "s|cp -rf|/bin/cp -rf|" iphone/cli/commands/_build.js - ''} - - # Patch some executables - - ${if stdenv.hostPlatform.system == "i686-linux" then - '' - patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 android/titanium_prep.linux32 - '' - else if stdenv.hostPlatform.system == "x86_64-linux" then - '' - patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 android/titanium_prep.linux64 - '' - else ""} - ''; -} diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix index 4d3bd420969..13abc18f76e 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix @@ -35,7 +35,7 @@ let sha256 = "11nwdb9y84cghcx319nsjjf9m035s4s1184zrhzpvaxq2wvqhbhx"; }; - # Put the download plugins in a fake Maven repository + # Put the downloaded plugins in a fake Maven repository fakeMavenRepo = stdenv.mkDerivation { name = "fake-maven-repo"; buildCommand = '' @@ -54,15 +54,15 @@ let in stdenv.mkDerivation { name = "mobilesdk-7.1.0.GA"; - src = if (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") then fetchurl { + src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = http://builds.appcelerator.com/mobile/7_1_X/mobilesdk-7.1.0.v20180314133955-linux.zip; sha256 = "18b3jnr65sdn5wj191bcl48gvhyklxmighxakv4vrz1fb59kyvqn"; } - else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl { + else if stdenv.system == "x86_64-darwin" then fetchurl { url = http://builds.appcelerator.com/mobile/7_1_X/mobilesdk-7.1.0.v20180314133955-osx.zip; sha256 = "1f62616biwsw1fqxz2sq7lpa6bsfjazffliplyf5dpnh298cnc1m"; } - else throw "Platform: ${stdenv.hostPlatform.system} not supported!"; + else throw "Platform: ${stdenv.system} not supported!"; buildInputs = [ unzip makeWrapper ]; @@ -89,11 +89,11 @@ stdenv.mkDerivation { # Patch some executables - ${if stdenv.hostPlatform.system == "i686-linux" then + ${if stdenv.system == "i686-linux" then '' patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 android/titanium_prep.linux32 '' - else if stdenv.hostPlatform.system == "x86_64-linux" then + else if stdenv.system == "x86_64-linux" then '' patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 android/titanium_prep.linux64 '' diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index d7dd2d1190d..90fa307fbf2 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -1,14 +1,13 @@ -{stdenv, xcodewrapper}: +{stdenv, composeXcodeWrapper}: { name , src -, sdkVersion ? "11.2" +, sdkVersion ? "11.3" , target ? null , configuration ? null , scheme ? null , sdk ? null , xcodeFlags ? "" , release ? false -, codeSignIdentity ? null , certificateFile ? null , certificatePassword ? null , provisioningProfile ? null @@ -18,24 +17,23 @@ , enableWirelessDistribution ? false , installURL ? null , bundleId ? null -, version ? null -, title ? null -, meta ? {} -}: +, appVersion ? null +, ... +}@args: -assert release -> codeSignIdentity != null && certificateFile != null && certificatePassword != null && provisioningProfile != null && signMethod != null; -assert enableWirelessDistribution -> installURL != null && bundleId != null && version != null && title != null; +assert release -> certificateFile != null && certificatePassword != null && provisioningProfile != null && signMethod != null; +assert enableWirelessDistribution -> installURL != null && bundleId != null && appVersion != null; let # Set some default values here - + _target = if target == null then name else target; _configuration = if configuration == null then if release then "Release" else "Debug" else configuration; - + _sdk = if sdk == null then if release then "iphoneos" + sdkVersion else "iphonesimulator" + sdkVersion @@ -46,41 +44,45 @@ let security default-keychain -s login.keychain security delete-keychain $keychainName ''; + + xcodewrapperFormalArgs = builtins.functionArgs composeXcodeWrapper; + xcodewrapperArgs = builtins.intersectAttrs xcodewrapperFormalArgs args; + xcodewrapper = composeXcodeWrapper xcodewrapperArgs; + + extraArgs = removeAttrs args ([ "name" "scheme" "xcodeFlags" "release" "certificateFile" "certificatePassword" "provisioningProfile" "signMethod" "generateIPA" "generateXCArchive" "enableWirelessDistribution" "installURL" "bundleId" "version" ] ++ builtins.attrNames xcodewrapperFormalArgs); in -stdenv.mkDerivation { - name = stdenv.lib.replaceChars [" "] [""] name; - inherit src; - inherit meta; +stdenv.mkDerivation ({ + name = stdenv.lib.replaceChars [" "] [""] name; # iOS app names can contain spaces, but in the Nix store this is not allowed buildInputs = [ xcodewrapper ]; buildPhase = '' ${stdenv.lib.optionalString release '' - export HOME=/Users/$(whoami) - keychainName="$(basename $out)" - - # Create a keychain - security create-keychain -p "" $keychainName - security default-keychain -s $keychainName - security unlock-keychain -p "" $keychainName - - # Import the certificate into the keychain - security import ${certificateFile} -k $keychainName -P "${certificatePassword}" -A - - # Grant the codesign utility permissions to read from the keychain - security set-key-partition-list -S apple-tool:,apple: -s -k "" $keychainName - - # Determine provisioning ID - PROVISIONING_PROFILE=$(grep UUID -A1 -a ${provisioningProfile} | grep -o "[-A-Za-z0-9]\{36\}") - - if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$PROVISIONING_PROFILE.mobileprovision" ] - then - # Copy provisioning profile into the home directory - mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles" - cp ${provisioningProfile} "$HOME/Library/MobileDevice/Provisioning Profiles/$PROVISIONING_PROFILE.mobileprovision" - fi - - # Check whether the identity can be found - security find-identity -p codesigning $keychainName - ''} + export HOME=/Users/$(whoami) + keychainName="$(basename $out)" + + # Create a keychain + security create-keychain -p "" $keychainName + security default-keychain -s $keychainName + security unlock-keychain -p "" $keychainName + + # Import the certificate into the keychain + security import ${certificateFile} -k $keychainName -P "${certificatePassword}" -A + + # Grant the codesign utility permissions to read from the keychain + security set-key-partition-list -S apple-tool:,apple: -s -k "" $keychainName + + # Determine provisioning ID + PROVISIONING_PROFILE=$(grep UUID -A1 -a ${provisioningProfile} | grep -o "[-A-Za-z0-9]\{36\}") + + if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$PROVISIONING_PROFILE.mobileprovision" ] + then + # Copy provisioning profile into the home directory + mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles" + cp ${provisioningProfile} "$HOME/Library/MobileDevice/Provisioning Profiles/$PROVISIONING_PROFILE.mobileprovision" + fi + + # Check whether the identity can be found + security find-identity -p codesigning $keychainName + ''} # Do the building export LD=clang # To avoid problem with -isysroot parameter that is unrecognized by the stock ld. Comparison with an impure build shows that it uses clang instead. Ugly, but it works @@ -116,10 +118,11 @@ stdenv.mkDerivation { # Add IPA to Hydra build products mkdir -p $out/nix-support echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products - + ${stdenv.lib.optionalString enableWirelessDistribution '' - appname=$(basename $out/*.ipa .ipa) - sed -e "s|@INSTALL_URL@|${installURL}?bundleId=${bundleId}\&version=${version}\&title=$appname|" ${./install.html.template} > $out/$appname.html + # Add another hacky build product that enables wireless adhoc installations + appname="$(basename "$out/*.ipa" .ipa)" + sed -e "s|@INSTALL_URL@|${installURL}?bundleId=${bundleId}\&version=${appVersion}\&title=$appname|" ${./install.html.template} > $out/$appname.html echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products ''} ''} @@ -127,13 +130,13 @@ stdenv.mkDerivation { mkdir -p $out mv "${name}.xcarchive" $out ''} - + # Delete our temp keychain ${deleteKeychain} ''} ''; - + failureHook = stdenv.lib.optionalString release deleteKeychain; - + installPhase = "true"; -} +} // extraArgs) diff --git a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix index 38afe86c5aa..d0093ffac91 100644 --- a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix +++ b/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix @@ -1,4 +1,7 @@ -{stdenv, version, xcodeBaseDir}: +{stdenv}: +{version ? "9.3", xcodeBaseDir ? "/Applications/Xcode.app"}: + +assert stdenv.isDarwin; stdenv.mkDerivation { name = "xcode-wrapper-"+version; @@ -9,6 +12,7 @@ stdenv.mkDerivation { ln -s /usr/bin/security ln -s /usr/bin/codesign ln -s /usr/bin/xcrun + ln -s /usr/bin/plutil ln -s "${xcodeBaseDir}/Contents/Developer/usr/bin/xcodebuild" ln -s "${xcodeBaseDir}/Contents/Developer/Applications/Simulator.app/Contents/MacOS/Simulator" diff --git a/pkgs/development/mobile/xcodeenv/default.nix b/pkgs/development/mobile/xcodeenv/default.nix index b3b9dbdf07a..47686e6d69e 100644 --- a/pkgs/development/mobile/xcodeenv/default.nix +++ b/pkgs/development/mobile/xcodeenv/default.nix @@ -1,15 +1,15 @@ -{stdenv, version ? "9.2", xcodeBaseDir ? "/Applications/Xcode.app"}: +{stdenv}: rec { - xcodewrapper = import ./xcodewrapper.nix { - inherit stdenv version xcodeBaseDir; + composeXcodeWrapper = import ./compose-xcodewrapper.nix { + inherit stdenv; }; buildApp = import ./build-app.nix { - inherit stdenv xcodewrapper; + inherit stdenv composeXcodeWrapper; }; simulateApp = import ./simulate-app.nix { - inherit stdenv xcodewrapper; + inherit stdenv composeXcodeWrapper; }; } diff --git a/pkgs/development/mobile/xcodeenv/install.html.template b/pkgs/development/mobile/xcodeenv/install.html.template index 833b1994162..d48fda7f38b 100644 --- a/pkgs/development/mobile/xcodeenv/install.html.template +++ b/pkgs/development/mobile/xcodeenv/install.html.template @@ -4,14 +4,14 @@ <head> <title>Install IPA</title> </head> - + <body> <a id="forwardlink" href="@INSTALL_URL@">Go to the install page or wait a second</a> - + <script type="text/javascript"> setTimeout(function() { var link = document.getElementById('forwardlink'); - + if(document.createEvent) { var eventObj = document.createEvent('MouseEvents'); eventObj.initEvent('click', true, false); diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix index 04b6f2cbc83..1a55f8366a3 100644 --- a/pkgs/development/mobile/xcodeenv/simulate-app.nix +++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix @@ -1,47 +1,56 @@ -{stdenv, xcodewrapper}: -{name, bundleId, app}: +{stdenv, composeXcodeWrapper}: +{name, app ? null, bundleId ? null, ...}@args: +assert app != null -> bundleId != null; + +let + xcodewrapperArgs = builtins.intersectAttrs (builtins.functionArgs composeXcodeWrapper) args; + + xcodewrapper = composeXcodeWrapper xcodewrapperArgs; +in stdenv.mkDerivation { name = stdenv.lib.replaceChars [" "] [""] name; buildCommand = '' mkdir -p $out/bin cat > $out/bin/run-test-simulator << "EOF" #! ${stdenv.shell} -e - + if [ "$1" = "" ] then # Show the user the possibile UDIDs and let him pick one, if none is provided as a command-line parameter xcrun simctl list - + echo "Please provide a UDID of a simulator:" read udid else # If a parameter has been provided, consider that a device UDID and use that udid="$1" fi - + # Open the simulator instance open -a "$(readlink "${xcodewrapper}/bin/Simulator")" --args -CurrentDeviceUDID $udid - - # Copy the app and restore the write permissions - appTmpDir=$(mktemp -d -t appTmpDir) - cp -r "$(echo ${app}/*.app)" "$appTmpDir" - chmod -R 755 "$(echo $appTmpDir/*.app)" - - # Wait for the simulator to start - echo "Press enter when the simulator is started..." - read - - # Install the app - xcrun simctl install "$udid" "$(echo $appTmpDir/*.app)" - - # Remove the app tempdir - rm -Rf $appTmpDir - - # Launch the app in the simulator - xcrun simctl launch $udid "${bundleId}" - EOF - - chmod +x $out/bin/run-test-simulator + + ${stdenv.lib.optionalString (app != null) '' + # Copy the app and restore the write permissions + appTmpDir=$(mktemp -d -t appTmpDir) + cp -r "$(echo ${app}/*.app)" "$appTmpDir" + chmod -R 755 "$(echo $appTmpDir/*.app)" + + # Wait for the simulator to start + echo "Press enter when the simulator is started..." + read + + # Install the app + xcrun simctl install "$udid" "$(echo $appTmpDir/*.app)" + + # Remove the app tempdir + rm -Rf $appTmpDir + + # Launch the app in the simulator + xcrun simctl launch $udid "${bundleId}" + EOF + + chmod +x $out/bin/run-test-simulator + ''} ''; } diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix index 9ba48e6ebfd..a4341ed98c6 100644 --- a/pkgs/development/ocaml-modules/cmdliner/default.nix +++ b/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -8,11 +8,11 @@ assert stdenv.lib.versionAtLeast ocaml.version "4.01.0"; stdenv.mkDerivation rec { name = "ocaml-${pname}-${version}"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz"; - sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1"; + sha256 = "0g3w4hvc1cx9x2yp5aqn6m2rl8lf9x1dn754hfq8m1sc1102lxna"; }; nativeBuildInputs = [ ocamlbuild topkg ]; diff --git a/pkgs/development/ocaml-modules/csv/lwt.nix b/pkgs/development/ocaml-modules/csv/lwt.nix new file mode 100644 index 00000000000..2fa9296d7e4 --- /dev/null +++ b/pkgs/development/ocaml-modules/csv/lwt.nix @@ -0,0 +1,14 @@ +{ lib, buildDunePackage, ocaml, csv, ocaml_lwt }: + +if !lib.versionAtLeast ocaml.version "4.02" +then throw "csv-lwt is not available for OCaml ${ocaml.version}" +else + +buildDunePackage { + pname = "csv-lwt"; + inherit (csv) src version meta; + + propagatedBuildInputs = [ csv ocaml_lwt ]; + + doCheck = lib.versionAtLeast ocaml.version "4.03"; +} diff --git a/pkgs/development/ocaml-modules/curses/default.nix b/pkgs/development/ocaml-modules/curses/default.nix index eebb2f68f3d..d08259af247 100644 --- a/pkgs/development/ocaml-modules/curses/default.nix +++ b/pkgs/development/ocaml-modules/curses/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ocaml-curses-${version}"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { url = "http://ocaml.phauna.org/distfiles/ocaml-curses-${version}.ogunden1.tar.gz"; - sha256 = "0fxya4blx4zcp9hy8gxxm2z7aas7hfvwnjdlj9pmh0s5gijpwsll"; + sha256 = "08wq1r93lincdfzlriyc5nl2p4q7ca4h6ygzgp1nhkgd93pgk9v2"; }; propagatedBuildInputs = [ ncurses ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "OCaml Bindings to curses/ncurses"; - homepage = https://opam.ocaml.org/packages/curses/curses.1.0.3/; + homepage = https://opam.ocaml.org/packages/curses/curses.1.0.4/; license = licenses.gpl2; maintainers = [ maintainers.volth ]; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix index 26fa24d8dc0..53e8265c3a7 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix @@ -1,29 +1,30 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg, cppo -, ppx_deriving, yojson, ounit +{ lib, buildDunePackage, fetchFromGitHub, ppxfind, ounit +, ppx_deriving, yojson }: -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-ppx_deriving_yojson-${version}"; - version = "3.1"; +buildDunePackage rec { + pname = "ppx_deriving_yojson"; + version = "3.3"; + + minimumOCamlVersion = "4.04"; src = fetchFromGitHub { owner = "ocaml-ppx"; repo = "ppx_deriving_yojson"; rev = "v${version}"; - sha256 = "1pwfnq7z60nchba4gnf58918ll11w3gj5i88qhz1p2jm45hxqgnw"; + sha256 = "1gbfziw03r9azqlsmyn6izrgrf1xc30s88jgdany1kblpgq41rsz"; }; - buildInputs = [ ocaml findlib ocamlbuild cppo ounit ]; + buildInputs = [ ppxfind ounit ]; propagatedBuildInputs = [ ppx_deriving yojson ]; - inherit (topkg) installPhase; + doCheck = true; meta = { - description = "A Yojson codec generator for OCaml >= 4.02."; + description = "A Yojson codec generator for OCaml >= 4.04"; inherit (src.meta) homepage; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/ppxfind/default.nix b/pkgs/development/ocaml-modules/ppxfind/default.nix new file mode 100644 index 00000000000..ebb592dddd2 --- /dev/null +++ b/pkgs/development/ocaml-modules/ppxfind/default.nix @@ -0,0 +1,21 @@ +{ lib, buildDunePackage, fetchurl, ocaml-migrate-parsetree }: + +buildDunePackage rec { + pname = "ppxfind"; + version = "1.2"; + src = fetchurl { + url = "https://github.com/diml/ppxfind/releases/download/${version}/ppxfind-${version}.tbz"; + sha256 = "1687jbgii5w5dvvid3ri2cx006ysv0rrspn8dz8x7ma8615whz2h"; + }; + + minimumOCamlVersion = "4.03"; + + buildInputs = [ ocaml-migrate-parsetree ]; + + meta = { + homepage = "https://github.com/diml/ppxfind"; + description = "ocamlfind ppx tool"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index b59be96bb62..c67e5a9489b 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -1,4 +1,19 @@ -{ stdenv, fetchurl, bash, unzip, glibc, openssl, libGLU_combined, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc48, ... }: +{ stdenv +, fetchurl +, bash +, unzip +, glibc +, openssl +, libgit2 +, libGLU_combined +, freetype +, xorg +, alsaLib +, cairo +, libuuid +, autoreconfHook +, gcc48 +, ... }: { name, src, version, source-date, source-url, ... }: @@ -65,7 +80,19 @@ stdenv.mkDerivation rec { # (No special build phase.) - installPhase = '' + installPhase = let + libs = [ + cairo + libgit2 + libGLU_combined + freetype + openssl + libuuid + alsaLib + xorg.libICE + xorg.libSM + ]; + in '' # Install in working directory and then copy make install-squeak install-plugins prefix=$(pwd)/products @@ -83,7 +110,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" # Note: include ELF rpath in LD_LIBRARY_PATH for finding libc. - libs=$out:$(patchelf --print-rpath "$out/pharo"):${cairo}/lib:${libGLU_combined}/lib:${freetype}/lib:${openssl}/lib:${libuuid}/lib:${alsaLib}/lib:${xorg.libICE}/lib:${xorg.libSM}/lib + libs=$out:$(patchelf --print-rpath "$out/pharo"):${stdenv.lib.makeLibraryPath libs} # Create the script cat > "$out/bin/${cmd}" <<EOF @@ -92,6 +119,7 @@ stdenv.mkDerivation rec { LD_LIBRARY_PATH="\$LD_LIBRARY_PATH:$libs" exec $out/pharo "\$@" EOF chmod +x "$out/bin/${cmd}" + ln -s ${libgit2}/lib/libgit2.so* "$out/" ''; enableParallelBuilding = true; @@ -104,7 +132,22 @@ stdenv.mkDerivation rec { # # (stack protection is disabled above for gcc 4.8 compatibility.) nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ bash unzip glibc openssl gcc48 libGLU_combined freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share libuuid ]; + buildInputs = [ + bash + unzip + glibc + openssl + gcc48 + libGLU_combined + freetype + xorg.libX11 + xorg.libICE + xorg.libSM + alsaLib + cairo + pharo-share + libuuid + ]; meta = with stdenv.lib; { description = "Clean and innovative Smalltalk-inspired environment"; diff --git a/pkgs/development/pharo/vm/vms.nix b/pkgs/development/pharo/vm/vms.nix index 9a7a1ebd06f..19065f972a4 100644 --- a/pkgs/development/pharo/vm/vms.nix +++ b/pkgs/development/pharo/vm/vms.nix @@ -1,4 +1,23 @@ -{ cmake, stdenv, fetchurl, bash, unzip, glibc, openssl, gcc, libGLU_combined, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc48, fetchFromGitHub, makeWrapper} @args: +{ cmake +, stdenv +, fetchurl +, bash +, unzip +, glibc +, openssl +, gcc +, libgit2 +, libGLU_combined +, freetype +, xorg +, alsaLib +, cairo +, libuuid +, autoreconfHook +, gcc48 +, fetchFromGitHub +, makeWrapper +} @args: let pharo-vm-build = import ./build-vm.nix args; diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index 60a704f5610..a80cd99f73f 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -1,7 +1,9 @@ { buildPythonPackage , lib +, pythonOlder , fetchPypi , six +, enum34 }: buildPythonPackage rec { @@ -13,7 +15,11 @@ buildPythonPackage rec { sha256 = "87519e3b91a3d573664c6e2ee33df582bb68dca6642ae3cf3a4361b1c0a4e9d6"; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ + six + ] ++ lib.optionals (pythonOlder "3.4") [ + enum34 + ]; # checks use bazel; should be revisited doCheck = false; diff --git a/pkgs/development/python-modules/affine/default.nix b/pkgs/development/python-modules/affine/default.nix index 5bd957ae731..e2fd802cf80 100644 --- a/pkgs/development/python-modules/affine/default.nix +++ b/pkgs/development/python-modules/affine/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "affine"; - version = "2.2.1"; + version = "2.2.2"; src = fetchPypi { inherit pname version; - sha256 = "0j3mvcnmgjvvm0znqyf7xylq7i89zjf4dq0g8280xs6bwbl5cvih"; + sha256 = "146slzpj2b220dmbmrxib030wymvplawxzn7gcgnbahgm500y3gz"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index 0f2740a90d8..bbfd08e03aa 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -10,11 +10,11 @@ # wrapped to be able to find aioconsole and any other packages. buildPythonPackage rec { pname = "aioconsole"; - version = "0.1.10"; + version = "0.1.11"; src = fetchPypi { inherit pname version; - sha256 = "3fab07073648d70d8345e0eb745bd81fcd02b5e2b080c4663faea8c8ab281c0a"; + sha256 = "0xjfx7fnmc9c8s1agj5mva3api4dywrf1q81yccb1gk7ifrrn04c"; }; # hardcodes a test dependency on an old version of pytest-asyncio diff --git a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix index 8f46a6f0b0f..6f5fd3e934a 100644 --- a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix +++ b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "antlr4-python3-runtime"; - version = "4.7.1"; + version = "4.7.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1lrzmagawmavyw1n1z0qarvs2jmbnbv0p89dah8g7klj8hnbf9hv"; + sha256 = "02xm7ccsf51vh4xsnhlg6pvchm1x3ckgv9kwm222w5drizndr30n"; }; meta = { diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index e460b0ac625..4ea60f2f29a 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "4.3.1"; + version = "0.20.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "5b0c2390af3e29d910e3d6e7a72b0be59d6e15933740dd193129217c000e4fed"; + sha256 = "12hr5vxdg2sk2fzr608a37f4i8nbchca7dgdmly2w5fc7x88jx2v"; }; preConfigure = '' diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index beb0a7f895d..fd47f8895fd 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "2.2.1"; + version = "0.20.1"; pname = "azure-mgmt-network"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "a4327bccc435ca4f829ac18f82f17923b490958c202af7a86044ccabeaaa5401"; + sha256 = "10vj22h6nxpw0qpvib5x2g6qs5j8z31142icvh4qk8k40fcrs9hx"; }; preConfigure = '' diff --git a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix index cf977539d5d..aa037b48b4f 100644 --- a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "3.0.2"; + version = "1.0.0"; pname = "azure-mgmt-nspkg"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "8b2287f671529505b296005e6de9150b074344c2c7d1c805b3f053d081d58c52"; + sha256 = "1rq92fj3kvnqkk18596dybw0kvhgscvc6cd8hp1dhy3wrkqnhwmq"; }; propagatedBuildInputs = [ azure-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index 557cf8e315a..b60e3aee340 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { - version = "2.0.0"; + version = "0.20.1"; pname = "azure-mgmt-resource"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "2e83289369be88d0f06792118db5a7d4ed7150f956aaae64c528808da5518d7f"; + sha256 = "0slh9qfm5nfacrdm3lid0sr8kwqzgxvrwf27laf9v38kylkfqvml"; }; preConfigure = '' diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index ec45d5ae8f6..2e0523bb25c 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "3.0.0"; + version = "0.20.0"; pname = "azure-mgmt-storage"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "24c52b9dcb5e224ca9572d6ec39b53d332bdfe01818e85ec1cc1b5bedf16ce07"; + sha256 = "16iw7hqhq97vlzfwixarfnirc60l5mz951p57brpcwyylphl3yim"; }; preConfigure = '' diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix index 6fc3f16b3ad..7ad3489553c 100644 --- a/pkgs/development/python-modules/behave/default.nix +++ b/pkgs/development/python-modules/behave/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi +{ stdenv, fetchPypi, fetchpatch , buildPythonApplication, python, pythonOlder , mock, nose, pathpy, pyhamcrest, pytest , glibcLocales, parse, parse-type, six @@ -13,6 +13,14 @@ buildPythonApplication rec { sha256 = "11hsz365qglvpp1m1w16239c3kiw15lw7adha49lqaakm8kj6rmr"; }; + patches = [ + # Fix tests on Python 2.7 + (fetchpatch { + url = https://github.com/behave/behave/commit/0a9430a94881cd18437deb03d2ae23afea0f009c.patch; + sha256 = "1nrh9ii6ik6gw2kjh8a6jk4mg5yqw3jfjfllbyxardclsab62ydy"; + }) + ]; + checkInputs = [ mock nose pathpy pyhamcrest pytest ]; buildInputs = [ glibcLocales ]; propagatedBuildInputs = [ parse parse-type six ] ++ stdenv.lib.optional (pythonOlder "3.0") traceback2; diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix index 39be67e6e51..beb03c894be 100644 --- a/pkgs/development/python-modules/biopython/default.nix +++ b/pkgs/development/python-modules/biopython/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "biopython"; - version = "1.72"; + version = "1.73"; src = fetchPypi { inherit pname version; - sha256 = "ab6b492443adb90c66267b3d24d602ae69a93c68f4b9f135ba01cb06d36ce5a2"; + sha256 = "1q55jhf76z3k6is3psis0ckbki7df26x7dikpcc3vhk1vhkwribh"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index 7dc9649e628..f7b09b96fb1 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -1,12 +1,12 @@ { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k }: buildPythonPackage rec { - version = "4.11.0"; + version = "4.11.1"; pname = "breathe"; src = fetchPypi { inherit pname version; - sha256 = "05x3qrvsriy0cn0p4bxnzhp27pvxbq2vxlxncr2wqh003gpbp4fa"; + sha256 = "1mps0cfli6iq2gqsv3d24fs1cp7sq7crd9ji6lw63b9r40998ylv"; }; propagatedBuildInputs = [ docutils six sphinx ]; diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index c8bc14d3dc1..011cd879b1f 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k, python, twisted, jinja2, zope_interface, future, sqlalchemy, sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, treq, txrequests, - txgithub, pyjade, boto3, moto, mock, lz4, setuptoolsTrial, isort, pylint, + txgithub, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial, isort, pylint, flake8, buildbot-worker, buildbot-pkg, glibcLocales }: let @@ -55,7 +55,7 @@ let boto3 moto mock - lz4 + python-lz4 setuptoolsTrial isort pylint diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 8e35c7c2d37..cbb8774f55f 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi, isPy3k , cheroot, contextlib2, portend, routes, six , setuptools_scm, zc_lockfile , backports_unittest-mock, objgraph, pathpy, pytest, pytestcov @@ -9,6 +9,8 @@ buildPythonPackage rec { pname = "CherryPy"; version = "18.0.1"; + disabled = !isPy3k; + src = fetchPypi { inherit pname version; sha256 = "3002fc47b982c3df4d08dbe5996b093fd73f85b650ab8df19e8b9b95f5c00520"; diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix index 799ad0473ea..f2817d0fd32 100644 --- a/pkgs/development/python-modules/cli-helpers/default.nix +++ b/pkgs/development/python-modules/cli-helpers/default.nix @@ -1,11 +1,13 @@ { lib , buildPythonPackage , fetchPypi +, configobj , terminaltables , tabulate , backports_csv , wcwidth , pytest +, mock , isPy27 }: @@ -19,12 +21,13 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ + configobj terminaltables tabulate wcwidth ] ++ (lib.optionals isPy27 [ backports_csv ]); - checkInputs = [ pytest ]; + checkInputs = [ pytest mock ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix index 9a9be578ca8..a77e98dae4c 100644 --- a/pkgs/development/python-modules/cypari2/default.nix +++ b/pkgs/development/python-modules/cypari2/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "cypari2"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "2.0.1"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "32fad615d773e9b5a9394c078ddc2c868e64e35f1ac9633ff90b456901b9d886"; + sha256 = "04f00xp8aaz37v00iqg1mv5wjq00a5qhk8cqa93s13009s9x984r"; }; # This differs slightly from the default python installPhase in that it pip-installs diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index 30ef1a10418..822815736da 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "django-extensions"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0ns1m9sdkcbbz84wvzgxa4f8hf4a8z656jzwx4bw8np9kh96zfjy"; + sha256 = "1bp0ybarkrj66qx2gn9954vsjqq2ya1w4bppfhr763mkis8qnb4f"; }; postPatch = '' diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index c8c9267265d..131c6b3ef1b 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.16"; + version = "1.11.17"; disabled = pythonOlder "2.7"; src = fetchurl { - url = "http://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz"; - sha256 = "14apywfi8mfy50xh07cagp24kx9mlqfzfq4f60klz90ng328q9i9"; + url = "https://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz"; + sha256 = "10xlpm21ll8mgz5py41sz9vrd603qv7an736agbqxkxlyikfx1x7"; }; patches = stdenv.lib.optionals withGdal [ @@ -34,8 +34,9 @@ buildPythonPackage rec { # too complicated to setup doCheck = false; - meta = { + meta = with stdenv.lib; { description = "A high-level Python Web framework"; homepage = https://www.djangoproject.com/; + license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/django/1_8.nix b/pkgs/development/python-modules/django/1_8.nix index e87a9cbad02..30d75e73c68 100644 --- a/pkgs/development/python-modules/django/1_8.nix +++ b/pkgs/development/python-modules/django/1_8.nix @@ -6,12 +6,11 @@ buildPythonPackage rec { name = "Django-${version}"; - version = "1.8.18"; - disabled = pythonOlder "2.7"; + version = "1.8.19"; src = fetchurl { url = "http://www.djangoproject.com/m/releases/1.8/${name}.tar.gz"; - sha256 = "1ishvbihr9pain0486qafb18dnb7v2ppq34nnx1s8f95bvfiqqf7"; + sha256 = "0iy0ni9j1rnx9b06ycgbg2dkrf3qid3y2jipk9x28cykz5f4mm1k"; }; # too complicated to setup diff --git a/pkgs/development/python-modules/django/2_1.nix b/pkgs/development/python-modules/django/2_1.nix index adda83ce715..57a3198b4d1 100644 --- a/pkgs/development/python-modules/django/2_1.nix +++ b/pkgs/development/python-modules/django/2_1.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.1.3"; + version = "2.1.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "05k990b9zbj0nfkdcn13f5hg7ppfx9vffz5s0m66imd3mmlb5yhz"; + sha256 = "1mxbrqdzim3xcy18dmd08xh2am0q7whbf0nf6bmnrl43802m3386"; }; patches = stdenv.lib.optionals withGdal [ diff --git a/pkgs/development/python-modules/dominate/default.nix b/pkgs/development/python-modules/dominate/default.nix index 4e918968f44..94c67afe164 100644 --- a/pkgs/development/python-modules/dominate/default.nix +++ b/pkgs/development/python-modules/dominate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dominate"; - version = "2.3.4"; + version = "2.3.5"; src = fetchPypi { inherit pname version; - sha256 = "8dfcca2bde3937a2d03db6e55efcb0c0dea0d4ab0923dc983d794b19e9247328"; + sha256 = "0lda2a4nxxh9wp727vhn31rl5v7y9fxkscdjawg7gzj50xf76xj0"; }; doCheck = !isPy3k; diff --git a/pkgs/development/python-modules/dpkt/default.nix b/pkgs/development/python-modules/dpkt/default.nix index e45d651f324..c8c7f255afa 100644 --- a/pkgs/development/python-modules/dpkt/default.nix +++ b/pkgs/development/python-modules/dpkt/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dpkt"; - version = "1.9.1"; + version = "1.9.2"; src = fetchPypi { inherit pname version; - sha256 = "0rr9ygczhxkfb61778jx0cxs0sq46zwlcj5l3wn6xmd3iy3yx9y6"; + sha256 = "0m0ym219zsqfjl6jwivw5as3igjbmhpcn4dvabc5nkd0bk6jxaaj"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index 7693f7f0568..345cd120f07 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dropbox"; - version = "9.1.0"; + version = "9.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0j6p5hgbglpwqd4jl53iqs83537464lybzc0aszi3w6wm6i0dlyq"; + sha256 = "121wn4l6f6r4vm7yq0y9d1xsn5y77l6a4vgakyy2yaz8wv6j9w7c"; }; # Set DROPBOX_TOKEN environment variable to a valid token. diff --git a/pkgs/development/python-modules/easyprocess/default.nix b/pkgs/development/python-modules/easyprocess/default.nix index dc5784aafb7..46948f2485c 100644 --- a/pkgs/development/python-modules/easyprocess/default.nix +++ b/pkgs/development/python-modules/easyprocess/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "EasyProcess"; - version = "0.2.3"; + version = "0.2.5"; src = fetchPypi { inherit pname version; - sha256 = "07z6485bjxkmx26mp1p1ww19d10qavw0s006bidzailsvk543qll"; + sha256 = "0gdl6y37g8rns2i26d2zlx7x4kbpql9h5qd8k23ka69q6frcpb8k"; }; # No tests diff --git a/pkgs/development/python-modules/elpy/default.nix b/pkgs/development/python-modules/elpy/default.nix index a08616b7cb7..6c22236892e 100644 --- a/pkgs/development/python-modules/elpy/default.nix +++ b/pkgs/development/python-modules/elpy/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "elpy"; - version = "1.26.0"; + version = "1.27.0"; src = fetchPypi { inherit pname version; - sha256 = "1m3dk609sn1j8zk8xwrlgcw82vkpws4q4aypv2ljpky9lm36npv6"; + sha256 = "0fpxxmxjzcam3kharbmvprf4kagspya1rx9piacmxbgcp6w2lc4s"; }; propagatedBuildInputs = [ flake8 autopep8 jedi importmagic ] diff --git a/pkgs/development/python-modules/facebook-sdk/default.nix b/pkgs/development/python-modules/facebook-sdk/default.nix index 249acb262fb..d74c6e57470 100644 --- a/pkgs/development/python-modules/facebook-sdk/default.nix +++ b/pkgs/development/python-modules/facebook-sdk/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "facebook-sdk"; - version = "3.0.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "f3d450ec313b62d3716fadc4e5098183760e1d2a9e0434a94b74e59ea6ea3e4d"; + sha256 = "138grz0n6plzdqgi4h6hhszf58bsvx9v76cwj51g1nd3kvkd5g6a"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/fints/default.nix b/pkgs/development/python-modules/fints/default.nix new file mode 100644 index 00000000000..4f6d8d0dc17 --- /dev/null +++ b/pkgs/development/python-modules/fints/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi, + requests, mt-940, sepaxml, bleach, isPy3k }: + +buildPythonPackage rec { + version = "2.0.0"; + pname = "fints"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1jja83h0ld55djiphcxdz64z5qp3w94204bfbgg65v5ybw0vpqq1"; + }; + + propagatedBuildInputs = [ requests mt-940 sepaxml bleach ]; + + # no tests included in PyPI package + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/raphaelm/python-fints/; + description = "Pure-python FinTS (formerly known as HBCI) implementation"; + license = licenses.lgpl3; + maintainers = with maintainers; [ elohmeier ]; + }; +} diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix index 1f9177832c3..90c2349ae53 100644 --- a/pkgs/development/python-modules/flask-migrate/default.nix +++ b/pkgs/development/python-modules/flask-migrate/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; buildPythonPackage rec { pname = "Flask-Migrate"; - version = "2.3.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "19rxhva9i5n643vm3d11f8p98jwai2pavysa217p5w5h5cnksnx2"; + sha256 = "1awlb4q1l9iv794qjjxxyhcv4i69j77kh7nsg17a6kb909mglml3"; }; checkInputs = optional isPy3k glibcLocales; diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index f0f7ee84bce..7c64d9bd183 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -28,14 +28,15 @@ buildPythonPackage rec { }; disabled = !isPy3k; - propagatedBuildInputs = [ docutils requests requests_download pytoml ] ++ lib.optional (pythonOlder "3.6") zipfile36; + propagatedBuildInputs = [ docutils requests requests_download pytoml ] + ++ lib.optional (pythonOlder "3.6") zipfile36; checkInputs = [ pytest testpath responses ]; # Disable test that needs some ini file. # Disable test that wants hg checkPhase = '' - py.test -k "not test_invalid_classifier and not test_build_sdist" + HOME=$(mktemp -d) pytest -k "not test_invalid_classifier and not test_build_sdist" ''; meta = { diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index 7ff4a37d6d3..78db8e0e10c 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "folium"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "08681be47b1861221bc7cf17b6e368a8d734db81682d716c22a11e839f47cb79"; + sha256 = "04mhdl3k644j45rlfkamxz1paf58fxrmnwgvkrvza2fcwcs4nr9n"; }; checkInputs = [ pytest nbconvert pandas mock ]; diff --git a/pkgs/development/python-modules/github3_py/default.nix b/pkgs/development/python-modules/github3_py/default.nix index 7b378660cff..cab7ca68ef6 100644 --- a/pkgs/development/python-modules/github3_py/default.nix +++ b/pkgs/development/python-modules/github3_py/default.nix @@ -1,18 +1,19 @@ -{ stdenv +{ lib +, pythonOlder , buildPythonPackage , fetchPypi -, unittest2 -, pytest -, mock , betamax +, pytest , betamax-matchers -, dateutil +, unittest2 +, mock , requests -, pyopenssl , uritemplate +, dateutil +, jwcrypto +, pyopenssl , ndg-httpsclient , pyasn1 -, jwcrypto }: buildPythonPackage rec { @@ -24,18 +25,19 @@ buildPythonPackage rec { sha256 = "35fea5bf3567a8e88d3660686d83f96ef164e698ce6fb30f9e2b0edded7357af"; }; - buildInputs = [ unittest2 pytest mock betamax betamax-matchers dateutil ]; + checkInputs = [ betamax pytest betamax-matchers ] + ++ lib.optional (pythonOlder "3") unittest2 + ++ lib.optional (pythonOlder "3.3") mock; propagatedBuildInputs = [ requests uritemplate dateutil jwcrypto pyopenssl ndg-httpsclient pyasn1 ]; postPatch = '' - sed -i -e 's/mock ==1.0.1/mock>=1.0.1/' setup.py sed -i -e 's/unittest2 ==0.5.1/unittest2>=0.5.1/' setup.py ''; # TODO: only disable the tests that require network doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = http://github3py.readthedocs.org/en/master/; description = "A wrapper for the GitHub API written in python"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/goobook/default.nix b/pkgs/development/python-modules/goobook/default.nix index 599132f0f2c..4a3c3dc3bcb 100644 --- a/pkgs/development/python-modules/goobook/default.nix +++ b/pkgs/development/python-modules/goobook/default.nix @@ -4,6 +4,7 @@ , isPy3k , oauth2client , gdata +, google_api_python_client , simplejson , httplib2 , keyring @@ -21,7 +22,7 @@ buildPythonPackage rec { sha256 = "139a98d646d5c5963670944d5cfcc1a107677ee11fa98329221bd600457fda6d"; }; - propagatedBuildInputs = [ oauth2client gdata simplejson httplib2 keyring six rsa ]; + propagatedBuildInputs = [ oauth2client gdata google_api_python_client simplejson httplib2 keyring six rsa ]; preConfigure = '' sed -i '/distribute/d' setup.py diff --git a/pkgs/development/python-modules/google_cloud_vision/default.nix b/pkgs/development/python-modules/google_cloud_vision/default.nix index 6a52016311b..da01147f645 100644 --- a/pkgs/development/python-modules/google_cloud_vision/default.nix +++ b/pkgs/development/python-modules/google_cloud_vision/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "0.34.0"; + version = "0.35.1"; src = fetchPypi { inherit pname version; - sha256 = "50392b2c68e40dbf725c531ba4d325bd910da6441a472ed0a3fadfd0ab8548f7"; + sha256 = "0hx80q8rcgs0kvhv0xix2dhr3n19abac4sj4k5pfqxh6qzdxm3d8"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index 7c83039ecdb..d58ec269054 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "graph-tool"; format = "other"; - version = "2.26"; + version = "2.27"; meta = with stdenv.lib; { description = "Python module for manipulation and statistical analysis of graphs"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchurl { url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2"; - sha256 = "0w7pd2h8ayr88kjl82c8fdshnk6f3xslc77gy7ma09zkbvf76qnz"; + sha256 = "04s31qwlfcl7bwsggnic8gqcqmx2wsrmfw77nf7vzgnz42bwch27"; }; patches = [ diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix index 51a7fd9b5d2..229e35b6ca4 100644 --- a/pkgs/development/python-modules/graphite-web/default.nix +++ b/pkgs/development/python-modules/graphite-web/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k, which , django, django_tagging, whisper, pycairo, cairocffi, ldap, memcached, pytz, urllib3, scandir }: -if django.version != "1.8.18" +if django.version != "1.8.19" || django_tagging.version != "0.4.3" then throw "graphite-web should be build with django_1_8 and django_tagging_0_4_3" else buildPythonPackage rec { diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix index 331c88a5e3a..f5769bf0b2d 100644 --- a/pkgs/development/python-modules/importlib-resources/default.nix +++ b/pkgs/development/python-modules/importlib-resources/default.nix @@ -5,6 +5,7 @@ , typing , isPy3k , pythonOlder +, python }: buildPythonPackage rec { @@ -21,8 +22,9 @@ buildPythonPackage rec { ++ lib.optional (pythonOlder "3.5") typing ; - # https://gitlab.com/python-devs/importlib_resources/issues/69 - doCheck = !isPy3k; + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; meta = with lib; { description = "Read resources from Python packages"; diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index 0d6828bff72..99edea703c6 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "influxdb"; - version = "5.2.0"; + version = "5.2.1"; src = fetchPypi { inherit pname version; - sha256 = "0fqnshmsgifvp79pd4g9a1kyfxvpa9vczv0dv8x2jr2c5m1mi99v"; + sha256 = "1dp3fakzp0fqdajf6xsfmisdwj1avk4lvxjmw5k9wkhdbpi6vnbm"; }; # ImportError: No module named tests diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 43b1c9fd034..b4daf5a6ecb 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , ipython , jupyter_client , traitlets @@ -23,6 +24,14 @@ buildPythonPackage rec { checkInputs = [ pytest nose ]; propagatedBuildInputs = [ ipython jupyter_client traitlets tornado ]; + # https://github.com/ipython/ipykernel/pull/377 + patches = [ + (fetchpatch { + url = "https://github.com/ipython/ipykernel/commit/a3bf849dbd368a1826deb9dfc94c2bd3e5ed04fe.patch"; + sha256 = "1yhpwqixlf98a3n620z92mfips3riw6psijqnc5jgs2p58fgs2yc"; + }) + ]; + checkPhase = '' HOME=$(mktemp -d) pytest ipykernel ''; diff --git a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix index 2e3ef054598..5e6d6ceab9b 100644 --- a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix +++ b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix @@ -12,6 +12,8 @@ buildPythonPackage rec { sha256 = "14d288d1b3d3273cf96a729dd21a2470851c4962be8509f3dd62f0137ff90339"; }; + doCheck = false; # test_suite="tests" in setup.py but no tests in pypi. + meta = with lib; { description = "JSON RPC client library - Pelix compatible fork"; homepage = https://pypi.python.org/pypi/jsonrpclib-pelix/; diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix new file mode 100644 index 00000000000..5622ee1669d --- /dev/null +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchPypi +, testfixtures +, pyyaml +, mock +, nbformat +, pytest +}: + +buildPythonPackage rec { + pname = "jupytext"; + version = "0.8.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1m35m9z4vy480d2200nd4lk9n5s4z3zcnq0d9rdlh4yv5264mrgf"; + }; + + propagatedBuildInputs = [ + pyyaml + nbformat + testfixtures + ]; + checkInputs = [ + pytest + ]; + # setup.py checks for those even though they're not needed at runtime (only + # for tests), thus not propagated + buildInputs = [ + mock + pytest + ]; + + # requires test notebooks which are not shipped with the pypi release + doCheck = false; + checkPhase = '' + py.test + ''; + + meta = with lib; { + description = "Jupyter notebooks as Markdown documents, Julia, Python or R scripts"; + homepage = https://github.com/mwouts/jupytext; + license = licenses.mit; + maintainers = with maintainers; [ timokau ]; + }; +} diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix index db0fda6584c..0f257fb13c2 100644 --- a/pkgs/development/python-modules/kafka-python/default.nix +++ b/pkgs/development/python-modules/kafka-python/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, pytest, six, mock }: buildPythonPackage rec { - version = "1.4.3"; + version = "1.4.4"; pname = "kafka-python"; src = fetchPypi { inherit pname version; - sha256 = "078acdcd1fc6eddacc46d437c664998b4cf7613b7e79ced66a460965f2648f88"; + sha256 = "1p9sr9vl96xz8qrgdrjiql9qkch2qx29pkq7igk28clgc6zbn510"; }; checkInputs = [ pytest six mock ]; diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index fc58c6ca6a1..8d0bf2b7b17 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "libarcus"; - version = "3.4.1"; + version = "3.6.0"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libArcus"; rev = version; - sha256 = "0mln8myvfl7rq2p4g1vadvlykckd8490jijag4xa5hhj3w3p19bk"; + sha256 = "1zbp6axai47k3p2q497wiajls1h17wss143zynbwbwrqinsfiw43"; }; disabled = pythonOlder "3.4.0"; @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Communication library between internal components for Ultimaker software"; homepage = https://github.com/Ultimaker/libArcus; - license = licenses.agpl3; + license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix new file mode 100644 index 00000000000..9f78b999450 --- /dev/null +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -0,0 +1,33 @@ +{ stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, cmake, sip }: + +buildPythonPackage rec { + pname = "libsavitar"; + version = "3.6.0"; + format = "other"; + + src = fetchFromGitHub { + owner = "Ultimaker"; + repo = "libSavitar"; + rev = version; + sha256 = "1bz8ga0n9aw65hqzajbr93dcv5g555iaihbhs1jq2k47cx66klzv"; + }; + + postPatch = '' + # To workaround buggy SIP detection which overrides PYTHONPATH + sed -i '/SET(ENV{PYTHONPATH}/d' cmake/FindSIP.cmake + ''; + + nativeBuildInputs = [ cmake ]; + + propagatedBuildInputs = [ sip ]; + + disabled = pythonOlder "3.4.0"; + + meta = with stdenv.lib; { + description = "C++ implementation of 3mf loading with SIP python bindings"; + homepage = https://github.com/Ultimaker/libSavitar; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar orivej ]; + }; +} diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix deleted file mode 100644 index a9a7783fe77..00000000000 --- a/pkgs/development/python-modules/lz4/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, pytestrunner -, pytest -, psutil -, pkgconfig -, setuptools_scm -}: - -buildPythonPackage rec { - pname = "lz4"; - version = "2.1.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "ec265f7c3fc3df706e9579bde632ceeef9278858d7ae87c376a2954d11e9ea39"; - }; - - buildInputs = [ setuptools_scm pytestrunner pkgconfig ]; - checkInputs = [ pytest psutil ]; - - meta = with stdenv.lib; { - description = "Compression library"; - homepage = https://github.com/python-lz4/python-lz4; - license = licenses.bsd3; - }; - -} diff --git a/pkgs/development/python-modules/manhole/default.nix b/pkgs/development/python-modules/manhole/default.nix index 8c8c6bf3501..1dc90e66683 100644 --- a/pkgs/development/python-modules/manhole/default.nix +++ b/pkgs/development/python-modules/manhole/default.nix @@ -19,7 +19,10 @@ buildPythonPackage rec { # # {test_locals,test_socket_path} fail to remove /tmp/manhole-socket # on the x86_64-darwin builder. - doCheck = stdenv.isLinux; + # + # TODO: change this back to `doCheck = stdenv.isLinux` after + # https://github.com/ionelmc/python-manhole/issues/54 is fixed + doCheck = false; checkInputs = [ pytest requests process-tests ]; checkPhase = '' diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix index 9b1a2df48bb..5c323068ddd 100644 --- a/pkgs/development/python-modules/mt-940/default.nix +++ b/pkgs/development/python-modules/mt-940/default.nix @@ -1,35 +1,37 @@ -{ buildPythonPackage, stdenv, pytestrunner, pyyaml, pytest, enum34 -, pytestpep8, pytestflakes,fetchFromGitHub, isPy3k, lib, glibcLocales +{ buildPythonPackage, stdenv, pyyaml, pytest, enum34 +, pytestpep8, pytestflakes, fetchFromGitHub, isPy3k, lib, glibcLocales }: buildPythonPackage rec { - version = "4.10.0"; - pname = "mt940"; + version = "4.12.2"; + pname = "mt-940"; src = fetchFromGitHub { owner = "WoLpH"; - repo = pname; + repo = "mt940"; rev = "v${version}"; - sha256 = "1dsf2di8rr0iw2vaz6dppalby3y7i8x2bl0qjqvaiqacjxxvwj65"; + sha256 = "0l7q8v00dhpbc9mh6baaaqc55kf44rszygx28dq3pwp5b5x33nir"; }; - patches = [ - ./no-coverage.patch - ]; + postPatch = '' + # No coverage report + sed -i "/--\(no-\)\?cov/d" pytest.ini + ''; - propagatedBuildInputs = [ pyyaml pytestrunner ] - ++ lib.optional (!isPy3k) enum34; + propagatedBuildInputs = lib.optional (!isPy3k) enum34; LC_ALL="en_US.UTF-8"; - checkInputs = [ pytestpep8 pytestflakes pytest glibcLocales ]; + checkInputs = [ pyyaml pytestpep8 pytestflakes pytest glibcLocales ]; + + # See https://github.com/WoLpH/mt940/issues/64 for the disabled test checkPhase = '' - py.test + py.test -k "not mt940.models.FixedOffset" ''; meta = with stdenv.lib; { description = "A library to parse MT940 files and returns smart Python collections for statistics and manipulation"; - homepage = https://pythonhosted.org/mt-940/; + inherit (src.meta) homepage; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/mt-940/no-coverage.patch b/pkgs/development/python-modules/mt-940/no-coverage.patch deleted file mode 100644 index 1617e6dd394..00000000000 --- a/pkgs/development/python-modules/mt-940/no-coverage.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/pytest.ini b/pytest.ini -index fef28f5..f366331 100644 ---- a/pytest.ini -+++ b/pytest.ini -@@ -4,10 +4,6 @@ python_files = - tests/*.py - - addopts = -- --cov mt940 -- --cov-report term-missing -- --cov-report html -- --no-cov-on-fail - --doctest-modules - --pep8 - --flakes -diff --git a/tests/requirements.txt b/tests/requirements.txt -index fc55572..e52cc28 100644 ---- a/tests/requirements.txt -+++ b/tests/requirements.txt -@@ -3,6 +3,5 @@ - -r ../docs/requirements.txt - pytest - pytest-cache --pytest-cover - pytest-flakes - pytest-pep8 diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index 41e1d4cb10b..71287189017 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "mysqlclient"; - version = "1.3.13"; + version = "1.3.14"; buildInputs = [ mysql.connector-c @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "ff8ee1be84215e6c30a746b728c41eb0701a46ca76e343af445b35ce6250644f"; + sha256 = "0symgjmzkckzsxx3piaxywls8q19s1pdgbmpm0v1m425wnfax09r"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/nose-randomly/default.nix b/pkgs/development/python-modules/nose-randomly/default.nix index 2bfa5cb0f05..a9e31016a1f 100644 --- a/pkgs/development/python-modules/nose-randomly/default.nix +++ b/pkgs/development/python-modules/nose-randomly/default.nix @@ -19,6 +19,10 @@ buildPythonPackage rec { nose ]; + checkPhase = '' + nosetests + ''; + meta = with lib; { description = "Nose plugin to randomly order tests and control random.seed"; homepage = https://github.com/adamchainz/nose-randomly; diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix index acf41fb539e..280b11706a1 100644 --- a/pkgs/development/python-modules/numexpr/default.nix +++ b/pkgs/development/python-modules/numexpr/default.nix @@ -3,7 +3,6 @@ , fetchPypi , python , numpy -, llvmPackages ? null }: buildPythonPackage rec { @@ -16,16 +15,11 @@ buildPythonPackage rec { }; # Remove existing site.cfg, use the one we built for numpy. - # Somehow openmp needs to be added to LD_LIBRARY_PATH - # https://software.intel.com/en-us/forums/intel-system-studio/topic/611682 preBuild = '' rm site.cfg ln -s ${numpy.cfg} site.cfg - export LD_LIBRARY_PATH=${llvmPackages.openmp}/lib ''; - buildInputs = [] ++ lib.optional (numpy.blasImplementation == "mkl") llvmPackages.openmp; - propagatedBuildInputs = [ numpy ]; # Run the test suite. @@ -47,4 +41,4 @@ buildPythonPackage rec { homepage = "https://github.com/pydata/numexpr"; license = lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 8a3879f1982..d66cbd77bbc 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -71,8 +71,6 @@ in buildPythonPackage rec { inherit blasImplementation cfg; }; - doCheck = blasImplementation != "mkl"; - # Disable two tests # - test_f2py: f2py isn't yet on path. # - test_large_file_support: takes a long time and can cause the machine to run out of disk space diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix index a015a124738..c636346a5e3 100644 --- a/pkgs/development/python-modules/nvchecker/default.nix +++ b/pkgs/development/python-modules/nvchecker/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "nvchecker"; - version = "1.2.7"; + version = "1.3"; src = fetchPypi { inherit pname version; - sha256 = "19qc2wwkdr701mx94r75ayq5h2jz3q620hcqaj2ng9qdgxm90940"; + sha256 = "0lgcc05c515d7692zvcmf36n2qpyn0bi018i1z3jy73abm04230j"; }; propagatedBuildInputs = [ setuptools structlog tornado pycurl ]; diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix index c7e924569ba..16dc60fc28a 100644 --- a/pkgs/development/python-modules/objgraph/default.nix +++ b/pkgs/development/python-modules/objgraph/default.nix @@ -1,8 +1,9 @@ { stdenv , buildPythonPackage , fetchPypi -, pkgs , isPyPy +, graphviz +, mock }: buildPythonPackage rec { @@ -17,7 +18,9 @@ buildPythonPackage rec { # Tests fail with PyPy. disabled = isPyPy; - propagatedBuildInputs = [pkgs.graphviz]; + propagatedBuildInputs = [ graphviz ]; + + checkInputs = [ mock ]; meta = with stdenv.lib; { description = "Draws Python object reference graphs with graphviz"; diff --git a/pkgs/development/python-modules/ofxparse/default.nix b/pkgs/development/python-modules/ofxparse/default.nix index fbbd3899420..377138877c9 100644 --- a/pkgs/development/python-modules/ofxparse/default.nix +++ b/pkgs/development/python-modules/ofxparse/default.nix @@ -3,6 +3,7 @@ , fetchPypi , six , beautifulsoup4 +, lxml }: buildPythonPackage rec { @@ -14,7 +15,7 @@ buildPythonPackage rec { sha256 = "d8c81fd5089332106da1a2e8919c412c7c677f08af04d557ca767701a04e0918"; }; - propagatedBuildInputs = [ six beautifulsoup4 ]; + propagatedBuildInputs = [ six beautifulsoup4 lxml ]; meta = with stdenv.lib; { homepage = "http://sites.google.com/site/ofxparse"; diff --git a/pkgs/development/python-modules/parsel/default.nix b/pkgs/development/python-modules/parsel/default.nix index 0135b98cbda..9ebd5e9b9ea 100644 --- a/pkgs/development/python-modules/parsel/default.nix +++ b/pkgs/development/python-modules/parsel/default.nix @@ -1,8 +1,9 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi , pytest , pytestrunner +, functools32 , six , w3lib , lxml @@ -19,13 +20,13 @@ buildPythonPackage rec { }; buildInputs = [ pytest pytestrunner ]; - propagatedBuildInputs = [ six w3lib lxml cssselect ]; + propagatedBuildInputs = [ functools32 six w3lib lxml cssselect ]; checkPhase = '' py.test ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/scrapy/parsel"; description = "Parsel is a library to extract data from HTML and XML using XPath and CSS selectors"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/path.py/default.nix b/pkgs/development/python-modules/path.py/default.nix index f9f74858149..a94d495310f 100644 --- a/pkgs/development/python-modules/path.py/default.nix +++ b/pkgs/development/python-modules/path.py/default.nix @@ -2,8 +2,8 @@ , buildPythonPackage , fetchPypi , setuptools_scm -, pytestrunner , pytest +, pytest-flake8 , glibcLocales , packaging , isPy27 @@ -14,14 +14,13 @@ buildPythonPackage rec { pname = "path.py"; version = "11.5.0"; - name = pname + "-" + version; src = fetchPypi { inherit pname version; sha256 = "b6687a532a735a2d79a13e92bdb31cb0971abe936ea0fa78bcb47faf4372b3cb"; }; - checkInputs = [ pytest pytestrunner glibcLocales packaging ]; + checkInputs = [ pytest pytest-flake8 glibcLocales packaging ]; buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ importlib-metadata @@ -37,8 +36,7 @@ buildPythonPackage rec { }; checkPhase = '' - # Ignore pytest configuration - rm pytest.ini - py.test test_path.py + # ignore performance test which may fail when the system is under load + py.test -v -k 'not TestPerformance' ''; } diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index 09ee7dc92ea..a18168eaa5a 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.7.1"; + version = "3.8.0"; # pypi release does not provide tests src = fetchFromGitHub { owner = "coleifer"; repo = pname; rev = version; - sha256 = "0chn8mknzvkmcmysy2291hanf0vg3sfzqgfc5hqx1nnrd6qkiq8r"; + sha256 = "0kqhpalw1587zaz3fcj13mpzs5950l6fm3qlcfqsfp16h8w0s89f"; }; diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 175e64b8d72..f5828bebbb3 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pytz +, six }: buildPythonPackage rec { @@ -13,10 +14,10 @@ buildPythonPackage rec { sha256 = "18192d90409a3037619ef17f1924e3fd9c7169c9c1b3277cec1982116ec2b6de"; }; - propagatedBuildInputs = [ pytz ]; + propagatedBuildInputs = [ pytz six ]; meta = with stdenv.lib; { - homepage = https://github.com/realazthat/aiopg8000; + homepage = https://github.com/mfenniak/pg8000; description = "PostgreSQL interface library, for asyncio"; maintainers = with maintainers; [ garbas domenkozar ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix index 9ea3a3eda07..0721c0d449c 100644 --- a/pkgs/development/python-modules/pyaxmlparser/default.nix +++ b/pkgs/development/python-modules/pyaxmlparser/default.nix @@ -1,16 +1,30 @@ -{ buildPythonPackage, stdenv, lxml, click, fetchPypi }: +{ buildPythonPackage, stdenv, lxml, click, fetchFromGitHub, pytest, isPy3k }: buildPythonPackage rec { version = "0.3.13"; pname = "pyaxmlparser"; - src = fetchPypi { - inherit pname version; - sha256 = "1mzdrifnaky57vkmdvg0rgjss55xkxaramci3wpv4h65lmk95988"; + # the PyPI tarball doesn't ship tests. + src = fetchFromGitHub { + owner = "appknox"; + repo = pname; + rev = "v${version}"; + sha256 = "0jfjhxc6b57npsidknxmhj1x813scg47aaw90ybyr90fpdz5rlwk"; }; + disabled = !isPy3k; + + postPatch = '' + substituteInPlace setup.py --replace "click==6.7" "click" + ''; + propagatedBuildInputs = [ lxml click ]; + checkInputs = [ pytest ]; + checkPhase = '' + py.test tests/ + ''; + meta = with stdenv.lib; { description = "Python3 Parser for Android XML file and get Application Name without using Androguard"; homepage = https://github.com/appknox/pyaxmlparser; diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index acc8ee71311..d1b2f075b91 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -3,13 +3,13 @@ pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }: buildPythonPackage rec { pname = "pygobject"; - version = "3.30.2"; + version = "3.30.4"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "15zd4w43js048y7fd1kdi6wpvccz1njjy60xw1ckvfy1qhikbz54"; + sha256 = "0hscyvr6hh8l90fyz97b9d03506g3r8s5hl1bgk5aadq8jja3h9d"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/pyjet/default.nix b/pkgs/development/python-modules/pyjet/default.nix index 69d20863a77..ca9492cb948 100644 --- a/pkgs/development/python-modules/pyjet/default.nix +++ b/pkgs/development/python-modules/pyjet/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, nose, numpy }: +{ lib, buildPythonPackage, fetchPypi, cython, nose, numpy }: buildPythonPackage rec { pname = "pyjet"; @@ -9,6 +9,15 @@ buildPythonPackage rec { sha256 = "1glcwv9ni8i40smfw6m456xjadlkackim5nk33xmas1fa96lpagg"; }; + # fix for python37 + # https://github.com/scikit-hep/pyjet/issues/8 + nativeBuildInputs = [ cython ]; + preBuild = '' + for f in pyjet/src/*.{pyx,pxd}; do + cython --cplus "$f" + done + ''; + propagatedBuildInputs = [ numpy ]; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/pyliblo/default.nix b/pkgs/development/python-modules/pyliblo/default.nix index 9dc57aa9c72..3c637ffced3 100644 --- a/pkgs/development/python-modules/pyliblo/default.nix +++ b/pkgs/development/python-modules/pyliblo/default.nix @@ -2,20 +2,21 @@ , buildPythonPackage , fetchurl , isPyPy -, pkgs +, liblo +, cython }: buildPythonPackage rec { pname = "pyliblo"; - version = "0.9.2"; + version = "0.10.0"; disabled = isPyPy; src = fetchurl { url = "http://das.nasophon.de/download/${pname}-${version}.tar.gz"; - sha256 = "382ee7360aa00aeebf1b955eef65f8491366657a626254574c647521b36e0eb0"; + sha256 = "13vry6xhxm7adnbyj28w1kpwrh0kf7nw83cz1yq74wl21faz2rzw"; }; - propagatedBuildInputs = [ pkgs.liblo ]; + buildInputs = [ liblo cython ]; meta = with stdenv.lib; { homepage = http://das.nasophon.de/pyliblo/; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 0e033a9e45d..14d7bddbb70 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -8,7 +8,9 @@ let pname = "PyQt"; version = "5.11.3"; - inherit (pythonPackages) buildPythonPackage python isPy3k dbus-python sip enum34; + inherit (pythonPackages) buildPythonPackage python isPy3k dbus-python enum34; + + sip = pythonPackages.sip.override { sip-module = "PyQt5.sip"; }; in buildPythonPackage { pname = pname; @@ -32,10 +34,10 @@ in buildPythonPackage { nativeBuildInputs = [ pkgconfig qmake lndir ]; - buildInputs = [ dbus ]; + buildInputs = [ dbus sip ]; propagatedBuildInputs = [ - sip qtbase qtsvg qtwebkit qtwebengine + qtbase qtsvg qtwebkit qtwebengine ] ++ lib.optional (!isPy3k) enum34 ++ lib.optional withWebSockets qtwebsockets ++ lib.optional withConnectivity qtconnectivity; configurePhase = '' @@ -65,6 +67,7 @@ in buildPythonPackage { ''; postInstall = '' + ln -s ${sip}/${python.sitePackages}/PyQt5/sip.* $out/${python.sitePackages}/PyQt5/ for i in $out/bin/*; do wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH" done diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix index 7d96f4d39bd..8fae56e9a23 100644 --- a/pkgs/development/python-modules/pytesseract/default.nix +++ b/pkgs/development/python-modules/pytesseract/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytesseract"; - version = "0.2.5"; + version = "0.2.6"; src = fetchPypi { inherit pname version; - sha256 = "0wlz1vbg1k8cdrpzvrahjnbsfs4ki6xqhbkv17ycfchh7h6kfkfm"; + sha256 = "0w4phjw0gn52hqlm3ixs2cmj25x7y7nk6ijr9f82wvjvb4hh7hhi"; }; patches = [ diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index 9b1be86a7c8..a8fc1c6742b 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest, setuptools_scm, pytest-forked, filelock }: +{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest, setuptools_scm, pytest-forked, filelock, six }: buildPythonPackage rec { pname = "pytest-xdist"; @@ -9,9 +9,9 @@ buildPythonPackage rec { sha256 = "909bb938bdb21e68a28a8d58c16a112b30da088407b678633efb01067e3923de"; }; - nativeBuildInputs = [ setuptools_scm ]; - checkInputs = [ pytest pytest-forked filelock ]; - propagatedBuildInputs = [ execnet ]; + nativeBuildInputs = [ setuptools_scm pytest ]; + checkInputs = [ pytest filelock ]; + propagatedBuildInputs = [ execnet pytest-forked six ]; checkPhase = '' # Excluded tests access file system diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/pkgs/development/python-modules/python-lz4/default.nix index a0fe6666d84..544d8f6254d 100644 --- a/pkgs/development/python-modules/python-lz4/default.nix +++ b/pkgs/development/python-modules/python-lz4/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "python-lz4"; - version = "2.1.0"; + version = "2.1.2"; # get full repository inorder to run tests src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1vjfplj37jcw1mf8l810dv76dx0raia3ylgyfy7sfsb3g17brjq6"; + sha256 = "1kzzdfkrq9nnlh0wssa6ccncvv0sk4wmhivhgyndjxz6d6przl5d"; }; buildInputs = [ setuptools_scm pkgconfig pytestrunner ]; @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = { description = "LZ4 Bindings for Python"; homepage = https://github.com/python-lz4/python-lz4; - license = lib.licenses.bsd0; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index b0ae9ef0cf5..8b9ba07ce95 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -1,6 +1,6 @@ -{ buildPythonPackage, pythonOlder, +{ stdenv, fetchurl, buildPythonPackage, pythonOlder, cudaSupport ? false, cudatoolkit ? null, cudnn ? null, - fetchFromGitHub, lib, numpy, pyyaml, cffi, typing, cmake, + fetchFromGitHub, lib, numpy, pyyaml, cffi, typing, cmake, hypothesis, numactl, linkFarm, symlinkJoin, utillinux, which }: @@ -25,7 +25,7 @@ let "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} "; in buildPythonPackage rec { - version = "0.4.1"; + version = "1.0.0"; pname = "pytorch"; src = fetchFromGitHub { @@ -33,9 +33,17 @@ in buildPythonPackage rec { repo = "pytorch"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1cr8h47jxgfar5bamyvlayvqymnb2qvp7rr0ka2d2d4rdldf9lrp"; + sha256 = "076cpbig4sywn9vv674c0xdg832sdrd5pk1d0725pjkm436kpvlm"; }; + patches = + [ # Skips two tests that are only meant to run on multi GPUs + (fetchurl { + url = "https://github.com/pytorch/pytorch/commit/bfa666eb0deebac21b03486e26642fd70d66e478.patch"; + sha256 = "1fgblcj02gjc0y62svwc5gnml879q3x2z7m69c9gax79dpr37s9i"; + }) + ]; + preConfigure = lib.optionalString cudaSupport '' export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++ '' + lib.optionalString (cudaSupport && cudnn != null) '' @@ -58,12 +66,24 @@ in buildPythonPackage rec { done ''; + # Override the (weirdly) wrong version set by default. See + # https://github.com/NixOS/nixpkgs/pull/52437#issuecomment-449718038 + # https://github.com/pytorch/pytorch/blob/v1.0.0/setup.py#L267 + PYTORCH_BUILD_VERSION = version; + PYTORCH_BUILD_NUMBER = 0; + + # Suppress a weird warning in mkl-dnn, part of ideep in pytorch + # (upstream seems to have fixed this in the wrong place?) + # https://github.com/intel/mkl-dnn/commit/8134d346cdb7fe1695a2aa55771071d455fae0bc + NIX_CFLAGS_COMPILE = lib.optionals (numpy.blasImplementation == "mkl") [ "-Wno-error=array-bounds" ]; + buildInputs = [ cmake numpy.blas utillinux which - ] ++ lib.optionals cudaSupport [cudatoolkit_joined cudnn]; + ] ++ lib.optionals cudaSupport [ cudatoolkit_joined cudnn ] + ++ lib.optionals stdenv.isLinux [ numactl ]; propagatedBuildInputs = [ cffi @@ -71,15 +91,16 @@ in buildPythonPackage rec { pyyaml ] ++ lib.optional (pythonOlder "3.5") typing; + checkInputs = [ hypothesis ]; checkPhase = '' - ${cudaStubEnv}python test/run_test.py --exclude dataloader sparse torch utils distributed + ${cudaStubEnv}python test/run_test.py --exclude dataloader sparse torch utils thd_distributed distributed cpp_extensions ''; meta = { - description = "Tensors and Dynamic neural networks in Python with strong GPU acceleration."; - homepage = https://pytorch.org/; - license = lib.licenses.bsd3; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ teh ]; + description = "Open source, prototype-to-production deep learning platform"; + homepage = https://pytorch.org/; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ teh thoughtpolice ]; }; } diff --git a/pkgs/development/python-modules/pywal/convert.patch b/pkgs/development/python-modules/pywal/convert.patch new file mode 100644 index 00000000000..999bc1abeaf --- /dev/null +++ b/pkgs/development/python-modules/pywal/convert.patch @@ -0,0 +1,21 @@ +diff --git a/pywal/backends/wal.py b/pywal/backends/wal.py +index a75fdc5..4339680 100644 +--- a/pywal/backends/wal.py ++++ b/pywal/backends/wal.py +@@ -21,15 +21,7 @@ def imagemagick(color_count, img, magick_command): + + def has_im(): + """Check to see if the user has im installed.""" +- if shutil.which("magick"): +- return ["magick", "convert"] +- +- if shutil.which("convert"): +- return ["convert"] +- +- logging.error("Imagemagick wasn't found on your system.") +- logging.error("Try another backend. (wal --backend)") +- sys.exit(1) ++ return ["@convert@"] + + + def gen_colors(img): diff --git a/pkgs/tools/graphics/pywal/default.nix b/pkgs/development/python-modules/pywal/default.nix index 4d493bdd73e..00691e65225 100644 --- a/pkgs/tools/graphics/pywal/default.nix +++ b/pkgs/development/python-modules/pywal/default.nix @@ -9,16 +9,21 @@ python3Packages.buildPythonApplication rec { sha256 = "1pj30h19ijwhmbm941yzbkgr19q06dhp9492h9nrqw1wfjfdbdic"; }; - # necessary for imagemagick to be found during tests - buildInputs = [ imagemagick ]; - - makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ imagemagick feh ]}" ]; - preCheck = '' mkdir tmp HOME=$PWD/tmp ''; + patches = [ + ./convert.patch + ./feh.patch + ]; + + postPatch = '' + substituteInPlace pywal/backends/wal.py --subst-var-by convert "${imagemagick}/bin/convert" + substituteInPlace pywal/wallpaper.py --subst-var-by feh "${feh}/bin/feh" + ''; + meta = with lib; { description = "Generate and change colorschemes on the fly. A 'wal' rewrite in Python 3."; homepage = https://github.com/dylanaraps/pywal; diff --git a/pkgs/development/python-modules/pywal/feh.patch b/pkgs/development/python-modules/pywal/feh.patch new file mode 100644 index 00000000000..985e601d625 --- /dev/null +++ b/pkgs/development/python-modules/pywal/feh.patch @@ -0,0 +1,39 @@ +commit c31faa212e09aa62c232d9008e05976b1cdc9ee5 +Author: Frederik Rietdijk <fridh@fridh.nl> +Date: Wed Dec 26 12:54:32 2018 +0100 + + nix: hardcode feh + +diff --git a/pywal/wallpaper.py b/pywal/wallpaper.py +index ba61e66..fad34f7 100644 +--- a/pywal/wallpaper.py ++++ b/pywal/wallpaper.py +@@ -47,27 +47,7 @@ def xfconf(path, img): + + def set_wm_wallpaper(img): + """Set the wallpaper for non desktop environments.""" +- if shutil.which("feh"): +- util.disown(["feh", "--bg-fill", img]) +- +- elif shutil.which("nitrogen"): +- util.disown(["nitrogen", "--set-zoom-fill", img]) +- +- elif shutil.which("bgs"): +- util.disown(["bgs", "-z", img]) +- +- elif shutil.which("hsetroot"): +- util.disown(["hsetroot", "-fill", img]) +- +- elif shutil.which("habak"): +- util.disown(["habak", "-mS", img]) +- +- elif shutil.which("display"): +- util.disown(["display", "-backdrop", "-window", "root", img]) +- +- else: +- logging.error("No wallpaper setter found.") +- return ++ return util.disown(["@feh@", "--bg-fill", img]) + + + def set_desktop_wallpaper(desktop, img): diff --git a/pkgs/development/python-modules/qrcode/default.nix b/pkgs/development/python-modules/qrcode/default.nix index ca751e4ce78..fedff05d813 100644 --- a/pkgs/development/python-modules/qrcode/default.nix +++ b/pkgs/development/python-modules/qrcode/default.nix @@ -1,5 +1,6 @@ { stdenv , buildPythonPackage +, isPy27 , fetchPypi , six , pillow @@ -18,6 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six pillow pymaging_png ]; checkInputs = [ mock ]; + doCheck = isPy27; # https://github.com/lincolnloop/python-qrcode/issues/163 meta = with stdenv.lib; { description = "Quick Response code generation for Python"; diff --git a/pkgs/development/python-modules/raven/default.nix b/pkgs/development/python-modules/raven/default.nix index 07632662d26..9ea04fa8bdf 100644 --- a/pkgs/development/python-modules/raven/default.nix +++ b/pkgs/development/python-modules/raven/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "raven"; - version = "6.9.0"; + version = "6.10.0"; src = fetchFromGitHub { owner = "getsentry"; repo = "raven-python"; rev = version; - sha256 = "1kggp34i8gqi47khca2v5n2i32zrg66m1pga6c00yqmlbv74d84v"; + sha256 = "16x9ldl8cy7flw5kh7qmgbmflqyf210j3q6ac2lw61sgwajsnvw8"; }; # way too many dependencies to run tests diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix index 619b2fb5eb3..e10005fc205 100644 --- a/pkgs/development/python-modules/ruamel_yaml/default.nix +++ b/pkgs/development/python-modules/ruamel_yaml/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , ruamel_base -, typing , ruamel_ordereddict , isPy3k }: @@ -19,7 +18,7 @@ buildPythonPackage rec { # Tests cannot load the module to test doCheck = false; - propagatedBuildInputs = [ ruamel_base typing ] + propagatedBuildInputs = [ ruamel_base ] ++ stdenv.lib.optional (!isPy3k) ruamel_ordereddict; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index fcac013b6de..8bb332fa9da 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi, glibcLocales, mock, pytest, botocore, testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl, - service-identity, parsel, pydispatcher, cssselect, lib }: + service-identity, parsel, pydispatcher, cssselect, lib, fetchpatch }: buildPythonPackage rec { version = "1.5.1"; pname = "Scrapy"; @@ -10,18 +10,26 @@ buildPythonPackage rec { six twisted w3lib lxml cssselect queuelib pyopenssl service-identity parsel pydispatcher ]; - # Scrapy is usually installed via pip where copying all - # permissions makes sense. In Nix the files copied are owned by - # root and readonly. As a consequence scrapy can't edit the - # project templates. - patches = [ ./permissions-fix.patch ]; + patches = [ + # Scrapy is usually installed via pip where copying all + # permissions makes sense. In Nix the files copied are owned by + # root and readonly. As a consequence scrapy can't edit the + # project templates. + ./permissions-fix.patch + # fix python37 issues. Remove with the next release + (fetchpatch { + url = https://github.com/scrapy/scrapy/commit/f4f39057cbbfa4daf66f82061e57101b88d88d05.patch; + sha256 = "1f761qkji362i20i5bzcxz44sihvl29prm02i5l2xyhgl1hp91hv"; + }) + ]; LC_ALL="en_US.UTF-8"; + # Ignore proxy tests because requires mitmproxy + # Ignore test_retry_dns_error because tries to resolve an invalid dns and weirdly fails with "Reactor was unclean" + # Ignore xml encoding test on darwin because lxml can't find encodings https://bugs.launchpad.net/lxml/+bug/707396 checkPhase = '' - py.test --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py ${lib.optionalString stdenv.isDarwin "--ignore=tests/test_utils_iterators.py"} - # The ignored tests require mitmproxy, which depends on protobuf, but it's disabled on Python3 - # Ignore iteration test, because lxml can't find encodings on darwin https://bugs.launchpad.net/lxml/+bug/707396 + pytest --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py --deselect tests/test_crawl.py::CrawlTestCase::test_retry_dns_error ${lib.optionalString stdenv.isDarwin "--deselect tests/test_utils_iterators.py::LxmlXmliterTestCase::test_xmliter_encoding"} ''; src = fetchPypi { @@ -29,11 +37,17 @@ buildPythonPackage rec { sha256 = "5a398bf6818f87dcc817c919408a195f19ba46414ae12f259119336cfa862bb6"; }; + postInstall = '' + install -m 644 -D extras/scrapy.1 $out/share/man/man1/scrapy.1 + install -m 644 -D extras/scrapy_bash_completion $out/share/bash-completion/completions/scrapy + install -m 644 -D extras/scrapy_zsh_completion $out/share/zsh/site-functions/_scrapy + ''; + meta = with lib; { description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages"; homepage = https://scrapy.org/; license = licenses.bsd3; - maintainers = with maintainers; [ drewkett ]; + maintainers = with maintainers; [ drewkett marsam ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/secretstorage/2.nix b/pkgs/development/python-modules/secretstorage/2.nix new file mode 100644 index 00000000000..8fa044e638a --- /dev/null +++ b/pkgs/development/python-modules/secretstorage/2.nix @@ -0,0 +1,24 @@ +{ lib, fetchPypi, buildPythonPackage, cryptography, dbus-python }: + +buildPythonPackage rec { + pname = "secretstorage"; + version = "2.3.1"; + + src = fetchPypi { + pname = "SecretStorage"; + inherit version; + sha256 = "1di9gx4m27brs6ar774m64s017iz742mnmw39kvfc8skfs3mrxis"; + }; + + propagatedBuildInputs = [ cryptography dbus-python ]; + + # Needs a D-Bus Sesison + doCheck = false; + + meta = with lib; { + homepage = https://github.com/mitya57/secretstorage; + description = "Python bindings to FreeDesktop.org Secret Service API"; + license = licenses.bsd3; + maintainers = with maintainers; [ orivej ]; + }; +} diff --git a/pkgs/development/python-modules/secretstorage/default.nix b/pkgs/development/python-modules/secretstorage/default.nix index c0df4d4a878..bff45c7f2c3 100644 --- a/pkgs/development/python-modules/secretstorage/default.nix +++ b/pkgs/development/python-modules/secretstorage/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { homepage = https://github.com/mitya57/secretstorage; description = "Python bindings to FreeDesktop.org Secret Service API"; - license = licenses.bsdOriginal; + license = licenses.bsd3; maintainers = with maintainers; [ teto ]; }; } diff --git a/pkgs/development/python-modules/sepaxml/default.nix b/pkgs/development/python-modules/sepaxml/default.nix new file mode 100644 index 00000000000..deb24a7130a --- /dev/null +++ b/pkgs/development/python-modules/sepaxml/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + version = "2.0.0"; + pname = "sepaxml"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0jhj8fa0lbyaw15q485kyyli9qgrmqr47a6z6pgqm40kwmjghiyc"; + }; + + # no tests included in PyPI package + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/raphaelm/python-sepaxml/; + description = "SEPA Direct Debit XML generation in python"; + license = licenses.mit; + maintainers = with maintainers; [ elohmeier ]; + }; +} diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix index 37388bf4690..964386564e4 100644 --- a/pkgs/development/python-modules/sh/default.nix +++ b/pkgs/development/python-modules/sh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, coverage }: +{ stdenv, buildPythonPackage, fetchPypi, python, coverage, lsof, glibcLocales }: buildPythonPackage rec { pname = "sh"; @@ -9,10 +9,19 @@ buildPythonPackage rec { sha256 = "1z2hx357xp3v4cv44xmqp7lli3frndqpyfmpbxf7n76h7s1zaaxm"; }; - checkInputs = [ coverage ]; + # Disable tests that fail on Darwin + # Some of the failures are due to Nix using GNU coreutils + patches = [ ./disable-broken-tests-darwin.patch ]; + + postPatch = '' + sed -i 's#/usr/bin/env python#${python.interpreter}#' test.py + ''; + + checkInputs = [ coverage lsof glibcLocales ]; # A test needs the HOME directory to be different from $TMPDIR. preCheck = '' + export LC_ALL="en_US.UTF-8" HOME=$(mktemp -d) ''; diff --git a/pkgs/development/python-modules/sh/disable-broken-tests-darwin.patch b/pkgs/development/python-modules/sh/disable-broken-tests-darwin.patch new file mode 100644 index 00000000000..6488dd1ffea --- /dev/null +++ b/pkgs/development/python-modules/sh/disable-broken-tests-darwin.patch @@ -0,0 +1,49 @@ +From 264f2f6a04d25156bba43524a6b172d2e99c53f4 Mon Sep 17 00:00:00 2001 +From: Ben Wolsieffer <benwolsieffer@gmail.com> +Date: Fri, 21 Dec 2018 17:39:45 -0500 +Subject: [PATCH] Disable tests that fail on OSX. + +Some of the failures are due to the use of GNU ls. +--- + test.py | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/test.py b/test.py +index 68ef40c..2f53360 100644 +--- a/test.py ++++ b/test.py +@@ -352,6 +352,7 @@ exit(3) + self.assertEqual(sed(_in="one test three", e="s/test/two/").strip(), + "one two three") + ++ @not_osx + def test_ok_code(self): + from sh import ls, ErrorReturnCode_1, ErrorReturnCode_2 + +@@ -498,6 +499,7 @@ while True: + self.assertEqual(out, match) + + ++ @not_osx + def test_environment(self): + """ tests that environments variables that we pass into sh commands + exist in the environment, and on the sh module """ +@@ -861,6 +863,7 @@ print(sys.argv[1]) + self.assertTrue(now - start > sleep_time) + + ++ @not_osx + def test_background_exception(self): + from sh import ls, ErrorReturnCode_1, ErrorReturnCode_2 + p = ls("/ofawjeofj", _bg=True) # should not raise +@@ -2036,6 +2039,7 @@ else: + self.assertEqual(p, "test") + + ++ @not_osx + def test_signal_exception(self): + from sh import SignalException_15 + +-- +2.20.0 + diff --git a/pkgs/development/python-modules/shellingham/default.nix b/pkgs/development/python-modules/shellingham/default.nix index 6fa265517df..b2c63ea97e3 100644 --- a/pkgs/development/python-modules/shellingham/default.nix +++ b/pkgs/development/python-modules/shellingham/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "shellingham"; - version = "1.2.7"; + version = "1.2.8"; src = fetchPypi { inherit pname version; - sha256 = "06biyiwq9571mryzbr50am3mxpc3blscwqhiq8c66ac4xm3maszm"; + sha256 = "115k1z2klgsvyzg4q5ip0iqxyb565pkchhf2fsr846k68gqcgrjn"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index f8cc7e8dc45..2b034897a78 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -1,23 +1,26 @@ -{ lib, fetchurl, buildPythonPackage, python, isPyPy }: +{ lib, fetchurl, buildPythonPackage, python, isPyPy, sip-module ? "sip" }: buildPythonPackage rec { - pname = "sip"; + pname = sip-module; version = "4.19.13"; format = "other"; disabled = isPyPy; src = fetchurl { - url = "mirror://sourceforge/pyqt/sip/${pname}-${version}/${pname}-${version}.tar.gz"; + url = "mirror://sourceforge/pyqt/sip/sip-${version}/sip-${version}.tar.gz"; sha256 = "0pniq03jk1n5bs90yjihw3s3rsmjd8m89y9zbnymzgwrcl2sflz3"; }; configurePhase = '' ${python.executable} ./configure.py \ + --sip-module ${sip-module} \ -d $out/lib/${python.libPrefix}/site-packages \ -b $out/bin -e $out/include ''; + enableParallelBuilding = true; + meta = with lib; { description = "Creates C++ bindings for Python modules"; homepage = "http://www.riverbankcomputing.co.uk/"; diff --git a/pkgs/development/python-modules/snscrape/default.nix b/pkgs/development/python-modules/snscrape/default.nix new file mode 100644 index 00000000000..972ea3149f9 --- /dev/null +++ b/pkgs/development/python-modules/snscrape/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, isPy3k +, fetchPypi +, requests +, lxml +, beautifulsoup4 +}: + +buildPythonPackage rec { + pname = "snscrape"; + version = "0.1.3"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1mnhqqc7xfwg2wrzpj1pjbcisjjwxrgmy21f53p80xbx2iz8b9n1"; + }; + + # There are no tests; make sure the executable works. + checkPhase = '' + export PATH=$PATH:$out/bin + snscrape --help + ''; + + propagatedBuildInputs = [ requests lxml beautifulsoup4 ]; + + meta = with lib; { + homepage = https://github.com/JustAnotherArchivist/snscrape; + description = "A social networking service scraper in Python"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ivan ]; + }; +} diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index 8f3724e97ca..700a7fad4aa 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -3,12 +3,12 @@ }: buildPythonPackage rec { - version = "0.4.0"; + version = "0.4.1"; pname = "sphinxcontrib-bibtex"; src = fetchPypi { inherit pname version; - sha256 = "cb9fb4526642fc080204fccd5cd8f41e9e95387278e17b1d6969b1e27c2d3e0c"; + sha256 = "0kx04bqjf9ilygrzpm2z9078nfnkmywpgwxl7idpzidkzirqsnsr"; }; propagatedBuildInputs = [ oset pybtex pybtex-docutils sphinx ]; diff --git a/pkgs/development/python-modules/taskw/default.nix b/pkgs/development/python-modules/taskw/default.nix index 328eb158eef..d2d12ca0b96 100644 --- a/pkgs/development/python-modules/taskw/default.nix +++ b/pkgs/development/python-modules/taskw/default.nix @@ -5,6 +5,7 @@ , tox , six , dateutil +, kitchen , pytz , pkgs }: @@ -28,7 +29,7 @@ buildPythonPackage rec { doCheck = false; buildInputs = [ nose pkgs.taskwarrior tox ]; - propagatedBuildInputs = [ six dateutil pytz ]; + propagatedBuildInputs = [ six dateutil kitchen pytz ]; meta = with stdenv.lib; { homepage = https://github.com/ralphbean/taskw; diff --git a/pkgs/development/python-modules/taskw/use-template-for-taskwarrior-install-path.patch b/pkgs/development/python-modules/taskw/use-template-for-taskwarrior-install-path.patch index 006d964d401..8c7685c9d03 100644 --- a/pkgs/development/python-modules/taskw/use-template-for-taskwarrior-install-path.patch +++ b/pkgs/development/python-modules/taskw/use-template-for-taskwarrior-install-path.patch @@ -4,45 +4,11 @@ Date: Sun Nov 16 15:19:38 2014 +0100 Use a template for taskwarrior install path. -diff --git a/taskw/warrior.py b/taskw/warrior.py -index 21dde88..e0509f2 100644 --- a/taskw/warrior.py +++ b/taskw/warrior.py -@@ -451,17 +451,17 @@ class TaskWarriorShellout(TaskWarriorBase): - def _execute(self, *args): - """ Execute a given taskwarrior command with arguments - - Returns a 2-tuple of stdout and stderr (respectively). - - """ - command = ( - [ +@@ -449 +449 @@ class TaskWarriorShellout(TaskWarriorBase): - 'task', + '@@taskwarrior@@/bin/task', - 'rc:%s' % self.config_filename, - ] - + self.get_configuration_override_args() - + [six.text_type(arg) for arg in args] - ) - - # subprocess is expecting bytestrings only, so nuke unicode if present - for i in range(len(command)): -@@ -525,17 +525,17 @@ class TaskWarriorShellout(TaskWarriorBase): - except OSError: - # OSError is raised if subprocess.Popen fails to find - # the executable. - return False - - @classmethod - def get_version(cls): - taskwarrior_version = subprocess.Popen( -- ['task', '--version'], -+ ['@@taskwarrior@@/bin/task', '--version'], - stdout=subprocess.PIPE - ).communicate()[0] - return LooseVersion(taskwarrior_version.decode()) - - def sync(self, init=False): - if self.get_version() < LooseVersion('2.3'): - raise UnsupportedVersionException( - "'sync' requires version 2.3 of taskwarrior or later." +@@ -553 +553 @@ class TaskWarriorShellout(TaskWarriorBase): +- ['task', '--version'], ++ ['@@taskwarrior@@/bin/task', '--version'], diff --git a/pkgs/development/python-modules/thumbor/default.nix b/pkgs/development/python-modules/thumbor/default.nix index 27e90514b72..0f10692685b 100644 --- a/pkgs/development/python-modules/thumbor/default.nix +++ b/pkgs/development/python-modules/thumbor/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "thumbor"; - version = "6.5.2"; + version = "6.6.0"; disabled = isPy3k; # see https://github.com/thumbor/thumbor/issues/1004 @@ -16,14 +16,14 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "1ys5ymwbvgh2ir85g9nyrzzf8vgi16j6pzzi53b0rgjx0kwlmnxg"; + sha256 = "0m4q40fcha1aydyr1khjhnb08cdfma67yxgyhsvwar5a6sl0906i"; }; postPatch = '' substituteInPlace "setup.py" \ --replace '"argparse",' "" ${lib.optionalString isPy3k ''--replace '"futures",' ""''} - substituteInPlace "setup.py" \ - --replace "piexif>=1.0.13,<1.1.0" "piexif>=1.0.13" + sed -i setup.py \ + -e 's/piexif[^"]*/piexif/;s/Pillow[^"]*/Pillow/' substituteInPlace "tests/test_utils.py" \ --replace "/bin/ls" "${coreutils}/bin/ls" substituteInPlace "tests/detectors/test_face_detector.py" \ diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix index 5bd0f5f81d2..ead61eef363 100644 --- a/pkgs/development/python-modules/typed-ast/default.nix +++ b/pkgs/development/python-modules/typed-ast/default.nix @@ -1,10 +1,10 @@ { buildPythonPackage, fetchPypi, lib, pythonOlder }: buildPythonPackage rec { pname = "typed-ast"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi{ inherit pname version; - sha256 = "57fe287f0cdd9ceaf69e7b71a2e94a24b5d268b35df251a88fef5cc241bf73aa"; + sha256 = "1iml3lcw50bz1fyw7s9sa4mqzbmqs5w43k6bsv5ix4vqa34mvckc"; }; # Only works with Python 3.3 and newer; disabled = pythonOlder "3.3"; diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index 3c4d17a4698..351279476c8 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -1,8 +1,8 @@ { stdenv, buildPythonPackage, fetchFromGitHub, python, cmake -, pyqt5, numpy, scipy, libarcus, doxygen, gettext, pythonOlder }: +, pyqt5, numpy, scipy, shapely, libarcus, doxygen, gettext, pythonOlder }: buildPythonPackage rec { - version = "3.5.1"; + version = "3.6.0"; pname = "uranium"; format = "other"; @@ -10,13 +10,13 @@ buildPythonPackage rec { owner = "Ultimaker"; repo = "Uranium"; rev = version; - sha256 = "1qfci5pl4yhirkkck1rm4i766j8gi56p81mfc6vgbdnhchcjyhy9"; + sha256 = "02hid13h8anb9bgv2hhrcdg10bxdxa9hj9pbdv3gw3lpn9r2va98"; }; disabled = pythonOlder "3.5.0"; buildInputs = [ python gettext ]; - propagatedBuildInputs = [ pyqt5 numpy scipy libarcus ]; + propagatedBuildInputs = [ pyqt5 numpy scipy shapely libarcus ]; nativeBuildInputs = [ cmake doxygen ]; postPatch = '' @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python framework for building Desktop applications"; homepage = https://github.com/Ultimaker/Uranium; - license = licenses.agpl3; + license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/uritemplate_py/default.nix b/pkgs/development/python-modules/uritemplate_py/default.nix deleted file mode 100644 index 6aff82c5711..00000000000 --- a/pkgs/development/python-modules/uritemplate_py/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -}: - -buildPythonPackage rec { - pname = "uritemplate.py"; - version = "3.0.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "e0cdeb0f55ec18e1580974e8017cd188549aacc2aba664ae756adb390b9d45b4"; - }; - - meta = with stdenv.lib; { - homepage = https://github.com/uri-templates/uritemplate-py; - description = "Python implementation of URI Template"; - license = licenses.asl20; - maintainers = with maintainers; [ pSub ]; - }; - -} diff --git a/pkgs/development/python-modules/wptserve/default.nix b/pkgs/development/python-modules/wptserve/default.nix index 8ae617830f1..7258ec30f9f 100644 --- a/pkgs/development/python-modules/wptserve/default.nix +++ b/pkgs/development/python-modules/wptserve/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, six, h2 , isPy3k }: @@ -15,7 +16,7 @@ buildPythonPackage rec { sha256 = "9d0c6adc279748abea81ac12b7a2cac97ebbdd87826dc11f6dbd85b781e9442a"; }; - propagatedBuildInputs = [ ]; + propagatedBuildInputs = [ six h2 ]; meta = { description = "A webserver intended for web browser testing"; diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index 09beb9d8991..c4d9222e817 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -25,11 +25,11 @@ buildPythonPackage rec { pname = "zeep"; - version = "3.1.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "b2d96881689c3f29e8ea5c8c6abb2b17fb0f470deee15d0d7bec4e74592850f6"; + sha256 = "0bfpdy3hi8aa45piwg5gj0xxa187v13d66qr1ki73qn7c6rbizp5"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/development/ruby-modules/bundix/default.nix index 45be83f6ebe..92f14114cf1 100644 --- a/pkgs/development/ruby-modules/bundix/default.nix +++ b/pkgs/development/ruby-modules/bundix/default.nix @@ -38,7 +38,7 @@ buildRubyGem rec { ''; homepage = https://github.com/manveru/bundix; license = "MIT"; - maintainers = with lib.maintainers; [ manveru zimbatm ]; + maintainers = with lib.maintainers; [ manveru qyliss zimbatm ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index d67c7bd7324..decde250ac2 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "1.17.1"; - source.sha256 = "0jmj67r2677mq8hxkhvlgpbv8gzfgdhxra3x0gf0bywiyypl546c"; + version = "1.17.2"; + source.sha256 = "0dbnq6703mjvgsri45vaw7b4wjqr89z1h8xkzsacqcp24a706m5r"; dontPatchShebangs = true; postFixup = '' diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 3671605a407..7fdf5c83901 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -23,7 +23,7 @@ , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl , msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem , cairo, re2, rake, gobject-introspection, gdk_pixbuf, zeromq, graphicsmagick, libcxx, file -, libselinux ? null, libsepol ? null +, libselinux ? null, libsepol ? null, libvirt }@args: let @@ -314,6 +314,14 @@ in buildInputs = [ imagemagick which ]; }; + ruby-libvirt = attrs: { + buildInputs = [ libvirt pkgconfig ]; + buildFlags = [ + "--with-libvirt-include=${libvirt}/include" + "--with-libvirt-lib=${libvirt}/lib" + ]; + }; + ruby-lxc = attrs: { buildInputs = [ lxc ]; }; diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index d80270f65b7..6e090648798 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -5,12 +5,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "ammonite-${version}"; - version = "1.5.0"; + version = "1.6.0"; scalaVersion = "2.12"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; - sha256 = "0ivfas9lfx3wsc2c4jxi1z54vn5f4cc4j1aqq53nxfl8sx2hbm3v"; + sha256 = "17c6ps5i48hcjj7r6xw8mrqhy4cs7qsa787l36f30757hi1cx4qy"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 3724494da11..e60729dc8b9 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pmd-${version}"; - version = "6.9.0"; + version = "6.10.0"; buildInputs = [ unzip ]; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "13w07f68gfcjy3a2zk4z4b0f95qscbkjlylckphmyxhw7vmgzlmn"; + sha256 = "1yzgin2lbhfswb07mm14wq8rn129kpfjidd8nv9pg77ywhnbwqmb"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 2e04cac6c49..78f40913eb5 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -73,8 +73,6 @@ stdenv.mkDerivation rec { --replace 'obj:/usr/X11R6/lib' 'obj:*/lib' \ --replace 'obj:/usr/lib' 'obj:*/lib' done - - paxmark m $out/lib/valgrind/*-*-linux ''; meta = { diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index 17b0265fddd..c811b8a99e9 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre, buildTools }: +{ stdenv, fetchurl, makeWrapper, jre, build-tools }: stdenv.mkDerivation rec { name = "apktool-${version}"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" makeWrapper "${jre}/bin/java" "$out/bin/apktool" \ --add-flags "-jar $out/libexec/apktool/apktool.jar" \ - --prefix PATH : "${buildTools.v25_0_1}/build-tools/25.0.1/" + --prefix PATH : "${builtins.head build-tools}/libexec/android-sdk/build-tools/28.0.3" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 15a14be7b13..9aff59f3497 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -119,7 +119,8 @@ stdenv.mkDerivation rec { find src/main/java/com/google/devtools -type f -print0 | while IFS="" read -r -d "" path; do substituteInPlace "$path" \ --replace /bin/bash ${customBash}/bin/bash \ - --replace /usr/bin/env ${coreutils}/bin/env + --replace /usr/bin/env ${coreutils}/bin/env \ + --replace /bin/true ${coreutils}/bin/true done # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. substituteInPlace scripts/bootstrap/compile.sh \ diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/pkgs/development/tools/cloudfoundry-cli/default.nix index 3ce9e64c0f7..4f285fa6961 100644 --- a/pkgs/development/tools/cloudfoundry-cli/default.nix +++ b/pkgs/development/tools/cloudfoundry-cli/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "cloudfoundry-cli-${version}"; - version = "6.37.0"; + version = "6.41.0"; goPackagePath = "code.cloudfoundry.org/cli"; @@ -12,20 +12,28 @@ buildGoPackage rec { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "1v4f1fyydpzkfir46g4ppbf3zmk3ym6kxswpkdjls8h3dbb2fbnv"; + sha256 = "1dkd0lfq55qpnxsrigffaqm2nlcxr0bm0jsl4rsjlmb8p2vgpx8b"; }; - outputs = [ "out" ]; + makeTarget = let hps = stdenv.hostPlatform.system; in + if hps == "x86_64-darwin" then + "out/cf-cli_osx" + else if hps == "x86_64-linux" then + "out/cf-cli_linux_x86-64" + else if hps == "i686-linux" then + "out/cf-cli_linux_i686" + else + throw "make target for this platform unknown"; buildPhase = '' cd go/src/${goPackagePath} - CF_BUILD_DATE="1970-01-01" make build + CF_BUILD_DATE="1970-01-01" make $makeTarget + cp $makeTarget out/cf ''; installPhase = '' - install -Dm555 out/cf "$out/bin/cf" - remove-references-to -t ${go} "$out/bin/cf" - install -Dm444 -t "$out/share/bash-completion/completions/" "$src/ci/installers/completion/cf" + install -Dm555 out/cf "$bin/bin/cf" + install -Dm444 -t "$bin/share/bash-completion/completions/" "$src/ci/installers/completion/cf" ''; meta = with stdenv.lib; { @@ -33,5 +41,6 @@ buildGoPackage rec { homepage = https://github.com/cloudfoundry/cli; maintainers = with maintainers; [ ris ]; license = licenses.asl20; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 04f0c5cb66f..93f389e6879 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "11.5.0"; + version = "11.6.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "1siiws19qzfv2nnyp9fy215yd08iv70x830b61kr1742ywc0jcbn"; + sha256 = "16xwj962biny18ci8lvfc6r6jq9vcdlc8vs6w7d5yzvd9x55rvwd"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "0d7wnpry4861dcmpspbaar97mkf0jf2bcxvr4nph9xnkw8w7fs2z"; + sha256 = "05wb7imly0c5zqmxrgdpls8izsq1g409nh31yf6j0sr76m8qkvf9"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "028bl249yfccdnwskbn6sxzf1xsg94chbm107n2h83j7a81cz8kw"; + sha256 = "1g9wyi9n9xvynvn7c8kjzm5pznyw7w4ziklxjniaa69idzgvbl5g"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 46104e78d1d..4589e6ff4e5 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -6,7 +6,18 @@ assert mysqlSupport -> mysql_jdbc != null; with stdenv.lib; let extraJars = optional mysqlSupport mysql_jdbc; - + logback-core = fetchurl { + url = "http://central.maven.org/maven2/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3.jar"; + sha256 = "5946d837fe6f960c02a53eda7a6926ecc3c758bbdd69aa453ee429f858217f22"; + }; + logback-classic = fetchurl { + url = "http://central.maven.org/maven2/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar"; + sha256 = "fb53f8539e7fcb8f093a56e138112056ec1dc809ebb020b59d8a36a5ebac37e0"; + }; + slf4j = fetchurl { + url = "http://central.maven.org/maven2/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar"; + sha256 = "18c4a0095d5c1da6b817592e767bb23d29dd2f560ad74df75ff3961dbde25b79"; + }; in stdenv.mkDerivation rec { @@ -34,6 +45,7 @@ stdenv.mkDerivation rec { in '' mkdir -p $out/{bin,lib,sdk} mv ./* $out/ + cp ${logback-core} ${logback-classic} ${slf4j} $out/lib # Clean up documentation. mkdir -p $out/share/doc/${name} diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 5d60903ee86..787a5dbc646 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -33,11 +33,6 @@ stdenv.mkDerivation rec { # Make binutils output deterministic by default. ./deterministic.patch - # Always add PaX flags section to ELF files. - # This is needed, for instance, so that running "ldd" on a binary that is - # PaX-marked to disable mprotect doesn't fail with permission denied. - ./pt-pax-flags.patch - # Bfd looks in BINDIR/../lib for some plugins that don't # exist. This is pointless (since users can't install plugins # there) and causes a cycle between the lib and bin outputs, so diff --git a/pkgs/development/tools/misc/binutils/pt-pax-flags.patch b/pkgs/development/tools/misc/binutils/pt-pax-flags.patch deleted file mode 100644 index 3c060012ad0..00000000000 --- a/pkgs/development/tools/misc/binutils/pt-pax-flags.patch +++ /dev/null @@ -1,233 +0,0 @@ ---- binutils-2.15.94.0.2.2.orig/bfd/elf-bfd.h 2005-02-07 20:42:44.000000000 +0100 -+++ binutils-2.15.94.0.2.2/bfd/elf-bfd.h 2005-02-20 13:13:17.362558200 +0100 -@@ -1266,6 +1266,9 @@ - /* Should the PT_GNU_RELRO segment be emitted? */ - bfd_boolean relro; - -+ /* Segment flags for the PT_PAX_FLAGS segment. */ -+ unsigned int pax_flags; -+ - /* Symbol version definitions in external objects. */ - Elf_Internal_Verdef *verdef; - ---- binutils-2.17.50.0.18/bfd/elf.c.orig 2007-08-01 11:12:02.000000000 -0400 -+++ binutils-2.17.50.0.18/bfd/elf.c 2007-08-01 14:27:36.086986774 -0400 -@@ -1085,6 +1085,7 @@ - case PT_GNU_EH_FRAME: pt = "EH_FRAME"; break; - case PT_GNU_STACK: pt = "STACK"; break; - case PT_GNU_RELRO: pt = "RELRO"; break; -+ case PT_PAX_FLAGS: pt = "PAX_FLAGS"; break; - default: pt = NULL; break; - } - return pt; -@@ -2346,6 +2347,9 @@ - case PT_GNU_RELRO: - return _bfd_elf_make_section_from_phdr (abfd, hdr, hdr_index, "relro"); - -+ case PT_PAX_FLAGS: -+ return _bfd_elf_make_section_from_phdr (abfd, hdr, hdr_index, "pax_flags"); -+ - default: - /* Check for any processor-specific program segment types. */ - bed = get_elf_backend_data (abfd); -@@ -3326,6 +3330,11 @@ - ++segs; - } - -+ { -+ /* We need a PT_PAX_FLAGS segment. */ -+ ++segs; -+ } -+ - for (s = abfd->sections; s != NULL; s = s->next) - { - if ((s->flags & SEC_LOAD) != 0 -@@ -3945,6 +3954,20 @@ - pm = &m->next; - } - -+ { -+ amt = sizeof (struct elf_segment_map); -+ m = bfd_zalloc (abfd, amt); -+ if (m == NULL) -+ goto error_return; -+ m->next = NULL; -+ m->p_type = PT_PAX_FLAGS; -+ m->p_flags = elf_tdata (abfd)->pax_flags; -+ m->p_flags_valid = 1; -+ -+ *pm = m; -+ pm = &m->next; -+ } -+ - free (sections); - elf_tdata (abfd)->segment_map = mfirst; - } -@@ -5129,7 +5152,8 @@ - 5. PT_GNU_STACK segments do not include any sections. - 6. PT_TLS segment includes only SHF_TLS sections. - 7. SHF_TLS sections are only in PT_TLS or PT_LOAD segments. -- 8. PT_DYNAMIC should not contain empty sections at the beginning -+ 8. PT_PAX_FLAGS segments do not include any sections. -+ 9. PT_DYNAMIC should not contain empty sections at the beginning - (with the possible exception of .dynamic). */ - #define IS_SECTION_IN_INPUT_SEGMENT(section, segment, bed) \ - ((((segment->p_paddr \ -@@ -5138,6 +5162,7 @@ - && (section->flags & SEC_ALLOC) != 0) \ - || IS_COREFILE_NOTE (segment, section)) \ - && segment->p_type != PT_GNU_STACK \ -+ && segment->p_type != PT_PAX_FLAGS \ - && (segment->p_type != PT_TLS \ - || (section->flags & SEC_THREAD_LOCAL)) \ - && (segment->p_type == PT_LOAD \ ---- binutils-2.23.52.0.1/bfd/elflink.c.orig 2013-02-27 21:28:03.000000000 +0100 -+++ binutils-2.23.52.0.1/bfd/elflink.c 2013-03-01 17:32:44.922717879 +0100 -@@ -5764,18 +5764,32 @@ - && ! (*bed->elf_backend_always_size_sections) (output_bfd, info)) - return FALSE; - -+ elf_tdata (output_bfd)->pax_flags = PF_NORANDEXEC; -+ -+ if (info->execheap) -+ elf_tdata (output_bfd)->pax_flags |= PF_NOMPROTECT; -+ else if (info->noexecheap) -+ elf_tdata (output_bfd)->pax_flags |= PF_MPROTECT; -+ - /* Determine any GNU_STACK segment requirements, after the backend - has had a chance to set a default segment size. */ - if (info->execstack) -+ { - elf_stack_flags (output_bfd) = PF_R | PF_W | PF_X; -+ elf_tdata (output_bfd)->pax_flags |= PF_EMUTRAMP; -+ } - else if (info->noexecstack) -+ { - elf_stack_flags (output_bfd) = PF_R | PF_W; -+ elf_tdata (output_bfd)->pax_flags |= PF_NOEMUTRAMP; -+ } - else - { - bfd *inputobj; - asection *notesec = NULL; - int exec = 0; - -+ elf_tdata (output_bfd)->pax_flags |= PF_NOEMUTRAMP; - for (inputobj = info->input_bfds; - inputobj; - inputobj = inputobj->link_next) -@@ -5789,7 +5803,11 @@ - if (s) - { - if (s->flags & SEC_CODE) -- exec = PF_X; -+ { -+ elf_tdata (output_bfd)->pax_flags &= ~PF_NOEMUTRAMP; -+ elf_tdata (output_bfd)->pax_flags |= PF_EMUTRAMP; -+ exec = PF_X; -+ } - notesec = s; - } - else if (bed->default_execstack) ---- binutils-2.15.94.0.2.2.orig/binutils/readelf.c 2005-02-18 07:14:30.000000000 +0100 -+++ binutils-2.15.94.0.2.2/binutils/readelf.c 2005-02-20 13:13:17.470541784 +0100 -@@ -2293,6 +2293,7 @@ - return "GNU_EH_FRAME"; - case PT_GNU_STACK: return "GNU_STACK"; - case PT_GNU_RELRO: return "GNU_RELRO"; -+ case PT_PAX_FLAGS: return "PAX_FLAGS"; - - default: - if ((p_type >= PT_LOPROC) && (p_type <= PT_HIPROC)) ---- binutils-2.15.94.0.2.2.orig/include/bfdlink.h 2004-11-22 21:33:32.000000000 +0100 -+++ binutils-2.15.94.0.2.2/include/bfdlink.h 2005-02-20 13:13:17.476540872 +0100 -@@ -313,6 +313,14 @@ - flags. */ - unsigned int noexecstack: 1; - -+ /* TRUE if PT_PAX_FLAGS segment should be created with PF_NOMPROTECT -+ flags. */ -+ unsigned int execheap: 1; -+ -+ /* TRUE if PT_PAX_FLAGS segment should be created with PF_MPROTECT -+ flags. */ -+ unsigned int noexecheap: 1; -+ - /* TRUE if PT_GNU_RELRO segment should be created. */ - unsigned int relro: 1; - ---- binutils-2.15.94.0.2.2.orig/include/elf/common.h 2004-11-22 21:33:32.000000000 +0100 -+++ binutils-2.15.94.0.2.2/include/elf/common.h 2005-02-20 13:13:17.482539960 +0100 -@@ -423,6 +423,7 @@ - #define PT_SUNW_EH_FRAME PT_GNU_EH_FRAME /* Solaris uses the same value */ - #define PT_GNU_STACK (PT_LOOS + 0x474e551) /* Stack flags */ - #define PT_GNU_RELRO (PT_LOOS + 0x474e552) /* Read-only after relocation */ -+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580) /* PaX flags */ - - /* Program segment permissions, in program header p_flags field. */ - -@@ -433,6 +434,19 @@ - #define PF_MASKOS 0x0FF00000 /* New value, Oct 4, 1999 Draft */ - #define PF_MASKPROC 0xF0000000 /* Processor-specific reserved bits */ - -+#define PF_PAGEEXEC (1 << 4) /* Enable PAGEEXEC */ -+#define PF_NOPAGEEXEC (1 << 5) /* Disable PAGEEXEC */ -+#define PF_SEGMEXEC (1 << 6) /* Enable SEGMEXEC */ -+#define PF_NOSEGMEXEC (1 << 7) /* Disable SEGMEXEC */ -+#define PF_MPROTECT (1 << 8) /* Enable MPROTECT */ -+#define PF_NOMPROTECT (1 << 9) /* Disable MPROTECT */ -+#define PF_RANDEXEC (1 << 10) /* Enable RANDEXEC */ -+#define PF_NORANDEXEC (1 << 11) /* Disable RANDEXEC */ -+#define PF_EMUTRAMP (1 << 12) /* Enable EMUTRAMP */ -+#define PF_NOEMUTRAMP (1 << 13) /* Disable EMUTRAMP */ -+#define PF_RANDMMAP (1 << 14) /* Enable RANDMMAP */ -+#define PF_NORANDMMAP (1 << 15) /* Disable RANDMMAP */ -+ - /* Values for section header, sh_type field. */ - - #define SHT_NULL 0 /* Section header table entry unused */ ---- binutils-2.18.50.0.1/ld/emultempl/elf32.em.orig 2007-09-08 19:34:12.000000000 +0200 -+++ binutils-2.18.50.0.1/ld/emultempl/elf32.em 2007-09-15 21:41:35.688212063 +0200 -@@ -2139,6 +2139,16 @@ - link_info.noexecstack = TRUE; - link_info.execstack = FALSE; - } -+ else if (strcmp (optarg, "execheap") == 0) -+ { -+ link_info.execheap = TRUE; -+ link_info.noexecheap = FALSE; -+ } -+ else if (strcmp (optarg, "noexecheap") == 0) -+ { -+ link_info.noexecheap = TRUE; -+ link_info.execheap = FALSE; -+ } - EOF - - if test -n "$COMMONPAGESIZE"; then ---- binutils-2.15.94.0.2.2.orig/ld/ldgram.y 2004-11-22 21:33:32.000000000 +0100 -+++ binutils-2.15.94.0.2.2/ld/ldgram.y 2005-02-20 13:13:17.499537376 +0100 -@@ -1073,6 +1073,8 @@ - $$ = exp_intop (0x6474e550); - else if (strcmp (s, "PT_GNU_STACK") == 0) - $$ = exp_intop (0x6474e551); -+ else if (strcmp (s, "PT_PAX_FLAGS") == 0) -+ $$ = exp_intop (0x65041580); - else - { - einfo (_("\ ---- binutils-2.26/ld/lexsup.c.orig 2015-11-13 09:27:42.000000000 +0100 -+++ binutils-2.26/ld/lexsup.c 2016-01-26 21:08:41.787138458 +0100 -@@ -1793,8 +1793,12 @@ - fprintf (file, _("\ - -z muldefs Allow multiple definitions\n")); - fprintf (file, _("\ -+ -z execheap Mark executable as requiring executable heap\n")); -+ fprintf (file, _("\ - -z execstack Mark executable as requiring executable stack\n")); - fprintf (file, _("\ -+ -z noexecheap Mark executable as not requiring executable heap\n")); -+ fprintf (file, _("\ - -z noexecstack Mark executable as not requiring executable stack\n")); - } - diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index dbe22bae77f..9464ad463f6 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { # Note: The test-suite *requires* /dev/pts among the `build-chroot-dirs' of # the build daemon when building in a chroot. See - # <http://thread.gmane.org/gmane.linux.distributions.nixos/1036> for + # <https://www.mail-archive.com/nix-dev@cs.uu.nl/msg01056.html> for # details. # The test-suite needs to have a non-empty stdin: diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index cc6dde53bb9..b2c71388fc5 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "global-${version}"; - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { url = "mirror://gnu/global/${name}.tar.gz"; - sha256 = "0zvi5vxwiq0dy8mq2cgs64m8harxs0fvkmsnvi0ayb0w608lgij3"; + sha256 = "0735pj47dnspf20n0j1px24p59nwjinlmlb2n32ln1hvdkprivnb"; }; nativeBuildInputs = [ libtool makeWrapper ]; diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index ee96b6198cc..14374937fe0 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -2,7 +2,7 @@ , libaio }: stdenv.mkDerivation rec { - name = "sysbench-1.0.15"; + name = "sysbench-1.0.16"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ vim mysql.connector-c libaio ]; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "akopytov"; repo = "sysbench"; - rev = "1.0.15"; - sha256 = "0ddj4mxxqlnlp817ix2qad0v3p83azi9wyz4h7mffchgp3mndp9z"; + rev = "1.0.16"; + sha256 = "0ypain0m1yqn7yqfb5847fdph6a6m0rn2rnqbnkxcxz5g85kv1rg"; }; meta = { diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 46b77a2b998..30d8992bb98 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -2,11 +2,11 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "pipenv"; - version = "2018.11.14"; + version = "2018.11.26"; src = fetchPypi { inherit pname version; - sha256 = "1ni2cjgm04dwi8a0376nzwwy3gklqk9d0hkl8d9j760lvqshsxjz"; + sha256 = "0ip8zsrwmhrankrix0shig9g8q2knmr7b63sh7lqa8a5x03fcwx6"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix index 87066284bfe..a93dedded29 100644 --- a/pkgs/development/tools/pyre/default.nix +++ b/pkgs/development/tools/pyre/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, ocamlPackages, makeWrapper, writeScript -, dune, python3, rsync, fetchpatch, buck }: +{ stdenv, fetchFromGitHub, ocamlPackages, writeScript +, dune, python3, rsync, buck, watchman }: let # Manually set version - the setup script requires # hg and git + keeping the .git directory around. @@ -103,6 +103,10 @@ in python3.pkgs.buildPythonApplication rec { substituteInPlace scripts/build-pypi-package.sh \ --replace 'NIX_BINARY_FILE' '${pyre-bin}/bin/pyre.bin' \ --replace 'BUILD_ROOT="$(mktemp -d)"' "BUILD_ROOT=$PWD/build" + for file in client/pyre.py client/commands/initialize.py client/commands/tests/initialize_test.py; do + substituteInPlace "$file" \ + --replace '"watchman"' '"${watchman}/bin/watchman"' + done substituteInPlace client/buck.py \ --replace '"buck"' '"${buck}/bin/buck"' substituteInPlace client/tests/buck_test.py \ diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 7f39376dc06..d44b3d4ec4f 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; let - version = "0.1.32"; + version = "0.1.34"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "0pyii4z9xf23lsdx4d3m5pkdyrsi4v1pbjj8l7fjgyfv8ncrjyn8"; + sha256 = "1drbbjqih69nvgynjcz0js0vi6sgsax8565zbrmf8fkbk609c7r3"; }; defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out"; diff --git a/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch b/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch new file mode 100644 index 00000000000..f87ff5135b3 --- /dev/null +++ b/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch @@ -0,0 +1,97 @@ +From: Antonio Terceiro <terceiro@debian.org> +Date: Wed, 27 May 2015 09:36:17 -0300 +Subject: Support system-installed plugins +Source: https://salsa.debian.org/ruby-team/vagrant/blob/cb672c6dc0c63f6552c5ec4d6d7d22929d353503/debian/patches/0004-Support-system-installed-plugins.patch + +Plugins must be installed as regular Ruby libraries, and they must +contain /usr/share/vagrant-plugins/plugins.d/$PLUGINNAME.json with the +following content: + +{ + "${PLUGINNAME}": { + "ruby_version":"$(ruby -e 'puts RUBY_VERSION')", + "vagrant_version":"$(cat /usr/share/vagrant/version.txt)", + "gem_version":"", + "require":"", + "sources":[] + } +} +--- + lib/vagrant/plugin/manager.rb | 4 ++-- + lib/vagrant/plugin/state_file.rb | 22 +++++++++++++++++++++- + 2 files changed, 23 insertions(+), 3 deletions(-) + +diff --git a/lib/vagrant/plugin/manager.rb b/lib/vagrant/plugin/manager.rb +index 567347d..d9d76a0 100644 +--- a/lib/vagrant/plugin/manager.rb ++++ b/lib/vagrant/plugin/manager.rb +@@ -18,7 +18,7 @@ module Vagrant + + # Returns the path to the [StateFile] for system plugins. + def self.system_plugins_file +- dir = Vagrant.installer_embedded_dir ++ dir = '@system_plugin_dir@' + return nil if !dir + Pathname.new(dir).join("plugins.json") + end +@@ -38,7 +38,7 @@ module Vagrant + + system_path = self.class.system_plugins_file + @system_file = nil +- @system_file = StateFile.new(system_path) if system_path && system_path.file? ++ @system_file = StateFile.new(system_path, true) if system_path && system_path.file? + + @local_file = nil + @globalized = @localized = false +diff --git a/lib/vagrant/plugin/state_file.rb b/lib/vagrant/plugin/state_file.rb +index c6872d4..935d431 100644 +--- a/lib/vagrant/plugin/state_file.rb ++++ b/lib/vagrant/plugin/state_file.rb +@@ -11,8 +11,9 @@ module Vagrant + # @return [Pathname] path to file + attr_reader :path + +- def initialize(path) ++ def initialize(path, system = false) + @path = path ++ @system = system + + @data = {} + if @path.exist? +@@ -28,6 +29,21 @@ module Vagrant + + @data["version"] ||= "1" + @data["installed"] ||= {} ++ load_extra_plugins ++ end ++ ++ def load_extra_plugins ++ extra_plugins = Dir.glob(@path.dirname.join('plugins.d', '*.json')) ++ extra_plugins.each do |filename| ++ json = File.read(filename) ++ begin ++ plugin_data = JSON.parse(json) ++ @data["installed"].merge!(plugin_data) ++ rescue JSON::ParserError => e ++ raise Vagrant::Errors::PluginStateFileParseError, ++ path: filename, message: e.message ++ end ++ end + end + + # Add a plugin that is installed to the state file. +@@ -107,6 +123,14 @@ module Vagrant + f.close + FileUtils.mv(f.path, @path) + end ++ rescue Errno::EACCES ++ # Ignore permission denied against system-installed plugins; regular ++ # users are not supposed to write there. ++ raise unless @system ++ rescue Errno::EROFS ++ # Ignore read-only filesystem against system-installed plugins; regular ++ # users are not supposed to write there. ++ raise unless @system + end + + protected diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 74992560f3f..f2e6b00c09b 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive, writeText, withLibvirt ? true, libvirt, pkgconfig }: +{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive, writeText, withLibvirt ? true}: let # NOTE: bumping the version and updating the hash is insufficient; @@ -35,24 +35,31 @@ in buildRubyGem rec { dontBuild = false; src = fetchurl { inherit url sha256; }; - buildInputs = lib.optional withLibvirt [ libvirt pkgconfig ]; - patches = [ ./unofficial-installation-nowarn.patch ./use-system-bundler-version.patch + ./0004-Support-system-installed-plugins.patch ]; + postPatch = '' + substituteInPlace lib/vagrant/plugin/manager.rb --subst-var-by \ + system_plugin_dir "$out/vagrant-plugins" + ''; + # PATH additions: # - libarchive: Make `bsdtar` available for extracting downloaded boxes postInstall = '' wrapProgram "$out/bin/vagrant" \ --set GEM_PATH "${deps}/lib/ruby/gems/${ruby.version.libDir}" \ - --prefix PATH ':' "${lib.getBin libarchive}/bin" \ - ${lib.optionalString withLibvirt '' - --prefix PATH ':' "${pkgconfig}/bin" \ - --prefix PKG_CONFIG_PATH ':' \ - "${lib.makeSearchPath "lib/pkgconfig" [ libvirt ]}" - ''} + --prefix PATH ':' "${lib.getBin libarchive}/bin" + + mkdir -p "$out/vagrant-plugins/plugins.d" + echo '{}' > "$out/vagrant-plugins/plugins.json" + '' + + lib.optionalString withLibvirt '' + substitute ${./vagrant-libvirt.json.in} $out/vagrant-plugins/plugins.d/vagrant-libvirt.json \ + --subst-var-by ruby_version ${ruby.version} \ + --subst-var-by vagrant_version ${version} ''; installCheckPhase = '' diff --git a/pkgs/development/tools/vagrant/gemset_libvirt.nix b/pkgs/development/tools/vagrant/gemset_libvirt.nix index aeaf42341a8..2631833dc00 100644 --- a/pkgs/development/tools/vagrant/gemset_libvirt.nix +++ b/pkgs/development/tools/vagrant/gemset_libvirt.nix @@ -1,19 +1,118 @@ { + excon = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15l9w0938c19nxmrp09n75qpmm64k12xj69h47yvxzcxcpbgnkb2"; + type = "gem"; + }; + version = "0.62.0"; + }; + fog-core = { + dependencies = ["builder" "excon" "formatador"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ac25s2wv7m6av7h7vjzd2bg3srhnn5yrz3lq1xpimhnfmp82sw6"; + type = "gem"; + }; + version = "1.43.0"; + }; + fog-json = { + dependencies = ["fog-core" "multi_json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zj8llzc119zafbmfa4ai3z5s7c4vp9akfs0f9l2piyvcarmlkyx"; + type = "gem"; + }; + version = "1.2.0"; + }; + fog-libvirt = { + dependencies = ["fog-core" "fog-json" "fog-xml" "json" "ruby-libvirt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gk16gsjd51x71wla7h5jqr6x5ywpwz5l8jdv76f9mr6fp1j2bkf"; + type = "gem"; + }; + version = "0.5.0"; + }; + fog-xml = { + dependencies = ["fog-core" "nokogiri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "043lwdw2wsi6d55ifk0w3izi5l1d1h0alwyr3fixic7b94kc812n"; + type = "gem"; + }; + version = "0.1.3"; + }; + formatador = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0"; + type = "gem"; + }; + version = "0.2.5"; + }; + json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + type = "gem"; + }; + version = "2.1.0"; + }; mini_portile2 = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y"; + sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; type = "gem"; }; version = "2.3.0"; }; nokogiri = { dependencies = ["mini_portile2"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz"; - type = "gem"; - }; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz"; + type = "gem"; + }; version = "1.8.5"; }; + ruby-libvirt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0d754d6pgdqyq52pl9hp0x38q1vn3vf9nz4nm5gqdj5i4fw7pba6"; + type = "gem"; + }; + version = "0.7.1"; + }; + vagrant-libvirt = { + dependencies = ["fog-core" "fog-libvirt" "nokogiri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wm5yvml3sxdzpnlp4q6yhy695syy8byd1g7cxll4pmj1kwlknym"; + type = "gem"; + }; + version = "0.0.45"; + }; } diff --git a/pkgs/development/tools/vagrant/vagrant-libvirt.json.in b/pkgs/development/tools/vagrant/vagrant-libvirt.json.in new file mode 100644 index 00000000000..22060e1c2db --- /dev/null +++ b/pkgs/development/tools/vagrant/vagrant-libvirt.json.in @@ -0,0 +1,9 @@ +{ + "vagrant-libvirt": { + "ruby_version":"@ruby_version@", + "vagrant_version":"@vagrant_version@", + "gem_version":"", + "require":"", + "sources":[] + } +} diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index a9c08e1c5b7..e5c52f620ac 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -88,7 +88,6 @@ in doCheck = false; # fails 4 out of 1453 tests postInstall = '' - paxmark m $out/bin/node PATH=$out/bin:$PATH patchShebangs $out ${optionalString enableNpm '' diff --git a/pkgs/games/boohu/default.nix b/pkgs/games/boohu/default.nix index 2504e6935ab..1e70a92066d 100644 --- a/pkgs/games/boohu/default.nix +++ b/pkgs/games/boohu/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { name = "boohu-${version}"; - version = "0.11.1"; + version = "0.12.0"; goPackagePath = "git.tuxfamily.org/boohu/boohu.git"; src = fetchurl { url = "https://download.tuxfamily.org/boohu/downloads/boohu-${version}.tar.gz"; - sha256 = "0m0ajxiyx8qwxj2zq33s5qpjr65cr33f7dpirg6b4w4y9gyhhv1g"; + sha256 = "0nf3xj3lda8279cqvjv5c3vpsb7d2kynwwna5yrsy7gq8c9n4rh8"; }; buildFlags = "--tags ansi"; diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix index c114443e1e7..6c7e9ac76a9 100644 --- a/pkgs/games/bzflag/default.nix +++ b/pkgs/games/bzflag/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchurl, pkgconfig -, curl, SDL2, libGLU_combined, glew, ncurses, c-ares }: +, curl, SDL2, libGLU_combined, glew, ncurses, c-ares +, Carbon, CoreServices }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -12,13 +13,14 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ curl SDL2 libGLU_combined glew ncurses c-ares ]; + buildInputs = [ curl SDL2 libGLU_combined glew ncurses c-ares ] + ++ lib.optionals stdenv.isDarwin [ Carbon CoreServices ]; meta = with lib; { description = "Multiplayer 3D Tank game"; homepage = https://bzflag.org/; license = licenses.lgpl21Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix index e4f8c4fd8b3..52d0bf778f9 100644 --- a/pkgs/games/gcompris/default.nix +++ b/pkgs/games/gcompris/default.nix @@ -2,12 +2,12 @@ gst_all_1, ninja }: stdenv.mkDerivation rec { - version = "0.91"; + version = "0.95"; name = "gcompris-${version}"; src = fetchurl { url = "http://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz"; - sha256 = "09h098w9q79hnzla1pcpqlnnr6dbafm4q6zmdp7wlk11ym8n9kvg"; + sha256 = "1aaijjx2b7k1cyx59jhs64hlp1sppw1faa81qxl5lxc79vifrlrl"; }; cmakeFlags = "-DQML_BOX2D_LIBRARY=${qmlbox2d}/${qtbase.qtQmlPrefix}/Box2D.2.0"; diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix index 6d31369a159..ad3baa9d22a 100644 --- a/pkgs/games/ivan/default.nix +++ b/pkgs/games/ivan/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ivan-${version}"; - version = "054"; + version = "055"; src = fetchFromGitHub { owner = "Attnam"; repo = "ivan"; rev = "v${version}"; - sha256 = "0ayhp9qvxsi5dsgjvy43i3lpdis883g1xn2b8l5xkwxcqfnvsfmq"; + sha256 = "10qrwzwfzqs7f663x1cbbhisz60axcl51glxq33zaxl0jwnmma2p"; }; nativeBuildInputs = [ cmake pkgconfig ]; @@ -18,11 +18,8 @@ stdenv.mkDerivation rec { hardeningDisable = ["all"]; - # To store bone and high score files in ~/.ivan of the current user - patches = [./new.patch]; - # Enable wizard mode - cmakeFlags = ["-DCMAKE_CXX_FLAGS=-DWIZARD" "-DFORCE_HOME_AS_STATE_DIR=ON"]; + cmakeFlags = ["-DCMAKE_CXX_FLAGS=-DWIZARD"]; # Help CMake find SDL_mixer.h NIX_CFLAGS_COMPILE = "-I${SDL2_mixer}/include/SDL2"; diff --git a/pkgs/games/ivan/new.patch b/pkgs/games/ivan/new.patch deleted file mode 100644 index d0ed866b3f3..00000000000 --- a/pkgs/games/ivan/new.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 13e143e..a6f9176 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -13,10 +13,14 @@ set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}") - add_definitions(-DIVAN_VERSION="${PROJECT_VERSION}" -DUSE_SDL) - - option(BUILD_MAC_APP "Build standalone application for MacOS" OFF) -+option(FORCE_HOME_AS_STATE_DIR "Statedir will be /.ivan/ in current user's homedir" OFF) - - if(UNIX) - add_definitions(-DUNIX) - include(GNUInstallDirs) -+ if(FORCE_HOME_AS_STATE_DIR) -+ add_definitions(-DFORCE_HOME_AS_STATE_DIR) -+ endif(FORCE_HOME_AS_STATE_DIR) - - if(BUILD_MAC_APP) - install(DIRECTORY Graphics Script Music Sound DESTINATION "ivan") -diff --git a/Main/Source/game.cpp b/Main/Source/game.cpp -index 323a185..012feb3 100644 ---- a/Main/Source/game.cpp -+++ b/Main/Source/game.cpp -@@ -5191,6 +5191,9 @@ festring game::GetDataDir() - - festring game::GetStateDir() - { -+#ifdef FORCE_HOME_AS_STATE_DIR -+ return GetHomeDir()+"/.ivan/"; -+#endif - #ifdef UNIX - #ifdef MAC_APP - return GetHomeDir(); diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix index 9a6ff4e0ae8..303855fb348 100644 --- a/pkgs/games/liquidwar/default.nix +++ b/pkgs/games/liquidwar/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, xproto, libX11, libXrender -, gmp, libGLU_combined, libjpeg, libpng +, gmp, libjpeg, libpng , expat, gettext, perl, guile , SDL, SDL_image, SDL_mixer, SDL_ttf , curl, sqlite, libtool, readline @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ xproto libX11 gmp guile - libGLU_combined libjpeg libpng + libjpeg libpng expat gettext perl SDL SDL_image SDL_mixer SDL_ttf curl sqlite @@ -27,7 +27,11 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + NIX_CFLAGS_COMPILE = + "-Wno-error=deprecated-declarations" + + # Avoid GL_GLEXT_VERSION double definition + " -DNO_SDL_GLEXT" + ; # To avoid problems finding SDL_types.h. configureFlags = [ "CFLAGS=-I${SDL.dev}/include/SDL" ]; diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix index d0649237b12..922d4f4762c 100644 --- a/pkgs/games/openra/default.nix +++ b/pkgs/games/openra/default.nix @@ -4,8 +4,8 @@ }: stdenv.mkDerivation rec { - name = "openra-${version}"; - version = "20180923"; + pname = "openra"; + version = "20181215"; meta = with stdenv.lib; { description = "Real Time Strategy game engine recreating the C&C titles"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "OpenRA"; repo = "OpenRA"; rev = "release-${version}"; - sha256 = "1pgi3zaq9fwwdq6yh19bwxscslqgabjxkvl9bcn1a5agy4bfbqk5"; + sha256 = "0p0izykjnz7pz02g2khp7msqa00jhjsrzk9y0g29dirmdv75qa4r"; extraPostFetch = '' sed -i 's,curl,curl --insecure,g' $out/thirdparty/{fetch-thirdparty-deps,noget}.sh @@ -69,5 +69,11 @@ stdenv.mkDerivation rec { mkdir -p $out/bin makeWrapper $out/lib/openra/launch-game.sh $out/bin/openra --run "cd $out/lib/openra" + printf "#!/bin/sh\nexec $out/bin/openra Game.Mod=ra" > $out/bin/openra-ra + chmod +x $out/bin/openra-ra + printf "#!/bin/sh\nexec $out/bin/openra Game.Mod=cnc" > $out/bin/openra-cnc + chmod +x $out/bin/openra-cnc + printf "#!/bin/sh\nexec $out/bin/openra Game.Mod=d2k" > $out/bin/openra-d2k + chmod +x $out/bin/openra-d2k ''; } diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index b4757265555..f218ba762ca 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, unzip, zip, file +{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, cmake, unzip, zip, file , curl, glew , libGL, SDL2, SDL2_image, zlib, freetype, imagemagick , openal , opusfile, libogg +, Cocoa }: stdenv.mkDerivation rec { @@ -19,6 +20,16 @@ stdenv.mkDerivation rec { buildInputs = [ freetype SDL2 SDL2_image libGL zlib curl glew opusfile openal libogg + ] ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ + Cocoa + ]; + + patches = [ + # https://github.com/yvt/openspades/pull/793 fix Darwin build + (fetchpatch { + url = "https://github.com/yvt/openspades/commit/2d13704fefc475b279337e89057b117f711a35d4.diff"; + sha256 = "1i7rcpjzkjhbv5pp6byzrxv7sb1iamqq5k1vyqlvkbr38k2dz0rv"; + }) ]; cmakeFlags = [ @@ -43,6 +54,6 @@ stdenv.mkDerivation rec { description = "A compatible client of Ace of Spades 0.75"; homepage = "https://github.com/yvt/openspades/"; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/games/ue4demos/default.nix b/pkgs/games/ue4demos/default.nix index b8b165ee051..b9cc8a6cd6d 100644 --- a/pkgs/games/ue4demos/default.nix +++ b/pkgs/games/ue4demos/default.nix @@ -1,6 +1,13 @@ { stdenv, fetchurl, unzip, patchelf, xorg, openal }: let + urls = file: + [ + # Untrusted mirrors - do not update hashes + "https://ludios.org/mirror/ue4demos/${file}" + "http://web.archive.org/web/20140824192039/http://ue4linux.raxxy.com/${file}" + ]; + buildDemo = { name, src }: stdenv.mkDerivation rec { inherit name src; @@ -53,7 +60,7 @@ in { tappy_chicken = buildDemo rec { name = "ue4demos-tappy_chicken"; src = fetchurl { - url = "http://ue4linux.raxxy.com/tappy_chicken.zip"; + urls = urls "tappy_chicken.zip"; sha256 = "0lwhvk3lpb2r5ng2cnzk7fpjj5lwhy2sch1a8v154x1xfhfb3h4v"; }; }; @@ -61,7 +68,7 @@ in { swing_ninja = buildDemo rec { name = "ue4demos-swing_ninja"; src = fetchurl { - url = "http://ue4linux.raxxy.com/swing_ninja.zip"; + urls = urls "swing_ninja.zip"; sha256 = "1bmgqqk3lda5h7nnqi59jgyrsn0clr3xs0k1jclnqf9fk0m8hjcv"; }; }; @@ -69,7 +76,7 @@ in { card_game = buildDemo rec { name = "ue4demos-card_game"; src = fetchurl { - url = "http://ue4linux.raxxy.com/card_game.zip"; + urls = urls "card_game.zip"; sha256 = "154baqias5q7kad0c89k35jbmnmlm865sll02mi7bk1yllcckz5z"; }; }; @@ -77,7 +84,7 @@ in { vehicle_game = buildDemo rec { name = "ue4demos-vehicle_game"; src = fetchurl { - url = "http://ue4linux.raxxy.com/vehicle_game.zip"; + urls = urls "vehicle_game.zip"; sha256 = "03dlacf1iv7sgn7pl3sx9r6243wy8fsi2kd858syfm9slg0190bs"; }; }; @@ -85,7 +92,7 @@ in { shooter_game = buildDemo rec { name = "ue4demos-shooter_game"; src = fetchurl { - url = "http://ue4linux.raxxy.com/shooter_game.zip"; + urls = urls "shooter_game.zip"; sha256 = "1bk32k349iqbqk8x8jffnqq0pjiqmvrvv675xxmlvkkr8qrlhz98"; }; }; @@ -93,7 +100,7 @@ in { strategy_game = buildDemo rec { name = "ue4demos-strategy_game"; src = fetchurl { - url = "http://ue4linux.raxxy.com/strategy_game.zip"; + urls = urls "strategy_game.zip"; sha256 = "1p7i966v1ssm20y12g4wsccpgnky3szy19qyjlacynk7bgbk6lg7"; }; }; @@ -101,7 +108,7 @@ in { black_jack = buildDemo rec { name = "ue4demos-black_jack"; src = fetchurl { - url = "http://ue4linux.raxxy.com/black_jack.zip"; + urls = urls "black_jack.zip"; sha256 = "0g52wkzn5isa3az32y25yx5b56wxks97pajqwkmm6gf4qpkfksxv"; }; }; @@ -109,7 +116,7 @@ in { landscape_mountains = buildDemo rec { name = "ue4demos-landscape_mountains"; src = fetchurl { - url = "http://ue4linux.raxxy.com/landscape_mountains.zip"; + urls = urls "landscape_mountains.zip"; sha256 = "14jzajhs3cpydvf3ag7lpj4hkpbjpwnn3xkdvdx92fi0pcl8cwym"; }; }; @@ -117,7 +124,7 @@ in { matinee_demo = buildDemo rec { name = "ue4demos-matinee_demo"; src = fetchurl { - url = "http://ue4linux.raxxy.com/matinee_demo.zip"; + urls = urls "matinee_demo.zip"; sha256 = "0ib8k6fl15cxzdarar2sqq5v3g3c7p2jidkdjd00nym6cvkibb4d"; }; }; @@ -125,7 +132,7 @@ in { elemental_demo = buildDemo rec { name = "ue4demos-elemental_demo"; src = fetchurl { - url = "http://ue4linux.raxxy.com/elemental_demo.zip"; + urls = urls "elemental_demo.zip"; sha256 = "1v4jdsy8jvv8wgc8dx17q17xigfrya5q0nfdzw4md7fzm3bg9z0v"; }; }; @@ -133,7 +140,7 @@ in { effects_cave_demo = buildDemo rec { name = "ue4demos-effects_cave_demo"; src = fetchurl { - url = "http://ue4linux.raxxy.com/effects_cave_demo.zip"; + urls = urls "effects_cave_demo.zip"; sha256 = "0lvd3aaha2x9pnpkdmrzi6nf7hymr95834z3l8shygjf9kbbzsz4"; }; }; @@ -141,7 +148,7 @@ in { realistic_rendering = buildDemo rec { name = "ue4demos-realistic_rendering"; src = fetchurl { - url = "http://ue4linux.raxxy.com/realistic_rendering_demo.zip"; + urls = urls "realistic_rendering_demo.zip"; sha256 = "0r16nznkv475hkw5rnngqsc69ch8vh86dppyyyr9nn43dkr2110a"; }; }; @@ -149,7 +156,7 @@ in { reflections_subway = buildDemo rec { name = "ue4demos-reflections_subway"; src = fetchurl { - url = "http://ue4linux.raxxy.com/reflections_subway_demo.zip"; + urls = urls "reflections_subway_demo.zip"; sha256 = "0dw5sm7405gxw9iqz0vpnhdprrb4wl5i14pvzl1381k973m8bd00"; }; }; @@ -157,7 +164,7 @@ in { scifi_hallway_demo = buildDemo rec { name = "ue4demos-scifi_hallway_demo"; src = fetchurl { - url = "http://ue4linux.raxxy.com/sci-fi_hallway_demo.zip"; + urls = urls "sci-fi_hallway_demo.zip"; sha256 = "14qp9iwm47awn8d9j6ijh6cnds308x60xs4vi2fvz2666jlz1pq2"; }; }; @@ -165,7 +172,7 @@ in { mobile_temple_demo = buildDemo rec { name = "ue4demos-mobile_temple_demo"; src = fetchurl { - url = "http://ue4linux.raxxy.com/mobile_temple_demo.zip"; + urls = urls "mobile_temple_demo.zip"; sha256 = "12bz4h1b9lhmqglwsa6r8q48ijqbjdha9fql31540d01kigaka75"; }; }; @@ -173,7 +180,7 @@ in { stylized_demo = buildDemo rec { name = "ue4demos-stylized_demo"; src = fetchurl { - url = "http://ue4linux.raxxy.com/stylized_demo.zip"; + urls = urls "stylized_demo.zip"; sha256 = "1676ridmj8rk4y4hbdscfnnka5l636av1xxl0qwvk236kq9j7v0l"; }; }; @@ -181,7 +188,7 @@ in { blueprint_examples_demo = buildDemo rec { name = "ue4demos-blueprint_examples_demo"; src = fetchurl { - url = "http://ue4linux.raxxy.com/blueprint_examples_demo.zip"; + urls = urls "blueprint_examples_demo.zip"; sha256 = "076q33h2hy965fvr805hsprkpcmizf638lj2ik8k923v86b15nbv"; }; }; diff --git a/pkgs/misc/cups/cups-clean-dirty.patch b/pkgs/misc/cups/cups-clean-dirty.patch deleted file mode 100644 index 0bdc8198e8f..00000000000 --- a/pkgs/misc/cups/cups-clean-dirty.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/scheduler/main.c b/scheduler/main.c -index 8925c8373..acf031684 100644 ---- a/scheduler/main.c -+++ b/scheduler/main.c -@@ -893,7 +893,7 @@ main(int argc, /* I - Number of command-line args */ - * Write dirty config/state files... - */ - -- if (DirtyCleanTime && current_time >= DirtyCleanTime && cupsArrayCount(Clients) == 0) -+ if (DirtyCleanTime && current_time >= DirtyCleanTime) - cupsdCleanDirty(); - - #ifdef __APPLE__ diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index df2d94c1f89..e3649bb821b 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -21,16 +21,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "man" ]; - patches = [ - (fetchpatch { - name = "cups"; # weird name to avoid change (for now) - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/cups-systemd-socket.patch" - + "?h=packages/cups&id=41fefa22ac518"; - sha256 = "1ddgdlg9s0l2ph6l8lx1m1lx6k50gyxqi3qiwr44ppq1rxs80ny5"; - }) - ./cups-clean-dirty.patch - ]; - postPatch = '' substituteInPlace cups/testfile.c \ --replace 'cupsFileFind("cat", "/bin' 'cupsFileFind("cat", "${coreutils}/bin' diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 9eeadda73fc..348b7c6550e 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -2,7 +2,6 @@ , libjpeg, libpng, perl, ijs, qpdf, dbus, avahi , makeWrapper, coreutils, gnused, bc, gawk, gnugrep, which, ghostscript , mupdf -, fetchpatch }: let @@ -10,23 +9,13 @@ let in stdenv.mkDerivation rec { name = "cups-filters-${version}"; - version = "1.20.4"; + version = "1.21.6"; src = fetchurl { url = "https://openprinting.org/download/cups-filters/${name}.tar.xz"; - sha256 = "0sjkmclcb1r77015wllsyz26272br3s17v6b1q2xwb2nm2gnwx9k"; + sha256 = "0k0x9p40bahq44189vy9zai2ia9i91h26chrddr0m9agzsy5s3k3"; }; - patches = [ - # This patch fixes cups-filters when compiled with poppler-0.67.0. - # Issue: https://github.com/OpenPrinting/cups-filters/pull/50 - # PR: https://github.com/OpenPrinting/cups-filters/pull/51 - (fetchpatch { - url = "https://github.com/OpenPrinting/cups-filters/commit/219de01c61f3b1ec146abf142d0dfc8c560cc58e.patch"; - sha256 = "0f0lql3rbm2g8mxrpigfyi8fb4i2g4av20g417jzdilp60jq0ny8"; - }) - ]; - nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix index d9f68b3e2ec..c0f471c8e20 100644 --- a/pkgs/misc/drivers/sc-controller/default.nix +++ b/pkgs/misc/drivers/sc-controller/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "sc-controller"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { owner = "kozec"; repo = pname; rev = "v${version}"; - sha256 = "0mb9r4811rfj5rs4vrdhaf3x38iy1fvxr4sk2zg3xhvc29cdf5wv"; + sha256 = "0527igjgc5jf60ldsrc4xv3k8gw2480pmqyp6nv5xcrm5j0ah4q5"; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/misc/emulators/blastem/default.nix b/pkgs/misc/emulators/blastem/default.nix index afc555cb51e..666f953f6b5 100644 --- a/pkgs/misc/emulators/blastem/default.nix +++ b/pkgs/misc/emulators/blastem/default.nix @@ -44,5 +44,7 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; + # Makefile:140: *** aarch64 is not a supported architecture. Stop. + badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 7a0a48db118..3f20390fba7 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -150,7 +150,7 @@ in with stdenv.lib.licenses; cmake curl libGLU_combined pcre pkgconfig sfml miniupnpc gettext glib gtk2 hidapi libevdev udev - ] ++ (with xorg; [ libSM libX11 libXi libpthreadstubs libxcb xcbutil ]); + ] ++ (with xorg; [ libSM libX11 libXi libpthreadstubs libxcb xcbutil libXinerama libXxf86vm ]); }).override { cmakeFlags = [ "-DLINUX_LOCAL_DEV=true" diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index 79832227a14..a58f95875cc 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "snes9x-gtk-${version}"; - version = "1.56.2"; + version = "1.57"; src = fetchFromGitHub { owner = "snes9xgit"; repo = "snes9x"; rev = version; - sha256 = "0cbv95799gpagf6bxs1fmwmxvz5qs9g2rmmf5fsdd1cb4lryaijr"; + sha256 = "1jcvj2l03b98iz6aq4x747vfz7i6h6j339z4brj4vz71s11vn31a"; }; enableParallelBuilding = true; diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 5533c8d54a5..8b80dd838ae 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "3.0.3"; + version = "3.0.4"; url = "https://dl.winehq.org/wine/source/3.0/wine-${version}.tar.xz"; - sha256 = "18add8wqqz7y1aj8x0dcba7pqj9jkbhngwjv4yjmar3gxacmjr7b"; + sha256 = "037vlrk80lagy362w7500i2ldwvdwsadrknajzi67cvxpvnqhnnl"; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { @@ -56,8 +56,8 @@ in rec { winetricks = fetchFromGitHub rec { # https://github.com/Winetricks/winetricks/releases - version = "20180815"; - sha256 = "0ksz2jkpqq8vnsc511zag9zcx8486hs8mwlmkkygljc8ylb1ibn5"; + version = "20181203"; + sha256 = "1as5h5xibpplm619b1i73g974p96q2jnd7fqm28xj3zkqy7qjdm3"; owner = "Winetricks"; repo = "winetricks"; rev = version; diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index afe8c0b7b67..87762eb4b25 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -3,7 +3,7 @@ , ninja , pkgconfig -, platformTools +, platform-tools , ffmpeg , SDL2 }: @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ln -s "${prebuilt_server}" "$out/share/scrcpy/scrcpy-server.jar" # runtime dep on `adb` to push the server - wrapProgram "$out/bin/scrcpy" --prefix PATH : "${platformTools}/bin" + wrapProgram "$out/bin/scrcpy" --prefix PATH : "${platform-tools}/bin" ''; meta = with stdenv.lib; { diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 4f73822b573..ebb8f1868ff 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1280,6 +1280,16 @@ }; }; + Recover-vim = buildVimPluginFrom2Nix { + name = "Recover-vim-2018-10-22"; + src = fetchFromGitHub { + owner = "chrisbra"; + repo = "Recover.vim"; + rev = "28195f7d1047515438c43a3ae8ac39648376412b"; + sha256 = "03jd3jzq0b1djym448vyg0bvrkfrhk86djkbkyzajrsfj46ygs8q"; + }; + }; + Rename = buildVimPluginFrom2Nix { name = "Rename-2011-08-31"; src = fetchFromGitHub { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index e914a3f4323..7bb07aa3e9d 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -28,6 +28,7 @@ Chiel92/vim-autoformat chikatoike/concealedyank.vim chikatoike/sourcemap.vim chrisbra/CheckAttach +chrisbra/Recover.vim chrisbra/csv.vim chrisgeo/sparkup chriskempson/base16-vim diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index cda7e03cd06..bc35d14321b 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -19,7 +19,7 @@ with stdenv.lib; # make sure libglx.so of ati is used. xorg.xorgserver does provide it as well # which is a problem because it doesn't contain the xorgserver patch supporting # the XORG_DRI_DRIVER_PATH env var. -# See http://thread.gmane.org/gmane.linux.distributions.nixos/4145 for a +# See https://marc.info/?l=nix-dev&m=139641585515351 for a # workaround (TODO) # The gentoo ebuild contains much more "magic" and is usually a great resource to diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index 180957ac2ad..495cd49e3f4 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { - version = "1.5.2"; + version = "2.0.2"; name = "ena-${version}-${kernel.version}"; src = fetchFromGitHub { owner = "amzn"; repo = "amzn-drivers"; rev = "ena_linux_${version}"; - sha256 = "18wf36092kr3zlpnqdkcdlim3vvjxy5f24zzsv4fwa7xg12mcfjm"; + sha256 = "0vb8s0w7ddwajk5gj5nqqlqc63p8p556f9ccwviwda2zvgqmk2pb"; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index 5394edf2877..d712ea99578 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -11,7 +11,7 @@ in { }; fuse_3 = mkFuse { - version = "3.3.0"; - sha256Hash = "1pwrnfm8jkxxqhrjz0v1gaw36hshgznchyj961qdk2y697y4zp19"; + version = "3.4.1"; + sha256Hash = "1aihvklhqx7abqiy5n9gns7gryqgjldhzghigwrqwnwvf9z0ggyx"; }; } diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index 1e16725af3f..daeda5fa8c0 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "fwts-${version}"; - version = "18.11.00"; + version = "18.12.00"; src = fetchzip { url = "http://fwts.ubuntu.com/release/fwts-V${version}.tar.gz"; - sha256 = "14dxw0ny5z681kz4dpm2phyanr2q4c8fqml3mhdr1mb2ndrrwqgz"; + sha256 = "10kzn5r099i4b8m5l7s68fs885d126l9cingq9gj1g574c18hg2s"; stripRoot = false; }; @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { substituteInPlace src/lib/include/fwts_binpaths.h --replace "/usr/bin/iasl" "${iasl}/bin/iasl" ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = "https://wiki.ubuntu.com/FirmwareTestSuite"; description = "Firmware Test Suite"; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index ec9aed402bf..c098571bb60 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -301,7 +301,7 @@ let NFS_V4_SECURITY_LABEL = yes; CIFS_XATTR = yes; - CIFS_POSIX = yes; + CIFS_POSIX = option yes; CIFS_FSCACHE = yes; CIFS_STATS = whenOlder "4.19" yes; CIFS_WEAK_PW_HASH = yes; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 0e8215133ad..5f04b220b4b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.89"; + version = "4.14.90"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "098b38518va6hhv5114vkyhyr2xzx01wxwib4dm0vpfx8jn1cvnf"; + sha256 = "1jl6l7zi5dl1ahxj30m4wmnd05s61rxn8yfjkkc4mr45634x07hc"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 4b33c121788..cb4a89a6419 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.10"; + version = "4.19.12"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "151ync20fz8bmiw3826jznx8kd7fna85vygrfchsqgm9xk76isdg"; + sha256 = "0xwvk6989glrpfc6irzf1lh3lvcckms72ngja9dpyqb2km9sr0ad"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.20.nix b/pkgs/os-specific/linux/kernel/linux-4.20.nix new file mode 100644 index 00000000000..838ef4a5b80 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-4.20.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: + +with stdenv.lib; + +buildLinux (args // rec { + version = "4.20"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; + + # branchVersion needs to be x.y + extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "0f14l6mb5c4rwpqjbcb2yrvk1bmmiyh0mpw24fbl7rr26lc2625d"; + }; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 5005e5b1d84..2e83e73df2e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.168"; + version = "4.4.169"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0zhmhccwki1r7p99ap772p3bknl4hm6zfwvzk97nas42anqc0ylg"; + sha256 = "1aah2qmifj15kcck4m6p00zz0d80afs22bg44y3n4l926f0b1w86"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index f1fa1baea37..99b82522be3 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.146"; + version = "4.9.147"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0ncf7yqavxqkkwdrapy72hb7rsj67fm1rvd2hdy12p88wf5ml6aq"; + sha256 = "10hxxcwa9lgsdz0k6229fly9r7iyqv9xq838zx8s7bd12qrrfb59"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 104dc457d6c..fa9b41b928e 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,11 +1,11 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/"; - + # Update this if linux_latest-libre fails to build. # $ curl https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/ | grep -Eo 'Revision [0-9]+' - rev = "15715"; - sha256 = "1mz1xv860ddxz7dfp4l6q25hlsh532aapvylq703jskgbzsfinxh"; + rev = "15814"; + sha256 = "10y2nh9sqd5kw1331apq50ikd8585gsja8hbjzyiskl3x5ak5xzh"; } , ... }: diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index d54e0153229..dc41c2e5f15 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -58,4 +58,14 @@ rec { }; }; + # Reverts a change related to the overlayfs overhaul in 4.19 + # https://github.com/NixOS/nixpkgs/issues/48828#issuecomment-445208626 + revert-vfs-dont-open-real = rec { + name = "revert-vfs-dont-open-real"; + patch = fetchpatch { + name = name + ".patch"; + url = https://github.com/samueldr/linux/commit/ee23fa215caaa8102f4ab411d39fcad5858147f2.patch; + sha256 = "0bp4jryihg1y2sl8zlj6w7vvnxj0kmb6xdy42hpvdv43kb6ngiaq"; + }; + }; } diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index a33431f0f58..469096d014d 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -40,7 +40,8 @@ stdenv.mkDerivation { sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in ''; - enableParallelBuilding = true; + # gcc: error: ../../device_mapper/libdevice-mapper.a: No such file or directory + enableParallelBuilding = false; #patches = [ ./purity.patch ]; patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ diff --git a/pkgs/os-specific/linux/ndiswrapper/default.nix b/pkgs/os-specific/linux/ndiswrapper/default.nix index fc9e6ab00dd..bdb52c0c091 100644 --- a/pkgs/os-specific/linux/ndiswrapper/default.nix +++ b/pkgs/os-specific/linux/ndiswrapper/default.nix @@ -34,8 +34,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "pgiri"; repo = "ndiswrapper"; - rev = "f4d16afb29ab04408d02e38d4ea1148807778e21"; - sha256 = "0iaw0vhchmqf1yh14v4a6whnbg4sx1hag8a4hrsh4fzgw9fx0ij4"; + rev = "5e29f6a9d41df949b435066c173e3b1947f179d3"; + sha256 = "0sprrmxxkf170bmh1nz9xw00gs89dddr84djlf666bn5bhy6jffi"; }; buildInputs = [ perl libelf ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index aa604cd9776..90efb9bda52 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -16,17 +16,20 @@ let in rec { # Policy: use the highest stable version as the default (on our master). - stable = if stdenv.hostPlatform.system == "x86_64-linux" then stable_410 else stable_390; + stable = if stdenv.hostPlatform.system != "x86_64-linux" + then legacy_390 + else generic { + version = "410.78"; + sha256_64bit = "1ciabnmvh95gsfiaakq158x2yws3m9zxvnxws3p32lz9riblpdjx"; + settingsSha256 = "1677g7rcjbcs5fja1s4p0syhhz46g9x2qqzyn3wwwrjsj7rwaz77"; + persistencedSha256 = "01kvd3zp056i4n8vazj7gx1xw0h4yjdlpazmspnsmwg24ijb82x4"; + }; - stable_410 = generic { - version = "410.78"; - sha256_64bit = "1ciabnmvh95gsfiaakq158x2yws3m9zxvnxws3p32lz9riblpdjx"; - settingsSha256 = "1677g7rcjbcs5fja1s4p0syhhz46g9x2qqzyn3wwwrjsj7rwaz77"; - persistencedSha256 = "01kvd3zp056i4n8vazj7gx1xw0h4yjdlpazmspnsmwg24ijb82x4"; - }; + # No active beta right now + beta = stable; # Last one supporting x86 - stable_390 = generic { + legacy_390 = generic { version = "390.87"; sha256_32bit = "0rlr1f4lnpb8c4qz4w5r8xw5gdy9bzz26qww45qyl1qav3wwaaaw"; sha256_64bit = "07k1kq8lkgbvjyr2dnbxcz6nppcwpq17wf925w8kfq78345hla9q"; @@ -36,9 +39,6 @@ rec { patches = lib.optional (kernel.meta.branch == "4.19") ./drm_mode_connector.patch; }; - # No active beta right now - beta = stable; - legacy_340 = generic { version = "340.107"; sha256_32bit = "0mh83affz6bim26ws7kkwwcfj2s6vkdy4d45hifsbshr82qd52wd"; diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 1a89ff57491..2a614e22c9a 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "sysdig-${version}"; - version = "0.24.1"; + version = "0.24.2"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "04y6cqi2j0qpr5bgxyn6zz9f33v5v4lmkcl21c3sg5hmpjwibg3w"; + sha256 = "16gz6gcp0zfhrqldw9cms38w0x5h3qhlx64dayqgsqbkw914b31a"; }; nativeBuildInputs = [ cmake perl ]; diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 88907231d6e..bddffc52fd7 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "clickhouse-${version}"; - version = "18.14.9"; + version = "18.14.18"; src = fetchFromGitHub { owner = "yandex"; repo = "ClickHouse"; rev = "v${version}-stable"; - sha256 = "1dsqwihh48fgsjy3jmfjk5271dw3052agw5wpfdm054nkkych86i"; + sha256 = "0nivnmlnamcjxwc66ja9fagi5fqzzjsnrrfk32f4g8sxffx2rjy3"; }; nativeBuildInputs = [ cmake libtool ninja ]; @@ -36,6 +36,11 @@ stdenv.mkDerivation rec { postInstall = '' rm -rf $out/share/clickhouse-test + + sed -i -e '\!<log>/var/log/clickhouse-server/clickhouse-server\.log</log>!d' \ + $out/etc/clickhouse-server/config.xml + substituteInPlace $out/etc/clickhouse-server/config.xml \ + --replace "<errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>" "<console>1</console>" ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 49d11a51617..74e1fda2d42 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -8,14 +8,14 @@ assert enableSeccomp -> libseccomp != null; assert enablePython -> python3 != null; -let version = "9.12.3"; in +let version = "9.12.3-P1"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "0f5rjs6zsq8sp6iv5r4q5y65xv05dk2sgvsj6lcir3i564k7d00f"; + sha256 = "0wzdbn6ig851354cjdys5q3gvqcvl2gmmih1gzr8ldl7sy4r7dvc"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 7e4babbb979..5d8e347de99 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -2,7 +2,7 @@ , lib, fetchurl, fetchpatch, fetchFromGitHub , which, findutils, m4, gawk -, python, openjdk, mono58, libressl +, python, openjdk, mono, libressl }: let @@ -50,7 +50,7 @@ let inherit rev sha256; }; - nativeBuildInputs = [ python openjdk gawk which m4 findutils mono58 ]; + nativeBuildInputs = [ python openjdk gawk which m4 findutils mono ]; buildInputs = [ libressl boost ]; patches = diff --git a/pkgs/servers/home-assistant/cli.nix b/pkgs/servers/home-assistant/cli.nix new file mode 100644 index 00000000000..c889610963d --- /dev/null +++ b/pkgs/servers/home-assistant/cli.nix @@ -0,0 +1,35 @@ +{ lib, python3 }: + +python3.pkgs.buildPythonApplication rec { + pname = "homeassistant-cli"; + version = "0.3.0"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "42d7cb008801d7a448b62aed1fc46dd450ee67397bf16faabb02f691417db4b2"; + }; + + postPatch = '' + # Ignore pinned versions + sed -i "s/'\(.*\)==.*'/'\1'/g" setup.py + ''; + + propagatedBuildInputs = with python3.pkgs; [ + requests pyyaml netdisco click click-log tabulate idna jsonpath_rw jinja2 + ]; + + checkInputs = with python3.pkgs; [ + pytest requests-mock + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Command-line tool for Home Asssistant"; + homepage = https://github.com/home-assistant/home-assistant-cli; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index b34355c88b6..fbea4ceff6a 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.84.3"; + version = "0.84.6"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 68bb42f51fb..049a1d5c293 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fetchpatch, python +{ lib, fetchFromGitHub, fetchpatch, python3 # Look up dependencies of specified components in component-packages.nix , extraComponents ? [] @@ -52,7 +52,7 @@ let (mkOverride "colorlog" "3.1.4" "418db638c9577f37f0fae4914074f395847a728158a011be2a193ac491b9779d") - # hass-frontend does not exist in python.pkgs + # hass-frontend does not exist in python3.pkgs (self: super: { hass-frontend = self.callPackage ./frontend.nix { }; }) @@ -68,7 +68,7 @@ let }); }; - py = python.override { + py = python3.override { # Put packageOverrides at the start so they are applied after defaultOverrides packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); }; @@ -85,7 +85,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.84.3"; + hassVersion = "0.84.6"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -100,7 +100,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "0b7634niqqmcckhqb7vx1wimibfs4v042bwja7am90jy0hzafbji"; + sha256 = "142hxsvhb9lh77h54975vkvl1fx5lslrydq1vbqyy51dy85ms8lc"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 0e1b327a264..74145d87589 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20181211.1"; + version = "20181211.2"; src = fetchPypi { inherit pname version; - sha256 = "c3bb994e8e121d146fedc113b35ced0c007169fd70b489e9344df082f934dbdf"; + sha256 = "75dd525922efc1f9a6a4a42c720764a539b18636769e2febc33bb68967c7ebff"; }; propagatedBuildInputs = [ user-agents ]; diff --git a/pkgs/servers/http/couchdb/2.0.0.nix b/pkgs/servers/http/couchdb/2.0.0.nix index 6e52bdc3270..fa8cb23bf1f 100644 --- a/pkgs/servers/http/couchdb/2.0.0.nix +++ b/pkgs/servers/http/couchdb/2.0.0.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "couchdb-${version}"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz"; - sha256 = "11brqv302j999sd5x8amhj9iqns9cbrlkjg2l9a8xbvkmf5fng0f"; + sha256 = "0lpk64n6fip85j1jz59kq20jdliwv6mh8j2h5zyxjn5i8b86hf0b"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 38212885541..a3948bb6908 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -1,14 +1,13 @@ -{ stdenv, fetchurl -, which -, python -, php71 -, php72 -, php73 -, perl -, perldevel -, ruby_2_3 -, ruby_2_4 -, ruby +{ stdenv, fetchFromGitHub, which +, withPython ? true, python +, withPHP71 ? false, php71 +, withPHP72 ? true, php72 +, withPHP73 ? false, php73 +, withPerl ? true, perl +, withPerldevel ? false, perldevel +, withRuby_2_3 ? false, ruby_2_3 +, withRuby_2_4 ? false, ruby_2_4 +, withRuby ? true, ruby , withSSL ? true, openssl ? null , withIPv6 ? true , withDebug ? false @@ -17,26 +16,29 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.6"; + version = "1.7"; name = "unit-${version}"; - src = fetchurl { - url = "https://unit.nginx.org/download/${name}.tar.gz"; - sha256 = "0lws5xpzkcmv0gc7vi8pgnymin02dq4gw0zb41jfzq0vbljxxl14"; + src = fetchFromGitHub { + owner = "nginx"; + repo = "unit"; + rev = "${version}"; + sha256 = "1klwricr0mxhw5wka35vnl919821vcvaf5w3ixvkbxaisml19qq4"; }; - buildInputs = [ - which - python - php71 - php72 - php73 - perl - perldevel - ruby_2_3 - ruby_2_4 - ruby - ] ++ optional withSSL openssl; + nativeBuildInputs = [ which ]; + + buildInputs = [ ] + ++ optional withPython python + ++ optional withPHP71 php71 + ++ optional withPHP72 php72 + ++ optional withPHP73 php73 + ++ optional withPerl perl + ++ optional withPerldevel perldevel + ++ optional withRuby_2_3 ruby_2_3 + ++ optional withRuby_2_4 ruby_2_4 + ++ optional withRuby ruby + ++ optional withSSL openssl; configureFlags = [ "--control=unix:/run/control.unit.sock" @@ -46,15 +48,15 @@ stdenv.mkDerivation rec { ++ optional withDebug [ "--debug" ]; postConfigure = '' - ./configure python --module=python --config=${python}/bin/python-config --lib-path=${python}/lib - ./configure php --module=php71 --config=${php71.dev}/bin/php-config --lib-path=${php71}/lib - ./configure php --module=php72 --config=${php72.dev}/bin/php-config --lib-path=${php72}/lib - ./configure php --module=php73 --config=${php73.dev}/bin/php-config --lib-path=${php73}/lib - ./configure perl --module=perl --perl=${perl}/bin/perl - ./configure perl --module=perl529 --perl=${perldevel}/bin/perl - ./configure ruby --module=ruby23 --ruby=${ruby_2_3}/bin/ruby - ./configure ruby --module=ruby24 --ruby=${ruby_2_4}/bin/ruby - ./configure ruby --module=ruby --ruby=${ruby}/bin/ruby + ${optionalString withPython "./configure python --module=python --config=${python}/bin/python-config --lib-path=${python}/lib"} + ${optionalString withPHP71 "./configure php --module=php71 --config=${php71.dev}/bin/php-config --lib-path=${php71}/lib"} + ${optionalString withPHP72 "./configure php --module=php72 --config=${php72.dev}/bin/php-config --lib-path=${php72}/lib"} + ${optionalString withPHP73 "./configure php --module=php73 --config=${php73.dev}/bin/php-config --lib-path=${php73}/lib"} + ${optionalString withPerl "./configure perl --module=perl --perl=${perl}/bin/perl"} + ${optionalString withPerldevel "./configure perl --module=perl529 --perl=${perldevel}/bin/perl"} + ${optionalString withRuby_2_3 "./configure ruby --module=ruby23 --ruby=${ruby_2_3}/bin/ruby"} + ${optionalString withRuby_2_4 "./configure ruby --module=ruby24 --ruby=${ruby_2_4}/bin/ruby"} + ${optionalString withRuby "./configure ruby --module=ruby --ruby=${ruby}/bin/ruby"} ''; meta = { diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index b0330b72ae4..5db09284874 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -37,11 +37,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "0.33.9"; + version = "0.34.0"; src = fetchPypi { inherit pname version; - sha256 = "1wdpywqi1xd6dy3hxnnjnh2amlmhljf8s0bff9v55jyh42bj1vpn"; + sha256 = "1bqwivzfx3kikzjmn4mng829ll8y62pd08hvsx99arr7cyzp6gri"; }; patches = [ @@ -64,7 +64,13 @@ in buildPythonApplication rec { netaddr phonenumbers pillow - prometheus_client + (prometheus_client.overrideAttrs (x: { + src = fetchPypi { + pname = "prometheus_client"; + version = "0.3.1"; + sha256 = "093yhvz7lxl7irnmsfdnf2030lkj4gsfkg6pcmy4yr1ijk029g0p"; + }; + })) psutil psycopg2 pyasn1 diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 80fb5575e4d..5000e4c396c 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -4,8 +4,8 @@ }: buildGoPackage rec { - name = "miniflux-${version}"; - version = "2.0.12"; + pname = "miniflux"; + version = "2.0.13"; goPackagePath = "miniflux.app"; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "miniflux"; repo = "miniflux"; rev = "refs/tags/${version}"; - sha256 = "13d1dwcwig7b5phymgxqm227k5l3zzzvx997cywarbl953ji2y1d"; + sha256 = "16c9jszrz3153kr0xyj7na09hpqvnjsrmsbic7qkp5a9aa839b9s"; }; goDeps = ./deps.nix; @@ -29,7 +29,7 @@ buildGoPackage rec { ''; meta = with stdenv.lib; { - description = "Miniflux is a minimalist and opinionated feed reader."; + description = "Minimalist and opinionated feed reader"; homepage = https://miniflux.app/; license = licenses.asl20; maintainers = with maintainers; [ benpye ]; diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index b1fbb3eb9ea..5c5750fccc8 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "check_ssl_cert-${version}"; - version = "1.78.0"; + version = "1.79.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - sha256 = "0s03625xzb30f6dbn34zkp0wcajzlir7wzkgi9rmms76gk4jqq6h"; + sha256 = "0pqk09xypa9vdxw5lbaa1j8w3mbmdwh2y1sq768rqq0izyfynf4d"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index 9ecd26af5c0..b228d690101 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { perlarchname=$(perl -e 'use Config; print $Config{archname};') installFlags="INSTALLSITEARCH=$out/${perl.libPrefix}/${perl.version}/$perlarchname INSTALLSITEMAN3DIR=$out/share/man/man3" - # http://comments.gmane.org/gmane.network.net-snmp.user/32434 + # http://article.gmane.org/gmane.network.net-snmp.user/32434 substituteInPlace "man/Makefile.in" --replace 'grep -vE' '@EGREP@ -v' ''; diff --git a/pkgs/servers/monitoring/uchiwa/bower-packages.nix b/pkgs/servers/monitoring/uchiwa/bower-packages.nix index a8180c5de3d..40789fa34f8 100644 --- a/pkgs/servers/monitoring/uchiwa/bower-packages.nix +++ b/pkgs/servers/monitoring/uchiwa/bower-packages.nix @@ -1,7 +1,7 @@ # Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix) { fetchbower, buildEnv }: buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ - (fetchbower "uchiwa-web" "1.3.1" "1.3.1" "0vhfwm4z3d4v4p2vfq1vvk4fifxm43f8lyccwpgmw153z4gj14gk") + (fetchbower "uchiwa-web" "1.5.0" "1.5.0" "0z7g4nb7cm5w5l8w1856sbib15sx022mqpap9d49s6ppnn53vcs1") (fetchbower "angular" "1.6.10" "~1.6.3" "0ag8xddsgxx5yka4wjq4ala4y6z3x2g1vc3x7a1n291fzz26p7ws") (fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "11r2nlwp6xrim2y6lnrr8v064mx3bmlxchqpg1i803v9zxz3q53d") (fetchbower "angular-cookies" "1.6.10" "~1.6.3" "0bjgmz5jnw06dfxhq9sajj62fk0b3v4j9p7nb45x8bl8rzkf25pn") @@ -19,7 +19,7 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ (fetchbower "highlightjs" "9.1.0" "~9.1.0" "0ld1da3h416a5j8v3v50rrpm4xwvvq8k8y2vwncvaqm9cqddz4s3") (fetchbower "moment" "2.16.0" "~2.16.0" "1mji892i60f2aw3vhl6878acrcgh0ycn3r4af0ivnjf8az2b9n71") (fetchbower "moment-picker" "0.9.11" "~0.9.7" "0p2g6rp2kcixydrga9lfihg4bxb598rvpi8n8l59mp549diy7vsb") - (fetchbower "ua-parser-js" "0.7.18" "~0.7.12" "0qi7y5yrsdh2brpmwx0xs53bzr4pja5x1k2875x6zh259ag3zdkn") + (fetchbower "ua-parser-js" "0.7.19" "~0.7.12" "0s1yaspccz234hm772hlybjsi0kndzwpjx5lzy3y1s4wfk248ks4") (fetchbower "jsoneditor" "5.5.11" "~5.5.10" "1gfsf8jqnd3hb3r9s9246mg40iqxk2ix8k4bjnrsbfmg6cd3xw6x") (fetchbower "jquery" "3.3.1" ">= 1.9.0" "1l891s3vgnpi1g8ksplid9jvrvnnv6lci8vraix4ssy50i264rkx") ]; } diff --git a/pkgs/servers/monitoring/uchiwa/src.nix b/pkgs/servers/monitoring/uchiwa/src.nix index 51c343d01da..cf5376318b4 100644 --- a/pkgs/servers/monitoring/uchiwa/src.nix +++ b/pkgs/servers/monitoring/uchiwa/src.nix @@ -1,4 +1,4 @@ { - version = "1.3.1-1"; - sha256 = "1cjb7k19iy79hh9gbjx67yrz44y92s516d0h403bf6w272g23yzi"; + version = "1.5.0-1"; + sha256 = "05idwiv47zav46wi1hfly6rylpw8qryr12xlz47ic04ggdlga13b"; } diff --git a/pkgs/servers/nosql/aerospike/default.nix b/pkgs/servers/nosql/aerospike/default.nix index 124daa4a5cc..c5290709b62 100644 --- a/pkgs/servers/nosql/aerospike/default.nix +++ b/pkgs/servers/nosql/aerospike/default.nix @@ -30,8 +30,7 @@ stdenv.mkDerivation rec { description = "Flash-optimized, in-memory, NoSQL database"; homepage = http://aerospike.com/; license = licenses.agpl3; - #platforms = [ "x86_64-linux" ]; # breaks eval of nixos manual for aarch64 - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ kalbasit ]; }; } diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index a7370847be1..d6cade72a87 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lua }: stdenv.mkDerivation rec { - version = "5.0.1"; + version = "5.0.3"; name = "redis-${version}"; src = fetchurl { url = "http://download.redis.io/releases/${name}.tar.gz"; - sha256 = "1jxbjmsxn0lgh0y3k5j57rxf2sdjj71hxhw4jcvsvycpxh77r9l2"; + sha256 = "00iyv4ybcgm5xxcm85lg1p99q7xijm05cpadlxa65chpz3fv9472"; }; buildInputs = [ lua ]; diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 9561af537e3..cce1f5c6ab0 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -6,9 +6,9 @@ let plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass"; plexpkg = if enablePlexPass then plexPass else { - version = "1.14.0.5470"; - vsnHash = "9d51fdfaa"; - sha256 = "cf547d286c731e98b19b70954f2777653fe77c30c329faab260c460374984010"; + version = "1.14.1.5488"; + vsnHash = "cc260c476"; + sha256 = "8ee806f35ccedcecd0cab028bbe1f7e2ac7de24292b715978d3165c4712f5c40"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix index 0c092e31a03..b52255cc594 100644 --- a/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { name = "grml-zsh-config-${version}"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "grml"; repo = "grml-etc-core"; rev = "v${version}"; - sha256 = "13mm1vjmb600l4g0ssr56xrlx6lwpv1brrpmf2v2pp2d5ki0d47x"; + sha256 = "15cr8pv1idshhq5d9sq4smgfl00iz55ji5mrxclsl3a35wg0djnw"; }; buildInputs = [ zsh coreutils txt2tags procps ] diff --git a/pkgs/shells/zsh/zsh-completions/default.nix b/pkgs/shells/zsh/zsh-completions/default.nix index 29a2a653265..726f2b7ad73 100644 --- a/pkgs/shells/zsh/zsh-completions/default.nix +++ b/pkgs/shells/zsh/zsh-completions/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zsh-completions-${version}"; - version = "0.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "zsh-users"; repo = "zsh-completions"; rev = "${version}"; - sha256 = "0a4fdh10rhhjcy06qiyyy0xjvg7fapvy3pgif38wrjqvrddaj6pv"; + sha256 = "1yf4rz99acdsiy0y1v3bm65xvs2m0sl92ysz0rnnrlbd5amn283l"; }; installPhase= '' diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 4790145e01f..aafc0855dbe 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -53,13 +53,13 @@ in lib.init bootStages ++ [ cc = if crossSystem.useiOSPrebuilt or false then buildPackages.darwin.iosSdkPkgs.clang else if crossSystem.useAndroidPrebuilt or false - then buildPackages.androidenv."androidndkPkgs_${crossSystem.ndkVer}".gcc + then buildPackages."androidndkPkgs_${crossSystem.ndkVer}".gcc else buildPackages.gcc; extraNativeBuildInputs = old.extraNativeBuildInputs ++ lib.optionals (hostPlatform.isLinux && !buildPlatform.isLinux) - [ buildPackages.patchelf buildPackages.paxctl ] + [ buildPackages.patchelf ] ++ lib.optional (let f = p: !p.isx86 || p.libc == "musl"; in f hostPlatform && !(f buildPlatform)) buildPackages.updateAutotoolsGnuConfigScriptsHook diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index be9d38f9780..f77f43aea88 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -130,9 +130,6 @@ let # The derivation's `system` is `buildPlatform.system`. inherit (buildPlatform) system; - # Whether we should run paxctl to pax-mark binaries. - needsPax = isLinux; - inherit (import ./make-derivation.nix { inherit lib config stdenv; }) mkDerivation; diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index be96d018612..03fa589138d 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -280,10 +280,6 @@ if [ -z "${SHELL:-}" ]; then echo "SHELL not set"; exit 1; fi BASH="$SHELL" export CONFIG_SHELL="$SHELL" -# Dummy implementation of the paxmark function. On Linux, this is -# overwritten by paxctl's setup hook. -paxmark() { true; } - # Execute the pre-hook. if [ -z "${shell:-}" ]; then export shell="$SHELL"; fi diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 28c3b9f3fb4..12bf781de70 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -216,7 +216,7 @@ in inherit (prevStage) ccWrapperStdenv gcc-unwrapped coreutils gnugrep - perl paxctl gnum4 bison; + perl gnum4 bison; # This also contains the full, dynamically linked, final Glibc. binutils = prevStage.binutils.override { # Rewrap the binutils with the new glibc, so both the next @@ -250,7 +250,7 @@ in isl = isl_0_17; }; }; - extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++ + extraNativeBuildInputs = [ prevStage.patchelf ] ++ # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. lib.optional (!localSystem.isx86 || localSystem.libc == "musl") prevStage.updateAutotoolsGnuConfigScriptsHook; @@ -325,7 +325,7 @@ in initialPath = ((import ../common-path.nix) {pkgs = prevStage;}); - extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++ + extraNativeBuildInputs = [ prevStage.patchelf ] ++ # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. lib.optional (!localSystem.isx86 || localSystem.libc == "musl") prevStage.updateAutotoolsGnuConfigScriptsHook; @@ -349,7 +349,7 @@ in # Simple executable tools concatMap (p: [ (getBin p) (getLib p) ]) [ gzip bzip2 xz bash binutils.bintools coreutils diffutils findutils - gawk gnumake gnused gnutar gnugrep gnupatch patchelf ed paxctl + gawk gnumake gnused gnutar gnugrep gnupatch patchelf ed ] # Library dependencies ++ map getLib ( @@ -368,7 +368,7 @@ in inherit (prevStage) gzip bzip2 xz bash coreutils diffutils findutils gawk gnumake gnused gnutar gnugrep gnupatch patchelf - attr acl paxctl zlib pcre; + attr acl zlib pcre; ${localSystem.libc} = getLibc prevStage; } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) { # Need to get rid of these when cross-compiling. diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix index 374d3e112ca..cc7f213b88b 100644 --- a/pkgs/tools/X11/wpgtk/default.nix +++ b/pkgs/tools/X11/wpgtk/default.nix @@ -1,24 +1,17 @@ -{ stdenv, python36Packages, fetchFromGitHub, pywal, feh, libxslt, imagemagick, +{ stdenv, python3Packages, fetchFromGitHub, feh, libxslt, gobject-introspection, gtk3, wrapGAppsHook, gnome3 }: -python36Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "wpgtk"; - version = "5.7.4"; + version = "5.8.6"; src = fetchFromGitHub { owner = "deviantfero"; repo = "wpgtk"; rev = "${version}"; - sha256 = "0c0kmc18lbr7nk3hh44hai9z06lfsgwxnjdv02hpjwrxg40zh726"; + sha256 = "1i29zdmgm8knp6mmz3nfl0dwn3vd2wcvf5vn0gg8sv2wjgk3i10y"; }; - pythonPath = [ - python36Packages.pygobject3 - python36Packages.pillow - pywal - imagemagick - ]; - buildInputs = [ wrapGAppsHook gtk3 @@ -27,11 +20,20 @@ python36Packages.buildPythonApplication rec { libxslt ]; + propagatedBuildInputs = with python3Packages; [ + pygobject3 + pillow + pywal + ]; + # The $HOME variable must be set to build the package. A "permission denied" error will occur otherwise preBuild = '' export HOME=$(pwd) ''; + # No test exist + doCheck = false; + meta = with stdenv.lib; { description = "Template based wallpaper/colorscheme generator and manager"; longDescription = '' diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix index be616c1bf9e..32d0e584f31 100644 --- a/pkgs/tools/admin/nomachine-client/default.nix +++ b/pkgs/tools/admin/nomachine-client/default.nix @@ -1,6 +1,7 @@ -{ stdenv, lib, file, fetchurl, makeWrapper, autoPatchelfHook, jsoncpp }: +{ stdenv, lib, file, fetchurl, makeWrapper, + autoPatchelfHook, jsoncpp, libpulseaudio }: let - versionMajor = "6.3"; + versionMajor = "6.4"; versionMinor = "6_1"; in stdenv.mkDerivation rec { @@ -11,12 +12,12 @@ in if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_x86_64.tar.gz"; - sha256 = "1035j2z2rqmdfb8cfm1pakd05c575640604b8lkljmilpky9mw5d"; + sha256 = "141pv277kl5ij1pmc0iadc0hnslxri2qaqvsjkmmvls4432jh0yi"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_i686.tar.gz"; - sha256 = "07j9f6mlq9m01ch8ik5dybi283vrp5dlv156jr5n7n2chzk34kf3"; + sha256 = "0a2vi4ygw34yw8rcjhw17mqx5qbjnym4jkap8paik8lisb5mhnyj"; } else throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}"; @@ -31,7 +32,7 @@ in ''; nativeBuildInputs = [ file makeWrapper autoPatchelfHook ]; - buildInputs = [ jsoncpp ]; + buildInputs = [ jsoncpp libpulseaudio ]; installPhase = '' rm bin/nxplayer bin/nxclient @@ -63,6 +64,10 @@ in postFixup = '' makeWrapper $out/bin/nxplayer.bin $out/bin/nxplayer --set NX_SYSTEM $out/NX makeWrapper $out/bin/nxclient.bin $out/bin/nxclient --set NX_SYSTEM $out/NX + + # libnxcau.so needs libpulse.so.0 for audio to work, but doesn't + # have a DT_NEEDED entry for it. + patchelf --add-needed libpulse.so.0 $out/NX/lib/libnxcau.so ''; dontBuild = true; diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index b24b88fa96a..e2e1980dad9 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -2,17 +2,17 @@ let - version = "0.16.2"; + version = "0.16.7"; # switch the dropdown to “manual” on https://pulumi.io/quickstart/install.html # TODO: update script pulumiArchPackage = { "x86_64-linux" = { url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-linux-x64.tar.gz"; - sha256 = "16qgy2pj3xkf1adi3882fpsl99jwsm19111fi5vzh1xqf39sg549"; + sha256 = "1l1cn8pk05vl7vpmhny9rlz1hj0iqclqjj1r2q12qip7f4qkgsfw"; }; "x86_64-darwin" = { url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-darwin-x64.tar.gz"; - sha256 = "18ck9khspa0x798bdlwk8dzylbsq7s35xmla8yasd9qqlab1yy1a"; + sha256 = "0p07jvgy0xl524fgb5d9wijxa91isv4h4mcn9qghycqj90yqnjhx"; }; }; diff --git a/pkgs/tools/archivers/fsarchiver/default.nix b/pkgs/tools/archivers/fsarchiver/default.nix new file mode 100644 index 00000000000..cb73233dcb4 --- /dev/null +++ b/pkgs/tools/archivers/fsarchiver/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +, zlib, bzip2, lzma, lzo, lz4, zstd, xz +, libgcrypt, e2fsprogs, utillinux, libgpgerror }: + +let + version = "0.8.5"; + +in stdenv.mkDerivation { + name = "fsarchiver-${version}"; + + src = fetchFromGitHub { + owner = "fdupoux"; + repo = "fsarchiver"; + rev = version; + sha256 = "1rvwq5v3rl14bqxjm1ibfapyicf0sa44nw7451v10kx39lp56ylp"; + }; + + nativeBuildInputs = [ + autoreconfHook pkgconfig + ]; + + buildInputs = [ + zlib bzip2 lzma lzo lz4 zstd xz + libgcrypt e2fsprogs utillinux libgpgerror + ]; + + meta = with stdenv.lib; { + description = "File system archiver for linux"; + longDescription = '' + FSArchiver is a system tool that allows you to save the contents of a + file-system to a compressed archive file. The file-system can be restored + on a partition which has a different size and it can be restored on a + different file-system. Unlike tar/dar, FSArchiver also creates the + file-system when it extracts the data to partitions. Everything is + checksummed in the archive in order to protect the data. If the archive is + corrupt, you just loose the current file, not the whole archive. + ''; + homepage = http://www.fsarchiver.org/; + license = licenses.lgpl2; + maintainers = [ maintainers.etu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix index eefb8160cbb..8fe445fedbe 100644 --- a/pkgs/tools/audio/abcm2ps/default.nix +++ b/pkgs/tools/audio/abcm2ps/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "abcm2ps-${version}"; - version = "8.14.1"; + version = "8.14.2"; src = fetchFromGitHub { owner = "leesavide"; repo = "abcm2ps"; rev = "v${version}"; - sha256 = "1i39wfrnjflhfbqhcphr9dw08q4si5i724wv423996whk5xni61l"; + sha256 = "15hka82zps3rfp4xdbzlf23wz4hqjk084awzfjh357qn168bwwid"; }; prePatch = '' diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix index 15e7a772bbd..d1edbf94fe0 100644 --- a/pkgs/tools/audio/playerctl/default.nix +++ b/pkgs/tools/audio/playerctl/default.nix @@ -1,28 +1,25 @@ -{ stdenv, meson, ninja, fetchFromGitHub, glib, pkgconfig, gobject-introspection }: +{ stdenv, meson, ninja, fetchFromGitHub, glib, pkgconfig, gtk-doc, docbook_xsl, gobject-introspection }: stdenv.mkDerivation rec { name = "playerctl-${version}"; - version = "0.6.1"; + version = "2.0.1"; src = fetchFromGitHub { owner = "acrisci"; repo = "playerctl"; rev = "v${version}"; - sha256 = "0jnylj5d6i29c5y6yjxg1a88r2qfbac5pj95f2aljjkfh9428jbb"; + sha256 = "0j1fvcc80307ybl1z9l752sr4bcza2fmb8qdivpnm4xmm82faigb"; }; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkgconfig gtk-doc docbook_xsl gobject-introspection ]; buildInputs = [ glib ]; - # docs somehow crashes the install phase: - # https://github.com/acrisci/playerctl/issues/85 - mesonFlags = [ "-Dgtk-doc=false" ]; - meta = with stdenv.lib; { description = "Command-line utility and library for controlling media players that implement MPRIS"; homepage = https://github.com/acrisci/playerctl; license = licenses.lgpl3; platforms = platforms.unix; maintainers = with maintainers; [ puffnfresh ]; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index fce1ff75cfa..759e2606e19 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline }: stdenv.mkDerivation rec { - name = "bacula-9.2.2"; + name = "bacula-9.4.1"; src = fetchurl { url = "mirror://sourceforge/bacula/${name}.tar.gz"; - sha256 = "0bi2jwvgs2ppdvksx41z69b5r5qr39kasxcgyhd08d6i8z89j87h"; + sha256 = "0hpxk0f81yx4p1xndsjbwnj7hvvplqlgrw74gv1scq6krabn2pvb"; }; buildInputs = [ postgresql sqlite zlib ncurses openssl readline ] diff --git a/pkgs/tools/compression/mozlz4a/default.nix b/pkgs/tools/compression/mozlz4a/default.nix index 16455fe3588..ce2aa9520d6 100644 --- a/pkgs/tools/compression/mozlz4a/default.nix +++ b/pkgs/tools/compression/mozlz4a/default.nix @@ -1,12 +1,13 @@ -{stdenv, fetchurl, python3, pylz4}: +{ stdenv, fetchurl, python3 }: + stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "mozlz4a"; - version = "2015-07-24"; + version = "2018-08-23"; # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) src = fetchurl { - url = "https://gist.githubusercontent.com/Tblue/62ff47bef7f894e92ed5/raw/2483756c55ed34be565aea269f05bd5eeb6b0a33/mozlz4a.py"; - sha256 = "1y52zqkdyfacl2hr5adkjphgqfyfylp8ksrkh165bq48zlbf00s8"; + url = "https://gist.githubusercontent.com/kaefer3000/73febe1eec898cd50ce4de1af79a332a/raw/a266410033455d6b4af515d7a9d34f5afd35beec/mozlz4a.py"; + sha256 = "1d1ai062kdms34bya9dlykkx011rj8d8nh5l7d76xj8k9kv4ssq6"; }; unpackPhase = "true;"; @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { chmod a+x "$out/bin/mozlz4a" ''; - buildInputs = [ pylz4 python3 ]; + buildInputs = [ python3 python3.pkgs.python-lz4 ]; meta = { inherit version; diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix index 56795332a96..208cbb83209 100644 --- a/pkgs/tools/filesystems/duperemove/default.nix +++ b/pkgs/tools/filesystems/duperemove/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libgcrypt glib linuxHeaders sqlite ]; - makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with stdenv.lib; { description = "A simple tool for finding duplicated extents and submitting them for deduplication"; diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index 956b0039489..b477ad8deac 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mtools-4.0.22"; + name = "mtools-4.0.23"; src = fetchurl { url = "mirror://gnu/mtools/${name}.tar.bz2"; - sha256 = "08shiy9am4x65yg8l5mplj8jrvsimzbaf2id8cmfc02b00i0yb35"; + sha256 = "1qwfxzr964fasxlzhllahk8mzh7c82s808wvly95dsqsflkdp27i"; }; patches = stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index ddec6b7eff8..1a24cf7e75c 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "3.5.0"; + version = "3.5.1"; name = "sshfs-fuse-${version}"; src = fetchFromGitHub { owner = "libfuse"; repo = "sshfs"; rev = "sshfs-${version}"; - sha256 = "1mczf13ic5ycfhcxmxma50n5h32vygcll0d8m39vam237s95aqy6"; + sha256 = "07ryavfbbzfxaswsbr8ifnnfn6g8yxgxam6mk6gvcskld6rkf6gd"; }; nativeBuildInputs = [ meson pkgconfig ninja docutils ]; diff --git a/pkgs/tools/graphics/guff/default.nix b/pkgs/tools/graphics/guff/default.nix new file mode 100644 index 00000000000..db218a812e6 --- /dev/null +++ b/pkgs/tools/graphics/guff/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "guff"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "silentbicycle"; + repo = "guff"; + rev = "v${version}"; + sha256 = "0n8mc9j3044j4b3vgc94ryd2j9ik6g73fqja54yxfdfrks4ksyds"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "A plot device"; + homepage = https://github.com/silentbicycle/guff; + license = licenses.isc; + maintainers = [ maintainers.marsam ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 0ddfad65a7a..3a348650308 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -25,16 +25,27 @@ stdenv.mkDerivation rec { patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch; - # The test tends to fail on btrfs and maybe other unusual filesystems. postPatch = '' + # The test tends to fail on btrfs and maybe other unusual filesystems. sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh sed '2i echo Skipping cp sparse test && exit 0' -i ./tests/cp/sparse.sh sed '2i echo Skipping rm deep-2 test && exit 0' -i ./tests/rm/deep-2.sh sed '2i echo Skipping du long-from-unreadable test && exit 0' -i ./tests/du/long-from-unreadable.sh + + # sandbox does not allow setgid sed '2i echo Skipping chmod setgid test && exit 0' -i ./tests/chmod/setgid.sh - sed '2i print "Skipping env -S test"; exit 0;' -i ./tests/misc/env-S.pl substituteInPlace ./tests/install/install-C.sh \ --replace 'mode3=2755' 'mode3=1755' + + sed '2i print "Skipping env -S test"; exit 0;' -i ./tests/misc/env-S.pl + + # these tests fail in the unprivileged nix sandbox (without nix-daemon) as we break posix assumptions + for f in ./tests/chgrp/{basic.sh,recurse.sh,default-no-deref.sh,no-x.sh,posix-H.sh}; do + sed '2i echo Skipping chgrp && exit 0' -i "$f" + done + for f in gnulib-tests/{test-chown.c,test-fchownat.c,test-lchown.c}; do + echo "int main() { return 0; }" > "$f" + done ''; outputs = [ "out" "info" ]; @@ -63,8 +74,8 @@ stdenv.mkDerivation rec { ++ optional (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.libc != "glibc") libiconv; # The tests are known broken on Cygwin - # (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19025), - # Darwin (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19351), + # (http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/19025), + # Darwin (http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/19351), # and {Open,Free}BSD. # With non-standard storeDir: https://github.com/NixOS/nix/issues/512 doCheck = stdenv.hostPlatform == stdenv.buildPlatform diff --git a/pkgs/tools/misc/datamash/default.nix b/pkgs/tools/misc/datamash/default.nix index d8591647ad3..230a97da5e4 100644 --- a/pkgs/tools/misc/datamash/default.nix +++ b/pkgs/tools/misc/datamash/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "datamash-${version}"; - version = "1.3"; + version = "1.4"; src = fetchurl { url = "mirror://gnu/datamash/${name}.tar.gz"; - sha256 = "19jpcv4ryvbz0476d6dgpxpbjkpmih4q84wj06nslls338bm5fzf"; + sha256 = "fa44dd2d5456bcb94ef49dfc6cfe62c83fd53ac435119a85d34e6812f6e6472a"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/diskus/default.nix b/pkgs/tools/misc/diskus/default.nix index 7b0681f3166..346ae141819 100644 --- a/pkgs/tools/misc/diskus/default.nix +++ b/pkgs/tools/misc/diskus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { name = "diskus-${version}"; @@ -11,6 +11,8 @@ rustPlatform.buildRustPackage rec { sha256 = "18scxspi5ncags8bnxq4ah9w8hrlwwlgpq7q9qfh4d81asmbyr8n"; }; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + cargoSha256 = "1syrmm5qpz7d1h17xpw1wa3d2snaz9n7d1avsjp7xz8s2qcx1wdc"; meta = with stdenv.lib; { @@ -18,6 +20,6 @@ rustPlatform.buildRustPackage rec { homepage = https://github.com/sharkdp/diskus; license = with licenses; [ asl20 /* or */ mit ]; maintainers = [ maintainers.fuerbringer ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/doitlive/default.nix b/pkgs/tools/misc/doitlive/default.nix index f18874e4f44..00b04c2112f 100644 --- a/pkgs/tools/misc/doitlive/default.nix +++ b/pkgs/tools/misc/doitlive/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "doitlive"; - version = "4.2.0"; + version = "4.2.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0yabw2gqsjdivivlwsc2q7p3qq72cccx3xzfc1a4gd8d74f84nrw"; + sha256 = "0sffr78h0hdrlpamg6v0iw2cgrkv7wy82mvrbzri0w1jqd29s526"; }; propagatedBuildInputs = with python3Packages; [ click click-completion click-didyoumean ]; diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 86287779792..d5079750859 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -109,8 +109,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; postInstall = '' - paxmark pms $out/sbin/grub-{probe,bios-setup} - # Avoid a runtime reference to gcc sed -i $out/lib/grub/*/modinfo.sh -e "/grub_target_cppflags=/ s|'.*'|' '|" ''; diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index d4d79c6e59f..94beff8dfe3 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -90,10 +90,6 @@ stdenv.mkDerivation rec { doCheck = false; enableParallelBuilding = true; - postInstall = '' - paxmark pms $out/sbin/grub-{probe,bios-setup} - ''; - meta = with stdenv.lib; { description = "GRUB 2.0 extended with TCG (TPM) support for integrity measured boot process (trusted boot)"; homepage = https://github.com/Sirrix-AG/TrustedGRUB2; diff --git a/pkgs/tools/misc/hyperledger-fabric/default.nix b/pkgs/tools/misc/hyperledger-fabric/default.nix new file mode 100644 index 00000000000..a66923b03f4 --- /dev/null +++ b/pkgs/tools/misc/hyperledger-fabric/default.nix @@ -0,0 +1,35 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "hyperledger-fabric"; + version = "1.3.0"; + + goPackagePath = "github.com/hyperledger/fabric"; + + # taken from https://github.com/hyperledger/fabric/blob/v1.3.0/Makefile#L108 + subPackages = [ + "common/tools/configtxgen" + "common/tools/configtxlator" + "common/tools/cryptogen" + "common/tools/idemixgen" + "cmd/discover" + "peer" + "orderer" + ]; + + src = fetchFromGitHub { + owner = "hyperledger"; + repo = "fabric"; + rev = "v${version}"; + sha256 = "08qrrxzgkqg9v7n3y8f2vggyqx9j65wisxi17hrabz5mzaq299xs"; + }; + + doCheck = true; + + meta = with stdenv.lib; { + description = "An implementation of blockchain technology, leveraging familiar and proven technologies"; + homepage = https://wiki.hyperledger.org/projects/Fabric; + license = licenses.asl20; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix index 72ba4863c40..04151812a07 100644 --- a/pkgs/tools/misc/qt5ct/default.nix +++ b/pkgs/tools/misc/qt5ct/default.nix @@ -4,11 +4,11 @@ let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { name = "qt5ct-${version}"; - version = "0.36"; + version = "0.37"; src = fetchurl { url = "mirror://sourceforge/qt5ct/${name}.tar.bz2"; - sha256 = "12gfhchp05xn311zsxh41k3anyrscg53r5d06dasyxyk6hpr9hwg"; + sha256 = "0n8csvbpislxjr2s1xi8r5a4q4bqn4kylcy2zws6w7z4m8pdzrny"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index 6ca284f15a6..2d0ed3ac1c5 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "you-get"; - version = "0.4.1181"; + version = "0.4.1193"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "1rcy590392aycjazi3z8gf6ll39rxkbgmkgnsbsl6yl5vb3jgk83"; + sha256 = "1q7wha0d55pw077bs92bbzx6ck3nsmhnxblz7zaqzladn23hs9zg"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/bud/default.nix b/pkgs/tools/networking/bud/default.nix index c0383b7c822..386642614bc 100644 --- a/pkgs/tools/networking/bud/default.nix +++ b/pkgs/tools/networking/bud/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { description = "A TLS terminating proxy"; license = licenses.mit; platforms = platforms.linux; + # Does not build on aarch64-linux. + badPlatforms = [ "aarch64-linux" ]; maintainers = with maintainers; [ cstrahan ]; }; } diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix index d40b85591b5..69ad0e39c94 100644 --- a/pkgs/tools/networking/gnirehtet/default.nix +++ b/pkgs/tools/networking/gnirehtet/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { patches = [ (substituteAll { src = ./paths.patch; - adb = "${androidenv.platformTools}/bin/adb"; + adb = "${androidenv.androidPkgs_9_0.platform-tools}/bin/adb"; inherit apk; }) ]; diff --git a/pkgs/tools/networking/ip2unix/default.nix b/pkgs/tools/networking/ip2unix/default.nix index 1fa1531d183..a37626c14da 100644 --- a/pkgs/tools/networking/ip2unix/default.nix +++ b/pkgs/tools/networking/ip2unix/default.nix @@ -5,21 +5,22 @@ stdenv.mkDerivation rec { name = "ip2unix-${version}"; - version = "1.2.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "nixcloud"; repo = "ip2unix"; rev = "v${version}"; - sha256 = "0blrhcmska06ydkl15jjgblygkwrimdnbaq3hhifgmffymfk2652"; + sha256 = "0xxwx1ip5jhkq93b91gcqd1i4njlvl9c4vjzijbdhjrrzz971iwk"; }; nativeBuildInputs = [ meson ninja pkgconfig asciidoc libxslt.bin docbook_xml_dtd_45 docbook_xsl libxml2.bin docbook5 python3Packages.pytest python3Packages.pytest-timeout + systemd ]; - buildInputs = [ libyamlcpp systemd ]; + buildInputs = [ libyamlcpp ]; doCheck = true; diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix index 9f1b5008507..f3fe14e4f24 100644 --- a/pkgs/tools/networking/network-manager/applet.nix +++ b/pkgs/tools/networking/network-manager/applet.nix @@ -2,7 +2,7 @@ , libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl, docbook_xml_dtd_43 , mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas , libgudev, jansson, wrapGAppsHook, gobject-introspection, python3 -, libappindicator-gtk3, withGnome ? false }: +, libappindicator-gtk3, withGnome ? false, gcr }: let pname = "network-manager-applet"; @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { polkit isocodes mobile-broadband-provider-info libgudev modemmanager jansson glib-networking libappindicator-gtk3 gnome3.defaultIconTheme - ] ++ stdenv.lib.optionals withGnome [ gnome3.gcr ]; # advanced certificate chooser + ] ++ stdenv.lib.optionals withGnome [ gcr ]; # advanced certificate chooser nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobject-introspection python3 gtk-doc docbook_xsl docbook_xml_dtd_43 libxml2 ]; diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix index fc961675c7f..b199d850f97 100644 --- a/pkgs/tools/networking/nss-pam-ldapd/default.nix +++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix @@ -1,16 +1,19 @@ -{ stdenv, fetchurl, pkgconfig, openldap, python, pam, makeWrapper }: +{ stdenv, fetchurl +, pkgconfig, makeWrapper, autoreconfHook +, openldap, python, pam +}: stdenv.mkDerivation rec { name = "nss-pam-ldapd-${version}"; version = "0.9.10"; - + src = fetchurl { url = "https://arthurdejong.org/nss-pam-ldapd/${name}.tar.gz"; sha256 = "1cqamcr6qpgwxijlr6kg7jspjamjra8w0haan0qssn0yxn95d7c0"; }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper python openldap pam ]; + + nativeBuildInputs = [ pkgconfig makeWrapper autoreconfHook ]; + buildInputs = [ openldap pam python ]; preConfigure = '' substituteInPlace Makefile.in --replace "install-data-local: " "# install-data-local: " @@ -21,6 +24,7 @@ stdenv.mkDerivation rec { "--with-nslcd-socket=/run/nslcd/socket" "--with-nslcd-pidfile=/run/nslcd/nslcd.pid" "--with-pam-seclib-dir=$(out)/lib/security" + "--enable-kerberos=no" ]; postInstall = '' diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index eac1ccb253f..c0ec4eb9b95 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -6,6 +6,7 @@ , curl , enableTNC ? false, trousers, sqlite, libxml2 , enableNetworkManager ? false, networkmanager +, libpcap }: # Note on curl support: If curl is built with gnutls as its backend, the @@ -30,7 +31,10 @@ stdenv.mkDerivation rec { [ curl gmp python iptables ldns unbound openssl pcsclite ] ++ optionals enableTNC [ trousers sqlite libxml2 ] ++ optionals stdenv.isLinux [ systemd.dev pam ] - ++ optionals enableNetworkManager [ networkmanager ]; + ++ optionals enableNetworkManager [ networkmanager ] + # ad-hoc fix for https://github.com/NixOS/nixpkgs/pull/51787 + # Remove when the above PR lands in master + ++ [ libpcap ]; patches = [ ./ext_auth-path.patch diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix index b2ef684f589..71c9263a6e2 100644 --- a/pkgs/tools/networking/tgt/default.nix +++ b/pkgs/tools/networking/tgt/default.nix @@ -15,9 +15,14 @@ in stdenv.mkDerivation rec { buildInputs = [ libxslt systemd libaio docbook_xsl ]; - DESTDIR = "$(out)"; - PREFIX = "/"; - SD_NOTIFY="1"; + makeFlags = [ + "PREFIX=${placeholder "out"}" + "SD_NOTIFY=1" + ]; + + installFlags = [ + "sysconfdir=${placeholder "out"}/etc" + ]; preConfigure = '' sed -i 's|/usr/bin/||' doc/Makefile diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 51e23e5dee1..07b75737a35 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "wireguard-tools-${version}"; - version = "0.0.20181119"; + version = "0.0.20181218"; src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "1cxws2h64xvg6idb6jb6rdvn9wgmhdvq8s2lzqjbmds7sj6n09wa"; + sha256 = "15lch0s4za7q5mr0dzdzwfsr7pr2i9gjygmpdnidwlx4z72vsajj"; }; sourceRoot = "source/src/tools"; diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index 562f92121d6..116337e067e 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -1,17 +1,19 @@ -{ stdenv, rustPlatform, fetchFromGitHub }: +{ stdenv, rustPlatform, fetchFromGitHub, Security }: rustPlatform.buildRustPackage rec { name = "cargo-release-${version}"; - version = "0.10.0"; + version = "0.10.5"; src = fetchFromGitHub { owner = "sunng87"; repo = "cargo-release"; rev = "${version}"; - sha256 = "1wp7x6nmmhi019iyvyva26k14f4fsxrh424s2pgrr09nqlrfjbz0"; + sha256 = "14l5znr1nl69v2v3mdrlas85krq9jn280ssflmd0dz7i4fxiaflc"; }; - cargoSha256 = "0qxwkp6w7ir3hs0r587k3jmh69afc7j411bsy6k8hlm8g9clgby5"; + cargoSha256 = "1f0wgggsjpmcijq07abm3yw06z2ahsdr9iwn4izljvkc1nkqk6jq"; + + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; meta = with stdenv.lib; { description = ''Cargo subcommand "release": everything about releasing a rust crate''; diff --git a/pkgs/tools/package-management/cde/default.nix b/pkgs/tools/package-management/cde/default.nix index 17150c75466..e45906688ad 100644 --- a/pkgs/tools/package-management/cde/default.nix +++ b/pkgs/tools/package-management/cde/default.nix @@ -33,5 +33,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.rlupton20 ]; platforms = platforms.linux; + # error: architecture aarch64 is not supported by strace + badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/tools/package-management/nix-review/default.nix b/pkgs/tools/package-management/nix-review/default.nix index 0409df7906c..5481182fbd1 100644 --- a/pkgs/tools/package-management/nix-review/default.nix +++ b/pkgs/tools/package-management/nix-review/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nix-review"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-review"; rev = version; - sha256 = "18z7dws3ngx0ffqqgybq65xxsiycildd101q58sj51z1k3lnrynh"; + sha256 = "0vgar8sb2471zipxa1cw0n90mrnn5da7wqdlxhamnkrylbh0mc0d"; }; makeWrapperArgs = [ diff --git a/pkgs/tools/security/b2sum/default.nix b/pkgs/tools/security/b2sum/default.nix index 1679b7fddd0..f9d2855e739 100644 --- a/pkgs/tools/security/b2sum/default.nix +++ b/pkgs/tools/security/b2sum/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { homepage = "https://blake2.net"; license = with licenses; [ asl20 cc0 openssl ]; maintainers = with maintainers; [ kirelagin ]; - platforms = platforms.all; + # "This code requires at least SSE2." + platforms = with platforms; [ "x86_64-linux" "i686-linux" ] ++ darwin; }; } diff --git a/pkgs/tools/security/diceware/default.nix b/pkgs/tools/security/diceware/default.nix index 32819b603f9..1c3d5f1d465 100644 --- a/pkgs/tools/security/diceware/default.nix +++ b/pkgs/tools/security/diceware/default.nix @@ -6,11 +6,11 @@ with pythonPackages; buildPythonApplication rec { pname = "diceware"; - version = "0.9.5"; + version = "0.9.6"; src = fetchPypi { inherit pname version; - sha256 = "22a998361fd2afbc7890062e228235b3501084de1e6a5bb61f16d2637977f50d"; + sha256 = "0klb0ysybzlh2wihvir82hgq62v0jjmlcqklwajyms7c0p529yby"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix index 0ce44b11acc..114ba57e170 100644 --- a/pkgs/tools/security/monkeysphere/default.nix +++ b/pkgs/tools/security/monkeysphere/default.nix @@ -2,13 +2,23 @@ , perl, libassuan, libgcrypt , perlPackages, lockfileProgs, gnupg, coreutils # For the tests: -, bash, openssh, which, socat, cpio, hexdump +, bash, openssh, which, socat, cpio, hexdump, openssl }: -stdenv.mkDerivation rec { +let + # A patch is needed to run the tests inside the Nix sandbox: + # /etc/passwd: "nixbld:x:1000:100:Nix build user:/build:/noshell" + # sshd: "User nixbld not allowed because shell /noshell does not exist" + opensshUnsafe = openssh.overrideAttrs (oldAttrs: { + patches = oldAttrs.patches ++ [ ./openssh-nixos-sandbox.patch ]; + }); +in stdenv.mkDerivation rec { name = "monkeysphere-${version}"; version = "0.42"; + # The patched OpenSSH binary MUST NOT be used (except in the check phase): + disallowedRequisites = [ opensshUnsafe ]; + src = fetchurl { url = "http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${version}.orig.tar.gz"; sha256 = "1haqgjxm8v2xnhc652lx79p2cqggb9gxgaf19w9l9akar2qmdjf1"; @@ -23,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perl libassuan libgcrypt ] ++ stdenv.lib.optional doCheck - ([ gnupg openssh which socat cpio hexdump lockfileProgs ] ++ + ([ gnupg opensshUnsafe which socat cpio hexdump lockfileProgs ] ++ (with perlPackages; [ CryptOpenSSLRSA CryptOpenSSLBignum ])); makeFlags = '' @@ -31,15 +41,19 @@ stdenv.mkDerivation rec { DESTDIR=$(out) ''; - # The tests "drain" entropy (GnuPG still uses /dev/random) and they don't run - # inside of the sandbox, because nixbld isn't allowed to login via SSH - # (/etc/passwd: "nixbld:x:1000:100:Nix build user:/build:/noshell", - # sshd: "User nixbld not allowed because shell /noshell does not exist"). + # The tests should be run (and succeed) when making changes to this package + # but they aren't enabled by default because they "drain" entropy (GnuPG + # still uses /dev/random). doCheck = false; - preCheck = '' + preCheck = stdenv.lib.optionalString doCheck '' patchShebangs tests/ patchShebangs src/ - sed -i "s,/usr/sbin/sshd,${openssh}/bin/sshd," tests/basic + sed -i \ + -e "s,/usr/sbin/sshd,${opensshUnsafe}/bin/sshd," \ + -e "s,/bin/true,${coreutils}/bin/true," \ + -e "s,/bin/false,${coreutils}/bin/false," \ + -e "s,openssl\ req,${openssl}/bin/openssl req," \ + tests/basic sed -i "s/<(hd/<(hexdump/" tests/keytrans ''; diff --git a/pkgs/tools/security/monkeysphere/openssh-nixos-sandbox.patch b/pkgs/tools/security/monkeysphere/openssh-nixos-sandbox.patch new file mode 100644 index 00000000000..2a9a1fc8dfa --- /dev/null +++ b/pkgs/tools/security/monkeysphere/openssh-nixos-sandbox.patch @@ -0,0 +1,17 @@ +diff --git a/auth.c b/auth.c +index d2a8cd65..811a129f 100644 +--- a/auth.c ++++ b/auth.c +@@ -580,6 +580,12 @@ getpwnamallow(const char *user) + #endif + + pw = getpwnam(user); ++ if (pw != NULL) { ++ // This is only for testing purposes, ++ // DO NOT USE THIS PATCH IN PRODUCTION! ++ char *shell = "/bin/sh"; ++ pw->pw_shell = shell; ++ } + + #if defined(_AIX) && defined(HAVE_SETAUTHDB) + aix_restoreauthdb(); diff --git a/pkgs/tools/security/neopg/default.nix b/pkgs/tools/security/neopg/default.nix index 7cb442bdf62..cf5f760cda4 100644 --- a/pkgs/tools/security/neopg/default.nix +++ b/pkgs/tools/security/neopg/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { name = "neopg-${version}"; - version = "0.0.5"; + version = "0.0.4"; src = fetchFromGitHub { owner = "das-labor"; repo = "neopg"; rev = "v${version}"; - sha256 = "1ky3pwg6w8kyaa9iksfx6rryva87mbj1h3yi2mrzp2h7jhrfffpp"; + sha256 = "0hhkl326ff6f76k8pwggpzmivbm13fz497nlyy6ybn5bmi9xfblm"; fetchSubmodules = true; }; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index ac79fc8d464..4d646cfd332 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "vault-${version}"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "0wqqf9mif6icfl888w2izvml7vqs4hkd5hrq4dhzcyig5w1bp0if"; + sha256 = "17gyl8hb72gwb3vy7nrp3cj9lrj0zgb8xja0bgwqpv511hg1qwwf"; }; nativeBuildInputs = [ go gox removeReferencesTo ]; diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 8b99f1c7ca9..3fdc8780888 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -1,41 +1,44 @@ { stdenv, fetchurl, fetchpatch, darwin -# optional: -, pkgconfig ? null # most of the extra deps need pkgconfig to be found -, curl ? null -, iptables ? null -, jdk ? null -, libatasmart ? null -, libcredis ? null -, libdbi ? null -, libgcrypt ? null -, libmemcached ? null, cyrus_sasl ? null -, libmicrohttpd ? null -, libmodbus ? null -, libnotify ? null, gdk_pixbuf ? null -, liboping ? null -, libpcap ? null -, libsigrok ? null -, libvirt ? null -, libxml2 ? null -, libtool ? null -, lm_sensors ? null -, lvm2 ? null -, mysql ? null -, postgresql ? null -, protobufc ? null -, python ? null -, rabbitmq-c ? null -, riemann_c_client ? null -, rrdtool ? null -, udev ? null -, varnish ? null -, yajl ? null -, net_snmp ? null -, hiredis ? null -, libmnl ? null -, mosquitto ? null -, rdkafka ? null -, mongoc ? null +, autoreconfHook +, pkgconfig +, curl +, iptables +, jdk +, libapparmor +, libatasmart +, libcap_ng +, libcredis +, libdbi +, libgcrypt +, libmemcached, cyrus_sasl +, libmicrohttpd +, libmodbus +, libnotify, gdk_pixbuf +, liboping +, libpcap +, libsigrok +, libvirt +, libxml2 +, libtool +, lm_sensors +, lvm2 +, mysql +, numactl +, postgresql +, protobufc +, python +, rabbitmq-c +, riemann_c_client +, rrdtool +, udev +, varnish +, yajl +, net_snmp +, hiredis +, libmnl +, mosquitto +, rdkafka +, mongoc }: stdenv.mkDerivation rec { version = "5.8.1"; @@ -46,10 +49,14 @@ stdenv.mkDerivation rec { sha256 = "1njk8hh56gb755xafsh7ahmqr9k2d4lam4ddj7s7fqz0gjigv5p7"; }; - # on 5.8.0: lvm2app.h:21:2: error: #warning "liblvm2app is deprecated, use D-Bus API instead." [-Werror=cpp] - NIX_CFLAGS_COMPILE = [ "-Wno-error=cpp" ]; + patches = [ + (fetchpatch { + url = "https://github.com/rpv-tomsk/collectd/commit/d5a3c020d33cc33ee8049f54c7b4dffcd123bf83.patch"; + sha256 = "1n65zw4d2k2bxapayaaw51ym7hy72a0cwi2abd8jgxcw3d0m5g15"; + }) + ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ curl libdbi libgcrypt libmemcached cyrus_sasl libnotify gdk_pixbuf liboping libpcap libvirt @@ -60,12 +67,18 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals stdenv.isLinux [ iptables libatasmart libcredis libmodbus libsigrok lm_sensors lvm2 rabbitmq-c udev net_snmp libmnl + # those might be no longer required when https://github.com/NixOS/nixpkgs/pull/51767 + # is merged + libapparmor numactl libcap_ng ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit darwin.apple_sdk.frameworks.ApplicationServices ]; - configureFlags = [ "--localstatedir=/var" ]; + configureFlags = [ + "--localstatedir=/var" + "--disable-werror" + ]; # do not create directories in /var during installPhase postConfigure = '' diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index dd2340668c4..8fe8ac836ba 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "facter-${version}"; - version = "3.12.1"; + version = "3.12.2"; src = fetchFromGitHub { - sha256 = "08mhsf9q9mhjfdzn8qkm12i1k5l7fnm6hqx6rqr8ni5iprl73b3d"; + sha256 = "021z0r6m5nyi37045ycjpw0lawvw70w4pjl56cj1mwz99pq1qqns"; rev = version; repo = "facter"; owner = "puppetlabs"; diff --git a/pkgs/tools/system/localtime/default.nix b/pkgs/tools/system/localtime/default.nix index 442b9a42f2b..45cf378a14e 100644 --- a/pkgs/tools/system/localtime/default.nix +++ b/pkgs/tools/system/localtime/default.nix @@ -1,6 +1,6 @@ -{ stdenv, go, systemd, polkit, fetchFromGitHub, m4, removeReferencesTo }: +{ stdenv, systemd, polkit, fetchFromGitHub, buildGoPackage, m4}: -stdenv.mkDerivation { +buildGoPackage rec { name = "localtime-2017-11-07"; src = fetchFromGitHub { @@ -9,14 +9,20 @@ stdenv.mkDerivation { rev = "2e7b4317c723406bd75b2a1d640219ab9f8090ce"; sha256 = "04fyna8p7q7skzx9fzmncd6gx7x5pwa9jh8a84hpljlvj0kldfs8"; }; + goPackagePath = "github.com/Stebalien/localtime"; - buildInputs = [ go systemd polkit m4 removeReferencesTo ]; - disallowedRequisites = [ go ]; + buildInputs = [ systemd polkit m4 ]; makeFlags = [ "PREFIX=$(out)" ]; - preFixup = '' - find $out/bin -type f -exec remove-references-to -t ${go} '{}' + + buildPhase = '' + cd go/src/${goPackagePath} + make localtimed + ''; + + installPhase = '' + mkdir -p $bin/bin + install -Dm555 localtimed $bin/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index 6cdaec10868..c7faf4d3889 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/pkgs/tools/system/osquery/default.nix @@ -4,7 +4,7 @@ , beecrypt, augeas, libxml2, sleuthkit, yara, lldpd, google-gflags , thrift, boost, rocksdb_lite, glog, gbenchmark, snappy , openssl, file, doxygen -, gtest, sqlite, fpm, zstd, rdkafka, rapidjson +, gtest, sqlite, fpm, zstd, rdkafka, rapidjson, fetchgit }: let @@ -43,6 +43,20 @@ stdenv.mkDerivation rec { gflags' = google-gflags.overrideAttrs (old: { cmakeFlags = stdenv.lib.filter (f: isNull (builtins.match ".*STATIC.*" f)) old.cmakeFlags; }); + + # use older `lvm2` source for osquery, the 2.03 sourcetree + # will break osquery due to the lacking header `lvm2app.h`. + # + # https://github.com/NixOS/nixpkgs/pull/51756#issuecomment-446035295 + lvm2' = lvm2.overrideAttrs (old: rec { + name = "lvm2-${version}"; + version = "2.02.183"; + src = fetchgit { + url = "git://sourceware.org/git/lvm2.git"; + rev = "v${version}"; + sha256 = "1ny3srcsxd6kj59zq1cman5myj8kzw010wbyc6mrpk4kp823r5nx"; + }; + }); in [ udev audit @@ -51,7 +65,7 @@ stdenv.mkDerivation rec { customMemoryManagement = false; }) - lvm2 libgcrypt libarchive libgpgerror libuuid iptables dpkg + lvm2' libgcrypt libarchive libgpgerror libuuid iptables dpkg lzma bzip2 rpm beecrypt augeas libxml2 sleuthkit yara lldpd gflags' thrift boost glog gbenchmark snappy openssl diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 1ce7e766a18..7283819f14b 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -11,11 +11,11 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "3.18.1"; + version = "3.19.1"; src = fetchurl { url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz"; - sha256 = "1y1v16vvyirh0qv4wzczqp8d3llh6dl63lz3irwib1qhh7x56dyn"; + sha256 = "0y2ixmbl4af4yf0a56pmg1c00nh0yvlfwr9ck9nhxbdysylk3yaw"; }; nativeBuildInputs = [ pkgconfig which ]; diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 0b6f36bea72..702d1b4d89f 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pcre, libiconv, perl }: -let version = "3.1"; in +let version = "3.3"; in stdenv.mkDerivation { name = "gnugrep-${version}"; src = fetchurl { url = "mirror://gnu/grep/grep-${version}.tar.xz"; - sha256 = "0zm0ywmyz9g8vn1plw14mn8kj74yipx5qsljndbyfgmvndx5qqnv"; + sha256 = "055mqp6vrd0brkygmygb2673qwz409a7kyp1mzbfy6cn94f58q5r"; }; # Perl is needed for testing diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 29a7f05af07..209cc45eee9 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -28,9 +28,19 @@ let patches = [ (fetchurl { - name = "texlive-poppler-0.64.patch"; - url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/texlive-poppler-0.64.patch?h=packages/texlive-bin&id=da56abf0f8a1e85daca0ec0f031b8fa268519e6b; - sha256 = "0443d074zl3c5raba8jyhavish706arjcd80ibb84zwnwck4ai0w"; + name = "poppler-compat-fixes-up-to-0.70.patch"; + url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/poppler-compat-fixes-up-to-0.70.patch?h=packages/texlive-bin&id=85ee0539525d8012f134b76c18dfb10d0837a7e2; + sha256 = "0a8bvyl7v6zlyyg3ycl0dmg2g2qahxlq3qmc1nv33r24anzb8xhs"; + }) + (fetchurl { + name = "luatex-poppler-0.70-const-fixes.patch"; + url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/luatex-poppler-0.70-const-fixes.patch?h=packages/texlive-bin&id=85ee0539525d8012f134b76c18dfb10d0837a7e2; + sha256 = "0yiw2x97whdi23dc10xnqpxqj3aja15alir1byp1y03j60zv5n7i"; + }) + (fetchurl { + name = "texlive-poppler-0.71.patch"; + url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/texlive-poppler-0.71.patch?h=packages/texlive-bin&id=85ee0539525d8012f134b76c18dfb10d0837a7e2; + sha256 = "164wibyf786gdcb0ij4svsmyi13wvcx0cpdr4flki0lpy3igvlnq"; }) (fetchurl { name = "synctex-missing-header.patch"; @@ -38,6 +48,17 @@ let sha256 = "1c4aq8lk8g3mlfq3mdjnxvmhss3qs7nni5rmw0k054dmj6q1xj5n"; }) ]; + + postPatch = '' + for i in texk/kpathsea/mktex*; do + sed -i '/^mydir=/d' "$i" + done + cp -pv texk/web2c/pdftexdir/pdftoepdf{-poppler0.70.0,}.cc + cp -pv texk/web2c/pdftexdir/pdftosrc{-newpoppler,}.cc + # fix build with poppler 0.71 + find texk/web2c/{lua,pdf}texdir -type f | xargs sed -e 's|gTrue|true|g' -e 's|gFalse|false|g' -e 's|GBool|bool|g' -e 's|getCString|c_str|g' -i + ''; + # remove when removing synctex-missing-header.patch preAutoreconf = "pushd texk/web2c"; postAutoreconf = "popd"; @@ -72,7 +93,7 @@ texliveYear = year; core = stdenv.mkDerivation rec { name = "texlive-bin-${version}"; - inherit (common) src patches preAutoreconf postAutoreconf; + inherit (common) src patches postPatch preAutoreconf postAutoreconf; outputs = [ "out" "doc" ]; @@ -85,14 +106,6 @@ core = stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - postPatch = '' - for i in texk/kpathsea/mktex*; do - sed -i '/^mydir=/d' "$i" - done - cp -pv texk/web2c/pdftexdir/pdftoepdf{-newpoppler.cc,.cc} - cp -pv texk/web2c/pdftexdir/pdftosrc{-newpoppler.cc,.cc} - ''; - preConfigure = '' rm -r libs/{cairo,freetype2,gd,gmp,graphite2,harfbuzz,icu,libpaper,libpng} \ libs/{mpfr,pixman,poppler,potrace,xpdf,zlib,zziplib} @@ -172,7 +185,7 @@ inherit (core-big) metafont metapost luatex xetex; core-big = stdenv.mkDerivation { #TODO: upmendex name = "texlive-core-big.bin-${version}"; - inherit (common) src patches preAutoreconf postAutoreconf; + inherit (common) src patches postPatch preAutoreconf postAutoreconf; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/video/bento4/default.nix b/pkgs/tools/video/bento4/default.nix index 687f80f1adf..75964a3c2e5 100644 --- a/pkgs/tools/video/bento4/default.nix +++ b/pkgs/tools/video/bento4/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Full-featured MP4 format and MPEG DASH library and tools"; homepage = http://bento4.com; - license = licenses.gpl3; + license = licenses.gpl2Plus; maintainers = with maintainers; [ makefu ]; broken = stdenv.isAarch64; platforms = platforms.linux; diff --git a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix new file mode 100644 index 00000000000..5096c7f9468 --- /dev/null +++ b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, fetchFromGitHub +, curl +, json_c +, pam +}: + +stdenv.mkDerivation rec { + name = "google-compute-engine-oslogin-${version}"; + version = "1.4.3"; + + src = fetchFromGitHub { + repo = "compute-image-packages"; + owner = "GoogleCloudPlatform"; + rev = "2ccfe80f162a01b5b7c3316ca37981fc8b3fc32a"; + sha256 = "036g7609ni164rmm68pzi47vrywfz2rcv0ad67gqf331pvlr92x1"; + }; + sourceRoot = "source/google_compute_engine_oslogin"; + + postPatch = '' + # change sudoers dir from /var/google-sudoers.d to /run/google-sudoers.d (managed through systemd-tmpfiles) + substituteInPlace pam_module/pam_oslogin_admin.cc --replace /var/google-sudoers.d /run/google-sudoers.d + # fix "User foo not allowed because shell /bin/bash does not exist" + substituteInPlace utils/oslogin_utils.cc --replace /bin/bash /bin/sh + ''; + + buildInputs = [ curl.dev pam ]; + + NIX_CFLAGS_COMPILE="-I${json_c.dev}/include/json-c"; + NIX_CFLAGS_LINK="-L${json_c}/lib"; + + installPhase = '' + mkdir -p $out/{bin,lib} + + install -Dm755 libnss_cache_google-compute-engine-oslogin-${version}.so $out/lib/libnss_cache_oslogin.so.2 + install -Dm755 libnss_google-compute-engine-oslogin-${version}.so $out/lib/libnss_oslogin.so.2 + + install -Dm755 pam_oslogin_admin.so pam_oslogin_login.so $out/lib + install -Dm755 google_{oslogin_nss_cache,authorized_keys} $out/bin + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/GoogleCloudPlatform/compute-image-packages; + description = "OS Login Guest Environment for Google Compute Engine"; + license = licenses.asl20; + maintainers = with maintainers; [ adisbladis flokli ]; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8360bf44706..b56640049d8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -306,6 +306,7 @@ mapAliases ({ terraform-provider-ibm = terraform-providers.ibm; # added 2018-09-28 terraform-provider-libvirt = terraform-providers.libvirt; # added 2018-09-28 terraform-provider-nixos = terraform-providers.nixos; # added 2018-09-28 + tesseract_4 = tesseract4; # added 2018-12-19 tex-gyre-bonum-math = tex-gyre-math.bonum; # added 2018-04-03 tex-gyre-pagella-math = tex-gyre-math.pagella; # added 2018-04-03 tex-gyre-schola-math = tex-gyre-math.schola; # added 2018-04-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d0e1bb5b525..e10613721e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -539,7 +539,7 @@ in ansifilter = callPackage ../tools/text/ansifilter {}; apktool = callPackage ../development/tools/apktool { - buildTools = androidenv.buildTools; + inherit (androidenv.androidPkgs_9_0) build-tools; }; appimage-run = callPackage ../tools/package-management/appimage-run {}; @@ -699,7 +699,9 @@ in deskew = callPackage ../applications/graphics/deskew { }; - diskus = callPackage ../tools/misc/diskus { }; + diskus = callPackage ../tools/misc/diskus { + inherit (darwin.apple_sdk.frameworks) Security; + }; djmount = callPackage ../tools/filesystems/djmount { }; @@ -814,26 +816,29 @@ in ssh-agents = callPackage ../tools/networking/ssh-agents { }; - titaniumenv = callPackage ../development/mobile/titaniumenv { }; + titaniumenv = callPackage ../development/mobile/titaniumenv { + pkgs_i686 = pkgsi686Linux; + }; abootimg = callPackage ../development/mobile/abootimg {}; adbfs-rootless = callPackage ../development/mobile/adbfs-rootless { - adb = androidenv.platformTools; + adb = androidenv.androidPkgs_9_0.platform-tools; }; - adb-sync = callPackage ../development/mobile/adb-sync { }; + adb-sync = callPackage ../development/mobile/adb-sync { + inherit (androidenv.androidPkgs_9_0) platform-tools; + }; androidenv = callPackage ../development/mobile/androidenv { pkgs_i686 = pkgsi686Linux; - licenseAccepted = (config.android_sdk.accept_license or false); + licenseAccepted = config.android_sdk.accept_license or false; }; - inherit (androidenv) androidndk; - - androidsdk = androidenv.androidsdk_8_0; + androidndkPkgs = androidndkPkgs_18b; + androidndkPkgs_18b = (callPackage ../development/androidndk-pkgs {})."18b"; - androidsdk_extras = res.androidenv.androidsdk_8_0_extras; + androidsdk_9_0 = androidenv.androidPkgs_9_0.androidsdk; webos = recurseIntoAttrs { cmake-modules = callPackage ../development/mobile/webos/cmake-modules.nix { }; @@ -1397,6 +1402,8 @@ in fileshelter = callPackage ../servers/web-apps/fileshelter { }; + firecracker = callPackage ../applications/virtualization/firecracker { }; + fsmon = callPackage ../tools/misc/fsmon { }; fsql = callPackage ../tools/misc/fsql { }; @@ -1683,9 +1690,7 @@ in mongodb-tools = callPackage ../tools/misc/mongodb-tools { }; - mozlz4a = callPackage ../tools/compression/mozlz4a { - pylz4 = python3Packages.lz4; - }; + mozlz4a = callPackage ../tools/compression/mozlz4a { }; msr-tools = callPackage ../os-specific/linux/msr-tools { }; @@ -1974,7 +1979,7 @@ in libpinyin = callPackage ../development/libraries/libpinyin { }; libskk = callPackage ../development/libraries/libskk { - inherit (gnome3) gnome-common libgee; + inherit (gnome3) gnome-common; }; m17n_db = callPackage ../tools/inputmethods/m17n-db { }; @@ -1992,9 +1997,7 @@ in inherit (pythonPackages) marisa; }; - libkkc = callPackage ../tools/inputmethods/libkkc { - inherit (gnome3) libgee; - }; + libkkc = callPackage ../tools/inputmethods/libkkc { }; ibus = callPackage ../tools/inputmethods/ibus { gconf = gnome2.GConf; @@ -2348,6 +2351,8 @@ in dropbear = callPackage ../tools/networking/dropbear { }; + dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { }; + dtach = callPackage ../tools/misc/dtach { }; dtc = callPackage ../development/compilers/dtc { }; @@ -2657,7 +2662,7 @@ in flamerobin = callPackage ../applications/misc/flamerobin { }; flashtool = pkgsi686Linux.callPackage ../development/mobile/flashtool { - platformTools = androidenv.platformTools; + inherit (androidenv.androidPkgs_9_0) platform-tools; }; flashrom = callPackage ../tools/misc/flashrom { }; @@ -2764,6 +2769,8 @@ in ftop = callPackage ../os-specific/linux/ftop { }; + fsarchiver = callPackage ../tools/archivers/fsarchiver { }; + fsfs = callPackage ../tools/filesystems/fsfs { }; fstl = qt5.callPackage ../applications/graphics/fstl { }; @@ -2864,8 +2871,12 @@ in getopt = callPackage ../tools/misc/getopt { }; + gexiv2 = callPackage ../development/libraries/gexiv2 { }; + gftp = callPackage ../tools/networking/gftp { }; + gfbgraph = callPackage ../development/libraries/gfbgraph { }; + ggobi = callPackage ../tools/graphics/ggobi { }; gibo = callPackage ../tools/misc/gibo { }; @@ -3018,6 +3029,8 @@ in google-compute-engine = python2.pkgs.google-compute-engine; + google-compute-engine-oslogin = callPackage ../tools/virtualization/google-compute-engine-oslogin { }; + gource = callPackage ../applications/version-management/gource { }; govc = callPackage ../tools/virtualization/govc { }; @@ -3134,7 +3147,8 @@ in gt5 = callPackage ../tools/system/gt5 { }; - gtest = callPackage ../development/libraries/gtest {}; + gtest = callPackage ../development/libraries/gtest { }; + gtest_static = callPackage ../development/libraries/gtest { static = true; }; gmock = gtest; # TODO: move to aliases.nix gbenchmark = callPackage ../development/libraries/gbenchmark {}; @@ -3515,9 +3529,7 @@ in jaaa = callPackage ../applications/audio/jaaa { }; - jackett = callPackage ../servers/jackett { - mono = mono514; - }; + jackett = callPackage ../servers/jackett { }; jade = callPackage ../tools/text/sgml/jade { }; @@ -3698,6 +3710,8 @@ in libcloudproviders = callPackage ../development/libraries/libcloudproviders { }; + libcroco = callPackage ../development/libraries/libcroco { }; + libsmi = callPackage ../development/libraries/libsmi { }; lesspipe = callPackage ../tools/misc/lesspipe { }; @@ -3913,6 +3927,8 @@ in libee = callPackage ../development/libraries/libee { }; + libepc = callPackage ../development/libraries/libepc { }; + libestr = callPackage ../development/libraries/libestr { }; libevdev = callPackage ../development/libraries/libevdev { }; @@ -3990,6 +4006,8 @@ in libreswan = callPackage ../tools/networking/libreswan { }; + librest = callPackage ../development/libraries/librest { }; + libwebsockets = callPackage ../development/libraries/libwebsockets { }; lidarr = callPackage ../servers/lidarr { }; @@ -4678,6 +4696,13 @@ in mkdir -p $out/share/man/man1 cp man/pandoc.1 $out/share/man/man1/ ''; + # Newer tasty version works + # https://github.com/jgm/pandoc/commit/3bf398b15ff28a39133a8ce27ba3d2728d255b17#diff-d37211f38c72504621b9d03eef12ffd7 + # Note the patch doesn't apply because we fetch the cabal file from elsewhere + # This should be removed with pandoc 2.6. + postPatch = '' + substituteInPlace pandoc.cabal --replace "tasty >= 0.11 && < 1.2" "tasty >= 0.11 && < 1.3" + ''; }); pamtester = callPackage ../tools/security/pamtester { }; @@ -4761,7 +4786,7 @@ in fmodex = callPackage ../games/zandronum/fmod.nix { }; - pdfmod = callPackage ../applications/misc/pdfmod { mono = mono4; }; + pdfmod = callPackage ../applications/misc/pdfmod { }; pdf-quench = callPackage ../applications/misc/pdf-quench { }; @@ -4815,7 +4840,7 @@ in }; pinentry_gnome = res.pinentry.override { - gcr = gnome3.gcr; + inherit gcr; }; pinentry_qt4 = res.pinentry.override { @@ -4984,7 +5009,7 @@ in pytrainer = callPackage ../applications/misc/pytrainer { }; - pywal = callPackage ../tools/graphics/pywal {}; + pywal = with python3Packages; toPythonApplication pywal; remarshal = callPackage ../development/tools/remarshal { }; @@ -5283,7 +5308,7 @@ in }; scrcpy = callPackage ../misc/scrcpy { - inherit (androidenv) platformTools; + inherit (androidenv.androidPkgs_9_0) platform-tools; }; screen-message = callPackage ../tools/X11/screen-message { }; @@ -5949,7 +5974,6 @@ in viking = callPackage ../applications/misc/viking { inherit (gnome2) scrollkeeper; - inherit (gnome3) gexiv2; }; vim-vint = callPackage ../development/tools/vim-vint { }; @@ -6190,9 +6214,7 @@ in urlwatch = callPackage ../tools/networking/urlwatch { }; - valum = callPackage ../development/web/valum { - inherit (gnome3) libgee; - }; + valum = callPackage ../development/web/valum { }; inherit (callPackages ../servers/varnish { }) varnish4 varnish5 varnish6; @@ -6527,9 +6549,12 @@ in adoptopenjdk-openj9-bin-11 = if stdenv.isLinux then callPackage adoptopenjdk-bin-11-packages-linux.jdk-openj9 {} else callPackage adoptopenjdk-bin-11-packages-darwin.jdk-openj9 {}; - adoptopenjdk-jre-openj9-bin-11 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {} - else callPackage adoptopenjdk-bin-11-packages-darwin.jre-openj9 {}; + + # openj9 jre builds for mac are currently missing (upstream) + #adoptopenjdk-jre-openj9-bin-11 = if stdenv.isLinux + # then callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {} + # else callPackage adoptopenjdk-bin-11-packages-darwin.jre-openj9 {}; + adoptopenjdk-jre-openj9-bin-11 = callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {}; adoptopenjdk-bin = adoptopenjdk-hotspot-bin-11; adoptopenjdk-jre-bin = adoptopenjdk-jre-hotspot-bin-11; @@ -6962,7 +6987,7 @@ in haskell = callPackage ./haskell-packages.nix { }; - haskellPackages = haskell.packages.ghc844.override { + haskellPackages = haskell.packages.ghc863.override { overrides = config.haskellPackageOverrides or haskell.packageOverrides; }; @@ -6999,9 +7024,7 @@ in fsharp = callPackage ../development/compilers/fsharp { }; - fsharp41 = callPackage ../development/compilers/fsharp41 { - mono = mono46; - }; + fsharp41 = callPackage ../development/compilers/fsharp41 { mono = mono4; }; fstar = callPackage ../development/compilers/fstar { }; @@ -7121,7 +7144,7 @@ in ((openjdk11.override { minimal = true; }) // {})); jdk = jdk8; - jre = jre8; + jre = if stdenv.isAarch32 || stdenv.isAarch64 then adoptopenjdk-jre-bin else jre8; jre_headless = jre8_headless; inherit (callPackages ../development/compilers/graalvm { }) mx jvmci8 graalvm8; @@ -7314,36 +7337,14 @@ in mlton = mlton20180207; - mono = mono5; - mono5 = mono58; - mono4 = mono48; + mono = mono5; - mono46 = lowPrio (callPackage ../development/compilers/mono/4.6.nix { + mono4 = lowPrio (callPackage ../development/compilers/mono/4.nix { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) Foundation; }); - mono48 = lowPrio (callPackage ../development/compilers/mono/4.8.nix { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) Foundation; - }); - - mono50 = lowPrio (callPackage ../development/compilers/mono/5.0.nix { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) Foundation; - }); - - mono54 = lowPrio (callPackage ../development/compilers/mono/5.4.nix { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) Foundation; - }); - - mono58 = callPackage ../development/compilers/mono/5.8.nix { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) Foundation; - }; - - mono514 = callPackage ../development/compilers/mono/5.14.nix { + mono5 = callPackage ../development/compilers/mono/5.nix { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) Foundation; }; @@ -7444,7 +7445,9 @@ in cargo-download = callPackage ../tools/package-management/cargo-download { }; cargo-edit = callPackage ../tools/package-management/cargo-edit { }; - cargo-release = callPackage ../tools/package-management/cargo-release { }; + cargo-release = callPackage ../tools/package-management/cargo-release { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-tree = callPackage ../tools/package-management/cargo-tree { }; cargo-update = callPackage ../tools/package-management/cargo-update { }; @@ -7547,7 +7550,6 @@ in urweb = callPackage ../development/compilers/urweb { }; inherit (callPackage ../development/compilers/vala { }) - vala_0_34 vala_0_36 vala_0_38 vala_0_40 @@ -7920,7 +7922,8 @@ in python = python2; python2 = python27; python3 = python37; - pypy = pypy27; + pypy = pypy2; + pypy2 = pypy27; # Python interpreter that is build with all modules, including tkinter. # These are for compatibility and should not be used inside Nixpkgs. @@ -7959,6 +7962,11 @@ in python = python27.override{x11Support=true;}; db = db.override { dbmSupport = true; }; }; + pypy3 = callPackage ../development/interpreters/python/pypy/3 { + self = pypy3; + python = python27; + db = db.override { dbmSupport = true; }; + }; # Python package sets. python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); @@ -7966,6 +7974,9 @@ in python36Packages = python36.pkgs; python37Packages = recurseIntoAttrs python37.pkgs; pypyPackages = pypy.pkgs; + pypy2Packages = pypy2.pkgs; + pypy27Packages = pypy27.pkgs; + pypy3Packages = pypy3.pkgs; update-python-libraries = callPackage ../development/interpreters/python/update-python-libraries { }; @@ -8045,7 +8056,8 @@ in }) ruby_2_3 ruby_2_4 - ruby_2_5; + ruby_2_5 + ruby_2_6; ruby = ruby_2_5; @@ -8486,6 +8498,10 @@ in libsigrokdecode = callPackage ../development/tools/libsigrokdecode { }; + # special forks used for dsview + libsigrok4dsl = callPackage ../applications/science/electronics/dsview/libsigrok4dsl.nix { }; + libsigrokdecode4dsl = callPackage ../applications/science/electronics/dsview/libsigrokdecode4dsl.nix { }; + dcadec = callPackage ../development/tools/dcadec { }; dejagnu = callPackage ../development/tools/misc/dejagnu { }; @@ -8664,6 +8680,8 @@ in gtkdialog = callPackage ../development/tools/misc/gtkdialog { }; + guff = callPackage ../tools/graphics/guff { }; + guile-lint = callPackage ../development/tools/guile/guile-lint { guile = guile_1_8; }; @@ -9311,7 +9329,7 @@ in # TODO(@Ericson2314): Build bionic libc from source bionic = assert stdenv.hostPlatform.useAndroidPrebuilt; - androidenv."androidndkPkgs_${stdenv.hostPlatform.ndkVer}".libraries; + pkgs."androidndkPkgs_${stdenv.hostPlatform.ndkVer}".libraries; bobcat = callPackage ../development/libraries/bobcat { }; @@ -9743,6 +9761,8 @@ in folly = callPackage ../development/libraries/folly { }; + folks = callPackage ../development/libraries/folks { }; + makeFontsConf = let fontconfig_ = fontconfig; in {fontconfig ? fontconfig_, fontDirectories}: callPackage ../development/libraries/fontconfig/make-fonts-conf.nix { inherit fontconfig fontDirectories; @@ -9776,6 +9796,8 @@ in gcab = callPackage ../development/libraries/gcab { }; + gcr = callPackages ../development/libraries/gcr { }; + gdome2 = callPackage ../development/libraries/gdome2 { inherit (gnome2) gtkdoc; }; @@ -9802,6 +9824,8 @@ in geoclue2 = callPackage ../development/libraries/geoclue {}; + geocode-glib = callPackage ../development/libraries/geocode-glib {}; + geoipWithDatabase = makeOverridable (callPackage ../development/libraries/geoip) { drvName = "geoip-tools"; geoipDatabase = geolite-legacy; @@ -9974,6 +9998,7 @@ in goocanvas = callPackage ../development/libraries/goocanvas { }; goocanvas2 = callPackage ../development/libraries/goocanvas/2.x.nix { }; + goocanvasmm2 = callPackage ../development/libraries/goocanvasmm { }; google-gflags = callPackage ../development/libraries/google-gflags { }; gflags = google-gflags; # TODO: move to aliases.nix @@ -10073,6 +10098,8 @@ in gsoap = callPackage ../development/libraries/gsoap { }; + gsound = callPackages ../development/libraries/gsound { }; + gss = callPackage ../development/libraries/gss { }; gtkimageview = callPackage ../development/libraries/gtkimageview { }; @@ -10127,6 +10154,8 @@ in gnome-sharp = callPackage ../development/libraries/gnome-sharp { mono = mono4; }; + gnome-menus = callPackage ../development/libraries/gnome-menus { }; + granite = callPackage ../development/libraries/granite { }; elementary-cmake-modules = callPackage ../development/libraries/elementary-cmake-modules { }; @@ -10185,6 +10214,8 @@ in gtksourceviewmm = callPackage ../development/libraries/gtksourceviewmm { }; + gtksourceviewmm4 = callPackage ../development/libraries/gtksourceviewmm/4.x.nix { }; + gtkspell2 = callPackage ../development/libraries/gtkspell { }; gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { }; @@ -10262,7 +10293,7 @@ in hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { }; - hyena = callPackage ../development/libraries/hyena { mono = mono4; }; + hyena = callPackage ../development/libraries/hyena { }; hyperscan = callPackage ../development/libraries/hyperscan { }; @@ -10282,6 +10313,11 @@ in } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' })); + icu63 = callPackage ../development/libraries/icu/63.nix ({ + nativeBuildRoot = buildPackages.icu63.override { buildRootOnly = true; }; + } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' + })); icu = icu59; @@ -10415,6 +10451,8 @@ in languageMachines = recurseIntoAttrs (import ../development/libraries/languagemachines/packages.nix { inherit callPackage; }); + lasem = callPackage ../development/libraries/lasem { }; + lasso = callPackage ../development/libraries/lasso { }; LASzip = callPackage ../development/libraries/LASzip { }; @@ -10595,8 +10633,6 @@ in libconfuse = callPackage ../development/libraries/libconfuse { }; - inherit (gnome3) libcroco; - libcangjie = callPackage ../development/libraries/libcangjie { }; libcollectdclient = callPackage ../development/libraries/libcollectdclient { }; @@ -10642,6 +10678,8 @@ in libde265 = callPackage ../development/libraries/libde265 {}; + libdeflate = callPackage ../development/libraries/libdeflate { }; + libdevil = callPackage ../development/libraries/libdevil { inherit (darwin.apple_sdk.frameworks) OpenGL; }; @@ -10746,13 +10784,21 @@ in libgda = callPackage ../development/libraries/libgda { }; - libgdata = gnome3.libgdata; + libgdamm = callPackage ../development/libraries/libgdamm { }; + + libgdata = callPackage ../development/libraries/libgdata { }; + + libgee = callPackage ../development/libraries/libgee { }; + + libgepub = callPackage ../development/libraries/libgepub { }; libgig = callPackage ../development/libraries/libgig { }; libgnome-keyring = callPackage ../development/libraries/libgnome-keyring { }; libgnome-keyring3 = gnome3.libgnome-keyring; + libgnomekbd = callPackage ../development/libraries/libgnomekbd { }; + libglvnd = callPackage ../development/libraries/libglvnd { }; libgnurl = callPackage ../development/libraries/libgnurl { }; @@ -10763,6 +10809,10 @@ in libgrss = callPackage ../development/libraries/libgrss { }; + libgweather = callPackage ../development/libraries/libgweather { }; + + libgxps = callPackage ../development/libraries/libgxps { }; + libiio = callPackage ../development/libraries/libiio { }; libseccomp = callPackage ../development/libraries/libseccomp { }; @@ -10923,6 +10973,8 @@ in libmcrypt = callPackage ../development/libraries/libmcrypt {}; + libmediaart = callPackage ../development/libraries/libmediaart { }; + libmediainfo = callPackage ../development/libraries/libmediainfo { }; libmhash = callPackage ../development/libraries/libmhash {}; @@ -11193,6 +11245,8 @@ in libpcap = callPackage ../development/libraries/libpcap { }; + libpeas = callPackage ../development/libraries/libpeas { }; + libpipeline = callPackage ../development/libraries/libpipeline { }; libpgf = callPackage ../development/libraries/libpgf { }; @@ -11470,6 +11524,8 @@ in libyubikey = callPackage ../development/libraries/libyubikey { }; + libzapojit = callPackage ../development/libraries/libzapojit { }; + libzen = callPackage ../development/libraries/libzen { }; libzip = callPackage ../development/libraries/libzip { }; @@ -12204,7 +12260,7 @@ in qmltermwidget = callPackage ../development/libraries/qmltermwidget { inherit (darwin.apple_sdk.libs) utmp; }; - qmlbox2d = libsForQt59.callPackage ../development/libraries/qmlbox2d { }; + qmlbox2d = libsForQt5.callPackage ../development/libraries/qmlbox2d { }; qscintilla = callPackage ../development/libraries/qscintilla { withQt5 = true; @@ -12734,6 +12790,8 @@ in torch-hdf5 = callPackage ../development/libraries/torch-hdf5 {}; + totem-pl-parser = callPackage ../development/libraries/totem-pl-parser { }; + tremor = callPackage ../development/libraries/tremor { }; twolame = callPackage ../development/libraries/twolame { }; @@ -12839,6 +12897,12 @@ in vsqlite = callPackage ../development/libraries/vsqlite { }; + vte = callPackage ../development/libraries/vte { }; + + vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; + + vte-ng = callPackage ../development/libraries/vte/ng.nix { }; + vtk = callPackage ../development/libraries/vtk { inherit (darwin) cf-private libobjc; inherit (darwin.apple_sdk.libs) xpc; @@ -13444,7 +13508,7 @@ in elasticmq = callPackage ../servers/elasticmq { }; eventstore = callPackage ../servers/nosql/eventstore { - mono = mono46; + mono = mono4; v8 = v8_6_x; }; @@ -13500,9 +13564,9 @@ in hiawatha = callPackage ../servers/http/hiawatha {}; - home-assistant = callPackage ../servers/home-assistant { - python = python36; - }; + home-assistant = callPackage ../servers/home-assistant { }; + + home-assistant-cli = callPackage ../servers/home-assistant/cli.nix { }; hydron = callPackage ../servers/hydron { }; @@ -14498,10 +14562,16 @@ in linux_4_19 = callPackage ../os-specific/linux/kernel/linux-4.19.nix { kernelPatches = [ kernelPatches.bridge_stp_helper - # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md - # when adding a new linux version - # kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long + kernelPatches.revert-vfs-dont-open-real + ]; + }; + + linux_4_20 = callPackage ../os-specific/linux/kernel/linux-4.20.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + kernelPatches.modinst_arg_list_too_long + kernelPatches.revert-vfs-dont-open-real ]; }; @@ -14593,6 +14663,7 @@ in nvidia_x11_legacy304 = nvidiaPackages.legacy_304; nvidia_x11_legacy340 = nvidiaPackages.legacy_340; + nvidia_x11_legacy390 = nvidiaPackages.legacy_390; nvidia_x11_beta = nvidiaPackages.beta; nvidia_x11 = nvidiaPackages.stable; @@ -14679,11 +14750,11 @@ in }); # The current default kernel / kernel modules. - linuxPackages = linuxPackages_4_14; + linuxPackages = linuxPackages_4_19; linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_4_19; + linuxPackages_latest = linuxPackages_4_20; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -14693,6 +14764,7 @@ in linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); + linuxPackages_4_20 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_20); # When adding to this list: # - Update linuxPackages_latest to the latest version # - Update the rev in ../os-specific/linux/kernel/linux-libre.nix to the latest one. @@ -15533,6 +15605,8 @@ in man-pages = callPackage ../data/documentation/man-pages { }; + matcha = callPackage ../data/themes/matcha { }; + materia-theme = callPackage ../data/themes/materia-theme { }; material-icons = callPackage ../data/fonts/material-icons { }; @@ -15626,6 +15700,8 @@ in penna = callPackage ../data/fonts/penna { }; + plano-theme = callPackage ../data/themes/plano { }; + plata-theme = callPackage ../data/themes/plata {}; poly = callPackage ../data/fonts/poly { }; @@ -15659,6 +15735,8 @@ in shaderc = callPackage ../development/compilers/shaderc { }; + shades-of-gray-theme = callPackage ../data/themes/shades-of-gray { }; + mime-types = callPackage ../data/misc/mime-types { }; shared-mime-info = callPackage ../data/misc/shared-mime-info { }; @@ -16810,9 +16888,7 @@ in inherit (gnome3) evince; evolution-data-server = gnome3.evolution-data-server; - keepass = callPackage ../applications/misc/keepass { - buildDotnetPackage = buildDotnetPackage.override { mono = mono54; }; - }; + keepass = callPackage ../applications/misc/keepass { }; keepass-keeagent = callPackage ../applications/misc/keepass-plugins/keeagent { }; @@ -17172,7 +17248,6 @@ in gimp = callPackage ../applications/graphics/gimp { gegl = gegl_0_4; lcms = lcms2; - inherit (gnome3) gexiv2; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; inherit (darwin) cf-private; }; @@ -17380,9 +17455,7 @@ in inherit (gnome2) gtk; }; - guake = callPackage ../applications/misc/guake { - inherit (gnome3) vte; - }; + guake = callPackage ../applications/misc/guake { }; guitone = callPackage ../applications/version-management/guitone { graphviz = graphviz_2_32; @@ -17468,6 +17541,8 @@ in extra-packages = [ csound ]; }; + hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { }; + jackline = callPackage ../applications/networking/instant-messengers/jackline { }; slack = callPackage ../applications/networking/instant-messengers/slack { }; @@ -17894,7 +17969,7 @@ in libvmi = callPackage ../development/libraries/libvmi { }; liferea = callPackage ../applications/networking/newsreaders/liferea { - inherit (gnome3) libpeas gsettings-desktop-schemas dconf; + inherit (gnome3) gsettings-desktop-schemas dconf; }; lightworks = callPackage ../applications/video/lightworks { @@ -17928,7 +18003,7 @@ in linuxsampler = callPackage ../applications/audio/linuxsampler { }; - llpp = ocaml-ng.ocamlPackages_4_04.callPackage ../applications/misc/llpp { }; + llpp = ocaml-ng.ocamlPackages_4_07.callPackage ../applications/misc/llpp { }; lmms = libsForQt5.callPackage ../applications/audio/lmms { lame = null; @@ -18204,6 +18279,8 @@ in mm = callPackage ../applications/networking/instant-messengers/mm { }; + mm-common = callPackage ../development/libraries/mm-common { }; + matrique = libsForQt5.callPackage ../applications/networking/instant-messengers/matrique { }; mpc-qt = libsForQt5.callPackage ../applications/video/mpc-qt { }; @@ -18365,9 +18442,7 @@ in ruby = ruby_2_3.override { cursesSupport = true; }; }; - synapse = callPackage ../applications/misc/synapse { - inherit (gnome3) libgee; - }; + synapse = callPackage ../applications/misc/synapse { }; synapse-bt = callPackage ../applications/networking/p2p/synapse-bt { inherit (darwin.apple_sdk.frameworks) Security; @@ -18614,7 +18689,6 @@ in pdfgrep = callPackage ../tools/typesetting/pdfgrep { }; pdfpc = callPackage ../applications/misc/pdfpc { - inherit (gnome3) libgee; inherit (gst_all_1) gstreamer gst-plugins-base; }; @@ -19054,9 +19128,7 @@ in udiskie = python3Packages.callPackage ../applications/misc/udiskie { }; - sakura = callPackage ../applications/misc/sakura { - vte = gnome3.vte; - }; + sakura = callPackage ../applications/misc/sakura { }; sayonara = callPackage ../applications/audio/sayonara { }; @@ -19141,7 +19213,6 @@ in ssvnc = callPackage ../applications/networking/remote/ssvnc { }; stupidterm = callPackage ../applications/misc/stupidterm { - vte = gnome3.vte; gtk = gtk3; }; @@ -19200,7 +19271,6 @@ in lightdm_qt = lightdm.override { withQt5 = true; }; lightdm-enso-os-greeter = callPackage ../applications/display-managers/lightdm-enso-os-greeter { - inherit (gnome3) libgee; inherit (xorg) libX11 libXdmcp libpthreadstubs; }; @@ -19445,25 +19515,23 @@ in terminus = callPackage ../applications/misc/terminus { }; - lxterminal = callPackage ../applications/misc/lxterminal { - vte = gnome3.vte; - }; + lxterminal = callPackage ../applications/misc/lxterminal { }; aminal = callPackage ../applications/misc/aminal { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel; inherit (darwin) cf-private; }; - termite-unwrapped = callPackage ../applications/misc/termite { - vte = gnome3.vte-ng; - }; + termite-unwrapped = callPackage ../applications/misc/termite { }; termite = callPackage ../applications/misc/termite/wrapper.nix { termite = termite-unwrapped; }; termtosvg = callPackage ../tools/misc/termtosvg { }; - tesseract = callPackage ../applications/graphics/tesseract { }; - tesseract_4 = lowPrio (callPackage ../applications/graphics/tesseract/4.x.nix { }); + inherit (callPackage ../applications/graphics/tesseract {}) + tesseract3 + tesseract4; + tesseract = tesseract3; tetraproc = callPackage ../applications/audio/tetraproc { }; @@ -19490,7 +19558,6 @@ in tig = gitAndTools.tig; tilda = callPackage ../applications/misc/tilda { - vte = gnome3.vte; gtk = gtk3; }; @@ -19698,7 +19765,6 @@ in virt-what = callPackage ../applications/virtualization/virt-what { }; virtmanager = callPackage ../applications/virtualization/virt-manager { - vte = gnome3.vte; dconf = gnome3.dconf; system-libvirt = libvirt; }; @@ -20200,13 +20266,12 @@ in xterm = callPackage ../applications/misc/xterm { }; mlterm = callPackage ../applications/misc/mlterm { - vte = gnome3.vte; libssh2 = null; openssl = null; }; roxterm = callPackage ../applications/misc/roxterm { - inherit (gnome3) gsettings-desktop-schemas vte; + inherit (gnome3) gsettings-desktop-schemas; }; termonad-with-packages = callPackage ../applications/misc/termonad { @@ -20382,7 +20447,9 @@ in btanks = callPackage ../games/btanks { }; - bzflag = callPackage ../games/bzflag { }; + bzflag = callPackage ../games/bzflag { + inherit (darwin.apple_sdk.frameworks) Carbon CoreServices; + }; cataclysm-dda = callPackage ../games/cataclysm-dda { inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -20552,7 +20619,7 @@ in gcs = callPackage ../games/gcs { }; - gcompris = libsForQt59.callPackage ../games/gcompris { }; + gcompris = libsForQt5.callPackage ../games/gcompris { }; gemrb = callPackage ../games/gemrb { }; @@ -20715,7 +20782,9 @@ in openrw = callPackage ../games/openrw { }; - openspades = callPackage ../games/openspades { }; + openspades = callPackage ../games/openspades { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; openttd = callPackage ../games/openttd { zlib = zlib.override { @@ -21657,6 +21726,8 @@ in ginac = callPackage ../applications/science/math/ginac { }; + glom = callPackage ../applications/misc/glom { }; + glucose = callPackage ../applications/science/logic/glucose { }; glucose-syrup = callPackage ../applications/science/logic/glucose/syrup.nix { }; @@ -22306,8 +22377,6 @@ in martyr = callPackage ../development/libraries/martyr { }; - matcha = callPackage ../misc/themes/matcha { }; - mess = callPackage ../misc/emulators/mess { inherit (pkgs.gnome2) GConf; }; @@ -22587,8 +22656,6 @@ in pjsip = callPackage ../applications/networking/pjsip { }; - plano-theme = callPackage ../misc/themes/plano { }; - ppsspp = libsForQt5.callPackage ../misc/emulators/ppsspp { }; pt = callPackage ../applications/misc/pt { }; @@ -22710,8 +22777,6 @@ in libsemanage = libsemanage.override { python = python3; }; }; - shades-of-gray-theme = callPackage ../misc/themes/shades-of-gray { }; - sierra-gtk-theme = callPackage ../misc/themes/sierra { }; slock = callPackage ../misc/screensavers/slock { @@ -22722,6 +22787,8 @@ in snapraid = callPackage ../tools/filesystems/snapraid { }; + snscrape = with python3Packages; toPythonApplication snscrape; + soundOfSorting = callPackage ../misc/sound-of-sorting { }; sourceAndTags = callPackage ../misc/source-and-tags { @@ -23036,7 +23103,7 @@ in iterm2 = callPackage ../applications/misc/iterm2 {}; sequeler = callPackage ../applications/misc/sequeler { - inherit (gnome3) gtksourceview libgda libgee; + inherit (gnome3) gtksourceview libgda; }; sequelpro = callPackage ../applications/misc/sequelpro {}; @@ -23072,6 +23139,10 @@ in ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; }; + vdr = callPackage ../applications/video/vdr { }; + vdrPlugins = vdr.plugins // (recurseIntoAttrs (callPackages ../applications/video/vdr/plugins.nix { })); + wrapVdr = callPackage ../applications/video/vdr/wrapper.nix {}; + chrome-gnome-shell = callPackage ../desktops/gnome-3/extensions/chrome-gnome-shell {}; chrome-token-signing = libsForQt5.callPackage ../tools/security/chrome-token-signing {}; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 9c3e81e3177..c670db81772 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -202,6 +202,8 @@ let then callPackage ../development/ocaml-modules/csv { } else callPackage ../development/ocaml-modules/csv/1.5.nix { }; + csv-lwt = callPackage ../development/ocaml-modules/csv/lwt.nix { }; + curses = callPackage ../development/ocaml-modules/curses { }; custom_printf = callPackage ../development/ocaml-modules/custom_printf { }; @@ -578,6 +580,8 @@ let piqi = callPackage ../development/ocaml-modules/piqi { }; piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { }; + ppxfind = callPackage ../development/ocaml-modules/ppxfind { }; + ppxlib = callPackage ../development/ocaml-modules/ppxlib { }; psmt2-frontend = callPackage ../development/ocaml-modules/psmt2-frontend { }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 2fddf4787b2..cb425b14e1d 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -357,11 +357,11 @@ let phpcs = pkgs.stdenv.mkDerivation rec { name = "phpcs-${version}"; - version = "3.3.2"; + version = "3.4.0"; src = pkgs.fetchurl { url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar"; - sha256 = "0np3bsj32mwyrcccw5pgypz7wchd5l89bq951w9a7bxh80gjhak9"; + sha256 = "1d6zf0ab76r5ibb80q46silhy87hrwh50gfvhd0i25wzad7r09mw"; }; phases = [ "installPhase" ]; @@ -384,11 +384,11 @@ let phpcbf = pkgs.stdenv.mkDerivation rec { name = "phpcbf-${version}"; - version = "3.3.2"; + version = "3.4.0"; src = pkgs.fetchurl { url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar"; - sha256 = "1qxcd7lkqrfjibkrqq1f5szrcjmd6682mwaxha7v93pj9f92wgn4"; + sha256 = "0iscs4hg1msk8198pmkdmbxn1g53gbq3i5qgszs0bi6hz3ng9ag9"; }; phases = [ "installPhase" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3096b8d5844..05973c7aacd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26,7 +26,7 @@ let isPy35 = python.pythonVersion == "3.5"; isPy36 = python.pythonVersion == "3.6"; isPy37 = python.pythonVersion == "3.7"; - isPyPy = python.executable == "pypy"; + isPyPy = strings.substring 0 4 python.executable == "pypy"; isPy3k = strings.substring 0 1 python.pythonVersion == "3"; callPackage = pkgs.newScope self; @@ -358,6 +358,8 @@ in { filterpy = callPackage ../development/python-modules/filterpy { }; + fints = callPackage ../development/python-modules/fints { }; + fire = callPackage ../development/python-modules/fire { }; fdint = callPackage ../development/python-modules/fdint { }; @@ -646,6 +648,7 @@ in { python-hosts = callPackage ../development/python-modules/python-hosts { }; python-lz4 = callPackage ../development/python-modules/python-lz4 { }; + lz4 = self.python-lz4; # alias 2018-12-05 python-ldap-test = callPackage ../development/python-modules/python-ldap-test { }; @@ -702,6 +705,8 @@ in { selectors2 = callPackage ../development/python-modules/selectors2 { }; + sepaxml = callPackage ../development/python-modules/sepaxml { }; + serversyncstorage = callPackage ../development/python-modules/serversyncstorage {}; shellingham = callPackage ../development/python-modules/shellingham {}; @@ -1871,6 +1876,8 @@ in { jupyterlab = callPackage ../development/python-modules/jupyterlab {}; + jupytext = callPackage ../development/python-modules/jupytext { }; + PyLTI = callPackage ../development/python-modules/pylti { }; lmdb = callPackage ../development/python-modules/lmdb { }; @@ -2209,7 +2216,7 @@ in { django_tagging = callPackage ../development/python-modules/django_tagging { }; django_tagging_0_4_3 = if - self.django.version != "1.8.18" + self.django.version != "1.8.19" then throw "django_tagging_0_4_3 should be build with django_1_8" else (callPackage ../development/python-modules/django_tagging {}).overrideAttrs (attrs: rec { pname = "django-tagging"; @@ -2817,6 +2824,8 @@ in { fs-s3fs = callPackage ../development/python-modules/fs-s3fs { }; + libarcus = callPackage ../development/python-modules/libarcus { }; + libcloud = callPackage ../development/python-modules/libcloud { }; libgpuarray = callPackage ../development/python-modules/libgpuarray { @@ -2835,6 +2844,8 @@ in { inherit (pkgs) libsodium; }; + libsavitar = callPackage ../development/python-modules/libsavitar { }; + libplist = disabledIf isPy3k (toPythonModule (pkgs.libplist.override{python2Packages=self; })).py; @@ -3262,8 +3273,6 @@ in { ldappool = callPackage ../development/python-modules/ldappool { }; - lz4 = callPackage ../development/python-modules/lz4 { }; - retrying = callPackage ../development/python-modules/retrying { }; fasteners = callPackage ../development/python-modules/fasteners { }; @@ -3719,7 +3728,7 @@ in { pythonnet = callPackage ../development/python-modules/pythonnet { # `mono >= 4.6` required to prevent crashes encountered with earlier versions. - mono = pkgs.mono46; + mono = pkgs.mono4; }; pytz = callPackage ../development/python-modules/pytz { }; @@ -3728,6 +3737,8 @@ in { pyutil = callPackage ../development/python-modules/pyutil { }; + pywal = callPackage ../development/python-modules/pywal { }; + pywebkitgtk = callPackage ../development/python-modules/pywebkitgtk { }; pywinrm = callPackage ../development/python-modules/pywinrm { }; @@ -3932,6 +3943,8 @@ in { snowballstemmer = callPackage ../development/python-modules/snowballstemmer { }; + snscrape = callPackage ../development/python-modules/snscrape { }; + snug = callPackage ../development/python-modules/snug { }; snuggs = callPackage ../development/python-modules/snuggs { }; @@ -4251,7 +4264,9 @@ in { blessings = callPackage ../development/python-modules/blessings { }; - secretstorage = callPackage ../development/python-modules/secretstorage { }; + secretstorage = if isPy3k + then callPackage ../development/python-modules/secretstorage { } + else callPackage ../development/python-modules/secretstorage/2.nix { }; semantic = callPackage ../development/python-modules/semantic { }; @@ -4371,8 +4386,6 @@ in { unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { }; - uritemplate_py = callPackage ../development/python-modules/uritemplate_py { }; - traceback2 = callPackage ../development/python-modules/traceback2 { }; linecache2 = callPackage ../development/python-modules/linecache2 { }; @@ -4484,8 +4497,6 @@ in { inherit (pkgs) libasyncns pkgconfig; }; - libarcus = callPackage ../development/python-modules/libarcus { }; - pybrowserid = callPackage ../development/python-modules/pybrowserid { }; pyzmq = callPackage ../development/python-modules/pyzmq { }; |