git.iko.soy/typeable/nixpkgs
on master help sign in
Merge master into staging-next
commita7844157d10ddb93df564bdebe48d9969b41078e authorFrederik Rietdijk <fridh@fridh.nl> dateTue 25 Dec 2018, 10:01 (8 years ago) parent911d185fcfdd1d
443 files changed+12019−12519
.github/CODEOWNERS+7−2 .gitignore+2−1 doc/languages-frameworks/android.section.md+240 doc/languages-frameworks/index.xml+3 doc/languages-frameworks/ios.section.md+219 doc/languages-frameworks/python.section.md+16−5 doc/languages-frameworks/titanium.section.md+115 lib/licenses.nix+32−23 lib/systems/examples.nix+3−3 maintainers/maintainer-list.nix+10 maintainers/scripts/update-python-libraries+3−1 nixos/doc/manual/release-notes/rl-1903.xml+25 nixos/lib/testing.nix+1−1 nixos/lib/utils.nix+2−3 nixos/modules/config/nsswitch.nix+5−3 nixos/modules/module-list.nix+2 nixos/modules/programs/adb.nix+1−2 nixos/modules/security/google_oslogin.nix+68 nixos/modules/security/pam.nix+31−1 nixos/modules/services/databases/aerospike.nix+1 nixos/modules/services/databases/clickhouse.nix+5 nixos/modules/services/hardware/vdr.nix+71 nixos/modules/services/network-filesystems/ipfs.nix+1−1 nixos/modules/services/networking/shairport-sync.nix+1−1 nixos/modules/services/x11/display-managers/default.nix+5−2 nixos/modules/virtualisation/google-compute-config.nix+1−27 nixos/release-combined.nix+27−22 nixos/release.nix+2−2 nixos/tests/all-tests.nix+2 nixos/tests/clickhouse.nix+25 nixos/tests/google-oslogin/default.nix+52 nixos/tests/google-oslogin/server.nix+29 nixos/tests/google-oslogin/server.py+96 nixos/tests/home-assistant.nix+7−1 pkgs/applications/audio/ams-lv2/default.nix+2 pkgs/applications/audio/artyFX/default.nix+2 pkgs/applications/audio/lmms/default.nix+4−4 pkgs/applications/audio/lollypop/default.nix+2−2 pkgs/applications/audio/qjackctl/default.nix+2−2 pkgs/applications/audio/qmmp/default.nix+2−2 pkgs/applications/audio/rosegarden/default.nix+2−2 pkgs/applications/audio/whipper/default.nix+2−2 pkgs/applications/editors/android-studio/default.nix+6−6 pkgs/applications/editors/emacs-modes/elpa-generated.nix+137−57 pkgs/applications/editors/emacs-modes/org-generated.nix+6−6 pkgs/applications/editors/ghostwriter/default.nix+2−2 pkgs/applications/editors/gnome-builder/default.nix+2−2 pkgs/applications/editors/manuskript/default.nix+2−2 pkgs/applications/graphics/rawtherapee/default.nix+2−2 pkgs/applications/graphics/tesseract/4.x.nix−61 pkgs/applications/graphics/tesseract/default.nix+13−62 pkgs/applications/graphics/tesseract/fetch-language-hashes+35 pkgs/applications/graphics/tesseract/languages.nix+289 pkgs/applications/graphics/tesseract/tesseract3.nix+29 pkgs/applications/graphics/tesseract/tesseract4.nix+27 pkgs/applications/graphics/tesseract/wrapper.nix+58 pkgs/applications/misc/albert/default.nix+6−8 pkgs/applications/misc/flrig/default.nix+2−2 pkgs/applications/misc/glom/default.nix+132 pkgs/applications/misc/k2pdfopt/default.nix+15−13 pkgs/applications/misc/llpp/default.nix+18−15 pkgs/applications/misc/llpp/fix-build-bash.patch+88 pkgs/applications/misc/pgmanage/default.nix+2−2 pkgs/applications/misc/playonlinux/default.nix+2−2 pkgs/applications/misc/qmapshack/default.nix+2−2 pkgs/applications/misc/rtl_433/default.nix+3−3 pkgs/applications/misc/soapysdr/default.nix+3−3 pkgs/applications/networking/browsers/chromium/upstream-info.nix+9−9 pkgs/applications/networking/browsers/midori/default.nix+17−40 pkgs/applications/networking/browsers/qutebrowser/default.nix+7−13 pkgs/applications/networking/browsers/surf/default.nix+1−1 pkgs/applications/networking/cluster/cni/default.nix+6−12 pkgs/applications/networking/cluster/luigi/default.nix+3 pkgs/applications/networking/cluster/pig/default.nix+4−4 pkgs/applications/networking/cluster/terragrunt/default.nix+2−2 pkgs/applications/networking/flexget/default.nix+14−29 pkgs/applications/networking/gns3/server.nix+10−11 pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix+4−3 pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix+7−4 pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix+4−5 pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix+5−10 pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix+2−6 pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix+2−3 pkgs/applications/networking/instant-messengers/riot/riot-web.nix+2−2 pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix+2−2 pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix+3−1 pkgs/applications/networking/instant-messengers/wavebox/default.nix+2−2 pkgs/applications/networking/syncplay/default.nix+3−3 pkgs/applications/networking/syncthing/default.nix+2−2 pkgs/applications/office/gnumeric/default.nix+13−17 pkgs/applications/office/zim/default.nix+3−2 pkgs/applications/science/astronomy/stellarium/default.nix+2−2 pkgs/applications/science/biology/picard-tools/default.nix+2−2 pkgs/applications/science/electronics/dsview/default.nix+47 pkgs/applications/science/electronics/dsview/install.patch+15 pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix+28 pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix+27 pkgs/applications/science/electronics/verilator/default.nix+2−2 pkgs/applications/science/logic/aspino/default.nix+2 pkgs/applications/science/logic/avy/default.nix+3 pkgs/applications/science/logic/glucose/default.nix+2 pkgs/applications/science/math/R/default.nix+2−2 pkgs/applications/version-management/git-and-tools/git-secret/default.nix+2−2 pkgs/applications/version-management/git-repo/default.nix+2−2 pkgs/applications/version-management/gitea/default.nix+8−3 pkgs/applications/version-management/mercurial/default.nix+3−2 pkgs/applications/version-management/src/default.nix+2−2 pkgs/applications/video/vdr/default.nix+78 pkgs/applications/video/vdr/plugins.nix+318 pkgs/applications/video/vdr/wrapper.nix+21 pkgs/applications/virtualization/firecracker/default.nix+35 pkgs/applications/virtualization/runc/default.nix+10−20 pkgs/applications/window-managers/dwm/dwm-status.nix+4−5 pkgs/applications/window-managers/yabar/unstable.nix+8−1 pkgs/data/fonts/source-sans-pro/default.nix+7−5 pkgs/misc/themes/plano/default.nix → pkgs/data/themes/plano/default.nix+2−2 pkgs/misc/themes/shades-of-gray/default.nix → pkgs/data/themes/shades-of-gray/default.nix+3−3 pkgs/desktops/gnome-3/core/evince/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-software/default.nix+2−2 pkgs/desktops/gnome-3/default.nix−2 pkgs/desktops/gnome-3/misc/california/default.nix−47 pkgs/development/mobile/androidenv/androidndk-pkgs.nix → pkgs/development/androidndk-pkgs/androidndk-pkgs.nix+16−10 pkgs/development/androidndk-pkgs/default.nix+34 pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix+2−1 pkgs/development/compilers/chez/default.nix+1 pkgs/development/compilers/llvm/4/libc++/default.nix+5 pkgs/development/compilers/llvm/4/libc++/libc++.a+1 pkgs/development/compilers/llvm/4/libc++abi.nix+1 pkgs/development/compilers/llvm/5/libc++/default.nix+5 pkgs/development/compilers/llvm/5/libc++/libc++.a+1 pkgs/development/compilers/llvm/5/libc++abi.nix+1 pkgs/development/compilers/llvm/6/libc++/default.nix+5 pkgs/development/compilers/llvm/6/libc++/libc++.a+1 pkgs/development/compilers/llvm/6/libc++abi.nix+1 pkgs/development/compilers/llvm/7/libc++/default.nix+5 pkgs/development/compilers/llvm/7/libc++/libc++.a+1 pkgs/development/compilers/llvm/7/libc++abi.nix+1 pkgs/development/compilers/mono/4.6.nix−9 pkgs/development/compilers/mono/4.8.nix → pkgs/development/compilers/mono/4.nix+1−1 pkgs/development/compilers/mono/5.0.nix−8 pkgs/development/compilers/mono/5.14.nix−8 pkgs/development/compilers/mono/5.4.nix−8 pkgs/development/compilers/mono/5.8.nix−8 pkgs/development/compilers/mono/5.nix+8 pkgs/development/compilers/mono/build-fix-llvm.patch−12 pkgs/development/compilers/mono/generic-cmake.nix−90 pkgs/development/compilers/mono/generic.nix+17−25 pkgs/development/compilers/mono/llvm.nix+12−18 pkgs/development/compilers/mono/pkgconfig-before-gac-5x.patch−65 pkgs/development/compilers/mruby/default.nix+2−2 pkgs/development/compilers/solc/default.nix+4−6 pkgs/development/compilers/solc/patches/shared-libs-install.patch+3−16 pkgs/development/compilers/vala/default.nix−6 pkgs/development/coq-modules/Cheerios/default.nix+7−27 pkgs/development/coq-modules/InfSeqExt/default.nix+7−34 pkgs/development/coq-modules/StructTact/default.nix+6−33 pkgs/development/coq-modules/Verdi/default.nix+8−28 pkgs/development/coq-modules/coqprime/default.nix+7−4 pkgs/development/haskell-modules/configuration-common.nix−3 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix+1−1 pkgs/development/haskell-modules/configuration-hackage2nix.yaml+19−17 pkgs/development/haskell-modules/hackage-packages.nix+1218−587 pkgs/development/idris-modules/tparsec.nix+3−3 pkgs/development/interpreters/angelscript/2.22.nix+1 pkgs/development/interpreters/clojure/default.nix+4−4 pkgs/development/interpreters/python/mk-python-derivation.nix+2−7 pkgs/development/interpreters/python/pypy/3/default.nix+138 pkgs/development/interpreters/python/pypy/3/tk_tcl_paths.patch+17 pkgs/development/libraries/aften/default.nix+1−1 pkgs/development/libraries/allegro/5.nix+10−2 pkgs/development/libraries/avahi/default.nix+4−1 pkgs/development/libraries/beignet/default.nix+2 pkgs/development/libraries/boost/generic.nix+2−1 pkgs/development/libraries/bootil/default.nix+2 pkgs/development/libraries/dbus-sharp/default.nix+2−2 pkgs/development/libraries/fdk-aac/default.nix+2−2 pkgs/development/libraries/freetds/default.nix+2−2 pkgs/development/libraries/goffice/default.nix+15−6 pkgs/development/libraries/goocanvasmm/default.nix+31 pkgs/development/libraries/gsl/gsl-1_16.nix+2 pkgs/development/libraries/gtksourceviewmm/4.x.nix+30 pkgs/development/libraries/icu/63.nix+14 pkgs/development/libraries/icu/base.nix+2−2 pkgs/development/libraries/lasem/default.nix+38 pkgs/development/libraries/libcollectdclient/default.nix+1−5 pkgs/development/libraries/libepc/default.nix+47 pkgs/development/libraries/libgda/default.nix+2−2 pkgs/development/libraries/libgdamm/default.nix+39 pkgs/development/libraries/libgdiplus/default.nix+29−16 pkgs/development/libraries/libgdiplus/giflib.patch−143 pkgs/development/libraries/libgrss/default.nix+1 pkgs/development/libraries/librealsense/default.nix+2−2 pkgs/development/libraries/librime/default.nix+2−2 pkgs/development/libraries/mailcore2/default.nix+2−2 pkgs/development/libraries/mm-common/default.nix+33 pkgs/development/libraries/mono-addins/default.nix+2−2 pkgs/development/libraries/mpich/default.nix+8−7 pkgs/development/libraries/nlohmann_json/default.nix+2−2 pkgs/development/libraries/openbabel/default.nix+9−1 pkgs/development/libraries/opencv/3.x.nix+3−10 pkgs/development/libraries/opencv/4.x.nix+4−19 pkgs/development/libraries/qmlbox2d/default.nix+3−3 pkgs/development/libraries/science/math/mkl/default.nix+14−20 pkgs/development/libraries/science/math/openblas/default.nix+9−2 pkgs/development/libraries/wlroots/default.nix+1−18 pkgs/development/libraries/wt/default.nix+2−2 pkgs/development/mobile/adb-sync/default.nix+3−3 pkgs/development/mobile/adbfs-rootless/default.nix+1−1 pkgs/development/mobile/androidenv/addon.xml−1614 pkgs/development/mobile/androidenv/addons.nix−321 pkgs/development/mobile/androidenv/androidndk.nix−120 pkgs/development/mobile/androidenv/androidndk_r8e.nix−88 pkgs/development/mobile/androidenv/androidsdk.nix−296 pkgs/development/mobile/androidenv/build-app.nix+22−25 pkgs/development/mobile/androidenv/build-gradle-app.nix−108 pkgs/development/mobile/androidenv/build-tools-srcs-linux.nix−376 pkgs/development/mobile/androidenv/build-tools-srcs-macosx.nix−376 pkgs/development/mobile/androidenv/build-tools.nix+19−53 pkgs/development/mobile/androidenv/cmake.nix+10 pkgs/development/mobile/androidenv/compose-android-packages.nix+262 pkgs/development/mobile/androidenv/convertaddons.xsl+128 pkgs/development/mobile/androidenv/convertpackages.xsl+116 pkgs/development/mobile/androidenv/convertsystemimages.xsl+47 pkgs/development/mobile/androidenv/default.nix+12−366 pkgs/development/mobile/androidenv/deploy-androidpackage.nix+44 pkgs/development/mobile/androidenv/emulate-app.nix+52−41 pkgs/development/mobile/androidenv/emulator.nix+20 pkgs/development/mobile/androidenv/fetch.sh−14 pkgs/development/mobile/androidenv/generate-addons.sh−3 pkgs/development/mobile/androidenv/generate-addons.xsl−82 pkgs/development/mobile/androidenv/generate-platforms.sh−4 pkgs/development/mobile/androidenv/generate-platforms.xsl−54 pkgs/development/mobile/androidenv/generate-sources.sh−3 pkgs/development/mobile/androidenv/generate-sources.xsl−52 pkgs/development/mobile/androidenv/generate-sysimages.sh−26 pkgs/development/mobile/androidenv/generate-sysimages.xsl−20 pkgs/development/mobile/androidenv/generate-tools.sh−4 pkgs/development/mobile/androidenv/generate-tools.xsl−43 pkgs/development/mobile/androidenv/generate.sh+16 pkgs/development/mobile/androidenv/generated/addons.nix+1145 pkgs/development/mobile/androidenv/generated/packages.nix+1910 pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix+157 pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix+67 pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix+97 pkgs/development/mobile/androidenv/generated/system-images-android.nix+547 pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix+502 pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix+97 pkgs/development/mobile/androidenv/lldb.nix+12 pkgs/development/mobile/androidenv/make-standalone-toolchain_r10e.patch−13 pkgs/development/mobile/androidenv/make-standalone-toolchain_r8e.patch−13 pkgs/development/mobile/androidenv/make_standalone_toolchain.py_16b.patch−119 pkgs/development/mobile/androidenv/make_standalone_toolchain.py_17c.patch−119 pkgs/development/mobile/androidenv/ndk-bundle/default.nix+51 pkgs/development/mobile/androidenv/ndk-bundle/make_standalone_toolchain.py_18.patch+44 pkgs/development/mobile/androidenv/platform-tools.nix+12−44 pkgs/development/mobile/androidenv/platforms-linux.nix−343 pkgs/development/mobile/androidenv/platforms-macosx.nix−343 pkgs/development/mobile/androidenv/querypackages.sh+27 pkgs/development/mobile/androidenv/repository-11.xml−2834 pkgs/development/mobile/androidenv/sources.nix−184 pkgs/development/mobile/androidenv/support-repository.nix−18 pkgs/development/mobile/androidenv/support.nix−18 pkgs/development/mobile/androidenv/sys-img.xml−1026 pkgs/development/mobile/androidenv/sysimages.nix−305 pkgs/development/mobile/androidenv/tools.nix+26 pkgs/development/mobile/androidenv/tools/25.nix+62 pkgs/development/mobile/androidenv/tools/26.nix+40 pkgs/development/mobile/flashtool/default.nix+3−3 pkgs/development/mobile/titaniumenv/build-app.nix+146−165 pkgs/development/mobile/titaniumenv/default.nix+8−16 pkgs/development/mobile/titaniumenv/examples/default.nix−91 pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix−10 pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix−44 pkgs/development/mobile/titaniumenv/examples/kitchensink/generatekeystore.sh−10 pkgs/development/mobile/titaniumenv/examples/kitchensink/keystore pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix−7 pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix−43 pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix+6−6 pkgs/development/mobile/xcodeenv/build-app.nix+52−49 pkgs/development/mobile/xcodeenv/xcodewrapper.nix → pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix+5−1 pkgs/development/mobile/xcodeenv/default.nix+5−5 pkgs/development/mobile/xcodeenv/install.html.template+3−3 pkgs/development/mobile/xcodeenv/simulate-app.nix+35−26 pkgs/development/ocaml-modules/cmdliner/default.nix+2−2 pkgs/development/ocaml-modules/csv/lwt.nix+14 pkgs/development/ocaml-modules/curses/default.nix+3−3 pkgs/development/pharo/vm/build-vm.nix+47−4 pkgs/development/pharo/vm/vms.nix+20−1 pkgs/development/python-modules/absl-py/default.nix+7−1 pkgs/development/python-modules/aioconsole/default.nix+2−2 pkgs/development/python-modules/azure-mgmt-compute/default.nix+2−2 pkgs/development/python-modules/azure-mgmt-network/default.nix+2−2 pkgs/development/python-modules/azure-mgmt-nspkg/default.nix+2−2 pkgs/development/python-modules/azure-mgmt-resource/default.nix+2−2 pkgs/development/python-modules/azure-mgmt-storage/default.nix+2−2 pkgs/development/python-modules/behave/default.nix+9−1 pkgs/development/python-modules/cherrypy/default.nix+3−1 pkgs/development/python-modules/cli-helpers/default.nix+4−1 pkgs/development/python-modules/cypari2/default.nix+2−2 pkgs/development/python-modules/django/1_11.nix+5−4 pkgs/development/python-modules/django/1_8.nix+2−3 pkgs/development/python-modules/django/2_1.nix+2−2 pkgs/development/python-modules/dominate/default.nix+2−2 pkgs/development/python-modules/dropbox/default.nix+2−2 pkgs/development/python-modules/elpy/default.nix+2−2 pkgs/development/python-modules/facebook-sdk/default.nix+2−2 pkgs/development/python-modules/fints/default.nix+25 pkgs/development/python-modules/flask-migrate/default.nix+2−2 pkgs/development/python-modules/flit/default.nix+3−2 pkgs/development/python-modules/folium/default.nix+2−2 pkgs/development/python-modules/github3_py/default.nix+12−10 pkgs/development/python-modules/google_cloud_vision/default.nix+2−2 pkgs/development/python-modules/graphite-web/default.nix+1−1 pkgs/development/python-modules/ipykernel/default.nix+9 pkgs/development/python-modules/jupytext/default.nix+47 pkgs/development/python-modules/kafka-python/default.nix+2−2 pkgs/development/python-modules/manhole/default.nix+4−1 pkgs/development/python-modules/mt-940/default.nix+16−14 pkgs/development/python-modules/mt-940/no-coverage.patch−26 pkgs/development/python-modules/mysqlclient/default.nix+2−2 pkgs/development/python-modules/nose-randomly/default.nix+4 pkgs/development/python-modules/numexpr/default.nix+1−7 pkgs/development/python-modules/numpy/default.nix−2 pkgs/development/python-modules/nvchecker/default.nix+2−2 pkgs/development/python-modules/objgraph/default.nix+5−2 pkgs/development/python-modules/path.py/default.nix+4−6 pkgs/development/python-modules/peewee/default.nix+2−2 pkgs/development/python-modules/pg8000/default.nix+3−2 pkgs/development/python-modules/pyaxmlparser/default.nix+18−4 pkgs/development/python-modules/pyjet/default.nix+10−1 pkgs/development/python-modules/pyliblo/default.nix+5−4 pkgs/development/python-modules/pyqt/5.x.nix+1 pkgs/development/python-modules/raven/default.nix+2−2 pkgs/development/python-modules/ruamel_yaml/default.nix+1−2 pkgs/development/python-modules/scrapy/default.nix+24−10 pkgs/development/python-modules/sepaxml/default.nix+22 pkgs/development/python-modules/sh/default.nix+11−2 pkgs/development/python-modules/sh/disable-broken-tests-darwin.patch+49 pkgs/development/python-modules/sip/default.nix+1 pkgs/development/python-modules/snscrape/default.nix+35 pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix+2−2 pkgs/development/python-modules/thumbor/default.nix+4−4 pkgs/development/python-modules/typed-ast/default.nix+2−2 pkgs/development/python-modules/uritemplate_py/default.nix−22 pkgs/development/python-modules/wptserve/default.nix+2−1 pkgs/development/python-modules/zeep/default.nix+2−2 pkgs/development/ruby-modules/bundix/default.nix+1−1 pkgs/development/ruby-modules/bundler/default.nix+2−2 pkgs/development/ruby-modules/gem-config/default.nix+9−1 pkgs/development/tools/ammonite/default.nix+2−2 pkgs/development/tools/analysis/pmd/default.nix+2−2 pkgs/development/tools/analysis/valgrind/default.nix+5−6 pkgs/development/tools/apktool/default.nix+2−2 pkgs/development/tools/build-managers/bazel/default.nix+2−1 pkgs/development/tools/cloudfoundry-cli/default.nix+16−7 pkgs/development/tools/database/liquibase/default.nix+13−1 pkgs/development/tools/misc/sysbench/default.nix+3−3 pkgs/development/tools/pipenv/default.nix+2−2 pkgs/development/tools/pyre/default.nix+6−2 pkgs/development/tools/skopeo/default.nix+2−2 pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch+97 pkgs/development/tools/vagrant/default.nix+16−9 pkgs/development/tools/vagrant/gemset_libvirt.nix+105−6 pkgs/development/tools/vagrant/vagrant-libvirt.json.in+9 pkgs/games/boohu/default.nix+2−2 pkgs/games/bzflag/default.nix+5−3 pkgs/games/gcompris/default.nix+2−2 pkgs/games/ivan/default.nix+3−6 pkgs/games/ivan/new.patch−33 pkgs/games/liquidwar/default.nix+7−3 pkgs/games/openra/default.nix+9−3 pkgs/games/openspades/default.nix+13−2 pkgs/games/ue4demos/default.nix+24−17 pkgs/misc/drivers/sc-controller/default.nix+2−2 pkgs/misc/emulators/blastem/default.nix+2 pkgs/misc/emulators/retroarch/cores.nix+1−1 pkgs/misc/emulators/snes9x-gtk/default.nix+2−2 pkgs/misc/emulators/wine/sources.nix+4−4 pkgs/misc/scrcpy/default.nix+2−2 pkgs/misc/vim-plugins/generated.nix+10 pkgs/misc/vim-plugins/vim-plugin-names+1 pkgs/os-specific/linux/fuse/default.nix+2−2 pkgs/os-specific/linux/fwts/default.nix+4−2 pkgs/os-specific/linux/kernel/common-config.nix+1−1 pkgs/os-specific/linux/kernel/linux-4.14.nix+2−2 pkgs/os-specific/linux/kernel/linux-4.19.nix+2−2 pkgs/os-specific/linux/kernel/linux-4.20.nix+18 pkgs/os-specific/linux/kernel/linux-4.4.nix+2−2 pkgs/os-specific/linux/kernel/linux-4.9.nix+2−2 pkgs/os-specific/linux/kernel/linux-libre.nix+3−3 pkgs/os-specific/linux/sysdig/default.nix+2−2 pkgs/servers/clickhouse/default.nix+7−2 pkgs/servers/foundationdb/default.nix+2−2 pkgs/servers/home-assistant/cli.nix+35 pkgs/servers/home-assistant/component-packages.nix+1−1 pkgs/servers/home-assistant/default.nix+5−5 pkgs/servers/home-assistant/frontend.nix+2−2 pkgs/servers/http/unit/default.nix+38−36 pkgs/servers/matrix-synapse/default.nix+9−3 pkgs/servers/miniflux/default.nix+4−4 pkgs/servers/nosql/aerospike/default.nix+1−2 pkgs/servers/nosql/redis/default.nix+2−2 pkgs/servers/plex/default.nix+3−3 pkgs/shells/zsh/zsh-completions/default.nix+2−2 pkgs/stdenv/cross/default.nix+1−1 pkgs/tools/admin/nomachine-client/default.nix+10−5 pkgs/tools/admin/pulumi/default.nix+3−3 pkgs/tools/archivers/fsarchiver/default.nix+43 pkgs/tools/audio/abcm2ps/default.nix+2−2 pkgs/tools/audio/playerctl/default.nix+5−8 pkgs/tools/compression/mozlz4a/default.nix+3−3 pkgs/tools/filesystems/duperemove/default.nix+1−1 pkgs/tools/filesystems/sshfs-fuse/default.nix+2−2 pkgs/tools/graphics/guff/default.nix+25 pkgs/tools/misc/datamash/default.nix+2−2 pkgs/tools/misc/diskus/default.nix+4−2 pkgs/tools/misc/hyperledger-fabric/default.nix+35 pkgs/tools/misc/qt5ct/default.nix+2−2 pkgs/tools/misc/you-get/default.nix+2−2 pkgs/tools/networking/bud/default.nix+2 pkgs/tools/networking/gnirehtet/default.nix+1−1 pkgs/tools/networking/nss-pam-ldapd/default.nix+9−5 pkgs/tools/networking/strongswan/default.nix+5−1 pkgs/tools/networking/tgt/default.nix+8−3 pkgs/tools/networking/wireguard-tools/default.nix+2−2 pkgs/tools/package-management/cde/default.nix+2 pkgs/tools/package-management/nix-review/default.nix+2−2 pkgs/tools/security/b2sum/default.nix+2−1 pkgs/tools/security/monkeysphere/default.nix+23−9 pkgs/tools/security/monkeysphere/openssh-nixos-sandbox.patch+17 pkgs/tools/security/neopg/default.nix+2−2 pkgs/tools/security/vault/default.nix+2−2 pkgs/tools/system/collectd/default.nix+54−41 pkgs/tools/system/localtime/default.nix+12−6 pkgs/tools/system/osquery/default.nix+16−2 pkgs/tools/system/syslog-ng/default.nix+2−2 pkgs/tools/video/bento4/default.nix+1−1 pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix+48 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix+114−69 pkgs/top-level/ocaml-packages.nix+2 pkgs/top-level/php-packages.nix+4−4 pkgs/top-level/python-packages.nix+11−5
.github/CODEOWNERS+7−2
@@ -64,13 +64,18 @@
6464/pkgs/development/haskell-modules/generic-builder.nix @peti @ryantm @basvandijk
6565/pkgs/development/haskell-modules/hoogle.nix @peti @ryantm @basvandijk
6666
67+# Perl
68+/pkgs/development/interpreters/perl @volth
69+/pkgs/top-level/perl-packages.nix @volth
70+/pkgs/development/perl-modules @volth
71+
6772# R
6873/pkgs/applications/science/math/R @peti
6974/pkgs/development/r-modules @peti
7075
7176# Ruby
72−/pkgs/development/interpreters/ruby @zimbatm
73−/pkgs/development/ruby-modules @zimbatm
77+/pkgs/development/interpreters/ruby @alyssais @zimbatm
78+/pkgs/development/ruby-modules @alyssais @zimbatm
7479
7580# Rust
7681/pkgs/development/compilers/rust @Mic92 @LnL7
.gitignore+2−1
@@ -13,4 +13,5 @@ result-*
1313.DS_Store
1414
1515/pkgs/development/libraries/qt-5/*/tmp/
16−/pkgs/desktops/kde-5/*/tmp/
16+/pkgs/desktops/kde-5/*/tmp/
17+/pkgs/development/mobile/androidenv/xml/*
doc/languages-frameworks/android.section.mdnew file+240
@@ -0,0 +1,240 @@
1+---
2+title: Android
3+author: Sander van der Burg
4+date: 2018-11-18
5+---
6+# Android
7+
8+The Android build environment provides three major features and a number of
9+supporting features.
10+
11+Deploying an Android SDK installation with plugins
12+--------------------------------------------------
13+The first use case is deploying the SDK with a desired set of plugins or subsets
14+of an SDK.
15+
16+```nix
17+with import <nixpkgs> {};
18+
19+let
20+ androidComposition = androidenv.composeAndroidPackages {
21+ toolsVersion = "25.2.5";
22+ platformToolsVersion = "27.0.1";
23+ buildToolsVersions = [ "27.0.3" ];
24+ includeEmulator = false;
25+ emulatorVersion = "27.2.0";
26+ platformVersions = [ "24" ];
27+ includeSources = false;
28+ includeDocs = false;
29+ includeSystemImages = false;
30+ systemImageTypes = [ "default" ];
31+ abiVersions = [ "armeabi-v7a" ];
32+ lldbVersions = [ "2.0.2558144" ];
33+ cmakeVersions = [ "3.6.4111459" ];
34+ includeNDK = false;
35+ ndkVersion = "16.1.4479499";
36+ useGoogleAPIs = false;
37+ useGoogleTVAddOns = false;
38+ includeExtras = [
39+ "extras;google;gcm"
40+ ];
41+ };
42+in
43+androidComposition.androidsdk
44+```
45+
46+The above function invocation states that we want an Android SDK with the above
47+specified plugin versions. By default, most plugins are disabled. Notable
48+exceptions are the tools, platform-tools and build-tools sub packages.
49+
50+The following parameters are supported:
51+
52+* `toolsVersion`, specifies the version of the tools package to use
53+* `platformsToolsVersion` specifies the version of the `platform-tools` plugin
54+* `buildToolsVersion` specifies the versions of the `build-tools` plugins to
55+ use.
56+* `includeEmulator` specifies whether to deploy the emulator package (`false`
57+ by default). When enabled, the version of the emulator to deploy can be
58+ specified by setting the `emulatorVersion` parameter.
59+* `includeDocs` specifies whether the documentation catalog should be included.
60+* `lldbVersions` specifies what LLDB versions should be deployed.
61+* `cmakeVersions` specifies which CMake versions should be deployed.
62+* `includeNDK` specifies that the Android NDK bundle should be included.
63+ Defaults to: `false`.
64+* `ndkVersion` specifies the NDK version that we want to use.
65+* `includeExtras` is an array of identifier strings referring to arbitrary
66+ add-on packages that should be installed.
67+* `platformVersions` specifies which platform SDK versions should be included.
68+
69+For each platform version that has been specified, we can apply the following
70+options:
71+
72+* `includeSystemImages` specifies whether a system image for each platform SDK
73+ should be included.
74+* `includeSources` specifies whether the sources for each SDK version should be
75+ included.
76+* `useGoogleAPIs` specifies that for each selected platform version the
77+ Google API should be included.
78+* `useGoogleTVAddOns` specifies that for each selected platform version the
79+ Google TV add-on should be included.
80+
81+For each requested system image we can specify the following options:
82+
83+* `systemImageTypes` specifies what kind of system images should be included.
84+ Defaults to: `default`.
85+* `abiVersions` specifies what kind of ABI version of each system image should
86+ be included. Defaults to: `armeabi-v7a`.
87+
88+Most of the function arguments have reasonable default settings.
89+
90+When building the above expression with:
91+
92+```bash
93+$ nix-build
94+```
95+
96+The Android SDK gets deployed with all desired plugin versions.
97+
98+We can also deploy subsets of the Android SDK. For example, to only the the
99+`platform-tools` package, you can evaluate the following expression:
100+
101+```nix
102+with import <nixpkgs> {};
103+
104+let
105+ androidComposition = androidenv.composeAndroidPackages {
106+ # ...
107+ };
108+in
109+androidComposition.platform-tools
110+```
111+
112+Using predefine Android package compositions
113+--------------------------------------------
114+In addition to composing an Android package set manually, it is also possible
115+to use a predefined composition that contains all basic packages for a specific
116+Android version, such as version 9.0 (API-level 28).
117+
118+The following Nix expression can be used to deploy the entire SDK with all basic
119+plugins:
120+
121+```nix
122+with import <nixpkgs> {};
123+
124+androidenv.androidPkgs_9_0.androidsdk
125+```
126+
127+It is also possible to use one plugin only:
128+
129+```nix
130+with import <nixpkgs> {};
131+
132+androidenv.androidPkgs_9_0.platform-tools
133+```
134+
135+Building an Android application
136+-------------------------------
137+In addition to the SDK, it is also possible to build an Ant-based Android
138+project and automatically deploy all the Android plugins that a project
139+requires.
140+
141+```nix
142+with import <nixpkgs> {};
143+
144+androidenv.buildApp {
145+ name = "MyAndroidApp";
146+ src = ./myappsources;
147+ release = true;
148+
149+ # If release is set to true, you need to specify the following parameters
150+ keyStore = ./keystore;
151+ keyAlias = "myfirstapp";
152+ keyStorePassword = "mykeystore";
153+ keyAliasPassword = "myfirstapp";
154+
155+ # Any Android SDK parameters that install all the relevant plugins that a
156+ # build requires
157+ platformVersions = [ "24" ];
158+
159+ # When we include the NDK, then ndk-build is invoked before Ant gets invoked
160+ includeNDK = true;
161+}
162+```
163+
164+Aside from the app-specific build parameters (`name`, `src`, `release` and
165+keystore parameters), the `buildApp {}` function supports all the function
166+parameters that the SDK composition function (the function shown in the
167+previous section) supports.
168+
169+This build function is particularly useful when it is desired to use
170+[Hydra](http://nixos.org/hydra): the Nix-based continuous integration solution
171+to build Android apps. An Android APK gets exposed as a build product and can be
172+installed on any Android device with a web browser by navigating to the build
173+result page.
174+
175+Spawning emulator instances
176+---------------------------
177+For testing purposes, it can also be quite convenient to automatically generate
178+scripts that spawn emulator instances with all desired configuration settings.
179+
180+An emulator spawn script can be configured by invoking the `emulateApp {}`
181+function:
182+
183+```nix
184+with import <nixpkgs> {};
185+
186+androidenv.emulateApp {
187+ name = "emulate-MyAndroidApp";
188+ platformVersion = "24";
189+ abiVersion = "armeabi-v7a"; # mips, x86 or x86_64
190+ systemImageType = "default";
191+ useGoogleAPIs = false;
192+}
193+```
194+
195+It is also possible to specify an APK to deploy inside the emulator
196+and the package and activity names to launch it:
197+
198+```nix
199+with import <nixpkgs> {};
200+
201+androidenv.emulateApp {
202+ name = "emulate-MyAndroidApp";
203+ platformVersion = "24";
204+ abiVersion = "armeabi-v7a"; # mips, x86 or x86_64
205+ systemImageType = "default";
206+ useGoogleAPIs = false;
207+ app = ./MyApp.apk;
208+ package = "MyApp";
209+ activity = "MainActivity";
210+}
211+```
212+
213+In addition to prebuilt APKs, you can also bind the APK parameter to a
214+`buildApp {}` function invocation shown in the previous example.
215+
216+Querying the available versions of each plugin
217+----------------------------------------------
218+When using any of the previously shown functions, it may be a bit inconvenient
219+to find out what options are supported, since the Android SDK provides many
220+plugins.
221+
222+A shell script in the `pkgs/development/mobile/androidenv/` sub directory can be used to retrieve all
223+possible options:
224+
225+```bash
226+sh ./querypackages.sh packages build-tools
227+```
228+
229+The above command-line instruction queries all build-tools versions in the
230+generated `packages.nix` expression.
231+
232+Updating the generated expressions
233+----------------------------------
234+Most of the Nix expressions are generated from XML files that the Android
235+package manager uses. To update the expressions run the `generate.sh` script
236+that is stored in the `pkgs/development/mobile/androidenv/` sub directory:
237+
238+```bash
239+sh ./generate.sh
240+```
doc/languages-frameworks/index.xml+3
@@ -10,12 +10,14 @@
1010 Nixpkgs to easily build packages for other programming languages, such as
1111 Perl or Haskell. These are described in this chapter.
1212 </para>
13+ <xi:include href="android.section.xml" />
1314 <xi:include href="beam.xml" />
1415 <xi:include href="bower.xml" />
1516 <xi:include href="coq.xml" />
1617 <xi:include href="go.xml" />
1718 <xi:include href="haskell.section.xml" />
1819 <xi:include href="idris.section.xml" />
20+ <xi:include href="ios.section.xml" />
1921 <xi:include href="java.xml" />
2022 <xi:include href="lua.xml" />
2123 <xi:include href="node.section.xml" />
@@ -27,6 +29,7 @@
2729 <xi:include href="ruby.xml" />
2830 <xi:include href="rust.section.xml" />
2931 <xi:include href="texlive.xml" />
32+ <xi:include href="titanium.section.xml" />
3033 <xi:include href="vim.section.xml" />
3134 <xi:include href="emscripten.section.xml" />
3235</chapter>
doc/languages-frameworks/ios.section.mdnew file+219
@@ -0,0 +1,219 @@
1+---
2+title: iOS
3+author: Sander van der Burg
4+date: 2018-11-18
5+---
6+# iOS
7+
8+This component is basically a wrapper/workaround that makes it possible to
9+expose an Xcode installation as a Nix package by means of symlinking to the
10+relevant executables on the host system.
11+
12+Since Xcode can't be packaged with Nix, nor we can publish it as a Nix package
13+(because of its license) this is basically the only integration strategy
14+making it possible to do iOS application builds that integrate with other
15+components of the Nix ecosystem
16+
17+The primary objective of this project is to use the Nix expression language to
18+specify how iOS apps can be built from source code, and to automatically spawn
19+iOS simulator instances for testing.
20+
21+This component also makes it possible to use [Hydra](http://nixos.org/hydra),
22+the Nix-based continuous integration server to regularly build iOS apps and to
23+do wireless ad-hoc installations of enterprise IPAs on iOS devices through
24+Hydra.
25+
26+The Xcode build environment implements a number of features.
27+
28+Deploying a proxy component wrapper exposing Xcode
29+--------------------------------------------------
30+The first use case is deploying a Nix package that provides symlinks to the Xcode
31+installation on the host system. This package can be used as a build input to
32+any build function implemented in the Nix expression language that requires
33+Xcode.
34+
35+```nix
36+let
37+ pkgs = import <nixpkgs> {};
38+
39+ xcodeenv = import ./xcodeenv {
40+ inherit (pkgs) stdenv;
41+ };
42+in
43+xcodeenv.composeXcodeWrapper {
44+ version = "9.2";
45+ xcodeBaseDir = "/Applications/Xcode.app";
46+}
47+```
48+
49+By deploying the above expression with `nix-build` and inspecting its content
50+you will notice that several Xcode-related executables are exposed as a Nix
51+package:
52+
53+```bash
54+$ ls result/bin
55+lrwxr-xr-x 1 sander staff 94 1 jan 1970 Simulator -> /Applications/Xcode.app/Contents/Developer/Applications/Simulator.app/Contents/MacOS/Simulator
56+lrwxr-xr-x 1 sander staff 17 1 jan 1970 codesign -> /usr/bin/codesign
57+lrwxr-xr-x 1 sander staff 17 1 jan 1970 security -> /usr/bin/security
58+lrwxr-xr-x 1 sander staff 21 1 jan 1970 xcode-select -> /usr/bin/xcode-select
59+lrwxr-xr-x 1 sander staff 61 1 jan 1970 xcodebuild -> /Applications/Xcode.app/Contents/Developer/usr/bin/xcodebuild
60+lrwxr-xr-x 1 sander staff 14 1 jan 1970 xcrun -> /usr/bin/xcrun
61+```
62+
63+Building an iOS application
64+---------------------------
65+We can build an iOS app executable for the simulator, or an IPA/xcarchive file
66+for release purposes, e.g. ad-hoc, enterprise or store installations, by
67+executing the `xcodeenv.buildApp {}` function:
68+
69+```nix
70+let
71+ pkgs = import <nixpkgs> {};
72+
73+ xcodeenv = import ./xcodeenv {
74+ inherit (pkgs) stdenv;
75+ };
76+in
77+xcodeenv.buildApp {
78+ name = "MyApp";
79+ src = ./myappsources;
80+ sdkVersion = "11.2";
81+
82+ target = null; # Corresponds to the name of the app by default
83+ configuration = null; # Release for release builds, Debug for debug builds
84+ scheme = null; # -scheme will correspond to the app name by default
85+ sdk = null; # null will set it to 'iphonesimulator` for simulator builds or `iphoneos` to real builds
86+ xcodeFlags = "";
87+
88+ release = true;
89+ certificateFile = ./mycertificate.p12;
90+ certificatePassword = "secret";
91+ provisioningProfile = ./myprovisioning.profile;
92+ signMethod = "ad-hoc"; # 'enterprise' or 'store'
93+ generateIPA = true;
94+ generateXCArchive = false;
95+
96+ enableWirelessDistribution = true;
97+ installURL = "/installipa.php";
98+ bundleId = "mycompany.myapp";
99+ appVersion = "1.0";
100+
101+ # Supports all xcodewrapper parameters as well
102+ xcodeBaseDir = "/Applications/Xcode.app";
103+}
104+```
105+
106+The above function takes a variety of parameters:
107+* The `name` and `src` parameters are mandatory and specify the name of the app
108+ and the location where the source code resides
109+* `sdkVersion` specifies which version of the iOS SDK to use.
110+
111+It also possile to adjust the `xcodebuild` parameters. This is only needed in
112+rare circumstances. In most cases the default values should suffice:
113+
114+* Specifies which `xcodebuild` target to build. By default it takes the target
115+ that has the same name as the app.
116+* The `configuration` parameter can be overridden if desired. By default, it
117+ will do a debug build for the simulator and a release build for real devices.
118+* The `scheme` parameter specifies which `-scheme` parameter to propagate to
119+ `xcodebuild`. By default, it corresponds to the app name.
120+* The `sdk` parameter specifies which SDK to use. By default, it picks
121+ `iphonesimulator` for simulator builds and `iphoneos` for release builds.
122+* The `xcodeFlags` parameter specifies arbitrary command line parameters that
123+ should be propagated to `xcodebuild`.
124+
125+By default, builds are carried out for the iOS simulator. To do release builds
126+(builds for real iOS devices), you must set the `release` parameter to `true`.
127+In addition, you need to set the following parameters:
128+
129+* `certificateFile` refers to a P12 certificate file.
130+* `certificatePassword` specifies the password of the P12 certificate.
131+* `provisioningProfile` refers to the provision profile needed to sign the app
132+* `signMethod` should refer to `ad-hoc` for signing the app with an ad-hoc
133+ certificate, `enterprise` for enterprise certificates and `app-store` for App
134+ store certificates.
135+* `generateIPA` specifies that we want to produce an IPA file (this is probably
136+ what you want)
137+* `generateXCArchive` specifies thet we want to produce an xcarchive file.
138+
139+When building IPA files on Hydra and when it is desired to allow iOS devices to
140+install IPAs by browsing to the Hydra build products page, you can enable the
141+`enableWirelessDistribution` parameter.
142+
143+When enabled, you need to configure the following options:
144+
145+* The `installURL` parameter refers to the URL of a PHP script that composes the
146+ `itms-services://` URL allowing iOS devices to install the IPA file.
147+* `bundleId` refers to the bundle ID value of the app
148+* `appVersion` refers to the app's version number
149+
150+To use wireless adhoc distributions, you must also install the corresponding
151+PHP script on a web server (see section: 'Installing the PHP script for wireless
152+ad hoc installations from Hydra' for more information).
153+
154+In addition to the build parameters, you can also specify any parameters that
155+the `xcodeenv.composeXcodeWrapper {}` function takes. For example, the
156+`xcodeBaseDir` parameter can be overridden to refer to a different Xcode
157+version.
158+
159+Spawning simulator instances
160+----------------------------
161+In addition to building iOS apps, we can also automatically spawn simulator
162+instances:
163+
164+```nix
165+let
166+ pkgs = import <nixpkgs> {};
167+
168+ xcodeenv = import ./xcodeenv {
169+ inherit (pkgs) stdenv;
170+ };
171+in
172+xcode.simulateApp {
173+ name = "simulate";
174+
175+ # Supports all xcodewrapper parameters as well
176+ xcodeBaseDir = "/Applications/Xcode.app";
177+}
178+```
179+
180+The above expression produces a script that starts the simulator from the
181+provided Xcode installation. The script can be started as follows:
182+
183+```bash
184+./result/bin/run-test-simulator
185+```
186+
187+By default, the script will show an overview of UDID for all available simulator
188+instances and asks you to pick one. You can also provide a UDID as a
189+command-line parameter to launch an instance automatically:
190+
191+```bash
192+./result/bin/run-test-simulator 5C93129D-CF39-4B1A-955F-15180C3BD4B8
193+```
194+
195+You can also extend the simulator script to automatically deploy and launch an
196+app in the requested simulator instance:
197+
198+```nix
199+let
200+ pkgs = import <nixpkgs> {};
201+
202+ xcodeenv = import ./xcodeenv {
203+ inherit (pkgs) stdenv;
204+ };
205+in
206+xcode.simulateApp {
207+ name = "simulate";
208+ bundleId = "mycompany.myapp";
209+ app = xcode.buildApp {
210+ # ...
211+ };
212+
213+ # Supports all xcodewrapper parameters as well
214+ xcodeBaseDir = "/Applications/Xcode.app";
215+}
216+```
217+
218+By providing the result of an `xcode.buildApp {}` function and configuring the
219+app bundle id, the app gets deployed automatically and started.
doc/languages-frameworks/python.section.md+16−5
@@ -484,10 +484,12 @@ and in this case the `python35` interpreter is automatically used.
484484### Interpreters
485485
486486Versions 2.7, 3.5, 3.6 and 3.7 of the CPython interpreter are available as
487−respectively `python27`, `python35`, `python36`, and `python37`. The PyPy
488−interpreter is available as `pypy`. The aliases `python2` and `python3`
489−correspond to respectively `python27` and `python37`. The default interpreter,
490−`python`, maps to `python2`. The Nix expressions for the interpreters can be
487+respectively `python27`, `python35`, `python36` and `python37`. The aliases
488+`python2` and `python3` correspond to respectively `python27` and
489+`python37`. The default interpreter, `python`, maps to `python2`. The PyPy
490+interpreters compatible with Python 2.7 and 3 are available as `pypy27` and
491+`pypy3`, with aliases `pypy2` mapping to `pypy27` and `pypy` mapping to
492+`pypy2`. The Nix expressions for the interpreters can be
491493found in `pkgs/development/interpreters/python`.
492494
493495All packages depending on any Python interpreter get appended
@@ -1102,7 +1104,7 @@ on `numpy` will be built with `mkl`.
11021104The following is an overlay that configures `numpy` to use `mkl`:
11031105```nix
11041106self: super: {
1105− python36 = super.python36.override {
1107+ python37 = super.python37.override {
11061108 packageOverrides = python-self: python-super: {
11071109 numpy = python-super.numpy.override {
11081110 blas = super.pkgs.mkl;
@@ -1112,6 +1114,15 @@ self: super: {
11121114}
11131115```
11141116
1117+`mkl` requires an `openmp` implementation when running with multiple processors.
1118+By default, `mkl` will use Intel's `iomp` implementation if no other is
1119+specified, but this is a runtime-only dependency and binary compatible with the
1120+LLVM implementation. To use that one instead, Intel recommends users set it with
1121+`LD_PRELOAD`.
1122+
1123+Note that `mkl` is only available on `x86_64-{linux,darwin}` platforms;
1124+moreover, Hydra is not building and distributing pre-compiled binaries using it.
1125+
11151126## Contributing
11161127
11171128### Contributing guidelines
doc/languages-frameworks/titanium.section.mdnew file+115
@@ -0,0 +1,115 @@
1+---
2+title: Titanium
3+author: Sander van der Burg
4+date: 2018-11-18
5+---
6+# Titanium
7+
8+The Nixpkgs repository contains facilities to deploy a variety of versions of
9+the [Titanium SDK](https://www.appcelerator.com) versions, a cross-platform
10+mobile app development framework using JavaScript as an implementation language,
11+and includes a function abstraction making it possible to build Titanium
12+applications for Android and iOS devices from source code.
13+
14+Not all Titanium features supported -- currently, it can only be used to build
15+Android and iOS apps.
16+
17+Building a Titanium app
18+-----------------------
19+We can build a Titanium app from source for Android or iOS and for debugging or
20+release purposes by invoking the `titaniumenv.buildApp {}` function:
21+
22+```nix
23+titaniumenv.buildApp {
24+ name = "myapp";
25+ src = ./myappsource;
26+
27+ preBuild = "";
28+ target = "android"; # or 'iphone'
29+ tiVersion = "7.1.0.GA";
30+ release = true;
31+
32+ androidsdkArgs = {
33+ platformVersions = [ "25" "26" ];
34+ };
35+ androidKeyStore = ./keystore;
36+ androidKeyAlias = "myfirstapp";
37+ androidKeyStorePassword = "secret";
38+
39+ xcodeBaseDir = "/Applications/Xcode.app";
40+ xcodewrapperArgs = {
41+ version = "9.3";
42+ };
43+ iosMobileProvisioningProfile = ./myprovisioning.profile;
44+ iosCertificateName = "My Company";
45+ iosCertificate = ./mycertificate.p12;
46+ iosCertificatePassword = "secret";
47+ iosVersion = "11.3";
48+ iosBuildStore = false;
49+
50+ enableWirelessDistribution = true;
51+ installURL = "/installipa.php";
52+}
53+```
54+
55+The `titaniumenv.buildApp {}` function takes the following parameters:
56+
57+* The `name` parameter refers to the name in the Nix store.
58+* The `src` parameter refers to the source code location of the app that needs
59+ to be built.
60+* `preRebuild` contains optional build instructions that are carried out before
61+ the build starts.
62+* `target` indicates for which device the app must be built. Currently only
63+ 'android' and 'iphone' (for iOS) are supported.
64+* `tiVersion` can be used to optionally override the requested Titanium version
65+ in `tiapp.xml`. If not specified, it will use the version in `tiapp.xml`.
66+* `release` should be set to true when building an app for submission to the
67+ Google Playstore or Apple Appstore. Otherwise, it should be false.
68+
69+When the `target` has been set to `android`, we can configure the following
70+parameters:
71+
72+* The `androidSdkArgs` parameter refers to an attribute set that propagates all
73+ parameters to the `androidenv.composeAndroidPackages {}` function. This can
74+ be used to install all relevant Android plugins that may be needed to perform
75+ the Android build. If no parameters are given, it will deploy the platform
76+ SDKs for API-levels 25 and 26 by default.
77+
78+When the `release` parameter has been set to true, you need to provide
79+parameters to sign the app:
80+
81+* `androidKeyStore` is the path to the keystore file
82+* `androidKeyAlias` is the key alias
83+* `androidKeyStorePassword` refers to the password to open the keystore file.
84+
85+When the `target` has been set to `iphone`, we can configure the following
86+parameters:
87+
88+* The `xcodeBaseDir` parameter refers to the location where Xcode has been
89+ installed. When none value is given, the above value is the default.
90+* The `xcodewrapperArgs` parameter passes arbitrary parameters to the
91+ `xcodeenv.composeXcodeWrapper {}` function. This can, for example, be used
92+ to adjust the default version of Xcode.
93+
94+When `release` has been set to true, you also need to provide the following
95+parameters:
96+
97+* `iosMobileProvisioningProfile` refers to a mobile provisioning profile needed
98+ for signing.
99+* `iosCertificateName` refers to the company name in the P12 certificate.
100+* `iosCertificate` refers to the path to the P12 file.
101+* `iosCertificatePassword` contains the password to open the P12 file.
102+* `iosVersion` refers to the iOS SDK version to use. It defaults to the latest
103+ version.
104+* `iosBuildStore` should be set to `true` when building for the Apple Appstore
105+ submission. For enterprise or ad-hoc builds it should be set to `false`.
106+
107+When `enableWirelessDistribution` has been enabled, you must also provide the
108+path of the PHP script (`installURL`) (that is included with the iOS build
109+environment) to enable wireless ad-hoc installations.
110+
111+Emulating or simulating the app
112+-------------------------------
113+It is also possible to simulate the correspond iOS simulator build by using
114+`xcodeenv.simulateApp {}` and emulate an Android APK by using
115+`androidenv.emulateApp {}`.
lib/licenses.nix+32−23
@@ -29,13 +29,13 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
2929 };
3030
3131 agpl3 = spdx {
32− spdxId = "AGPL-3.0";
33− fullName = "GNU Affero General Public License v3.0";
32+ spdxId = "AGPL-3.0-only";
33+ fullName = "GNU Affero General Public License v3.0 only";
3434 };
3535
36− agpl3Plus = {
36+ agpl3Plus = spdx {
37+ spdxId = "AGPL-3.0-or-later";
3738 fullName = "GNU Affero General Public License v3.0 or later";
38− inherit (agpl3) url;
3939 };
4040
4141 amazonsl = {
@@ -266,13 +266,23 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
266266 };
267267
268268 fdl12 = spdx {
269− spdxId = "GFDL-1.2";
270− fullName = "GNU Free Documentation License v1.2";
269+ spdxId = "GFDL-1.2-only";
270+ fullName = "GNU Free Documentation License v1.2 only";
271+ };
272+
273+ fdl12Plus = spdx {
274+ spdxId = "GFDL-1.2-or-later";
275+ fullName = "GNU Free Documentation License v1.2 or later";
271276 };
272277
273278 fdl13 = spdx {
274− spdxId = "GFDL-1.3";
275− fullName = "GNU Free Documentation License v1.3";
279+ spdxId = "GFDL-1.3-only";
280+ fullName = "GNU Free Documentation License v1.3 only";
281+ };
282+
283+ fdl13Plus = spdx {
284+ spdxId = "GFDL-1.3-or-later";
285+ fullName = "GNU Free Documentation License v1.3 or later";
276286 };
277287
278288 ffsl = {
@@ -297,24 +307,23 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
297307 };
298308
299309 gpl1 = spdx {
300− spdxId = "GPL-1.0";
310+ spdxId = "GPL-1.0-only";
301311 fullName = "GNU General Public License v1.0 only";
302312 };
303313
304314 gpl1Plus = spdx {
305− spdxId = "GPL-1.0+";
315+ spdxId = "GPL-1.0-or-later";
306316 fullName = "GNU General Public License v1.0 or later";
307317 };
308318
309319 gpl2 = spdx {
310− spdxId = "GPL-2.0";
320+ spdxId = "GPL-2.0-only";
311321 fullName = "GNU General Public License v2.0 only";
312322 };
313323
314− gpl2Classpath = {
324+ gpl2Classpath = spdx {
315325 spdxId = "GPL-2.0-with-classpath-exception";
316326 fullName = "GNU General Public License v2.0 only (with Classpath exception)";
317− url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception;
318327 };
319328
320329 gpl2ClasspathPlus = {
@@ -328,17 +337,17 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
328337 };
329338
330339 gpl2Plus = spdx {
331− spdxId = "GPL-2.0+";
340+ spdxId = "GPL-2.0-or-later";
332341 fullName = "GNU General Public License v2.0 or later";
333342 };
334343
335344 gpl3 = spdx {
336− spdxId = "GPL-3.0";
345+ spdxId = "GPL-3.0-only";
337346 fullName = "GNU General Public License v3.0 only";
338347 };
339348
340349 gpl3Plus = spdx {
341− spdxId = "GPL-3.0+";
350+ spdxId = "GPL-3.0-or-later";
342351 fullName = "GNU General Public License v3.0 or later";
343352 };
344353
@@ -408,32 +417,32 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
408417 };
409418
410419 lgpl2 = spdx {
411− spdxId = "LGPL-2.0";
420+ spdxId = "LGPL-2.0-only";
412421 fullName = "GNU Library General Public License v2 only";
413422 };
414423
415424 lgpl2Plus = spdx {
416− spdxId = "LGPL-2.0+";
425+ spdxId = "LGPL-2.0-or-later";
417426 fullName = "GNU Library General Public License v2 or later";
418427 };
419428
420429 lgpl21 = spdx {
421− spdxId = "LGPL-2.1";
430+ spdxId = "LGPL-2.1-only";
422431 fullName = "GNU Library General Public License v2.1 only";
423432 };
424433
425434 lgpl21Plus = spdx {
426− spdxId = "LGPL-2.1+";
435+ spdxId = "LGPL-2.1-or-later";
427436 fullName = "GNU Library General Public License v2.1 or later";
428437 };
429438
430439 lgpl3 = spdx {
431− spdxId = "LGPL-3.0";
440+ spdxId = "LGPL-3.0-only";
432441 fullName = "GNU Lesser General Public License v3.0 only";
433442 };
434443
435444 lgpl3Plus = spdx {
436− spdxId = "LGPL-3.0+";
445+ spdxId = "LGPL-3.0-or-later";
437446 fullName = "GNU Lesser General Public License v3.0 or later";
438447 };
439448
@@ -697,7 +706,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
697706 };
698707
699708 wxWindows = spdx {
700− spdxId = "WXwindows";
709+ spdxId = "wxWindows";
701710 fullName = "wxWindows Library Licence, Version 3.1";
702711 };
703712
lib/systems/examples.nix+3−3
@@ -47,7 +47,7 @@ rec {
4747 armv5te-android-prebuilt = rec {
4848 config = "armv5tel-unknown-linux-androideabi";
4949 sdkVer = "21";
50− ndkVer = "10e";
50+ ndkVer = "18b";
5151 platform = platforms.armv5te-android;
5252 useAndroidPrebuilt = true;
5353 };
@@ -55,7 +55,7 @@ rec {
5555 armv7a-android-prebuilt = rec {
5656 config = "armv7a-unknown-linux-androideabi";
5757 sdkVer = "24";
58− ndkVer = "17c";
58+ ndkVer = "18b";
5959 platform = platforms.armv7a-android;
6060 useAndroidPrebuilt = true;
6161 };
@@ -63,7 +63,7 @@ rec {
6363 aarch64-android-prebuilt = rec {
6464 config = "aarch64-unknown-linux-android";
6565 sdkVer = "24";
66− ndkVer = "17c";
66+ ndkVer = "18b";
6767 platform = platforms.aarch64-multiplatform;
6868 useAndroidPrebuilt = true;
6969 };
maintainers/maintainer-list.nix+10
@@ -256,6 +256,11 @@
256256 github = "AndrewMorsillo";
257257 name = "Andrew Morsillo";
258258 };
259+ andersk = {
260+ email = "andersk@mit.edu";
261+ github = "andersk";
262+ name = "Anders Kaseorg";
263+ };
259264 AndersonTorres = {
260265 email = "torres.anderson.85@protonmail.com";
261266 github = "AndersonTorres";
@@ -1324,6 +1329,11 @@
13241329 github = "ellis";
13251330 name = "Ellis Whitehead";
13261331 };
1332+ elohmeier = {
1333+ email = "elo-nixos@nerdworks.de";
1334+ github = "elohmeier";
1335+ name = "Enno Lohmeier";
1336+ };
13271337 elseym = {
13281338 email = "elseym@me.com";
13291339 github = "elseym";
maintainers/scripts/update-python-libraries+3−1
@@ -1,3 +1,5 @@
11#!/bin/sh
2−exec nix-shell -p "python3.withPackages(ps: with ps; [ packaging requests toolz ])" -p git --run pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
2+build=`nix-build -E "with import (fetchTarball "channel:nixpkgs-unstable") {}; python3.withPackages(ps: with ps; [ packaging requests toolz ])"`
3+python=${build}/bin/python
4+exec ${python} pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py $@
35
nixos/doc/manual/release-notes/rl-1903.xml+25
@@ -43,6 +43,15 @@
4343 <literal>./programs/nm-applet.nix</literal>
4444 </para>
4545 </listitem>
46+ <listitem>
47+ <para>
48+ There is a new <varname>security.googleOsLogin</varname> module for using
49+ <link xlink:href="https://cloud.google.com/compute/docs/instances/managing-instance-access">OS Login</link>
50+ to manage SSH access to Google Compute Engine instances, which supersedes
51+ the imperative and broken <literal>google-accounts-daemon</literal> used
52+ in <literal>nixos/modules/virtualisation/google-compute-config.nix</literal>.
53+ </para>
54+ </listitem>
4655 </itemizedlist>
4756 </section>
4857
@@ -318,6 +327,22 @@
318327 case.
319328 </para>
320329 </listitem>
330+ <listitem>
331+ <para>
332+ The <literal>pam_unix</literal> account module is now loaded with its
333+ control field set to <literal>required</literal> instead of
334+ <literal>sufficient</literal>, so that later pam account modules that
335+ might do more extensive checks are being executed.
336+ Previously, the whole account module verification was exited prematurely
337+ in case a nss module provided the account name to
338+ <literal>pam_unix</literal>.
339+ The LDAP and SSSD NixOS modules already add their NSS modules when
340+ enabled. In case your setup breaks due to some later pam account module
341+ previosuly shadowed, or failing NSS lookups, please file a bug. You can
342+ get back the old behaviour by manually setting
343+ <literal><![CDATA[security.pam.services.<name?>.text]]></literal>.
344+ </para>
345+ </listitem>
321346 </itemizedlist>
322347 </section>
323348
nixos/lib/testing.nix+1−1
@@ -116,7 +116,7 @@ in rec {
116116
117117 vms = map (m: m.config.system.build.vm) (lib.attrValues nodes);
118118
119− ocrProg = tesseract_4.override { enableLanguages = [ "eng" ]; };
119+ ocrProg = tesseract4.override { enableLanguages = [ "eng" ]; };
120120
121121 imagemagick_tiff = imagemagick_light.override { inherit libtiff; };
122122
nixos/lib/utils.nix+2−3
@@ -7,9 +7,8 @@ rec {
77 || elem fs.mountPoint [ "/" "/nix" "/nix/store" "/var" "/var/log" "/var/lib" "/etc" ];
88
99 # Check whenever `b` depends on `a` as a fileSystem
10− # FIXME: it's incorrect to simply use hasPrefix here: "/dev/a" is not a parent of "/dev/ab"
11− fsBefore = a: b: ((any (x: elem x [ "bind" "move" ]) b.options) && (a.mountPoint == b.device))
12− || (hasPrefix a.mountPoint b.mountPoint);
10+ fsBefore = a: b: a.mountPoint == b.device
11+ || hasPrefix "${a.mountPoint}${optionalString (!(hasSuffix "/" a.mountPoint)) "/"}" b.mountPoint;
1312
1413 # Escape a path according to the systemd rules, e.g. /dev/xyzzy
1514 # becomes dev-xyzzy. FIXME: slow.
nixos/modules/config/nsswitch.nix+5−3
@@ -1,6 +1,6 @@
11# Configuration for the Name Service Switch (/etc/nsswitch.conf).
22
3−{ config, lib, ... }:
3+{ config, lib, pkgs, ... }:
44
55with lib;
66
@@ -15,6 +15,7 @@ let
1515 ldap = canLoadExternalModules && (config.users.ldap.enable && config.users.ldap.nsswitch);
1616 sssd = canLoadExternalModules && config.services.sssd.enable;
1717 resolved = canLoadExternalModules && config.services.resolved.enable;
18+ googleOsLogin = canLoadExternalModules && config.security.googleOsLogin.enable;
1819
1920 hostArray = [ "files" ]
2021 ++ optional mymachines "mymachines"
@@ -29,6 +30,7 @@ let
2930 ++ optional sssd "sss"
3031 ++ optional ldap "ldap"
3132 ++ optional mymachines "mymachines"
33+ ++ optional googleOsLogin "cache_oslogin oslogin"
3234 ++ [ "systemd" ];
3335
3436 shadowArray = [ "files" ]
@@ -97,7 +99,7 @@ in {
9799 # configured IP addresses, or ::1 and 127.0.0.2 as
98100 # fallbacks. Systemd also provides nss-mymachines to return IP
99101 # addresses of local containers.
100− system.nssModules = optionals canLoadExternalModules [ config.systemd.package.out ];
101−
102+ system.nssModules = (optionals canLoadExternalModules [ config.systemd.package.out ])
103+ ++ optional googleOsLogin pkgs.google-compute-engine-oslogin.out;
102104 };
103105}
nixos/modules/module-list.nix+2
@@ -154,6 +154,7 @@
154154 ./security/chromium-suid-sandbox.nix
155155 ./security/dhparams.nix
156156 ./security/duosec.nix
157+ ./security/google_oslogin.nix
157158 ./security/hidepid.nix
158159 ./security/lock-kernel-modules.nix
159160 ./security/misc.nix
@@ -303,6 +304,7 @@
303304 ./services/hardware/usbmuxd.nix
304305 ./services/hardware/thermald.nix
305306 ./services/hardware/undervolt.nix
307+ ./services/hardware/vdr.nix
306308 ./services/logging/SystemdJournal2Gelf.nix
307309 ./services/logging/awstats.nix
308310 ./services/logging/fluentd.nix
nixos/modules/programs/adb.nix+1−2
@@ -16,7 +16,6 @@ with lib;
1616 To grant access to a user, it must be part of adbusers group:
1717 <code>users.users.alice.extraGroups = ["adbusers"];</code>
1818 '';
19− relatedPackages = [ ["androidenv" "platformTools"] ];
2019 };
2120 };
2221 };
@@ -24,7 +23,7 @@ with lib;
2423 ###### implementation
2524 config = mkIf config.programs.adb.enable {
2625 services.udev.packages = [ pkgs.android-udev-rules ];
27− environment.systemPackages = [ pkgs.androidenv.platformTools ];
26+ environment.systemPackages = [ pkgs.androidenv.androidPkgs_9_0.platform-tools ];
2827 users.groups.adbusers = {};
2928 };
3029}
nixos/modules/security/google_oslogin.nixnew file+68
@@ -0,0 +1,68 @@
1+{ config, lib, pkgs, ... }:
2+
3+with lib;
4+
5+let
6+
7+ cfg = config.security.googleOsLogin;
8+ package = pkgs.google-compute-engine-oslogin;
9+
10+in
11+
12+{
13+
14+ options = {
15+
16+ security.googleOsLogin.enable = mkOption {
17+ type = types.bool;
18+ default = false;
19+ description = ''
20+ Whether to enable Google OS Login
21+
22+ The OS Login package enables the following components:
23+ AuthorizedKeysCommand to query valid SSH keys from the user's OS Login
24+ profile during ssh authentication phase.
25+ NSS Module to provide user and group information
26+ PAM Module for the sshd service, providing authorization and
27+ authentication support, allowing the system to use data stored in
28+ Google Cloud IAM permissions to control both, the ability to log into
29+ an instance, and to perform operations as root (sudo).
30+ '';
31+ };
32+
33+ };
34+
35+ config = mkIf cfg.enable {
36+ security.pam.services.sshd = {
37+ makeHomeDir = true;
38+ googleOsLoginAccountVerification = true;
39+ # disabled for now: googleOsLoginAuthentication = true;
40+ };
41+
42+ security.sudo.extraConfig = ''
43+ #includedir /run/google-sudoers.d
44+ '';
45+ systemd.tmpfiles.rules = [
46+ "d /run/google-sudoers.d 750 root root -"
47+ "d /var/google-users.d 750 root root -"
48+ ];
49+
50+ # enable the nss module, so user lookups etc. work
51+ system.nssModules = [ package ];
52+
53+ # Ugly: sshd refuses to start if a store path is given because /nix/store is group-writable.
54+ # So indirect by a symlink.
55+ environment.etc."ssh/authorized_keys_command_google_oslogin" = {
56+ mode = "0755";
57+ text = ''
58+ #!/bin/sh
59+ exec ${package}/bin/google_authorized_keys "$@"
60+ '';
61+ };
62+ services.openssh.extraConfig = ''
63+ AuthorizedKeysCommand /etc/ssh/authorized_keys_command_google_oslogin %u
64+ AuthorizedKeysCommandUser nobody
65+ '';
66+ };
67+
68+}
nixos/modules/security/pam.nix+31−1
@@ -77,6 +77,30 @@ let
7777 '';
7878 };
7979
80+ googleOsLoginAccountVerification = mkOption {
81+ default = false;
82+ type = types.bool;
83+ description = ''
84+ If set, will use the Google OS Login PAM modules
85+ (<literal>pam_oslogin_login</literal>,
86+ <literal>pam_oslogin_admin</literal>) to verify possible OS Login
87+ users and set sudoers configuration accordingly.
88+ This only makes sense to enable for the <literal>sshd</literal> PAM
89+ service.
90+ '';
91+ };
92+
93+ googleOsLoginAuthentication = mkOption {
94+ default = false;
95+ type = types.bool;
96+ description = ''
97+ If set, will use the <literal>pam_oslogin_login</literal>'s user
98+ authentication methods to authenticate users using 2FA.
99+ This only makes sense to enable for the <literal>sshd</literal> PAM
100+ service.
101+ '';
102+ };
103+
80104 fprintAuth = mkOption {
81105 default = config.services.fprintd.enable;
82106 type = types.bool;
@@ -269,7 +293,7 @@ let
269293 text = mkDefault
270294 (''
271295 # Account management.
272− account ${if cfg.sssdStrictAccess then "required" else "sufficient"} pam_unix.so
296+ account required pam_unix.so
273297 ${optionalString use_ldap
274298 "account sufficient ${pam_ldap}/lib/security/pam_ldap.so"}
275299 ${optionalString (config.services.sssd.enable && cfg.sssdStrictAccess==false)
@@ -278,8 +302,14 @@ let
278302 "account [default=bad success=ok user_unknown=ignore] ${pkgs.sssd}/lib/security/pam_sss.so"}
279303 ${optionalString config.krb5.enable
280304 "account sufficient ${pam_krb5}/lib/security/pam_krb5.so"}
305+ ${optionalString cfg.googleOsLoginAccountVerification ''
306+ account [success=ok ignore=ignore default=die] ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_login.so
307+ account [success=ok default=ignore] ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_admin.so
308+ ''}
281309
282310 # Authentication management.
311+ ${optionalString cfg.googleOsLoginAuthentication
312+ "auth [success=done perm_denied=bad default=ignore] ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_login.so"}
283313 ${optionalString cfg.rootOK
284314 "auth sufficient pam_rootok.so"}
285315 ${optionalString cfg.requireWheel
nixos/modules/services/databases/aerospike.nix+1
@@ -43,6 +43,7 @@ in
4343
4444 package = mkOption {
4545 default = pkgs.aerospike;
46+ defaultText = "pkgs.aerospike";
4647 type = types.package;
4748 description = "Which Aerospike derivation to use";
4849 };
nixos/modules/services/databases/clickhouse.nix+5
@@ -70,6 +70,11 @@ with lib;
7070 };
7171 };
7272
73+ environment.systemPackages = [ pkgs.clickhouse ];
74+
75+ # startup requires a `/etc/localtime` which only if exists if `time.timeZone != null`
76+ time.timeZone = mkDefault "UTC";
77+
7378 };
7479
7580}
nixos/modules/services/hardware/vdr.nixnew file+71
@@ -0,0 +1,71 @@
1+{ config, lib, pkgs, ... }:
2+
3+with lib;
4+
5+let
6+ cfg = config.services.vdr;
7+ libDir = "/var/lib/vdr";
8+in {
9+
10+ ###### interface
11+
12+ options = {
13+
14+ services.vdr = {
15+ enable = mkEnableOption "enable VDR. Please put config into ${libDir}.";
16+
17+ package = mkOption {
18+ type = types.package;
19+ default = pkgs.vdr;
20+ defaultText = "pkgs.vdr";
21+ example = literalExample "pkgs.wrapVdr.override { plugins = with pkgs.vdrPlugins; [ hello ]; }";
22+ description = "Package to use.";
23+ };
24+
25+ videoDir = mkOption {
26+ type = types.path;
27+ default = "/srv/vdr/video";
28+ description = "Recording directory";
29+ };
30+
31+ extraArguments = mkOption {
32+ type = types.listOf types.str;
33+ default = [];
34+ description = "Additional command line arguments to pass to VDR.";
35+ };
36+ };
37+ };
38+
39+ ###### implementation
40+
41+ config = mkIf cfg.enable {
42+ systemd.tmpfiles.rules = [
43+ "d ${cfg.videoDir} 0755 vdr vdr -"
44+ "Z ${cfg.videoDir} - vdr vdr -"
45+ ];
46+
47+ systemd.services.vdr = {
48+ description = "VDR";
49+ wantedBy = [ "multi-user.target" ];
50+ serviceConfig = {
51+ ExecStart = ''
52+ ${cfg.package}/bin/vdr \
53+ --video="${cfg.videoDir}" \
54+ --config="${libDir}" \
55+ ${escapeShellArgs cfg.extraArguments}
56+ '';
57+ User = "vdr";
58+ CacheDirectory = "vdr";
59+ StateDirectory = "vdr";
60+ Restart = "on-failure";
61+ };
62+ };
63+
64+ users.users.vdr = {
65+ group = "vdr";
66+ home = libDir;
67+ };
68+
69+ users.groups.vdr = {};
70+ };
71+}
nixos/modules/services/network-filesystems/ipfs.nix+1−1
@@ -74,7 +74,7 @@ in {
7474
7575 services.ipfs = {
7676
77− enable = mkEnableOption "Interplanetary File System";
77+ enable = mkEnableOption "Interplanetary File System (WARNING: may cause severe network degredation)";
7878
7979 user = mkOption {
8080 type = types.str;
nixos/modules/services/networking/shairport-sync.nix+1−1
@@ -27,7 +27,7 @@ in
2727 };
2828
2929 arguments = mkOption {
30− default = "-v -d pulse";
30+ default = "-v pulse";
3131 description = ''
3232 Arguments to pass to the daemon. Defaults to a local pulseaudio
3333 server.
nixos/modules/services/x11/display-managers/default.nix+5−2
@@ -194,9 +194,12 @@ let
194194 ${xorg.lndir}/bin/lndir ${pkg}/share/xsessions $out/share/xsessions
195195 '') cfg.displayManager.extraSessionFilePackages}
196196
197− mkdir -p "$out/share/wayland-sessions"
197+
198198 ${concatMapStrings (pkg: ''
199− ${xorg.lndir}/bin/lndir ${pkg}/share/wayland-sessions $out/share/wayland-sessions
199+ if test -d ${pkg}/share/wayland-sessions; then
200+ mkdir -p "$out/share/wayland-sessions"
201+ ${xorg.lndir}/bin/lndir ${pkg}/share/wayland-sessions $out/share/wayland-sessions
202+ fi
200203 '') cfg.displayManager.extraSessionFilePackages}
201204 '';
202205
nixos/modules/virtualisation/google-compute-config.nix+1−27
@@ -65,33 +65,7 @@ in
6565 # GC has 1460 MTU
6666 networking.interfaces.eth0.mtu = 1460;
6767
68− # allow the google-accounts-daemon to manage users
69− users.mutableUsers = true;
70− # and allow users to sudo without password
71− security.sudo.enable = true;
72− security.sudo.extraConfig = ''
73− %google-sudoers ALL=(ALL:ALL) NOPASSWD:ALL
74− '';
75−
76− # NOTE: google-accounts tries to write to /etc/sudoers.d but the folder doesn't exist
77− # FIXME: not such file or directory on dynamic SSH provisioning
78− systemd.services.google-accounts-daemon = {
79− description = "Google Compute Engine Accounts Daemon";
80− # This daemon creates dynamic users
81− enable = config.users.mutableUsers;
82− after = [
83− "network.target"
84− "google-instance-setup.service"
85− "google-network-setup.service"
86− ];
87− requires = ["network.target"];
88− wantedBy = ["multi-user.target"];
89− path = with pkgs; [ shadow ];
90− serviceConfig = {
91− Type = "simple";
92− ExecStart = "${gce}/bin/google_accounts_daemon --debug";
93− };
94− };
68+ security.googleOsLogin.enable = true;
9569
9670 systemd.services.google-clock-skew-daemon = {
9771 description = "Google Compute Engine Clock Skew Daemon";
nixos/release-combined.nix+27−22
@@ -5,7 +5,7 @@
55{ nixpkgs ? { outPath = (import ../lib).cleanSource ./..; revCount = 56789; shortRev = "gfedcba"; }
66, stableBranch ? false
77, supportedSystems ? [ "x86_64-linux" ]
8−, limitedSupportedSystems ? [ "i686-linux" ]
8+, limitedSupportedSystems ? [ "i686-linux" "aarch64-linux" ]
99}:
1010
1111let
@@ -46,16 +46,20 @@ in rec {
4646 };
4747 constituents =
4848 let
49− all = x: map (system: x.${system}) supportedSystems;
49+ # Except for the given systems, return the system-specific constituent
50+ except = systems: x: map (system: x.${system}) (pkgs.lib.subtractLists systems supportedSystems);
51+ all = x: except [] x;
5052 in [
5153 nixos.channel
5254 (all nixos.dummy)
5355 (all nixos.manual)
5456
55− nixos.iso_minimal.x86_64-linux or []
56− nixos.iso_minimal.i686-linux or []
5757 nixos.iso_graphical.x86_64-linux or []
58+ nixos.iso_minimal.aarch64-linux or []
59+ nixos.iso_minimal.i686-linux or []
60+ nixos.iso_minimal.x86_64-linux or []
5861 nixos.ova.x86_64-linux or []
62+ nixos.sd_image.aarch64-linux or []
5963
6064 #(all nixos.tests.containers)
6165 (all nixos.tests.containers-imperative)
@@ -63,24 +67,24 @@ in rec {
6367 nixos.tests.chromium.x86_64-linux or []
6468 (all nixos.tests.firefox)
6569 (all nixos.tests.firewall)
66− (all nixos.tests.gnome3)
70+ (except ["aarch64-linux"] nixos.tests.gnome3)
6771 nixos.tests.installer.zfsroot.x86_64-linux or [] # ZFS is 64bit only
68− (all nixos.tests.installer.lvm)
69− (all nixos.tests.installer.luksroot)
70− (all nixos.tests.installer.separateBoot)
71− (all nixos.tests.installer.separateBootFat)
72− (all nixos.tests.installer.simple)
73− (all nixos.tests.installer.simpleLabels)
74− (all nixos.tests.installer.simpleProvided)
75− (all nixos.tests.installer.simpleUefiSystemdBoot)
76− (all nixos.tests.installer.swraid)
77− (all nixos.tests.installer.btrfsSimple)
78− (all nixos.tests.installer.btrfsSubvols)
79− (all nixos.tests.installer.btrfsSubvolDefault)
80− (all nixos.tests.boot.biosCdrom)
81− #(all nixos.tests.boot.biosUsb) # disabled due to issue #15690
82− (all nixos.tests.boot.uefiCdrom)
83− (all nixos.tests.boot.uefiUsb)
72+ (except ["aarch64-linux"] nixos.tests.installer.lvm)
73+ (except ["aarch64-linux"] nixos.tests.installer.luksroot)
74+ (except ["aarch64-linux"] nixos.tests.installer.separateBoot)
75+ (except ["aarch64-linux"] nixos.tests.installer.separateBootFat)
76+ (except ["aarch64-linux"] nixos.tests.installer.simple)
77+ (except ["aarch64-linux"] nixos.tests.installer.simpleLabels)
78+ (except ["aarch64-linux"] nixos.tests.installer.simpleProvided)
79+ (except ["aarch64-linux"] nixos.tests.installer.simpleUefiSystemdBoot)
80+ (except ["aarch64-linux"] nixos.tests.installer.swraid)
81+ (except ["aarch64-linux"] nixos.tests.installer.btrfsSimple)
82+ (except ["aarch64-linux"] nixos.tests.installer.btrfsSubvols)
83+ (except ["aarch64-linux"] nixos.tests.installer.btrfsSubvolDefault)
84+ (except ["aarch64-linux"] nixos.tests.boot.biosCdrom)
85+ #(except ["aarch64-linux"] nixos.tests.boot.biosUsb) # disabled due to issue #15690
86+ (except ["aarch64-linux"] nixos.tests.boot.uefiCdrom)
87+ (except ["aarch64-linux"] nixos.tests.boot.uefiUsb)
8488 (all nixos.tests.boot-stage1)
8589 (all nixos.tests.hibernate)
8690 nixos.tests.docker.x86_64-linux or []
@@ -132,7 +136,8 @@ in rec {
132136
133137 nixpkgs.tarball
134138 (all allSupportedNixpkgs.emacs)
135− (all allSupportedNixpkgs.jdk)
139+ # The currently available aarch64 JDK is unfree
140+ (except ["aarch64-linux"] allSupportedNixpkgs.jdk)
136141 ];
137142 });
138143
nixos/release.nix+2−2
@@ -157,7 +157,7 @@ in rec {
157157
158158 # A variant with a more recent (but possibly less stable) kernel
159159 # that might support more hardware.
160− iso_minimal_new_kernel = forMatchingSystems [ "x86_64-linux" ] (system: makeIso {
160+ iso_minimal_new_kernel = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeIso {
161161 module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix;
162162 type = "minimal-new-kernel";
163163 inherit system;
@@ -273,7 +273,7 @@ in rec {
273273 { services.httpd.enable = true;
274274 services.httpd.adminAddr = "foo@example.org";
275275 services.postgresql.enable = true;
276− services.postgresql.package = pkgs.postgresql_9_3;
276+ services.postgresql.package = pkgs.postgresql;
277277 environment.systemPackages = [ pkgs.php ];
278278 });
279279 };
nixos/tests/all-tests.nix+2
@@ -39,6 +39,7 @@ in
3939 cfssl = handleTestOn ["x86_64-linux"] ./cfssl.nix {};
4040 chromium = (handleTestOn ["x86_64-linux"] ./chromium.nix {}).stable or {};
4141 cjdns = handleTest ./cjdns.nix {};
42+ clickhouse = handleTest ./clickhouse.nix {};
4243 cloud-init = handleTest ./cloud-init.nix {};
4344 codimd = handleTest ./codimd.nix {};
4445 containers-bridge = handleTest ./containers-bridge.nix {};
@@ -80,6 +81,7 @@ in
8081 gitlab = handleTest ./gitlab.nix {};
8182 gitolite = handleTest ./gitolite.nix {};
8283 gjs = handleTest ./gjs.nix {};
84+ google-oslogin = handleTest ./google-oslogin {};
8385 gnome3 = handleTestOn ["x86_64-linux"] ./gnome3.nix {}; # libsmbios is unsupported on aarch64
8486 gnome3-gdm = handleTestOn ["x86_64-linux"] ./gnome3-gdm.nix {}; # libsmbios is unsupported on aarch64
8587 gocd-agent = handleTest ./gocd-agent.nix {};
nixos/tests/clickhouse.nixnew file+25
@@ -0,0 +1,25 @@
1+import ./make-test.nix ({ pkgs, ... }: {
2+ name = "clickhouse";
3+ meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ma27 ];
4+
5+ machine = {
6+ services.clickhouse.enable = true;
7+ };
8+
9+ testScript =
10+ let
11+ # work around quote/substitution complexity by Nix, Perl, bash and SQL.
12+ tableDDL = pkgs.writeText "ddl.sql" "CREATE TABLE `demo` (`value` FixedString(10)) engine = MergeTree PARTITION BY value ORDER BY tuple();";
13+ insertQuery = pkgs.writeText "insert.sql" "INSERT INTO `demo` (`value`) VALUES ('foo');";
14+ selectQuery = pkgs.writeText "select.sql" "SELECT * from `demo`";
15+ in
16+ ''
17+ $machine->start();
18+ $machine->waitForUnit("clickhouse.service");
19+ $machine->waitForOpenPort(9000);
20+
21+ $machine->succeed("cat ${tableDDL} | clickhouse-client");
22+ $machine->succeed("cat ${insertQuery} | clickhouse-client");
23+ $machine->succeed("cat ${selectQuery} | clickhouse-client | grep foo");
24+ '';
25+})
nixos/tests/google-oslogin/default.nixnew file+52
@@ -0,0 +1,52 @@
1+import ../make-test.nix ({ pkgs, ... } :
2+let
3+ inherit (import ./../ssh-keys.nix pkgs)
4+ snakeOilPrivateKey snakeOilPublicKey;
5+in {
6+ name = "google-oslogin";
7+ meta = with pkgs.stdenv.lib.maintainers; {
8+ maintainers = [ adisbladis flokli ];
9+ };
10+
11+ nodes = {
12+ # the server provides both the the mocked google metadata server and the ssh server
13+ server = (import ./server.nix pkgs);
14+
15+ client = { ... }: {};
16+ };
17+ testScript = ''
18+ startAll;
19+
20+ $server->waitForUnit("mock-google-metadata.service");
21+ $server->waitForOpenPort(80);
22+
23+ # mockserver should return a non-expired ssh key for both mockuser and mockadmin
24+ $server->succeed('${pkgs.google-compute-engine-oslogin}/bin/google_authorized_keys mockuser | grep -q "${snakeOilPublicKey}"');
25+ $server->succeed('${pkgs.google-compute-engine-oslogin}/bin/google_authorized_keys mockadmin | grep -q "${snakeOilPublicKey}"');
26+
27+ # install snakeoil ssh key on the client
28+ $client->succeed("mkdir -p ~/.ssh");
29+ $client->succeed("cat ${snakeOilPrivateKey} > ~/.ssh/id_snakeoil");
30+ $client->succeed("chmod 600 ~/.ssh/id_snakeoil");
31+
32+ $client->waitForUnit("network.target");
33+ $server->waitForUnit("sshd.service");
34+
35+ # we should not be able to connect as non-existing user
36+ $client->fail("ssh -o User=ghost -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server -i ~/.ssh/id_snakeoil 'true'");
37+
38+ # we should be able to connect as mockuser
39+ $client->succeed("ssh -o User=mockuser -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server -i ~/.ssh/id_snakeoil 'true'");
40+ # but we shouldn't be able to sudo
41+ $client->fail("ssh -o User=mockuser -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server -i ~/.ssh/id_snakeoil '/run/wrappers/bin/sudo /run/current-system/sw/bin/id' | grep -q 'root'");
42+
43+ # we should also be able to log in as mockadmin
44+ $client->succeed("ssh -o User=mockadmin -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server -i ~/.ssh/id_snakeoil 'true'");
45+ # pam_oslogin_admin.so should now have generated a sudoers file
46+ $server->succeed("find /run/google-sudoers.d | grep -q '/run/google-sudoers.d/mockadmin'");
47+
48+ # and we should be able to sudo
49+ $client->succeed("ssh -o User=mockadmin -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server -i ~/.ssh/id_snakeoil '/run/wrappers/bin/sudo /run/current-system/sw/bin/id' | grep -q 'root'");
50+ '';
51+ })
52+
nixos/tests/google-oslogin/server.nixnew file+29
@@ -0,0 +1,29 @@
1+{ pkgs, ... }:
2+let
3+ inherit (import ./../ssh-keys.nix pkgs)
4+ snakeOilPrivateKey snakeOilPublicKey;
5+in {
6+ networking.firewall.allowedTCPPorts = [ 80 ];
7+
8+ systemd.services.mock-google-metadata = {
9+ description = "Mock Google metadata service";
10+ serviceConfig.Type = "simple";
11+ serviceConfig.ExecStart = "${pkgs.python3}/bin/python ${./server.py}";
12+ environment = {
13+ SNAKEOIL_PUBLIC_KEY = snakeOilPublicKey;
14+ };
15+ wantedBy = [ "multi-user.target" ];
16+ after = [ "network.target" ];
17+ };
18+
19+ services.openssh.enable = true;
20+ services.openssh.challengeResponseAuthentication = false;
21+ services.openssh.passwordAuthentication = false;
22+
23+ security.googleOsLogin.enable = true;
24+
25+ # Mock google service
26+ networking.extraHosts = ''
27+ 127.0.0.1 metadata.google.internal
28+ '';
29+}
nixos/tests/google-oslogin/server.pynew file+96
@@ -0,0 +1,96 @@
1+#!/usr/bin/env python3
2+import json
3+import sys
4+import time
5+import os
6+import hashlib
7+import base64
8+
9+from http.server import BaseHTTPRequestHandler, HTTPServer
10+from typing import Dict
11+
12+SNAKEOIL_PUBLIC_KEY = os.environ['SNAKEOIL_PUBLIC_KEY']
13+
14+
15+def w(msg):
16+ sys.stderr.write(f"{msg}\n")
17+ sys.stderr.flush()
18+
19+
20+def gen_fingerprint(pubkey):
21+ decoded_key = base64.b64decode(pubkey.encode("ascii").split()[1])
22+ return hashlib.sha256(decoded_key).hexdigest()
23+
24+def gen_email(username):
25+ """username seems to be a 21 characters long number string, so mimic that in a reproducible way"""
26+ return str(int(hashlib.sha256(username.encode()).hexdigest(), 16))[0:21]
27+
28+def gen_mockuser(username: str, uid: str, gid: str, home_directory: str, snakeoil_pubkey: str) -> Dict:
29+ snakeoil_pubkey_fingerprint = gen_fingerprint(snakeoil_pubkey)
30+ # seems to be a 21 characters long numberstring, so mimic that in a reproducible way
31+ email = gen_email(username)
32+ return {
33+ "loginProfiles": [
34+ {
35+ "name": email,
36+ "posixAccounts": [
37+ {
38+ "primary": True,
39+ "username": username,
40+ "uid": uid,
41+ "gid": gid,
42+ "homeDirectory": home_directory,
43+ "operatingSystemType": "LINUX"
44+ }
45+ ],
46+ "sshPublicKeys": {
47+ snakeoil_pubkey_fingerprint: {
48+ "key": snakeoil_pubkey,
49+ "expirationTimeUsec": str((time.time() + 600) * 1000000), # 10 minutes in the future
50+ "fingerprint": snakeoil_pubkey_fingerprint
51+ }
52+ }
53+ }
54+ ]
55+ }
56+
57+
58+class ReqHandler(BaseHTTPRequestHandler):
59+ def _send_json_ok(self, data):
60+ self.send_response(200)
61+ self.send_header('Content-type', 'application/json')
62+ self.end_headers()
63+ out = json.dumps(data).encode()
64+ w(out)
65+ self.wfile.write(out)
66+
67+ def do_GET(self):
68+ p = str(self.path)
69+ # mockuser and mockadmin are allowed to login, both use the same snakeoil public key
70+ if p == '/computeMetadata/v1/oslogin/users?username=mockuser' \
71+ or p == '/computeMetadata/v1/oslogin/users?uid=1009719690':
72+ self._send_json_ok(gen_mockuser(username='mockuser', uid='1009719690', gid='1009719690',
73+ home_directory='/home/mockuser', snakeoil_pubkey=SNAKEOIL_PUBLIC_KEY))
74+ elif p == '/computeMetadata/v1/oslogin/users?username=mockadmin' \
75+ or p == '/computeMetadata/v1/oslogin/users?uid=1009719691':
76+ self._send_json_ok(gen_mockuser(username='mockadmin', uid='1009719691', gid='1009719691',
77+ home_directory='/home/mockadmin', snakeoil_pubkey=SNAKEOIL_PUBLIC_KEY))
78+
79+ # mockuser is allowed to login
80+ elif p == f"/computeMetadata/v1/oslogin/authorize?email={gen_email('mockuser')}&policy=login":
81+ self._send_json_ok({'success': True})
82+
83+ # mockadmin may also become root
84+ elif p == f"/computeMetadata/v1/oslogin/authorize?email={gen_email('mockadmin')}&policy=login" or p == f"/computeMetadata/v1/oslogin/authorize?email={gen_email('mockadmin')}&policy=adminLogin":
85+ self._send_json_ok({'success': True})
86+ else:
87+ sys.stderr.write(f"Unhandled path: {p}\n")
88+ sys.stderr.flush()
89+ self.send_response(501)
90+ self.end_headers()
91+ self.wfile.write(b'')
92+
93+
94+if __name__ == '__main__':
95+ s = HTTPServer(('0.0.0.0', 80), ReqHandler)
96+ s.serve_forever()
nixos/tests/home-assistant.nix+7−1
@@ -4,6 +4,7 @@ let
44 configDir = "/var/lib/foobar";
55 apiPassword = "some_secret";
66 mqttPassword = "another_secret";
7+ hassCli = "hass-cli --server http://hass:8123 --password '${apiPassword}'";
78
89in {
910 name = "home-assistant";
@@ -16,7 +17,7 @@ in {
1617 { pkgs, ... }:
1718 {
1819 environment.systemPackages = with pkgs; [
19− mosquitto
20+ mosquitto home-assistant-cli
2021 ];
2122 services.home-assistant = {
2223 inherit configDir;
@@ -71,6 +72,11 @@ in {
7172 $hass->waitUntilSucceeds("mosquitto_pub -V mqttv311 -t home-assistant/test -u homeassistant -P '${mqttPassword}' -m let_there_be_light");
7273 $hass->succeed("curl http://localhost:8123/api/states/binary_sensor.mqtt_binary_sensor -H 'x-ha-access: ${apiPassword}' | grep -qF '\"state\": \"on\"'");
7374
75+ # Toggle a binary sensor using hass-cli
76+ $hass->succeed("${hassCli} entity get binary_sensor.mqtt_binary_sensor | grep -qF '\"state\": \"on\"'");
77+ $hass->succeed("${hassCli} entity edit binary_sensor.mqtt_binary_sensor --json='{\"state\": \"off\"}'");
78+ $hass->succeed("curl http://localhost:8123/api/states/binary_sensor.mqtt_binary_sensor -H 'x-ha-access: ${apiPassword}' | grep -qF '\"state\": \"off\"'");
79+
7480 # Print log to ease debugging
7581 my $log = $hass->succeed("cat ${configDir}/home-assistant.log");
7682 print "\n### home-assistant.log ###\n";
pkgs/applications/audio/ams-lv2/default.nix+2
@@ -21,5 +21,7 @@ stdenv.mkDerivation rec {
2121 license = licenses.gpl3;
2222 maintainers = [ maintainers.goibhniu ];
2323 platforms = platforms.linux;
24+ # Build uses `-msse` and `-mfpmath=sse`
25+ badPlatforms = [ "aarch64-linux" ];
2426 };
2527}
pkgs/applications/audio/artyFX/default.nix+2
@@ -20,5 +20,7 @@ stdenv.mkDerivation rec {
2020 license = licenses.gpl2;
2121 maintainers = [ maintainers.magnetophon ];
2222 platforms = platforms.linux;
23+ # Build uses `-msse` and `-mfpmath=sse`
24+ badPlatforms = [ "aarch64-linux" ];
2325 };
2426}
pkgs/applications/audio/lmms/default.nix+4−4
@@ -1,17 +1,17 @@
11{ stdenv, fetchFromGitHub, cmake, pkgconfig, alsaLib ? null, fftwFloat, fltk13
2−, fluidsynth ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null
2+, fluidsynth_1 ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null
33, libsamplerate, libsoundio ? null, libsndfile, libvorbis ? null, portaudio ? null
44, qtbase, qtx11extras, qttools, SDL ? null }:
55
66stdenv.mkDerivation rec {
77 name = "lmms-${version}";
8− version = "1.2.0-rc6";
8+ version = "1.2.0-rc7";
99
1010 src = fetchFromGitHub {
1111 owner = "LMMS";
1212 repo = "lmms";
1313 rev = "v${version}";
14− sha256 = "1pqir5srfrknfd8nmbz565ymq18ffw8d8k9pbmzggaxvlcr12b25";
14+ sha256 = "1hshzf2sbdfw37y9rz1ksgvn81kp2n23dp74lsaasc2n7wzjwdis";
1515 fetchSubmodules = true;
1616 };
1717
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 alsaLib
2222 fftwFloat
2323 fltk13
24− fluidsynth
24+ fluidsynth_1
2525 lame
2626 libgig
2727 libjack2
pkgs/applications/audio/lollypop/default.nix+2−2
@@ -5,7 +5,7 @@
55
66python3.pkgs.buildPythonApplication rec {
77 pname = "lollypop";
8− version = "0.9.611";
8+ version = "0.9.906";
99
1010 format = "other";
1111 doCheck = false;
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
1414 url = "https://gitlab.gnome.org/World/lollypop";
1515 rev = "refs/tags/${version}";
1616 fetchSubmodules = true;
17− sha256 = "1k78a26sld0xd14c9hr4qv8c7qaq1m8zqk1mzrh4pl7ysqqg9p20";
17+ sha256 = "1blfq3vdzs3ji3sr1z6dn5c2f8w93zv2k7aa5xpfpfnds4zfd3q6";
1818 };
1919
2020 nativeBuildInputs = with python3.pkgs; [
pkgs/applications/audio/qjackctl/default.nix+2−2
@@ -1,14 +1,14 @@
11{ stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }:
22
33stdenv.mkDerivation rec {
4− version = "0.5.3";
4+ version = "0.5.5";
55 name = "qjackctl-${version}";
66
77 # some dependencies such as killall have to be installed additionally
88
99 src = fetchurl {
1010 url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
11− sha256 = "0x08af8m5l8qy9av3dlldsg58ny9nc69h1s4i6hqkvj24jwy6fw1";
11+ sha256 = "1rzzqa39a6llr52vjkjr0a86nc776kmr5xs52qqga8ms9697psz5";
1212 };
1313
1414 buildInputs = [
pkgs/applications/audio/qmmp/default.nix+2−2
@@ -29,11 +29,11 @@
2929# handle that.
3030
3131stdenv.mkDerivation rec {
32− name = "qmmp-1.2.4";
32+ name = "qmmp-1.2.5";
3333
3434 src = fetchurl {
3535 url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
36− sha256 = "0rmfd6h0186b6n4g079d8kshdmp3k5n8w06a1l41m4p3fgq08j92";
36+ sha256 = "1xs8kg65088yzdhdkymmknkp1s4adzv095f5jhjvy62s8ymyjvnx";
3737 };
3838
3939 buildInputs =
pkgs/applications/audio/rosegarden/default.nix+2−2
@@ -3,12 +3,12 @@
33, liblo, liblrdf, libsamplerate, libsndfile, lirc ? null, qtbase }:
44
55stdenv.mkDerivation (rec {
6− version = "18.06";
6+ version = "18.12";
77 name = "rosegarden-${version}";
88
99 src = fetchurl {
1010 url = "mirror://sourceforge/rosegarden/${name}.tar.bz2";
11− sha256 = "04qc80sqb2ji42pq3mayhvqqn39hlxzymsywpbpzfpchr19chxx7";
11+ sha256 = "15i9fm0vkn3wsgahaxqi1j5zs0wc0j3wdwml0x49084gk2p328vb";
1212 };
1313
1414 patchPhase = ''
pkgs/applications/audio/whipper/default.nix+2−2
@@ -3,13 +3,13 @@
33
44python2.pkgs.buildPythonApplication rec {
55 name = "whipper-${version}";
6− version = "0.7.2";
6+ version = "0.7.3";
77
88 src = fetchFromGitHub {
99 owner = "whipper-team";
1010 repo = "whipper";
1111 rev = "v${version}";
12− sha256 = "17cn11c6c62pfhhp6vcslxpanb0czh2xbxq1g6wd7bpmgw38yd8v";
12+ sha256 = "0ypbgc458i7yvbyvg6wg6agz5yzlwm1v6zw7fmyq9h59xsv27mpr";
1313 };
1414
1515 pythonPath = with python2.pkgs; [
pkgs/applications/editors/android-studio/default.nix+6−6
@@ -13,14 +13,14 @@ let
1313 sha256Hash = "117skqjax1xz9plarhdnrw2rwprjpybdc7mx7wggxapyy920vv5r";
1414 };
1515 betaVersion = {
16− version = "3.3.0.18"; # "Android Studio 3.3 RC 2"
17− build = "182.5160847";
18− sha256Hash = "05rjwvcph0wx0p0hai5z6n9lnyhk3i5yvbvhr51jc8s3k3b6jyi5";
16+ version = "3.3.0.19"; # "Android Studio 3.3 RC 3"
17+ build = "182.5183351";
18+ sha256Hash = "1rql4kxjic4qjcd8zssw2mmi55cxpzd0wp5g0kzwk5wybsfdcqhy";
1919 };
2020 latestVersion = { # canary & dev
21− version = "3.4.0.7"; # "Android Studio 3.4 Canary 8"
22− build = "183.5173923";
23− sha256Hash = "0bf96c9db15rw1k1znz6yxhbrn9q990zy3pkq0nsirnqfpgllvpi";
21+ version = "3.4.0.8"; # "Android Studio 3.4 Canary 9"
22+ build = "183.5186062";
23+ sha256Hash = "04i7ys0qzj3039h41q4na6737gl55wpp6hiwfas2h6zwvj25a9z9";
2424 };
2525in rec {
2626 # Old alias
pkgs/applications/editors/emacs-modes/elpa-generated.nix+137−57
@@ -39,10 +39,10 @@
3939 elpaBuild {
4040 pname = "ada-mode";
4141 ename = "ada-mode";
42− version = "5.3.2";
42+ version = "6.0.1";
4343 src = fetchurl {
44− url = "https://elpa.gnu.org/packages/ada-mode-5.3.2.tar";
45− sha256 = "1ayp4y8q201fny2far9p2ziji968f2svr7apvfrlwnnpkk3w9lif";
44+ url = "https://elpa.gnu.org/packages/ada-mode-6.0.1.tar";
45+ sha256 = "12ryblyqnhqibaffibs7qq3xq9rf5d4y9dishq82pbbh9y8s17hj";
4646 };
4747 packageRequires = [ cl-lib emacs wisi ];
4848 meta = {
@@ -478,10 +478,10 @@
478478 elpaBuild {
479479 pname = "company";
480480 ename = "company";
481− version = "0.9.7";
481+ version = "0.9.9";
482482 src = fetchurl {
483− url = "https://elpa.gnu.org/packages/company-0.9.7.tar";
484− sha256 = "17p61yzbgymr46y6vbz7pfvydp5hfkqckbwficwkpz0nq8gcklhs";
483+ url = "https://elpa.gnu.org/packages/company-0.9.9.tar";
484+ sha256 = "1qinkz8gwgc27p3p3c9kddrrwx0jb4w0vgx7jq8fwpfj1n92m1rv";
485485 };
486486 packageRequires = [ emacs ];
487487 meta = {
@@ -711,16 +711,16 @@
711711 license = lib.licenses.free;
712712 };
713713 }) {};
714− diff-hl = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
714+ diff-hl = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
715715 elpaBuild {
716716 pname = "diff-hl";
717717 ename = "diff-hl";
718− version = "1.8.4";
718+ version = "1.8.5";
719719 src = fetchurl {
720− url = "https://elpa.gnu.org/packages/diff-hl-1.8.4.tar";
721− sha256 = "0axhidc3cym7a2x4rpxf4745qss9s9ajyg4s9h5b4zn7v7fyp71n";
720+ url = "https://elpa.gnu.org/packages/diff-hl-1.8.5.tar";
721+ sha256 = "1vxc7z7c2qs0mx7l5sa4sybi5qbzv0s79flj74p1ynw8dl3qxg3d";
722722 };
723− packageRequires = [ cl-lib ];
723+ packageRequires = [ cl-lib emacs ];
724724 meta = {
725725 homepage = "https://elpa.gnu.org/packages/diff-hl.html";
726726 license = lib.licenses.free;
@@ -835,10 +835,10 @@
835835 elpaBuild {
836836 pname = "ebdb";
837837 ename = "ebdb";
838− version = "0.6";
838+ version = "0.6.2";
839839 src = fetchurl {
840− url = "https://elpa.gnu.org/packages/ebdb-0.6.tar";
841− sha256 = "1zj8jvq5l4wlk4734i3isxi4barpivarq2f9kqzkfia7mcspxav8";
840+ url = "https://elpa.gnu.org/packages/ebdb-0.6.2.tar";
841+ sha256 = "1b37962mvm80vk5sdk9kfvvxsxn83z5z6zvm20m9997ggl5dv4dz";
842842 };
843843 packageRequires = [ cl-lib emacs seq ];
844844 meta = {
@@ -891,16 +891,21 @@
891891 license = lib.licenses.free;
892892 };
893893 }) {};
894− eglot = callPackage ({ elpaBuild, emacs, fetchurl, jsonrpc, lib }:
894+ eglot = callPackage ({ elpaBuild
895+ , emacs
896+ , fetchurl
897+ , flymake ? null
898+ , jsonrpc
899+ , lib }:
895900 elpaBuild {
896901 pname = "eglot";
897902 ename = "eglot";
898− version = "1.1";
903+ version = "1.3";
899904 src = fetchurl {
900− url = "https://elpa.gnu.org/packages/eglot-1.1.tar";
901− sha256 = "01h4wh87lrd9l50y20gjjkgg760v8ixvbcb3q8jykl29989zw62y";
905+ url = "https://elpa.gnu.org/packages/eglot-1.3.tar";
906+ sha256 = "0hndqabxvrq4ak5kx2xlds5pkayi2bfd1f1xk8aidzk5i70f7yry";
902907 };
903− packageRequires = [ emacs jsonrpc ];
908+ packageRequires = [ emacs flymake jsonrpc ];
904909 meta = {
905910 homepage = "https://elpa.gnu.org/packages/eglot.html";
906911 license = lib.licenses.free;
@@ -915,10 +920,10 @@
915920 elpaBuild {
916921 pname = "el-search";
917922 ename = "el-search";
918− version = "1.7.15";
923+ version = "1.8.7";
919924 src = fetchurl {
920− url = "https://elpa.gnu.org/packages/el-search-1.7.15.tar";
921− sha256 = "000z8vllz53vmfblsrxjm2nc4h9lcyxw8xxqfxxyl99zhfiikjai";
925+ url = "https://elpa.gnu.org/packages/el-search-1.8.7.tar";
926+ sha256 = "0jlalcz8hppra2chmppd6b2g5dz8w6yscqylkx28pd7wy6aadx1r";
922927 };
923928 packageRequires = [ cl-print emacs stream ];
924929 meta = {
@@ -1032,10 +1037,10 @@
10321037 elpaBuild {
10331038 pname = "exwm";
10341039 ename = "exwm";
1035− version = "0.20";
1040+ version = "0.21";
10361041 src = fetchurl {
1037− url = "https://elpa.gnu.org/packages/exwm-0.20.tar";
1038− sha256 = "0nhhzbkm0mkj7sd1dy2c19cmn56gyaj9nl8kgy86h4fp63hjaz04";
1042+ url = "https://elpa.gnu.org/packages/exwm-0.21.tar";
1043+ sha256 = "07ng1pgsnc3isfsyzh2gfc7391p9il8lb5xqf1z6yqn20w7k6xzj";
10391044 };
10401045 packageRequires = [ xelb ];
10411046 meta = {
@@ -1088,6 +1093,21 @@
10881093 license = lib.licenses.free;
10891094 };
10901095 }) {};
1096+ flymake = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
1097+ elpaBuild {
1098+ pname = "flymake";
1099+ ename = "flymake";
1100+ version = "1.0.3";
1101+ src = fetchurl {
1102+ url = "https://elpa.gnu.org/packages/flymake-1.0.3.el";
1103+ sha256 = "1algny2zhcl4vc7kp5czcqvxzpgqfjnz2rnkv26r0ylxig3s98v7";
1104+ };
1105+ packageRequires = [ emacs ];
1106+ meta = {
1107+ homepage = "https://elpa.gnu.org/packages/flymake.html";
1108+ license = lib.licenses.free;
1109+ };
1110+ }) {};
10911111 fountain-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
10921112 elpaBuild {
10931113 pname = "fountain-mode";
@@ -1197,10 +1217,10 @@
11971217 elpaBuild {
11981218 pname = "gnorb";
11991219 ename = "gnorb";
1200− version = "1.6.0";
1220+ version = "1.6.1";
12011221 src = fetchurl {
1202− url = "https://elpa.gnu.org/packages/gnorb-1.6.0.tar";
1203− sha256 = "0nssrnrf083mw7kllp0hkxdkklvildzmslcs1r3zf2hnl1ggfs8y";
1222+ url = "https://elpa.gnu.org/packages/gnorb-1.6.1.tar";
1223+ sha256 = "0n4460hsmcc3l0y3nb3fysvh33cjwgv0a3mkc26xcx8v85zl7m63";
12041224 };
12051225 packageRequires = [ cl-lib ];
12061226 meta = {
@@ -1232,10 +1252,10 @@
12321252 elpaBuild {
12331253 pname = "gnus-mock";
12341254 ename = "gnus-mock";
1235− version = "0.3.0";
1255+ version = "0.4.0";
12361256 src = fetchurl {
1237− url = "https://elpa.gnu.org/packages/gnus-mock-0.3.0.tar";
1238− sha256 = "02z3f8njwv480fff57dbrf7nhmwbgm4apzicnzwmip5j4a6w5q0n";
1257+ url = "https://elpa.gnu.org/packages/gnus-mock-0.4.0.tar";
1258+ sha256 = "058bd4f8za9bxayrd2j5b05qvk8lxxm8mmfwxb73d7k15z3z3l3s";
12391259 };
12401260 packageRequires = [];
12411261 meta = {
@@ -1243,6 +1263,21 @@
12431263 license = lib.licenses.free;
12441264 };
12451265 }) {};
1266+ gpastel = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
1267+ elpaBuild {
1268+ pname = "gpastel";
1269+ ename = "gpastel";
1270+ version = "0.3.0";
1271+ src = fetchurl {
1272+ url = "https://elpa.gnu.org/packages/gpastel-0.3.0.el";
1273+ sha256 = "0426y55f7mbfbyjhl2bn0c2cn57jd4d8xvzri2pbqakff8ij470a";
1274+ };
1275+ packageRequires = [ emacs ];
1276+ meta = {
1277+ homepage = "https://elpa.gnu.org/packages/gpastel.html";
1278+ license = lib.licenses.free;
1279+ };
1280+ }) {};
12461281 heap = callPackage ({ elpaBuild, fetchurl, lib }:
12471282 elpaBuild {
12481283 pname = "heap";
@@ -1459,10 +1494,10 @@
14591494 elpaBuild {
14601495 pname = "jsonrpc";
14611496 ename = "jsonrpc";
1462− version = "1.0.6";
1497+ version = "1.0.7";
14631498 src = fetchurl {
1464− url = "https://elpa.gnu.org/packages/jsonrpc-1.0.6.el";
1465− sha256 = "13a19smz8cksv6fgcyxb111csvagkp07z5nl4imyp5b23asgl70p";
1499+ url = "https://elpa.gnu.org/packages/jsonrpc-1.0.7.el";
1500+ sha256 = "19z35gjphl4mlgpznfhlccgipnmbb3c1dvax48f4hw8qwksfcac1";
14661501 };
14671502 packageRequires = [ emacs ];
14681503 meta = {
@@ -1858,10 +1893,10 @@
18581893 elpaBuild {
18591894 pname = "nhexl-mode";
18601895 ename = "nhexl-mode";
1861− version = "1.0";
1896+ version = "1.2";
18621897 src = fetchurl {
1863− url = "https://elpa.gnu.org/packages/nhexl-mode-1.0.el";
1864− sha256 = "1bf0jfim41m08ac4p4zxjj6qqw7f86gwiwyvfjg68n2nzbzgz1i9";
1898+ url = "https://elpa.gnu.org/packages/nhexl-mode-1.2.el";
1899+ sha256 = "031h22p564qdvr9khs05qcba06pmsk68cr7zyc7c04hfr3y3ziaf";
18651900 };
18661901 packageRequires = [ cl-lib emacs ];
18671902 meta = {
@@ -1989,6 +2024,21 @@
19892024 license = lib.licenses.free;
19902025 };
19912026 }) {};
2027+ org-edna = callPackage ({ elpaBuild, emacs, fetchurl, lib, org, seq }:
2028+ elpaBuild {
2029+ pname = "org-edna";
2030+ ename = "org-edna";
2031+ version = "1.0.1";
2032+ src = fetchurl {
2033+ url = "https://elpa.gnu.org/packages/org-edna-1.0.1.tar";
2034+ sha256 = "0xzyzx3pq1q6d66qcqx38pgxzn160y9yrzpy0ka8ap5xsm7ngn7m";
2035+ };
2036+ packageRequires = [ emacs org seq ];
2037+ meta = {
2038+ homepage = "https://elpa.gnu.org/packages/org-edna.html";
2039+ license = lib.licenses.free;
2040+ };
2041+ }) {};
19922042 orgalist = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
19932043 elpaBuild {
19942044 pname = "orgalist";
@@ -2113,10 +2163,10 @@
21132163 elpaBuild {
21142164 pname = "posframe";
21152165 ename = "posframe";
2116− version = "0.3.0";
2166+ version = "0.4.2";
21172167 src = fetchurl {
2118− url = "https://elpa.gnu.org/packages/posframe-0.3.0.el";
2119− sha256 = "0q74lwklr29c50qgaqly48nj7f49kgxiv70lsvhdy8cg2v082v8k";
2168+ url = "https://elpa.gnu.org/packages/posframe-0.4.2.el";
2169+ sha256 = "1h8vvxvsg41vc1nnglqjs2q0k1yzfsn72skga9s76qa3zxmx6kds";
21202170 };
21212171 packageRequires = [ emacs ];
21222172 meta = {
@@ -2522,10 +2572,10 @@
25222572 elpaBuild {
25232573 pname = "ssh-deploy";
25242574 ename = "ssh-deploy";
2525− version = "2.0";
2575+ version = "3.0";
25262576 src = fetchurl {
2527− url = "https://elpa.gnu.org/packages/ssh-deploy-2.0.tar";
2528− sha256 = "0mrgnandnqk25bx3x2a7hdw7pmjiq24w2lad7l2xqaqpwb8r6wgj";
2577+ url = "https://elpa.gnu.org/packages/ssh-deploy-3.0.tar";
2578+ sha256 = "0lv9qwm1dhcd2l2mnhjfpqsz6xx0wabjg5j5sm3425fjsaqws6m7";
25292579 };
25302580 packageRequires = [ emacs ];
25312581 meta = {
@@ -2552,10 +2602,10 @@
25522602 elpaBuild {
25532603 pname = "svg";
25542604 ename = "svg";
2555− version = "0.1";
2605+ version = "0.2";
25562606 src = fetchurl {
2557− url = "https://elpa.gnu.org/packages/svg-0.1.el";
2558− sha256 = "0v27casnjvjjaalmrbw494sk0zciws037cn6cmcc6rnhj30lzbv5";
2607+ url = "https://elpa.gnu.org/packages/svg-0.2.el";
2608+ sha256 = "14yfi27v3zdzh1chcjiq4l63iwh0vd99wv1z4w7agr33540jybc5";
25592609 };
25602610 packageRequires = [ emacs ];
25612611 meta = {
@@ -2578,6 +2628,21 @@
25782628 license = lib.licenses.free;
25792629 };
25802630 }) {};
2631+ system-packages = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
2632+ elpaBuild {
2633+ pname = "system-packages";
2634+ ename = "system-packages";
2635+ version = "1.0.10";
2636+ src = fetchurl {
2637+ url = "https://elpa.gnu.org/packages/system-packages-1.0.10.tar";
2638+ sha256 = "1vwf2j0fxrsqmrgc7x5nkkg0vlhwgxppc4w7kb5is6dgrssskpb5";
2639+ };
2640+ packageRequires = [ emacs ];
2641+ meta = {
2642+ homepage = "https://elpa.gnu.org/packages/system-packages.html";
2643+ license = lib.licenses.free;
2644+ };
2645+ }) {};
25812646 tNFA = callPackage ({ elpaBuild, fetchurl, lib, queue }:
25822647 elpaBuild {
25832648 pname = "tNFA";
@@ -2767,6 +2832,21 @@
27672832 license = lib.licenses.free;
27682833 };
27692834 }) {};
2835+ vcl-mode = callPackage ({ elpaBuild, fetchurl, lib }:
2836+ elpaBuild {
2837+ pname = "vcl-mode";
2838+ ename = "vcl-mode";
2839+ version = "1.1";
2840+ src = fetchurl {
2841+ url = "https://elpa.gnu.org/packages/vcl-mode-1.1.el";
2842+ sha256 = "1r70pmvr95k5f2xphvhliqvyh7al0qabm7wvkamximcssvs38q1h";
2843+ };
2844+ packageRequires = [];
2845+ meta = {
2846+ homepage = "https://elpa.gnu.org/packages/vcl-mode.html";
2847+ license = lib.licenses.free;
2848+ };
2849+ }) {};
27702850 vdiff = callPackage ({ elpaBuild, emacs, fetchurl, hydra, lib }:
27712851 elpaBuild {
27722852 pname = "vdiff";
@@ -2932,16 +3012,16 @@
29323012 license = lib.licenses.free;
29333013 };
29343014 }) {};
2935− wisi = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
3015+ wisi = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }:
29363016 elpaBuild {
29373017 pname = "wisi";
29383018 ename = "wisi";
2939− version = "1.1.6";
3019+ version = "2.0.1";
29403020 src = fetchurl {
2941− url = "https://elpa.gnu.org/packages/wisi-1.1.6.tar";
2942− sha256 = "0p7hm9l4gbp50rmpqna6jnc1pss2axdd6m6hk9ik4afbz0knzwnk";
3021+ url = "https://elpa.gnu.org/packages/wisi-2.0.1.tar";
3022+ sha256 = "1h0g6y33jrafcabgyi7j700hpv4p56v84c2mlqb334k1g9rq3709";
29433023 };
2944− packageRequires = [ cl-lib emacs ];
3024+ packageRequires = [ cl-lib emacs seq ];
29453025 meta = {
29463026 homepage = "https://elpa.gnu.org/packages/wisi.html";
29473027 license = lib.licenses.free;
@@ -2966,10 +3046,10 @@
29663046 elpaBuild {
29673047 pname = "xclip";
29683048 ename = "xclip";
2969− version = "1.5";
3049+ version = "1.7";
29703050 src = fetchurl {
2971− url = "https://elpa.gnu.org/packages/xclip-1.5.el";
2972− sha256 = "1fyqyi0672igjn53xlaj8hzbymkw08pk6wj58ndbrnm410g0h0i9";
3051+ url = "https://elpa.gnu.org/packages/xclip-1.7.el";
3052+ sha256 = "0jpy3zzbyb16vqa9l6m45crzlypwvscvs76h8lci7kvp91kq954r";
29733053 };
29743054 packageRequires = [];
29753055 meta = {
@@ -3044,10 +3124,10 @@
30443124 elpaBuild {
30453125 pname = "zones";
30463126 ename = "zones";
3047− version = "2018.11.13";
3127+ version = "2018.11.21";
30483128 src = fetchurl {
3049− url = "https://elpa.gnu.org/packages/zones-2018.11.13.el";
3050− sha256 = "0716m9s5qjp5w3gdlx0p53qrfylw6mhdmic88qmsndmhkijsrax4";
3129+ url = "https://elpa.gnu.org/packages/zones-2018.11.21.el";
3130+ sha256 = "0s68mnynjd08gyga7xdnb0zy3irsxl1jryidpcrkzg821vfrk11i";
30513131 };
30523132 packageRequires = [];
30533133 meta = {
pkgs/applications/editors/emacs-modes/org-generated.nix+6−6
@@ -4,10 +4,10 @@
44 elpaBuild {
55 pname = "org";
66 ename = "org";
7− version = "20181119";
7+ version = "20181217";
88 src = fetchurl {
9− url = "http://orgmode.org/elpa/org-20181119.tar";
10− sha256 = "0li6mx0kv70js3mlw7wxk1yi8kgc3nxnb87kdb7jy68xh4lsila7";
9+ url = "http://orgmode.org/elpa/org-20181217.tar";
10+ sha256 = "0j301z0429dnk1d3bn7524y848vp9il41sxpm9z9hs7gpzfdcw28";
1111 };
1212 packageRequires = [];
1313 meta = {
@@ -19,10 +19,10 @@
1919 elpaBuild {
2020 pname = "org-plus-contrib";
2121 ename = "org-plus-contrib";
22− version = "20181119";
22+ version = "20181217";
2323 src = fetchurl {
24− url = "http://orgmode.org/elpa/org-plus-contrib-20181119.tar";
25− sha256 = "0dz0vn2xyidifrwrd604yknyq843i31jcc8qgsi6wib29rh7zzpa";
24+ url = "http://orgmode.org/elpa/org-plus-contrib-20181217.tar";
25+ sha256 = "1p7v9246zxkp68kc63550x3w7pmhx1drgj20wmddhvs0bqd3k3ap";
2626 };
2727 packageRequires = [];
2828 meta = {
pkgs/applications/editors/ghostwriter/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, qmake, pkgconfig, qtwebkit, hunspell }:
1+{ stdenv, fetchFromGitHub, qmake, pkgconfig, qttools, qtwebkit, hunspell }:
22
33stdenv.mkDerivation rec {
44 pname = "ghostwriter";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "1pqlr08z5syqcq5p282asxwzrrm7c1w94baxyb467swh8yp3fj5m";
1313 };
1414
15− nativeBuildInputs = [ qmake pkgconfig ];
15+ nativeBuildInputs = [ qmake pkgconfig qttools ];
1616
1717 buildInputs = [ qtwebkit hunspell ];
1818
pkgs/applications/editors/gnome-builder/default.nix+2−2
@@ -30,14 +30,14 @@
3030, wrapGAppsHook
3131}:
3232let
33− version = "3.30.0";
33+ version = "3.30.2";
3434 pname = "gnome-builder";
3535in stdenv.mkDerivation {
3636 name = "${pname}-${version}";
3737
3838 src = fetchurl {
3939 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
40− sha256 = "1pshzpjy9rk6gijlm97s316aihykzxrmb07vilp17q5857passak";
40+ sha256 = "05yax7iv9g831xvw9xdc01qc0l7qpmh6rfd692x8cbg76hljxdrr";
4141 };
4242
4343 nativeBuildInputs = [
pkgs/applications/editors/manuskript/default.nix+2−2
@@ -2,13 +2,13 @@
22
33python3Packages.buildPythonApplication rec {
44 pname = "manuskript";
5− version = "0.3.0";
5+ version = "0.8.0";
66
77 src = fetchFromGitHub {
88 repo = pname;
99 owner = "olivierkes";
1010 rev = version;
11− sha256 = "0bqxc4a8kyi6xz1zs0dp85wxl9h4v8lzc6073bbcsn1zg4y59ys7";
11+ sha256 = "0vqz02p3m9n4hk2jplnklr9s6niqdm5iykab6nblqdm4plb04c34";
1212 };
1313
1414 propagatedBuildInputs = [
pkgs/applications/graphics/rawtherapee/default.nix+2−2
@@ -4,14 +4,14 @@
44}:
55
66stdenv.mkDerivation rec {
7− version = "5.4";
7+ version = "5.5";
88 name = "rawtherapee-" + version;
99
1010 src = fetchFromGitHub {
1111 owner = "Beep6581";
1212 repo = "RawTherapee";
1313 rev = version;
14− sha256 = "1h2x5biqsb4kfwsffqkyk8ky22qv2a0cjs1s445x9farcr3kwk99";
14+ sha256 = "13clnx7rwkfa7wxgsim1xdx2pd7gwmmdad1m8a3fvywr20ml8xzk";
1515 };
1616
1717 nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ];
pkgs/applications/graphics/tesseract/4.x.nixdeleted−61
@@ -1,61 +0,0 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkgconfig
2−, leptonica, libpng, libtiff, icu, pango, opencl-headers
3−
4−# Supported list of languages or `null' for all available languages
5−, enableLanguages ? null
6−}:
7−
8−stdenv.mkDerivation rec {
9− name = "tesseract-${version}";
10− version = "4.0.0";
11−
12− src = fetchFromGitHub {
13− owner = "tesseract-ocr";
14− repo = "tesseract";
15− rev = version;
16− sha256 = "1b5fi2vibc4kk9b30kkk4ais4bw8fbbv24bzr5709194hb81cav8";
17− };
18−
19− tessdata = fetchFromGitHub {
20− owner = "tesseract-ocr";
21− repo = "tessdata";
22− rev = version;
23− sha256 = "1chw1ya5zf8aaj2ixr9x013x7vwwwjjmx6f2ag0d6i14lypygy28";
24− };
25−
26− nativeBuildInputs = [ pkgconfig autoreconfHook autoconf-archive ];
27− buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ];
28−
29− # Copy the .traineddata files of the languages specified in enableLanguages
30− # into `$out/share/tessdata' and check afterwards if copying was successful.
31− postInstall = let
32− mkArg = lang: "-iname ${stdenv.lib.escapeShellArg "${lang}.traineddata"}";
33− mkFindArgs = stdenv.lib.concatMapStringsSep " -o " mkArg;
34− findLangArgs = if enableLanguages != null
35− then "\\( ${mkFindArgs enableLanguages} \\)"
36− else "-iname '*.traineddata'";
37− in ''
38− numLangs="$(find "$tessdata" -mindepth 1 -maxdepth 1 -type f \
39− ${findLangArgs} -exec cp -t "$out/share/tessdata" {} + -print | wc -l)"
40−
41− ${if enableLanguages != null then ''
42− expected=${toString (builtins.length enableLanguages)}
43− '' else ''
44− expected="$(ls -1 "$tessdata/"*.traineddata | wc -l)"
45− ''}
46−
47− if [ "$numLangs" -ne "$expected" ]; then
48− echo "Expected $expected languages, but $numLangs" \
49− "were copied to \`$out/share/tessdata'" >&2
50− exit 1
51− fi
52− '';
53−
54− meta = {
55− description = "OCR engine";
56− homepage = https://github.com/tesseract-ocr/tesseract;
57− license = stdenv.lib.licenses.asl20;
58− maintainers = with stdenv.lib.maintainers; [viric];
59− platforms = with stdenv.lib.platforms; linux;
60− };
61−}
pkgs/applications/graphics/tesseract/default.nix+13−62
@@ -1,67 +1,18 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
2−, leptonica, libpng, libtiff, icu, pango, opencl-headers
3−# Supported list of languages or `null' for all available languages
4−, enableLanguages ? null
5−# if you want just a specific list of languages, optionally specify a hash
6−# to make tessdata a fixed output derivation.
7−, enableLanguagesHash ? (if enableLanguages == null # all languages
8− then "1h48xfzabhn0ldbx5ib67cp9607pr0zpblsy8z6fs4knn0zznfnw"
9− else null)
10−}:
1+{ callPackage, lowPrio }:
112
12−let tessdata = stdenv.mkDerivation ({
13− name = "tessdata";
14− src = fetchFromGitHub {
15− owner = "tesseract-ocr";
16− repo = "tessdata";
17− rev = "3cf1e2df1fe1d1da29295c9ef0983796c7958b7d";
18− # when updating don't forget to update the default value fo enableLanguagesHash
19− sha256 = "1v4b63v5nzcxr2y3635r19l7lj5smjmc9vfk0wmxlryxncb4vpg7";
20− };
21− buildCommand = ''
22− cd $src;
23− for lang in ${if enableLanguages==null then "*.traineddata" else stdenv.lib.concatMapStringsSep " " (x: x+".traineddata") enableLanguages} ; do
24− install -Dt $out/share/tessdata $src/$lang ;
25− done;
26− '';
27− preferLocalBuild = true;
28− } // (stdenv.lib.optionalAttrs (enableLanguagesHash != null) {
29− # when a hash is given, we make this a fixed output derivation.
30− outputHashMode = "recursive";
31− outputHashAlgo = "sha256";
32− outputHash = enableLanguagesHash;
33− }));
3+let
4+ base3 = callPackage ./tesseract3.nix {};
5+ base4 = callPackage ./tesseract4.nix {};
6+ languages = callPackage ./languages.nix {};
347in
35−
36−stdenv.mkDerivation rec {
37− name = "tesseract-${version}";
38− version = "3.05.00";
39−
40− src = fetchFromGitHub {
41− owner = "tesseract-ocr";
42− repo = "tesseract";
43− rev = version;
44− sha256 = "11wrpcfl118wxsv2c3w2scznwb48c4547qml42s2bpdz079g8y30";
8+{
9+ tesseract3 = callPackage ./wrapper.nix {
10+ tesseractBase = base3;
11+ languages = languages.v3;
4512 };
4613
47− enableParallelBuilding = true;
48−
49− nativeBuildInputs = [ pkgconfig autoreconfHook ];
50− buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ];
51−
52− LIBLEPT_HEADERSDIR = "${leptonica}/include";
53−
54− postInstall = ''
55− for i in ${tessdata}/share/tessdata/*; do
56− ln -s $i $out/share/tessdata;
57− done
58− '';
59−
60− meta = {
61− description = "OCR engine";
62− homepage = https://github.com/tesseract-ocr/tesseract;
63− license = stdenv.lib.licenses.asl20;
64− maintainers = with stdenv.lib.maintainers; [viric];
65− platforms = with stdenv.lib.platforms; linux ++ darwin;
66− };
14+ tesseract4 = lowPrio (callPackage ./wrapper.nix {
15+ tesseractBase = base4;
16+ languages = languages.v4;
17+ });
6718}
pkgs/applications/graphics/tesseract/fetch-language-hashesnew file+35
@@ -0,0 +1,35 @@
1+#!/usr/bin/env bash
2+
3+# Usage:
4+# ./fetch-language-hashes <tessdataRev> [<language code>…]
5+#
6+# Fetches all languages if no language codes are given.
7+#
8+# Example:
9+# ./fetch-language-hashes 4.0.0 eng spa
10+#
11+# Output:
12+# eng = "0iy0...";
13+# spa = "15kw...";
14+
15+set -e
16+
17+(( $# >= 1 )) || exit 1
18+tessdataRev=$1
19+shift
20+
21+if (( $# > 0 )); then
22+ langCodes="$@"
23+else
24+ repoPage=$(curl -fs https://github.com/tesseract-ocr/tessdata/tree/$tessdataRev || {
25+ >&2 echo "Invalid tessdataRev: $tessdataRev"
26+ exit 1
27+ })
28+ langCodes=$(echo $(echo "$repoPage" | grep -ohP "(?<=/)[^/]+?(?=\.traineddata)" | sort))
29+fi
30+
31+for lang in $langCodes; do
32+ url=https://github.com/tesseract-ocr/tessdata/raw/$tessdataRev/$lang.traineddata
33+ hash=$(nix-prefetch-url $url 2>/dev/null)
34+ echo "$lang = \"$hash\";"
35+done
pkgs/applications/graphics/tesseract/languages.nixnew file+289
@@ -0,0 +1,289 @@
1+{ stdenv, lib, fetchurl, fetchFromGitHub }:
2+
3+rec {
4+ makeLanguages = { tessdataRev, tessdata ? null, all ? null, languages ? {} }:
5+ let
6+ tessdataSrc = fetchFromGitHub {
7+ owner = "tesseract-ocr";
8+ repo = "tessdata";
9+ rev = tessdataRev;
10+ sha256 = tessdata;
11+ };
12+
13+ languageFile = lang: sha256: fetchurl {
14+ url = "https://github.com/tesseract-ocr/tessdata/raw/${tessdataRev}/${lang}.traineddata";
15+ inherit sha256;
16+ };
17+ in
18+ {
19+ # Use a simple fixed-output derivation for all languages to increase nix eval performance
20+ all = stdenv.mkDerivation {
21+ name = "all";
22+ buildCommand = ''
23+ mkdir $out
24+ cd ${tessdataSrc}
25+ cp *.traineddata $out
26+ '';
27+ outputHashMode = "recursive";
28+ outputHashAlgo = "sha256";
29+ outputHash = all;
30+ };
31+ } // (lib.mapAttrs languageFile languages);
32+
33+ v3 = makeLanguages {
34+ tessdataRev = "3cf1e2df1fe1d1da29295c9ef0983796c7958b7d";
35+ tessdata = "1v4b63v5nzcxr2y3635r19l7lj5smjmc9vfk0wmxlryxncb4vpg7";
36+ all = "0yj6h9n6h0kzzcqsn3z87vsi8pa60szp0yiayb0znd0v9my0dqhn";
37+
38+ # Run `./fetch-language-hashes <tessdataRev>` to generate these hashes
39+ languages = {
40+ afr = "15dsnzy4i9ai26ilm73gkfj4ck039raa88i6w443c4b1fnay2akf";
41+ amh = "1wbcsdq3svxga3j1alk61xs72a9fhsfsyjxhp3cwxfaqfhrzg7h4";
42+ ara = "0nk495gki6jbbnwcl2ybsx4nd02d6qykcjncq0d2g8pbgapqmj91";
43+ asm = "0c3wq15yphq7x74s2sn3f90k6z1cf5j7ic62z0dynidrv99bddfh";
44+ aze = "0pz073hxqkx1a1cshlgg5k11lj73s52sdxa7k3020drc314lhaxw";
45+ aze_cyrl = "0djbfgx28ykcjsn2p0766qrmj256g7vhc7valc3ivsva8b906lxq";
46+ bel = "04zqy8vik0fcakq6apfp8wjhkkhlg0yn9kmag1lk7s8fy9ax3ws2";
47+ ben = "0q7812kn5xjm47hcgdcg911lhbgqr7hbvqckfxxm8qw0yjx2cy0m";
48+ bod = "0rwq7539zzfs8xs0bf1535z1cwkm0yk1ni25f5gjav7nm6qpiaan";
49+ bos = "1qr04dj7lx347gxpin5nfprbggmxq2mwx8kf3pcc3vb5x3pa57g4";
50+ bul = "0cyyqgi3i4y9bfzwls0lwljzgd0r8ayfqb4bbvdh4qmbni9x42ya";
51+ cat = "0kgw8f5pdw9lfbn6cfp5n1s0j8pj3418yx6rsbagzcf1gr36gbr9";
52+ ceb = "1g1n4np4vhar7wfwx2km5k6kldb600rrl7npfbf75229rar068f1";
53+ ces = "0zxkkyhpd74i6321nv86pkjb0k7p9cp6m174rbn42nl7jz6qxib0";
54+ chi_sim = "0k250xr0gk9yh22yqxd0zpxdsrqfzs164kdv5n9rxx1g996yffij";
55+ chi_tra = "03nxqpd546p0gwfj6pqzbdbv5zjpdddzlpa10xn4nvmks1mmckbp";
56+ chr = "1k1sg3hap0kd5aa36ysvmhp7r3fynxf0f7lzz814h6p3g250zclb";
57+ cym = "0d6wbf9cmrrzf66mhcckwdfy3xh2i38r0by9nk6isw9rl7bf7j07";
58+ dan = "1s1yj56rpzmif3ir3qs4iab744cgpflk7y8812z2665bh61illpr";
59+ dan_frak = "1bxi53ymib5g0139vfd2pflh7nl5925vqznq3sfgaqx7gdx630vi";
60+ deu = "0fna7fqk1a8ivd7q2k38vx37qm3vbn183zh4z5zfqb4pgqmb8znb";
61+ deu_frak = "1y4krkvarg7jxhcq49fgybg4phbn58y9c0z2bm8mnp28jkih1cnb";
62+ dzo = "1fcz0imi7zxi99762pxfcm5iz2jcbqj3s742magka4ihrxnz07xm";
63+ ell = "0r0f71jy4y29bg055qvvy93wchi3lh08zz0k9c8l7466b03yvq5v";
64+ eng = "0vghah8kqcv0n5fnjb88w6siz156ysrc41fckw3f2y8c3sgmqlf0";
65+ enm = "10y61xv3w1ypgqz5rgb22y5hh1i4zx03cwiqw21ifqvg4xdrln46";
66+ epo = "1y5lh55mbcx33cm7qlf1dcah8ffycxmlcpzjzx9r6ij14fdd4964";
67+ equ = "1nqrd0a9jqqh6byy8snfhad1hisrc92dcx44wsy7v4nf40j3mx1s";
68+ est = "12ll8lq1hjcsq9hh93020w78r7f1rcxcwlvrjqw8j5p3k9jg5a4g";
69+ eus = "034s9mp7lw1a4yvf2cmbbj2fbqbaq6xnjqh30yn0wq0c0jck96nw";
70+ fas = "0m61p4byc0kzf75cdn6g18s8hcg9r8ifs34wr85lbsb65kil4ijx";
71+ fin = "1wac333k0lcd5jwprzg99b10bq8sdc96b9d6275kg9imyqjwcc7q";
72+ fra = "1ax7i0nw1lwkz4sbrvn4z0lcrcai77ymdpla7qk7yij6s4xb5bw6";
73+ frk = "16nmr71p93724vk1x5mq4r8vxpwnm448p6dwqv8scg8asch1cidp";
74+ frm = "00yz3hz7wcralq8wbx1ap4c6b37ac6vnz5bgmxmgdx0kqzibiddn";
75+ gle = "1n8z8kmn5m628rlzgz5v0iw6h46aalflq5asa1wj5rygx1y2azpa";
76+ glg = "0fdniayplc3iwmlmvhblarh1gm97dp8rqhhkb8b0clwfd9cj342z";
77+ grc = "04r2193qcxqyab5998xn8bf7197wiccmjm7iakij8d0c7l61dnxb";
78+ guj = "0dp8mlxmf0x9wb8dg0c508sdwz03icq94z8ji8jhwgdqgv8hw1al";
79+ hat = "0793mmlxbb09c8103jhdvlczz647nyn4ykkgd3gwgavncmjh72v8";
80+ heb = "16za9ff1i3ya6hz75l9v3v7j4039kscxxw21g3i2w5p9zn52hyag";
81+ hin = "1vnn5wpc724kgib8jbx0kpnnp4al60ivqir72gnbyh6cpnflb6bf";
82+ hrv = "15rqd6xiv2bdmalb5s6rxvw0yk6w9agn9fli3bvi703q6vpj2yn3";
83+ hun = "19zzwdxwi3h3vdsgr271i1m87gfpdirk6b1ljw2j8qmfilp4sw56";
84+ iku = "1v1yvc1194qycjgb4ihh5hpj6472nlbp66dii183514g2dh9x0db";
85+ ind = "120d4b41wvsgcd1sgy2mp78i9hvi7w03a63078dz1yds0yqdwf1p";
86+ isl = "003ngk8dfv6dglkq8pmi6jsglrfkc65js5ywh3vvkg7qfqf6qsxz";
87+ ita = "1lxklk3zc3x3k8yfpp6ygyv7fndgs57dfasc97rh8782ds16wkjs";
88+ ita_old = "188gby1y51pa1ycyc8y17d16hs5w27yl5ch7xzni98bdjkwbkl1z";
89+ jav = "1fjyjznjchls5ifbnx2b9xagisgxvgj9lsf39rr9d87sbzdbbwbp";
90+ jpn = "1wmayj8wh3pfwznjhalad2qzv38mhrzw2sxl71mycvzvpdy9ag1w";
91+ kan = "0hak4953whw9vd9dzl0hq076kzb19kk45kmfxk03af4k6gb206vg";
92+ kat = "16k0057cvvdc6snm5svhdv3cr7cw71g74yy8215njjbsi838imi3";
93+ kat_old = "02gl755d38plyvzwfjqxvjgfqkbjs9rvzx33qfhm2zvmgbwrfrfh";
94+ kaz = "0hc36w7zz5waycsk220v0r83sg991gd5f5r937mvz44viql80sgm";
95+ khm = "1gb2nv5qdq5fz9w9xq4fj68p46b62sd1m986ra5qbnskxqizr12s";
96+ kir = "1b1ing6qqi8qqfh4xpk76rp4gxp69wdjdl5m777ayx3v02d7nhh3";
97+ kor = "1rldj6f8h1nn5wpx57b0ci7p0fnivnwzgaf0d3576xls26z2wcgv";
98+ kur = "1cp2pfd6g662gvxi7ywkxfbfq1lwbis888bf1gg8ynzy342mx1ic";
99+ lao = "03bdaxakmxpbbr9vsnbzzfksvm6js0l5i0ijwl71piqyxqjj1gxf";
100+ lat = "1q7v7drnwpna9k2l79jbdlxiv1j617rqzjc9d48h3lfrma5z97sj";
101+ lav = "0fxzyvw7n67rmw2irvlghkf1bii4w47200zv26p0v3a9dwvhc7sg";
102+ lit = "0f00ggjjqrl94kwwjmjqwajyfprsml0br8vhn2gvn11gaxvm52hm";
103+ mal = "1i83plhin3m6sq8p92vzlyng5z59gvvqypyh7rnmvdmm9rranx8a";
104+ mar = "0ay7q53yl3709crvn5l9c9jx7hw6m5d3x2crmvnvczsh83ayfdik";
105+ mkd = "1q1wadcr4j1dzssyyqz43qmizc6vfqkbivr6xi2p7p4h9rl11x73";
106+ mlt = "1qp4v6habak1l7xrw322wglvjjndrfp4j7bj8d4npwbzk1sh4s0h";
107+ msa = "048p6mkx9zr40s9s5vbi0gnizhvqwn0g8i1hf1l8db7igbax5xyj";
108+ mya = "17nyr5bd42kzvid3421n3mwckd49vzrjhjahd8rnfsmbsy1x382l";
109+ nep = "154375r32sdmvcnp1ckvgbp3wxvb2xiiypb8bxbsvrabrz4wzjqc";
110+ nld = "1clwbky71zkz55zd3f8r9hj8fhpnbkply80p1js4fvs7x12r715x";
111+ nor = "1ynvrz6s0vmlq1xkjd8k2w6bx8770x6v29qgx83d4nl17ngjd459";
112+ ori = "0dsakc8gnwhs6z5kxc2wdkbn31gkkiqk5vriw0swghychp164aac";
113+ osd = "1zq0dfliavglmix7zzrqdxz1w01rm1f1x1352bqn8xf4zivdbxcw";
114+ pan = "1fwdpwkydfmr6drwgkqzn89z12r2rdm02a75vvdxhxg2a9yiwmbv";
115+ pol = "155z870ygzws476kp7qpzi8jcjcv3jb5px8rbzhnag1fklqr48hx";
116+ por = "1814cff2rffpzlg4hyyrjzpf5ps2i95rmpa4c8ikblbvrlcv97q8";
117+ pus = "1iz5nn1zfvn1l9gb1jriwx991d2hwwc7x4k1nvzjlwpzscplx25b";
118+ ron = "11lr80zhvnnngvwwk01z1d3prfpbh3qbwpl1nl5fp7h09d6n3wzl";
119+ rus = "1d6a8lg4bmd3np16jds1py3qpkaq4ahnhwghd5r0159y0jpxq00q";
120+ san = "169f4ajgwn99yfdfrlwfvdgvv1abal7fpdp31sknvq8l7w2sak3g";
121+ sin = "1411g18r6f6j6f4n0sn7ajgs4gkplb892s6ak0hi9nyyxwv3r1gm";
122+ slk = "0bxfbrg1nf6px0xzkh6ihdi71fmr1rxxs99qb191k7pm16x2lpds";
123+ slk_frak = "0zyqnn1y5cyx1y7wzgw743k4584ljl0rhvk2q1ni6jnjx9ciwzqy";
124+ slv = "1kjn9m9hbwp0m0p2v8c3skpzr6f8x42hz8x48zl22550a7hq8n1h";
125+ spa = "1npgl8ylvfm60hd4214z8a3lriy1hckhijschrbjpzmwdfcqafgj";
126+ spa_old = "0w4ivkv8flyn7bjlyjcrcrdnslkvrrfs7l33mvird1jhhkyqd8sx";
127+ sqi = "15wzvh6qm3yx7yf0k5j7g1imsaqxvq7r2xh6a0xgmkqbyypbbkdf";
128+ srp = "05blqriv30x02c80ds3x7zhw0y21nc6lkqlv5jwgwnjgw4yfpgrm";
129+ srp_latn = "0ss8s3q60aq8sd2a3sbnzvp13qqarxnjw4hij8hd9ab5gsjw0nwr";
130+ swa = "1pwwhx7ldq21cv06cchws8gvwsmkwn5sjcy9z3nk3nbp9qjsf44f";
131+ swe = "0l10iyn2cr7ibgk0akmpg8725mpwpydawgv3s77izsw7y6xhfr1a";
132+ syr = "08bxil13wyp5h4hvbxjcys7ypgqgg46rrp653m7gyv5q94ycjgb0";
133+ tam = "1g155kyba2wjfgzgy48g6yd2csinwbfjdi5r7vw0wm3dh1z39dvz";
134+ tel = "0fydrcb54b6mmqazb337x4s36i2a64sb4xm7y7g3nqqmk9afsipv";
135+ tgk = "0f6j37friywj7y132fv0jm6aj4sx8f0b7brspj3pbjqqpi4v5ws0";
136+ tgl = "0f1r0gicif57qhyw8xaa1sqgny720q3z5cpd5srrn9i6fihaz577";
137+ tha = "1y2hw55jfpidk95y8qbsiczgg2r2khabac97s1y3gl0v93a44jna";
138+ tir = "1y7iryhjr83ca4yh5jjz7qlnrx4kbrp0a0p650whjvk2gnv8m98h";
139+ tur = "0xqnq99b2jb4v74bj95py6wmg14dm31zp5s3l48dmcv6zdgcxg2w";
140+ uig = "1sdddr15zlb33kd1d7hzi5lfd15bfhqn105d7x6snfpqp7vq4bxv";
141+ ukr = "0cdwjnfnnmzz7jdn49l96vqgaimclfxcxaw09cm63f5my382r2rg";
142+ urd = "10xcn1zs2lfswp5yai0ckyg7js587qhr5cf7qib3i35qjbw7nc18";
143+ uzb = "1jkkd5j6vsx5jv5gwprbfwg1vwh714prm8j446wzvp74brmk949l";
144+ uzb_cyrl = "1kdia38rgm2qd3ly80a412jyagxxryr09h1nz2d0iw71bmfn4855";
145+ vie = "1ja18jxxaw282y4jljxpjf1gj15il61vc2ykpfy22vn88wvydxff";
146+ yid = "1jddd0g8mm5v00z5kb8rbpfs7ppzgq9kzm1xlhhvv960yfdbi6fd";
147+ };
148+ };
149+
150+ v4 = makeLanguages {
151+ tessdataRev = "4.0.0";
152+ tessdata = "1chw1ya5zf8aaj2ixr9x013x7vwwwjjmx6f2ag0d6i14lypygy28";
153+ all = "0dqgkp369rcvq72yhgnzj1pj8yrv7kqzc7y6sqs7nzcq7l5qazlg";
154+
155+ # Run `./fetch-language-hashes <tessdataRev>` to generate these hashes
156+ languages = {
157+ afr = "1a9f8pnrspfmcq9gpjnxn2kkhjlsmh912bnpx671fjizxpmiri2y";
158+ amh = "0m1vdyxjx57kmf2qra0p31k509y1cqn4pyckzw00i5n3wx11d2j0";
159+ ara = "0nswl6n0s94g900j5k1gwzp7m140c0yd9a2fdb2lzhdvg1krf190";
160+ asm = "025d9vrjcrwyd6cc6hrw1x8xqhicgrb9wpvhhmlw71ql04dadslf";
161+ aze = "01shcs78a6xn3my8p3y42x1c9f5hzfn83w2n2nwpffbgz4y2nsgf";
162+ aze_cyrl = "1sbd89i5r7rnkjh2in8j0plrxnfiill9jl8pr68iw77ghih6q1vg";
163+ bel = "0dhyymsxcyzwal8474q7ag3m2akv0b92hkdz7rka5z1cxry1cn8c";
164+ ben = "0a7q9414k3frn37x2qcglz722ysg2iivj6kqaaa0ik7z14ibc8v0";
165+ bod = "0rh7x54nlh6ir6ldccj8hi7g8hwlp13r3fkljw8gndvhwmgfkkar";
166+ bos = "1szym4n605hlx12a9vpz4jjs76jscajh22rgkqwbv4qdsl0gi3nd";
167+ bre = "070f4c84iznblsw4jkwpzh9dss8nfb678160szm5r8dlv2yinrrk";
168+ bul = "03bg2yw79lg8rl43y9288313jrfh0h69vl4s4cmlgbmnbx8pvxwj";
169+ cat = "19xs691aj8yy2ff07c3gzm07zicd5ha0gmcjxjh9pknqf2gfy7qv";
170+ ceb = "1896vn41hqc4anm6hjvrnn022i0p8pmhwsp5rv9w2cvr6738l79r";
171+ ces = "0fh2g47msfr91285rnccxcmcshihm126sqy496s4vrr0vk8ix1nf";
172+ chi_sim = "0qxkvbpm5l7gzsshnn72wfx473pprf5nmw8hd4i4x2qxnfddh1gw";
173+ chi_sim_vert = "1f75pzvxbda82vxa2zb1z9b9f13sh81kzaw45vg5118ncsklj8w7";
174+ chi_tra = "056vjws1fir1v5iv44pzykkxs5q1dbb2j8blhj47i53w1zf6g42m";
175+ chi_tra_vert = "10c9cdycg1a5kwlgg60sh8yp07w2fl4whinpxfhlzrzs56allql4";
176+ chr = "19qq8a6c27973djsc4xpcklis92r58x21fg4mz5azdyka5i1n46l";
177+ cos = "0z9kx1hw8h5n00pcahxla808wya50wrkk8cz7x676pd93ibyrlyx";
178+ cym = "13pk9cpf43xxqbz3blfz2av2yd1ma6ds6jbdiqw8anhhj7l9ch2d";
179+ dan = "1jirmahxvyyswhhyzhinvcqaycz7m3ixchqrj3lgfcdi3anvabr2";
180+ dan_frak = "17wcgdqxmbzn7qchnx5gsa05aj4wmhbwk43w173bl3wr6h5ylmh0";
181+ deu = "194rqsg4nlycca9bg2fqf15xgcl110rxp182l7dbjfjhar4knsw9";
182+ deu_frak = "12hhhp32f15c7fw2jp05mwim9ps14kmamhh6vmalvm7r2033vbm7";
183+ div = "09mm9r5hxhsc4qpyg10ym9mc2kdpawx8zk0aiv1xpgd35rzpyz41";
184+ dzo = "1zk7crgcazgqy5zmslp6iw4jws07nja31qdxx0rpzhn3c0bjgw1b";
185+ ell = "1hhym18a9411953j47xjk47jx9ij9xi2qwlx05c93zl41528nsqg";
186+ eng = "0iy07z182lwhqfa0q288ha691scpsry330aynaizn68wcmywk86s";
187+ enm = "1dhr1qvil38bil43wk5ci645sbm3my2y9y7qlcbnwz2p4pflayvm";
188+ epo = "1jig4db7050vww32vxsqyig3j1b0vgz9ipxbsw0jpkjia84k44n9";
189+ equ = "02qwg6s1z7pynwm0p6dvpwi04ivfkr1s7qgssbla1dx7v0ih6rlg";
190+ est = "1jxygahy6by7fbirbmjmd68k6560q1a3h5mvpzdx15h5fw0q58gl";
191+ eus = "0cai7nm7si8680avrrls8bf9ski980rvsj560fh9y6n9rz7mh9mp";
192+ fao = "1n3434jf18bzakbylzyg3jaw2ad4h376g56dsql32bgh2yvyww8a";
193+ fas = "17wjkfka9725rz32clgqgk9msmbz4axs59vz30jmhhxyrkliafqb";
194+ fil = "0p713k8g27df9z384ns111xqxii5kq20m8brflsmd3yckw1mibhz";
195+ fin = "1wc3y9nnm7rb2c2c5fkj7cv7jb27jlkb2bh0g8kaz57h6imfmb2g";
196+ fra = "04qrfvi6irlaahh1pgn5azyfhbhavm12yyybza8603alf8firh7a";
197+ frk = "05cqmxxxjqdl5hjyzi6dpmixnjpd6f3jr6741yapdmnxvkzxkiyp";
198+ frm = "0a86yy6hd0lvlbzvnzjmyapzc0rn7mnkdadqycd65bw1b714cvy2";
199+ fry = "0i84r8g9hlkr9nlhypl4lq6ncrhbcpskqkdcijgk88c2fdknh57h";
200+ gla = "17idyhb505waz9dnb8dsk54faw7y0xvvb12yw71k0skq3i90akar";
201+ gle = "1q87h5zzcva54pg364d3hl6q9hdlydlyj1qmq8n5k7hqk11msxmk";
202+ glg = "01xssz1rhpy3a0sm4i43nba61wc2srz6wv327vdw1kg8ijm0s0g4";
203+ grc = "00x0s3smx4wg5h12y2b9al0j2jk1y3f0yy2x6f2qf7ps831drgyl";
204+ guj = "028v4fgn0zi2044vk6j2rlqklc9i0kj22s52vhifmx1g02kz9154";
205+ hat = "1bca516pr2cnyjlwycc7pr6gfmdjb8565hp06pw9nwpr20ry0hss";
206+ heb = "1qfkffjh29b21frs0mv6llsrchixl5kjkpj1if7fq816g9mym9kx";
207+ hin = "1rkfam5c6qil2590lfffzndhq3bncdgf4ij0cyjcglgyljgx0xnc";
208+ hrv = "0da7b6mk0rwc9zlbqkycwjpddp3qpy07l643i00ia5a1zq35fmgp";
209+ hun = "0w2s4mn9p74zqzmp9hh2017zgsh5v43k4lid4pv29f4b0y5gj9xi";
210+ hye = "0ifzm875wlbjh4vkpmj1n6f14m8i174413l6pc6i44y4p5fpgxrf";
211+ iku = "19arnv82xbxhbcy8pf9fv1sl5zc5707mk34nh7w46dlz86qkidmn";
212+ ind = "1d421hizwni4m6sr4f3nqqpr1g744hzn0krk130m7x8mhzgamba5";
213+ isl = "1hjjw8k2r9qa990ziq5wxr36kyf16mnmrqfmq5vbcjprka9h08pq";
214+ ita = "1qyrvlf7pjxzyb29sc7aq3gq61bww14sijka44scxggfw7134l3r";
215+ ita_old = "1pf8461jbj0vpyry0b54crmkf2bk9mh4klxvmj09jvf0aq2vm9s6";
216+ jav = "18vvbyimj0y462amjmwvqa6h9n8l122j9v0w3hfp63hlxpfprm0m";
217+ jpn = "16hma9w32vdh41ihymp894jza72b0d235hwriv18r78j5n86nhbg";
218+ jpn_vert = "0yca09l9sbpfjgb2slnpb9q7qd7vz3a1wb6bkln30d3nl0d9r1rn";
219+ kan = "0lcmx37rjfxkbhhbrld1ndmkwkm9w9b3pzxhas0cv5dqsx2f84jd";
220+ kat = "1b164bgwa7bbvw4177h8fxfh0fbh4bycfl9pkaa184dpjpaiqpia";
221+ kat_old = "1mgff7sh93hdp3wh0ckikdggrdgf0syp75s39pickpbkp9ic41ai";
222+ kaz = "0h37y0kb5lwsp5zpl7bvxg3ryqldl5hxfnardliwgyqgnag951vi";
223+ khm = "0m7x1fynr18sid2kjjw8xa9ika0a0fc6a6hvc7ihizi47893hdfb";
224+ kir = "09kxwqpqf6kxjii07qlqsiii83zk12rszp88xnzzjp8rjsnk78s3";
225+ kor = "0nsr43fwrp9876ia1fc0zcviv2n8hw16n0wfh158vhygwglvy84m";
226+ kor_vert = "1wmvdznmikk9fq7wdffvn22scxmcl26vjh26jhicqwxpc7kg4bh8";
227+ kur = "0gbsf3ny3n5mgb30v54bz3crgnimdpg19jn633pbpzryzg3xhd25";
228+ kur_ara = "1sbj0cczhi9q119fbzpi0m6zr9kjp3k76bv9w8szkv1wc5y4fng6";
229+ lao = "1gvxlg8bw3a4c9izg3c2a2yl7q6rsy7z9y64axdw9a04pz2ndbl5";
230+ lat = "0b7an3q3xrf9c55bhiqqh7l45ga88l0kwvkp1akmlr98piach3vr";
231+ lav = "0fqsmy47cygamddxyjfrdgkfa9bvmrvf4csvppnkdvfzy6iiv0c2";
232+ lit = "0wjgbkwc3bf5khdqali7ylnhhs4xvpx19m3zx2y9s27v2wjbb6kv";
233+ ltz = "02zdxbniiqfl87fzsiaaqgldqfsv15z5hja1xhxnqpl0nds7shfc";
234+ mal = "0a41ifz8i6lj2ywxjkwvymxzxahkz2cjv4apbrawdj1h42bn7frd";
235+ mar = "00swhlh9bckvmlxanfmlw5j4n9qqhggl84bsq0827bmijsqwnl44";
236+ mkd = "1bqfiwxlzfpz4fs4z5ci2wbv01qhrcayk1inmk3dxq7dsywx1ajg";
237+ mlt = "1rmmga2aw88hr7q7cfr5cvhnsgnf1mi069d5k7z66zp4vzbl4zyz";
238+ mon = "1jksvcavn9plsmjdmhg40mwq5rlvrd1b9gvghdjg7zkf6qqqynlh";
239+ mri = "0jlfawx20s5clsnk82ndy3v2zidh4cfh4acrh8nindk21xmiwh5i";
240+ msa = "0m7zs8anaa3l4z5f3xvbhs4syp41dp4all2yfpi1plyr0hy784an";
241+ mya = "0hljm5haadlr4k5rhw4mvhkygcnrr709rvl7amz7av3nskmi8mb1";
242+ nep = "1dhy0m2h6xfgwibf92iwxsn926dmrhfvkg9rafkdaqcr4pq6w563";
243+ nld = "0bspf5bv1s7qzm6k4aqbpq91zvk4kxxhx5zv08w91xfsa1zpdxmi";
244+ nor = "08majhc9m0fjvac50yq52ia2af9kscclimwkv403klnj4kgf8ndq";
245+ oci = "1mzrw9gsdjrd1xj3zv7l5gzgjq5jrygxf8cfkz20d9lls0wj1xdv";
246+ ori = "1sh42mjzb1hv6l6lljp3wifjmz7wrv818f9f16m8qjikwqxm0s78";
247+ osd = "03mvfk1q1xp1klpf4bwna903rnp51bkqr3gl5hvxybvrc3l2m7z1";
248+ pan = "0165kr94p6x5yxzs4p8sfppvg9cywp65ps0xaym5rqz9iashz32h";
249+ pol = "0g0b71ms6ddgykmkna4mlavgzgmh9vj6s62fi8l4ja93nfpr37hp";
250+ por = "132jbhzmcsq8skanm15bw2niyx9xpbrqr411wn7w9r5i3cvnlv01";
251+ pus = "0iiglnkn478al11avigsav625pn7ifscycnxpj6fg8835vjww3xr";
252+ que = "01vkmfi9idjwskv5pllmrxpil0v5h7f7rzv5viclxrzkmbvrz9b5";
253+ ron = "0ag6vs0cn3sryavs1mfrallgdgi4h28114g7m61rhlhq0z484g0m";
254+ rus = "1hippm3w5d73sh50r136x0xff2p6x128ry2x4fywf6xdpv1f46v8";
255+ san = "1qlpqkr5c5wqcf1bvlipy72advqnvd4wm61vghmrj2sda8mx87sx";
256+ sin = "097d2s4ma0zsq0ab5qs1ylgl9l5phw91fnpsvb7vjmz2mw3ic964";
257+ slk = "0c97pp5iffhdzyma605x8q3rx1qq9pq2h6cai1kppaj92rz3ji9k";
258+ slk_frak = "16ivsam1g18zlpw6pgidvzwb7h8rvw1s10nigs6yfwir8hjxsgki";
259+ slv = "0644jlm55p0dg4zchgrashmbv36zb4x649ckmf2jkbss8bzx7wsf";
260+ snd = "1i2mfi4414l3v9nznjy7959y2jcr8ymvf6w8zpyrw6nad4d1aak7";
261+ spa = "15kwvr7cpcnlxm1ja1yyc022dmsd04gmk7h1p0df12aicsscn3qb";
262+ spa_old = "1jq80c4mi3rmwnfhb3mbaaq0ci101mgbibkji9ala4l5dkcwjra3";
263+ sqi = "19cvvixhz9906p4c9i2grpr386rbp5alp4fp14xm9nd81bmq4701";
264+ srp = "1jd25n13h6vxsa3gzbj6q6mdh02rjl4qrd1bffr5psp33asqvw0l";
265+ srp_latn = "1k7577mn3z0bm5ma9d8l14sn5wpvw50hq1nxwbc36yn3a5b3mhiz";
266+ sun = "0lvlaw3jfvr7b5v09669kq8mm19jdsk9g5h09jsa2gr6fvsq11pa";
267+ swa = "0qy9qc5pa1dzzqrh1z40gk845z1r4d2smywnzydknbb3n240lhz0";
268+ swe = "1y56r7bgzw0pqkdylbah07r1f0v03sblkggiql8x5200rhaxvqi4";
269+ syr = "1vfj5fsiv170jghryrxwyz0i9mdsaki1kglxrklkb2caal9kwy38";
270+ tam = "0rhhdbnp0a2hpg00vpc0xyxcl2w36i1kn63mrvwx1f9q7m3y1fmf";
271+ tat = "0a74rp8pyp4yivv2xcy2m8xgwch8scr3wmk1fzniwzf43fsrqp76";
272+ tel = "0gcq8hxhxvilyh7x7kiikq07hllqysc8sfyr88gvpj4xi092h2bx";
273+ tgk = "1458gk0k6gk49n8lr6fj7l7cwkhxn0lrhybzq10zl1ly7yzjhf67";
274+ tgl = "12yscwckdy3l21mvsrj1021gxw2isjrg369r08rsf7lh96wn4wkn";
275+ tha = "01f0j7gsc5slxaaql1gqbhk4wlwaxc29dlmfxwjzikxc46gjl0w8";
276+ tir = "1q6w48b1jchv55713pq20inzjjdymh32fw8wxfaj1qi7bjqfb9fk";
277+ ton = "06g60ga8rys8jaimqrvd4svh40qs1nz4bszdnf2hdv05ibryibdq";
278+ tur = "0g9g1wvibp61qbriy8ys948yfkl88xk9g8f93bnq8w8dx029b6s8";
279+ uig = "09sajx21lw3a3ph62dyqr10pjaq2mij10sdhkhvvjiydk34dn548";
280+ ukr = "14q8ls8gkrg7c9pc6qzm6yf5ady3i3303vs1hz4d2idcl6yry334";
281+ urd = "15vszhqraxqdcng1069p6i4xq3ck3904q207nkbap6dfpcpjig40";
282+ uzb = "03hyw0vavmjirqs4wkd5r85g91w2avsyl14z624fhm3gc66pqg7n";
283+ uzb_cyrl = "1433lrrp2lfgb1k0a4sc20b35b2jcl8f1z92vm2936y7w04xpaq7";
284+ vie = "02k40d3wji74d1jgvkr3zrn9gpzlmp0lqhrrdmc48r2sgvnrnk8n";
285+ yid = "0xnbvi04xv1qapqg72wa3bjwbw51pkdnyncjpjp37vn6dzh04l0z";
286+ yor = "07w3aci52ng6i6nyp97q5zb2dqlj08w6im90y1h691qah1x44zlv";
287+ };
288+ };
289+}
pkgs/applications/graphics/tesseract/tesseract3.nixnew file+29
@@ -0,0 +1,29 @@
1+{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, pkgconfig
2+, leptonica, libpng, libtiff, icu, pango, opencl-headers }:
3+
4+stdenv.mkDerivation rec {
5+ name = "tesseract-${version}";
6+ version = "3.05.00";
7+
8+ src = fetchFromGitHub {
9+ owner = "tesseract-ocr";
10+ repo = "tesseract";
11+ rev = version;
12+ sha256 = "11wrpcfl118wxsv2c3w2scznwb48c4547qml42s2bpdz079g8y30";
13+ };
14+
15+ enableParallelBuilding = true;
16+
17+ nativeBuildInputs = [ pkgconfig autoreconfHook ];
18+ buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ];
19+
20+ LIBLEPT_HEADERSDIR = "${leptonica}/include";
21+
22+ meta = {
23+ description = "OCR engine";
24+ homepage = https://github.com/tesseract-ocr/tesseract;
25+ license = stdenv.lib.licenses.asl20;
26+ maintainers = with stdenv.lib.maintainers; [ viric earvstedt ];
27+ platforms = with stdenv.lib.platforms; linux ++ darwin;
28+ };
29+}
pkgs/applications/graphics/tesseract/tesseract4.nixnew file+27
@@ -0,0 +1,27 @@
1+{ stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkgconfig
2+, leptonica, libpng, libtiff, icu, pango, opencl-headers }:
3+
4+stdenv.mkDerivation rec {
5+ name = "tesseract-${version}";
6+ version = "4.0.0";
7+
8+ src = fetchFromGitHub {
9+ owner = "tesseract-ocr";
10+ repo = "tesseract";
11+ rev = version;
12+ sha256 = "1b5fi2vibc4kk9b30kkk4ais4bw8fbbv24bzr5709194hb81cav8";
13+ };
14+
15+ enableParallelBuilding = true;
16+
17+ nativeBuildInputs = [ pkgconfig autoreconfHook autoconf-archive ];
18+ buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ];
19+
20+ meta = {
21+ description = "OCR engine";
22+ homepage = https://github.com/tesseract-ocr/tesseract;
23+ license = stdenv.lib.licenses.asl20;
24+ maintainers = with stdenv.lib.maintainers; [ viric earvstedt ];
25+ platforms = with stdenv.lib.platforms; linux ++ darwin;
26+ };
27+}
pkgs/applications/graphics/tesseract/wrapper.nixnew file+58
@@ -0,0 +1,58 @@
1+{ stdenv, makeWrapper, tesseractBase, languages
2+
3+# A list of languages like [ "eng" "spa" … ] or `null` for all available languages
4+, enableLanguages ? null
5+
6+# A list of files or a directory containing files
7+, tessdata ? (if enableLanguages == null then languages.all
8+ else map (lang: languages.${lang}) enableLanguages)
9+
10+# This argument is obsolete
11+, enableLanguagesHash ? null
12+}:
13+
14+let
15+ passthru = { inherit tesseractBase languages tessdata; };
16+
17+ tesseractWithData = tesseractBase.overrideAttrs (_: {
18+ inherit tesseractBase tessdata;
19+
20+ buildInputs = [ makeWrapper ];
21+
22+ buildCommand = ''
23+ makeWrapper {$tesseractBase,$out}/bin/tesseract --set-default TESSDATA_PREFIX $out/share/tessdata
24+
25+ # Recursively link include, share
26+ cp -rs --no-preserve=mode $tesseractBase/{include,share} $out
27+
28+ cp -r --no-preserve=mode $tesseractBase/lib $out
29+ # Fixup the store paths in lib so that the tessdata from this derivation is used.
30+ if (( ''${#tesseractBase} != ''${#out} )); then
31+ echo "Can't replace store paths due to differing lengths"
32+ exit 1
33+ fi
34+ find $out/lib -type f -exec sed -i "s|$tesseractBase|$out|g" {} \;
35+
36+ if [[ -d "$tessdata" ]]; then
37+ ln -s $tessdata/* $out/share/tessdata
38+ else
39+ for lang in $tessdata; do
40+ ln -s $lang $out/share/tessdata/''${lang#/nix/store*-}
41+ done
42+ fi
43+
44+ if [[ ! -e $out/share/tessdata/eng.traineddata ]]; then
45+ # This is a bug in Tesseract's internal tessdata discovery mechanism
46+ echo "eng.traineddata must be present in tessdata for Tesseract to work"
47+ exit 1
48+ fi
49+ '';
50+ });
51+
52+ tesseract = (if enableLanguages == [] then tesseractBase else tesseractWithData) // passthru;
53+in
54+ if enableLanguagesHash == null then
55+ tesseract
56+ else
57+ stdenv.lib.warn "Argument `enableLanguagesHash` is obsolete and can be removed."
58+ tesseract
pkgs/applications/misc/albert/default.nix+6−8
@@ -1,24 +1,22 @@
11{ mkDerivation, lib, fetchFromGitHub, makeWrapper, qtbase,
2− qtdeclarative, qtsvg, qtx11extras, muparser, cmake, python3 }:
2+ qtdeclarative, qtsvg, qtx11extras, muparser, cmake, python3,
3+ qtcharts }:
34
4−let
5− pname = "albert";
6− version = "0.14.22";
7−in
85mkDerivation rec {
9− name = "${pname}-${version}";
6+ pname = "albert";
7+ version = "0.15.0";
108
119 src = fetchFromGitHub {
1210 owner = "albertlauncher";
1311 repo = "albert";
1412 rev = "v${version}";
15− sha256 = "0i9kss5szirmd0pzw3cm692kl9rhkan1zfywfqrjdf3i3b6914sg";
13+ sha256 = "063z9yq6bsxcsqsw1n93ks5dzhzv6i252mjz1d5mxhxvgmqlfk0v";
1614 fetchSubmodules = true;
1715 };
1816
1917 nativeBuildInputs = [ cmake makeWrapper ];
2018
21− buildInputs = [ qtbase qtdeclarative qtsvg qtx11extras muparser python3 ];
19+ buildInputs = [ qtbase qtdeclarative qtsvg qtx11extras muparser python3 qtcharts ];
2220
2321 enableParallelBuilding = true;
2422
pkgs/applications/misc/flrig/default.nix+2−2
@@ -6,13 +6,13 @@
66}:
77
88stdenv.mkDerivation rec {
9− version = "1.3.40";
9+ version = "1.3.41";
1010 pname = "flrig";
1111 name = "${pname}-${version}";
1212
1313 src = fetchurl {
1414 url = "mirror://sourceforge/fldigi/${name}.tar.gz";
15− sha256 = "1wr7bb2577gha7y3a8m5w60m4xdv8m0199cj2c6349sgbds373w9";
15+ sha256 = "0vh14azg3pppyg3fb7kf6q3ighw1ka9m60jf2dzsd77f4hidhqx4";
1616 };
1717
1818 buildInputs = [
pkgs/applications/misc/glom/default.nixnew file+132
@@ -0,0 +1,132 @@
1+{ stdenv
2+, fetchFromGitLab
3+, pkgconfig
4+, autoconf
5+, automake
6+, libtool
7+, mm-common
8+, intltool
9+, itstool
10+, doxygen
11+, graphviz
12+, makeFontsConf
13+, freefont_ttf
14+, boost
15+, libxmlxx3
16+, libxslt
17+, libgdamm
18+, libarchive
19+, libepc
20+, python3
21+, ncurses
22+, glibmm
23+, gtk3
24+, openssl
25+, gtkmm3
26+, goocanvasmm2
27+, evince
28+, isocodes
29+, gtksourceviewmm4
30+, postgresql
31+, gnome3
32+, gobject-introspection
33+, wrapGAppsHook
34+}:
35+
36+let
37+ gda = libgdamm.override {
38+ mysqlSupport = true;
39+ postgresSupport = true;
40+ };
41+ python = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]);
42+ sphinx-build = python3.pkgs.sphinx.overrideAttrs (super: {
43+ postFixup = super.postFixup or "" + ''
44+ # Do not propagate Python
45+ rm $out/nix-support/propagated-build-inputs
46+ '';
47+ });
48+ boost_python = boost.override { enablePython = true; inherit python; };
49+in stdenv.mkDerivation rec {
50+ pname = "glom";
51+ version = "unstable-2018-12-16";
52+
53+ outputs = [ "out" "lib" "dev" "doc" "devdoc" ];
54+
55+ src = fetchFromGitLab {
56+ domain = "gitlab.gnome.org";
57+ owner = "GNOME";
58+ repo = pname;
59+ rev = "fa5ff04f209f35bf3e97bc1c3eb1d1138d6172ce";
60+ sha256 = "145hnk96xa4v35i3a3mbf3fnx4nlk8cksc0qhm7nrh8cnnrbdfgn";
61+ };
62+
63+ nativeBuildInputs = [
64+ pkgconfig
65+ autoconf
66+ automake
67+ libtool
68+ mm-common
69+ intltool
70+ gnome3.yelp-tools
71+ itstool
72+ doxygen
73+ graphviz
74+ sphinx-build
75+ wrapGAppsHook
76+ gobject-introspection # for setup hook
77+ ];
78+
79+ buildInputs = [
80+ boost_python
81+ glibmm
82+ gtk3
83+ openssl
84+ libxmlxx3
85+ libxslt
86+ gda
87+ libarchive
88+ libepc
89+ python
90+ ncurses # for python
91+ gtkmm3
92+ goocanvasmm2
93+ evince
94+ isocodes
95+ python3.pkgs.pygobject3
96+ gtksourceviewmm4
97+ postgresql # for pg_config
98+ ];
99+
100+ enableParallelBuilding = true;
101+
102+ preConfigure = "NOCONFIGURE=1 ./autogen.sh";
103+
104+ configureFlags = [
105+ "--with-boost-python=boost_python${stdenv.lib.versions.major python3.version}${stdenv.lib.versions.minor python3.version}"
106+ ];
107+
108+ makeFlags = [
109+ "libdocdir=${placeholder "doc"}/share/doc/$(book_name)"
110+ "devhelpdir=${placeholder "devdoc"}/share/devhelp/books/$(book_name)"
111+ ];
112+
113+ # Fontconfig error: Cannot load default config file
114+ FONTCONFIG_FILE = makeFontsConf {
115+ fontDirectories = [ freefont_ttf ];
116+ };
117+
118+ preFixup = ''
119+ gappsWrapperArgs+=(
120+ --prefix PYTHONPATH : "${placeholder "out"}/${python3.sitePackages}"
121+ --set PYTHONHOME "${python}"
122+ )
123+ '';
124+
125+ meta = with stdenv.lib; {
126+ description = "An easy-to-use database designer and user interface";
127+ homepage = http://www.glom.org/;
128+ license = [ licenses.lgpl2 licenses.gpl2 ];
129+ maintainers = gnome3.maintainers;
130+ platforms = platforms.linux;
131+ };
132+}
pkgs/applications/misc/k2pdfopt/default.nix+15−13
@@ -75,19 +75,21 @@ stdenv.mkDerivation rec {
7575 cp ${src}/leptonica_mod/* src/
7676 '';
7777 });
78− tesseract_modded = tesseract.overrideAttrs (attrs: {
79− prePatch = ''
80− cp ${src}/tesseract_mod/{ambigs.cpp,ccutil.h,ccutil.cpp} ccutil/
81− cp ${src}/tesseract_mod/dawg.cpp api/
82− cp ${src}/tesseract_mod/{imagedata.cpp,tessdatamanager.cpp} ccstruct/
83− cp ${src}/tesseract_mod/openclwrapper.h opencl/
84− cp ${src}/tesseract_mod/{tessedit.cpp,thresholder.cpp} ccmain/
85− cp ${src}/tesseract_mod/tess_lang_mod_edge.h cube/
86− cp ${src}/tesseract_mod/tesscapi.cpp api/
87− cp ${src}/include_mod/{tesseract.h,leptonica.h} api/
88− '';
89− patches = [ ./tesseract.patch ];
90− });
78+ tesseract_modded = tesseract.override {
79+ tesseractBase = tesseract.tesseractBase.overrideAttrs (_: {
80+ prePatch = ''
81+ cp ${src}/tesseract_mod/{ambigs.cpp,ccutil.h,ccutil.cpp} ccutil/
82+ cp ${src}/tesseract_mod/dawg.cpp api/
83+ cp ${src}/tesseract_mod/{imagedata.cpp,tessdatamanager.cpp} ccstruct/
84+ cp ${src}/tesseract_mod/openclwrapper.h opencl/
85+ cp ${src}/tesseract_mod/{tessedit.cpp,thresholder.cpp} ccmain/
86+ cp ${src}/tesseract_mod/tess_lang_mod_edge.h cube/
87+ cp ${src}/tesseract_mod/tesscapi.cpp api/
88+ cp ${src}/include_mod/{tesseract.h,leptonica.h} api/
89+ '';
90+ patches = [ ./tesseract.patch ];
91+ });
92+ };
9193 in
9294 [ zlib libpng ] ++
9395 optional enableGSL gsl ++
pkgs/applications/misc/llpp/default.nix+18−15
@@ -1,33 +1,36 @@
1−{ stdenv, lib, makeWrapper, fetchgit, pkgconfig, ninja, ocaml, findlib, mupdf
2−, gtk3, openjpeg, jbig2dec, mujs, xsel, openssl, freetype, ncurses }:
1+{ stdenv, lib, substituteAll, makeWrapper, fetchgit, ocaml, mupdf, libX11,
2+libGLU_combined, freetype, xclip }:
33
4−assert lib.versionAtLeast (lib.getVersion ocaml) "4.02";
4+assert lib.versionAtLeast (lib.getVersion ocaml) "4.07";
55
66stdenv.mkDerivation rec {
77 name = "llpp-${version}";
8− version = "2018-03-02";
8+ version = "30";
99
1010 src = fetchgit {
1111 url = "git://repo.or.cz/llpp.git";
12− rev = "0ab1fbbf142b6df6d6bae782e3af2ec50f32dec9";
13− sha256 = "1h0hrmxwm7ripgp051788p8ad0q38dc9nvjx87mdwlkwk9qc0dis";
12+ rev = "v${version}";
13+ sha256 = "0iilpzf12hs0zky58j55l4y5dvzv7fc53nsrg324n9vka92mppvd";
1414 fetchSubmodules = false;
1515 };
1616
17− nativeBuildInputs = [ pkgconfig makeWrapper ninja ];
18− buildInputs = [ ocaml findlib mupdf gtk3 jbig2dec openjpeg mujs openssl freetype ncurses ];
17+ patches = (substituteAll {
18+ inherit version;
19+ src = ./fix-build-bash.patch;
20+ });
21+
22+ nativeBuildInputs = [ makeWrapper ];
23+ buildInputs = [ ocaml mupdf libX11 libGLU_combined freetype ];
1924
2025 dontStrip = true;
2126
2227 configurePhase = ''
23− sed -i -e 's+ocamlc --version+ocamlc -version+' build.sh
24− sed -i -e 's+-I \$srcdir/mupdf/include -I \$srcdir/mupdf/thirdparty/freetype/include+-I ${freetype.dev}/include+' build.sh
25− sed -i -e 's+-lmupdf +-lfreetype -lz -lharfbuzz -ljbig2dec -lopenjp2 -ljpeg -lmupdf +' build.sh
26− sed -i -e 's+-L\$srcdir/mupdf/build/native ++' build.sh
28+ mkdir -p build/mupdf/thirdparty
29+ ln -s ${freetype.dev} build/mupdf/thirdparty/freetype
2730 '';
2831
2932 buildPhase = ''
30− sh ./build.sh build
33+ bash ./build.bash build
3134 '';
3235
3336 installPhase = ''
@@ -35,14 +38,14 @@ stdenv.mkDerivation rec {
3538 install build/llpp $out/bin
3639 wrapProgram $out/bin/llpp \
3740 --prefix CAML_LD_LIBRARY_PATH ":" "$out/lib" \
38− --prefix PATH ":" "${xsel}/bin"
41+ --prefix PATH ":" "${xclip}/bin"
3942 '';
4043
4144 meta = with stdenv.lib; {
4245 homepage = https://repo.or.cz/w/llpp.git;
4346 description = "A MuPDF based PDF pager written in OCaml";
4447 platforms = platforms.linux;
45− maintainers = with maintainers; [ pSub ];
48+ maintainers = with maintainers; [ pSub enzime ];
4649 license = licenses.gpl3;
4750 };
4851}
pkgs/applications/misc/llpp/fix-build-bash.patchnew file+88
@@ -0,0 +1,88 @@
1+From cccadedfbcb6764a38382154838113a6b2fd4dee Mon Sep 17 00:00:00 2001
2+From: Michael Hoang <enzime@users.noreply.github.com>
3+Date: Mon, 10 Dec 2018 15:08:01 +1100
4+Subject: [PATCH] Patch build.bash for nixpkgs
5+
6+---
7+ build.bash | 37 ++-----------------------------------
8+ 1 file changed, 2 insertions(+), 35 deletions(-)
9+
10+diff --git a/build.bash b/build.bash
11+index 1588011..72117d9 100755
12+--- a/build.bash
13++++ b/build.bash
14+@@ -29,7 +29,6 @@ srcd="$(dirname $0)"
15+ mudir=$outd/mupdf
16+ muinc="-I $mudir/include -I $mudir/thirdparty/freetype/include"
17+
18+-test -d "$mudir" || die muPDF not found, consult $(dirname $0)/BUILDING
19+
20+ mkdir -p $outd/{$wsid,lablGL}
21+ :>$outd/ordered
22+@@ -39,12 +38,6 @@ isfresh() { test -r "$1.past" && . "$1.past" && test "$k" = "$2"; }
23+ mbt=native
24+ mulibs="$mudir/build/$mbt/libmupdf.a" # $mudir/build/$mbt/libmupdf-third.a
25+
26+-keycmd="(cd $mudir && git describe --tags --dirty); digest $mulibs"
27+-isfresh "$mulibs" "$(eval $keycmd)" || (
28+- make -C "$mudir" build=$mbt -j $mjobs libs
29+- echo "k='$(eval $keycmd)'" >$mudir/build/$mbt/libmupdf.a.past
30+-) && vecho "fresh mupdf"
31+-
32+ oincs() {
33+ local i=
34+ local incs1=
35+@@ -90,32 +83,6 @@ mflags() {
36+ }
37+
38+ overs="$(ocamlc -vnum 2>/dev/null)" || overs=""
39+-test "$overs" = "4.07.0" || {
40+- url=https://caml.inria.fr/pub/distrib/ocaml-4.07/ocaml-4.07.0.tar.xz
41+- txz=$outd/$(basename $url)
42+- isfresh $txz $url || {
43+- executable_p() { command -v "$1" >/dev/null 2>&1; }
44+- if executable_p wget; then dl() { wget -q "$1" -O "$2"; }
45+- elif executable_p curl; then dl() { curl -L "$1" -o "$2"; }
46+- else die "no program to fetch remote urls found"
47+- fi
48+- dl $url $txz
49+- echo "k=$url" >$txz.past
50+- } && vecho "fresh $txz"
51+- absprefix=$(cd $outd &>/dev/null; pwd -P)
52+- export PATH=$absprefix/bin:$PATH
53+- isfresh $absprefix/bin/ocamlc "$url" || (
54+- tar xf $txz -C $outd
55+- bn=$(basename $url)
56+- cd $outd/${bn%.tar.xz}
57+- ./configure -prefix $absprefix \
58+- -no-graph -no-debugger -no-ocamldoc -no-native-compiler
59+- make -j $mjobs world
60+- make install
61+- echo "k='$url'" >$absprefix/bin/ocamlc.past
62+- ) && vecho "fresh ocamlc"
63+- overs=$(ocamlc -vnum 2>/dev/null)
64+-}
65+
66+ bocaml1() {
67+ grep -q "$3" $outd/ordered || {
68+@@ -224,7 +191,7 @@ bobjc() {
69+ } && vecho "fresh $o"
70+ }
71+
72+-ver=$(cd $srcd && git describe --tags --dirty) || ver=unknown
73++ver=@version@
74+
75+ cmd="(. $srcd/genconfstr.sh >$outd/confstruct.ml)"
76+ keycmd="digest $srcd/genconfstr.sh $outd/confstruct.ml"
77+@@ -278,7 +245,7 @@ for m in ml_gl ml_glarray ml_raw; do
78+ done
79+
80+ libs="str.cma unix.cma"
81+-clibs="-L$mudir/build/$mbt -lmupdf -lmupdf-third -lpthread"
82++clibs="-lmupdf -lfreetype -lpthread"
83+ if $darwin; then
84+ mcomp=$(ocamlc -config | grep bytecomp_c_co | { read _ c; echo $c; })
85+ clibs="$clibs -framework Cocoa -framework OpenGL"
86+--
87+2.19.2
88+
pkgs/applications/misc/pgmanage/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 name = "pgmanage-${version}";
5− version = "10.3.1";
5+ version = "11.0.1";
66
77 src = fetchFromGitHub {
88 owner = "pgManage";
99 repo = "pgManage";
1010 rev = "v${version}";
11− sha256 = "0ym1arla9wfkmr5n6h6dfyd680vlnng5s5j5nyxi2gl2wxqqhxzz";
11+ sha256 = "1a1dbc32b3y0ph8ydf800h6pz7dg6g1gxgid4gffk7k58xj0c5yf";
1212 };
1313
1414 patchPhase = ''
pkgs/applications/misc/playonlinux/default.nix+2−2
@@ -22,7 +22,7 @@
2222}:
2323
2424let
25− version = "4.2.12";
25+ version = "4.3.3";
2626
2727 binpath = stdenv.lib.makeBinPath
2828 [ cabextract
@@ -55,7 +55,7 @@ in stdenv.mkDerivation {
5555
5656 src = fetchurl {
5757 url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz";
58− sha256 = "03k8v9dknc5hfrfzqw1nkpifz7wkixv3mvjl1vnp4fx8rj2xrjrq";
58+ sha256 = "117xivwa87i2w66klplmwd5q7pfxcbrj2rjm11wl8iy5h3xpqkak";
5959 };
6060
6161 nativeBuildInputs = [ makeWrapper ];
pkgs/applications/misc/qmapshack/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 name = "qmapshack-${version}";
5− version = "1.12.0";
5+ version = "1.12.1";
66
77 src = fetchurl {
88 url = "https://bitbucket.org/maproom/qmapshack/downloads/${name}.tar.gz";
9− sha256 = "0d5p60kq9pa2hfql4nr8p42n88lr42jrsryrsllvaj45b8b6kvih";
9+ sha256 = "1d6n7xk0ksxb1fw43s5lb08vgxf6h93k3rb401cbka1inpyf2232";
1010 };
1111
1212 nativeBuildInputs = [ cmake ];
pkgs/applications/misc/rtl_433/default.nix+3−3
@@ -1,14 +1,14 @@
11{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libusb1, rtl-sdr }:
22stdenv.mkDerivation rec {
33
4− version = "18.05";
4+ version = "18.12";
55 name = "rtl_433-${version}";
66
77 src = fetchFromGitHub {
88 owner = "merbanan";
99 repo = "rtl_433";
10− rev = "18.05";
11− sha256 = "0vfhnjyrx6w1m8g1hww5vdz4zgdlhcaps9g0397mxlki4sm77wpc";
10+ rev = "18.12";
11+ sha256 = "0y73g9ffpsgnmfk8lbihyl9d1fd9v91wsn8k8xhsdmgmn4ra1jk5";
1212 };
1313
1414 nativeBuildInputs = [ autoreconfHook pkgconfig ];
pkgs/applications/misc/soapysdr/default.nix+3−3
@@ -19,7 +19,7 @@ in stdenv.mkDerivation {
1919 };
2020
2121 nativeBuildInputs = [ cmake pkgconfig ];
22− buildInputs = [ libusb ncurses numpy swig2 python ];
22+ buildInputs = [ libusb ncurses numpy swig2 python makeWrapper ];
2323
2424 cmakeFlags = [
2525 "-DCMAKE_BUILD_TYPE=Release"
@@ -33,8 +33,8 @@ in stdenv.mkDerivation {
3333 done
3434
3535 # Needed for at least the remote plugin server
36− for file in out/bin/*; do
37− ${makeWrapper}/bin/wrapProgram "$file" \
36+ for file in $out/bin/*; do
37+ wrapProgram "$file" \
3838 --prefix SOAPY_SDR_PLUGIN_PATH : ${lib.makeSearchPath "lib/SoapySDR/modules0.6" extraPackages}
3939 done
4040 '';
pkgs/applications/networking/browsers/chromium/upstream-info.nix+9−9
@@ -1,18 +1,18 @@
11# This file is autogenerated from update.sh in the same directory.
22{
33 beta = {
4− sha256 = "03ddfxxzh8pxil9n28y8nkzl8x0kb5bzzjy4mihg448dflh3anq2";
5− sha256bin64 = "147lh1way8db0j0m6wbpfzmfsvvlsjb29cjgf7s9hljb00wqv6ay";
6− version = "71.0.3578.80";
4+ sha256 = "1xcdbf5yia3xm0kil0gyd1mlj3m902w1px3lzpdqv31mr2lzaz08";
5+ sha256bin64 = "0pcbz3201nyl07psdxwphb3z9shqj4crj16f97xclyvjnwpl1jnp";
6+ version = "72.0.3626.28";
77 };
88 dev = {
9− sha256 = "0whw1kq5gd07k061ycfdn7bygahbl6zqa54wkz2lqh73yknbbnj4";
10− sha256bin64 = "0hlfzzf7kx90jw0zin685c4haiv262hf9a4sj6fmb2yhj21hbp87";
11− version = "72.0.3622.0";
9+ sha256 = "1vlpcafg3xx6bpnf74xs6ifqjbpb5bpxp10r55w4784yr57pmhq3";
10+ sha256bin64 = "02y974zbxy1gbiv9q8hp7nfl0l5frn35ggmgc44g90pbry48h8rg";
11+ version = "73.0.3642.0";
1212 };
1313 stable = {
14− sha256 = "03ddfxxzh8pxil9n28y8nkzl8x0kb5bzzjy4mihg448dflh3anq2";
15− sha256bin64 = "1rnw3whn2aaxxb4w3s2nf0wb91qjrq099550j42wig7xa71j6rz4";
16− version = "71.0.3578.80";
14+ sha256 = "0icxdg4fvz30jzq0xvl11zlwc9anb3lr9lb8sn1lqxr513isjmhw";
15+ sha256bin64 = "07kiqx5bpk54il0ynxl61bs5yscxb470q2bw3sx6cxjbhmnvbcn2";
16+ version = "71.0.3578.98";
1717 };
1818}
pkgs/applications/networking/browsers/midori/default.nix+17−40
@@ -1,54 +1,31 @@
1−{ stdenv, fetchurl, cmake, pkgconfig, intltool, vala_0_34, wrapGAppsHook
2−, gtk3, webkitgtk, librsvg, libnotify, sqlite
3−, glib-networking, gsettings-desktop-schemas, libsoup, pcre, gnome3
4−, libxcb, libpthreadstubs, libXdmcp, libxkbcommon, epoxy, at-spi2-core
5−, zeitgeistSupport ? false, zeitgeist ? null
1+{ stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook
2+, gtk3, webkitgtk, sqlite, gsettings-desktop-schemas, libsoup, glib-networking, gnome3
63}:
74
8−assert zeitgeistSupport -> zeitgeist != null;
9−
105stdenv.mkDerivation rec {
11− name = "midori-${version}";
12− version = "0.5.11";
13−
14− meta = with stdenv.lib; {
15− description = "Lightweight WebKitGTK+ web browser";
16− homepage = http://midori-browser.org;
17− license = with licenses; [ lgpl21Plus ];
18− platforms = with platforms; linux;
19− maintainers = with maintainers; [ raskin ramkromberg ];
20− };
6+ pname = "midori";
7+ version = "7";
218
229 src = fetchurl {
23− urls = [
24− "${meta.homepage}/downloads/midori_${version}_all_.tar.bz2"
25− "http://mirrors-ru.go-parts.com/blfs/conglomeration/midori/midori_${version}_all_.tar.bz2"
26− ];
27− name = "midori_${version}_all_.tar.bz2";
28− sha256 = "0gcwqkcyliqz10i33ww3wl02mmfnl7jzl2d493l4l53ipsb1l6cn";
10+ url = "https://github.com/midori-browser/core/releases/download/v${version}/midori-v${version}.0.tar.gz";
11+ sha256 = "0ffdnjp55s0ci737vlhxikb2nihghwlb6mjcjzpgpnzi47vjqnwh";
2912 };
3013
3114 nativeBuildInputs = [
32− pkgconfig wrapGAppsHook cmake intltool vala_0_34
15+ pkgconfig cmake ninja intltool vala wrapGAppsHook
3316 ];
3417
3518 buildInputs = [
36− gtk3 webkitgtk librsvg libnotify sqlite gsettings-desktop-schemas pcre gnome3.gcr
37− libxcb libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core
38− (libsoup.override {gnomeSupport = true;})
39− ] ++ stdenv.lib.optionals zeitgeistSupport [
40− zeitgeist
19+ gtk3 webkitgtk sqlite gsettings-desktop-schemas gnome3.gcr
20+ (libsoup.override { gnomeSupport = true; }) gnome3.libpeas
21+ glib-networking
4122 ];
4223
43− cmakeFlags = [
44− "-DUSE_ZEITGEIST=${if zeitgeistSupport then "ON" else "OFF"}"
45− "-DHALF_BRO_INCOM_WEBKIT2=ON"
46− "-DUSE_GTK3=1"
47− ];
48−
49− NIX_LDFLAGS="-lX11";
50−
51− preFixup = ''
52− gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules")
53− '';
24+ meta = with stdenv.lib; {
25+ description = "Lightweight WebKitGTK+ web browser";
26+ homepage = https://www.midori-browser.org/;
27+ license = with licenses; [ lgpl21Plus ];
28+ platforms = with platforms; linux;
29+ maintainers = with maintainers; [ raskin ramkromberg ];
30+ };
5431}
pkgs/applications/networking/browsers/qutebrowser/default.nix+7−13
@@ -10,20 +10,14 @@
1010assert withMediaPlayback -> gst_all_1 != null;
1111
1212let
13− pdfjs = stdenv.mkDerivation rec {
14− name = "pdfjs-${version}";
13+ pdfjs = let
1514 version = "1.10.100";
16−
17− src = fetchzip {
18− url = "https://github.com/mozilla/pdf.js/releases/download/${version}/${name}-dist.zip";
19− sha256 = "04df4cf6i6chnggfjn6m1z9vb89f01a0l9fj5rk21yr9iirq9rkq";
20− stripRoot = false;
21− };
22−
23− buildCommand = ''
24− mkdir $out
25− cp -r $src $out
26− '';
15+ in
16+ fetchzip rec {
17+ name = "pdfjs-${version}";
18+ url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip";
19+ sha256 = "04df4cf6i6chnggfjn6m1z9vb89f01a0l9fj5rk21yr9iirq9rkq";
20+ stripRoot = false;
2721 };
2822
2923in python3Packages.buildPythonApplication rec {
pkgs/applications/networking/browsers/surf/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818
1919 inherit patches;
2020
21− installFlags = [ "PREFIX=/" "DESTDIR=$(out)" ];
21+ installFlags = [ "PREFIX=$(out)" ];
2222
2323 meta = with stdenv.lib; {
2424 description = "A simple web browser based on WebKit/GTK+";
pkgs/applications/networking/cluster/cni/default.nix+6−12
@@ -1,6 +1,6 @@
1−{ stdenv, fetchFromGitHub, go, removeReferencesTo }:
1+{ stdenv, fetchFromGitHub, buildGoPackage }:
22
3−stdenv.mkDerivation rec {
3+buildGoPackage rec {
44 name = "cni-${version}";
55 version = "0.6.0";
66
@@ -11,29 +11,23 @@ stdenv.mkDerivation rec {
1111 sha256 = "00ajs2r5r2z3l0vqwxrcwhjfc9px12qbcv5vnvs2mdipvvls1y2y";
1212 };
1313
14− buildInputs = [ removeReferencesTo go ];
15−
16− GOCACHE = "off";
14+ goPackagePath = "github.com/containernetworking/cni";
1715
1816 buildPhase = ''
17+ cd "go/src/${goPackagePath}"
1918 patchShebangs build.sh
2019 ./build.sh
2120 '';
2221
2322 installPhase = ''
24− mkdir -p $out/bin
25− mv bin/cnitool $out/bin
26− '';
27−
28− preFixup = ''
29− find $out/bin -type f -exec remove-references-to -t ${go} '{}' +
23+ install -Dm555 bin/cnitool $bin/bin/cnitool
3024 '';
3125
3226 meta = with stdenv.lib; {
3327 description = "Container Network Interface - networking for Linux containers";
3428 license = licenses.asl20;
3529 homepage = https://github.com/containernetworking/cni;
36− maintainers = with maintainers; [offline];
30+ maintainers = with maintainers; [ offline vdemeester ];
3731 platforms = [ "x86_64-linux" ];
3832 };
3933}
pkgs/applications/networking/cluster/luigi/default.nix+3
@@ -19,6 +19,9 @@ python3Packages.buildPythonApplication rec {
1919 # Requires tox, hadoop, and google cloud
2020 doCheck = false;
2121
22+ # This enables accessing modules stored in cwd
23+ makeWrapperArgs = ["--prefix PYTHONPATH . :"];
24+
2225 meta = with lib; {
2326 homepage = https://github.com/spotify/luigi;
2427 description = "Python package that helps you build complex pipelines of batch jobs";
pkgs/applications/networking/cluster/pig/default.nix+4−4
@@ -2,15 +2,15 @@
22
33stdenv.mkDerivation rec {
44
5− name = "pig-0.16.0";
5+ name = "pig-0.17.0";
66
77 src = fetchurl {
88 url = "mirror://apache/pig/${name}/${name}.tar.gz";
9− sha256 = "0p79grz5islnq195lv7pqdxb5l3v4y0k0w63602827qs70zpr508";
9+ sha256 = "1wwpg0w47f49rnivn2d26vrxgyfl9gpqx3vmzbl5lhx6x5l3fqbd";
1010
1111 };
1212
13− buildInputs = [ makeWrapper ];
13+ nativeBuildInputs = [ makeWrapper ];
1414
1515 installPhase = ''
1616 mkdir -p $out
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 '';
2828
2929 meta = with stdenv.lib; {
30− homepage = http://pig.apache.org/;
30+ homepage = https://pig.apache.org/;
3131 description = "High-level language for Apache Hadoop";
3232 license = licenses.asl20;
3333
pkgs/applications/networking/cluster/terragrunt/default.nix+2−2
@@ -2,7 +2,7 @@
22
33buildGoPackage rec {
44 name = "terragrunt-${version}";
5− version = "0.17.3";
5+ version = "0.17.4";
66
77 goPackagePath = "github.com/gruntwork-io/terragrunt";
88
@@ -10,7 +10,7 @@ buildGoPackage rec {
1010 owner = "gruntwork-io";
1111 repo = "terragrunt";
1212 rev = "v${version}";
13− sha256 = "1b0fwql9nr00qpvcbsbdymxf1wrgr590gkms7yz3yirb4xfl3gl3";
13+ sha256 = "13hlv0ydmv8gpzgg6bfr7rp89xfw1bkgd0j684armw8zq29cmv3a";
1414 };
1515
1616 goDeps = ./deps.nix;
pkgs/applications/networking/flexget/default.nix+14−29
@@ -1,8 +1,4 @@
1−{ lib, python
2−, delugeSupport ? true, deluge ? null
3−}:
4−
5−assert delugeSupport -> deluge != null;
1+{ lib, python36 }:
62
73# Flexget have been a trouble maker in the past,
84# if you see flexget breaking when updating packages, don't worry.
@@ -10,17 +6,9 @@ assert delugeSupport -> deluge != null;
106# -- Mic92
117
128let
13− python' = python.override { inherit packageOverrides; };
9+ python' = python36.override { inherit packageOverrides; };
1410
1511 packageOverrides = self: super: {
16− sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec {
17− version = "1.2.6";
18− src = old.src.override {
19− inherit version;
20− sha256 = "1nwylglh256mbwwnng6n6bzgxshyz18j12hw76sghbprp74hrc3w";
21− };
22− });
23−
2412 guessit = super.guessit.overridePythonAttrs (old: rec {
2513 version = "3.0.3";
2614 src = old.src.override {
@@ -36,14 +24,16 @@ with python'.pkgs;
3624
3725buildPythonApplication rec {
3826 pname = "FlexGet";
39− version = "2.17.14";
27+ version = "2.17.20";
4028
4129 src = fetchPypi {
4230 inherit pname version;
43− sha256 = "1wh12nspjzsgb0a7qp67s4k8wssbhhf500s8x8mx2smb1mgy4xzz";
31+ sha256 = "a09ef9482ed54f7e96eb8b4d08c59687c5c43a3341c9d2675383693e6c3681c3";
4432 };
4533
4634 postPatch = ''
35+ # build for the correct python version
36+ substituteInPlace setup.cfg --replace $'[bdist_wheel]\npython-tag = py27' ""
4737 # remove dependency constraints
4838 sed 's/==\([0-9]\.\?\)\+//' -i requirements.txt
4939 '';
@@ -52,25 +42,20 @@ buildPythonApplication rec {
5242 doCheck = false;
5343
5444 propagatedBuildInputs = [
45+ # See https://github.com/Flexget/Flexget/blob/master/requirements.in
5546 feedparser sqlalchemy pyyaml
56− chardet beautifulsoup4 html5lib
47+ beautifulsoup4 html5lib
5748 PyRSS2Gen pynzb rpyc jinja2
58− jsonschema requests dateutil
49+ requests dateutil jsonschema
5950 pathpy guessit APScheduler
6051 terminaltables colorclass
6152 cherrypy flask flask-restful
6253 flask-restplus flask-compress
63− flask_login flask-cors safe
64− pyparsing future zxcvbn-python
65− werkzeug tempora cheroot rebulk
66− portend transmissionrpc aniso8601
67− babelfish certifi click futures
68− idna itsdangerous markupsafe
69− plumbum pytz six tzlocal urllib3
70− webencodings werkzeug zxcvbn-python
71− backports_functools_lru_cache
72− ] ++ lib.optional (pythonOlder "3.4") pathlib
73− ++ lib.optional delugeSupport deluge;
54+ flask_login flask-cors
55+ pyparsing zxcvbn-python future
56+ # Optional requirements
57+ deluge-client
58+ ] ++ lib.optional (pythonOlder "3.4") pathlib;
7459
7560 meta = with lib; {
7661 homepage = https://flexget.com/;
pkgs/applications/networking/gns3/server.nix+10−11
@@ -1,10 +1,10 @@
11{ stable, branch, version, sha256Hash }:
22
3−{ stdenv, python3Packages, fetchFromGitHub, fetchurl }:
3+{ stdenv, python36Packages, fetchFromGitHub, fetchurl }:
44
55let
6− pythonPackages = python3Packages;
7− async-timeout = (stdenv.lib.overrideDerivation pythonPackages.async-timeout
6+ pythonPackages = python36Packages;
7+ async-timeout = pythonPackages.async-timeout.overrideAttrs
88 (oldAttrs:
99 rec {
1010 pname = "async-timeout";
@@ -13,8 +13,8 @@ let
1313 inherit pname version;
1414 sha256 = "1l3kg062m02mph6rf9rdv8r5c5n356clxa6b6mrn0i77vk9g9kq0";
1515 };
16− }));
17− aiohttp = (stdenv.lib.overrideDerivation pythonPackages.aiohttp
16+ });
17+ aiohttp = pythonPackages.aiohttp.overrideAttrs
1818 (oldAttrs:
1919 rec {
2020 pname = "aiohttp";
@@ -24,10 +24,9 @@ let
2424 sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964";
2525 };
2626 propagatedBuildInputs = [ async-timeout ]
27− ++ (with pythonPackages; [ attrs chardet multidict yarl ])
28− ++ stdenv.lib.optional (pythonPackages.pythonOlder "3.7") pythonPackages.idna-ssl;
29− }));
30− aiohttp-cors = (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors
27+ ++ (with pythonPackages; [ attrs chardet multidict yarl idna-ssl ]);
28+ });
29+ aiohttp-cors = pythonPackages.aiohttp-cors.overrideAttrs
3130 (oldAttrs:
3231 rec {
3332 pname = "aiohttp-cors";
@@ -41,7 +40,7 @@ let
4140 ++ stdenv.lib.optional
4241 (pythonPackages.pythonOlder "3.5")
4342 pythonPackages.typing;
44− }));
43+ });
4544in pythonPackages.buildPythonPackage rec {
4645 name = "${pname}-${version}";
4746 pname = "gns3-server";
@@ -57,7 +56,7 @@ in pythonPackages.buildPythonPackage rec {
5756 ++ (with pythonPackages; [
5857 yarl aiohttp multidict
5958 jinja2 psutil zipstream raven jsonschema typing
60− prompt_toolkit
59+ (pythonPackages.callPackage ../../../development/python-modules/prompt_toolkit/1.nix {})
6160 ]);
6261
6362 # Requires network access
pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix+4−3
@@ -13,9 +13,10 @@ stdenv.mkDerivation {
1313 platforms = stdenv.lib.platforms.linux;
1414 };
1515
16− makeFlags = "PURPLE_LIBDIR=lib PURPLE_DATADIR=share/data DESTDIR=$$out";
17− preInstall = "mkdir -p \$out/share";
18− postInstall = "ln -s \$out/lib/purple-2 \$out/share/pidgin-msn-pecan";
16+ makeFlags = [
17+ "PURPLE_LIBDIR=${placeholder "out"}/lib"
18+ "PURPLE_DATADIR=${placeholder "out"}/share/data"
19+ ];
1920
2021 buildInputs = [pidgin];
2122}
pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix+7−4
@@ -15,13 +15,16 @@ stdenv.mkDerivation rec {
1515 nativeBuildInputs = [ pkgconfig ];
1616 buildInputs = [ pidgin ];
1717
18− preConfigure = ''
18+ postPatch = ''
1919 sed -i 's|-I/usr/include/libpurple|$(shell pkg-config --cflags purple)|' Makefile
20− export DESTDIR=$out
21− export LIBDIR=/lib
22− export DATADIR=/share
2320 '';
2421
22+ makeFlags = [
23+ "DESTDIR=/"
24+ "LIBDIR=${placeholder "out"}/lib"
25+ "DATADIR=${placeholder "out"}/share"
26+ ];
27+
2528 meta = {
2629 homepage = https://github.com/dreadatour/pidgin-mra;
2730 description = "Mail.ru Agent plugin for Pidgin / libpurple";
pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix+4−5
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pidgin, unzip, glib, json-glib, nss, nspr, libgnome-keyring } :
1+{ stdenv, fetchFromGitHub, pidgin, glib, json-glib, nss, nspr, libgnome-keyring } :
22
33stdenv.mkDerivation rec {
44 name = "pidgin-opensteamworks-${version}";
@@ -13,12 +13,11 @@ stdenv.mkDerivation rec {
1313
1414 preConfigure = "cd steam-mobile";
1515 installFlags = [
16− "DESTDIR=$(out)"
17− "PLUGIN_DIR_PURPLE=/lib/purple-2"
18− "DATA_ROOT_DIR_PURPLE=/share"
16+ "PLUGIN_DIR_PURPLE=${placeholder "out"}/lib/purple-2"
17+ "DATA_ROOT_DIR_PURPLE=${placeholder "out"}/share"
1918 ];
2019
21− buildInputs = [ pidgin unzip glib json-glib nss nspr libgnome-keyring ];
20+ buildInputs = [ pidgin glib json-glib nss nspr libgnome-keyring ];
2221
2322 meta = with stdenv.lib; {
2423 homepage = https://github.com/EionRobb/pidgin-opensteamworks;
pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix+5−10
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 name = "pidgin-skypeweb-${version}";
5− version = "1.2.2";
5+ version = "1.5";
66
77 src = fetchFromGitHub {
88 owner = "EionRobb";
99 repo = "skype4pidgin";
10− rev = "${version}";
11− sha256 = "1lxpz316jmns6i143v4j6sd6k0a4a54alw08rvwjckf2rig57lj2";
10+ rev = version;
11+ sha256 = "1bd9gd36yhrbrww0dvai9rnzxxj1c9sb4003c72wg27w12y47xfv";
1212 };
1313
1414 setSourceRoot = ''
@@ -18,13 +18,8 @@ stdenv.mkDerivation rec {
1818 nativeBuildInputs = [ pkgconfig ];
1919 buildInputs = [ pidgin json-glib ];
2020
21− makeFlags = [
22− "PLUGIN_DIR_PURPLE=/lib/pidgin/"
23− "DATA_ROOT_DIR_PURPLE=/share"
24− "DESTDIR=$(out)"
25− ];
26−
27− postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-skypeweb";
21+ PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2";
22+ PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share";
2823
2924 meta = with stdenv.lib; {
3025 homepage = https://github.com/EionRobb/skype4pidgin;
pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix+2−6
@@ -14,12 +14,8 @@ stdenv.mkDerivation rec {
1414 nativeBuildInputs = [ pkgconfig ];
1515 buildInputs = [ pidgin json-glib ];
1616
17− makeFlags = [
18− "DESTDIR=$(out)"
19− ];
20−
21− PKG_CONFIG_PURPLE_PLUGINDIR = "/lib/purple-2";
22− PKG_CONFIG_PURPLE_DATADIR = "/share";
17+ PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2";
18+ PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share";
2319
2420 meta = with stdenv.lib; {
2521 homepage = https://github.com/EionRobb/purple-discord;
pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix+2−3
@@ -18,9 +18,8 @@ stdenv.mkDerivation rec {
1818 hardeningDisable = [ "fortify" ]; # upstream compiles with -O0
1919
2020 makeFlags = [
21− "DESTDIR=$(out)"
22− "PLUGIN_DIR_PURPLE=/lib/pidgin/"
23− "DATA_ROOT_DIR_PURPLE=/share"
21+ "PLUGIN_DIR_PURPLE=${placeholder "out"}/lib/purple-2"
22+ "DATA_ROOT_DIR_PURPLE=${placeholder "out"}/share"
2423 ];
2524
2625 meta = with stdenv.lib; {
pkgs/applications/networking/instant-messengers/riot/riot-web.nix+2−2
@@ -3,11 +3,11 @@
33let configFile = writeText "riot-config.json" conf; in
44stdenv.mkDerivation rec {
55 name= "riot-web-${version}";
6− version = "0.17.6";
6+ version = "0.17.8";
77
88 src = fetchurl {
99 url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
10− sha256 = "1y38fq0r9cxmazh9rjc5qy7fzwy81ad35k538d6rsfwz1y88ipdm";
10+ sha256 = "0610h307q0zlyd0l7afrb8jv1r9gy9gc07zkjn33jpycwmpbwxbz";
1111 };
1212
1313 installPhase = ''
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix+2−2
@@ -4,8 +4,8 @@ let
44 mkTelegram = args: qt5.callPackage (import ./generic.nix args) { };
55 stableVersion = {
66 stable = true;
7− version = "1.5.2";
8− sha256Hash = "0kg1xw1b4zj5a2yf6x5r7wrpl7w0fs52s58w606n9gyx7kdcgkj8";
7+ version = "1.5.4";
8+ sha256Hash = "0a52m5qkvk01yl3za3k7pccjrqkr8gbxqnj5lnhh1im1pdxqwh4m";
99 # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
1010 archPatchesRevision = "415526";
1111 archPatchesHash = "1lfzws90ab0vajhm5r64gyyqqc1g6a2ay0a1vkp0ah1iw5jh11ik";
pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix+3−1
@@ -29,7 +29,9 @@ mkDerivation rec {
2929 };
3030
3131 # TODO: libtgvoip.patch no-gtk2.patch
32− patches = [ "${archPatches}/tdesktop.patch" ]
32+ patches = [
33+ "${archPatches}/tdesktop.patch"
34+ ]
3335 # TODO: Only required to work around a compiler bug.
3436 # This should be fixed in GCC 7.3.1 (or later?)
3537 ++ [ ./fix-internal-compiler-error.patch ];
pkgs/applications/networking/instant-messengers/wavebox/default.nix+2−2
@@ -8,7 +8,7 @@ with stdenv.lib;
88let
99 bits = "x86_64";
1010
11− version = "4.5.5";
11+ version = "4.5.9";
1212
1313 desktopItem = makeDesktopItem rec {
1414 name = "Wavebox";
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
2525 name = "wavebox-${version}";
2626 src = fetchurl {
2727 url = "https://github.com/wavebox/waveboxapp/releases/download/v${version}/${tarball}";
28− sha256 = "b392e02b3b1b4deece32311aeb69b31c2550c4251be65f408c35b0badbf3c8b6";
28+ sha256 = "158kj7r5p4p3xk5pwzvbd51h543panmgkr64knv418ksyqjdi16g";
2929 };
3030
3131 # don't remove runtime deps
pkgs/applications/networking/syncplay/default.nix+3−3
@@ -2,13 +2,13 @@
22
33python3Packages.buildPythonApplication rec {
44 name = "syncplay-${version}";
5− version = "1.6.0";
5+ version = "1.6.1";
66
77 format = "other";
88
99 src = fetchurl {
10− url = https://github.com/Syncplay/syncplay/archive/v1.6.0.tar.gz;
11− sha256 = "19x7b694p8b3qp578qk8q4g0pybhfjd4zk8rgrggz40s1yyfnwy5";
10+ url = https://github.com/Syncplay/syncplay/archive/v1.6.1.tar.gz;
11+ sha256 = "15rhbc3r7l012d330hb64p8bhcpy4ydy89iv34c34a1r554b8k97";
1212 };
1313
1414 propagatedBuildInputs = with python3Packages; [ pyside twisted ];
pkgs/applications/networking/syncthing/default.nix+2−2
@@ -3,14 +3,14 @@
33let
44 common = { stname, target, postInstall ? "" }:
55 buildGoPackage rec {
6− version = "0.14.52";
6+ version = "0.14.54";
77 name = "${stname}-${version}";
88
99 src = fetchFromGitHub {
1010 owner = "syncthing";
1111 repo = "syncthing";
1212 rev = "v${version}";
13− sha256 = "1qzzbqfyjqlgzysyf6dr0xsm3gn35irmllxjjd94v169swvkk5kd";
13+ sha256 = "0l73ka71l6gxv46wmlyzj8zhfpfj3vf6nv6x3x0z25ymr3wa2fza";
1414 };
1515
1616 goPackagePath = "github.com/syncthing/syncthing";
pkgs/applications/office/gnumeric/default.nix+13−17
@@ -5,33 +5,23 @@
55
66let
77 inherit (pythonPackages) python pygobject3;
8− isopub = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isopub.ent; sha256 = "073l492jz70chcadr2p7ssx7gz5hd731s2cazhxx4r845kilyr77"; };
9− isonum = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isonum.ent; sha256 = "04b62dw2g3cj9i4vn9xyrsrlz8fpmmijq98dm0nrkky31bwbbrs3"; };
10− isogrk1 = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent; sha256 = "04b23anhs5wr62n4rgsjirzvw7rpjcsf8smz4ffzaqh3b0vw90vm"; };
118in stdenv.mkDerivation rec {
12− name = "gnumeric-1.12.43";
9+ pname = "gnumeric";
10+ version = "1.12.44";
1311
1412 src = fetchurl {
15− url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz";
16− sha256 = "87c9abd6260cf29401fa1e0fcce374e8c7bcd1986608e4049f6037c9d32b5fd5";
13+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
14+ sha256 = "0147962c6ybdsj57rz95nla0rls7g545wc2n7pz59zmzyd5pksk0";
1715 };
1816
1917 configureFlags = [ "--disable-component" ];
2018
21− prePatch = ''
22− substituteInPlace doc/C/gnumeric.xml \
23− --replace http://www.oasis-open.org/docbook/xml/4.5/ent/isopub.ent ${isopub} \
24− --replace http://www.oasis-open.org/docbook/xml/4.5/ent/isonum.ent ${isonum} \
25− --replace http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent ${isogrk1}
26− '';
27−
28− nativeBuildInputs = [ pkgconfig ];
19+ nativeBuildInputs = [ pkgconfig intltool bison itstool makeWrapper ];
2920
3021 # ToDo: optional libgda, introspection?
3122 buildInputs = [
32− intltool bison
33− goffice gtk3 makeWrapper gnome3.defaultIconTheme
34− python pygobject3 itstool
23+ goffice gtk3 gnome3.defaultIconTheme
24+ python pygobject3
3525 ] ++ (with perlPackages; [ perl XMLParser ]);
3626
3727 enableParallelBuilding = true;
@@ -44,6 +34,12 @@ in stdenv.mkDerivation rec {
4434 done
4535 '';
4636
37+ passthru = {
38+ updateScript = gnome3.updateScript {
39+ packageName = pname;
40+ };
41+ };
42+
4743 meta = with stdenv.lib; {
4844 description = "The GNOME Office Spreadsheet";
4945 license = stdenv.lib.licenses.gpl2Plus;
pkgs/applications/office/zim/default.nix+3−2
@@ -9,11 +9,11 @@
99
1010python2Packages.buildPythonApplication rec {
1111 name = "zim-${version}";
12− version = "0.68";
12+ version = "0.69";
1313
1414 src = fetchurl {
1515 url = "http://zim-wiki.org/downloads/${name}.tar.gz";
16− sha256 = "05fzb24a2s3pm89zb6gwa48wb925an5i652klx8yk9pn23h1h5fr";
16+ sha256 = "1j04l1914iw87b0jd3r1czrh0q491fdgbqbi0biacxiri5q0i6a1";
1717 };
1818
1919 propagatedBuildInputs = with python2Packages; [ pyGtkGlade pyxdg pygobject2 ];
@@ -42,5 +42,6 @@ python2Packages.buildPythonApplication rec {
4242 homepage = http://zim-wiki.org;
4343 license = licenses.gpl2Plus;
4444 maintainers = with maintainers; [ pSub ];
45+ broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/52658#issuecomment-449565790
4546 };
4647}
pkgs/applications/science/astronomy/stellarium/default.nix+2−2
@@ -6,13 +6,13 @@
66
77mkDerivation rec {
88 name = "stellarium-${version}";
9− version = "0.18.2";
9+ version = "0.18.3";
1010
1111 src = fetchFromGitHub {
1212 owner = "Stellarium";
1313 repo = "stellarium";
1414 rev = "v${version}";
15− sha256 = "17764i52dmipaz62k5n23fyx07d7cjir0dgav0s5b6sjd8gbjwbf";
15+ sha256 = "1cnwfk3vdsxh8gacw22qik401z0kpzd1ralbg9ph2cjqx9x2m1s1";
1616 };
1717
1818 nativeBuildInputs = [ cmake perl ];
pkgs/applications/science/biology/picard-tools/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 name = "picard-tools-${version}";
5− version = "2.18.17";
5+ version = "2.18.20";
66
77 src = fetchurl {
88 url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
9− sha256 = "0ks7ymrjfya5h77hp0bqyipzdri0kf97c8wks32nvwkj821687zm";
9+ sha256 = "0dx6fxn6d7mawkah242fdi9wm8pdzmm4m004fb9ak2fsvrs2m5pk";
1010 };
1111
1212 nativeBuildInputs = [ makeWrapper ];
pkgs/applications/science/electronics/dsview/default.nixnew file+47
@@ -0,0 +1,47 @@
1+{ stdenv, fetchFromGitHub, pkgconfig, cmake, autoreconfHook,
2+glib, libzip, boost, fftw, qtbase,
3+libusb, makeWrapper, libsigrok4dsl, libsigrokdecode4dsl
4+}:
5+
6+stdenv.mkDerivation rec {
7+ name = "dsview-${version}";
8+
9+ version = "0.99";
10+
11+ src = fetchFromGitHub {
12+ owner = "DreamSourceLab";
13+ repo = "DSView";
14+ rev = version;
15+ sha256 = "189i3baqgn8k3aypalayss0g489xi0an9hmvyggvxmgg1cvcwka2";
16+ };
17+
18+ postUnpack = ''
19+ export sourceRoot=$sourceRoot/DSView
20+ '';
21+
22+ patches = [
23+ # Fix absolute install paths
24+ ./install.patch
25+ ];
26+
27+ nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
28+
29+ buildInputs = [
30+ boost fftw qtbase libusb libzip libsigrokdecode4dsl libsigrok4dsl
31+ ];
32+
33+ enableParallelBuilding = true;
34+
35+ postFixup = ''
36+ wrapProgram $out/bin/DSView --suffix QT_PLUGIN_PATH : \
37+ ${qtbase.bin}/${qtbase.qtPluginPrefix}
38+ '';
39+
40+ meta = with stdenv.lib; {
41+ description = "A GUI program for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc";
42+ homepage = http://www.dreamsourcelab.com/;
43+ license = licenses.gpl3Plus;
44+ platforms = platforms.linux;
45+ maintainers = [ maintainers.bachp ];
46+ };
47+}
pkgs/applications/science/electronics/dsview/install.patchnew file+15
@@ -0,0 +1,15 @@
1+diff --git a/CMakeLists.txt b/CMakeLists.txt
2+index c1c33e1..208a184 100644
3+--- a/CMakeLists.txt
4++++ b/CMakeLists.txt
5+@@ -403,8 +403,8 @@ install(DIRECTORY res DESTINATION share/${PROJECT_NAME})
6+ install(FILES icons/logo.png DESTINATION share/${PROJECT_NAME} RENAME logo.png)
7+ install(FILES ../NEWS DESTINATION share/${PROJECT_NAME} RENAME NEWS)
8+ install(FILES ../ug.pdf DESTINATION share/${PROJECT_NAME} RENAME ug.pdf)
9+-install(FILES DreamSourceLab.rules DESTINATION /etc/udev/rules.d/)
10+-install(FILES DSView.desktop DESTINATION /usr/share/applications/)
11++install(FILES DreamSourceLab.rules DESTINATION etc/udev/rules.d/)
12++install(FILES DSView.desktop DESTINATION share/applications/)
13+
14+ #===============================================================================
15+ #= Packaging (handled by CPack)
pkgs/applications/science/electronics/dsview/libsigrok4dsl.nixnew file+28
@@ -0,0 +1,28 @@
1+{ stdenv, pkgconfig, autoreconfHook,
2+glib, libzip, libserialport, check, libusb, libftdi,
3+systemd, alsaLib, dsview
4+}:
5+
6+stdenv.mkDerivation rec {
7+ inherit (dsview) version src;
8+
9+ name = "libsigrok4dsl-${version}";
10+
11+ postUnpack = ''
12+ export sourceRoot=$sourceRoot/libsigrok4DSL
13+ '';
14+
15+ nativeBuildInputs = [ pkgconfig autoreconfHook ];
16+
17+ buildInputs = [
18+ glib libzip libserialport libusb libftdi systemd check alsaLib
19+ ];
20+
21+ meta = with stdenv.lib; {
22+ description = "A fork of the sigrok library for usage with DSView";
23+ homepage = http://www.dreamsourcelab.com/;
24+ license = licenses.gpl3Plus;
25+ platforms = platforms.linux;
26+ maintainers = [ maintainers.bachp ];
27+ };
28+}
pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nixnew file+27
@@ -0,0 +1,27 @@
1+{ stdenv, pkgconfig, autoreconfHook,
2+glib, check, python3, dsview
3+}:
4+
5+stdenv.mkDerivation rec {
6+ inherit (dsview) version src;
7+
8+ name = "libsigrokdecode4dsl-${version}";
9+
10+ postUnpack = ''
11+ export sourceRoot=$sourceRoot/libsigrokdecode4DSL
12+ '';
13+
14+ nativeBuildInputs = [ pkgconfig autoreconfHook ];
15+
16+ buildInputs = [
17+ python3 glib check
18+ ];
19+
20+ meta = with stdenv.lib; {
21+ description = "A fork of the sigrokdecode library for usage with DSView";
22+ homepage = http://www.dreamsourcelab.com/;
23+ license = licenses.gpl3Plus;
24+ platforms = platforms.linux;
25+ maintainers = [ maintainers.bachp ];
26+ };
27+}
pkgs/applications/science/electronics/verilator/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 name = "verilator-${version}";
5− version = "4.006";
5+ version = "4.008";
66
77 src = fetchurl {
88 url = "https://www.veripool.org/ftp/${name}.tgz";
9− sha256 = "0vnybpknf4llw3fw800ffiqj89ilbq06j8b2x4syj2gsrlnjvp1i";
9+ sha256 = "1b0cj7bb2a3hrfaziix7p9idcpbygapdl0nrfr3pbdxxsgnzdknm";
1010 };
1111
1212 enableParallelBuilding = true;
pkgs/applications/science/logic/aspino/default.nix+2
@@ -44,5 +44,7 @@ stdenv.mkDerivation rec {
4444 platforms = platforms.unix;
4545 license = licenses.asl20;
4646 homepage = http://alviano.net/software/maxino/;
47+ # See pkgs/applications/science/logic/glucose/default.nix
48+ badPlatforms = [ "aarch64-linux" ];
4749 };
4850}
pkgs/applications/science/logic/avy/default.nix+3
@@ -46,5 +46,8 @@ stdenv.mkDerivation rec {
4646 license = stdenv.lib.licenses.mit;
4747 maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
4848 platforms = stdenv.lib.platforms.linux;
49+ # See pkgs/applications/science/logic/glucose/default.nix
50+ # (The error is different due to glucose-fenv.patch, but the same)
51+ badPlatforms = [ "aarch64-linux" ];
4952 };
5053}
pkgs/applications/science/logic/glucose/default.nix+2
@@ -23,5 +23,7 @@ stdenv.mkDerivation rec {
2323 license = licenses.mit;
2424 platforms = platforms.unix;
2525 maintainers = with maintainers; [ gebner ];
26+ # Build uses _FPU_EXTENDED macro
27+ badPlatforms = [ "aarch64-linux" ];
2628 };
2729}
pkgs/applications/science/math/R/default.nix+2−2
@@ -8,11 +8,11 @@
88}:
99
1010stdenv.mkDerivation rec {
11− name = "R-3.5.1";
11+ name = "R-3.5.2";
1212
1313 src = fetchurl {
1414 url = "https://cran.r-project.org/src/base/R-3/${name}.tar.gz";
15− sha256 = "0463bff5eea0f3d93fa071f79c18d0993878fd4f2e18ae6cf22c1639d11457ed";
15+ sha256 = "0qjvdic1qd5vndc4f0wjndpm0x18lbvbcc8nkix8saqgy8y8qgg5";
1616 };
1717
1818 dontUseImakeConfigure = true;
pkgs/applications/version-management/git-and-tools/git-secret/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, makeWrapper, git, gnupg }:
1+{ stdenv, lib, fetchFromGitHub, makeWrapper, git, gnupg, gawk }:
22
33let
44 version = "0.2.4";
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
2020 install -D git-secret $out/bin/git-secret
2121
2222 wrapProgram $out/bin/git-secret \
23− --prefix PATH : "${lib.makeBinPath [ git gnupg ]}"
23+ --prefix PATH : "${lib.makeBinPath [ git gnupg gawk ]}"
2424
2525 mkdir $out/share
2626 cp -r man $out/share
pkgs/applications/version-management/git-repo/default.nix+2−2
@@ -4,13 +4,13 @@
44
55stdenv.mkDerivation rec {
66 name = "git-repo-${version}";
7− version = "1.13.0";
7+ version = "1.13.1";
88
99 src = fetchFromGitHub {
1010 owner = "android";
1111 repo = "tools_repo";
1212 rev = "v${version}";
13− sha256 = "0078nyz2j3ci9rs0h104xh046n0mcls3xcw5mysi2r7453xj8fkn";
13+ sha256 = "09p0xv8x7mkmibri7rcl1k4dwh2gj3c7dipkrwrsir6hrwsispd1";
1414 };
1515
1616 nativeBuildInputs = [ makeWrapper ];
pkgs/applications/version-management/gitea/default.nix+8−3
@@ -7,13 +7,13 @@ with stdenv.lib;
77
88buildGoPackage rec {
99 name = "gitea-${version}";
10− version = "1.6.0";
10+ version = "1.6.2";
1111
1212 src = fetchFromGitHub {
1313 owner = "go-gitea";
1414 repo = "gitea";
1515 rev = "v${version}";
16− sha256 = "01nqf8pnpa0n72brqh499z15rys6f0ck7l2cnpbiqgg3kir8b21p";
16+ sha256 = "1ijxpihdg8k6gs1xpim0iviqakvjadjzp0a5ki2czykilnyg8y85";
1717 # Required to generate the same checksum on MacOS due to unicode encoding differences
1818 # More information: https://github.com/NixOS/nixpkgs/pull/48128
1919 extraPostFetch = ''
@@ -33,7 +33,12 @@ buildGoPackage rec {
3333
3434 nativeBuildInputs = [ makeWrapper ];
3535
36− buildFlags = optionalString sqliteSupport "-tags sqlite";
36+ buildFlags = optional sqliteSupport "-tags sqlite";
37+ buildFlagsArray = ''
38+ -ldflags=
39+ -X=main.Version=${version}
40+ ${optionalString sqliteSupport "-X=main.Tags=sqlite"}
41+ '';
3742
3843 outputs = [ "bin" "out" "data" ];
3944
pkgs/applications/version-management/mercurial/default.nix+3−2
@@ -49,8 +49,9 @@ in python2Packages.buildPythonApplication {
4949 cp -v hgweb.cgi contrib/hgweb.wsgi $out/share/cgi-bin
5050 chmod u+x $out/share/cgi-bin/hgweb.cgi
5151
52− # install bash completion
53− install -D -v contrib/bash_completion $out/share/bash-completion/completions/mercurial
52+ # install bash/zsh completions
53+ install -v -m644 -D contrib/bash_completion $out/share/bash-completion/completions/_hg
54+ install -v -m644 -D contrib/zsh_completion $out/share/zsh/site-functions/_hg
5455 '';
5556
5657 meta = {
pkgs/applications/version-management/src/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 name = "src-${version}";
5− version = "1.18";
5+ version = "1.22";
66
77 src = fetchurl {
88 url = "http://www.catb.org/~esr/src/${name}.tar.gz";
9− sha256 = "0n0skhvya8w2az45h2gsafxy8m2mvqas64nrgxifcmrzfv0rf26c";
9+ sha256 = "0xvfg3aikr2jh09vjvxsha7day5br88chvirncr59ad40da1fils";
1010 };
1111
1212 buildInputs = [ python rcs git makeWrapper ];
pkgs/applications/video/vdr/default.nixnew file+78
@@ -0,0 +1,78 @@
1+{ stdenv, fetchurl, fontconfig, libjpeg, libcap, freetype, fribidi, pkgconfig
2+, gettext, ncurses, systemd, perl
3+, enableSystemd ? true
4+, enableBidi ? true
5+}:
6+let
7+
8+ version = "2.4.0";
9+
10+ name = "vdr-${version}";
11+
12+ mkPlugin = name: stdenv.mkDerivation {
13+ name = "vdr-${name}-${version}";
14+ inherit (vdr) src;
15+ buildInputs = [ vdr ];
16+ preConfigure = "cd PLUGINS/src/${name}";
17+ installFlags = [ "DESTDIR=$(out)" ];
18+ };
19+
20+ vdr = stdenv.mkDerivation {
21+
22+ inherit name;
23+
24+ src = fetchurl {
25+ url = "ftp://ftp.tvdr.de/vdr/${name}.tar.bz2";
26+ sha256 = "1klcgy9kr7n6z8d2c77j63bl8hvhx5qnqppg73f77004hzz4kbwk";
27+ };
28+
29+ enableParallelBuilding = true;
30+
31+ postPatch = "substituteInPlace Makefile --replace libsystemd-daemon libsystemd";
32+
33+ buildInputs = [ fontconfig libjpeg libcap freetype ]
34+ ++ stdenv.lib.optional enableSystemd systemd
35+ ++ stdenv.lib.optional enableBidi fribidi;
36+
37+ buildFlags = [ "vdr" "i18n" ]
38+ ++ stdenv.lib.optional enableSystemd "SDNOTIFY=1"
39+ ++ stdenv.lib.optional enableBidi "BIDI=1";
40+
41+ nativeBuildInputs = [ perl ];
42+
43+ # plugins uses the same build environment as vdr
44+ propagatedNativeBuildInputs = [ pkgconfig gettext ];
45+
46+ installFlags = [
47+ "DESTDIR=$(out)"
48+ "PREFIX=" # needs to be empty, otherwise plugins try to install at same prefix
49+ ];
50+
51+ installTargets = [ "install-pc" "install-bin" "install-doc" "install-i18n"
52+ "install-includes" ];
53+
54+ postInstall = ''
55+ mkdir -p $out/lib/vdr # only needed if vdr is started without any plugin
56+ mkdir -p $out/share/vdr/conf
57+ cp *.conf $out/share/vdr/conf
58+ '';
59+
60+ outputs = [ "out" "dev" "man" ];
61+
62+ meta = with stdenv.lib; {
63+ homepage = http://www.tvdr.de/;
64+ description = "Video Disc Recorder";
65+ maintainers = [ maintainers.ck3d ];
66+ platforms = [ "i686-linux" "x86_64-linux" ];
67+ license = licenses.gpl2;
68+ };
69+
70+ };
71+in vdr // {
72+ plugins = {
73+ skincurses = (mkPlugin "skincurses").overrideAttrs(
74+ oldAttr: { buildInputs = oldAttr.buildInputs ++ [ ncurses ]; });
75+ } // (stdenv.lib.genAttrs [
76+ "epgtableid0" "hello" "osddemo" "pictures" "servicedemo" "status" "svdrpdemo"
77+ ] mkPlugin);
78+}
pkgs/applications/video/vdr/plugins.nixnew file+318
@@ -0,0 +1,318 @@
1+{ stdenv, fetchurl, fetchgit, vdr, ffmpeg_2, alsaLib, fetchFromGitHub
2+, libvdpau, libxcb, xcbutilwm, graphicsmagick, libav, pcre, xorgserver, ffmpeg
3+, libiconv, boost, libgcrypt, perl, utillinux, groff, libva, xorg }:
4+{
5+ femon = stdenv.mkDerivation rec {
6+
7+ name = "vdr-femon-2.4.0";
8+
9+ buildInputs = [ vdr ];
10+
11+ src = fetchurl {
12+ url = "http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/${name}.tgz";
13+ sha256 = "1hra1xslj8s68zbyr8zdqp8yap0aj1p6rxyc6cwy1j122kwcnapp";
14+ };
15+
16+ postPatch = "substituteInPlace Makefile --replace /bin/true true";
17+
18+ makeFlags = [ "DESTDIR=$(out)" ];
19+
20+ meta = with stdenv.lib; {
21+ homepage = http://www.saunalahti.fi/~rahrenbe/vdr/femon/;
22+ description = "DVB Frontend Status Monitor plugin for VDR";
23+ maintainers = [ maintainers.ck3d ];
24+ license = licenses.gpl2;
25+ platforms = [ "i686-linux" "x86_64-linux" ];
26+ };
27+
28+ };
29+
30+ vaapidevice = stdenv.mkDerivation {
31+
32+ name = "vdr-vaapidevice-0.7.0";
33+
34+ buildInputs = [
35+ vdr libxcb xcbutilwm ffmpeg
36+ alsaLib
37+ libvdpau # vdpau
38+ libva # va-api
39+ ] ++ (with xorg; [ libxcb libX11 ]);
40+
41+ makeFlags = [ "DESTDIR=$(out)" ];
42+
43+ postPatch = ''
44+ substituteInPlace softhddev.c --replace /usr/bin/X ${xorgserver}/bin/X
45+ '';
46+
47+ src = fetchFromGitHub {
48+ owner = "pesintta";
49+ repo = "vdr-plugin-vaapidevice";
50+ sha256 = "072y61fpkh3i2dragg0nsd4g3malgwxkwpdrb1ykdljyzf52s5hs";
51+ rev = "c99afc23a53e6d91f9afaa99af59b30e68e626a8";
52+ };
53+
54+ meta = with stdenv.lib; {
55+ homepage = https://github.com/pesintta/vdr-plugin-vaapidevice;
56+ description = "VDR SoftHDDevice Plug-in (with VA-API VPP additions)";
57+ maintainers = [ maintainers.ck3d ];
58+ license = licenses.gpl2;
59+ platforms = [ "i686-linux" "x86_64-linux" ];
60+ };
61+
62+ };
63+
64+
65+ markad = stdenv.mkDerivation rec {
66+ name = "vdr-markad-2017-03-13";
67+
68+ src = fetchgit {
69+ url = "git://projects.vdr-developer.org/vdr-plugin-markad.git";
70+ sha256 = "0jvy70r8bcmbs7zdqilfz019z5xkz5c6rs57h1dsgv8v6x86c2i4";
71+ rev = "ea2e182ec798375f3830f8b794e7408576f139ad";
72+ };
73+
74+ buildInputs = [ vdr libav ];
75+
76+ postPatch = ''
77+ substituteInPlace command/Makefile --replace '$(DESTDIR)/usr' '$(DESTDIR)'
78+
79+ substituteInPlace plugin/markad.cpp \
80+ --replace "/usr/bin" "$out/bin" \
81+ --replace "/var/lib/markad" "$out/var/lib/markad"
82+
83+ substituteInPlace command/markad-standalone.cpp \
84+ --replace "/var/lib/markad" "$out/var/lib/markad"
85+ '';
86+
87+ preBuild = ''
88+ mkdir -p $out/lib/vdr
89+ '';
90+
91+ buildFlags = [
92+ "DESTDIR=$(out)"
93+ "LIBDIR=$(out)/lib/vdr"
94+ "VDRDIR=${vdr.dev}/include/vdr"
95+ "LOCALEDIR=$(DESTDIR)/share/locale"
96+ ];
97+
98+ installFlags = buildFlags;
99+
100+ meta = with stdenv.lib; {
101+ homepage = https://projects.vdr-developer.org/projects/plg-markad;
102+ description = "Ein Programm zum automatischen Setzen von Schnittmarken bei Werbeeinblendungen während einer Sendung.";
103+ maintainers = [ maintainers.ck3d ];
104+ license = licenses.gpl2;
105+ platforms = [ "i686-linux" "x86_64-linux" ];
106+ };
107+
108+ };
109+
110+ epgsearch = stdenv.mkDerivation rec {
111+ pname = "vdr-epgsearch";
112+ version = "2.4.0";
113+
114+ src = fetchurl {
115+ url = "https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-${version}.tar.bz2";
116+ sha256 = "0xfgn17vicyjwdf0rbkrik4q16mnfi305d4wmi8f0qk825pa0z3y";
117+ };
118+
119+ postPatch = ''
120+ for f in *.sh; do
121+ patchShebangs "$f"
122+ done
123+ '';
124+
125+ nativeBuildInputs = [
126+ perl # for pod2man and pos2html
127+ utillinux
128+ groff
129+ ];
130+
131+ buildInputs = [
132+ vdr
133+ pcre
134+ ];
135+
136+ buildFlags = [
137+ "SENDMAIL="
138+ "REGEXLIB=pcre"
139+ ];
140+
141+ installFlags = [
142+ "DESTDIR=$(out)"
143+ ];
144+
145+ outputs = [ "out" "man" ];
146+
147+ meta = with stdenv.lib; {
148+ homepage = http://winni.vdr-developer.org/epgsearch;
149+ description = "Searchtimer and replacement of the VDR program menu";
150+ maintainers = [ maintainers.ck3d ];
151+ license = licenses.gpl2;
152+ platforms = [ "i686-linux" "x86_64-linux" ];
153+ };
154+
155+ };
156+
157+ vnsiserver = let
158+ name = "vnsiserver";
159+ version = "1.8.0";
160+ in stdenv.mkDerivation {
161+ name = "vdr-${name}-${version}";
162+
163+ buildInputs = [ vdr ];
164+
165+ installFlags = [ "DESTDIR=$(out)" ];
166+
167+ src = fetchFromGitHub {
168+ repo = "vdr-plugin-${name}";
169+ owner = "FernetMenta";
170+ rev = "v${version}";
171+ sha256 = "0n7idpxqx7ayd63scl6xwdx828ik4kb2mwz0c30cfjnmnxxd45lw";
172+ };
173+
174+ meta = with stdenv.lib; {
175+ homepage = https://github.com/FernetMenta/vdr-plugin-vnsiserver;
176+ description = "VDR plugin to handle KODI clients.";
177+ maintainers = [ maintainers.ck3d ];
178+ license = licenses.gpl2;
179+ platforms = [ "i686-linux" "x86_64-linux" ];
180+ };
181+
182+ };
183+
184+ text2skin = stdenv.mkDerivation rec {
185+ name = "vdr-text2skin-1.3.4-20170702";
186+
187+ src = fetchgit {
188+ url = "git://projects.vdr-developer.org/vdr-plugin-text2skin.git";
189+ sha256 = "19hkwmaw6nwak38bv6cm2vcjjkf4w5yjyxb98qq6zfjjh5wq54aa";
190+ rev = "8f7954da2488ced734c30e7c2704b92a44e6e1ad";
191+ };
192+
193+ buildInputs = [ vdr graphicsmagick ];
194+
195+ buildFlags = [
196+ "DESTDIR=$(out)"
197+ "IMAGELIB=graphicsmagic"
198+ "VDRDIR=${vdr.dev}/include/vdr"
199+ "LOCALEDIR=$(DESTDIR)/share/locale"
200+ "LIBDIR=$(DESTDIR)/lib/vdr"
201+ ];
202+
203+ preBuild = ''
204+ mkdir -p $out/lib/vdr
205+ '';
206+
207+ installPhase = ":";
208+
209+ meta = with stdenv.lib; {
210+ homepage = https://projects.vdr-developer.org/projects/plg-text2skin;
211+ description = "VDR Text2Skin Plugin";
212+ maintainers = [ maintainers.ck3d ];
213+ license = licenses.gpl2;
214+ platforms = [ "i686-linux" "x86_64-linux" ];
215+ };
216+ };
217+
218+ fritzbox = let
219+ libconvpp = stdenv.mkDerivation {
220+ name = "jowi24-libconv++-20130216";
221+ propagatedBuildInputs = [ libiconv ];
222+ CXXFLAGS = "-std=gnu++11 -Os";
223+ src = fetchFromGitHub {
224+ owner = "jowi24";
225+ repo = "libconvpp";
226+ rev = "90769b2216bc66c5ea5e41a929236c20d367c63b";
227+ sha256 = "0bf0dwxrzd42l84p8nxcsjdk1gvzlhad93nsbn97z6kr61n4cr33";
228+ };
229+ installPhase = ''
230+ mkdir -p $out/lib $out/include/libconv++
231+ cp source.a $out/lib/libconv++.a
232+ cp *.h $out/include/libconv++
233+ '';
234+ };
235+
236+ liblogpp = stdenv.mkDerivation {
237+ name = "jowi24-liblogpp-20130216";
238+ CXXFLAGS = "-std=gnu++11 -Os";
239+ src = fetchFromGitHub {
240+ owner = "jowi24";
241+ repo = "liblogpp";
242+ rev = "eee4046d2ae440974bcc8ceec00b069f0a2c62b9";
243+ sha256 = "01aqvwmwh5kk3mncqpim8llwha9gj5qq0c4cvqfn4h8wqi3d9l3p";
244+ };
245+ installPhase = ''
246+ mkdir -p $out/lib $out/include/liblog++
247+ cp source.a $out/lib/liblog++.a
248+ cp *.h $out/include/liblog++
249+ '';
250+ };
251+
252+ libnetpp = stdenv.mkDerivation {
253+ name = "jowi24-libnet++-20180628";
254+ CXXFLAGS = "-std=gnu++11 -Os";
255+ src = fetchFromGitHub {
256+ owner = "jowi24";
257+ repo = "libnetpp";
258+ rev = "212847f0efaeffee8422059b8e202d844174aaf3";
259+ sha256 = "0vjl6ld6aj25rzxm26yjv3h2gy7gp7qnbinpw6sf1shg2xim9x0b";
260+ };
261+ installPhase = ''
262+ mkdir -p $out/lib $out/include/libnet++
263+ cp source.a $out/lib/libnet++.a
264+ cp *.h $out/include/libnet++
265+ '';
266+ buildInputs = [ boost liblogpp libconvpp ];
267+ };
268+
269+ libfritzpp = stdenv.mkDerivation {
270+ name = "jowi24-libfritzpp-20131201";
271+ CXXFLAGS = "-std=gnu++11 -Os";
272+ src = fetchFromGitHub {
273+ owner = "jowi24";
274+ repo = "libfritzpp";
275+ rev = "ca19013c9451cbac7a90155b486ea9959ced0f67";
276+ sha256 = "0jk93zm3qzl9z96gfs6xl1c8ip8lckgbzibf7jay7dbgkg9kyjfg";
277+ };
278+ installPhase = ''
279+ mkdir -p $out/lib $out/include/libfritz++
280+ cp source.a $out/lib/libfritz++.a
281+ cp *.h $out/include/libfritz++
282+ '';
283+ propagatedBuildInputs = [ libgcrypt ];
284+ buildInputs = [ boost liblogpp libconvpp libnetpp ];
285+ };
286+
287+ in stdenv.mkDerivation rec {
288+ pname = "vdr-fritzbox";
289+
290+ version = "1.5.3";
291+
292+ src = fetchFromGitHub {
293+ owner = "jowi24";
294+ repo = "vdr-fritz";
295+ rev = version;
296+ sha256 = "0wab1kyma9jzhm6j33cv9hd2a5d1334ghgdi2051nmr1bdcfcsw8";
297+ };
298+
299+ postUnpack = ''
300+ cp ${libfritzpp}/lib/* $sourceRoot/libfritz++
301+ cp ${liblogpp}/lib/* $sourceRoot/liblog++
302+ cp ${libnetpp}/lib/* $sourceRoot/libnet++
303+ cp ${libconvpp}/lib/* $sourceRoot/libconv++
304+ '';
305+
306+ buildInputs = [ vdr boost libconvpp libfritzpp libnetpp liblogpp ];
307+
308+ installFlags = [ "DESTDIR=$(out)" ];
309+
310+ meta = with stdenv.lib; {
311+ homepage = https://github.com/jowi24/vdr-fritz;
312+ description = "A plugin for VDR to access AVMs Fritz Box routers";
313+ maintainers = [ maintainers.ck3d ];
314+ license = licenses.gpl2;
315+ platforms = [ "i686-linux" "x86_64-linux" ];
316+ };
317+ };
318+}
pkgs/applications/video/vdr/wrapper.nixnew file+21
@@ -0,0 +1,21 @@
1+{ symlinkJoin, lib, makeWrapper, vdr, plugins ? [] }:
2+symlinkJoin {
3+
4+ name = "vdr-with-plugins-${(builtins.parseDrvName vdr.name).version}";
5+
6+ paths = [ vdr ] ++ plugins;
7+
8+ nativeBuildInputs = [ makeWrapper ];
9+
10+ postBuild = ''
11+ wrapProgram $out/bin/vdr --add-flags "-L $out/lib/vdr --localedir=$out/share/locale"
12+ '';
13+
14+ meta = with vdr.meta; {
15+ inherit license homepage;
16+ description = description
17+ + " (with plugins: "
18+ + lib.concatStrings (lib.intersperse ", " (map (x: ""+x.name) plugins))
19+ + ")";
20+ };
21+}
pkgs/applications/virtualization/firecracker/default.nixnew file+35
@@ -0,0 +1,35 @@
1+{ fetchurl, stdenv }:
2+
3+let
4+ version = "0.12.0";
5+ baseurl = "https://github.com/firecracker-microvm/firecracker/releases/download";
6+
7+ fetchbin = name: sha256: fetchurl {
8+ url = "${baseurl}/v${version}/${name}-v${version}";
9+ inherit sha256;
10+ };
11+
12+ firecracker-bin = fetchbin "firecracker" "0jk9w5kagqp3w668c1x0g4yyahmy7696pm0bkhv066rrdpcqpw66";
13+ jailer-bin = fetchbin "jailer" "1fcxzpnapnccklgbi4bis3f6c9fki2daxvzg9l7433vfqz2zbyjl";
14+in
15+stdenv.mkDerivation {
16+ name = "firecracker-${version}";
17+ inherit version;
18+
19+ srcs = [ firecracker-bin jailer-bin ];
20+ phases = [ "installPhase" ];
21+
22+ installPhase = ''
23+ mkdir -p $out/bin
24+ install -D ${firecracker-bin} $out/bin/firecracker
25+ install -D ${jailer-bin} $out/bin/jailer
26+ '';
27+
28+ meta = with stdenv.lib; {
29+ description = "Secure, fast, minimal micro-container virtualization";
30+ homepage = http://firecracker-microvm.io;
31+ license = licenses.asl20;
32+ platforms = [ "x86_64-linux" ];
33+ maintainers = with maintainers; [ thoughtpolice ];
34+ };
35+}
pkgs/applications/virtualization/runc/default.nix+10−20
@@ -1,9 +1,9 @@
1−{ stdenv, lib, fetchFromGitHub, removeReferencesTo, go-md2man
2−, go, pkgconfig, libapparmor, apparmor-parser, libseccomp }:
1+{ stdenv, lib, fetchFromGitHub, buildGoPackage, go-md2man
2+, pkgconfig, libapparmor, apparmor-parser, libseccomp, which }:
33
44with lib;
55
6−stdenv.mkDerivation rec {
6+buildGoPackage rec {
77 name = "runc-${version}";
88 version = "1.0.0-rc6";
99
@@ -14,32 +14,26 @@ stdenv.mkDerivation rec {
1414 sha256 = "1jwacb8xnmx5fr86gximhbl9dlbdwj3rpf27hav9q1si86w5pb1j";
1515 };
1616
17− outputs = [ "out" "man" ];
17+ goPackagePath = "github.com/opencontainers/runc";
18+ outputs = [ "bin" "out" "man" ];
1819
1920 hardeningDisable = ["fortify"];
2021
2122 nativeBuildInputs = [ pkgconfig ];
22− buildInputs = [ removeReferencesTo go-md2man go libseccomp libapparmor apparmor-parser ];
23+ buildInputs = [ go-md2man libseccomp libapparmor apparmor-parser which ];
2324
2425 makeFlags = ''BUILDTAGS+=seccomp BUILDTAGS+=apparmor'';
2526
26− preConfigure = ''
27− # Extract the source
28− cd "$NIX_BUILD_TOP"
29− mkdir -p "go/src/github.com/opencontainers"
30− mv "$sourceRoot" "go/src/github.com/opencontainers/runc"
31− export GOPATH=$NIX_BUILD_TOP/go:$GOPATH
32− '';
33−
34− preBuild = ''
35− cd go/src/github.com/opencontainers/runc
27+ buildPhase = ''
28+ cd go/src/${goPackagePath}
3629 patchShebangs .
3730 substituteInPlace libcontainer/apparmor/apparmor.go \
3831 --replace /sbin/apparmor_parser ${apparmor-parser}/bin/apparmor_parser
32+ make ${makeFlags} runc
3933 '';
4034
4135 installPhase = ''
42− install -Dm755 runc $out/bin/runc
36+ install -Dm755 runc $bin/bin/runc
4337
4438 # Include contributed man pages
4539 man/md2man-all.sh -q
@@ -55,10 +49,6 @@ stdenv.mkDerivation rec {
5549 done
5650 '';
5751
58− preFixup = ''
59− find $out/bin -type f -exec remove-references-to -t ${go} '{}' +
60− '';
61−
6252 meta = {
6353 homepage = https://runc.io/;
6454 description = "A CLI tool for spawning and running containers according to the OCI specification";
pkgs/applications/window-managers/dwm/dwm-status.nix+4−5
@@ -9,23 +9,22 @@ in
99
1010rustPlatform.buildRustPackage rec {
1111 name = "dwm-status-${version}";
12− version = "1.4.1";
12+ version = "1.5.0";
1313
1414 src = fetchFromGitHub {
1515 owner = "Gerschtli";
1616 repo = "dwm-status";
1717 rev = version;
18− sha256 = "054lwgqpx3kbrnlsqbnd8fxsawvw3nl702pf56c7dcm4sfws15nl";
18+ sha256 = "0mfzpyacd7i6ipbjwyl1zc0x3lnz0f4qqzsmsb07p047z95mw4v6";
1919 };
2020
2121 nativeBuildInputs = [ makeWrapper pkgconfig ];
2222 buildInputs = [ dbus gdk_pixbuf libnotify xorg.libX11 ];
2323
24− cargoSha256 = "0wbbbk99hxxlrkm389iqni9aqvw2laarwk6hhwsr4ph3y278qhi8";
24+ cargoSha256 = "1cngcacsbzijs55k4kz8fidki3p8jblk3v5s21hjsn4glzjdbkmm";
2525
2626 postInstall = lib.optionalString enableAlsaUtils ''
27− wrapProgram $out/bin/dwm-status \
28− --prefix "PATH" : "${binPath}"
27+ wrapProgram $out/bin/dwm-status --prefix "PATH" : "${binPath}"
2928 '';
3029
3130 meta = with stdenv.lib; {
pkgs/applications/window-managers/yabar/unstable.nix+8−1
@@ -1,4 +1,4 @@
1−{ playerctl, libxkbcommon, callPackage, attrs ? {} }:
1+{ fetchpatch, playerctl, libxkbcommon, callPackage, attrs ? {} }:
22
33let
44 pkg = callPackage ./build.nix ({
@@ -15,4 +15,11 @@ in pkg.overrideAttrs (o: {
1515 makeFlags = o.makeFlags ++ [
1616 "PLAYERCTL=1"
1717 ];
18+
19+ patches = (o.patches or []) ++ [
20+ (fetchpatch {
21+ url = "https://github.com/geommer/yabar/commit/008dc1420ff684cf12ce2ef3ac9d642e054e39f5.patch";
22+ sha256 = "1q7nd66ai6nr2m6iqxn55gvbr4r5gjc00c8wyjc3riv31qcbqbhv";
23+ })
24+ ];
1825})
pkgs/data/fonts/source-sans-pro/default.nix+7−5
@@ -1,16 +1,18 @@
11{ stdenv, fetchzip }:
22
33fetchzip {
4− name = "source-sans-pro-2.010";
4+ name = "source-sans-pro-2.040";
55
6− url = "https://github.com/adobe-fonts/source-sans-pro/archive/2.010R-ro/1.065R-it.zip";
6+ 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";
77
88 postFetch = ''
9− mkdir -p $out/share/fonts/opentype
10− unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
9+ mkdir -p $out/share/fonts/opentype $out/share/fonts/truetype $out/share/fonts/variable
10+ unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype
11+ unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype
12+ unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable
1113 '';
1214
13− sha256 = "17rgkh54arybmcdg750ynw32x2sps7p9vrvq9kpih8vdghwrh9k2";
15+ sha256 = "1n7z9xpxls74xxjsa61df1ln86y063m07w1f4sbxpjaa0frim4pp";
1416
1517 meta = with stdenv.lib; {
1618 homepage = https://sourceforge.net/adobe/sourcesans;
pkgs/misc/themes/plano/default.nix → pkgs/data/themes/plano/default.nixrenamed+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 name = "plano-theme-${version}";
5− version = "3.28-3";
5+ version = "3.30-2";
66
77 src = fetchFromGitHub {
88 owner = "lassekongo83";
99 repo = "plano-theme";
1010 rev = "v${version}";
11− sha256 = "0k9jgnifc2s8vsw9fanknx1mg8vlh6qa1cbb910nm4vgrxsbrc74";
11+ sha256 = "06yagpb0dpb8nzh3lvs607rzg6y5l6skl4mjcmbxayapsqka45hj";
1212 };
1313
1414 buildInputs = [ gdk_pixbuf gtk_engines ];
pkgs/misc/themes/shades-of-gray/default.nix → pkgs/data/themes/shades-of-gray/default.nixrenamed+3−3
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 name = "shades-of-gray-theme-${version}";
5− version = "1.1.1";
5+ version = "1.1.3";
66
77 src = fetchFromGitHub {
88 owner = "WernerFP";
99 repo = "Shades-of-gray-theme";
1010 rev = version;
11− sha256 = "1m75m6aq4hh39m8qrmbkaw31j4gzkh63ial4xnhw2habf31av682";
11+ sha256 = "14p1s1pmzqnn9j9vwqfxfd4i045p356a6d9rwzzs0gx3c6ibqx3a";
1212 };
1313
1414 buildInputs = [ gtk_engines ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717
1818 installPhase = ''
1919 mkdir -p $out/share/themes
20− cp -a Shades-of-gray* README.md preview_01.png $out/share/themes/
20+ cp -a Shades-of-gray* $out/share/themes/
2121 '';
2222
2323 meta = with stdenv.lib; {
pkgs/desktops/gnome-3/core/evince/default.nix+2−2
@@ -4,7 +4,7 @@
44, librsvg, gobject-introspection, yelp-tools, gspell
55, recentListSize ? null # 5 is not enough, allow passing a different number
66, supportXPS ? false # Open XML Paper Specification via libgxps
7−, autoreconfHook
7+, autoreconfHook, pruneLibtoolFiles
88}:
99
1010stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 };
2222
2323 nativeBuildInputs = [
24− pkgconfig gobject-introspection intltool itstool wrapGAppsHook yelp-tools autoreconfHook
24+ pkgconfig gobject-introspection intltool itstool wrapGAppsHook yelp-tools autoreconfHook pruneLibtoolFiles
2525 ];
2626
2727 buildInputs = [
pkgs/desktops/gnome-3/core/gnome-software/default.nix+2−2
@@ -4,11 +4,11 @@
44
55stdenv.mkDerivation rec {
66 name = "gnome-software-${version}";
7− version = "3.30.5";
7+ version = "3.30.6";
88
99 src = fetchurl {
1010 url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
11− sha256 = "0d2x208qbkx8szkrfddv1bz4rd9awfhbxvh078j7zrrfmzvq7892";
11+ sha256 = "00lh1ifgcs888i0774qdz2pzd5vnzcc5kvx20lcmgk37vvf0qqsl";
1212 };
1313
1414 patches = [
pkgs/desktops/gnome-3/default.nix−2
@@ -359,8 +359,6 @@ lib.makeScope pkgs.newScope (self: with self; {
359359
360360#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
361361
362− california = callPackage ./misc/california { };
363−
364362 geary = callPackage ./misc/geary { };
365363
366364 gfbgraph = callPackage ./misc/gfbgraph { };
pkgs/desktops/gnome-3/misc/california/default.nixdeleted−47
@@ -1,47 +0,0 @@
1−{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_34, libgee, wrapGAppsHook, itstool, gobject-introspection
2−, gnome-online-accounts, evolution-data-server, gnome3, glib, libsoup, libgdata, sqlite, xdg_utils }:
3−
4−let
5− pname = "california";
6− version = "0.4.0";
7−in stdenv.mkDerivation rec {
8− name = "${pname}-${version}";
9−
10− src = fetchurl {
11− url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
12− sha256 = "1dky2kllv469k8966ilnf4xrr7z35pq8mdvs7kwziy59cdikapxj";
13− };
14−
15− nativeBuildInputs = [ intltool itstool vala_0_34 pkgconfig wrapGAppsHook gobject-introspection ];
16− buildInputs = [ glib gtk3 libgee libsoup libgdata gnome-online-accounts evolution-data-server sqlite xdg_utils gnome3.gsettings-desktop-schemas ];
17−
18− enableParallelBuilding = true;
19−
20− patches = [
21− # Apply Fedora patch to build with evolution-data-server > 3.13
22− (fetchurl {
23− url = https://src.fedoraproject.org/rpms/california/raw/c00bf9924d8fa8cb0a9ec06564d1a1b00c9055af/f/0002-Build-with-evolution-data-server-3.13.90.patch;
24− sha256 = "0g9923n329p32gzr1q52ad30f8vyz8vrri4rih0w8klmf02ga4pm";
25− })
26− # Apply Fedora patch to build with libical > 3.0
27− (fetchurl {
28− url = https://src.fedoraproject.org/rpms/california/raw/2af9a6a1b67b53f3fca1472c5350dc11a1acf28f/f/california-0.4.0-libical-3.0.patch;
29− sha256 = "0cxycfaql0bsiz9hzanns33pwdqpb5n44znfcfa66i1bin34r4n6";
30− })
31− ];
32−
33− passthru = {
34− updateScript = gnome3.updateScript {
35− packageName = pname;
36− attrPath = "gnome3.${pname}";
37− };
38− };
39−
40− meta = with stdenv.lib; {
41− homepage = https://wiki.gnome.org/Apps/California;
42− description = "Calendar application for GNOME 3";
43− maintainers = with maintainers; [ pSub ];
44− license = licenses.lgpl21;
45− platforms = platforms.linux;
46− };
47−}
pkgs/development/mobile/androidenv/androidndk-pkgs.nix → pkgs/development/androidndk-pkgs/androidndk-pkgs.nixrenamed+16−10
@@ -38,14 +38,16 @@ let
3838
3939 hostInfo = ndkInfoFun stdenv.hostPlatform;
4040 targetInfo = ndkInfoFun stdenv.targetPlatform;
41−
4241in
4342
4443rec {
4544 # Misc tools
4645 binaries = let
4746 ndkBinDir =
48− "${androidndk}/libexec/${androidndk.name}/toolchains/${targetInfo.triple}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}/bin";
47+ "${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.triple}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}/bin";
48+ ndkGCCLibDir =
49+ "${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.triple}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}/lib/gcc/${targetInfo.triple}/4.9.x";
50+
4951 in runCommand "ndk-gcc-binutils" {
5052 isGNU = true; # for cc-wrapper
5153 nativeBuildInputs = [ makeWrapper ];
@@ -54,8 +56,15 @@ rec {
5456 mkdir -p $out/bin
5557 for prog in ${ndkBinDir}/${targetInfo.triple}-*; do
5658 prog_suffix=$(basename $prog | sed 's/${targetInfo.triple}-//')
57− ln -s $prog $out/bin/${stdenv.targetPlatform.config}-$prog_suffix
59+ cat > $out/bin/${stdenv.targetPlatform.config}-$prog_suffix <<EOF
60+ #! ${stdenv.shell} -e
61+ $prog "\$@"
62+ EOF
63+ chmod +x $out/bin/${stdenv.targetPlatform.config}-$prog_suffix
5864 done
65+
66+ ln -s $out/bin/${stdenv.targetPlatform.config}-ld $out/bin/ld
67+ ln -s ${ndkGCCLibDir} $out/lib
5968 '';
6069
6170 binutils = wrapBintoolsWith {
@@ -109,18 +118,15 @@ rec {
109118 # anyways.
110119 libraries =
111120 let
112− includePath = if buildAndroidndk.version == "10e" then
113− "${buildAndroidndk}/libexec/${buildAndroidndk.name}/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/include/"
114− else
115− "${buildAndroidndk}/libexec/${buildAndroidndk.name}/sysroot/usr/include";
116− libPath = "${buildAndroidndk}/libexec/${buildAndroidndk.name}/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/lib/";
121+ includePath = "${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include";
122+ asmIncludePath = "${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include/${targetInfo.triple}";
123+ libPath = "${buildAndroidndk}/libexec/android-sdk/ndk-bundle/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/lib/";
117124 in
118125 runCommand "bionic-prebuilt" {} ''
119126 mkdir -p $out
120127 cp -r ${includePath} $out/include
121128 chmod +w $out/include
122− ${lib.optionalString (lib.versionOlder "10e" buildAndroidndk.version)
123− "ln -s $out/include/${hostInfo.triple}/asm $out/include/asm"}
129+ cp -r ${asmIncludePath}/* $out/include
124130 ln -s ${libPath} $out/lib
125131 '';
126132}
pkgs/development/androidndk-pkgs/default.nixnew file+34
@@ -0,0 +1,34 @@
1+{ androidenv, buildPackages, pkgs, targetPackages
2+, includeSources ? true, licenseAccepted ? false
3+}:
4+
5+rec {
6+ "18b" =
7+ let
8+ ndkVersion = "18.1.5063045";
9+
10+ buildAndroidComposition = buildPackages.buildPackages.androidenv.composeAndroidPackages {
11+ includeNDK = true;
12+ inherit ndkVersion;
13+ };
14+
15+ androidComposition = androidenv.composeAndroidPackages {
16+ includeNDK = true;
17+ inherit ndkVersion;
18+ };
19+ in
20+ import ./androidndk-pkgs.nix {
21+ inherit (buildPackages)
22+ makeWrapper;
23+ inherit (pkgs)
24+ lib stdenv
25+ runCommand wrapBintoolsWith wrapCCWith;
26+ # buildPackages.foo rather than buildPackages.buildPackages.foo would work,
27+ # but for splicing messing up on infinite recursion for the variants we
28+ # *dont't* use. Using this workaround, but also making a test to ensure
29+ # these two really are the same.
30+ buildAndroidndk = buildAndroidComposition.ndk-bundle;
31+ androidndk = androidComposition.ndk-bundle;
32+ targetAndroidndkPkgs = targetPackages.androidndkPkgs_18b;
33+ };
34+}
pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix+2−1
@@ -5,5 +5,6 @@ in
55 jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.hotspot;
66 jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.hotspot;
77 jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.openj9;
8− jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.openj9;
8+ # openj9 jre builds are currently missing: https://github.com/AdoptOpenJDK/openjdk-build/issues/796
9+ #jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.openj9;
910}
pkgs/development/compilers/chez/default.nix+1
@@ -83,6 +83,7 @@ stdenv.mkDerivation rec {
8383 homepage = https://cisco.github.io/ChezScheme/;
8484 license = stdenv.lib.licenses.asl20;
8585 platforms = stdenv.lib.platforms.unix;
86+ badPlatforms = [ "aarch64-linux" ];
8687 maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
8788 };
8889}
pkgs/development/compilers/llvm/4/libc++/default.nix+5
@@ -44,6 +44,11 @@ stdenv.mkDerivation rec {
4444
4545 linkCxxAbi = stdenv.isLinux;
4646
47+ postInstall = ''
48+ mv $out/lib/libc++.a $out/lib/libc++_static.a
49+ cp ${./libc++.a} $out/lib/libc++.a
50+ '';
51+
4752 setupHooks = [
4853 ../../../../../build-support/setup-hooks/role.bash
4954 ./setup-hook.sh
pkgs/development/compilers/llvm/4/libc++/libc++.anew file+1
@@ -0,0 +1 @@
1+INPUT(-lc++_static -lc++abi)
pkgs/development/compilers/llvm/4/libc++abi.nix+1
@@ -34,6 +34,7 @@ stdenv.mkDerivation {
3434 ''
3535 else ''
3636 install -d -m 755 $out/include $out/lib
37+ install -m 644 lib/libc++abi.a $out/lib
3738 install -m 644 lib/libc++abi.so.1.0 $out/lib
3839 install -m 644 ../include/cxxabi.h $out/include
3940 ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
pkgs/development/compilers/llvm/5/libc++/default.nix+5
@@ -38,6 +38,11 @@ stdenv.mkDerivation rec {
3838
3939 linkCxxAbi = stdenv.isLinux;
4040
41+ postInstall = ''
42+ mv $out/lib/libc++.a $out/lib/libc++_static.a
43+ cp ${./libc++.a} $out/lib/libc++.a
44+ '';
45+
4146 setupHooks = [
4247 ../../../../../build-support/setup-hooks/role.bash
4348 ./setup-hook.sh
pkgs/development/compilers/llvm/5/libc++/libc++.anew file+1
@@ -0,0 +1 @@
1+INPUT(-lc++_static -lc++abi)
pkgs/development/compilers/llvm/5/libc++abi.nix+1
@@ -33,6 +33,7 @@ stdenv.mkDerivation {
3333 ''
3434 else ''
3535 install -d -m 755 $out/include $out/lib
36+ install -m 644 lib/libc++abi.a $out/lib
3637 install -m 644 lib/libc++abi.so.1.0 $out/lib
3738 install -m 644 ../include/cxxabi.h $out/include
3839 ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
pkgs/development/compilers/llvm/6/libc++/default.nix+5
@@ -38,6 +38,11 @@ stdenv.mkDerivation rec {
3838
3939 linkCxxAbi = stdenv.isLinux;
4040
41+ postInstall = ''
42+ mv $out/lib/libc++.a $out/lib/libc++_static.a
43+ cp ${./libc++.a} $out/lib/libc++.a
44+ '';
45+
4146 setupHooks = [
4247 ../../../../../build-support/setup-hooks/role.bash
4348 ./setup-hook.sh
pkgs/development/compilers/llvm/6/libc++/libc++.anew file+1
@@ -0,0 +1 @@
1+INPUT(-lc++_static -lc++abi)
pkgs/development/compilers/llvm/6/libc++abi.nix+1
@@ -33,6 +33,7 @@ stdenv.mkDerivation {
3333 ''
3434 else ''
3535 install -d -m 755 $out/include $out/lib
36+ install -m 644 lib/libc++abi.a $out/lib
3637 install -m 644 lib/libc++abi.so.1.0 $out/lib
3738 install -m 644 ../include/cxxabi.h $out/include
3839 ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
pkgs/development/compilers/llvm/7/libc++/default.nix+5
@@ -36,6 +36,11 @@ stdenv.mkDerivation rec {
3636
3737 linkCxxAbi = stdenv.isLinux;
3838
39+ postInstall = ''
40+ mv $out/lib/libc++.a $out/lib/libc++_static.a
41+ cp ${./libc++.a} $out/lib/libc++.a
42+ '';
43+
3944 setupHooks = [
4045 ../../../../../build-support/setup-hooks/role.bash
4146 ./setup-hook.sh
pkgs/development/compilers/llvm/7/libc++/libc++.anew file+1
@@ -0,0 +1 @@
1+INPUT(-lc++_static -lc++abi)
pkgs/development/compilers/llvm/7/libc++abi.nix+1
@@ -33,6 +33,7 @@ stdenv.mkDerivation {
3333 ''
3434 else ''
3535 install -d -m 755 $out/include $out/lib
36+ install -m 644 lib/libc++abi.a $out/lib
3637 install -m 644 lib/libc++abi.so.1.0 $out/lib
3738 install -m 644 ../include/cxxabi.h $out/include
3839 ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
pkgs/development/compilers/mono/4.6.nixdeleted−9
@@ -1,9 +0,0 @@
1−{ callPackage, Foundation, libobjc }:
2−
3−callPackage ./generic.nix (rec {
4− inherit Foundation libobjc;
5− version = "4.6.2.16";
6− sha256 = "190f7kcrm1y5x61s1xwdmjnwc3czsg50s3mml4xmix7byh3x2rc9";
7− enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65617511
8− meta.knownVulnerabilities = [ "CVE-2018-1002208" ];
9−})
pkgs/development/compilers/mono/4.8.nix → pkgs/development/compilers/mono/4.nixrenamed+1−1
@@ -1,6 +1,6 @@
11{ callPackage, Foundation, libobjc }:
22
3−callPackage ./generic-cmake.nix (rec {
3+callPackage ./generic.nix (rec {
44 inherit Foundation libobjc;
55 version = "4.8.1.0";
66 sha256 = "1vyvp2g28ihcgxgxr8nhzyzdmzicsh5djzk8dk1hj5p5f2k3ijqq";
pkgs/development/compilers/mono/5.0.nixdeleted−8
@@ -1,8 +0,0 @@
1−{ callPackage, Foundation, libobjc }:
2−
3−callPackage ./generic-cmake.nix (rec {
4− inherit Foundation libobjc;
5− version = "5.0.1.1";
6− sha256 = "064pgsmanpybpbhpam9jv9n8aicx6mlyb7a91yzh3kcksmqsxmj8";
7− enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65820147
8−})
pkgs/development/compilers/mono/5.14.nixdeleted−8
@@ -1,8 +0,0 @@
1−{ callPackage, Foundation, libobjc }:
2−
3−callPackage ./generic-cmake.nix (rec {
4− inherit Foundation libobjc;
5− version = "5.14.0.177";
6− sha256 = "164l30fkvfgs1rh663h7dnm1yp7425bi9x2lh2y6zml8h4pgmxfl";
7− enableParallelBuilding = false;
8−})
pkgs/development/compilers/mono/5.4.nixdeleted−8
@@ -1,8 +0,0 @@
1−{ callPackage, Foundation, libobjc }:
2−
3−callPackage ./generic-cmake.nix (rec {
4− inherit Foundation libobjc;
5− version = "5.4.1.6";
6− sha256 = "1pv5lmyxjr8z9s17jx19850k43ylzqlbzsgr5jxj1knmkbza1zdx";
7− enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65820147
8−})
pkgs/development/compilers/mono/5.8.nixdeleted−8
@@ -1,8 +0,0 @@
1−{ callPackage, Foundation, libobjc }:
2−
3−callPackage ./generic-cmake.nix (rec {
4− inherit Foundation libobjc;
5− version = "5.8.0.108";
6− sha256 = "177khb06dfll0pcncr84vvibni7f8m5fgb30ndgsdjk25xfcbmzc";
7− enableParallelBuilding = false;
8−})
pkgs/development/compilers/mono/5.nixnew file+8
@@ -0,0 +1,8 @@
1+{ callPackage, Foundation, libobjc }:
2+
3+callPackage ./generic.nix (rec {
4+ inherit Foundation libobjc;
5+ version = "5.16.0.220";
6+ sha256 = "1qwdmxssplfdb5rq86f1j8lskvr9dfk5c8hqz9ic09ml69r8c87l";
7+ enableParallelBuilding = false;
8+})
pkgs/development/compilers/mono/build-fix-llvm.patchdeleted−12
@@ -1,12 +0,0 @@
1−diff --git a/lib/CodeGen/AsmPrinter/CMakeLists.txt.old b/lib/CodeGen/AsmPrinter/CMakeLists.txt
2−index be484a6..c92ff46 100644
3−--- a/lib/CodeGen/AsmPrinter/CMakeLists.txt.old
4−+++ b/lib/CodeGen/AsmPrinter/CMakeLists.txt
5−@@ -10,6 +10,7 @@ add_llvm_library(LLVMAsmPrinter
6− DwarfCompileUnit.cpp
7− DwarfDebug.cpp
8− DwarfException.cpp
9−+ DwarfMonoException.cpp
10− ErlangGCPrinter.cpp
11− OcamlGCPrinter.cpp
12− Win64Exception.cpp
pkgs/development/compilers/mono/generic-cmake.nixdeleted−90
@@ -1,90 +0,0 @@
1−{ 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 }:
2−
3−let
4− llvm = callPackage ./llvm.nix { };
5−in
6−stdenv.mkDerivation rec {
7− name = "mono-${version}";
8−
9− src = fetchurl {
10− inherit sha256;
11− url = "https://download.mono-project.com/sources/mono/${name}.tar.bz2";
12− };
13−
14− buildInputs =
15− [ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib python autoconf libtool automake cmake which
16− ]
17− ++ (stdenv.lib.optionals stdenv.isDarwin [ Foundation libobjc ]);
18−
19− propagatedBuildInputs = [glib];
20−
21− NIX_LDFLAGS = if stdenv.isDarwin then "" else "-lgcc_s" ;
22−
23− # To overcome the bug https://bugzilla.novell.com/show_bug.cgi?id=644723
24− dontDisableStatic = true;
25−
26− configureFlags = [
27− "--x-includes=${libX11.dev}/include"
28− "--x-libraries=${libX11.out}/lib"
29− "--with-libgdiplus=${libgdiplus}/lib/libgdiplus.so"
30− ]
31− ++ stdenv.lib.optionals withLLVM [
32− "--enable-llvm"
33− "--enable-llvmloaded"
34− "--with-llvm=${llvm}"
35− ];
36−
37− configurePhase = ''
38− patchShebangs ./
39− ./autogen.sh --prefix $out $configureFlags
40− '';
41−
42− # Attempt to fix this error when running "mcs --version":
43− # The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image
44− dontStrip = true;
45−
46− # We want pkg-config to take priority over the dlls in the Mono framework and the GAC
47− # because we control pkg-config
48− patches = [ ./pkgconfig-before-gac.patch ];
49−
50− # Patch all the necessary scripts. Also, if we're using LLVM, we fix the default
51− # LLVM path to point into the Mono LLVM build, since it's private anyway.
52− preBuild = ''
53− makeFlagsArray=(INSTALL=`type -tp install`)
54− substituteInPlace mcs/class/corlib/System/Environment.cs --replace /usr/share "$out/share"
55− '' + stdenv.lib.optionalString withLLVM ''
56− substituteInPlace mono/mini/aot-compiler.c --replace "llvm_path = g_strdup (\"\")" "llvm_path = g_strdup (\"${llvm}/bin/\")"
57− '';
58−
59− # Fix mono DLLMap so it can find libX11 to run winforms apps
60− # libgdiplus is correctly handled by the --with-libgdiplus configure flag
61− # Other items in the DLLMap may need to be pointed to their store locations, I don't think this is exhaustive
62− # http://www.mono-project.com/Config_DllMap
63− postBuild = ''
64− find . -name 'config' -type f | xargs \
65− sed -i -e "s@libX11.so.6@${libX11.out}/lib/libX11.so.6@g"
66− '';
67−
68− # Without this, any Mono application attempting to open an SSL connection will throw with
69− # The authentication or decryption has failed.
70− # ---> Mono.Security.Protocol.Tls.TlsException: Invalid certificate received from server.
71− postInstall = ''
72− echo "Updating Mono key store"
73− $out/bin/cert-sync ${cacert}/etc/ssl/certs/ca-bundle.crt
74− ''
75− # According to [1], gmcs is just mcs
76− # [1] https://github.com/mono/mono/blob/master/scripts/gmcs.in
77− + ''
78− ln -s $out/bin/mcs $out/bin/gmcs
79− '';
80−
81− inherit enableParallelBuilding;
82−
83− meta = with stdenv.lib; {
84− homepage = http://mono-project.com/;
85− description = "Cross platform, open source .NET development framework";
86− platforms = with platforms; darwin ++ linux;
87− maintainers = with maintainers; [ thoughtpolice obadz vrthra ];
88− license = licenses.free; # Combination of LGPL/X11/GPL ?
89− };
90−}
pkgs/development/compilers/mono/generic.nix+17−25
@@ -1,19 +1,10 @@
1−{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11
2−, callPackage, ncurses, zlib
3−, cacert, Foundation, libobjc, python
4−
5−, version, sha256
6−, withLLVM ? false
7−, enableParallelBuilding ? true
8−, meta ? {}
9−}:
1+{ 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 }:
102
113let
124 llvm = callPackage ./llvm.nix { };
13− name = "mono-${version}";
145in
15−stdenv.mkDerivation {
16− inherit name;
6+stdenv.mkDerivation rec {
7+ name = "mono-${version}";
178
189 src = fetchurl {
1910 inherit sha256;
@@ -21,7 +12,7 @@ stdenv.mkDerivation {
2112 };
2213
2314 buildInputs =
24− [ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib python
15+ [ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib python autoconf libtool automake cmake which
2516 ]
2617 ++ (stdenv.lib.optionals stdenv.isDarwin [ Foundation libobjc ]);
2718
@@ -32,8 +23,6 @@ stdenv.mkDerivation {
3223 # To overcome the bug https://bugzilla.novell.com/show_bug.cgi?id=644723
3324 dontDisableStatic = true;
3425
35− # In fact I think this line does not help at all to what I
36− # wanted to achieve: have mono to find libgdiplus automatically
3726 configureFlags = [
3827 "--x-includes=${libX11.dev}/include"
3928 "--x-libraries=${libX11.out}/lib"
@@ -41,10 +30,14 @@ stdenv.mkDerivation {
4130 ]
4231 ++ stdenv.lib.optionals withLLVM [
4332 "--enable-llvm"
44− "--enable-llvmloaded"
4533 "--with-llvm=${llvm}"
4634 ];
4735
36+ configurePhase = ''
37+ patchShebangs ./
38+ ./autogen.sh --prefix $out $configureFlags
39+ '';
40+
4841 # Attempt to fix this error when running "mcs --version":
4942 # The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image
5043 dontStrip = true;
@@ -57,19 +50,18 @@ stdenv.mkDerivation {
5750 # LLVM path to point into the Mono LLVM build, since it's private anyway.
5851 preBuild = ''
5952 makeFlagsArray=(INSTALL=`type -tp install`)
60− patchShebangs ./
6153 substituteInPlace mcs/class/corlib/System/Environment.cs --replace /usr/share "$out/share"
6254 '' + stdenv.lib.optionalString withLLVM ''
6355 substituteInPlace mono/mini/aot-compiler.c --replace "llvm_path = g_strdup (\"\")" "llvm_path = g_strdup (\"${llvm}/bin/\")"
6456 '';
6557
66− # Fix mono DLLMap so it can find libX11 and gdiplus to run winforms apps
58+ # Fix mono DLLMap so it can find libX11 to run winforms apps
59+ # libgdiplus is correctly handled by the --with-libgdiplus configure flag
6760 # Other items in the DLLMap may need to be pointed to their store locations, I don't think this is exhaustive
6861 # http://www.mono-project.com/Config_DllMap
6962 postBuild = ''
7063 find . -name 'config' -type f | xargs \
71− sed -i -e "s@libX11.so.6@${libX11.out}/lib/libX11.so.6@g" \
72− -e "s@/.*libgdiplus.so@${libgdiplus}/lib/libgdiplus.so@g" \
64+ sed -i -e "s@libX11.so.6@${libX11.out}/lib/libX11.so.6@g"
7365 '';
7466
7567 # Without this, any Mono application attempting to open an SSL connection will throw with
@@ -87,11 +79,11 @@ stdenv.mkDerivation {
8779
8880 inherit enableParallelBuilding;
8981
90− meta = {
82+ meta = with stdenv.lib; {
9183 homepage = http://mono-project.com/;
9284 description = "Cross platform, open source .NET development framework";
93− platforms = stdenv.lib.platforms.x86;
94− maintainers = with stdenv.lib.maintainers; [ thoughtpolice obadz vrthra ];
95− license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ?
96− } // meta;
85+ platforms = with platforms; darwin ++ linux;
86+ maintainers = with maintainers; [ thoughtpolice obadz vrthra ];
87+ license = licenses.free; # Combination of LGPL/X11/GPL ?
88+ };
9789}
pkgs/development/compilers/mono/llvm.nix+12−18
@@ -1,9 +1,10 @@
11{ stdenv
2−, fetchurl
3−, perl
2+, lib
3+, fetchFromGitHub
44, groff
55, cmake
6−, python
6+, python2
7+, perl
78, libffi
89, libbfd
910, libxml2
@@ -14,22 +15,16 @@
1415
1516stdenv.mkDerivation rec {
1617 name = "llvm-${version}";
17− version = "3.4svn-mono-f9b1a74368";
18− src = fetchurl {
19− # from the HEAD of the 'mono3' branch
20− url = "https://github.com/mono/llvm/archive/f9b1a74368ec299fc04c4cfef4b5aa0992b7b806.tar.gz";
21− name = "${name}.tar.gz";
22− sha256 = "1bbkx4p5zdnk3nbdd5jxvbwqx8cdq8z1n1nhf639i98mggs0zhdg";
23− };
18+ version = "3.6-mono-2017-02-15";
2419
25− patches = [ ./build-fix-llvm.patch ];
26− unpackPhase = ''
27− unpackFile ${src}
28− mv llvm-* llvm
29− sourceRoot=$PWD/llvm
30− '';
20+ src = fetchFromGitHub {
21+ owner = "mono";
22+ repo = "llvm";
23+ rev = "dbb6fdffdeb780d11851a6be77c209bd7ada4bd3";
24+ sha256 = "07wd1cs3fdvzb1lv41b655z5zk34f47j8fgd9ljjimi5j9pj71f7";
25+ };
3126
32− buildInputs = [ perl groff cmake libxml2 python libffi ] ++ stdenv.lib.optional stdenv.isLinux valgrind;
27+ buildInputs = [ perl groff cmake libxml2 python2 libffi ] ++ lib.optional stdenv.isLinux valgrind;
3328
3429 propagatedBuildInputs = [ ncurses zlib ];
3530
@@ -43,7 +38,6 @@ stdenv.mkDerivation rec {
4338 cmakeFlags = with stdenv; [
4439 "-DLLVM_ENABLE_FFI=ON"
4540 "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"
46− "-DCMAKE_CXX_FLAGS=-std=c++11"
4741 ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON";
4842
4943 enableParallelBuilding = true;
pkgs/development/compilers/mono/pkgconfig-before-gac-5x.patchdeleted−65
@@ -1,65 +0,0 @@
1−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
2−--- mono-5.0.0/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets.old 2017-04-24 23:45:18.348116305 +0200
3−+++ mono-5.0.0/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets 2017-04-24 23:45:11.407051755 +0200
4−@@ -167,8 +167,8 @@
5− $(ReferencePath);
6− @(AdditionalReferencePath);
7− {HintPathFromItem};
8−- {TargetFrameworkDirectory};
9− {PkgConfig};
10−+ {TargetFrameworkDirectory};
11− {GAC};
12− {RawFileName};
13− $(OutDir)
14−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
15−--- mono-5.0.0/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets.old 2017-04-24 23:49:53.019616196 +0200
16−+++ mono-5.0.0/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets 2017-04-24 23:50:05.709729585 +0200
17−@@ -232,8 +232,8 @@
18− $(ReferencePath);
19− @(AdditionalReferencePath);
20− {HintPathFromItem};
21−- {TargetFrameworkDirectory};
22− {PkgConfig};
23−+ {TargetFrameworkDirectory};
24− {GAC};
25− {RawFileName};
26− $(OutDir)
27−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
28−--- mono-5.0.0/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets.old 2017-04-24 23:52:33.200037047 +0200
29−+++ mono-5.0.0/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets 2017-04-24 23:52:43.281125802 +0200
30−@@ -139,8 +139,8 @@
31− $(ReferencePath);
32− @(AdditionalReferencePath);
33− {HintPathFromItem};
34−- {TargetFrameworkDirectory};
35− {PkgConfig};
36−+ {TargetFrameworkDirectory};
37− {GAC};
38− {RawFileName};
39− $(OutDir)
40−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
41−--- mono-5.0.0/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets.old 2017-04-24 23:54:02.585821594 +0200
42−+++ mono-5.0.0/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets 2017-04-24 23:54:09.313880438 +0200
43−@@ -234,8 +234,8 @@
44− $(ReferencePath);
45− @(AdditionalReferencePath);
46− {HintPathFromItem};
47−- {TargetFrameworkDirectory};
48− {PkgConfig};
49−+ {TargetFrameworkDirectory};
50− {GAC};
51− {RawFileName};
52− $(OutDir)
53−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
54−--- mono-5.0.0/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets.old 2017-04-24 23:55:46.244895155 +0200
55−+++ mono-5.0.0/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets 2017-04-24 23:55:51.998961342 +0200
56−@@ -232,8 +232,8 @@
57− $(ReferencePath);
58− @(AdditionalReferencePath);
59− {HintPathFromItem};
60−- {TargetFrameworkDirectory};
61− {PkgConfig};
62−+ {TargetFrameworkDirectory};
63− {GAC};
64− {RawFileName};
65− $(OutDir)
pkgs/development/compilers/mruby/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 name = "mruby-${version}";
5− version = "1.4.1";
5+ version = "2.0.0";
66
77 src = fetchFromGitHub {
88 owner = "mruby";
99 repo = "mruby";
1010 rev = version;
11− sha256 = "0pw72acbqgs4n1qa297nnja23v9hxz9g7190yfx9kwm7mgbllmww";
11+ sha256 = "1r6w1asjshff43ymdwa6xmrkggza99mi2kw88k7ic6ag2j81hcj5";
1212 };
1313
1414 patches = [
pkgs/development/compilers/solc/default.nix+4−6
@@ -1,9 +1,9 @@
11{ stdenv, fetchzip, fetchFromGitHub, boost, cmake, z3 }:
22
33let
4− version = "0.5.1";
5− rev = "c8a2cb62832afb2dc09ccee6fd42c1516dfdb981";
6− sha256 = "0d6mfnixlr9m5yr3r4p6cv6vwrrivcamyar5d0f9rvir9w9ypzrr";
4+ version = "0.5.2";
5+ rev = "1df8f40cd2fd7b47698d847907b8ca7b47eb488d";
6+ sha256 = "009kjyb3r2p64wpdzfcmqr9swm5haaixbzvsbw1nd4wipwbp66y0";
77 jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz;
88 jsoncpp = fetchzip {
99 url = jsoncppURL;
@@ -33,11 +33,10 @@ stdenv.mkDerivation {
3333 cmakeFlags = [
3434 "-DBoost_USE_STATIC_LIBS=OFF"
3535 "-DBUILD_SHARED_LIBS=ON"
36− "-DINSTALL_LLLC=ON"
3736 ];
3837
3938 doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform == stdenv.buildPlatform;
40− checkPhase = "LD_LIBRARY_PATH=./libsolc:./libsolidity:./liblll:./libevmasm:./libdevcore:./libyul:./liblangutil:$LD_LIBRARY_PATH " +
39+ checkPhase = "LD_LIBRARY_PATH=./libsolc:./libsolidity:./libevmasm:./libdevcore:./libyul:./liblangutil:$LD_LIBRARY_PATH " +
4140 "./test/soltest -p -- --no-ipc --no-smt --testpath ../test";
4241
4342 nativeBuildInputs = [ cmake ];
@@ -47,7 +46,6 @@ stdenv.mkDerivation {
4746
4847 meta = with stdenv.lib; {
4948 description = "Compiler for Ethereum smart contract language Solidity";
50− longDescription = "This package also includes `lllc', the LLL compiler.";
5149 homepage = https://github.com/ethereum/solidity;
5250 license = licenses.gpl3;
5351 platforms = with platforms; linux ++ darwin;
pkgs/development/compilers/solc/patches/shared-libs-install.patch+3−16
@@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
22index 0c05208f..8893648e 100644
33--- a/CMakeLists.txt
44+++ b/CMakeLists.txt
5−@@ -48,6 +48,25 @@ add_subdirectory(libevmasm)
5+@@ -48,6 +48,22 @@ add_subdirectory(libevmasm)
66 add_subdirectory(libsolidity)
77 add_subdirectory(libsolc)
88
@@ -21,9 +21,6 @@ index 0c05208f..8893648e 100644
2121+install(DIRECTORY liblangutil/
2222+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/liblangutil
2323+ FILES_MATCHING PATTERN "*.h")
24−+install(DIRECTORY liblll/
25−+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/liblll
26−+ FILES_MATCHING PATTERN "*.h")
2724+
2825 if (NOT EMSCRIPTEN)
2926 add_subdirectory(solc)
@@ -46,15 +43,6 @@ index 86192c1b..e7f15e93 100644
4643 add_library(evmasm ${sources} ${headers})
4744 target_link_libraries(evmasm PUBLIC devcore)
4845+install(TARGETS evmasm LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
49−diff --git a/liblll/CMakeLists.txt b/liblll/CMakeLists.txt
50−index 4cdc073a..b61f03c7 100644
51−--- a/liblll/CMakeLists.txt
52−+++ b/liblll/CMakeLists.txt
53−@@ -3,3 +3,4 @@ file(GLOB headers "*.h")
54−
55− add_library(lll ${sources} ${headers})
56− target_link_libraries(lll PUBLIC evmasm devcore)
57−+install(TARGETS lll LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
5846diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
5947index 0bdec4b4..e876177e 100644
6048--- a/libsolidity/CMakeLists.txt
@@ -69,11 +57,10 @@ index 0bdec4b4..e876177e 100644
6957 target_link_libraries(solidity PUBLIC ${Z3_LIBRARY})
7058--- a/libyul/CMakeLists.txt
7159+++ b/libyul/CMakeLists.txt
72−@@ -42,3 +42,4 @@ endif()
60+@@ -43,3 +43,4 @@ endif()
7361 optimiser/VarDeclPropagator.cpp
7462 )
75−-target_link_libraries(yul PUBLIC devcore)
76−+target_link_libraries(yul PUBLIC evmasm devcore langutil)
63+ target_link_libraries(yul PUBLIC evmasm devcore langutil)
7764+install(TARGETS yul LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
7865--- a/liblangutil/CMakeLists.txt
7966+++ b/liblangutil/CMakeLists.txt
pkgs/development/compilers/vala/default.nix−6
@@ -45,12 +45,6 @@ let
4545 };
4646
4747in rec {
48− vala_0_34 = generic {
49− major = "0.34";
50− minor = "18";
51− sha256 = "1lhw3ghns059y5d6pdldy5p4yjwlhcls84k892i6qmbhxg34945q";
52− };
53−
5448 vala_0_36 = generic {
5549 major = "0.36";
5650 minor = "15";
pkgs/development/coq-modules/Cheerios/default.nix+7−27
@@ -1,32 +1,11 @@
11{ stdenv, fetchFromGitHub, coq, StructTact }:
22
3−let params =
3+let param =
44 {
5− "8.6" = {
65 version = "20181102";
76 rev = "04da309304bdd28a1f7dacca9fdf8696204a4ff2";
87 sha256 = "1xfa78p70c90favds1mv1vj5sr9bv0ad3dsgg05v3v72006g2f1q";
9− };
10−
11− "8.7" = {
12− version = "20181102";
13− rev = "04da309304bdd28a1f7dacca9fdf8696204a4ff2";
14− sha256 = "1xfa78p70c90favds1mv1vj5sr9bv0ad3dsgg05v3v72006g2f1q";
15− };
16−
17− "8.8" = {
18− version = "20181102";
19− rev = "04da309304bdd28a1f7dacca9fdf8696204a4ff2";
20− sha256 = "1xfa78p70c90favds1mv1vj5sr9bv0ad3dsgg05v3v72006g2f1q";
21− };
22−
23− "8.9" = {
24− version = "20181102";
25− rev = "04da309304bdd28a1f7dacca9fdf8696204a4ff2";
26− sha256 = "1xfa78p70c90favds1mv1vj5sr9bv0ad3dsgg05v3v72006g2f1q";
27− };
288 };
29− param = params."${coq.coq-version}";
309in
3110
3211stdenv.mkDerivation rec {
@@ -38,15 +17,16 @@ stdenv.mkDerivation rec {
3817 inherit (param) rev sha256;
3918 };
4019
41− buildInputs = [
42− coq coq.ocaml coq.camlp5 coq.findlib StructTact
43− ];
20+ buildInputs = [ coq ];
21+
22+ propagatedBuildInputs = [ StructTact ];
4423 enableParallelBuilding = true;
4524
46− buildPhase = "make -j$NIX_BUILD_CORES";
25+ preConfigure = "patchShebangs ./configure";
26+
4727 installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
4828
4929 passthru = {
50− compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ];
30+ compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6";
5131 };
5232}
pkgs/development/coq-modules/InfSeqExt/default.nix+7−34
@@ -1,38 +1,11 @@
1−{ stdenv, fetchFromGitHub, coq, mathcomp }:
1+{ stdenv, fetchFromGitHub, coq }:
22
3−let params =
3+let param =
44 {
5− "8.5" = {
65 version = "20180918";
76 rev = "243d6be45666da73a9da6c37d451327165275798";
87 sha256 = "1nh2psb4pcppy1akk24ilb4p08m35cba357i4xyymmarmbwqpxmn";
9− };
10−
11− "8.6" = {
12− version = "20180918";
13− rev = "243d6be45666da73a9da6c37d451327165275798";
14− sha256 = "1nh2psb4pcppy1akk24ilb4p08m35cba357i4xyymmarmbwqpxmn";
15− };
16−
17− "8.7" = {
18− version = "20180918";
19− rev = "243d6be45666da73a9da6c37d451327165275798";
20− sha256 = "1nh2psb4pcppy1akk24ilb4p08m35cba357i4xyymmarmbwqpxmn";
21− };
22−
23− "8.8" = {
24− version = "20180918";
25− rev = "243d6be45666da73a9da6c37d451327165275798";
26− sha256 = "1nh2psb4pcppy1akk24ilb4p08m35cba357i4xyymmarmbwqpxmn";
27− };
28−
29− "8.9" = {
30− version = "20180918";
31− rev = "243d6be45666da73a9da6c37d451327165275798";
32− sha256 = "1nh2psb4pcppy1akk24ilb4p08m35cba357i4xyymmarmbwqpxmn";
33− };
348 };
35− param = params."${coq.coq-version}";
369in
3710
3811stdenv.mkDerivation rec {
@@ -44,15 +17,15 @@ stdenv.mkDerivation rec {
4417 inherit (param) rev sha256;
4518 };
4619
47− buildInputs = [
48− coq coq.ocaml coq.camlp5 coq.findlib mathcomp
49− ];
20+ buildInputs = [ coq ];
21+
5022 enableParallelBuilding = true;
5123
52− buildPhase = "make -j$NIX_BUILD_CORES";
24+ preConfigure = "patchShebangs ./configure";
25+
5326 installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
5427
5528 passthru = {
56− compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ];
29+ compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.5";
5730 };
5831}
pkgs/development/coq-modules/StructTact/default.nix+6−33
@@ -1,38 +1,11 @@
11{ stdenv, fetchFromGitHub, coq, mathcomp }:
22
3−let params =
3+let param =
44 {
5− "8.5" = {
65 version = "20181102";
76 rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510";
87 sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v";
9− };
10−
11− "8.6" = {
12− version = "20181102";
13− rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510";
14− sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v";
15− };
16−
17− "8.7" = {
18− version = "20181102";
19− rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510";
20− sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v";
21− };
22−
23− "8.8" = {
24− version = "20181102";
25− rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510";
26− sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v";
27− };
28−
29− "8.9" = {
30− version = "20181102";
31− rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510";
32− sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v";
33− };
348 };
35− param = params."${coq.coq-version}";
369in
3710
3811stdenv.mkDerivation rec {
@@ -44,15 +17,15 @@ stdenv.mkDerivation rec {
4417 inherit (param) rev sha256;
4518 };
4619
47− buildInputs = [
48− coq coq.ocaml coq.camlp5 coq.findlib
49− ];
20+ buildInputs = [ coq ];
21+
5022 enableParallelBuilding = true;
5123
52− buildPhase = "make -j$NIX_BUILD_CORES";
24+ preConfigure = "patchShebangs ./configure";
25+
5326 installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
5427
5528 passthru = {
56− compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ];
29+ compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.5";
5730 };
5831}
pkgs/development/coq-modules/Verdi/default.nix+8−28
@@ -1,32 +1,11 @@
1−{ stdenv, fetchFromGitHub, coq, mathcomp, StructTact, InfSeqExt, Cheerios }:
1+{ stdenv, fetchFromGitHub, coq, Cheerios, InfSeqExt, ssreflect }:
22
3−let params =
3+let param =
44 {
5− "8.6" = {
65 version = "20181102";
76 rev = "25b79cf1be5527ab8dc1b8314fcee93e76a2e564";
87 sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z";
9− };
10−
11− "8.7" = {
12− version = "20181102";
13− rev = "25b79cf1be5527ab8dc1b8314fcee93e76a2e564";
14− sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z";
15− };
16−
17− "8.8" = {
18− version = "20181102";
19− rev = "25b79cf1be5527ab8dc1b8314fcee93e76a2e564";
20− sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z";
21− };
22−
23− "8.9" = {
24− version = "20181102";
25− rev = "25b79cf1be5527ab8dc1b8314fcee93e76a2e564";
26− sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z";
27− };
288 };
29− param = params."${coq.coq-version}";
309in
3110
3211stdenv.mkDerivation rec {
@@ -38,15 +17,16 @@ stdenv.mkDerivation rec {
3817 inherit (param) rev sha256;
3918 };
4019
41− buildInputs = [
42− coq coq.ocaml coq.camlp5 coq.findlib mathcomp StructTact InfSeqExt Cheerios
43− ];
20+ buildInputs = [ coq ];
21+ propagatedBuildInputs = [ Cheerios InfSeqExt ssreflect ];
22+
4423 enableParallelBuilding = true;
4524
46− buildPhase = "make -j$NIX_BUILD_CORES";
25+ preConfigure = "patchShebangs ./configure";
26+
4727 installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
4828
4929 passthru = {
50− compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ];
30+ compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6";
5131 };
5232}
pkgs/development/coq-modules/coqprime/default.nix+7−4
@@ -1,16 +1,19 @@
11{ stdenv, fetchFromGitHub, coq, bignums }:
22
33let params =
4+ let v_8_8 = {
5+ version = "8.8";
6+ sha256 = "075yjczk79pf1hd3lgdjiz84ilkzfxjh18lgzrhhqp7d3kz5lxp5";
7+ };
8+ in
49 {
510 "8.7" = {
611 version = "8.7.2";
712 sha256 = "15zlcrx06qqxjy3nhh22wzy0rb4npc8l4nx2bbsfsvrisbq1qb7k";
813 };
9− "8.8" = {
10− version = "8.8";
11− sha256 = "075yjczk79pf1hd3lgdjiz84ilkzfxjh18lgzrhhqp7d3kz5lxp5";
14+ "8.8" = v_8_8;
15+ "8.9" = v_8_8;
1216 };
13− };
1417 param = params."${coq.coq-version}"
1518; in
1619
pkgs/development/haskell-modules/configuration-common.nix−3
@@ -1201,9 +1201,6 @@ self: super: {
12011201 # https://github.com/mgajda/json-autotype/issues/25
12021202 json-autotype = dontCheck super.json-autotype;
12031203
1204− # https://github.com/kazu-yamamoto/iproute/issues/43
1205− appar = self.appar_0_1_7;
1206−
12071204 # The LTS-12.x version doesn't suffice to build hlint, hoogle, etc.
12081205 hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; });
12091206 hoogle = super.hoogle.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; });
pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix+1−1
@@ -63,7 +63,7 @@ self: super: {
6363 hspec-discover = self.hspec-discover_2_6_0;
6464 hspec-megaparsec = doJailbreak super.hspec-megaparsec; # newer versions need megaparsec 7.x
6565 hspec-meta = self.hspec-meta_2_6_0;
66− JuicyPixels = self.JuicyPixels_3_3_2;
66+ JuicyPixels = self.JuicyPixels_3_3_3;
6767 lens = self.lens_4_17;
6868 megaparsec = dontCheck (doJailbreak super.megaparsec);
6969 pandoc = self.pandoc_2_5;
pkgs/development/haskell-modules/configuration-hackage2nix.yaml+19−17
@@ -42,8 +42,9 @@ core-packages:
4242
4343default-package-overrides:
4444 # Newer versions don't work in LTS-12.x
45+ - alsa-mixer < 0.3
4546 - cassava-megaparsec < 2
46− # LTS Haskell 12.22
47+ # LTS Haskell 12.23
4748 - abstract-deque ==0.3
4849 - abstract-deque-tests ==0.3
4950 - abstract-par ==0.3.3
@@ -76,7 +77,7 @@ default-package-overrides:
7677 - alarmclock ==0.5.0.2
7778 - alerts ==0.1.0.0
7879 - alex ==3.2.4
79− - alg ==0.2.8.0
80+ - alg ==0.2.9.0
8081 - algebra ==4.3.1
8182 - algebraic-graphs ==0.2
8283 - Allure ==0.8.3.0
@@ -182,7 +183,7 @@ default-package-overrides:
182183 - ansi-wl-pprint ==0.6.8.2
183184 - ANum ==0.2.0.2
184185 - api-field-json-th ==0.1.0.2
185− - appar ==0.1.5
186+ - appar ==0.1.7
186187 - apply-refact ==0.5.0.0
187188 - apportionment ==0.0.0.3
188189 - approximate ==0.3.1
@@ -281,7 +282,7 @@ default-package-overrides:
281282 - blake2 ==0.2.0
282283 - blank-canvas ==0.6.3
283284 - blas-carray ==0.0.1.1
284− - blas-ffi ==0.0.1.1
285+ - blas-ffi ==0.0.2
285286 - blas-hs ==0.1.1.0
286287 - blaze-bootstrap ==0.1.0.1
287288 - blaze-builder ==0.4.1.0
@@ -701,7 +702,7 @@ default-package-overrides:
701702 - exp-pairs ==0.1.6.0
702703 - extensible ==0.4.9
703704 - extensible-exceptions ==0.1.1.4
704− - extra ==1.6.13
705+ - extra ==1.6.14
705706 - extractable-singleton ==0.0.1
706707 - extrapolate ==0.3.3
707708 - facts ==0.0.1.0
@@ -730,8 +731,8 @@ default-package-overrides:
730731 - fileplow ==0.1.0.0
731732 - filter-logger ==0.6.0.0
732733 - filtrable ==0.1.1.0
734+ - Fin ==0.2.6.1
733735 - fin ==0.0.1
734− - Fin ==0.2.6.0
735736 - FindBin ==0.0.5
736737 - find-clumpiness ==0.2.3.1
737738 - fingertree ==0.1.4.2
@@ -870,12 +871,12 @@ default-package-overrides:
870871 - GLUT ==2.7.0.14
871872 - gnuplot ==0.5.5.3
872873 - goggles ==0.3.2
873− - google-oauth2-jwt ==0.3.0
874+ - google-oauth2-jwt ==0.3.1
874875 - gpolyline ==0.1.0.1
875876 - graph-core ==0.3.0.0
876877 - graphs ==0.7.1
877878 - graphviz ==2999.20.0.2
878− - graph-wrapper ==0.2.5.1
879+ - graph-wrapper ==0.2.5.2
879880 - gravatar ==0.8.0
880881 - graylog ==0.1.0.1
881882 - greskell ==0.2.2.0
@@ -907,7 +908,7 @@ default-package-overrides:
907908 - hapistrano ==0.3.7.0
908909 - happstack-server ==7.5.1.1
909910 - happy ==1.19.9
910− - hasbolt ==0.1.3.1
911+ - hasbolt ==0.1.3.2
911912 - hashable ==1.2.7.0
912913 - hashids ==1.0.2.4
913914 - hashing ==0.1.0.1
@@ -1122,7 +1123,7 @@ default-package-overrides:
11221123 - iff ==0.0.6
11231124 - ihaskell ==0.9.1.0
11241125 - ihaskell-hvega ==0.1.0.3
1125− - ihs ==0.1.0.2
1126+ - ihs ==0.1.0.3
11261127 - ilist ==0.3.1.0
11271128 - imagesize-conduit ==1.1
11281129 - Imlib ==0.1.2
@@ -1154,7 +1155,7 @@ default-package-overrides:
11541155 - invariant ==0.5.1
11551156 - invertible ==0.2.0.5
11561157 - invertible-grammar ==0.1.1
1157− - io-choice ==0.0.6
1158+ - io-choice ==0.0.7
11581159 - io-machine ==0.2.0.0
11591160 - io-manager ==0.1.0.2
11601161 - io-memoize ==1.1.1.0
@@ -1164,7 +1165,7 @@ default-package-overrides:
11641165 - io-streams-haproxy ==1.0.0.2
11651166 - ip ==1.3.0
11661167 - ip6addr ==1.0.0
1167− - iproute ==1.7.6
1168+ - iproute ==1.7.7
11681169 - IPv6Addr ==1.1.1
11691170 - IPv6DB ==0.3.1
11701171 - ipython-kernel ==0.9.1.0
@@ -1330,7 +1331,7 @@ default-package-overrides:
13301331 - median-stream ==0.7.0.0
13311332 - med-module ==0.1.1
13321333 - megaparsec ==6.5.0
1333− - mega-sdist ==0.3.3.1
1334+ - mega-sdist ==0.3.3.2
13341335 - memory ==0.14.18
13351336 - MemoTrie ==0.6.9
13361337 - mercury-api ==0.1.0.1
@@ -1733,6 +1734,7 @@ default-package-overrides:
17331734 - refined ==0.2.3.0
17341735 - reflection ==2.1.4
17351736 - RefSerialize ==0.4.0
1737+ - regex ==1.0.1.4
17361738 - regex-applicative ==0.3.3
17371739 - regex-applicative-text ==0.1.0.1
17381740 - regex-base ==0.93.2
@@ -1800,8 +1802,8 @@ default-package-overrides:
18001802 - say ==0.1.0.1
18011803 - sbp ==2.3.17
18021804 - sbv ==7.12
1803− - scalendar ==1.2.0
18041805 - SCalendar ==1.1.0
1806+ - scalendar ==1.2.0
18051807 - scalpel ==0.5.1
18061808 - scalpel-core ==0.5.1
18071809 - scanner ==0.2
@@ -1878,7 +1880,7 @@ default-package-overrides:
18781880 - shell-escape ==0.2.0
18791881 - shelltestrunner ==1.9
18801882 - shelly ==1.8.1
1881− - shortcut-links ==0.4.2.0
1883+ - shortcut-links ==0.4.2.1
18821884 - should-not-typecheck ==2.1.0
18831885 - show-combinators ==0.1.0.0
18841886 - show-prettyprint ==0.2.2
@@ -2184,7 +2186,7 @@ default-package-overrides:
21842186 - unix-bytestring ==0.3.7.3
21852187 - unix-compat ==0.5.1
21862188 - unix-time ==0.3.8
2187− - unliftio ==0.2.8.1
2189+ - unliftio ==0.2.9.0
21882190 - unliftio-core ==0.1.2.0
21892191 - unlit ==0.4.0.0
21902192 - unordered-containers ==0.2.9.0
@@ -2303,7 +2305,7 @@ default-package-overrides:
23032305 - word-wrap ==0.4.1
23042306 - world-peace ==0.1.0.0
23052307 - wrap ==0.0.0
2306− - wreq ==0.5.3.0
2308+ - wreq ==0.5.3.1
23072309 - wreq-stringless ==0.5.9.1
23082310 - writer-cps-full ==0.1.0.0
23092311 - writer-cps-lens ==0.1.0.1
pkgs/development/haskell-modules/hackage-packages.nix+1218−587
@@ -5051,6 +5051,8 @@ self: {
50515051 pname = "Euterpea";
50525052 version = "2.0.6";
50535053 sha256 = "0smaa34s0yz90q4qx104glyx8s93k6vn6r60m6aq9infm7rkffxw";
5054+ revision = "1";
5055+ editedCabalFile = "1yrr18wv22ri1v8mij4lazl5lpri7sf8bxbz7igsbs8dngmycn9r";
50545056 libraryHaskellDepends = [
50555057 array arrows base bytestring containers deepseq ghc-prim HCodecs
50565058 heap PortMidi random stm
@@ -5469,21 +5471,6 @@ self: {
54695471 }) {};
54705472
54715473 "Fin" = callPackage
5472− ({ mkDerivation, alg, base, foldable1, natural-induction, peano
5473− , universe-base
5474− }:
5475− mkDerivation {
5476− pname = "Fin";
5477− version = "0.2.6.0";
5478− sha256 = "18qc3ih3l9zd13knxxsh657iq3c742pfaz4i45bq1ir60qwjqmhw";
5479− libraryHaskellDepends = [
5480− alg base foldable1 natural-induction peano universe-base
5481− ];
5482− description = "Finite totally-ordered sets";
5483− license = stdenv.lib.licenses.bsd3;
5484− }) {};
5485−
5486− "Fin_0_2_6_1" = callPackage
54875474 ({ mkDerivation, alg, base, foldable1, natural-induction, peano
54885475 , universe-base
54895476 }:
@@ -5496,7 +5483,6 @@ self: {
54965483 ];
54975484 description = "Finite totally-ordered sets";
54985485 license = stdenv.lib.licenses.bsd3;
5499− hydraPlatforms = stdenv.lib.platforms.none;
55005486 }) {};
55015487
55025488 "Finance-Quote-Yahoo" = callPackage
@@ -6689,6 +6675,29 @@ self: {
66896675 license = stdenv.lib.licenses.bsd3;
66906676 }) {};
66916677
6678+ "Glob_0_10_0" = callPackage
6679+ ({ mkDerivation, base, containers, directory, dlist, filepath
6680+ , HUnit, QuickCheck, test-framework, test-framework-hunit
6681+ , test-framework-quickcheck2, transformers, transformers-compat
6682+ }:
6683+ mkDerivation {
6684+ pname = "Glob";
6685+ version = "0.10.0";
6686+ sha256 = "0953f91f62ncna402vsrfzdcyxhdpjna3bgdw017kad0dfymacs7";
6687+ libraryHaskellDepends = [
6688+ base containers directory dlist filepath transformers
6689+ transformers-compat
6690+ ];
6691+ testHaskellDepends = [
6692+ base containers directory dlist filepath HUnit QuickCheck
6693+ test-framework test-framework-hunit test-framework-quickcheck2
6694+ transformers transformers-compat
6695+ ];
6696+ description = "Globbing library";
6697+ license = stdenv.lib.licenses.bsd3;
6698+ hydraPlatforms = stdenv.lib.platforms.none;
6699+ }) {};
6700+
66926701 "GlomeTrace" = callPackage
66936702 ({ mkDerivation, array, base, GlomeVec }:
66946703 mkDerivation {
@@ -7367,18 +7376,15 @@ self: {
73677376 }) {inherit (pkgs) unixODBC;};
73687377
73697378 "HDBC-postgresql" = callPackage
7370− ({ mkDerivation, base, bytestring, Cabal, convertible, HDBC, mtl
7371− , old-time, parsec, postgresql, time, utf8-string
7379+ ({ mkDerivation, base, bytestring, convertible, HDBC, mtl, old-time
7380+ , parsec, postgresql, time, utf8-string
73727381 }:
73737382 mkDerivation {
73747383 pname = "HDBC-postgresql";
7375− version = "2.3.2.5";
7376− sha256 = "0l9i7mkdcch7f1ajl0fma7rra3dc0llmlia0iqhqb4k0gcrpy7l8";
7377− revision = "1";
7378− editedCabalFile = "1myhqsn3kk21pchlwf9s6vxggl59s6vmhmbx2539ad4jvnfy2ijx";
7384+ version = "2.3.2.6";
7385+ sha256 = "1kas80zv3vbqq9cd73w87fj4mwxcphfmf7ycfnl4jwdzpqjzr0yj";
73797386 isLibrary = true;
73807387 isExecutable = true;
7381− setupHaskellDepends = [ base Cabal ];
73827388 libraryHaskellDepends = [
73837389 base bytestring convertible HDBC mtl old-time parsec time
73847390 utf8-string
@@ -9290,8 +9296,8 @@ self: {
92909296 ({ mkDerivation, array, base, containers, random }:
92919297 mkDerivation {
92929298 pname = "HaskellForMaths";
9293− version = "0.4.8";
9294− sha256 = "0yn2nj6irmj24j1djvnnq26i2lbf9g9x1wdhmcrk519glcn5k64j";
9299+ version = "0.4.9";
9300+ sha256 = "1jgim9g0jbv6k31aalq0yps843jmfx74k53lnd1p79kgad7670rz";
92959301 libraryHaskellDepends = [ array base containers random ];
92969302 description = "Combinatorics, group theory, commutative algebra, non-commutative algebra";
92979303 license = stdenv.lib.licenses.bsd3;
@@ -10743,14 +10749,16 @@ self: {
1074310749 license = stdenv.lib.licenses.bsd3;
1074410750 }) {};
1074510751
10746− "JuicyPixels_3_3_2" = callPackage
10752+ "JuicyPixels_3_3_3" = callPackage
1074710753 ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
1074810754 , primitive, transformers, vector, zlib
1074910755 }:
1075010756 mkDerivation {
1075110757 pname = "JuicyPixels";
10752− version = "3.3.2";
10753− sha256 = "120jlrqwa7i32yddwbyl6iyx99gx1fvrizb5lybj87p4fr7cxj6z";
10758+ version = "3.3.3";
10759+ sha256 = "1i5k81nfgibbmf5f70iicbh8rqbng61r926wcf9hwy2aa2vba11c";
10760+ revision = "1";
10761+ editedCabalFile = "1q8xyxn1a4ldaa1grmr7dywdbf4vqjw65v52h6z7ssz12hgjx0gq";
1075410762 libraryHaskellDepends = [
1075510763 base binary bytestring containers deepseq mtl primitive
1075610764 transformers vector zlib
@@ -10950,8 +10958,8 @@ self: {
1095010958 ({ mkDerivation, array, base, Cabal }:
1095110959 mkDerivation {
1095210960 pname = "KMP";
10953− version = "0.1.0.2";
10954− sha256 = "14dpqfji00jq2rc09l8d1ivphpiwkryjk5sn6lrwxv8mcly3pvhn";
10961+ version = "0.2.0.0";
10962+ sha256 = "0x90yi4aplfqhwaaw5ymgcmv6fpg7659r8n7ir6xfkrpgfmk18i9";
1095510963 libraryHaskellDepends = [ array base ];
1095610964 testHaskellDepends = [ base Cabal ];
1095710965 description = "Knuth–Morris–Pratt string searching algorithm";
@@ -14639,8 +14647,8 @@ self: {
1463914647 }:
1464014648 mkDerivation {
1464114649 pname = "Plot-ho-matic";
14642− version = "0.12.2.2";
14643− sha256 = "07zxn4gqkmprrpfyd8vvsf4c2350965k029nzvs0zvrwfbkxin4m";
14650+ version = "0.12.2.3";
14651+ sha256 = "1wmylc6z8ikq2qky46jvzffrrjzl8c9xzzlkwsx8223cxa2n59pn";
1464414652 isLibrary = true;
1464514653 isExecutable = true;
1464614654 libraryHaskellDepends = [
@@ -15653,17 +15661,15 @@ self: {
1565315661 license = stdenv.lib.licenses.bsd3;
1565415662 }) {};
1565515663
15656− "Rasterific_0_7_4_1" = callPackage
15664+ "Rasterific_0_7_4_2" = callPackage
1565715665 ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity
1565815666 , free, JuicyPixels, mtl, primitive, transformers, vector
1565915667 , vector-algorithms
1566015668 }:
1566115669 mkDerivation {
1566215670 pname = "Rasterific";
15663− version = "0.7.4.1";
15664− sha256 = "1d0j7xf2xbgrlny30qwm52wby51ic2cqlhb867a7a03k02p7ib2b";
15665− revision = "1";
15666− editedCabalFile = "1lz8b9xcfcv0a762zvaksh7c80yryc9yhap198dlm60i0znpjdg2";
15671+ version = "0.7.4.2";
15672+ sha256 = "1sg63cvcb64gbrxkn5pgs1nvvb1c9qfya7xxwn5daqpjgan426w1";
1566715673 libraryHaskellDepends = [
1566815674 base bytestring containers dlist FontyFruity free JuicyPixels mtl
1566915675 primitive transformers vector vector-algorithms
@@ -16345,6 +16351,8 @@ self: {
1634516351 pname = "SVGFonts";
1634616352 version = "1.7";
1634716353 sha256 = "1k9ili7l9pp5a009jh55vigb917wdnsl6iaz0ggp6d4nw1jwsg6s";
16354+ revision = "1";
16355+ editedCabalFile = "1w687f4lk4l07wqgldhpg7ycid0fs099x8vrylcxqdgfrzmm04dg";
1634816356 enableSeparateDataOutput = true;
1634916357 libraryHaskellDepends = [
1635016358 attoparsec base blaze-markup blaze-svg bytestring cereal
@@ -22009,8 +22017,8 @@ self: {
2200922017 pname = "aeson-extra";
2201022018 version = "0.4.1.1";
2201122019 sha256 = "1y7xss382hdxrv4jzprsm3b7ij7wiw8jgjg9wp49dx6bfvcnb2nl";
22012− revision = "2";
22013− editedCabalFile = "1iiibpr8pcdr0bjp0rhf1sxvs0kv66jm01nwlhj4243864qx476r";
22020+ revision = "3";
22021+ editedCabalFile = "0b9ccv529msmqay0gw2xcxm67n08hmv6s45ivyd8vq0rig4wz407";
2201422022 libraryHaskellDepends = [
2201522023 aeson aeson-compat attoparsec attoparsec-iso8601 base
2201622024 base-compat-batteries bytestring containers deepseq exceptions
@@ -23285,17 +23293,6 @@ self: {
2328523293 }) {};
2328623294
2328723295 "alg" = callPackage
23288− ({ mkDerivation, base, util }:
23289− mkDerivation {
23290− pname = "alg";
23291− version = "0.2.8.0";
23292− sha256 = "1zw50da4wz8qdc62qlvg74k3g5n48xlzda2k7c3y9zb8xb2xbfrr";
23293− libraryHaskellDepends = [ base util ];
23294− description = "Algebraic structures";
23295− license = stdenv.lib.licenses.bsd3;
23296− }) {};
23297−
23298− "alg_0_2_9_0" = callPackage
2329923296 ({ mkDerivation, base, util }:
2330023297 mkDerivation {
2330123298 pname = "alg";
@@ -23304,7 +23301,6 @@ self: {
2330423301 libraryHaskellDepends = [ base util ];
2330523302 description = "Algebraic structures";
2330623303 license = stdenv.lib.licenses.bsd3;
23307− hydraPlatforms = stdenv.lib.platforms.none;
2330823304 }) {};
2330923305
2331023306 "alga" = callPackage
@@ -23775,6 +23771,20 @@ self: {
2377523771 }) {inherit (pkgs) alsaLib;};
2377623772
2377723773 "alsa-mixer" = callPackage
23774+ ({ mkDerivation, alsa-core, alsaLib, base, c2hs, unix }:
23775+ mkDerivation {
23776+ pname = "alsa-mixer";
23777+ version = "0.2.0.3";
23778+ sha256 = "13fgd78msqsyzm92cbasm8m3s1rww6r1g83qbrv4mkm2h50fnvgp";
23779+ libraryHaskellDepends = [ alsa-core base unix ];
23780+ librarySystemDepends = [ alsaLib ];
23781+ libraryToolDepends = [ c2hs ];
23782+ description = "Bindings to the ALSA simple mixer API";
23783+ license = stdenv.lib.licenses.bsd3;
23784+ hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
23785+ }) {inherit (pkgs) alsaLib;};
23786+
23787+ "alsa-mixer_0_3_0" = callPackage
2377823788 ({ mkDerivation, alsa-core, alsaLib, base, c2hs, unix }:
2377923789 mkDerivation {
2378023790 pname = "alsa-mixer";
@@ -23785,7 +23795,7 @@ self: {
2378523795 libraryToolDepends = [ c2hs ];
2378623796 description = "Bindings to the ALSA simple mixer API";
2378723797 license = stdenv.lib.licenses.bsd3;
23788− hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
23798+ hydraPlatforms = stdenv.lib.platforms.none;
2378923799 }) {inherit (pkgs) alsaLib;};
2379023800
2379123801 "alsa-pcm" = callPackage
@@ -26594,8 +26604,8 @@ self: {
2659426604 }:
2659526605 mkDerivation {
2659626606 pname = "amqp-worker";
26597− version = "0.2.4";
26598− sha256 = "0ps0d9hly3cc9y7cmi5gr6p3h8qddig7sz3s7v6dl0icy3bvhinc";
26607+ version = "0.2.5";
26608+ sha256 = "0crbrmxwv1dwd84l41p2zmx5ap5wwr0n5a9cznz87x3cc6qncylq";
2659926609 isLibrary = true;
2660026610 isExecutable = true;
2660126611 libraryHaskellDepends = [
@@ -27272,8 +27282,8 @@ self: {
2727227282 }:
2727327283 mkDerivation {
2727427284 pname = "antiope-athena";
27275− version = "6.1.5";
27276− sha256 = "0p78yxdnfzz6jw7az6xfh6sjcnf9d8sl512cmhdcws78p7f2rhlx";
27285+ version = "6.2.0";
27286+ sha256 = "0kd31s399rddcjj8ayvki85j66xlkb7gh0jgfwxmxcxp3x4gs0xi";
2727727287 libraryHaskellDepends = [
2727827288 amazonka amazonka-athena amazonka-core base lens resourcet text
2727927289 unliftio-core
@@ -27289,8 +27299,8 @@ self: {
2728927299 ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }:
2729027300 mkDerivation {
2729127301 pname = "antiope-contract";
27292− version = "6.1.5";
27293− sha256 = "1ikd0sn3z901hyad55ngzs99b0v9bs5vkry5965w22smljdg3rqh";
27302+ version = "6.2.0";
27303+ sha256 = "0s2s0vq6n7zwjj1yd7kmpwxkvbnfd2ikjv9nzg1rz0hm6mz1dn4p";
2729427304 libraryHaskellDepends = [
2729527305 aeson antiope-s3 avro base bytestring text
2729627306 ];
@@ -27305,8 +27315,8 @@ self: {
2730527315 }:
2730627316 mkDerivation {
2730727317 pname = "antiope-core";
27308− version = "6.1.5";
27309− sha256 = "06c8wd4gjlrz1sdk7qpd1l8n29a3jkipy749j3414x7b5fqxbzi7";
27318+ version = "6.2.0";
27319+ sha256 = "0g3bhh8vdnkd5h9savhjc053jbb4k7b7chbzcjjqd4kj95v8jmr3";
2731027320 libraryHaskellDepends = [
2731127321 amazonka amazonka-core base bytestring exceptions generic-lens
2731227322 http-client http-types lens monad-logger mtl resourcet text
@@ -27328,8 +27338,8 @@ self: {
2732827338 }:
2732927339 mkDerivation {
2733027340 pname = "antiope-dynamodb";
27331− version = "6.1.5";
27332− sha256 = "181ygxvf29acianvnryv1kbn5g69axkagqa54429ja8jfxiblrqq";
27341+ version = "6.2.0";
27342+ sha256 = "1kv6ihb6829fbgzz489sg0zyz02rp9p8wk90w4x3sjsynf8djrjj";
2733327343 libraryHaskellDepends = [
2733427344 amazonka amazonka-core amazonka-dynamodb antiope-core base
2733527345 generic-lens lens text unliftio-core unordered-containers
@@ -27349,8 +27359,8 @@ self: {
2734927359 }:
2735027360 mkDerivation {
2735127361 pname = "antiope-messages";
27352− version = "6.1.5";
27353− sha256 = "09ysy9r38d216vzq0nm1zfl4fqz8mrqa39c2ivy7pqm4xldsqary";
27362+ version = "6.2.0";
27363+ sha256 = "11zkyfv06fsqxznr36hh563yz401y3wg2a5hc6x6ydza4xdnrzdz";
2735427364 libraryHaskellDepends = [
2735527365 aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3
2735627366 base generic-lens lens lens-aeson monad-loops network-uri text
@@ -27374,8 +27384,8 @@ self: {
2737427384 }:
2737527385 mkDerivation {
2737627386 pname = "antiope-s3";
27377− version = "6.1.5";
27378− sha256 = "0b2mildkgd271c8hwg6b3jf8xgli5bmd4dx9c0ac8ihyn28xr0m8";
27387+ version = "6.2.0";
27388+ sha256 = "1gb9ypj5gp6qkzncg44sja35pw2s6qg7msjrlcvhdfbcjs6pxrqj";
2737927389 libraryHaskellDepends = [
2738027390 amazonka amazonka-core amazonka-s3 antiope-core attoparsec base
2738127391 bytestring conduit conduit-extra exceptions generic-lens http-types
@@ -27397,8 +27407,8 @@ self: {
2739727407 }:
2739827408 mkDerivation {
2739927409 pname = "antiope-sns";
27400− version = "6.1.5";
27401− sha256 = "07kg0b0iyik0axnycph3irp73cv614qcny3z3rib1rpvbknz9iwh";
27410+ version = "6.2.0";
27411+ sha256 = "0npm9q3vf2njiqwyswxc6xh5psjls0skz29mz22y59sk25m5fmkv";
2740227412 libraryHaskellDepends = [
2740327413 aeson amazonka amazonka-core amazonka-sns base generic-lens lens
2740427414 text unliftio-core
@@ -27418,8 +27428,8 @@ self: {
2741827428 }:
2741927429 mkDerivation {
2742027430 pname = "antiope-sqs";
27421− version = "6.1.5";
27422− sha256 = "097vxkz54k4ijqqzb8lijr90hvnyyhqm7sqn5qxam3wy355w3z5c";
27431+ version = "6.2.0";
27432+ sha256 = "0v33diw8cwvfb9b4k24whbyl4apjq67rh36ndn5qr6627kp3b825";
2742327433 libraryHaskellDepends = [
2742427434 aeson amazonka amazonka-core amazonka-s3 amazonka-sqs
2742527435 antiope-messages antiope-s3 base generic-lens lens lens-aeson
@@ -27643,8 +27653,8 @@ self: {
2764327653 }:
2764427654 mkDerivation {
2764527655 pname = "apecs";
27646− version = "0.7.0";
27647− sha256 = "1yah3yn4z6nxm8gdlkmzlbi8h7nd4zb4905dvzb9b66njhff06l2";
27656+ version = "0.7.1";
27657+ sha256 = "0cvjqv6zbjzvp01ikfx5lkwb7fbq25555rbvfriwhsfjqanw5pj7";
2764827658 libraryHaskellDepends = [
2764927659 base containers mtl template-haskell vector
2765027660 ];
@@ -27662,8 +27672,8 @@ self: {
2766227672 }:
2766327673 mkDerivation {
2766427674 pname = "apecs-gloss";
27665− version = "0.1.1";
27666− sha256 = "0s5vhxgfgj4v51dnrhzfbids0a873113rqb76xr8f5azq6kr9g3p";
27675+ version = "0.2.0";
27676+ sha256 = "0qkdjanbrnwhxzr168xwrnhcd1hwsymlb1nvsb1mrklzj93amfvh";
2766727677 libraryHaskellDepends = [
2766827678 apecs apecs-physics base containers gloss linear
2766927679 ];
@@ -28199,19 +28209,6 @@ self: {
2819928209 }) {};
2820028210
2820128211 "appar" = callPackage
28202− ({ mkDerivation, base, bytestring }:
28203− mkDerivation {
28204− pname = "appar";
28205− version = "0.1.5";
28206− sha256 = "0qlfwy8nxl1na55p155vq5yn0cqz26mmmh5vs28aqry7kyyxndfi";
28207− revision = "1";
28208− editedCabalFile = "0adhm7jldcqnikvd8b9wj6p5rnhf4ciwbms0jafwx79w720knj9p";
28209− libraryHaskellDepends = [ base bytestring ];
28210− description = "A simple applicative parser";
28211− license = stdenv.lib.licenses.bsd3;
28212− }) {};
28213−
28214− "appar_0_1_7" = callPackage
2821528212 ({ mkDerivation, base, bytestring }:
2821628213 mkDerivation {
2821728214 pname = "appar";
@@ -28220,7 +28217,6 @@ self: {
2822028217 libraryHaskellDepends = [ base bytestring ];
2822128218 description = "A simple applicative parser";
2822228219 license = stdenv.lib.licenses.bsd3;
28223− hydraPlatforms = stdenv.lib.platforms.none;
2822428220 }) {};
2822528221
2822628222 "appc" = callPackage
@@ -29227,14 +29223,12 @@ self: {
2922729223 hydraPlatforms = stdenv.lib.platforms.none;
2922829224 }) {inherit (pkgs) arpack;};
2922929225
29230− "array_0_5_2_0" = callPackage
29226+ "array_0_5_3_0" = callPackage
2923129227 ({ mkDerivation, base }:
2923229228 mkDerivation {
2923329229 pname = "array";
29234− version = "0.5.2.0";
29235− sha256 = "12v83s2imxb3p2crnlzrpjh0nk6lpysw9bdk9yahs6f37csa5jaj";
29236− revision = "2";
29237− editedCabalFile = "1irpwz3spy3yy27kzw8sklhcvxz3mx9fkgqia7r9m069w5wid9kg";
29230+ version = "0.5.3.0";
29231+ sha256 = "07pyr2x09n23rdxldqgbx12hlg9dk92q9p56bpcdw3r87ajc3m9z";
2923829232 libraryHaskellDepends = [ base ];
2923929233 description = "Mutable and immutable arrays";
2924029234 license = stdenv.lib.licenses.bsd3;
@@ -32372,30 +32366,21 @@ self: {
3237232366 "aws-lambda-haskell-runtime" = callPackage
3237332367 ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit
3237432368 , directory, filepath, hspec, microlens-platform, mtl
32375− , optparse-generic, process, QuickCheck, relude, template-haskell
32376− , text, wreq
32369+ , optparse-generic, process, template-haskell, text, uuid, wreq
3237732370 }:
3237832371 mkDerivation {
3237932372 pname = "aws-lambda-haskell-runtime";
32380− version = "1.0.4";
32381− sha256 = "0cfmdgy0vn62gdi01r02k4yb87s4xv0xhyd06j5ws6ky6cpmmdwx";
32373+ version = "1.0.7";
32374+ sha256 = "0dkagfvnxr1bbl6ngglqvvwl4gc66ipvyww4j80nwaxdfwx85wjq";
3238232375 isLibrary = true;
3238332376 isExecutable = true;
3238432377 libraryHaskellDepends = [
3238532378 aeson base bytestring case-insensitive conduit directory filepath
32386− microlens-platform mtl optparse-generic process relude
32387− template-haskell text wreq
32388− ];
32389− executableHaskellDepends = [
32390− aeson base bytestring case-insensitive conduit directory filepath
32391− microlens-platform mtl optparse-generic process relude
32392− template-haskell text wreq
32393− ];
32394− testHaskellDepends = [
32395− aeson base bytestring case-insensitive conduit directory filepath
32396− hspec microlens-platform mtl optparse-generic process QuickCheck
32397− relude template-haskell text wreq
32379+ microlens-platform mtl optparse-generic process template-haskell
32380+ text uuid wreq
3239832381 ];
32382+ executableHaskellDepends = [ base mtl ];
32383+ testHaskellDepends = [ base hspec mtl ];
3239932384 description = "Haskell runtime for AWS Lambda";
3240032385 license = stdenv.lib.licenses.asl20;
3240132386 }) {};
@@ -32646,8 +32631,8 @@ self: {
3264632631 }) {};
3264732632
3264832633 "axel" = callPackage
32649− ({ mkDerivation, base, bytestring, directory, filepath
32650− , freer-simple, haskell-src-exts, hedgehog, lens, lens-aeson
32634+ ({ mkDerivation, base, bytestring, containers, directory, filepath
32635+ , freer-simple, ghcid, haskell-src-exts, hedgehog, lens, lens-aeson
3265132636 , optparse-applicative, parsec, process, regex-pcre, singletons
3265232637 , split, strict, tasty, tasty-discover, tasty-golden
3265332638 , tasty-hedgehog, tasty-hspec, template-haskell, text, transformers
@@ -32655,22 +32640,24 @@ self: {
3265532640 }:
3265632641 mkDerivation {
3265732642 pname = "axel";
32658− version = "0.0.8";
32659− sha256 = "16fkrc87yirzha3fgdcbidi7k9xkmb5y5w1i4i10rlikhszfr2b9";
32643+ version = "0.0.9";
32644+ sha256 = "0kr7iblj23dlfjzym2ndrns2x7z65sdn2pz8dwxsqvn8jhh24p7f";
3266032645 isLibrary = true;
3266132646 isExecutable = true;
3266232647 enableSeparateDataOutput = true;
3266332648 libraryHaskellDepends = [
32664− base bytestring directory filepath freer-simple haskell-src-exts
32665− lens lens-aeson optparse-applicative parsec process regex-pcre
32666− singletons strict template-haskell text typed-process vector yaml
32649+ base bytestring containers directory filepath freer-simple ghcid
32650+ haskell-src-exts lens lens-aeson optparse-applicative parsec
32651+ process regex-pcre singletons strict template-haskell text
32652+ typed-process vector yaml
3266732653 ];
3266832654 executableHaskellDepends = [
32669− base freer-simple optparse-applicative
32655+ base containers freer-simple optparse-applicative
3267032656 ];
3267132657 testHaskellDepends = [
32672− base bytestring filepath freer-simple hedgehog lens split tasty
32673− tasty-discover tasty-golden tasty-hedgehog tasty-hspec transformers
32658+ base bytestring containers filepath freer-simple hedgehog lens
32659+ split tasty tasty-discover tasty-golden tasty-hedgehog tasty-hspec
32660+ transformers
3267432661 ];
3267532662 testToolDepends = [ tasty-discover ];
3267632663 description = "The Axel programming language";
@@ -33302,8 +33289,8 @@ self: {
3330233289 }:
3330333290 mkDerivation {
3330433291 pname = "barbies";
33305− version = "1.0.0.0";
33306− sha256 = "05bbn1aqa6r9392fffgjgdl4m8nnagjx27aps5xrcf5x45kk88ci";
33292+ version = "1.1.0.0";
33293+ sha256 = "02lnq2f5n75r214lrhkhdl3a85lzn3am197df4a0mp6pvw07z1cs";
3330733294 libraryHaskellDepends = [ base bifunctors ];
3330833295 testHaskellDepends = [
3330933296 base QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -36401,8 +36388,8 @@ self: {
3640136388 ({ mkDerivation, base, monetdb-mapi }:
3640236389 mkDerivation {
3640336390 pname = "bindings-monetdb-mapi";
36404− version = "0.1.0.1";
36405− sha256 = "0ghl73n679y5srg4b2jwy6xgnd4lbv7wad8k133k6c7k70zq89hl";
36391+ version = "0.1.0.2";
36392+ sha256 = "1f6n2x8c0r72d011piyf8fqclfxcqda98ha3w29c86y66qid0wjm";
3640636393 libraryHaskellDepends = [ base ];
3640736394 libraryPkgconfigDepends = [ monetdb-mapi ];
3640836395 description = "Low-level bindings for the MonetDB API (mapi)";
@@ -36779,6 +36766,8 @@ self: {
3677936766 pname = "biocore";
3678036767 version = "0.3.1";
3678136768 sha256 = "06ml9p144bv0c9hv6pkcvhdgc0vw0jxzbqb834ilr38kjmrpsar1";
36769+ revision = "1";
36770+ editedCabalFile = "0lz3inilvxn1simbpm8002iv7h9wk1gzng2vj3gpxps99zvihqc4";
3678236771 libraryHaskellDepends = [ base bytestring stringable ];
3678336772 description = "A bioinformatics library";
3678436773 license = "LGPL";
@@ -37938,8 +37927,10 @@ self: {
3793837927 ({ mkDerivation, base, blas, netlib-ffi }:
3793937928 mkDerivation {
3794037929 pname = "blas-ffi";
37941− version = "0.0.1.1";
37942− sha256 = "0dphqcnnka0ahfgdnshm8r3bd6r5wbpln9kksa6y09yi2nnqh3gf";
37930+ version = "0.0.2";
37931+ sha256 = "047qal272s1hc3pp7xy8vyq4dm80nvqin34zvl7wz09c0qrnnvyc";
37932+ isLibrary = true;
37933+ isExecutable = true;
3794337934 libraryHaskellDepends = [ base netlib-ffi ];
3794437935 libraryPkgconfigDepends = [ blas ];
3794537936 description = "Auto-generated interface to Fortran BLAS";
@@ -37947,12 +37938,12 @@ self: {
3794737938 hydraPlatforms = stdenv.lib.platforms.none;
3794837939 }) {inherit (pkgs) blas;};
3794937940
37950− "blas-ffi_0_0_2" = callPackage
37941+ "blas-ffi_0_1" = callPackage
3795137942 ({ mkDerivation, base, blas, netlib-ffi }:
3795237943 mkDerivation {
3795337944 pname = "blas-ffi";
37954− version = "0.0.2";
37955− sha256 = "047qal272s1hc3pp7xy8vyq4dm80nvqin34zvl7wz09c0qrnnvyc";
37945+ version = "0.1";
37946+ sha256 = "1zmw1x37ayssplj8w01ivfyh2jjg906c389cjah4hpn5dpb7p9w5";
3795637947 isLibrary = true;
3795737948 isExecutable = true;
3795837949 libraryHaskellDepends = [ base netlib-ffi ];
@@ -40190,6 +40181,28 @@ self: {
4019040181 license = stdenv.lib.licenses.asl20;
4019140182 }) {};
4019240183
40184+ "bson_0_3_2_7" = callPackage
40185+ ({ mkDerivation, base, binary, bytestring, cryptohash
40186+ , data-binary-ieee754, mtl, network, QuickCheck, test-framework
40187+ , test-framework-quickcheck2, text, time
40188+ }:
40189+ mkDerivation {
40190+ pname = "bson";
40191+ version = "0.3.2.7";
40192+ sha256 = "0avzr3aa3mbr9hcjwd0nr0pnpiym7s35qw7nghz51mrzb76rsci7";
40193+ libraryHaskellDepends = [
40194+ base binary bytestring cryptohash data-binary-ieee754 mtl network
40195+ text time
40196+ ];
40197+ testHaskellDepends = [
40198+ base binary bytestring cryptohash data-binary-ieee754 mtl network
40199+ QuickCheck test-framework test-framework-quickcheck2 text time
40200+ ];
40201+ description = "BSON documents are JSON-like objects with a standard binary encoding";
40202+ license = stdenv.lib.licenses.asl20;
40203+ hydraPlatforms = stdenv.lib.platforms.none;
40204+ }) {};
40205+
4019340206 "bson-generic" = callPackage
4019440207 ({ mkDerivation, base, bson, ghc-prim, text }:
4019540208 mkDerivation {
@@ -42046,6 +42059,8 @@ self: {
4204642059 pname = "cabal-file-th";
4204742060 version = "0.2.4";
4204842061 sha256 = "076rprsnb9nyhm97ky4vzfcvirl8wx4g3f68lx7k5inhmkzxfm8b";
42062+ revision = "1";
42063+ editedCabalFile = "0qbhrpn23vrqyh71vkbbs5yxwlb8m6nzfpwn6mqz2xi0wwzvl9s6";
4204942064 libraryHaskellDepends = [
4205042065 base Cabal directory pretty template-haskell
4205142066 ];
@@ -42363,10 +42378,8 @@ self: {
4236342378 }:
4236442379 mkDerivation {
4236542380 pname = "cabal-plan";
42366− version = "0.4.0.0";
42367− sha256 = "0cbk0xhv189jv656x6a2s0bcnhkks4rlpkhvxbb215v5ldmrkpb1";
42368− revision = "1";
42369− editedCabalFile = "161vgfbwm8psqa6ncs12j7sn5lqjag1xi62vllvp8xbz9lcvbchb";
42381+ version = "0.5.0.0";
42382+ sha256 = "1vfa4lwfjhv4nyl1rwm7i99zdkwriighlhfcz0rgjwzgg56wrihq";
4237042383 configureFlags = [ "-fexe" ];
4237142384 isLibrary = true;
4237242385 isExecutable = true;
@@ -42380,7 +42393,7 @@ self: {
4238042393 ];
4238142394 doHaddock = false;
4238242395 description = "Library and utiltity for processing cabal's plan.json file";
42383− license = stdenv.lib.licenses.gpl3;
42396+ license = "GPL-2.0-or-later AND BSD-3-Clause";
4238442397 hydraPlatforms = stdenv.lib.platforms.none;
4238542398 }) {};
4238642399
@@ -43976,8 +43989,8 @@ self: {
4397643989 }:
4397743990 mkDerivation {
4397843991 pname = "casadi-bindings";
43979− version = "3.1.0.3";
43980− sha256 = "0fb4pyz1f66r811ihpcrq5qpznnxrnrrsh8wfy5g8i5k8srf78n9";
43992+ version = "3.4.5.0";
43993+ sha256 = "0ps01gm27dajr8ixfppc2mfmx8yzr24fbq9k5n3c9xgxvn9w7rmc";
4398143994 libraryHaskellDepends = [
4398243995 base binary casadi-bindings-core casadi-bindings-internal cereal
4398343996 containers linear spatial-math vector vector-binary-instances
@@ -44015,8 +44028,8 @@ self: {
4401544028 }:
4401644029 mkDerivation {
4401744030 pname = "casadi-bindings-core";
44018− version = "3.1.0.0";
44019− sha256 = "08z6jh8hn23162d6baznvs3br3fin4rp6j4sdfsiid1c3z92q3rn";
44031+ version = "3.4.5.0";
44032+ sha256 = "0iqzr6gm30a0v7523yqkipgph89wlyihwmnzidpvki0vlv6fldrl";
4402044033 libraryHaskellDepends = [
4402144034 base casadi-bindings-internal containers vector
4402244035 ];
@@ -44030,8 +44043,8 @@ self: {
4403044043 ({ mkDerivation, base, casadi, containers, vector }:
4403144044 mkDerivation {
4403244045 pname = "casadi-bindings-internal";
44033− version = "0.1.5.0";
44034− sha256 = "0p7kbg015447sasn6n4l5kdafrxc2yhgqrxg46xadma6vvv00hf2";
44046+ version = "0.1.6.1";
44047+ sha256 = "1y2h0r0l0b9y43n0irsc5s82x7xmzdjdjaz6cqmxk19v0hg4jdnx";
4403544048 libraryHaskellDepends = [ base containers vector ];
4403644049 librarySystemDepends = [ casadi ];
4403744050 description = "low level bindings to CasADi";
@@ -44891,6 +44904,26 @@ self: {
4489144904 hydraPlatforms = stdenv.lib.platforms.none;
4489244905 }) {};
4489344906
44907+ "cayley-client_0_4_8" = callPackage
44908+ ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
44909+ , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
44910+ , mtl, text, transformers, unordered-containers, vector
44911+ }:
44912+ mkDerivation {
44913+ pname = "cayley-client";
44914+ version = "0.4.8";
44915+ sha256 = "09hrq1k8s8w7rawyn78hjagirs3yrkp79nn7p5w1l8amp27k5cdi";
44916+ libraryHaskellDepends = [
44917+ aeson attoparsec base binary bytestring exceptions http-client
44918+ http-conduit lens lens-aeson mtl text transformers
44919+ unordered-containers vector
44920+ ];
44921+ testHaskellDepends = [ aeson base hspec unordered-containers ];
44922+ description = "A Haskell client for the Cayley graph database";
44923+ license = stdenv.lib.licenses.bsd3;
44924+ hydraPlatforms = stdenv.lib.platforms.none;
44925+ }) {};
44926+
4489444927 "cayley-dickson" = callPackage
4489544928 ({ mkDerivation, base, random }:
4489644929 mkDerivation {
@@ -48622,8 +48655,8 @@ self: {
4862248655 }:
4862348656 mkDerivation {
4862448657 pname = "cloudi";
48625− version = "1.7.4";
48626− sha256 = "0vpsb7sngc8q7bkdg737bfzqfkl14mwjzaycfs0x0fwl6f8l5a8a";
48658+ version = "1.7.5";
48659+ sha256 = "08cklswxmd7x0zxkkrlwh1qy57jbqp0dv3x57xskxpmwyhws2vgs";
4862748660 libraryHaskellDepends = [
4862848661 array base binary bytestring containers network time unix zlib
4862948662 ];
@@ -49504,26 +49537,26 @@ self: {
4950449537
4950549538 "codex" = callPackage
4950649539 ({ mkDerivation, ascii-progress, base, bytestring, Cabal
49507− , containers, cryptohash, directory, either, filepath, hackage-db
49508− , http-client, lens, machines, machines-directory, MissingH
49509− , monad-loops, network, process, tar, text, transformers, wreq
49510− , yaml, zlib
49540+ , containers, cryptohash, directory, filepath, hackage-db
49541+ , http-client, lens, machines, machines-directory, network, process
49542+ , tar, text, transformers, wreq, yaml, zlib
4951149543 }:
4951249544 mkDerivation {
4951349545 pname = "codex";
49514− version = "0.5.1.2";
49515− sha256 = "0w9m737v3fdgslqdfw16bq7hhsimjazdxrd4r5kzpm0jai39707r";
49546+ version = "0.5.2.0";
49547+ sha256 = "1bvz8pzh9qgb7ffnmihcain877igf1hm8rs4z9qx1gckz2c566vv";
49548+ revision = "1";
49549+ editedCabalFile = "0v0jlarip2689jxixymqzy36qywla76j78iqzyyc6s7hrd63mrlx";
4951649550 isLibrary = true;
4951749551 isExecutable = true;
4951849552 libraryHaskellDepends = [
4951949553 ascii-progress base bytestring Cabal containers cryptohash
49520− directory either filepath hackage-db http-client lens machines
49554+ directory filepath hackage-db http-client lens machines
4952149555 machines-directory process tar text transformers wreq yaml zlib
4952249556 ];
4952349557 executableHaskellDepends = [
49524− ascii-progress base bytestring Cabal directory either filepath
49525− hackage-db MissingH monad-loops network process transformers wreq
49526− yaml
49558+ ascii-progress base Cabal directory filepath hackage-db network
49559+ process transformers wreq yaml
4952749560 ];
4952849561 description = "A ctags file generator for cabal project dependencies";
4952949562 license = stdenv.lib.licenses.asl20;
@@ -53339,8 +53372,8 @@ self: {
5333953372 ({ mkDerivation, base, containers, convert, lens, text, vector }:
5334053373 mkDerivation {
5334153374 pname = "container";
53342− version = "1.1.5";
53343− sha256 = "1hh3ahw1vfmws1hyyl6blqyxaz4qcip0h0d80ia8pb6b1gfbvxsm";
53375+ version = "1.1.6";
53376+ sha256 = "0q4zgd7hsnpq5wnn5gk5rz9nq1kfp8ci5kc6yp1rmzbyky3j0211";
5334453377 libraryHaskellDepends = [
5334553378 base containers convert lens text vector
5334653379 ];
@@ -54025,8 +54058,8 @@ self: {
5402554058 }:
5402654059 mkDerivation {
5402754060 pname = "convert";
54028− version = "1.5";
54029− sha256 = "0hw2qmb3g9p7zqqk92hwnzamld6kg121dkv4va4hkpcjlhb8af6g";
54061+ version = "1.5.1";
54062+ sha256 = "044syln587z5mc4fia0d81p47rpkbvzkyyrcxyckqkh2yj3b2k85";
5403054063 libraryHaskellDepends = [
5403154064 ansi-wl-pprint base bytestring containers data-default impossible
5403254065 lens template-haskell text utf8-string
@@ -56466,8 +56499,8 @@ self: {
5646656499 pname = "cryptoids";
5646756500 version = "0.5.1.0";
5646856501 sha256 = "0ai7hg4r944hck9vq2ffwwjsxp3mjfvxwhfr8b8765n1bh86i466";
56469− revision = "1";
56470− editedCabalFile = "0whcgkgdq7hp1z4dr8291q8kpqipfr4mvn8dqq7byxm10v59kn0k";
56502+ revision = "3";
56503+ editedCabalFile = "0pjdc90i3qyzxc289kjvn90hnn5xjjzjpgnb24iwqj6ik9asi86g";
5647156504 libraryHaskellDepends = [
5647256505 base binary bytestring cryptoids-class cryptoids-types cryptonite
5647356506 directory exceptions filepath memory
@@ -56482,22 +56515,26 @@ self: {
5648256515 pname = "cryptoids-class";
5648356516 version = "0.0.0";
5648456517 sha256 = "0zp0d815r0dv2xqdi6drq846zz2a82gpqp6nvap3b5dnx2q3hbjy";
56485− revision = "3";
56486− editedCabalFile = "1hcdhmksd81sylfjyx0wb4yhrswdwbjlaarq8fbmwcl7fjm4sxfy";
56518+ revision = "4";
56519+ editedCabalFile = "0c3cq648sh5cpj0isknhayamzgzv8avixxfpzr4riags70jr28ld";
5648756520 libraryHaskellDepends = [ base cryptoids-types exceptions ];
5648856521 description = "Typeclass-based interface to cryptoids";
5648956522 license = stdenv.lib.licenses.bsd3;
5649056523 }) {};
5649156524
5649256525 "cryptoids-types" = callPackage
56493− ({ mkDerivation, base, binary, http-api-data, path-pieces }:
56526+ ({ mkDerivation, aeson, base, binary, deepseq, hashable
56527+ , http-api-data, path-pieces
56528+ }:
5649456529 mkDerivation {
5649556530 pname = "cryptoids-types";
56496− version = "0.0.0";
56497− sha256 = "0qp6lx1k2mqay1i4wgkwgaqamp33gijw0wb13rh71i0qwyvnr51b";
56498− revision = "3";
56499− editedCabalFile = "1v8fgyh03qggn0fr2kg79m3r1v9i85q0dihgmbq5z4s1y700c8vq";
56500− libraryHaskellDepends = [ base binary http-api-data path-pieces ];
56531+ version = "1.0.0";
56532+ sha256 = "0dhv92hdydhhgwgdihl3wpiyxl10szrgfnb68ygn07xxhmmfc3hf";
56533+ revision = "1";
56534+ editedCabalFile = "0fy6fxzaimgi0nrplzdgi0s26cjz2nrv7y5gdnk0z6k3jd1x5qgb";
56535+ libraryHaskellDepends = [
56536+ aeson base binary deepseq hashable http-api-data path-pieces
56537+ ];
5650156538 description = "Shared types for encrypting internal object identifiers before exposure";
5650256539 license = stdenv.lib.licenses.bsd3;
5650356540 }) {};
@@ -63635,8 +63672,8 @@ self: {
6363563672 pname = "diagrams-lib";
6363663673 version = "1.4.2.3";
6363763674 sha256 = "175yzi5kw4yd8ykdkpf64q85c7j3p89l90m3h6qcsx9ipv6av9r5";
63638− revision = "1";
63639− editedCabalFile = "0zsigisgn6sjpfy2hm31zddnsyqm2a046nxb5drjqm7r0aa3vjff";
63675+ revision = "2";
63676+ editedCabalFile = "0gn1lpsq1v9qpyhpizyknn3sfixg1b64s0dsl1jf25lz4kcrpbs7";
6364063677 libraryHaskellDepends = [
6364163678 active adjunctions array base bytestring cereal colour containers
6364263679 data-default-class diagrams-core diagrams-solve directory
@@ -63812,8 +63849,8 @@ self: {
6381263849 pname = "diagrams-solve";
6381363850 version = "0.1.1";
6381463851 sha256 = "17agchqkmj14b17sw50kzxq4hm056g5d8yy0wnqn5w8h1d0my7x4";
63815− revision = "3";
63816− editedCabalFile = "13vfs5k09c16q3dvqzgfca1kd93pgc4ll8mfl3wracanm5mn5rx7";
63852+ revision = "4";
63853+ editedCabalFile = "1yjacw17ga4rh6iw70vclk03qm5xjw4y17c7m43gjw8h3cfaq15d";
6381763854 libraryHaskellDepends = [ base ];
6381863855 testHaskellDepends = [
6381963856 base deepseq tasty tasty-hunit tasty-quickcheck
@@ -66728,6 +66765,22 @@ self: {
6672866765 hydraPlatforms = stdenv.lib.platforms.none;
6672966766 }) {};
6673066767
66768+ "doctest-driver-gen_0_3_0_0" = callPackage
66769+ ({ mkDerivation, base, doctest }:
66770+ mkDerivation {
66771+ pname = "doctest-driver-gen";
66772+ version = "0.3.0.0";
66773+ sha256 = "13m5f15076grwln29pnpqrq9h45cy46pagpk1qw3vzspp7k4ahk1";
66774+ isLibrary = true;
66775+ isExecutable = true;
66776+ libraryHaskellDepends = [ base ];
66777+ executableHaskellDepends = [ base ];
66778+ testHaskellDepends = [ base doctest ];
66779+ description = "Generate driver file for doctest's cabal integration";
66780+ license = stdenv.lib.licenses.bsd3;
66781+ hydraPlatforms = stdenv.lib.platforms.none;
66782+ }) {};
66783+
6673166784 "doctest-prop" = callPackage
6673266785 ({ mkDerivation, base, doctest, HUnit, QuickCheck }:
6673366786 mkDerivation {
@@ -72972,8 +73025,8 @@ self: {
7297273025 }:
7297373026 mkDerivation {
7297473027 pname = "eventsource-store-specs";
72975− version = "1.2.0";
72976− sha256 = "1fvwwbbn8407rcxl7sww1k944gq95hniq9s9ys3hzr8a9y65598i";
73028+ version = "1.2.1";
73029+ sha256 = "1b7nhigf4r26zfbcq0civbsw8mhsz4hpdsdnm94zmkysl5k58f04";
7297773030 libraryHaskellDepends = [
7297873031 aeson async base eventsource-api mtl streaming tasty tasty-hspec
7297973032 text transformers-base uuid
@@ -72989,8 +73042,8 @@ self: {
7298973042 }:
7299073043 mkDerivation {
7299173044 pname = "eventsource-stub-store";
72992− version = "1.1.0";
72993− sha256 = "0rfbn3f6dw6m03f47f68if11xkjd98djhballl50zv7fqifcpz7h";
73045+ version = "1.1.1";
73046+ sha256 = "1xd3ngjjpimfpglkgad3r9dmd7sf2mq3kdlbqs4d6xz28gd7vh7y";
7299473047 libraryHaskellDepends = [
7299573048 async base containers eventsource-api mtl stm streaming
7299673049 transformers-base
@@ -74223,24 +74276,23 @@ self: {
7422374276 license = stdenv.lib.licenses.bsd3;
7422474277 }) {};
7422574278
74226− "extensible_0_4_10_1" = callPackage
74279+ "extensible_0_5" = callPackage
7422774280 ({ mkDerivation, aeson, base, bytestring, cassava, comonad
7422874281 , constraints, deepseq, exceptions, ghc-prim, hashable, lens
7422974282 , monad-skeleton, mtl, prettyprinter, primitive, profunctors
74230− , QuickCheck, resourcet, semigroups, StateVar, tagged
74231− , template-haskell, text, th-lift, transformers
74232− , unordered-containers, vector
74283+ , QuickCheck, resourcet, StateVar, tagged, template-haskell, text
74284+ , th-lift, transformers, unordered-containers, vector
7423374285 }:
7423474286 mkDerivation {
7423574287 pname = "extensible";
74236− version = "0.4.10.1";
74237− sha256 = "009z0grpjnnmnsc887k6vgfz5w55mniax25dl4ispj1nq74djksb";
74288+ version = "0.5";
74289+ sha256 = "1nsidp8rb3fnkybirgql2ij1vwjzsy2da3qp8abjb1g8aj50ih14";
7423874290 libraryHaskellDepends = [
7423974291 aeson base bytestring cassava comonad constraints deepseq
7424074292 exceptions ghc-prim hashable monad-skeleton mtl prettyprinter
74241− primitive profunctors QuickCheck resourcet semigroups StateVar
74242− tagged template-haskell text th-lift transformers
74243− unordered-containers vector
74293+ primitive profunctors QuickCheck resourcet StateVar tagged
74294+ template-haskell text th-lift transformers unordered-containers
74295+ vector
7424474296 ];
7424574297 testHaskellDepends = [ base lens QuickCheck template-haskell ];
7424674298 description = "Extensible, efficient, optics-friendly data types and effects";
@@ -74296,8 +74348,8 @@ self: {
7429674348 }:
7429774349 mkDerivation {
7429874350 pname = "extensible-effects-concurrent";
74299− version = "0.15.0";
74300− sha256 = "0hy1z2caqwyxqw1s3xxkbrzi3f86w3vzch783ajq41xqd6z8spdp";
74351+ version = "0.18.1";
74352+ sha256 = "14kx3ipwz51g2qvdmz97v4mckglh6hajw6yzbzllqysgljs243cl";
7430174353 isLibrary = true;
7430274354 isExecutable = true;
7430374355 libraryHaskellDepends = [
@@ -74355,22 +74407,6 @@ self: {
7435574407 }) {};
7435674408
7435774409 "extra" = callPackage
74358− ({ mkDerivation, base, clock, directory, filepath, process
74359− , QuickCheck, time, unix
74360− }:
74361− mkDerivation {
74362− pname = "extra";
74363− version = "1.6.13";
74364− sha256 = "0jc5g120ff97sayff10kqn66wz8aw2wymgwgh2livzkf7vqm5q50";
74365− libraryHaskellDepends = [
74366− base clock directory filepath process time unix
74367− ];
74368− testHaskellDepends = [ base directory filepath QuickCheck unix ];
74369− description = "Extra functions I use";
74370− license = stdenv.lib.licenses.bsd3;
74371− }) {};
74372−
74373− "extra_1_6_14" = callPackage
7437474410 ({ mkDerivation, base, clock, directory, filepath, process
7437574411 , QuickCheck, time, unix
7437674412 }:
@@ -74384,7 +74420,6 @@ self: {
7438474420 testHaskellDepends = [ base directory filepath QuickCheck unix ];
7438574421 description = "Extra functions I use";
7438674422 license = stdenv.lib.licenses.bsd3;
74387− hydraPlatforms = stdenv.lib.platforms.none;
7438874423 }) {};
7438974424
7439074425 "extract-dependencies" = callPackage
@@ -74726,6 +74761,8 @@ self: {
7472674761 pname = "fake";
7472774762 version = "0.1.1.1";
7472874763 sha256 = "0f6iqbyyrllry2q48by8qwaq0n9k7b5d00xgw5vvlr9zdvrpllgf";
74764+ revision = "1";
74765+ editedCabalFile = "1a1rsa8hpgpyw8m2bq9ns76n4dbr4iymjhxqkiif6b6xvg8zwld5";
7472974766 libraryHaskellDepends = [
7473074767 base containers generics-sop random text time
7473174768 ];
@@ -74953,6 +74990,24 @@ self: {
7495374990 license = stdenv.lib.licenses.bsd3;
7495474991 }) {};
7495574992
74993+ "fast-logger_2_4_12" = callPackage
74994+ ({ mkDerivation, array, auto-update, base, bytestring, directory
74995+ , easy-file, filepath, hspec, text, unix-compat, unix-time
74996+ }:
74997+ mkDerivation {
74998+ pname = "fast-logger";
74999+ version = "2.4.12";
75000+ sha256 = "1jl9kiiijjpilj4zka8ffb2sil31qmgysan2hkld6mhddlr6pjdy";
75001+ libraryHaskellDepends = [
75002+ array auto-update base bytestring directory easy-file filepath text
75003+ unix-compat unix-time
75004+ ];
75005+ testHaskellDepends = [ base bytestring directory hspec ];
75006+ description = "A fast logging system";
75007+ license = stdenv.lib.licenses.bsd3;
75008+ hydraPlatforms = stdenv.lib.platforms.none;
75009+ }) {};
75010+
7495675011 "fast-math" = callPackage
7495775012 ({ mkDerivation, base }:
7495875013 mkDerivation {
@@ -75719,8 +75774,8 @@ self: {
7571975774 ({ mkDerivation, base }:
7572075775 mkDerivation {
7572175776 pname = "fedora-dists";
75722− version = "1.0.0.1";
75723− sha256 = "0x5lccpwcf2cd97vnqlzyi4lgbyhqcs5ks1sr3l33h1zffpb0br8";
75777+ version = "1.0.0.2";
75778+ sha256 = "0jc7kv2zflxwfbidc4wm6wad8hpwfxw7w2ri1zghk3970dkl7lnl";
7572475779 libraryHaskellDepends = [ base ];
7572575780 description = "Library for Fedora distribution versions";
7572675781 license = stdenv.lib.licenses.gpl3;
@@ -76726,8 +76781,8 @@ self: {
7672676781 pname = "filepath-crypto";
7672776782 version = "0.1.0.0";
7672876783 sha256 = "1bj9haa4ignmk6c6gdiqb4rnwy395pwqdyfy4kgg0z16w0l39mw0";
76729− revision = "6";
76730− editedCabalFile = "0lg22k1f9l51a8bdnhkwq07mg0m3w3rhgavp1lxi3vmsszsmpmvc";
76784+ revision = "7";
76785+ editedCabalFile = "0dniq1rzv6qb75svf2ya32r0116pjh9jlgly7106x3gyziq2cwh3";
7673176786 libraryHaskellDepends = [
7673276787 base binary bytestring case-insensitive cryptoids cryptoids-class
7673376788 cryptoids-types exceptions filepath sandi template-haskell
@@ -81576,6 +81631,8 @@ self: {
8157681631 pname = "functor-infix";
8157781632 version = "0.0.5";
8157881633 sha256 = "0rifm1p5zq2711vak2lyxzz2xs03saym3m3695wpf3zy38safbpn";
81634+ revision = "1";
81635+ editedCabalFile = "0nvk9hff0vd3s7q67pb4my5vfz1y954y0l8vlbbmdx9i20r1m8nf";
8157981636 libraryHaskellDepends = [ base template-haskell ];
8158081637 description = "Infix operators for mapping over compositions of functors. Lots of them.";
8158181638 license = stdenv.lib.licenses.mit;
@@ -81597,8 +81654,8 @@ self: {
8159781654 ({ mkDerivation, base, ghc-prim, lens }:
8159881655 mkDerivation {
8159981656 pname = "functor-utils";
81600− version = "1.17.1";
81601− sha256 = "1ixssxdhw94l1kjxd5k4gvq8wz4b9d0vww5mg2al9q3vzb7d4pld";
81657+ version = "1.17.2";
81658+ sha256 = "1sf4d3af4kf341g7slpylm2113cy0597fngr5ldlds8znylspmms";
8160281659 libraryHaskellDepends = [ base ghc-prim lens ];
8160381660 description = "Collection of functor utilities, providing handy operators, like generalization of (.).";
8160481661 license = stdenv.lib.licenses.asl20;
@@ -85229,6 +85286,28 @@ self: {
8522985286 license = stdenv.lib.licenses.bsd3;
8523085287 }) {};
8523185288
85289+ "ghc-prof_1_4_1_5" = callPackage
85290+ ({ mkDerivation, attoparsec, base, containers, directory, filepath
85291+ , process, scientific, tasty, tasty-hunit, temporary, text, time
85292+ }:
85293+ mkDerivation {
85294+ pname = "ghc-prof";
85295+ version = "1.4.1.5";
85296+ sha256 = "0cpyzfyfkq6c17xpccgibjpq8j0l4w33mbpivim3kha7k76ilbg4";
85297+ isLibrary = true;
85298+ isExecutable = true;
85299+ libraryHaskellDepends = [
85300+ attoparsec base containers scientific text time
85301+ ];
85302+ testHaskellDepends = [
85303+ attoparsec base containers directory filepath process tasty
85304+ tasty-hunit temporary text
85305+ ];
85306+ description = "Library for parsing GHC time and allocation profiling reports";
85307+ license = stdenv.lib.licenses.bsd3;
85308+ hydraPlatforms = stdenv.lib.platforms.none;
85309+ }) {};
85310+
8523285311 "ghc-prof-aeson" = callPackage
8523385312 ({ mkDerivation, aeson, base, bytestring, hspec, text, vector }:
8523485313 mkDerivation {
@@ -86866,20 +86945,21 @@ self: {
8686686945
8686786946 "ginger" = callPackage
8686886947 ({ mkDerivation, aeson, aeson-pretty, base, bytestring
86869− , data-default, filepath, http-types, mtl, parsec, process, safe
86870− , scientific, tasty, tasty-hunit, tasty-quickcheck, text, time
86871− , transformers, unordered-containers, utf8-string, vector, yaml
86948+ , data-default, filepath, http-types, mtl, parsec, process
86949+ , regex-tdfa, safe, scientific, tasty, tasty-hunit
86950+ , tasty-quickcheck, text, time, transformers, unordered-containers
86951+ , utf8-string, vector, yaml
8687286952 }:
8687386953 mkDerivation {
8687486954 pname = "ginger";
86875− version = "0.8.2.0";
86876− sha256 = "06k2imp511v4xxlzqgii14hf0ncnc6wci3hm7w48z332c5nk24m1";
86955+ version = "0.8.4.0";
86956+ sha256 = "0mk0jmw0qvbv73n7g8n14shnyxjkkq6wp3vnk1gx1dnmbk20vdm7";
8687786957 isLibrary = true;
8687886958 isExecutable = true;
8687986959 enableSeparateDataOutput = true;
8688086960 libraryHaskellDepends = [
8688186961 aeson aeson-pretty base bytestring data-default filepath http-types
86882− mtl parsec safe scientific text time transformers
86962+ mtl parsec regex-tdfa safe scientific text time transformers
8688386963 unordered-containers utf8-string vector
8688486964 ];
8688586965 executableHaskellDepends = [
@@ -91004,21 +91084,6 @@ self: {
9100491084 }) {};
9100591085
9100691086 "google-oauth2-jwt" = callPackage
91007− ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL
91008− , RSA, text, unix-time
91009− }:
91010− mkDerivation {
91011− pname = "google-oauth2-jwt";
91012− version = "0.3.0";
91013− sha256 = "1mi7mdkq2d7n3pxlspc5zgval7wb2q7sn261k704nwrbm0phzzbj";
91014− libraryHaskellDepends = [
91015− base base64-bytestring bytestring HsOpenSSL RSA text unix-time
91016− ];
91017− description = "Get a signed JWT for Google Service Accounts";
91018− license = stdenv.lib.licenses.bsd3;
91019− }) {};
91020−
91021− "google-oauth2-jwt_0_3_1" = callPackage
9102291087 ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL
9102391088 , RSA, text, unix-time
9102491089 }:
@@ -91031,7 +91096,6 @@ self: {
9103191096 ];
9103291097 description = "Get a signed JWT for Google Service Accounts";
9103391098 license = stdenv.lib.licenses.bsd3;
91034− hydraPlatforms = stdenv.lib.platforms.none;
9103591099 }) {};
9103691100
9103791101 "google-search" = callPackage
@@ -91056,8 +91120,8 @@ self: {
9105691120 }:
9105791121 mkDerivation {
9105891122 pname = "google-server-api";
91059− version = "0.2.0.1";
91060− sha256 = "0d07flz3vpdyq4ifldp466zhj19ll7zlcnwn0ns47d72r79wghiw";
91123+ version = "0.3.0.0";
91124+ sha256 = "1zrgflz6pav8ygjjisjm35w7a232116f90s0pd8jqf46an2bm8i2";
9106191125 libraryHaskellDepends = [
9106291126 aeson aeson-casing base base64-bytestring bytestring HsOpenSSL
9106391127 http-api-data http-client http-client-tls mime-mail monad-control
@@ -91999,22 +92063,6 @@ self: {
9199992063 }) {};
9200092064
9200192065 "graph-wrapper" = callPackage
92002− ({ mkDerivation, array, base, containers, deepseq, hspec
92003− , QuickCheck
92004− }:
92005− mkDerivation {
92006− pname = "graph-wrapper";
92007− version = "0.2.5.1";
92008− sha256 = "04z1qbsf1c31r0mhn8bgr8hisffxacq3j61y4fym28idr8zqaqc3";
92009− libraryHaskellDepends = [ array base containers ];
92010− testHaskellDepends = [
92011− array base containers deepseq hspec QuickCheck
92012− ];
92013− description = "A wrapper around the standard Data.Graph with a less awkward interface";
92014− license = stdenv.lib.licenses.bsd3;
92015− }) {};
92016−
92017− "graph-wrapper_0_2_5_2" = callPackage
9201892066 ({ mkDerivation, array, base, containers, deepseq, hspec
9201992067 , QuickCheck
9202092068 }:
@@ -92028,7 +92076,6 @@ self: {
9202892076 ];
9202992077 description = "A wrapper around the standard Data.Graph with a less awkward interface";
9203092078 license = stdenv.lib.licenses.bsd3;
92031− hydraPlatforms = stdenv.lib.platforms.none;
9203292079 }) {};
9203392080
9203492081 "graphbuilder" = callPackage
@@ -92816,6 +92863,26 @@ self: {
9281692863 hydraPlatforms = stdenv.lib.platforms.none;
9281792864 }) {};
9281892865
92866+ "groundhog_0_10_0" = callPackage
92867+ ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
92868+ , blaze-builder, bytestring, containers, monad-control, mtl
92869+ , resourcet, safe-exceptions, scientific, text, time, transformers
92870+ , transformers-base, transformers-compat
92871+ }:
92872+ mkDerivation {
92873+ pname = "groundhog";
92874+ version = "0.10.0";
92875+ sha256 = "1wckm2qrgmv1ccavwvq8ji3pfb4y197s1n1adv8hz9bqk246byrq";
92876+ libraryHaskellDepends = [
92877+ aeson attoparsec base base64-bytestring blaze-builder bytestring
92878+ containers monad-control mtl resourcet safe-exceptions scientific
92879+ text time transformers transformers-base transformers-compat
92880+ ];
92881+ description = "Type-safe datatype-database mapping library";
92882+ license = stdenv.lib.licenses.bsd3;
92883+ hydraPlatforms = stdenv.lib.platforms.none;
92884+ }) {};
92885+
9281992886 "groundhog-converters" = callPackage
9282092887 ({ mkDerivation, aeson, base, bimap, bytestring, containers
9282192888 , groundhog, groundhog-sqlite, groundhog-th, tasty, tasty-hunit
@@ -92861,6 +92928,30 @@ self: {
9286192928 hydraPlatforms = stdenv.lib.platforms.none;
9286292929 }) {};
9286392930
92931+ "groundhog-inspector_0_10_0" = callPackage
92932+ ({ mkDerivation, aeson-pretty, base, bytestring, cmdargs
92933+ , containers, groundhog, groundhog-sqlite, groundhog-th, mtl
92934+ , regex-compat, syb, template-haskell, text, time, transformers
92935+ }:
92936+ mkDerivation {
92937+ pname = "groundhog-inspector";
92938+ version = "0.10.0";
92939+ sha256 = "1l4smiydqqgpfqcyq77d2g0cvglanqfhlhx3y1k9n3kx94yss5a2";
92940+ isLibrary = true;
92941+ isExecutable = true;
92942+ libraryHaskellDepends = [
92943+ aeson-pretty base bytestring containers groundhog groundhog-th
92944+ regex-compat syb template-haskell text time transformers
92945+ ];
92946+ executableHaskellDepends = [
92947+ base bytestring cmdargs containers groundhog groundhog-sqlite
92948+ groundhog-th mtl
92949+ ];
92950+ description = "Type-safe datatype-database mapping library";
92951+ license = stdenv.lib.licenses.bsd3;
92952+ hydraPlatforms = stdenv.lib.platforms.none;
92953+ }) {};
92954+
9286492955 "groundhog-mysql" = callPackage
9286592956 ({ mkDerivation, base, bytestring, containers, groundhog
9286692957 , monad-control, monad-logger, mysql, mysql-simple, resource-pool
@@ -92879,6 +92970,24 @@ self: {
9287992970 hydraPlatforms = stdenv.lib.platforms.none;
9288092971 }) {};
9288192972
92973+ "groundhog-mysql_0_10" = callPackage
92974+ ({ mkDerivation, base, bytestring, containers, groundhog
92975+ , monad-control, monad-logger, mysql, mysql-simple, resource-pool
92976+ , resourcet, text, time, transformers
92977+ }:
92978+ mkDerivation {
92979+ pname = "groundhog-mysql";
92980+ version = "0.10";
92981+ sha256 = "1idyisl0dbij4ffd0bn1bm681az87wc30qnkn1vmr0cd0xb6mwnx";
92982+ libraryHaskellDepends = [
92983+ base bytestring containers groundhog monad-control monad-logger
92984+ mysql mysql-simple resource-pool resourcet text time transformers
92985+ ];
92986+ description = "MySQL backend for the groundhog library";
92987+ license = stdenv.lib.licenses.bsd3;
92988+ hydraPlatforms = stdenv.lib.platforms.none;
92989+ }) {};
92990+
9288292991 "groundhog-postgresql" = callPackage
9288392992 ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
9288492993 , containers, groundhog, monad-control, postgresql-libpq
@@ -92899,6 +93008,26 @@ self: {
9289993008 hydraPlatforms = stdenv.lib.platforms.none;
9290093009 }) {};
9290193010
93011+ "groundhog-postgresql_0_10" = callPackage
93012+ ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
93013+ , containers, groundhog, monad-control, postgresql-libpq
93014+ , postgresql-simple, resource-pool, resourcet, text, time
93015+ , transformers, vector
93016+ }:
93017+ mkDerivation {
93018+ pname = "groundhog-postgresql";
93019+ version = "0.10";
93020+ sha256 = "1digvi8ra58r122i030h0b089sbyzaclir1cg4iqaflbzrnz45l9";
93021+ libraryHaskellDepends = [
93022+ aeson attoparsec base blaze-builder bytestring containers groundhog
93023+ monad-control postgresql-libpq postgresql-simple resource-pool
93024+ resourcet text time transformers vector
93025+ ];
93026+ description = "PostgreSQL backend for the groundhog library";
93027+ license = stdenv.lib.licenses.bsd3;
93028+ hydraPlatforms = stdenv.lib.platforms.none;
93029+ }) {};
93030+
9290293031 "groundhog-sqlite" = callPackage
9290393032 ({ mkDerivation, base, bytestring, containers, direct-sqlite
9290493033 , groundhog, monad-control, resource-pool, resourcet, text
@@ -92917,6 +93046,24 @@ self: {
9291793046 hydraPlatforms = stdenv.lib.platforms.none;
9291893047 }) {};
9291993048
93049+ "groundhog-sqlite_0_10_0" = callPackage
93050+ ({ mkDerivation, base, bytestring, containers, direct-sqlite
93051+ , groundhog, monad-control, resource-pool, resourcet, text
93052+ , transformers, unordered-containers
93053+ }:
93054+ mkDerivation {
93055+ pname = "groundhog-sqlite";
93056+ version = "0.10.0";
93057+ sha256 = "1z6yss15aw0a14i0nj0flb0h2641sjr70mhasp718qmc4iwkgw7x";
93058+ libraryHaskellDepends = [
93059+ base bytestring containers direct-sqlite groundhog monad-control
93060+ resource-pool resourcet text transformers unordered-containers
93061+ ];
93062+ description = "Sqlite3 backend for the groundhog library";
93063+ license = stdenv.lib.licenses.bsd3;
93064+ hydraPlatforms = stdenv.lib.platforms.none;
93065+ }) {};
93066+
9292093067 "groundhog-th" = callPackage
9292193068 ({ mkDerivation, aeson, base, bytestring, containers, groundhog
9292293069 , template-haskell, text, time, unordered-containers, yaml
@@ -92934,6 +93081,23 @@ self: {
9293493081 hydraPlatforms = stdenv.lib.platforms.none;
9293593082 }) {};
9293693083
93084+ "groundhog-th_0_10" = callPackage
93085+ ({ mkDerivation, aeson, base, bytestring, containers, groundhog
93086+ , template-haskell, text, time, unordered-containers, yaml
93087+ }:
93088+ mkDerivation {
93089+ pname = "groundhog-th";
93090+ version = "0.10";
93091+ sha256 = "1bshffmv8x0yqd9d7m3s3abnhnz1g4ny3va5mkzsvy1snzxj7xlb";
93092+ libraryHaskellDepends = [
93093+ aeson base bytestring containers groundhog template-haskell text
93094+ time unordered-containers yaml
93095+ ];
93096+ description = "Type-safe datatype-database mapping library";
93097+ license = stdenv.lib.licenses.bsd3;
93098+ hydraPlatforms = stdenv.lib.platforms.none;
93099+ }) {};
93100+
9293793101 "group-by-date" = callPackage
9293893102 ({ mkDerivation, base, explicit-exception, filemanip, hsshellscript
9293993103 , pathtype, time, transformers, unix-compat, utility-ht
@@ -96403,6 +96567,26 @@ self: {
9640396567 license = stdenv.lib.licenses.publicDomain;
9640496568 }) {};
9640596569
96570+ "hakyll-images" = callPackage
96571+ ({ mkDerivation, base, bytestring, hakyll, HUnit-approx
96572+ , JuicyPixels, JuicyPixels-extra, tasty, tasty-hunit
96573+ }:
96574+ mkDerivation {
96575+ pname = "hakyll-images";
96576+ version = "0.1.0";
96577+ sha256 = "1l135gmlm2ydqj3d27gfarykcg6k1g204cysm3bk163f499b8w50";
96578+ enableSeparateDataOutput = true;
96579+ libraryHaskellDepends = [
96580+ base bytestring hakyll JuicyPixels JuicyPixels-extra
96581+ ];
96582+ testHaskellDepends = [
96583+ base bytestring hakyll HUnit-approx JuicyPixels JuicyPixels-extra
96584+ tasty tasty-hunit
96585+ ];
96586+ description = "Hakyll utilities to work with images";
96587+ license = stdenv.lib.licenses.bsd3;
96588+ }) {};
96589+
9640696590 "hakyll-ogmarkup" = callPackage
9640796591 ({ mkDerivation, base, hakyll, ogmarkup }:
9640896592 mkDerivation {
@@ -98187,26 +98371,6 @@ self: {
9818798371 }) {};
9818898372
9818998373 "hasbolt" = callPackage
98190− ({ mkDerivation, base, binary, bytestring, connection, containers
98191− , data-binary-ieee754, data-default, hex, hspec, network
98192− , QuickCheck, text, transformers
98193− }:
98194− mkDerivation {
98195− pname = "hasbolt";
98196− version = "0.1.3.1";
98197− sha256 = "0d6prk5fav5l0d4j0ndinn3szimy02dmayx997z5yg6yb5ix3lai";
98198− libraryHaskellDepends = [
98199− base binary bytestring connection containers data-binary-ieee754
98200− data-default network text transformers
98201− ];
98202− testHaskellDepends = [
98203− base bytestring containers hex hspec QuickCheck text
98204− ];
98205− description = "Haskell driver for Neo4j 3+ (BOLT protocol)";
98206− license = stdenv.lib.licenses.bsd3;
98207− }) {};
98208−
98209− "hasbolt_0_1_3_2" = callPackage
9821098374 ({ mkDerivation, base, binary, bytestring, connection, containers
9821198375 , data-binary-ieee754, data-default, hex, hspec, network
9821298376 , QuickCheck, text, transformers
@@ -98224,7 +98388,6 @@ self: {
9822498388 ];
9822598389 description = "Haskell driver for Neo4j 3+ (BOLT protocol)";
9822698390 license = stdenv.lib.licenses.bsd3;
98227− hydraPlatforms = stdenv.lib.platforms.none;
9822898391 }) {};
9822998392
9823098393 "hasbolt-extras" = callPackage
@@ -98888,8 +99051,8 @@ self: {
9888899051 }:
9888999052 mkDerivation {
9889099053 pname = "haskdogs";
98891− version = "0.5.3";
98892− sha256 = "1n3vwrm99h4kzcimav18dkbvkpkhspwdf5gz8da1sr4g0m4kg96n";
99054+ version = "0.5.4";
99055+ sha256 = "1f35np3a99y3aifqgp24c5wdjr5nvvs3jj6g71v39355sjj1hsqq";
9889399056 isLibrary = false;
9889499057 isExecutable = true;
9889599058 executableHaskellDepends = [
@@ -99255,8 +99418,8 @@ self: {
9925599418 }:
9925699419 mkDerivation {
9925799420 pname = "haskell-dap";
99258− version = "0.0.9.0";
99259− sha256 = "1flsz93wbhd61yfydbfbb3q8brhh0d0gzfsdd3xscwvcbdzgw9qr";
99421+ version = "0.0.10.0";
99422+ sha256 = "1d2jma4gly0bh1a114a7pm6xq13y5py3p1hkkn24755mi4b0ykqa";
9926099423 isLibrary = true;
9926199424 isExecutable = true;
9926299425 libraryHaskellDepends = [ base ];
@@ -99830,8 +99993,8 @@ self: {
9983099993 }:
9983199994 mkDerivation {
9983299995 pname = "haskell-names";
99833− version = "0.9.5";
99834− sha256 = "0j1snakldb29v8786licz4k2b92pbdbxhxgyz22rvjypdxyhaa7h";
99996+ version = "0.9.6";
99997+ sha256 = "06g1h1dvsh31hm18v3hkx2s4bcrv2h49kgc2x9k1xk6532a9503w";
9983599998 enableSeparateDataOutput = true;
9983699999 libraryHaskellDepends = [
99837100000 aeson base bytestring containers data-lens-light filepath
@@ -101668,8 +101831,8 @@ self: {
101668101831 }:
101669101832 mkDerivation {
101670101833 pname = "haskoin-store";
101671− version = "0.9.1";
101672− sha256 = "099fng9wy9qhcxn14m1mlpq004bl51xas3rk6jkspqv32d4rr6zs";
101834+ version = "0.9.2";
101835+ sha256 = "1p4za0b6n7ldz7jnq25n9f7wmngxy8ic0vy1kppb7wka0a96sdh1";
101673101836 isLibrary = true;
101674101837 isExecutable = true;
101675101838 libraryHaskellDepends = [
@@ -105329,8 +105492,8 @@ self: {
105329105492 ({ mkDerivation, base, doctest, time }:
105330105493 mkDerivation {
105331105494 pname = "herf-time";
105332− version = "0.2.2";
105333− sha256 = "13nn46l5mf555rab3fwl38g4fznjh3n07754l671vqcr8c5zfm4m";
105495+ version = "0.3.0";
105496+ sha256 = "00ar1kb29gjvna7rcdg6wj3f22dil2pzbzy8zblvyc452zjy03y2";
105334105497 libraryHaskellDepends = [ base time ];
105335105498 testHaskellDepends = [ base doctest ];
105336105499 description = "haskell time manipulation in a 'kerf like' style";
@@ -107529,8 +107692,8 @@ self: {
107529107692 }:
107530107693 mkDerivation {
107531107694 pname = "hinterface";
107532− version = "0.8.0";
107533− sha256 = "1mzq87sdcx50i67kf2lv5wg0k6ahxf1x2qxvi41dnaxkjjl1vcmr";
107695+ version = "0.8.1";
107696+ sha256 = "1qpdapvxy03jqrvn4p45pi2zhiy888k8acysb0fqzi3f8mypqm1c";
107534107697 libraryHaskellDepends = [
107535107698 array async base binary bytestring containers cryptonite deepseq
107536107699 exceptions lifted-async lifted-base memory monad-control
@@ -110802,17 +110965,15 @@ self: {
110802110965 }:
110803110966 mkDerivation {
110804110967 pname = "hosc";
110805− version = "0.16";
110806− sha256 = "1xj5kkpkzzwfi26n28s0gkr9vzkmvp276n9jb75j2ccbr8q79vbj";
110807− revision = "1";
110808− editedCabalFile = "0n9ra6qhy5wighwa3zn5496473kdarhdgzsvmhnlp14s6sgw8akb";
110968+ version = "0.17";
110969+ sha256 = "0340lldzim02ixj4n0smfwn20y5i0z7v0gqgbb0mdjs6c90rqhv6";
110809110970 enableSeparateDataOutput = true;
110810110971 libraryHaskellDepends = [
110811110972 base binary blaze-builder bytestring data-binary-ieee754 network
110812110973 time transformers
110813110974 ];
110814110975 description = "Haskell Open Sound Control";
110815− license = "GPL";
110976+ license = stdenv.lib.licenses.gpl3;
110816110977 }) {};
110817110978
110818110979 "hosc-json" = callPackage
@@ -113116,21 +113277,21 @@ self: {
113116113277
113117113278 "hsc3" = callPackage
113118113279 ({ mkDerivation, array, base, binary, bytestring, containers
113119− , data-default, data-ordlist, directory, filepath, hashable, hosc
113120− , network, process, random, safe, split, transformers, vector
113280+ , data-ordlist, directory, filepath, hosc, murmur-hash, network
113281+ , process, random, safe, split, transformers, vector
113121113282 }:
113122113283 mkDerivation {
113123113284 pname = "hsc3";
113124− version = "0.16";
113125− sha256 = "0m6pas8dx48mx91159s7p7fljnivs13cg34gys906nhq11dmjdqn";
113285+ version = "0.17";
113286+ sha256 = "1k7gm0qk96rm7rphmmwlqh99kn5v79g8szyyhb9cqg3rfv6as1ld";
113126113287 enableSeparateDataOutput = true;
113127113288 libraryHaskellDepends = [
113128− array base binary bytestring containers data-default data-ordlist
113129− directory filepath hashable hosc network process random safe split
113289+ array base binary bytestring containers data-ordlist directory
113290+ filepath hosc murmur-hash network process random safe split
113130113291 transformers vector
113131113292 ];
113132113293 description = "Haskell SuperCollider";
113133− license = "GPL";
113294+ license = stdenv.lib.licenses.gpl3;
113134113295 }) {};
113135113296
113136113297 "hsc3-auditor" = callPackage
@@ -118287,8 +118448,8 @@ self: {
118287118448 }:
118288118449 mkDerivation {
118289118450 pname = "htvm";
118290− version = "0.1.0.0";
118291− sha256 = "0bf3dqyqrdi9mw72kp6hid4p6jk3gs5vw5fd1ycjgid218na7qmm";
118451+ version = "0.1.2";
118452+ sha256 = "0ggb6g6cdx6qzvda4l2z9danq5pkwncf3p2cyb68bwghs988fgxs";
118292118453 libraryHaskellDepends = [
118293118454 array base bytestring containers deriving-compat directory Earley
118294118455 filepath mtl pretty-show process recursion-schemes temporary text
@@ -118301,7 +118462,7 @@ self: {
118301118462 tasty tasty-hunit tasty-quickcheck temporary text
118302118463 ];
118303118464 testSystemDepends = [ tvm_runtime ];
118304− description = "TVM bindings";
118465+ description = "Bindings for TVM machine learning framework";
118305118466 license = stdenv.lib.licenses.gpl3;
118306118467 }) {tvm_runtime = null;};
118307118468
@@ -119225,20 +119386,20 @@ self: {
119225119386 license = stdenv.lib.licenses.bsd3;
119226119387 }) {};
119227119388
119228− "hw-ip_1_0_0_0" = callPackage
119229− ({ mkDerivation, appar, attoparsec, base, generic-lens, hedgehog
119389+ "hw-ip_2_0_0_0" = callPackage
119390+ ({ mkDerivation, appar, base, containers, generic-lens, hedgehog
119230119391 , hspec, hw-bits, hw-hspec-hedgehog, iproute, text
119231119392 }:
119232119393 mkDerivation {
119233119394 pname = "hw-ip";
119234− version = "1.0.0.0";
119235− sha256 = "0di0r4dq1fzmb1cgmks54wqamx9jsjgnv4qjs3s8kwszz19plpfw";
119395+ version = "2.0.0.0";
119396+ sha256 = "04hb06rbkipm21fji9n5v56wm2jvdnr7w42ndp9x2hyp3m1i9sm0";
119236119397 libraryHaskellDepends = [
119237− appar attoparsec base generic-lens hw-bits iproute text
119398+ appar base containers generic-lens hw-bits iproute text
119238119399 ];
119239119400 testHaskellDepends = [
119240− attoparsec base generic-lens hedgehog hspec hw-bits
119241− hw-hspec-hedgehog text
119401+ appar base generic-lens hedgehog hspec hw-bits hw-hspec-hedgehog
119402+ text
119242119403 ];
119243119404 description = "Library for manipulating IP addresses and CIDR blocks";
119244119405 license = stdenv.lib.licenses.bsd3;
@@ -122007,19 +122168,6 @@ self: {
122007122168 }) {};
122008122169
122009122170 "ihs" = callPackage
122010− ({ mkDerivation, base, process }:
122011− mkDerivation {
122012− pname = "ihs";
122013− version = "0.1.0.2";
122014− sha256 = "0cprv8g7kz07s5954020ac9yfggf3d2wmwp4xa61q4sz5rs7wiwq";
122015− isLibrary = false;
122016− isExecutable = true;
122017− executableHaskellDepends = [ base process ];
122018− description = "Interpolated Haskell";
122019− license = stdenv.lib.licenses.publicDomain;
122020− }) {};
122021−
122022− "ihs_0_1_0_3" = callPackage
122023122171 ({ mkDerivation, base, process }:
122024122172 mkDerivation {
122025122173 pname = "ihs";
@@ -122030,7 +122178,6 @@ self: {
122030122178 executableHaskellDepends = [ base process ];
122031122179 description = "Interpolated Haskell";
122032122180 license = stdenv.lib.licenses.publicDomain;
122033− hydraPlatforms = stdenv.lib.platforms.none;
122034122181 }) {};
122035122182
122036122183 "ihttp" = callPackage
@@ -122595,8 +122742,8 @@ self: {
122595122742 ({ mkDerivation, base, lens }:
122596122743 mkDerivation {
122597122744 pname = "impossible";
122598− version = "1.1.3";
122599− sha256 = "01p9s6nzzlmgg1gr42ys6wkxnzp1jqs3ay8jz5lbm1nkbjlabs4n";
122745+ version = "1.1.4";
122746+ sha256 = "0557f8a9aaslkhpyp7b6zidg88a3472ya31rp8amqf71393nvkqp";
122600122747 libraryHaskellDepends = [ base lens ];
122601122748 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.";
122602122749 license = stdenv.lib.licenses.asl20;
@@ -123487,6 +123634,32 @@ self: {
123487123634 license = stdenv.lib.licenses.mit;
123488123635 }) {};
123489123636
123637+ "inline-c_0_7_0_1" = callPackage
123638+ ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
123639+ , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq
123640+ , regex-posix, template-haskell, transformers, unordered-containers
123641+ , vector
123642+ }:
123643+ mkDerivation {
123644+ pname = "inline-c";
123645+ version = "0.7.0.1";
123646+ sha256 = "19scbviwiv1fbsdcjji3dscjg7w0xa8r97xwkqqrwm7zhvrg5wns";
123647+ isLibrary = true;
123648+ isExecutable = true;
123649+ libraryHaskellDepends = [
123650+ ansi-wl-pprint base bytestring containers hashable mtl parsec
123651+ parsers template-haskell transformers unordered-containers vector
123652+ ];
123653+ testHaskellDepends = [
123654+ ansi-wl-pprint base containers hashable hspec parsers QuickCheck
123655+ raw-strings-qq regex-posix template-haskell transformers
123656+ unordered-containers vector
123657+ ];
123658+ description = "Write Haskell source files including C code inline. No FFI required.";
123659+ license = stdenv.lib.licenses.mit;
123660+ hydraPlatforms = stdenv.lib.platforms.none;
123661+ }) {};
123662+
123490123663 "inline-c-cpp_0_1_0_0" = callPackage
123491123664 ({ mkDerivation, base, inline-c, template-haskell }:
123492123665 mkDerivation {
@@ -123562,6 +123735,8 @@ self: {
123562123735 pname = "inline-r";
123563123736 version = "0.9.2";
123564123737 sha256 = "1h2gwrh8kzx3przx29gcl4wffni3bxy1yrfabf88bdxjwj79s7z0";
123738+ revision = "1";
123739+ editedCabalFile = "01cxsjdxy5brdnw966928bcdivc8ab7kq91vdqkg2q801jf5jj9g";
123565123740 libraryHaskellDepends = [
123566123741 aeson base bytestring containers data-default-class deepseq
123567123742 exceptions inline-c mtl pretty primitive process reflection setenv
@@ -124278,6 +124453,27 @@ self: {
124278124453 license = stdenv.lib.licenses.bsd3;
124279124454 }) {};
124280124455
124456+ "interpolator" = callPackage
124457+ ({ mkDerivation, aeson, base, containers, either, hspec
124458+ , mono-traversable, mtl, product-profunctors, profunctors
124459+ , QuickCheck, template-haskell, text
124460+ }:
124461+ mkDerivation {
124462+ pname = "interpolator";
124463+ version = "0.1";
124464+ sha256 = "049zx47z071n8k83xc7fwqqd397pg0g7misrggj4w27gxvdlvr7r";
124465+ libraryHaskellDepends = [
124466+ aeson base containers either mono-traversable mtl
124467+ product-profunctors profunctors QuickCheck template-haskell text
124468+ ];
124469+ testHaskellDepends = [
124470+ aeson base containers either hspec mono-traversable mtl
124471+ product-profunctors profunctors QuickCheck template-haskell text
124472+ ];
124473+ description = "Runtime interpolation of environment variables in records using profunctors";
124474+ license = stdenv.lib.licenses.mit;
124475+ }) {};
124476+
124281124477 "interprocess" = callPackage
124282124478 ({ mkDerivation, base, typed-process }:
124283124479 mkDerivation {
@@ -124647,25 +124843,6 @@ self: {
124647124843 }) {};
124648124844
124649124845 "io-choice" = callPackage
124650− ({ mkDerivation, base, hspec, lifted-base, monad-control
124651− , template-haskell, transformers, transformers-base
124652− }:
124653− mkDerivation {
124654− pname = "io-choice";
124655− version = "0.0.6";
124656− sha256 = "1vqw5v1b9mrkhhszxp1rg8gl1d53akdlzwh40w01b1ni208jhav1";
124657− libraryHaskellDepends = [
124658− base lifted-base monad-control template-haskell transformers
124659− transformers-base
124660− ];
124661− testHaskellDepends = [
124662− base hspec lifted-base monad-control transformers
124663− ];
124664− description = "Choice for IO and lifted IO";
124665− license = stdenv.lib.licenses.bsd3;
124666− }) {};
124667−
124668− "io-choice_0_0_7" = callPackage
124669124846 ({ mkDerivation, base, hspec, lifted-base, monad-control
124670124847 , template-haskell, transformers, transformers-base
124671124848 }:
@@ -124682,7 +124859,6 @@ self: {
124682124859 ];
124683124860 description = "Choice for IO and lifted IO";
124684124861 license = stdenv.lib.licenses.bsd3;
124685− hydraPlatforms = stdenv.lib.platforms.none;
124686124862 }) {};
124687124863
124688124864 "io-machine" = callPackage
@@ -125118,25 +125294,6 @@ self: {
125118125294 }) {};
125119125295
125120125296 "iproute" = callPackage
125121− ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec
125122− , network, QuickCheck, safe
125123− }:
125124− mkDerivation {
125125− pname = "iproute";
125126− version = "1.7.6";
125127− sha256 = "1svczhzy126w7pa5vyfg90xrvi2ym34f47nj4hhcpx13dv06g5wi";
125128− libraryHaskellDepends = [
125129− appar base byteorder containers network
125130− ];
125131− testHaskellDepends = [
125132− appar base byteorder containers doctest hspec network QuickCheck
125133− safe
125134− ];
125135− description = "IP Routing Table";
125136− license = stdenv.lib.licenses.bsd3;
125137− }) {};
125138−
125139− "iproute_1_7_7" = callPackage
125140125297 ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec
125141125298 , network, QuickCheck, safe
125142125299 }:
@@ -125153,7 +125310,6 @@ self: {
125153125310 ];
125154125311 description = "IP Routing Table";
125155125312 license = stdenv.lib.licenses.bsd3;
125156− hydraPlatforms = stdenv.lib.platforms.none;
125157125313 }) {};
125158125314
125159125315 "iptables-helpers" = callPackage
@@ -127339,6 +127495,41 @@ self: {
127339127495 license = stdenv.lib.licenses.asl20;
127340127496 }) {};
127341127497
127498+ "jose_0_8_0_0" = callPackage
127499+ ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
127500+ , bytestring, concise, containers, cryptonite, hspec, lens, memory
127501+ , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances
127502+ , safe, semigroups, tasty, tasty-hspec, tasty-quickcheck
127503+ , template-haskell, text, time, unix, unordered-containers, vector
127504+ , x509
127505+ }:
127506+ mkDerivation {
127507+ pname = "jose";
127508+ version = "0.8.0.0";
127509+ sha256 = "027698xq5l8in420x3sc5zqwp16i1jzjcy8rlh546j8acxcvrqc4";
127510+ isLibrary = true;
127511+ isExecutable = true;
127512+ libraryHaskellDepends = [
127513+ aeson attoparsec base base64-bytestring bytestring concise
127514+ containers cryptonite lens memory monad-time mtl network-uri
127515+ QuickCheck quickcheck-instances safe semigroups template-haskell
127516+ text time unordered-containers vector x509
127517+ ];
127518+ executableHaskellDepends = [
127519+ aeson base bytestring lens mtl semigroups text unix
127520+ ];
127521+ testHaskellDepends = [
127522+ aeson attoparsec base base64-bytestring bytestring concise
127523+ containers cryptonite hspec lens memory monad-time mtl network-uri
127524+ QuickCheck quickcheck-instances safe semigroups tasty tasty-hspec
127525+ tasty-quickcheck template-haskell text time unordered-containers
127526+ vector x509
127527+ ];
127528+ description = "Javascript Object Signing and Encryption and JSON Web Token library";
127529+ license = stdenv.lib.licenses.asl20;
127530+ hydraPlatforms = stdenv.lib.platforms.none;
127531+ }) {};
127532+
127342127533 "jose-jwt" = callPackage
127343127534 ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal
127344127535 , containers, criterion, cryptonite, doctest, either, hspec, HUnit
@@ -127662,6 +127853,22 @@ self: {
127662127853 license = stdenv.lib.licenses.bsd3;
127663127854 }) {};
127664127855
127856+ "json_0_9_3" = callPackage
127857+ ({ mkDerivation, array, base, bytestring, containers, mtl, parsec
127858+ , pretty, syb, text
127859+ }:
127860+ mkDerivation {
127861+ pname = "json";
127862+ version = "0.9.3";
127863+ sha256 = "1z8s3mfg76p2flqqd2wqsi96l5bg8k8w8m58zlv81pw3k7h1vbwb";
127864+ libraryHaskellDepends = [
127865+ array base bytestring containers mtl parsec pretty syb text
127866+ ];
127867+ description = "Support for serialising Haskell to and from JSON";
127868+ license = stdenv.lib.licenses.bsd3;
127869+ hydraPlatforms = stdenv.lib.platforms.none;
127870+ }) {};
127871+
127665127872 "json-alt" = callPackage
127666127873 ({ mkDerivation, aeson, base }:
127667127874 mkDerivation {
@@ -128627,6 +128834,22 @@ self: {
128627128834 hydraPlatforms = stdenv.lib.platforms.none;
128628128835 }) {Judy = null;};
128629128836
128837+ "juicy-draw" = callPackage
128838+ ({ mkDerivation, base, JuicyPixels, numeric-extras, primitive }:
128839+ mkDerivation {
128840+ pname = "juicy-draw";
128841+ version = "0.2.0.0";
128842+ sha256 = "0fi4kwcb8mqnzi3cx2gzpls6nyc8vxnhjfgrb7zf04bpcsph7rgr";
128843+ isLibrary = true;
128844+ isExecutable = true;
128845+ libraryHaskellDepends = [
128846+ base JuicyPixels numeric-extras primitive
128847+ ];
128848+ executableHaskellDepends = [ base JuicyPixels ];
128849+ description = "Draw and fill lines, rectangles and polygons";
128850+ license = stdenv.lib.licenses.mit;
128851+ }) {};
128852+
128630128853 "juicy-gcode" = callPackage
128631128854 ({ mkDerivation, base, configurator, lens, linear, matrix
128632128855 , optparse-applicative, svg-tree, text
@@ -130249,8 +130472,8 @@ self: {
130249130472 }:
130250130473 mkDerivation {
130251130474 pname = "keystore";
130252− version = "0.8.1.0";
130253− sha256 = "11dfxm7wxn1l82cr30gn2xw45ma7apssfgrgz95wrzm5k0kq331v";
130475+ version = "0.8.1.1";
130476+ sha256 = "013cvfp8cfj90lj4n41g8wwrv6xj3iql4m3zzawmpxzkqwmflsqy";
130254130477 isLibrary = true;
130255130478 isExecutable = true;
130256130479 enableSeparateDataOutput = true;
@@ -131509,6 +131732,32 @@ self: {
131509131732 hydraPlatforms = stdenv.lib.platforms.none;
131510131733 }) {};
131511131734
131735+ "lambdabot-xmpp" = callPackage
131736+ ({ mkDerivation, base, data-default, lambdabot-core
131737+ , lambdabot-haskell-plugins, lambdabot-irc-plugins
131738+ , lambdabot-misc-plugins, lambdabot-novelty-plugins
131739+ , lambdabot-reference-plugins, lambdabot-social-plugins
131740+ , lifted-base, mtl, network, pontarius-xmpp, split, text, tls
131741+ , x509-validation, xml-types
131742+ }:
131743+ mkDerivation {
131744+ pname = "lambdabot-xmpp";
131745+ version = "0.1.0.0";
131746+ sha256 = "1bn8gd2gxl44xqffiy8skh714hkvfv2d318v1qg9k52pp53al2ny";
131747+ isLibrary = false;
131748+ isExecutable = true;
131749+ executableHaskellDepends = [
131750+ base data-default lambdabot-core lambdabot-haskell-plugins
131751+ lambdabot-irc-plugins lambdabot-misc-plugins
131752+ lambdabot-novelty-plugins lambdabot-reference-plugins
131753+ lambdabot-social-plugins lifted-base mtl network pontarius-xmpp
131754+ split text tls x509-validation xml-types
131755+ ];
131756+ description = "Lambdabot plugin for XMPP (Jabber) protocol";
131757+ license = "unknown";
131758+ hydraPlatforms = stdenv.lib.platforms.none;
131759+ }) {};
131760+
131512131761 "lambdabot-zulip" = callPackage
131513131762 ({ mkDerivation, base, containers, hint, hspec, HUnit, hzulip
131514131763 , mueval, optparse-applicative, say, text, yaml
@@ -133430,8 +133679,8 @@ self: {
133430133679 }:
133431133680 mkDerivation {
133432133681 pname = "layered-state";
133433− version = "1.1.4";
133434− sha256 = "06mwkz6816nkwlsc51hfx0y67dhf42rkib165xag7kga7843idxa";
133682+ version = "1.1.5";
133683+ sha256 = "122z7jzhy65ksdkgn505gkjgn0j04gqq38q5k1d3xlg96x670chk";
133435133684 libraryHaskellDepends = [
133436133685 base constraints data-default exceptions lens lens-utils
133437133686 monad-branch monoid mtl primitive profunctors prologue transformers
@@ -133520,8 +133769,8 @@ self: {
133520133769 }:
133521133770 mkDerivation {
133522133771 pname = "layouting";
133523− version = "1.1.3";
133524− sha256 = "1ji0hmfa87n3pl61gmgk4phmpir29j5r81ack95s3h7nxh0q5qh7";
133772+ version = "1.1.4";
133773+ sha256 = "0p50zg1xydvci313dh87g0asx292vbhbz5iaywcw9rapwxlg5zld";
133525133774 libraryHaskellDepends = [
133526133775 base container layered-state prologue terminal-text text
133527133776 ];
@@ -134616,8 +134865,8 @@ self: {
134616134865 }:
134617134866 mkDerivation {
134618134867 pname = "lens-utils";
134619− version = "1.4.5";
134620− sha256 = "00xcwyl12w95k14rc12ww2i0kgbrv39q1lvq5kfj3z7l5hv4fg0g";
134868+ version = "1.4.6";
134869+ sha256 = "1gz2mf33lszk33yszzcsbjhch1jxszg1h9cin49wwbgrb0imz7ds";
134621134870 libraryHaskellDepends = [
134622134871 aeson base containers data-default lens monoid split
134623134872 template-haskell
@@ -137219,6 +137468,23 @@ self: {
137219137468 license = stdenv.lib.licenses.mit;
137220137469 }) {};
137221137470
137471+ "list-t_1_0_2" = callPackage
137472+ ({ mkDerivation, base, base-prelude, HTF, mmorph, monad-control
137473+ , mtl, mtl-prelude, transformers, transformers-base
137474+ }:
137475+ mkDerivation {
137476+ pname = "list-t";
137477+ version = "1.0.2";
137478+ sha256 = "08wjng9d1sqjqc6pgq2lh84gcaabqmrslm3slc0rvaxh1lvasv6s";
137479+ libraryHaskellDepends = [
137480+ base mmorph monad-control mtl transformers transformers-base
137481+ ];
137482+ testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ];
137483+ description = "ListT done right";
137484+ license = stdenv.lib.licenses.mit;
137485+ hydraPlatforms = stdenv.lib.platforms.none;
137486+ }) {};
137487+
137222137488 "list-t-attoparsec" = callPackage
137223137489 ({ mkDerivation, attoparsec, base-prelude, either, hspec, list-t
137224137490 , list-t-text, text, transformers
@@ -137348,8 +137614,8 @@ self: {
137348137614 ({ mkDerivation, base }:
137349137615 mkDerivation {
137350137616 pname = "list-zip-def";
137351− version = "0.1.0.2";
137352− sha256 = "15123r7a52qb6dcxy1bxid8llykx439srqripmvji3rizwlqaa89";
137617+ version = "0.1.0.3";
137618+ sha256 = "0sklydccvdbxnj0c79lj7pcvw5v0bkycs9zp566gdcfy08qcjq79";
137353137619 libraryHaskellDepends = [ base ];
137354137620 description = "Provides zips with default values";
137355137621 license = stdenv.lib.licenses.publicDomain;
@@ -140660,6 +140926,21 @@ self: {
140660140926 license = stdenv.lib.licenses.mit;
140661140927 }) {};
140662140928
140929+ "macos-corelibs" = callPackage
140930+ ({ mkDerivation, base, containers, managed, mtl, profunctors
140931+ , tagged, transformers
140932+ }:
140933+ mkDerivation {
140934+ pname = "macos-corelibs";
140935+ version = "0.0.1.0";
140936+ sha256 = "1ma5dc8j1s3fpqkqwlqnb32vwchdyabxp001qa7r7balima5xfjs";
140937+ libraryHaskellDepends = [
140938+ base containers managed mtl profunctors tagged transformers
140939+ ];
140940+ description = "Haskell bindings to C-based Mac OS SDK frameworks";
140941+ license = stdenv.lib.licenses.bsd3;
140942+ }) {};
140943+
140663140944 "macosx-make-standalone" = callPackage
140664140945 ({ mkDerivation, base, containers, data-lens, data-lens-template
140665140946 , deepseq, directory, filepath, graph-visit, mtl, process
@@ -143505,25 +143786,6 @@ self: {
143505143786 }) {};
143506143787
143507143788 "mega-sdist" = callPackage
143508− ({ mkDerivation, base, bytestring, conduit, conduit-extra
143509− , http-conduit, optparse-simple, rio, rio-orphans, tar-conduit
143510− , yaml
143511− }:
143512− mkDerivation {
143513− pname = "mega-sdist";
143514− version = "0.3.3.1";
143515− sha256 = "0p4n5m91i80cns1g5n18bczpyxm8jcc205syr3k8xd7x9gwg69ww";
143516− isLibrary = false;
143517− isExecutable = true;
143518− executableHaskellDepends = [
143519− base bytestring conduit conduit-extra http-conduit optparse-simple
143520− rio rio-orphans tar-conduit yaml
143521− ];
143522− description = "Handles uploading to Hackage from mega repos";
143523− license = stdenv.lib.licenses.mit;
143524− }) {};
143525−
143526− "mega-sdist_0_3_3_2" = callPackage
143527143789 ({ mkDerivation, base, bytestring, conduit, conduit-extra
143528143790 , http-conduit, optparse-simple, rio, rio-orphans, tar-conduit
143529143791 , yaml
@@ -143540,7 +143802,6 @@ self: {
143540143802 ];
143541143803 description = "Handles uploading to Hackage from mega repos";
143542143804 license = stdenv.lib.licenses.mit;
143543− hydraPlatforms = stdenv.lib.platforms.none;
143544143805 }) {};
143545143806
143546143807 "megaparsec" = callPackage
@@ -145760,6 +146021,66 @@ self: {
145760146021 license = stdenv.lib.licenses.publicDomain;
145761146022 }) {};
145762146023
146024+ "mismi-core" = callPackage
146025+ ({ mkDerivation, amazonka, amazonka-core, base, bytestring
146026+ , exceptions, hedgehog, http-client, http-types, lens
146027+ , mismi-core-test, mismi-kernel, mismi-p, mmorph, mtl, resourcet
146028+ , retry, text, transformers
146029+ }:
146030+ mkDerivation {
146031+ pname = "mismi-core";
146032+ version = "0.0.1";
146033+ sha256 = "1vcj56blmk3g7vbp3d3a4yhla002w1ws5jxzbmgf1wxswc8hywvc";
146034+ libraryHaskellDepends = [
146035+ amazonka amazonka-core base bytestring exceptions http-client
146036+ http-types lens mismi-kernel mismi-p mtl resourcet retry text
146037+ transformers
146038+ ];
146039+ testHaskellDepends = [
146040+ amazonka-core base exceptions hedgehog mismi-core-test mismi-p
146041+ mmorph resourcet transformers
146042+ ];
146043+ description = "AWS Library";
146044+ license = stdenv.lib.licenses.bsd3;
146045+ hydraPlatforms = stdenv.lib.platforms.none;
146046+ broken = true;
146047+ }) {mismi-core-test = null;};
146048+
146049+ "mismi-kernel" = callPackage
146050+ ({ mkDerivation, base, hedgehog, mismi-p, text }:
146051+ mkDerivation {
146052+ pname = "mismi-kernel";
146053+ version = "0.0.1";
146054+ sha256 = "1pqm6xza3ds6z5n32bb12q6z2x9n5jzwyxhy7b7f0ryzijasabg4";
146055+ libraryHaskellDepends = [ base mismi-p text ];
146056+ testHaskellDepends = [ base hedgehog mismi-p text ];
146057+ description = "AWS Library";
146058+ license = stdenv.lib.licenses.bsd3;
146059+ }) {};
146060+
146061+ "mismi-p" = callPackage
146062+ ({ mkDerivation, base, text }:
146063+ mkDerivation {
146064+ pname = "mismi-p";
146065+ version = "0.0.1";
146066+ sha256 = "1xkrf270rfjig6bkpk4n63kgmjh05x38p99ndan4gr31ghbjyvk5";
146067+ libraryHaskellDepends = [ base text ];
146068+ description = "A commmon prelude for the mismi project";
146069+ license = stdenv.lib.licenses.bsd3;
146070+ }) {};
146071+
146072+ "mismi-s3-core" = callPackage
146073+ ({ mkDerivation, attoparsec, base, hedgehog, mismi-p, text }:
146074+ mkDerivation {
146075+ pname = "mismi-s3-core";
146076+ version = "0.0.1";
146077+ sha256 = "06c7sgkhw7iax6z5cqq1a0icpizwmwl8agvi788h5w2d6hn9wgjh";
146078+ libraryHaskellDepends = [ attoparsec base mismi-p text ];
146079+ testHaskellDepends = [ base hedgehog mismi-p text ];
146080+ description = "AWS Library";
146081+ license = stdenv.lib.licenses.bsd3;
146082+ }) {};
146083+
145763146084 "miso" = callPackage
145764146085 ({ mkDerivation, aeson, base, bytestring, containers, http-api-data
145765146086 , http-types, lucid, network-uri, servant, servant-lucid, text
@@ -146366,13 +146687,13 @@ self: {
146366146687 }) {};
146367146688
146368146689 "modular-arithmetic" = callPackage
146369− ({ mkDerivation, base, doctest, Glob }:
146690+ ({ mkDerivation, base, doctest }:
146370146691 mkDerivation {
146371146692 pname = "modular-arithmetic";
146372− version = "1.2.1.3";
146373− sha256 = "1f5k25gqnn037fpan3l956ly0g5cgwnw7qxyc6sm6hgdcl91wn1l";
146693+ version = "1.2.1.4";
146694+ sha256 = "1nlv5bwyfppw6qz6j2z1cvgzpixciv5gygpcvqlfnmmv410il4si";
146374146695 libraryHaskellDepends = [ base ];
146375− testHaskellDepends = [ base doctest Glob ];
146696+ testHaskellDepends = [ base doctest ];
146376146697 description = "A type for integers modulo some constant";
146377146698 license = stdenv.lib.licenses.bsd3;
146378146699 hydraPlatforms = stdenv.lib.platforms.none;
@@ -146653,8 +146974,8 @@ self: {
146653146974 ({ mkDerivation, base, mtl, transformers }:
146654146975 mkDerivation {
146655146976 pname = "monad-branch";
146656− version = "1.0.3";
146657− sha256 = "15nk9lvwz4s6lx8g08x5npai0bk13s6mj26vz6biwy3shpf5v11r";
146977+ version = "1.0.4";
146978+ sha256 = "0g82ccql6pmj319ji3zpmxab78qwdlrjsl7cdfhjvv4m1i4kmzdf";
146658146979 libraryHaskellDepends = [ base mtl transformers ];
146659146980 description = "Monadic abstraction for computations that can be branched and run independently";
146660146981 license = stdenv.lib.licenses.asl20;
@@ -147976,8 +148297,8 @@ self: {
147976148297 ({ mkDerivation, base, bindings-monetdb-mapi }:
147977148298 mkDerivation {
147978148299 pname = "monetdb-mapi";
147979− version = "0.1.0.1";
147980− sha256 = "1r035w349js424x0864xghvs79v4wsf9br4rwqpfqkyz2hxsqhx0";
148300+ version = "0.1.0.2";
148301+ sha256 = "069jmlnrgia36ncl5mqaqq0iaqwrhx6ig5jjnlxr40vfdi4m4dw6";
147981148302 libraryHaskellDepends = [ base bindings-monetdb-mapi ];
147982148303 description = "Mid-level bindings for the MonetDB API (mapi)";
147983148304 license = stdenv.lib.licenses.bsd3;
@@ -148140,6 +148461,32 @@ self: {
148140148461 license = stdenv.lib.licenses.mit;
148141148462 }) {};
148142148463
148464+ "mono-traversable_1_0_10_0" = callPackage
148465+ ({ mkDerivation, base, bytestring, containers, foldl, gauge
148466+ , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split
148467+ , text, transformers, unordered-containers, vector
148468+ , vector-algorithms
148469+ }:
148470+ mkDerivation {
148471+ pname = "mono-traversable";
148472+ version = "1.0.10.0";
148473+ sha256 = "04c8gcksxkrfdll2lm3aaj1dgz7snvfa8avsccs3h6v5ygvdp5h0";
148474+ revision = "1";
148475+ editedCabalFile = "1hgwrmq7r8d1nq9283wis67lg0wlid2sgqnr9vpsv2wpnd4n1rdl";
148476+ libraryHaskellDepends = [
148477+ base bytestring containers hashable split text transformers
148478+ unordered-containers vector vector-algorithms
148479+ ];
148480+ testHaskellDepends = [
148481+ base bytestring containers foldl hspec HUnit QuickCheck semigroups
148482+ text transformers unordered-containers vector
148483+ ];
148484+ benchmarkHaskellDepends = [ base gauge mwc-random vector ];
148485+ description = "Type classes for mapping, folding, and traversing monomorphic containers";
148486+ license = stdenv.lib.licenses.mit;
148487+ hydraPlatforms = stdenv.lib.platforms.none;
148488+ }) {};
148489+
148143148490 "mono-traversable-instances" = callPackage
148144148491 ({ mkDerivation, base, comonad, containers, dlist, dlist-instances
148145148492 , mono-traversable, semigroupoids, semigroups, transformers
@@ -148172,8 +148519,8 @@ self: {
148172148519 ({ mkDerivation, base, containers, lens, mtl }:
148173148520 mkDerivation {
148174148521 pname = "monoid";
148175− version = "0.1.8";
148176− sha256 = "15mwj4w46wszawhiabykamaf020m795zg017jb2j49gpzk8abqjf";
148522+ version = "0.1.9";
148523+ sha256 = "13k5s9y37igvrsfbw5q76zy10fm585dijx10qk32c4agih9fxyfv";
148177148524 libraryHaskellDepends = [ base containers lens mtl ];
148178148525 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.";
148179148526 license = stdenv.lib.licenses.asl20;
@@ -148520,8 +148867,8 @@ self: {
148520148867 ({ mkDerivation, base, containers, hspec }:
148521148868 mkDerivation {
148522148869 pname = "more-containers";
148523− version = "0.1.1.0";
148524− sha256 = "1gy7h36spmksn1d3vg56l93kfgd24im304ync20pzaymkbljh1gk";
148870+ version = "0.1.2.0";
148871+ sha256 = "0q3ljqjzzrx1y0vbsgvrnmbmvysxkfk2ky5xxix1kirpn1q45yjj";
148525148872 libraryHaskellDepends = [ base containers ];
148526148873 testHaskellDepends = [ base containers hspec ];
148527148874 description = "A few more collections";
@@ -148706,6 +149053,22 @@ self: {
148706149053 license = stdenv.lib.licenses.bsd3;
148707149054 }) {};
148708149055
149056+ "moss" = callPackage
149057+ ({ mkDerivation, base, bytestring, conduit-extra, mtl, network
149058+ , network-simple, unix-compat
149059+ }:
149060+ mkDerivation {
149061+ pname = "moss";
149062+ version = "0.1.0.0";
149063+ sha256 = "19gy0x191gk6wa85vp5nhh0xgmr3mj2daiqx8bap452fm1y85qcr";
149064+ libraryHaskellDepends = [
149065+ base bytestring conduit-extra mtl network network-simple
149066+ unix-compat
149067+ ];
149068+ description = "Haskell client for Moss";
149069+ license = stdenv.lib.licenses.mit;
149070+ }) {};
149071+
148709149072 "moto" = callPackage
148710149073 ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
148711149074 , cryptohash-sha1, df1, di, di-core, di-df1, directory, filepath
@@ -154026,6 +154389,17 @@ self: {
154026154389 hydraPlatforms = stdenv.lib.platforms.none;
154027154390 }) {};
154028154391
154392+ "network-uri-lenses" = callPackage
154393+ ({ mkDerivation, base, lens, network-uri }:
154394+ mkDerivation {
154395+ pname = "network-uri-lenses";
154396+ version = "0.2.0.0";
154397+ sha256 = "08yvcvpqwibxpqjz3qbkvks1aqgbshdc9chnj8b49yd1vdrzx41p";
154398+ libraryHaskellDepends = [ base lens network-uri ];
154399+ description = "Lenses for network-uri";
154400+ license = stdenv.lib.licenses.bsd3;
154401+ }) {};
154402+
154029154403 "network-uri-static" = callPackage
154030154404 ({ mkDerivation, base, doctest, network-uri, template-haskell }:
154031154405 mkDerivation {
@@ -154423,8 +154797,8 @@ self: {
154423154797 }:
154424154798 mkDerivation {
154425154799 pname = "ngx-export-tools";
154426− version = "0.4.1.0";
154427− sha256 = "0q70p894sqzzx534vxl8grrizllzhw3cx1d02nfg88h7gr82zp3f";
154800+ version = "0.4.2.1";
154801+ sha256 = "1hb4n0sjxz6hrdpgw27kxynhvlb8lxf86k4vjjdvic038gf7lfik";
154428154802 libraryHaskellDepends = [
154429154803 aeson base binary bytestring ngx-export safe template-haskell
154430154804 ];
@@ -155519,6 +155893,25 @@ self: {
155519155893 hydraPlatforms = stdenv.lib.platforms.none;
155520155894 }) {};
155521155895
155896+ "notmuch" = callPackage
155897+ ({ mkDerivation, base, bytestring, c2hs, deepseq, mtl, notmuch
155898+ , profunctors, tagged, talloc, text, time
155899+ }:
155900+ mkDerivation {
155901+ pname = "notmuch";
155902+ version = "0.1.0.0";
155903+ sha256 = "100kqfyw5aan07ywynqrpmgvsv1cma1v7sl2a8zvlwnhva39nz3b";
155904+ isLibrary = true;
155905+ isExecutable = true;
155906+ libraryHaskellDepends = [
155907+ base bytestring deepseq mtl profunctors tagged text time
155908+ ];
155909+ librarySystemDepends = [ notmuch talloc ];
155910+ libraryToolDepends = [ c2hs ];
155911+ description = "Haskell binding to Notmuch, the mail indexer";
155912+ license = stdenv.lib.licenses.gpl3;
155913+ }) {inherit (pkgs) notmuch; inherit (pkgs) talloc;};
155914+
155522155915 "notmuch-haskell" = callPackage
155523155916 ({ mkDerivation, base, containers, filepath, notmuch, old-locale
155524155917 , parseargs, time
@@ -162269,14 +162662,14 @@ self: {
162269162662 license = stdenv.lib.licenses.bsd3;
162270162663 }) {};
162271162664
162272− "path-io_1_4_0" = callPackage
162665+ "path-io_1_4_1" = callPackage
162273162666 ({ mkDerivation, base, containers, directory, dlist, exceptions
162274162667 , filepath, hspec, path, temporary, time, transformers, unix-compat
162275162668 }:
162276162669 mkDerivation {
162277162670 pname = "path-io";
162278− version = "1.4.0";
162279− sha256 = "0pffdxzn59qm3ifk746sp2g3h2gip2ijs39gwi0k0xn1rkid6ph5";
162671+ version = "1.4.1";
162672+ sha256 = "0v5zwdsy8dd2ljidjm2rr8wfpvjlgk1g7c5xf40ddzjn9ghykk2p";
162280162673 libraryHaskellDepends = [
162281162674 base containers directory dlist exceptions filepath path temporary
162282162675 time transformers unix-compat
@@ -164355,7 +164748,7 @@ self: {
164355164748 maintainers = with stdenv.lib.maintainers; [ psibi ];
164356164749 }) {inherit (pkgs) sqlite;};
164357164750
164358− "persistent-sqlite_2_9_0" = callPackage
164751+ "persistent-sqlite_2_9_1" = callPackage
164359164752 ({ mkDerivation, aeson, base, bytestring, conduit, containers
164360164753 , hspec, microlens-th, monad-logger, old-locale, persistent
164361164754 , persistent-template, resource-pool, resourcet, sqlite, temporary
@@ -164363,8 +164756,8 @@ self: {
164363164756 }:
164364164757 mkDerivation {
164365164758 pname = "persistent-sqlite";
164366− version = "2.9.0";
164367− sha256 = "0yn99m64p49x0bghpbnm77bk3ghk99w2w5d1772cmx15aq2d7w0y";
164759+ version = "2.9.1";
164760+ sha256 = "1lh55511zw1zrbvfwbyz18zsm7kb2xsym76f1lp4cdjz37c7sh2j";
164368164761 configureFlags = [ "-fsystemlib" ];
164369164762 isLibrary = true;
164370164763 isExecutable = true;
@@ -168396,8 +168789,9 @@ self: {
168396168789 }:
168397168790 mkDerivation {
168398168791 pname = "pontarius-xmpp";
168399− version = "0.5.4";
168400− sha256 = "0fmi915jmdh2k6fp97vywxpbljpcf6xpmvy3m7l1imqig0hfd8nf";
168792+ version = "0.5.5";
168793+ sha256 = "044fhp9fa2fp0aka972wmlmfq05k63dc1xb6fqrbwcyaamlprdsp";
168794+ setupHaskellDepends = [ base Cabal filepath ];
168401168795 libraryHaskellDepends = [
168402168796 attoparsec base base64-bytestring binary bytestring conduit
168403168797 containers crypto-api crypto-random cryptohash cryptohash-cryptoapi
@@ -168763,8 +169157,8 @@ self: {
168763169157 }:
168764169158 mkDerivation {
168765169159 pname = "posix-paths";
168766− version = "0.2.1.5";
168767− sha256 = "1pyi25gz2r3pc64f1i5awyp3mg5w74ik9wh5s9i9hs7bfmkjk1as";
169160+ version = "0.2.1.6";
169161+ sha256 = "0ibycc7z3gm6jr83cgsqwa7hkky2ldfqqd30ickgq6vn2rkp8fbj";
168768169162 libraryHaskellDepends = [ base bytestring unix ];
168769169163 testHaskellDepends = [
168770169164 base bytestring doctest HUnit QuickCheck unix
@@ -170600,14 +170994,14 @@ self: {
170600170994 license = stdenv.lib.licenses.mit;
170601170995 }) {};
170602170996
170603− "pretty-show_1_9_2" = callPackage
170997+ "pretty-show_1_9_4" = callPackage
170604170998 ({ mkDerivation, array, base, filepath, ghc-prim, happy
170605170999 , haskell-lexer, pretty, text
170606171000 }:
170607171001 mkDerivation {
170608171002 pname = "pretty-show";
170609− version = "1.9.2";
170610− sha256 = "01vqa5z364cgj73360rpb4rcysfgfyil9l7gxfp96vzcca3gi37a";
171003+ version = "1.9.4";
171004+ sha256 = "00gpniygx45yczhkf6ayqik5kraa2c436ragx07mqp3mp383ab5r";
170611171005 isLibrary = true;
170612171006 isExecutable = true;
170613171007 enableSeparateDataOutput = true;
@@ -172220,8 +172614,8 @@ self: {
172220172614 }:
172221172615 mkDerivation {
172222172616 pname = "prologue";
172223− version = "3.2.4";
172224− sha256 = "0smh3g9k2l4ic9gh1i7aq541nnacipvvc9c0v04xq5rk0rzrswmv";
172617+ version = "3.2.6";
172618+ sha256 = "0xic2d3b7ya0qrb8r4q0v6f9zgbh7sw0l7rpbmz09i8pkx7bj90y";
172225172619 libraryHaskellDepends = [
172226172620 base bifunctors binary comonad cond container convert data-default
172227172621 deepseq deriving-compat either errors exceptions functor-utils
@@ -172561,34 +172955,37 @@ self: {
172561172955
172562172956 "proteome" = callPackage
172563172957 ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers
172564− , data-default-class, deepseq, directory, filepath, hslogger, HTF
172565− , lens, messagepack, MissingH, mtl, nvim-hs, pretty-terminal
172566− , prettyprinter, process, resourcet, split, stm, strings, text
172567− , time, transformers, unliftio, utf8-string
172958+ , data-default-class, deepseq, directory, either, filepath
172959+ , hslogger, HTF, lens, messagepack, MissingH, mtl, nvim-hs
172960+ , pretty-terminal, prettyprinter, process, resourcet, safe, split
172961+ , stm, strings, text, time, transformers, unliftio, utf8-string
172568172962 }:
172569172963 mkDerivation {
172570172964 pname = "proteome";
172571− version = "0.3.8.0";
172572− sha256 = "1lr0a5vyf305ikhzf8xqrdzksz48vjlikx7zvjxkp0wsarz07ikd";
172965+ version = "0.3.14.0";
172966+ sha256 = "0mrx51kqz69n8axhzcxfi7x0ddn35ypny2lidas45q0865qgniif";
172573172967 isLibrary = true;
172574172968 isExecutable = true;
172575172969 libraryHaskellDepends = [
172576172970 aeson ansi-terminal base bytestring containers data-default-class
172577− deepseq directory filepath hslogger lens messagepack MissingH mtl
172578− nvim-hs pretty-terminal prettyprinter process resourcet split stm
172579− strings text time transformers unliftio utf8-string
172971+ deepseq directory either filepath hslogger lens messagepack
172972+ MissingH mtl nvim-hs pretty-terminal prettyprinter process
172973+ resourcet safe split stm strings text time transformers unliftio
172974+ utf8-string
172580172975 ];
172581172976 executableHaskellDepends = [
172582172977 aeson ansi-terminal base bytestring containers data-default-class
172583− deepseq directory filepath hslogger lens messagepack MissingH mtl
172584− nvim-hs pretty-terminal prettyprinter process resourcet split stm
172585− strings text time transformers unliftio utf8-string
172978+ deepseq directory either filepath hslogger lens messagepack
172979+ MissingH mtl nvim-hs pretty-terminal prettyprinter process
172980+ resourcet safe split stm strings text time transformers unliftio
172981+ utf8-string
172586172982 ];
172587172983 testHaskellDepends = [
172588172984 aeson ansi-terminal base bytestring containers data-default-class
172589− deepseq directory filepath hslogger HTF lens messagepack MissingH
172590− mtl nvim-hs pretty-terminal prettyprinter process resourcet split
172591− stm strings text time transformers unliftio utf8-string
172985+ deepseq directory either filepath hslogger HTF lens messagepack
172986+ MissingH mtl nvim-hs pretty-terminal prettyprinter process
172987+ resourcet safe split stm strings text time transformers unliftio
172988+ utf8-string
172592172989 ];
172593172990 description = "neovim project manager";
172594172991 license = stdenv.lib.licenses.mit;
@@ -172860,14 +173257,14 @@ self: {
172860173257 license = stdenv.lib.licenses.bsd3;
172861173258 }) {inherit (pkgs) protobuf;};
172862173259
172863− "proto-lens-protoc_0_4_0_1" = callPackage
173260+ "proto-lens-protoc_0_4_0_2" = callPackage
172864173261 ({ mkDerivation, base, bytestring, containers, filepath
172865173262 , haskell-src-exts, lens-family, pretty, proto-lens, protobuf, text
172866173263 }:
172867173264 mkDerivation {
172868173265 pname = "proto-lens-protoc";
172869− version = "0.4.0.1";
172870− sha256 = "1vigmy8aq65yaspgq803a4vxsq5v3zwlaq95yrf47zrvcx1lw3ni";
173266+ version = "0.4.0.2";
173267+ sha256 = "1kvbv7c42qcynh25mh1vzwdzk4fhvjai031hwmsrmpqywgbgknmm";
172871173268 isLibrary = true;
172872173269 isExecutable = true;
172873173270 libraryHaskellDepends = [
@@ -176196,8 +176593,8 @@ self: {
176196176593 }:
176197176594 mkDerivation {
176198176595 pname = "radius";
176199− version = "0.5.0.2";
176200− sha256 = "08y57j4235ajkf3z05p8lcixgr2x1m6mih5l0bfic4gxfvs818wc";
176596+ version = "0.6.0.0";
176597+ sha256 = "02jvlbj3w5ww59ms37l24crr8vib7ghzr9y79bip3p4mhpi4c32l";
176201176598 libraryHaskellDepends = [
176202176599 base binary bytestring cryptonite iproute memory
176203176600 ];
@@ -178741,6 +179138,24 @@ self: {
178741179138 license = stdenv.lib.licenses.bsd3;
178742179139 }) {};
178743179140
179141+ "recursion-schemes_5_1" = callPackage
179142+ ({ mkDerivation, base, base-orphans, comonad, free, HUnit
179143+ , template-haskell, th-abstraction, transformers
179144+ }:
179145+ mkDerivation {
179146+ pname = "recursion-schemes";
179147+ version = "5.1";
179148+ sha256 = "1lpk8mkh3vd2j56f0fmaj64indgf5m1db9355fgimcb4xfw13nq1";
179149+ libraryHaskellDepends = [
179150+ base base-orphans comonad free template-haskell th-abstraction
179151+ transformers
179152+ ];
179153+ testHaskellDepends = [ base HUnit template-haskell transformers ];
179154+ description = "Generalized bananas, lenses and barbed wire";
179155+ license = stdenv.lib.licenses.bsd3;
179156+ hydraPlatforms = stdenv.lib.platforms.none;
179157+ }) {};
179158+
178744179159 "recursion-schemes-ext" = callPackage
178745179160 ({ mkDerivation, base, composition-prelude, criterion, deepseq
178746179161 , hspec, lens, recursion-schemes
@@ -179675,6 +180090,27 @@ self: {
179675180090 hydraPlatforms = stdenv.lib.platforms.none;
179676180091 }) {};
179677180092
180093+ "regex_1_0_2_0" = callPackage
180094+ ({ mkDerivation, array, base, base-compat, bytestring, containers
180095+ , hashable, regex-base, regex-pcre-builtin, regex-tdfa
180096+ , regex-tdfa-text, template-haskell, text, time, time-locale-compat
180097+ , transformers, unordered-containers, utf8-string
180098+ }:
180099+ mkDerivation {
180100+ pname = "regex";
180101+ version = "1.0.2.0";
180102+ sha256 = "1f2z025hif1fr24b5khq3qxxyvpxrnhyx8xmbms332arw28rpkda";
180103+ libraryHaskellDepends = [
180104+ array base base-compat bytestring containers hashable regex-base
180105+ regex-pcre-builtin regex-tdfa regex-tdfa-text template-haskell text
180106+ time time-locale-compat transformers unordered-containers
180107+ utf8-string
180108+ ];
180109+ description = "Toolkit for regex-base";
180110+ license = stdenv.lib.licenses.bsd3;
180111+ hydraPlatforms = stdenv.lib.platforms.none;
180112+ }) {};
180113+
179678180114 "regex-applicative" = callPackage
179679180115 ({ mkDerivation, base, containers, smallcheck, tasty, tasty-hunit
179680180116 , tasty-smallcheck, transformers
@@ -179814,8 +180250,8 @@ self: {
179814180250 }:
179815180251 mkDerivation {
179816180252 pname = "regex-examples";
179817− version = "1.0.1.4";
179818− sha256 = "0lxwp1kqacw7dvhbrzy7kl0w5g79gp22b9143m6cgd2f2z7bgzqp";
180253+ version = "1.0.2.0";
180254+ sha256 = "0qpf4b2zxdlih1smlhybs923n2gjaxhx8i1rgjw6v7ng13vnriiy";
179819180255 isLibrary = false;
179820180256 isExecutable = true;
179821180257 executableHaskellDepends = [
@@ -180119,8 +180555,8 @@ self: {
180119180555 }:
180120180556 mkDerivation {
180121180557 pname = "regex-with-pcre";
180122− version = "1.0.1.4";
180123− sha256 = "0pgy9bym4450kzhrzy3amw8dhswzvmqnj5i8pn33l8rvsyr37zp7";
180558+ version = "1.0.2.0";
180559+ sha256 = "19vn5w4vhgxv9s6nhlmj4xl8pa16d1a2ygxxyd5b0qg3q27vvisk";
180124180560 libraryHaskellDepends = [
180125180561 base base-compat bytestring containers regex regex-base
180126180562 regex-pcre-builtin regex-pcre-text regex-tdfa template-haskell text
@@ -180333,8 +180769,8 @@ self: {
180333180769 }:
180334180770 mkDerivation {
180335180771 pname = "registry";
180336− version = "0.1.2.0";
180337− sha256 = "1y2fvb5qf2gz3nzw983v7r1xgdxxxg0n62sambngf7w8pww5p27d";
180772+ version = "0.1.2.2";
180773+ sha256 = "1knhdrjj5y9p8974am4z31k163yjz3123lvjjk1ml4ba65afqhc7";
180338180774 libraryHaskellDepends = [
180339180775 base exceptions mtl protolude resourcet text transformers-base
180340180776 ];
@@ -186366,6 +186802,34 @@ self: {
186366186802 license = stdenv.lib.licenses.bsd3;
186367186803 }) {inherit (pkgs) z3;};
186368186804
186805+ "sbv_7_13" = callPackage
186806+ ({ mkDerivation, array, async, base, bytestring, containers
186807+ , crackNum, deepseq, directory, doctest, filepath, generic-deriving
186808+ , ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random, syb
186809+ , tasty, tasty-golden, tasty-hunit, tasty-quickcheck
186810+ , template-haskell, time, z3
186811+ }:
186812+ mkDerivation {
186813+ pname = "sbv";
186814+ version = "7.13";
186815+ sha256 = "0bk400swnb4s98c5p71ml1px6jndaiqhf5dj7zmnliyplqcgpfik";
186816+ enableSeparateDataOutput = true;
186817+ libraryHaskellDepends = [
186818+ array async base containers crackNum deepseq directory filepath
186819+ generic-deriving ghc mtl pretty process QuickCheck random syb
186820+ template-haskell time
186821+ ];
186822+ testHaskellDepends = [
186823+ base bytestring containers crackNum directory doctest filepath Glob
186824+ hlint mtl QuickCheck random syb tasty tasty-golden tasty-hunit
186825+ tasty-quickcheck template-haskell
186826+ ];
186827+ testSystemDepends = [ z3 ];
186828+ description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
186829+ license = stdenv.lib.licenses.bsd3;
186830+ hydraPlatforms = stdenv.lib.platforms.none;
186831+ }) {inherit (pkgs) z3;};
186832+
186369186833 "sbvPlugin" = callPackage
186370186834 ({ mkDerivation, base, containers, directory, filepath, ghc
186371186835 , ghc-prim, mtl, process, sbv, tasty, tasty-golden
@@ -188608,8 +189072,8 @@ self: {
188608189072 }:
188609189073 mkDerivation {
188610189074 pname = "semilattices";
188611− version = "0.0.0.2";
188612− sha256 = "1f4xy2kl8mqvlrzv8y0qs2i3c095iprbzpa4j424sifsmms3ya89";
189075+ version = "0.0.0.3";
189076+ sha256 = "089vgwbcwa3hj53hh9djmilwfknsd9g9z9q1gbl0dad4lr39062f";
188613189077 libraryHaskellDepends = [
188614189078 base containers hashable unordered-containers
188615189079 ];
@@ -189595,8 +190059,8 @@ self: {
189595190059 pname = "servant-auth-server";
189596190060 version = "0.4.2.0";
189597190061 sha256 = "000szizds1c8amxm7gl75gpwrlj38gv665bhp59d35wcq03na4ap";
189598− revision = "2";
189599− editedCabalFile = "188chzggs5ahc2v1mxrr5cda5dqjwwar8b85yz7ysvlvbxb1zsb3";
190062+ revision = "3";
190063+ editedCabalFile = "1zjxqlfyw3wwlyq2faiq9gqhfixn2mvfsv8dapalxs9fph7a2nzj";
189600190064 libraryHaskellDepends = [
189601190065 aeson base base64-bytestring blaze-builder bytestring
189602190066 bytestring-conversion case-insensitive cookie crypto-api
@@ -193721,8 +194185,8 @@ self: {
193721194185 ({ mkDerivation, base, text }:
193722194186 mkDerivation {
193723194187 pname = "shortcut-links";
193724− version = "0.4.2.0";
193725− sha256 = "09sh6c1cwhs9x49mim8z1pafb0sh1z3im0k5wvigkpagx72pasqy";
194188+ version = "0.4.2.1";
194189+ sha256 = "1zyy4jma61vg684sa66mpdlq9ylfrfv23d8m0163lbcfpkxfqdhd";
193726194190 libraryHaskellDepends = [ base text ];
193727194191 description = "Link shortcuts for use in text markup";
193728194192 license = stdenv.lib.licenses.bsd3;
@@ -195750,6 +196214,17 @@ self: {
195750196214 license = stdenv.lib.licenses.mit;
195751196215 }) {};
195752196216
196217+ "skip-var" = callPackage
196218+ ({ mkDerivation, base }:
196219+ mkDerivation {
196220+ pname = "skip-var";
196221+ version = "0.1.0.0";
196222+ sha256 = "1xwbr25nsjkjvwjh62inr3ja7lp7carmc4nd68ybkyxmcfp1ivmc";
196223+ libraryHaskellDepends = [ base ];
196224+ description = "Skip variables";
196225+ license = stdenv.lib.licenses.mit;
196226+ }) {};
196227+
195753196228 "skulk" = callPackage
195754196229 ({ mkDerivation, base, hspec, QuickCheck }:
195755196230 mkDerivation {
@@ -196745,27 +197220,27 @@ self: {
196745197220 "snap" = callPackage
196746197221 ({ mkDerivation, aeson, async, attoparsec, base, bytestring, cereal
196747197222 , clientsession, configurator, containers, deepseq, directory
196748− , directory-tree, dlist, filepath, hashable, heist, http-streams
196749− , HUnit, lens, lifted-base, map-syntax, monad-control, mtl
196750− , mwc-random, pwstore-fast, QuickCheck, smallcheck, snap-core
197223+ , directory-tree, dlist, fail, filepath, hashable, heist
197224+ , http-streams, HUnit, lens, lifted-base, map-syntax, monad-control
197225+ , mtl, mwc-random, pwstore-fast, QuickCheck, smallcheck, snap-core
196751197226 , snap-server, stm, syb, test-framework, test-framework-hunit
196752197227 , test-framework-quickcheck2, test-framework-smallcheck, text, time
196753197228 , transformers, transformers-base, unordered-containers, xmlhtml
196754197229 }:
196755197230 mkDerivation {
196756197231 pname = "snap";
196757− version = "1.1.1.0";
196758− sha256 = "08kgvry18kfkspif2xn8j7w9jfinhrnl33g6ap74fz7rsrg68jz7";
197232+ version = "1.1.2.0";
197233+ sha256 = "05da0dg0p6djcsinycih50hjnircibmicarwg2vr14a7zbrhynps";
196759197234 libraryHaskellDepends = [
196760197235 aeson attoparsec base bytestring cereal clientsession configurator
196761− containers directory directory-tree dlist filepath hashable heist
196762− lens lifted-base map-syntax monad-control mtl mwc-random
197236+ containers directory directory-tree dlist fail filepath hashable
197237+ heist lens lifted-base map-syntax monad-control mtl mwc-random
196763197238 pwstore-fast snap-core snap-server stm text time transformers
196764197239 transformers-base unordered-containers xmlhtml
196765197240 ];
196766197241 testHaskellDepends = [
196767197242 aeson async attoparsec base bytestring cereal clientsession
196768− configurator containers deepseq directory directory-tree dlist
197243+ configurator containers deepseq directory directory-tree dlist fail
196769197244 filepath hashable heist http-streams HUnit lens lifted-base
196770197245 map-syntax monad-control mtl mwc-random pwstore-fast QuickCheck
196771197246 smallcheck snap-core snap-server stm syb test-framework
@@ -196998,8 +197473,8 @@ self: {
196998197473 pname = "snap-loader-dynamic";
196999197474 version = "1.0.0.0";
197000197475 sha256 = "12zvmdkypwflmc81i0sxbfmb3ja0vydycmaliyvrw0z32kg705wg";
197001− revision = "3";
197002− editedCabalFile = "0kk3viaz5hikj9815ja9l3fqq3653vx7q9jamkz68hyfxyvf8qxh";
197476+ revision = "4";
197477+ editedCabalFile = "19bi4vh6pvcm0qc4wz0ydhs9flii6hyzg7z3iiijfcyhdcc9iah9";
197003197478 libraryHaskellDepends = [
197004197479 base directory directory-tree hint mtl snap-core template-haskell
197005197480 time unix
@@ -200113,25 +200588,24 @@ self: {
200113200588
200114200589 "sproxy2" = callPackage
200115200590 ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
200116− , bytestring, cereal, conduit, containers, cookie, docopt, entropy
200117− , Glob, http-client, http-conduit, http-types
200118− , interpolatedstring-perl6, network, postgresql-simple
200119− , resource-pool, SHA, sqlite-simple, text, time, unix
200120− , unordered-containers, wai, wai-conduit, warp, warp-tls, word8
200121− , yaml
200591+ , bytestring, cereal, conduit, cookie, docopt, entropy, Glob
200592+ , http-client, http-conduit, http-types, interpolatedstring-perl6
200593+ , network, postgresql-simple, resource-pool, SHA, sqlite-simple
200594+ , text, time, unix, unordered-containers, wai, wai-conduit, warp
200595+ , warp-tls, word8, yaml
200122200596 }:
200123200597 mkDerivation {
200124200598 pname = "sproxy2";
200125− version = "1.96.0";
200126− sha256 = "0wzkh312d7h957vkf2qqsbnf9xm98vm8y5kzray87rn6rdc5k5x6";
200599+ version = "1.97.0";
200600+ sha256 = "1in8sb41bl46xwk49904xkm3k5s59xikvmyyani1p60l0zfrb2jk";
200127200601 isLibrary = false;
200128200602 isExecutable = true;
200129200603 executableHaskellDepends = [
200130200604 aeson base base64-bytestring blaze-builder bytestring cereal
200131− conduit containers cookie docopt entropy Glob http-client
200132− http-conduit http-types interpolatedstring-perl6 network
200133− postgresql-simple resource-pool SHA sqlite-simple text time unix
200134− unordered-containers wai wai-conduit warp warp-tls word8 yaml
200605+ conduit cookie docopt entropy Glob http-client http-conduit
200606+ http-types interpolatedstring-perl6 network postgresql-simple
200607+ resource-pool SHA sqlite-simple text time unix unordered-containers
200608+ wai wai-conduit warp warp-tls word8 yaml
200135200609 ];
200136200610 description = "Secure HTTP proxy for authenticating users via OAuth2";
200137200611 license = stdenv.lib.licenses.mit;
@@ -201253,6 +201727,24 @@ self: {
201253201727 license = stdenv.lib.licenses.mit;
201254201728 }) {};
201255201729
201730+ "stack2cabal" = callPackage
201731+ ({ mkDerivation, base, bytestring, Cabal, directory, filepath
201732+ , hpack, stackage-to-hackage, text
201733+ }:
201734+ mkDerivation {
201735+ pname = "stack2cabal";
201736+ version = "1.0.0";
201737+ sha256 = "0pqyf8jpldb733i0g93z5w1r6rgxgdnswkd2ciw8pbq5dw38q2yf";
201738+ isLibrary = false;
201739+ isExecutable = true;
201740+ executableHaskellDepends = [
201741+ base bytestring Cabal directory filepath hpack stackage-to-hackage
201742+ text
201743+ ];
201744+ description = "Convert stack projects to cabal.project + cabal.project.freeze";
201745+ license = stdenv.lib.licenses.gpl3Plus;
201746+ }) {};
201747+
201256201748 "stack2nix" = callPackage
201257201749 ({ mkDerivation, async, base, Cabal, cabal2nix, containers
201258201750 , directory, distribution-nixpkgs, filepath, hackage-db, hspec
@@ -201529,19 +202021,22 @@ self: {
201529202021
201530202022 "stackage-to-hackage" = callPackage
201531202023 ({ mkDerivation, base, bytestring, Cabal, containers, directory
201532− , extra, filepath, HsOpenSSL, HsYAML, http-streams, network-uri
201533− , optparse-applicative, semigroupoids, text
202024+ , extra, filepath, HsYAML, http-client, http-client-tls
202025+ , optparse-applicative, text
201534202026 }:
201535202027 mkDerivation {
201536202028 pname = "stackage-to-hackage";
201537− version = "1.0.2";
201538− sha256 = "0s474q0hwz917vhh9hmx33j9jjbgm58ajgl0wacw8hfbs8awwk20";
201539− isLibrary = false;
202029+ version = "1.1.0";
202030+ sha256 = "165g5vyxck8hh2523v4h0cwjl3yvp4wwzlsdrs9wvg9ca3ij0v85";
202031+ isLibrary = true;
201540202032 isExecutable = true;
202033+ libraryHaskellDepends = [
202034+ base bytestring Cabal containers directory extra filepath HsYAML
202035+ http-client http-client-tls text
202036+ ];
201541202037 executableHaskellDepends = [
201542− base bytestring Cabal containers directory extra filepath HsOpenSSL
201543− HsYAML http-streams network-uri optparse-applicative semigroupoids
201544− text
202038+ base bytestring Cabal containers directory extra filepath
202039+ optparse-applicative text
201545202040 ];
201546202041 description = "Convert stack.yaml to cabal.project + cabal.project.freeze";
201547202042 license = stdenv.lib.licenses.gpl3Plus;
@@ -203320,15 +203815,15 @@ self: {
203320203815 license = stdenv.lib.licenses.mit;
203321203816 }) {};
203322203817
203323− "stratosphere_0_28_1" = callPackage
203818+ "stratosphere_0_29_0" = callPackage
203324203819 ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
203325203820 , hashable, hspec, hspec-discover, lens, template-haskell, text
203326203821 , unordered-containers
203327203822 }:
203328203823 mkDerivation {
203329203824 pname = "stratosphere";
203330− version = "0.28.1";
203331− sha256 = "1brypavqh8049adidzgsjsrfd2sxbv387cckwxl4kkm4s49zrx18";
203825+ version = "0.29.0";
203826+ sha256 = "0zncpgjklm649fzrjjy0bri0ivybrc7lvys8yq72b4dpb8ksp5zs";
203332203827 isLibrary = true;
203333203828 isExecutable = true;
203334203829 libraryHaskellDepends = [
@@ -204621,6 +205116,17 @@ self: {
204621205116 hydraPlatforms = stdenv.lib.platforms.none;
204622205117 }) {};
204623205118
205119+ "stripe-concepts" = callPackage
205120+ ({ mkDerivation, base, bytestring, text }:
205121+ mkDerivation {
205122+ pname = "stripe-concepts";
205123+ version = "1.0.0.0";
205124+ sha256 = "0s518mlb181407w2gmlhaayaf3ypn03lzw3fmkzkiqz2c89kd1rw";
205125+ libraryHaskellDepends = [ base bytestring text ];
205126+ description = "Types for the Stripe API";
205127+ license = stdenv.lib.licenses.mit;
205128+ }) {};
205129+
204624205130 "stripe-core" = callPackage
204625205131 ({ mkDerivation, aeson, base, bytestring, mtl, text, time
204626205132 , transformers, unordered-containers
@@ -204691,6 +205197,40 @@ self: {
204691205197 hydraPlatforms = stdenv.lib.platforms.none;
204692205198 }) {};
204693205199
205200+ "stripe-scotty" = callPackage
205201+ ({ mkDerivation, aeson, base, bytestring, http-types, scotty
205202+ , stripe-concepts, stripe-signature, text, unordered-containers
205203+ }:
205204+ mkDerivation {
205205+ pname = "stripe-scotty";
205206+ version = "1.0.0.0";
205207+ sha256 = "195v1a3sl5skz2jr71r1b4za033s6hib7ld59f4fdrfdr5658sbs";
205208+ revision = "1";
205209+ editedCabalFile = "0c3r39217650yjxxs1523ywvyiirrh2f209gl4hfznyigkx2kg41";
205210+ libraryHaskellDepends = [
205211+ aeson base bytestring http-types scotty stripe-concepts
205212+ stripe-signature text unordered-containers
205213+ ];
205214+ description = "Listen for Stripe webhook events with Scotty";
205215+ license = stdenv.lib.licenses.mit;
205216+ }) {};
205217+
205218+ "stripe-signature" = callPackage
205219+ ({ mkDerivation, base, bytestring, cryptonite, hex-text, memory
205220+ , stripe-concepts, text
205221+ }:
205222+ mkDerivation {
205223+ pname = "stripe-signature";
205224+ version = "1.0.0.0";
205225+ sha256 = "0hg5l9fyfr6yhna2awcyrfr38zlpd1q58b6q6fc3aq8qhbwk8zps";
205226+ libraryHaskellDepends = [
205227+ base bytestring cryptonite hex-text memory stripe-concepts text
205228+ ];
205229+ testHaskellDepends = [ base bytestring text ];
205230+ description = "Verification of Stripe webhook signatures";
205231+ license = stdenv.lib.licenses.mit;
205232+ }) {};
205233+
204694205234 "stripe-tests" = callPackage
204695205235 ({ mkDerivation, aeson, base, bytestring, free, hspec, hspec-core
204696205236 , mtl, random, stripe-core, text, time, transformers
@@ -204709,6 +205249,22 @@ self: {
204709205249 hydraPlatforms = stdenv.lib.platforms.none;
204710205250 }) {};
204711205251
205252+ "stripe-wreq" = callPackage
205253+ ({ mkDerivation, aeson, base, bytestring, lens, stripe-concepts
205254+ , text, unordered-containers, wreq
205255+ }:
205256+ mkDerivation {
205257+ pname = "stripe-wreq";
205258+ version = "1.0.0.0";
205259+ sha256 = "1cm9fvkpanxydbbrk9s1yj3bkxd7wcschi40a4dhmh8h3wr89y8s";
205260+ libraryHaskellDepends = [
205261+ aeson base bytestring lens stripe-concepts text
205262+ unordered-containers wreq
205263+ ];
205264+ description = "Use the Stripe API via Wreq";
205265+ license = stdenv.lib.licenses.mit;
205266+ }) {};
205267+
204712205268 "strips" = callPackage
204713205269 ({ mkDerivation, base, containers, hspec, mtl }:
204714205270 mkDerivation {
@@ -205739,14 +206295,16 @@ self: {
205739206295 }) {};
205740206296
205741206297 "supervisors" = callPackage
205742− ({ mkDerivation, async, base, containers, hspec, stm, unliftio }:
206298+ ({ mkDerivation, async, base, containers, hspec, safe-exceptions
206299+ , stm
206300+ }:
205743206301 mkDerivation {
205744206302 pname = "supervisors";
205745− version = "0.1.0.0";
205746− sha256 = "1sxralp0hcz2zn5byn67xq612nzmpm890gnjs827sidvr7r7h31j";
205747− revision = "2";
205748− editedCabalFile = "08qz4qbfrj7hpk3pgyjy3r149dz48jpxajyjs10fgiz16xg11zyl";
205749− libraryHaskellDepends = [ async base containers stm unliftio ];
206303+ version = "0.2.0.0";
206304+ sha256 = "0q6r211sbb9dyrplr61xajbwcfvz7z93401mhqxhw3pz55vyrg8i";
206305+ libraryHaskellDepends = [
206306+ async base containers safe-exceptions stm
206307+ ];
205750206308 testHaskellDepends = [ base hspec ];
205751206309 description = "Monitor groups of threads with non-hierarchical lifetimes";
205752206310 license = stdenv.lib.licenses.mit;
@@ -208826,6 +209384,24 @@ self: {
208826209384 license = stdenv.lib.licenses.bsd3;
208827209385 }) {};
208828209386
209387+ "tasty-ant-xml_1_1_5" = callPackage
209388+ ({ mkDerivation, base, containers, directory, filepath
209389+ , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers
209390+ , xml
209391+ }:
209392+ mkDerivation {
209393+ pname = "tasty-ant-xml";
209394+ version = "1.1.5";
209395+ sha256 = "1px562a9c3vn0qxy8zs8mkp73nfqca17hdwhv5p7qgawpjafxk32";
209396+ libraryHaskellDepends = [
209397+ base containers directory filepath generic-deriving ghc-prim mtl
209398+ stm tagged tasty transformers xml
209399+ ];
209400+ description = "Render tasty output to XML for Jenkins";
209401+ license = stdenv.lib.licenses.bsd3;
209402+ hydraPlatforms = stdenv.lib.platforms.none;
209403+ }) {};
209404+
208829209405 "tasty-auto" = callPackage
208830209406 ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec
208831209407 , tasty-hunit, tasty-quickcheck, tasty-smallcheck
@@ -209294,6 +209870,17 @@ self: {
209294209870 hydraPlatforms = stdenv.lib.platforms.none;
209295209871 }) {};
209296209872
209873+ "tasty-test-vector" = callPackage
209874+ ({ mkDerivation, base, tasty }:
209875+ mkDerivation {
209876+ pname = "tasty-test-vector";
209877+ version = "0";
209878+ sha256 = "1kgz9mp1h391rqj9n78bfvxl8pd3bxanbnwkc5l9gvlygly3fz8j";
209879+ libraryHaskellDepends = [ base tasty ];
209880+ description = "Test vector support for tasty";
209881+ license = stdenv.lib.licenses.bsd3;
209882+ }) {};
209883+
209297209884 "tasty-th" = callPackage
209298209885 ({ mkDerivation, base, haskell-src-exts, tasty, tasty-hunit
209299209886 , template-haskell
@@ -210556,8 +211143,8 @@ self: {
210556211143 }:
210557211144 mkDerivation {
210558211145 pname = "terminal-text";
210559− version = "1.1.1";
210560− sha256 = "1jgdxqck3ck65mppi694w0f5x0547148y5agi100zggp8r3yxsy3";
211146+ version = "1.1.2";
211147+ sha256 = "1cfxkx3mfjxw8fh3gw4wqk5wwf10hi1aldhn6xc75mwfa6x7djjq";
210561211148 libraryHaskellDepends = [
210562211149 ansi-terminal base container layered-state prologue text
210563211150 ];
@@ -212504,6 +213091,21 @@ self: {
212504213091 license = stdenv.lib.licenses.isc;
212505213092 }) {};
212506213093
213094+ "th-abstraction_0_2_10_0" = callPackage
213095+ ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
213096+ mkDerivation {
213097+ pname = "th-abstraction";
213098+ version = "0.2.10.0";
213099+ sha256 = "1bql46ylr111g0pncdsf5mbhn6cpaw9xlqby89bz417dlk5gzny9";
213100+ libraryHaskellDepends = [
213101+ base containers ghc-prim template-haskell
213102+ ];
213103+ testHaskellDepends = [ base containers template-haskell ];
213104+ description = "Nicer interface for reified information about data types";
213105+ license = stdenv.lib.licenses.isc;
213106+ hydraPlatforms = stdenv.lib.platforms.none;
213107+ }) {};
213108+
212507213109 "th-alpha" = callPackage
212508213110 ({ mkDerivation, base, containers, derive, mmorph, mtl, tasty
212509213111 , tasty-hunit, tasty-quickcheck, template-haskell, th-desugar
@@ -213826,19 +214428,19 @@ self: {
213826214428 }) {};
213827214429
213828214430 "tidal" = callPackage
213829− ({ mkDerivation, base, colour, containers, hashable, hosc
213830− , mersenne-random-pure64, monad-loops, mtl, parsec, safe, tasty
213831− , tasty-hunit, text, time, websockets
214431+ ({ mkDerivation, base, bifunctors, colour, containers, hashable
214432+ , hosc, microspec, monad-loops, mtl, mwc-random, network, parsec
214433+ , random, safe, text, time, vector
213832214434 }:
213833214435 mkDerivation {
213834214436 pname = "tidal";
213835− version = "0.9.10";
213836− sha256 = "1fgana79fwmn2s3b50vs9wlri6z4f2b8lad5m4n4ggc4rginvlkw";
214437+ version = "1.0.3";
214438+ sha256 = "1blzlahn1xsp03wiv7ci4n6795xx8i9syhclbgcx6fy6gkfr2wy2";
213837214439 libraryHaskellDepends = [
213838− base colour containers hashable hosc mersenne-random-pure64
213839− monad-loops mtl parsec safe text time websockets
214440+ base bifunctors colour containers hashable hosc monad-loops mtl
214441+ mwc-random network parsec random safe text time vector
213840214442 ];
213841− testHaskellDepends = [ base tasty tasty-hunit ];
214443+ testHaskellDepends = [ base containers microspec parsec ];
213842214444 description = "Pattern language for improvised music";
213843214445 license = stdenv.lib.licenses.gpl3;
213844214446 }) {};
@@ -217999,6 +218601,30 @@ self: {
217999218601 license = stdenv.lib.licenses.bsd3;
218000218602 }) {};
218001218603
218604+ "turtle_1_5_13" = callPackage
218605+ ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
218606+ , containers, criterion, directory, doctest, exceptions, foldl
218607+ , hostname, managed, optional-args, optparse-applicative, process
218608+ , semigroups, stm, system-fileio, system-filepath, temporary, text
218609+ , time, transformers, unix, unix-compat
218610+ }:
218611+ mkDerivation {
218612+ pname = "turtle";
218613+ version = "1.5.13";
218614+ sha256 = "1124yhw0l8924cwkmap1qn2z0hf4vn3r73h4pmi9icahg8zpc1hg";
218615+ libraryHaskellDepends = [
218616+ ansi-wl-pprint async base bytestring clock containers directory
218617+ exceptions foldl hostname managed optional-args
218618+ optparse-applicative process semigroups stm system-fileio
218619+ system-filepath temporary text time transformers unix unix-compat
218620+ ];
218621+ testHaskellDepends = [ base doctest system-filepath temporary ];
218622+ benchmarkHaskellDepends = [ base criterion text ];
218623+ description = "Shell programming, Haskell-style";
218624+ license = stdenv.lib.licenses.bsd3;
218625+ hydraPlatforms = stdenv.lib.platforms.none;
218626+ }) {};
218627+
218002218628 "turtle-options" = callPackage
218003218629 ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle
218004218630 }:
@@ -219052,6 +219678,8 @@ self: {
219052219678 pname = "type-level-sets";
219053219679 version = "0.8.9.0";
219054219680 sha256 = "1acsr7g9ssli9yil9kws47gc6h3csmk2afncyki41pipa1vsriv4";
219681+ revision = "1";
219682+ editedCabalFile = "0cc0ws2plharq0gvindgmkp1fs82zd43zijkh7wf0ilfnr2l17z2";
219055219683 libraryHaskellDepends = [ base ghc-prim ];
219056219684 description = "Type-level sets and finite maps (with value-level counterparts)";
219057219685 license = stdenv.lib.licenses.bsd3;
@@ -219087,8 +219715,8 @@ self: {
219087219715 }:
219088219716 mkDerivation {
219089219717 pname = "type-map";
219090− version = "0.1.3.0";
219091− sha256 = "146kc36z6fljcgmgl9vii1pmf3hs80v2vz21r84p823znrqjs8gc";
219718+ version = "0.1.4.0";
219719+ sha256 = "16ccnn5dk6wl2ynwwmc71rr64qpppqxlmxahmj5g3plq8hh0p40d";
219092219720 libraryHaskellDepends = [ base containers ghc-prim vector ];
219093219721 testHaskellDepends = [
219094219722 base HUnit test-framework test-framework-hunit
@@ -219402,8 +220030,8 @@ self: {
219402220030 }:
219403220031 mkDerivation {
219404220032 pname = "typed-spreadsheet";
219405− version = "1.1.3";
219406− sha256 = "1y59kd92f5v116y26dlznvqi5kcb6y89rliwcs8ay9sk76606fa6";
220033+ version = "1.1.4";
220034+ sha256 = "16xbzwaiakimwwkbb0q0nxa08j7842z3894p04ijjvksllkdrlna";
219407220035 isLibrary = true;
219408220036 isExecutable = true;
219409220037 libraryHaskellDepends = [
@@ -219527,8 +220155,8 @@ self: {
219527220155 }:
219528220156 mkDerivation {
219529220157 pname = "typelevel";
219530− version = "1.2.2";
219531− sha256 = "0baigk89rd5cdy35v3abvdwh7g11fnz2rpnzfy4ahr0q1lj395f5";
220158+ version = "1.2.3";
220159+ sha256 = "02bvzgl0331xa4pwdclw08wyq8canmw06ps3xvgvhb5miy93rrwz";
219532220160 libraryHaskellDepends = [
219533220161 base constraints convert exceptions lens mtl pretty pretty-show
219534220162 primitive transformers
@@ -221560,14 +222188,15 @@ self: {
221560222188 license = stdenv.lib.licenses.bsd3;
221561222189 }) {};
221562222190
221563− "unix-time_0_4_0" = callPackage
221564− ({ mkDerivation, base, binary, bytestring, doctest, hspec
221565− , old-locale, old-time, QuickCheck, time
222191+ "unix-time_0_4_3" = callPackage
222192+ ({ mkDerivation, base, binary, bytestring, Cabal, cabal-doctest
222193+ , doctest, hspec, old-locale, old-time, QuickCheck, time
221566222194 }:
221567222195 mkDerivation {
221568222196 pname = "unix-time";
221569− version = "0.4.0";
221570− sha256 = "0fb9mdg596db9wbxsr5m3zc3wasvwblb32fsva0zrac93c9rq51r";
222197+ version = "0.4.3";
222198+ sha256 = "0h95vmsk7qyk9nbgjm5vi32ikdw07p1z0l7k6b5hbsv3wavivm53";
222199+ setupHaskellDepends = [ base Cabal cabal-doctest ];
221571222200 libraryHaskellDepends = [ base binary bytestring old-time ];
221572222201 testHaskellDepends = [
221573222202 base bytestring doctest hspec old-locale old-time QuickCheck time
@@ -221626,28 +222255,6 @@ self: {
221626222255 }) {};
221627222256
221628222257 "unliftio" = callPackage
221629− ({ mkDerivation, async, base, deepseq, directory, filepath, hspec
221630− , process, stm, time, transformers, unix, unliftio-core
221631− }:
221632− mkDerivation {
221633− pname = "unliftio";
221634− version = "0.2.8.1";
221635− sha256 = "18v8rzm2nxpck5xvg8qixkarhliy16yswgvj6vbjzq8bn4n6nydz";
221636− revision = "1";
221637− editedCabalFile = "1zx2h1mnjcjszjdchg17gqrnj3d56x46947jm92snmdjw8x231wg";
221638− libraryHaskellDepends = [
221639− async base deepseq directory filepath process stm time transformers
221640− unix unliftio-core
221641− ];
221642− testHaskellDepends = [
221643− async base deepseq directory filepath hspec process stm time
221644− transformers unix unliftio-core
221645− ];
221646− description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
221647− license = stdenv.lib.licenses.mit;
221648− }) {};
221649−
221650− "unliftio_0_2_9_0" = callPackage
221651222258 ({ mkDerivation, async, base, deepseq, directory, filepath, gauge
221652222259 , hspec, process, QuickCheck, stm, time, transformers, unix
221653222260 , unliftio-core
@@ -221670,7 +222277,6 @@ self: {
221670222277 ];
221671222278 description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
221672222279 license = stdenv.lib.licenses.mit;
221673− hydraPlatforms = stdenv.lib.platforms.none;
221674222280 }) {};
221675222281
221676222282 "unliftio-core" = callPackage
@@ -223276,8 +223882,8 @@ self: {
223276223882 pname = "uuid-crypto";
223277223883 version = "1.4.0.0";
223278223884 sha256 = "191da0bdgzbpibh7v2n2cg13gkq2vchsybad0qy9qixk0rzi1cvn";
223279− revision = "4";
223280− editedCabalFile = "1rzvpkvjbvzwvks795998k8232pc41yvcblrq7f29abrvd0587xp";
223885+ revision = "6";
223886+ editedCabalFile = "146jxyrsnrcwsll6mhq8a67ms1wpbbbxmkbq7sh9wza6c4g2fbwy";
223281223887 libraryHaskellDepends = [
223282223888 base binary bytestring cryptoids cryptoids-class cryptoids-types
223283223889 exceptions uuid
@@ -224662,17 +225268,18 @@ self: {
224662225268 license = stdenv.lib.licenses.bsd3;
224663225269 }) {};
224664225270
224665− "vector-sized_1_1_1_0" = callPackage
225271+ "vector-sized_1_2_0_0" = callPackage
224666225272 ({ mkDerivation, adjunctions, base, comonad, deepseq, distributive
224667− , finite-typelits, indexed-list-literals, primitive, vector
225273+ , finite-typelits, hashable, indexed-list-literals, primitive
225274+ , vector
224668225275 }:
224669225276 mkDerivation {
224670225277 pname = "vector-sized";
224671− version = "1.1.1.0";
224672− sha256 = "05rrfiy0zzcq5jmr1kfbpv1p6f35pqsd5k6zf78byznzjwk758nb";
225278+ version = "1.2.0.0";
225279+ sha256 = "04r43b30vayg56n88b5r3b5krh2kjxnqgmr4kx052bgpl8k6zh54";
224673225280 libraryHaskellDepends = [
224674225281 adjunctions base comonad deepseq distributive finite-typelits
224675− indexed-list-literals primitive vector
225282+ hashable indexed-list-literals primitive vector
224676225283 ];
224677225284 description = "Size tagged vectors";
224678225285 license = stdenv.lib.licenses.bsd3;
@@ -224793,8 +225400,8 @@ self: {
224793225400 }:
224794225401 mkDerivation {
224795225402 pname = "vector-text";
224796− version = "1.1.5";
224797− sha256 = "1gd7dg9icr1211rf298ny60yjgyyxbxa62l16q28yd5z160sr3ir";
225403+ version = "1.1.6";
225404+ sha256 = "14ms8ach15c1pyaih92qi703vj9aanbrmcsfwzxb55vwfpbbm2f4";
224798225405 libraryHaskellDepends = [
224799225406 base binary prologue text vector vector-binary-instances
224800225407 ];
@@ -225153,6 +225760,25 @@ self: {
225153225760 license = stdenv.lib.licenses.bsd3;
225154225761 }) {};
225155225762
225763+ "viewprof_0_0_0_26" = callPackage
225764+ ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens
225765+ , scientific, text, vector, vector-algorithms, vty
225766+ }:
225767+ mkDerivation {
225768+ pname = "viewprof";
225769+ version = "0.0.0.26";
225770+ sha256 = "11nd137135jq19l58g5fkxzznbv2hdrfyy231fy9s8hifm2rz14d";
225771+ isLibrary = false;
225772+ isExecutable = true;
225773+ executableHaskellDepends = [
225774+ base brick containers directory ghc-prof lens scientific text
225775+ vector vector-algorithms vty
225776+ ];
225777+ description = "Text-based interactive GHC .prof viewer";
225778+ license = stdenv.lib.licenses.bsd3;
225779+ hydraPlatforms = stdenv.lib.platforms.none;
225780+ }) {};
225781+
225156225782 "views" = callPackage
225157225783 ({ mkDerivation, base, mtl }:
225158225784 mkDerivation {
@@ -226040,8 +226666,8 @@ self: {
226040226666 }:
226041226667 mkDerivation {
226042226668 pname = "waargonaut";
226043− version = "0.4.2.0";
226044− sha256 = "19zfzff6cp57xv220yyxfi0j36x1qic7v4sa93yclshyjmhm7vnm";
226669+ version = "0.5.0.0";
226670+ sha256 = "0xa9ql4583z9cwkn76sf41igk0ny8yp8fcgs6lwbk7kfbb54kk4b";
226045226671 setupHaskellDepends = [ base Cabal cabal-doctest ];
226046226672 libraryHaskellDepends = [
226047226673 base bifunctors bytestring containers contravariant digit
@@ -226632,6 +227258,24 @@ self: {
226632227258 license = stdenv.lib.licenses.bsd3;
226633227259 }) {};
226634227260
227261+ "wai-logger_2_3_3" = callPackage
227262+ ({ mkDerivation, base, byteorder, bytestring, Cabal, cabal-doctest
227263+ , doctest, fast-logger, http-types, network, wai
227264+ }:
227265+ mkDerivation {
227266+ pname = "wai-logger";
227267+ version = "2.3.3";
227268+ sha256 = "1i200kn3cnd1b3hf53982y6rddwrf3z1acbclf1xc15632df73wx";
227269+ setupHaskellDepends = [ base Cabal cabal-doctest ];
227270+ libraryHaskellDepends = [
227271+ base byteorder bytestring fast-logger http-types network wai
227272+ ];
227273+ testHaskellDepends = [ base doctest ];
227274+ description = "A logging system for WAI";
227275+ license = stdenv.lib.licenses.bsd3;
227276+ hydraPlatforms = stdenv.lib.platforms.none;
227277+ }) {};
227278+
226635227279 "wai-logger-buffered" = callPackage
226636227280 ({ mkDerivation, base, bytestring, containers, data-default
226637227281 , http-types, time, wai, warp
@@ -230834,44 +231478,6 @@ self: {
230834231478 }) {};
230835231479
230836231480 "wreq" = callPackage
230837− ({ mkDerivation, aeson, aeson-pretty, attoparsec
230838− , authenticate-oauth, base, base16-bytestring, base64-bytestring
230839− , bytestring, Cabal, cabal-doctest, case-insensitive, containers
230840− , cryptonite, directory, doctest, exceptions, filepath, ghc-prim
230841− , hashable, http-client, http-client-tls, http-types, HUnit, lens
230842− , lens-aeson, memory, mime-types, network-info, psqueues
230843− , QuickCheck, snap-core, snap-server, template-haskell, temporary
230844− , test-framework, test-framework-hunit, test-framework-quickcheck2
230845− , text, time, time-locale-compat, transformers, unix-compat
230846− , unordered-containers, uuid, vector
230847− }:
230848− mkDerivation {
230849− pname = "wreq";
230850− version = "0.5.3.0";
230851− sha256 = "1bi78y0jzm8mvwbfc4mphg8iyjz5v1f4ziqpk1dskvb1f3ysw3d9";
230852− isLibrary = true;
230853− isExecutable = true;
230854− setupHaskellDepends = [ base Cabal cabal-doctest ];
230855− libraryHaskellDepends = [
230856− aeson attoparsec authenticate-oauth base base16-bytestring
230857− bytestring case-insensitive containers cryptonite exceptions
230858− ghc-prim hashable http-client http-client-tls http-types lens
230859− lens-aeson memory mime-types psqueues template-haskell text time
230860− time-locale-compat unordered-containers
230861− ];
230862− testHaskellDepends = [
230863− aeson aeson-pretty base base64-bytestring bytestring
230864− case-insensitive containers directory doctest filepath hashable
230865− http-client http-types HUnit lens lens-aeson network-info
230866− QuickCheck snap-core snap-server temporary test-framework
230867− test-framework-hunit test-framework-quickcheck2 text time
230868− transformers unix-compat unordered-containers uuid vector
230869− ];
230870− description = "An easy-to-use HTTP client library";
230871− license = stdenv.lib.licenses.bsd3;
230872− }) {};
230873−
230874− "wreq_0_5_3_1" = callPackage
230875231481 ({ mkDerivation, aeson, aeson-pretty, attoparsec
230876231482 , authenticate-oauth, base, base16-bytestring, base64-bytestring
230877231483 , bytestring, Cabal, cabal-doctest, case-insensitive, containers
@@ -230907,7 +231513,6 @@ self: {
230907231513 ];
230908231514 description = "An easy-to-use HTTP client library";
230909231515 license = stdenv.lib.licenses.bsd3;
230910− hydraPlatforms = stdenv.lib.platforms.none;
230911231516 }) {};
230912231517
230913231518 "wreq-sb" = callPackage
@@ -231232,8 +231837,8 @@ self: {
231232231837 }:
231233231838 mkDerivation {
231234231839 pname = "wsjtx-udp";
231235− version = "0.1.3.4";
231236− sha256 = "0krn5ams62dh4f0gfyx7ss7ymm438s9bf4m329pqnhj11p2fiazf";
231840+ version = "0.1.3.5";
231841+ sha256 = "1x2975pj2i0c4w1s00s4qc24sa24y29magilfxbhy8v1w1hfqcv7";
231237231842 isLibrary = true;
231238231843 isExecutable = true;
231239231844 libraryHaskellDepends = [
@@ -235286,8 +235891,8 @@ self: {
235286235891 pname = "yesod-bin";
235287235892 version = "1.6.0.3";
235288235893 sha256 = "1p5f6bl4gynm47m1xg1x1xh9nz913i83iprh2xd207359idjknz4";
235289− revision = "3";
235290− editedCabalFile = "0v3bwg26ghxa1wdvwyvrffd8wwxhv1qk9g8f64ax1n8gz53k6an7";
235894+ revision = "4";
235895+ editedCabalFile = "1iw9m3z6m4n9dlwamf1kwr7pp2wpk6awf1m63zjkgw5j4vwxlcpg";
235291235896 isLibrary = false;
235292235897 isExecutable = true;
235293235898 executableHaskellDepends = [
@@ -237737,6 +238342,18 @@ self: {
237737238342 hydraPlatforms = stdenv.lib.platforms.none;
237738238343 }) {};
237739238344
238345+ "yx" = callPackage
238346+ ({ mkDerivation, array, base, bytestring, hspec }:
238347+ mkDerivation {
238348+ pname = "yx";
238349+ version = "0.0.2.0";
238350+ sha256 = "05xh7x02ddh87kwslgckzh3g5i22r01vfrb160gns3zl6fv8sj2z";
238351+ libraryHaskellDepends = [ array base bytestring ];
238352+ testHaskellDepends = [ array base bytestring hspec ];
238353+ description = "Row-major coordinates";
238354+ license = stdenv.lib.licenses.bsd3;
238355+ }) {};
238356+
237740238357 "yxdb-utils" = callPackage
237741238358 ({ mkDerivation, array, attoparsec, base, bimap, binary
237742238359 , binary-conduit, bytestring, Codec-Compression-LZF, conduit
@@ -238988,6 +239605,20 @@ self: {
238988239605 hydraPlatforms = stdenv.lib.platforms.none;
238989239606 }) {};
238990239607
239608+ "zsyntax" = callPackage
239609+ ({ mkDerivation, base, constraints, containers, mtl, multiset }:
239610+ mkDerivation {
239611+ pname = "zsyntax";
239612+ version = "0.2.0.0";
239613+ sha256 = "1pv2slz9r305lal25gh5zhr0lnkf4nzsg6vib6i576m83d3pcsgx";
239614+ libraryHaskellDepends = [
239615+ base constraints containers mtl multiset
239616+ ];
239617+ testHaskellDepends = [ base containers mtl multiset ];
239618+ description = "Automated theorem prover for the Zsyntax biochemical calculus";
239619+ license = stdenv.lib.licenses.bsd3;
239620+ }) {};
239621+
238991239622 "ztail" = callPackage
238992239623 ({ mkDerivation, array, base, bytestring, filepath, hinotify
238993239624 , process, regex-posix, time, unix, unordered-containers
pkgs/development/idris-modules/tparsec.nix+3−3
@@ -4,15 +4,15 @@
44}:
55build-idris-package {
66 name = "tparsec";
7− version = "2018-06-26";
7+ version = "2018-11-09";
88
99 ipkgName = "TParsec";
1010
1111 src = fetchFromGitHub {
1212 owner = "gallais";
1313 repo = "idris-tparsec";
14− rev = "ca32d1a83f3de95f8979d48016e79d010f47b3c2";
15− sha256 = "1zjzk8xjmyyx1qwrdwwg7yjzcgj5wkbwpx8a3wpbj5sv4b5s2r30";
14+ rev = "fc5bc1e0bf21a53ec854990ed799c4c73e304b06";
15+ sha256 = "0ladks6x1qhs884w4rsxnzpq8dpijyqfqbvhk55kq10xh6w1smrz";
1616 };
1717
1818 meta = {
pkgs/development/interpreters/angelscript/2.22.nix+1
@@ -38,6 +38,7 @@ stdenv.mkDerivation {
3838 license = stdenv.lib.licenses.zlib ;
3939 maintainers = [stdenv.lib.maintainers.raskin];
4040 platforms = stdenv.lib.platforms.linux;
41+ badPlatforms = [ "aarch64-linux" ];
4142 downloadPage = "http://www.angelcode.com/angelscript/downloads.html";
4243 homepage="http://www.angelcode.com/angelscript/";
4344 };
pkgs/development/interpreters/clojure/default.nix+4−4
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 name = "clojure-${version}";
5− version = "1.9.0.391";
5+ version = "1.10.0.403";
66
77 src = fetchurl {
88 url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
9− sha256 = "1720nbp891mhdjp37z1ns7rg8yapk3a7h1a1rkzhx7abngpwwjcz";
9+ sha256 = "0jsyd0vr1qfqs0dz560hyfya553jhr4m4msf5x0n610yzvbqym4c";
1010 };
1111
1212 buildInputs = [ makeWrapper ];
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
2323 substituteInPlace clojure --replace PREFIX $prefix
2424
2525 install -Dt $out/bin clj clojure
26− wrapProgram $out/bin/clj --prefix PATH : ${binPath}
27− wrapProgram $out/bin/clojure --prefix PATH : ${binPath}
26+ wrapProgram $out/bin/clj --prefix PATH : $out/bin:${binPath}
27+ wrapProgram $out/bin/clojure --prefix PATH : $out/bin:${binPath}
2828 '';
2929
3030 meta = with stdenv.lib; {
pkgs/development/interpreters/python/mk-python-derivation.nix+2−7
@@ -110,12 +110,7 @@ let self = toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attr
110110 } // meta;
111111}));
112112
113−passthru = {
114− updateScript = let
113+passthru.updateScript = let
115114 filename = builtins.head (lib.splitString ":" self.meta.position);
116− in writeScript "update-python" ''
117− #!${python.stdenv.shell}
118− ${update-python-libraries} ${filename}
119− '';
120−};
115+ in attrs.passthru.updateScript or [ update-python-libraries filename ];
121116in lib.extendDerivation true passthru self
pkgs/development/interpreters/python/pypy/3/default.nixnew file+138
@@ -0,0 +1,138 @@
1+{ stdenv, substituteAll, fetchurl
2+, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi
3+, sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11
4+, makeWrapper, callPackage, self, gdbm, db, lzma
5+, python-setup-hook
6+# For the Python package set
7+, packageOverrides ? (self: super: {})
8+}:
9+
10+assert zlibSupport -> zlib != null;
11+
12+let
13+ version = "6.0.0";
14+ pythonVersion = "3.5";
15+ libPrefix = "pypy${pythonVersion}";
16+ sitePackages = "site-packages";
17+
18+ pythonForPypy = python.withPackages (ppkgs: [ ppkgs.pycparser ]);
19+
20+in stdenv.mkDerivation rec {
21+ name = "pypy3-${version}";
22+ inherit version pythonVersion;
23+
24+ src = fetchurl {
25+ url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2";
26+ sha256 = "0lwq8nn0r5yj01bwmkk5p7xvvrp4s550l8184mkmn74d3gphrlwg";
27+ };
28+
29+ nativeBuildInputs = [ pkgconfig makeWrapper ];
30+ buildInputs = [
31+ bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 gdbm db lzma
32+ ] ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc
33+ ++ stdenv.lib.optional zlibSupport zlib;
34+
35+ hardeningDisable = stdenv.lib.optional stdenv.isi686 "pic";
36+
37+ C_INCLUDE_PATH = stdenv.lib.makeSearchPathOutput "dev" "include" buildInputs;
38+ LIBRARY_PATH = stdenv.lib.makeLibraryPath buildInputs;
39+ LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath (stdenv.lib.filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs);
40+
41+ patches = [
42+ (substituteAll {
43+ src = ./tk_tcl_paths.patch;
44+ inherit tk tcl;
45+ tk_dev = tk.dev;
46+ tcl_dev = tcl;
47+ tk_libprefix = tk.libPrefix;
48+ tcl_libprefix = tcl.libPrefix;
49+ })
50+ ];
51+
52+ postPatch = ''
53+ substituteInPlace "lib-python/3/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
54+
55+ # hint pypy to find nix ncurses
56+ substituteInPlace pypy/module/_minimal_curses/fficurses.py \
57+ --replace "/usr/include/ncurses/curses.h" "${ncurses.dev}/include/curses.h" \
58+ --replace "ncurses/curses.h" "${ncurses.dev}/include/curses.h" \
59+ --replace "ncurses/term.h" "${ncurses.dev}/include/term.h" \
60+ --replace "libraries=['curses']" "libraries=['ncurses']"
61+
62+ sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite.dev}/include'], library_dirs=['${sqlite.out}/lib']@" lib_pypy/_sqlite3_build.py
63+ '';
64+
65+ buildPhase = ''
66+ ${pythonForPypy.interpreter} rpython/bin/rpython \
67+ --make-jobs="$NIX_BUILD_CORES" \
68+ -Ojit \
69+ --batch pypy/goal/targetpypystandalone.py
70+ '';
71+
72+ setupHook = python-setup-hook sitePackages;
73+
74+ doCheck = true;
75+ checkPhase = ''
76+ export TERMINFO="${ncurses.out}/share/terminfo/";
77+ export TERM="xterm";
78+ export HOME="$TMPDIR";
79+ # disable asyncio due to https://github.com/NixOS/nix/issues/1238
80+ # disable os due to https://github.com/NixOS/nixpkgs/issues/10496
81+ # disable pathlib due to https://bitbucket.org/pypy/pypy/pull-requests/594
82+ # disable shutils because it assumes gid 0 exists
83+ # disable socket because it has two actual network tests that fail
84+ # disable tarfile because it assumes gid 0 exists
85+ ${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
86+ '';
87+
88+ installPhase = ''
89+ mkdir -p $out/{bin,include,lib,pypy3-c}
90+
91+ cp -R {include,lib_pypy,lib-python,pypy3-c} $out/pypy3-c
92+ cp libpypy3-c.so $out/lib/
93+ ln -s $out/pypy3-c/pypy3-c $out/bin/pypy3
94+
95+ # other packages expect to find stuff according to libPrefix
96+ ln -s $out/pypy3-c/include $out/include/${libPrefix}
97+ ln -s $out/pypy3-c/lib-python/3 $out/lib/${libPrefix}
98+
99+ # We must wrap the original, not the symlink.
100+ # PyPy uses argv[0] to find its standard library, and while it knows
101+ # how to follow symlinks, it doesn't know about wrappers. So, it
102+ # will think the wrapper is the original. As long as the wrapper has
103+ # the same path as the original, this is OK.
104+ wrapProgram "$out/pypy3-c/pypy3-c" \
105+ --set LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:$out/lib" \
106+ --set LIBRARY_PATH "${LIBRARY_PATH}:$out/lib"
107+
108+ # verify cffi modules
109+ $out/bin/pypy3 -c "import tkinter;import sqlite3;import curses;import lzma"
110+
111+ # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484
112+ echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py
113+ '';
114+
115+ passthru = let
116+ pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;};
117+ in rec {
118+ inherit zlibSupport libPrefix sitePackages;
119+ executable = "pypy3";
120+ isPypy = true;
121+ isPy3 = true;
122+ isPy35 = true;
123+ buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; };
124+ interpreter = "${self}/bin/${executable}";
125+ withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;};
126+ pkgs = pythonPackages;
127+ };
128+
129+ enableParallelBuilding = true; # almost no parallelization without STM
130+
131+ meta = with stdenv.lib; {
132+ homepage = http://pypy.org/;
133+ description = "Fast, compliant alternative implementation of the Python language (3.5.3)";
134+ license = licenses.mit;
135+ platforms = [ "i686-linux" "x86_64-linux" ];
136+ maintainers = with maintainers; [ andersk ];
137+ };
138+}
pkgs/development/interpreters/python/pypy/3/tk_tcl_paths.patchnew file+17
@@ -0,0 +1,17 @@
1+--- pypy-pypy-84a2f3e6a7f8.org/lib_pypy/_tkinter/tklib_build.py 2017-10-03 11:49:20.000000000 +0100
2++++ pypy-pypy-84a2f3e6a7f8/lib_pypy/_tkinter/tklib_build.py 2017-11-21 13:20:51.398607530 +0000
3+@@ -24,11 +24,11 @@
4+ else:
5+ # On some Linux distributions, the tcl and tk libraries are
6+ # stored in /usr/include, so we must check this case also
7+- libdirs = []
8++ libdirs = ["@tcl@/lib", "@tk@/lib"]
9+ found = False
10+ for _ver in ['', '8.6', '8.5']:
11+- incdirs = ['/usr/include/tcl' + _ver]
12+- linklibs = ['tcl' + _ver, 'tk' + _ver]
13++ incdirs = ['@tcl_dev@/include', '@tk_dev@/include']
14++ linklibs = ['@tcl_libprefix@', '@tk_libprefix@']
15+ if os.path.isdir(incdirs[0]):
16+ found = True
17+ break
pkgs/development/libraries/aften/default.nix+1−1
@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
1616 description = "An audio encoder which generates compressed audio streams based on ATSC A/52 specification";
1717 homepage = "http://aften.sourceforge.net/";
1818 license = stdenv.lib.licenses.lgpl2;
19− platforms = stdenv.lib.platforms.unix;
19+ platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
2020 };
2121}
pkgs/development/libraries/allegro/5.nix+10−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, texinfo, libXext, xextproto, libX11, xproto
1+{ stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xextproto, libX11, xproto
22, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
33, libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto
44, xf86vidmodeproto, libXxf86vm, openal, libGLU_combined, kbproto, libjpeg, flac
@@ -28,7 +28,15 @@ stdenv.mkDerivation rec {
2828 libpulseaudio libpthreadstubs
2929 ];
3030
31− patchPhase = ''
31+ patches = [
32+ # fix compilation with mesa 18.2.5
33+ (fetchpatch {
34+ url = "https://github.com/liballeg/allegro5/commit/a40d30e21802ecf5c9382cf34af9b01bd3781e47.patch";
35+ sha256 = "1f1xlj5y2vr6wzmcz04s8kxn8cfdwrg9kjlnvpz9dix1z3qjnd4m";
36+ })
37+ ];
38+
39+ postPatch = ''
3240 sed -e 's@/XInput2.h@/XI2.h@g' -i CMakeLists.txt "src/"*.c
3341 '';
3442
pkgs/development/libraries/avahi/default.nix+4−1
@@ -1,5 +1,6 @@
11{ fetchurl, stdenv, pkgconfig, libdaemon, dbus, perlPackages
22, expat, gettext, intltool, glib, libiconv
3+, gtk3Support ? false, gtk3 ? null
34, qt4 ? null
45, qt4Support ? false
56, withLibdnssdCompat ? false }:
@@ -19,13 +20,15 @@ stdenv.mkDerivation rec {
1920
2021 buildInputs = [ libdaemon dbus glib expat libiconv ]
2122 ++ (with perlPackages; [ perl XMLParser ])
23+ ++ (stdenv.lib.optional gtk3Support gtk3)
2224 ++ (stdenv.lib.optional qt4Support qt4);
2325
2426 nativeBuildInputs = [ pkgconfig gettext intltool glib ];
2527
2628 configureFlags =
2729 [ "--disable-qt3" "--disable-gdbm" "--disable-mono"
28− "--disable-gtk" "--disable-gtk3"
30+ "--disable-gtk"
31+ (stdenv.lib.enableFeature gtk3Support "gtk3")
2932 "--${if qt4Support then "enable" else "disable"}-qt4"
3033 "--disable-python" "--localstatedir=/var" "--with-distro=none"
3134 # A systemd unit is provided by the avahi-daemon NixOS module
pkgs/development/libraries/beignet/default.nix+2
@@ -107,5 +107,7 @@ stdenv.mkDerivation rec {
107107 license = licenses.lgpl21Plus;
108108 maintainers = with maintainers; [ artuuge zimbatm ];
109109 platforms = platforms.linux;
110+ # Requires libdrm_intel
111+ badPlatforms = [ "aarch64-linux" ];
110112 };
111113}
pkgs/development/libraries/boost/generic.nix+2−1
@@ -111,7 +111,8 @@ stdenv.mkDerivation {
111111 description = "Collection of C++ libraries";
112112 license = stdenv.lib.licenses.boost;
113113
114− platforms = (if versionOlder version "1.59" then remove "aarch64-linux" else id) (platforms.unix ++ platforms.windows);
114+ platforms = (platforms.unix ++ platforms.windows);
115+ badPlatforms = stdenv.lib.optional (versionOlder version "1.59") "aarch64-linux";
115116 maintainers = with maintainers; [ peti wkennington ];
116117 };
117118
pkgs/development/libraries/bootil/default.nix+2
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
1010 license = stdenv.lib.licenses.free;
1111 maintainers = [ stdenv.lib.maintainers.abigailbuccaneer ];
1212 platforms = stdenv.lib.platforms.all;
13+ # Build uses `-msse` and `-mfpmath=sse`
14+ badPlatforms = [ "aarch64-linux" ];
1315 };
1416
1517 src = fetchFromGitHub {
pkgs/development/libraries/dbus-sharp/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchFromGitHub, pkgconfig, mono48, autoreconfHook }:
1+{stdenv, fetchFromGitHub, pkgconfig, mono4, autoreconfHook }:
22
33stdenv.mkDerivation rec {
44 name = "dbus-sharp-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616
1717 # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged
1818 # See: https://github.com/NixOS/nixpkgs/pull/46060
19− buildInputs = [ mono48 ];
19+ buildInputs = [ mono4 ];
2020
2121 dontStrip = true;
2222
pkgs/development/libraries/fdk-aac/default.nix+2−2
@@ -5,11 +5,11 @@
55with stdenv.lib;
66stdenv.mkDerivation rec {
77 name = "fdk-aac-${version}";
8− version = "0.1.6";
8+ version = "2.0.0";
99
1010 src = fetchurl {
1111 url = "mirror://sourceforge/opencore-amr/fdk-aac/${name}.tar.gz";
12− sha256 = "1bfkpqba0v2jgxqwaf9xsrr63a089wckrir497lm6nbbmi11pdma";
12+ sha256 = "0v6rbyw9f9lpfvcg3v1qyapga5hqfnb3wp3x5yaxpwcgjw7ydmpp";
1313 };
1414
1515 configureFlags = [ ]
pkgs/development/libraries/freetds/default.nix+2−2
@@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null;
88
99stdenv.mkDerivation rec {
1010 name = "freetds-${version}";
11− version = "1.00.104";
11+ version = "1.00.109";
1212
1313 src = fetchurl {
1414 url = "http://www.freetds.org/files/stable/${name}.tar.bz2";
15− sha256 = "0mlg027mppv2348f4wwdpxpac9baqkdsg7xqx21kyx5dx5kmr71g";
15+ sha256 = "0d00ixf78jzkyhccxjsaspz7yvlwk0xvrfcqfca4cwnwvnyb54ry";
1616 };
1717
1818 buildInputs = [
pkgs/development/libraries/goffice/default.nix+15−6
@@ -1,18 +1,21 @@
1−{ fetchurl, stdenv, pkgconfig, intltool, glib, gtk3
2−, libgsf, libxml2, libxslt, cairo, pango, librsvg }:
1+{ fetchurl, stdenv, pkgconfig, intltool, glib, gtk3, lasem
2+, libgsf, libxml2, libxslt, cairo, pango, librsvg, gnome3 }:
33
44stdenv.mkDerivation rec {
5− name = "goffice-0.10.44";
5+ pname = "goffice";
6+ version = "0.10.44";
7+
8+ outputs = [ "out" "dev" "devdoc" ];
69
710 src = fetchurl {
8− url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
11+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
912 sha256 = "1fd7cm6j0g0mqgpqs4y22b4gd2ll4mcyvg4d0q22d5ndjapl4q3d";
1013 };
1114
1215 nativeBuildInputs = [ pkgconfig intltool ];
1316
14− propagatedBuildInputs = [ # ToDo lasem library for MathML, opt. introspection?
15− glib gtk3 libxml2 cairo pango libgsf
17+ propagatedBuildInputs = [
18+ glib gtk3 libxml2 cairo pango libgsf lasem
1619 ];
1720
1821 buildInputs = [ libxslt librsvg ];
@@ -20,6 +23,12 @@ stdenv.mkDerivation rec {
2023 enableParallelBuilding = true;
2124 doCheck = true;
2225
26+ passthru = {
27+ updateScript = gnome3.updateScript {
28+ packageName = pname;
29+ };
30+ };
31+
2332 meta = {
2433 description = "A Glib/GTK+ set of document centric objects and utilities";
2534
pkgs/development/libraries/goocanvasmm/default.nixnew file+31
@@ -0,0 +1,31 @@
1+{ stdenv, fetchurl, pkgconfig, goocanvas2, gtkmm3, gnome3 }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "goocanvasmm";
5+ version = "1.90.11";
6+
7+ outputs = [ "out" "dev" ];
8+
9+ src = fetchurl {
10+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
11+ sha256 = "0vpdfrj59nwzwj8bk4s0h05iyql62pxjzsxh72g3vry07s3i3zw0";
12+ };
13+ nativeBuildInputs = [ pkgconfig ];
14+ propagatedBuildInputs = [ gtkmm3 goocanvas2 ];
15+
16+ enableParallelBuilding = true;
17+
18+ passthru = {
19+ updateScript = gnome3.updateScript {
20+ packageName = pname;
21+ };
22+ };
23+
24+ meta = with stdenv.lib; {
25+ description = "C++ bindings for GooCanvas";
26+ homepage = https://wiki.gnome.org/Projects/GooCanvas;
27+ license = licenses.lgpl2;
28+ maintainers = with maintainers; [ ];
29+ platforms = platforms.unix;
30+ };
31+}
pkgs/development/libraries/gsl/gsl-1_16.nix+2
@@ -36,5 +36,7 @@ stdenv.mkDerivation rec {
3636 extensive test suite.
3737 '';
3838 platforms = stdenv.lib.platforms.unix;
39+ # Failing "eigen" tests on aarch64.
40+ badPlatforms = [ "aarch64-linux" ];
3941 };
4042}
pkgs/development/libraries/gtksourceviewmm/4.x.nixnew file+30
@@ -0,0 +1,30 @@
1+{ stdenv, fetchurl, pkgconfig, gtkmm3, glibmm, gtksourceview4, gnome3 }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "gtksourceviewmm";
5+ version = "3.91.1";
6+
7+ src = fetchurl {
8+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
9+ sha256 = "088p2ch1b4fvzl9416nw3waj0pqgp31cd5zj4lx5hzzrq2afgapy";
10+ };
11+
12+ passthru = {
13+ updateScript = gnome3.updateScript {
14+ packageName = pname;
15+ versionPolicy = "none";
16+ };
17+ };
18+
19+ nativeBuildInputs = [ pkgconfig ];
20+ propagatedBuildInputs = [ glibmm gtkmm3 gtksourceview4 ];
21+
22+ meta = with stdenv.lib; {
23+ platforms = platforms.linux;
24+ homepage = https://developer.gnome.org/gtksourceviewmm/;
25+ description = "C++ wrapper for gtksourceview";
26+ license = licenses.lgpl2;
27+ maintainers = gnome3.maintainers;
28+ };
29+}
30+
pkgs/development/libraries/icu/63.nixnew file+14
@@ -0,0 +1,14 @@
1+{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, nativeBuildRoot }:
2+
3+import ./base.nix {
4+ version = "63.1";
5+ sha256 = "17fbk0lm2clsxbmjzvyp245ayx0n4chji3ky1f3fbz2ljjv91i05";
6+ patches = [
7+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1499398
8+ (fetchpatch {
9+ url = https://github.com/unicode-org/icu/commit/8baff8f03e07d8e02304d0c888d0bb21ad2eeb01.patch;
10+ sha256 = "1awfa98ljcf95a85cssahw6bvdnpbq5brf1kgspy14w4mlmhd0jb";
11+ })
12+ ];
13+ patchFlags = [ "-p3" ];
14+} { inherit stdenv lib fetchurl fixDarwinDylibNames nativeBuildRoot; }
pkgs/development/libraries/icu/base.nix+2−2
@@ -1,5 +1,5 @@
11{ version, sha256, patches ? [], patchFlags ? "" }:
2−{ stdenv, fetchurl, fixDarwinDylibNames
2+{ stdenv, lib, fetchurl, fixDarwinDylibNames
33 # Cross-compiled icu4c requires a build-root of a native compile
44, buildRootOnly ? false, nativeBuildRoot
55}:
@@ -20,7 +20,7 @@ let
2020 '';
2121
2222 # https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27
23− postPatch = if (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl")
23+ postPatch = if (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl") && lib.versionOlder version "62.1"
2424 then "substituteInPlace i18n/digitlst.cpp --replace '<xlocale.h>' '<locale.h>'"
2525 else null; # won't find locale_t on darwin
2626
pkgs/development/libraries/lasem/default.nixnew file+38
@@ -0,0 +1,38 @@
1+{ fetchurl, stdenv, pkgconfig, intltool, gobject-introspection, glib, gdk_pixbuf
2+, libxml2, cairo, pango, gnome3 }:
3+
4+stdenv.mkDerivation rec {
5+ pname = "lasem";
6+ version = "0.4.3";
7+
8+ outputs = [ "bin" "out" "dev" "man" "doc" "devdoc" ];
9+
10+ src = fetchurl {
11+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
12+ sha256 = "13ym5pm2y3wk5hh9zb2535i3lnhnzyzs0na1knxwgvwxazwm1ng7";
13+ };
14+
15+ nativeBuildInputs = [ pkgconfig intltool gobject-introspection ];
16+
17+ propagatedBuildInputs = [
18+ glib gdk_pixbuf libxml2 cairo pango
19+ ];
20+
21+ enableParallelBuilding = true;
22+ doCheck = true;
23+
24+ passthru = {
25+ updateScript = gnome3.updateScript {
26+ packageName = pname;
27+ };
28+ };
29+
30+ meta = {
31+ description = "SVG and MathML rendering library";
32+
33+ homepage = https://wiki.gnome.org/Projects/Lasem;
34+ license = stdenv.lib.licenses.gpl2Plus;
35+
36+ platforms = stdenv.lib.platforms.unix;
37+ };
38+}
pkgs/development/libraries/libcollectdclient/default.nix+1−5
@@ -5,11 +5,7 @@ collectd.overrideAttrs (oldAttrs: {
55 name = "libcollectdclient-${collectd.version}";
66 buildInputs = [ ];
77
8− NIX_CFLAGS_COMPILE = oldAttrs.NIX_CFLAGS_COMPILE ++ [
9− "-Wno-error=unused-function"
10− ];
11−
12− configureFlags = oldAttrs.configureFlags ++ [
8+ configureFlags = (oldAttrs.configureFlags or []) ++ [
139 "--disable-daemon"
1410 "--disable-all-plugins"
1511 ];
pkgs/development/libraries/libepc/default.nixnew file+47
@@ -0,0 +1,47 @@
1+{ stdenv, fetchurl, pkgconfig, intltool, gtk-doc, glib, avahi, gnutls, libuuid, libsoup, gtk3, gnome3 }:
2+
3+let
4+ avahiWithGtk = avahi.override { gtk3Support = true; };
5+in stdenv.mkDerivation rec {
6+ pname = "libepc";
7+ version = "0.4.6";
8+
9+ outputs = [ "out" "dev" "devdoc" ];
10+
11+ src = fetchurl {
12+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
13+ sha256 = "1s3svb2slqjsrqfv50c2ymnqcijcxb5gnx6bfibwh9l5ga290n91";
14+ };
15+
16+ nativeBuildInputs = [
17+ pkgconfig
18+ intltool
19+ gtk-doc
20+ ];
21+ buildInputs = [
22+ glib
23+ libuuid
24+ gtk3
25+ ];
26+ propagatedBuildInputs = [
27+ avahiWithGtk
28+ gnutls
29+ libsoup
30+ ];
31+
32+ enableParallelBuilding = true;
33+
34+ passthru = {
35+ updateScript = gnome3.updateScript {
36+ packageName = pname;
37+ };
38+ };
39+
40+ meta = with stdenv.lib; {
41+ description = "Easy Publish and Consume Library";
42+ homepage = https://wiki.gnome.org/Projects/libepc;
43+ license = licenses.lgpl21Plus;
44+ maintainers = gnome3.maintainers;
45+ platforms = platforms.linux;
46+ };
47+}
pkgs/development/libraries/libgda/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, vala
1+{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala
22, overrideCC, gcc6
33, mysqlSupport ? false, mysql ? null
44, postgresSupport ? false, postgresql ? null
@@ -23,7 +23,7 @@ assert postgresSupport -> postgresql != null;
2323
2424 hardeningDisable = [ "format" ];
2525
26− nativeBuildInputs = [ pkgconfig intltool itstool libxml2 vala ];
26+ nativeBuildInputs = [ pkgconfig intltool itstool libxml2 gobject-introspection vala ];
2727 buildInputs = with stdenv.lib; [ gtk3 openssl gnome3.libgee ]
2828 ++ optional (mysqlSupport) mysql.connector-c
2929 ++ optional (postgresSupport) postgresql;
pkgs/development/libraries/libgdamm/default.nixnew file+39
@@ -0,0 +1,39 @@
1+{ stdenv, fetchurl, pkgconfig, glibmm, libgda, libxml2, gnome3
2+, mysqlSupport ? false, mysql ? null
3+, postgresSupport ? false, postgresql ? null }:
4+
5+let
6+ gda = libgda.override {
7+ inherit mysqlSupport postgresSupport;
8+ };
9+in stdenv.mkDerivation rec {
10+ pname = "libgdamm";
11+ version = "4.99.11";
12+
13+ outputs = [ "out" "dev" ];
14+
15+ src = fetchurl {
16+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
17+ sha256 = "1fyh15b3f8hmwbswalxk1g4l04yvvybksn5nm7gznn5jl5q010p9";
18+ };
19+
20+ nativeBuildInputs = [ pkgconfig ];
21+ buildInputs = [ glibmm libxml2 ];
22+ propagatedBuildInputs = [ gda ];
23+
24+ enableParallelBuilding = true;
25+
26+ passthru = {
27+ updateScript = gnome3.updateScript {
28+ packageName = pname;
29+ };
30+ };
31+
32+ meta = with stdenv.lib; {
33+ description = "C++ bindings for libgda";
34+ homepage = http://www.gnome-db.org/;
35+ license = licenses.lgpl21Plus;
36+ maintainers = gnome3.maintainers;
37+ platforms = platforms.linux;
38+ };
39+}
pkgs/development/libraries/libgdiplus/default.nix+29−16
@@ -1,31 +1,40 @@
1−{ stdenv, fetchurl, pkgconfig, glib, cairo, Carbon, fontconfig
1+{ stdenv, fetchFromGitHub, pkgconfig, glib, cairo, Carbon, fontconfig
22, libtiff, giflib, libjpeg, libpng
3−, libXrender, libexif }:
3+, libXrender, libexif, autoreconfHook, fetchpatch }:
44
55stdenv.mkDerivation rec {
6− name = "libgdiplus-2.10.9";
6+ name = "libgdiplus-5.6";
77
8− src = fetchurl {
9− url = "https://download.mono-project.com/sources/libgdiplus/${name}.tar.bz2";
10− sha256 = "0klnbly2q0yx5p0l5z8da9lhqsjj9xqj06kdw2v7rnms4z1vdpkd";
8+ src = fetchFromGitHub {
9+ owner = "mono";
10+ repo = "libgdiplus";
11+ rev = "5.6";
12+ sha256 = "11xr84kng74j3pd8sx74q80a71k6dw0a502qgibcxlyqh666lfb7";
1113 };
1214
1315 NIX_LDFLAGS = "-lgif";
1416
15− patches =
16− [ (fetchurl {
17− url = "https://raw.github.com/MagicGroup/MagicSpecLib/master/libgdiplus/libgdiplus-2.10.1-libpng15.patch";
18− sha256 = "130r0jm065pjvbz5dkx96w37vj1wqc8fakmi2znribs14g0bl65f";
19− })
20− ./giflib.patch
21− ];
22−
23− patchFlags = "-p0";
17+ patches = [ # Series of patches cherry-picked from master, all fixes various sigsegv (or required by other patch)
18+ (fetchpatch {
19+ url = "https://github.com/mono/libgdiplus/commit/d33a2580a94701ff33abe28c22881d6173be57d0.patch";
20+ sha256 = "0rr54jylscn4icqjprqhwrncyr92r0d7kmfrrq3myskplpqv1c11";
21+ })
22+ (fetchpatch {
23+ url ="https://github.com/mono/libgdiplus/commit/aa6aa53906935572f52f519fe4ab9ebedc051d08.patch";
24+ sha256 = "1wg0avm8qv5cb4vk80baflfzszm6q7ydhn89c3h6kq68hg6zsf1f";
25+ })
26+ (fetchpatch {
27+ url = "https://github.com/mono/libgdiplus/commit/81e45a1d5a3ac3cf035bcc3fabb2859818b6cc04.patch";
28+ sha256 = "07wmc88cd1lqifs5x6npryni65jyy9gi8lgr2i1lb7v0fhvlyswg";
29+ })
30+ ];
2431
2532 hardeningDisable = [ "format" ];
2633
34+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
35+
2736 buildInputs =
28− [ pkgconfig glib cairo fontconfig libtiff giflib
37+ [ glib cairo fontconfig libtiff giflib
2938 libjpeg libpng libXrender libexif
3039 ]
3140 ++ stdenv.lib.optional stdenv.isDarwin Carbon;
@@ -34,6 +43,10 @@ stdenv.mkDerivation rec {
3443 ln -s $out/lib/libgdiplus.0.dylib $out/lib/libgdiplus.so
3544 '';
3645
46+ checkPhase = ''
47+ make check -w
48+ '';
49+
3750 meta = with stdenv.lib; {
3851 description = "Mono library that provides a GDI+-compatible API on non-Windows operating systems";
3952 homepage = https://www.mono-project.com/docs/gui/libgdiplus/;
pkgs/development/libraries/libgdiplus/giflib.patchdeleted−143
@@ -1,143 +0,0 @@
1−diff -Naur libgdiplus-2.10.9-orig/src/gifcodec.c libgdiplus-2.10.9/src/gifcodec.c
2−--- src/gifcodec.c
3−+++ src/gifcodec.c
4−@@ -39,8 +39,10 @@
5−
6− #include "gifcodec.h"
7−
8−+#if GIFLIB_MAJOR < 5
9− /* giflib declares this incorrectly as EgifOpen */
10− extern GifFileType *EGifOpen(void *userData, OutputFunc writeFunc);
11−+#endif
12−
13− /* Data structure used for callback */
14− typedef struct
15−@@ -105,7 +107,7 @@
16− */
17−
18− static int
19−-AddExtensionBlockMono(SavedImage *New, int Len, BYTE ExtData[])
20−+AddExtensionBlockMono(SavedImage *New, int Len, int func, BYTE ExtData[])
21− {
22− ExtensionBlock *ep;
23−
24−@@ -129,7 +131,7 @@
25−
26− if (ExtData) {
27− memcpy(ep->Bytes, ExtData, Len);
28−- ep->Function = New->Function;
29−+ ep->Function = func;
30− }
31−
32− return (GIF_OK);
33−@@ -232,20 +234,20 @@
34− }
35−
36− case EXTENSION_RECORD_TYPE: {
37−- if (DGifGetExtension(GifFile, &temp_save.Function, &ExtData) == GIF_ERROR) {
38−+ int func;
39−+ if (DGifGetExtension(GifFile, &func, &ExtData) == GIF_ERROR) {
40− return (GIF_ERROR);
41− }
42−
43− while (ExtData != NULL) {
44− /* Create an extension block with our data */
45−- if (AddExtensionBlockMono(&temp_save, ExtData[0], &ExtData[1]) == GIF_ERROR) {
46−+ if (AddExtensionBlockMono(&temp_save, func, ExtData[0], &ExtData[1]) == GIF_ERROR) {
47− return (GIF_ERROR);
48− }
49−
50− if (DGifGetExtensionNext(GifFile, &ExtData) == GIF_ERROR) {
51− return (GIF_ERROR);
52− }
53−- temp_save.Function = 0;
54− }
55− break;
56− }
57−@@ -303,12 +305,19 @@
58− result = NULL;
59− loop_counter = FALSE;
60−
61−+#if GIFLIB_MAJOR < 5
62− if (from_file) {
63− gif = DGifOpen(stream, &gdip_gif_fileinputfunc);
64− } else {
65− gif = DGifOpen (stream, &gdip_gif_inputfunc);
66− }
67−-
68−+#else
69−+ if (from_file)
70−+ gif = DGifOpen(stream, &gdip_gif_fileinputfunc, NULL);
71−+ else
72−+ gif = DGifOpen(stream, &gdip_gif_inputfunc, NULL);
73−+#endif
74−+
75− if (gif == NULL) {
76− goto error;
77− }
78−@@ -581,7 +590,7 @@
79− }
80−
81− FreeExtensionMono(&global_extensions);
82−- DGifCloseFile (gif);
83−+ DGifCloseFile (gif, NULL);
84−
85− *image = result;
86− return Ok;
87−@@ -597,7 +606,7 @@
88−
89− if (gif != NULL) {
90− FreeExtensionMono (&global_extensions);
91−- DGifCloseFile (gif);
92−+ DGifCloseFile (gif, NULL);
93− }
94−
95− *image = NULL;
96−@@ -660,11 +669,22 @@
97− return InvalidParameter;
98− }
99−
100−+#if GIFLIB_MAJOR < 5
101− if (from_file) {
102− fp = EGifOpenFileName (stream, 0);
103− } else {
104− fp = EGifOpen (stream, gdip_gif_outputfunc);
105− }
106−+#else
107−+ if (from_file)
108−+ fp = EGifOpenFileName (stream, 0, NULL);
109−+ else
110−+ fp = EGifOpen (stream, gdip_gif_outputfunc, NULL);
111−+#define MakeMapObject GifMakeMapObject
112−+#define FreeMapObject GifFreeMapObject
113−+#define QuantizeBuffer GifQuantizeBuffer
114−+#define BitSize GifBitSize
115−+#endif
116−
117− if (!fp) {
118− return FileNotFound;
119−@@ -848,8 +868,15 @@
120− Buffer[0] = 1;
121− Buffer[1] = ptr[0];
122− Buffer[2] = ptr[1];
123−+#if GIFLIB_MAJOR < 5
124− EGifPutExtensionFirst(fp, APPLICATION_EXT_FUNC_CODE, 11, "NETSCAPE2.0");
125− EGifPutExtensionLast(fp, APPLICATION_EXT_FUNC_CODE, 3, Buffer);
126−+#else
127−+ EGifPutExtensionLeader(fp, APPLICATION_EXT_FUNC_CODE);
128−+ EGifPutExtensionBlock(fp, 11, "NETSCAPE2.0");
129−+ EGifPutExtensionBlock(fp, 3, Buffer);
130−+ EGifPutExtensionTrailer(fp);
131−+#endif
132− }
133− }
134−
135−@@ -923,7 +950,7 @@
136− }
137− }
138−
139−- EGifCloseFile (fp);
140−+ EGifCloseFile (fp, NULL);
141−
142− return Ok;
143−
pkgs/development/libraries/libgrss/default.nix+1
@@ -26,6 +26,7 @@ stdenv.mkDerivation {
2626 passthru = {
2727 updateScript = gnome3.updateScript {
2828 packageName = pname;
29+ versionPolicy = "none";
2930 };
3031 };
3132
pkgs/development/libraries/librealsense/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 name = "librealsense-${version}";
5− version = "2.16.4";
5+ version = "2.17.0";
66
77 src = fetchFromGitHub {
88 owner = "IntelRealSense";
99 repo = "librealsense";
1010 rev = "v${version}";
11− sha256 = "0664lsdw9a3s3apqiv9kkzfnz86ai9wdc8y00qyxrmxq9lpjsq11";
11+ sha256 = "1ac580yhxmvxpdvlzdzpcdffysr6z3dl8dykndnq5758alkyspd7";
1212 };
1313
1414 buildInputs = [
pkgs/development/libraries/librime/default.nix+2−2
@@ -3,13 +3,13 @@
33
44stdenv.mkDerivation rec {
55 name = "librime-${version}";
6− version = "1.3.1";
6+ version = "1.3.2";
77
88 src = fetchFromGitHub {
99 owner = "rime";
1010 repo = "librime";
1111 rev = "${version}";
12− sha256 = "1y0h3nnz97smx9z8h5fzk4c27mvrwv8kajxffqc43bhyvxvb2jd6";
12+ sha256 = "06q10cv7a3i6d8l3sq79nasw3p1njvmjgh4jq2hqw9abcx351m1r";
1313 };
1414
1515 nativeBuildInputs = [ cmake ];
pkgs/development/libraries/mailcore2/default.nix+2−2
@@ -5,13 +5,13 @@
55stdenv.mkDerivation rec {
66 name = "mailcore2-${version}";
77
8− version = "0.6.2";
8+ version = "0.6.3";
99
1010 src = fetchFromGitHub {
1111 owner = "MailCore";
1212 repo = "mailcore2";
1313 rev = version;
14− sha256 = "1d0wmnkk9vnjqc28i79z3fwaaycdbprfspagik4mzdkgval5r5pm";
14+ sha256 = "0yxynvfmifpw9hdhv499a813hb2ynan74r353lhcdajkkm7w8br5";
1515 };
1616
1717 nativeBuildInputs = [ pkgconfig ];
pkgs/development/libraries/mm-common/default.nixnew file+33
@@ -0,0 +1,33 @@
1+{ stdenv, fetchurl, gnome3 }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "mm-common";
5+ version = "0.9.12";
6+
7+ src = fetchurl {
8+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
9+ sha256 = "02vwgv404b56wxy0gnm9xq9fvzgn9dhfqcy2hhl78ljv3v7drzyf";
10+ };
11+
12+ passthru = {
13+ updateScript = gnome3.updateScript {
14+ packageName = pname;
15+ versionPolicy = "none";
16+ };
17+ };
18+
19+ meta = with stdenv.lib; {
20+ description = "Common build files of GLib/GTK+ C++ bindings";
21+ longDescription = ''
22+ The mm-common module provides the build infrastructure and utilities
23+ shared among the GNOME C++ binding libraries. It is only a required
24+ dependency for building the C++ bindings from the gnome.org version
25+ control repository. An installation of mm-common is not required for
26+ building tarball releases, unless configured to use maintainer-mode.
27+ '';
28+ homepage = http://www.gtkmm.org;
29+ license = licenses.gpl2Plus;
30+ maintainers = gnome3.maintainers;
31+ platforms = platforms.linux;
32+ };
33+}
pkgs/development/libraries/mono-addins/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono48, gtk-sharp-2_0 }:
1+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono4, gtk-sharp-2_0 }:
22
33stdenv.mkDerivation rec {
44 name = "mono-addins-${version}";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 nativeBuildInputs = [ pkgconfig autoreconfHook ];
1616
1717 # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged
18− buildInputs = [ mono48 gtk-sharp-2_0 ];
18+ buildInputs = [ mono4 gtk-sharp-2_0 ];
1919
2020 dontStrip = true;
2121
pkgs/development/libraries/mpich/default.nix+8−7
@@ -23,17 +23,18 @@ stdenv.mkDerivation rec {
2323 doCheck = true;
2424
2525 preFixup = ''
26+ # Ensure the default compilers are the ones mpich was built with
27+ sed -i 's:CC="gcc":CC=${stdenv.cc}/bin/gcc:' $out/bin/mpicc
28+ sed -i 's:CXX="g++":CXX=${stdenv.cc}/bin/g++:' $out/bin/mpicxx
29+ sed -i 's:FC="gfortran":FC=${gfortran}/bin/gfortran:' $out/bin/mpifort
30+ ''
31+ + stdenv.lib.optionalString (!stdenv.isDarwin) ''
2632 # /tmp/nix-build... ends up in the RPATH, fix it manually
2733 for entry in $out/bin/mpichversion $out/bin/mpivars; do
2834 echo "fix rpath: $entry"
2935 patchelf --set-rpath "$out/lib" $entry
3036 done
31−
32− # Ensure the default compilers are the ones mpich was built with
33− sed -i 's:CC="gcc":CC=${stdenv.cc}/bin/gcc:' $out/bin/mpicc
34− sed -i 's:CXX="g++":CXX=${stdenv.cc}/bin/g++:' $out/bin/mpicxx
35− sed -i 's:FC="gfortran":FC=${gfortran}/bin/gfortran:' $out/bin/mpifort
36− '';
37+ '';
3738
3839 meta = with stdenv.lib; {
3940 description = "Implementation of the Message Passing Interface (MPI) standard";
@@ -49,6 +50,6 @@ stdenv.mkDerivation rec {
4950 fullName = "MPICH license (permissive)";
5051 };
5152 maintainers = [ maintainers.markuskowa ];
52− platforms = platforms.linux;
53+ platforms = platforms.linux ++ platforms.darwin;
5354 };
5455}
pkgs/development/libraries/nlohmann_json/default.nix+2−2
@@ -3,13 +3,13 @@
33
44stdenv.mkDerivation rec {
55 name = "nlohmann_json-${version}";
6− version = "3.4.0";
6+ version = "3.5.0";
77
88 src = fetchFromGitHub {
99 owner = "nlohmann";
1010 repo = "json";
1111 rev = "v${version}";
12− sha256 = "1140gz5za7yvfcphdgxaq1dm4b1vxy1m8d1w0s0smv4vvdvl26ym";
12+ sha256 = "1jq522d48bvfrxr4f6jnijwx2dwqfb8w9k636j4kxlg1hka27lji";
1313 };
1414
1515 nativeBuildInputs = [ cmake ];
pkgs/development/libraries/openbabel/default.nix+9−1
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkgconfig }:
1+{stdenv, fetchurl, fetchpatch, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkgconfig }:
22
33stdenv.mkDerivation rec {
44 name = "openbabel-${version}";
@@ -9,6 +9,14 @@ stdenv.mkDerivation rec {
99 sha256 = "0xm7y859ivq2cp0q08mwshfxm0jq31xkyr4x8s0j6l7khf57yk2r";
1010 };
1111
12+ patches = [
13+ # ARM / AArch64 fixes.
14+ (fetchpatch {
15+ url = https://github.com/openbabel/openbabel/commit/ee11c98a655296550710db1207b294f00e168216.patch;
16+ sha256 = "0wjqjrkr4pfirzzicdvlyr591vppydk572ix28jd2sagnfnf566g";
17+ })
18+ ];
19+
1220 # TODO : perl & python bindings;
1321 # TODO : wxGTK: I have no time to compile
1422 # TODO : separate lib and apps
pkgs/development/libraries/opencv/3.x.nix+3−10
@@ -35,20 +35,20 @@
3535}:
3636
3737let
38− version = "3.4.4";
38+ version = "3.4.5";
3939
4040 src = fetchFromGitHub {
4141 owner = "opencv";
4242 repo = "opencv";
4343 rev = version;
44− sha256 = "1xzbv0922r2zq4fgpkc1ldyq3kxp4c6x6dizydbspka18jrrxqlr";
44+ sha256 = "0hz9316ys2qi0lx9dcbsk3mkn8cn08q12hc96p6zz2d4is6d5wsc";
4545 };
4646
4747 contribSrc = fetchFromGitHub {
4848 owner = "opencv";
4949 repo = "opencv_contrib";
5050 rev = version;
51− sha256 = "0ylsljkmgfj5vam05cv0z3qwkqwjwz5fs5f5yif3pwvb99lxlbib";
51+ sha256 = "1fw7qwgibiznqal2dg4alkw8hrrrpjc0jaicf2406604rjm2lx6h";
5252 };
5353
5454 # Contrib must be built in order to enable Tesseract support:
@@ -147,13 +147,6 @@ stdenv.mkDerivation rec {
147147 cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib"
148148 '';
149149
150− patches =
151− # https://github.com/opencv/opencv/pull/13254
152− lib.optional enablePython (fetchpatch {
153− url = https://github.com/opencv/opencv/commit/ad35b79e3f98b4ce30481e0299cca550ed77aef0.patch;
154− sha256 = "0rkvg6wm5fyncszfpd83wa4lvsb8srvk21r1jcld758i4f334sws";
155− });
156−
157150 # This prevents cmake from using libraries in impure paths (which
158151 # causes build failure on non NixOS)
159152 # Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with
pkgs/development/libraries/opencv/4.x.nix+4−19
@@ -1,5 +1,5 @@
11{ lib, stdenv
2−, fetchurl, fetchFromGitHub, fetchpatch
2+, fetchurl, fetchFromGitHub
33, cmake, pkgconfig, unzip, zlib, pcre, hdf5
44, glog, boost, google-gflags, protobuf
55, config
@@ -35,20 +35,20 @@
3535}:
3636
3737let
38− version = "4.0.0";
38+ version = "4.0.1";
3939
4040 src = fetchFromGitHub {
4141 owner = "opencv";
4242 repo = "opencv";
4343 rev = version;
44− sha256 = "1r2hszm4044dfx65wv69rcs419jjd7bqllhnpcwk3n28f5ahln50";
44+ sha256 = "1f0n2a57sn47w55vaxlwhr3g6xgchvr3gxicxbkyzai3pvj55k48";
4545 };
4646
4747 contribSrc = fetchFromGitHub {
4848 owner = "opencv";
4949 repo = "opencv_contrib";
5050 rev = version;
51− sha256 = "1g4pzw7hv1v9jp1nrqjxqwpi1byl3mxkj6w6ibq6ydsn0138p66z";
51+ sha256 = "0svw8f6nvnzmrc0baj6priq4hbijla4kl6gzy8yif1jfvcwb1syy";
5252 };
5353
5454 # Contrib must be built in order to enable Tesseract support:
@@ -160,21 +160,6 @@ stdenv.mkDerivation rec {
160160 cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib"
161161 '';
162162
163− patches =
164− # Fixes issue: https://github.com/opencv/opencv_contrib/issues/1923
165− # PR: https://github.com/opencv/opencv_contrib/pull/1913
166− lib.optional buildContrib (fetchpatch {
167− url = https://github.com/opencv/opencv_contrib/commit/e068b62a1432d4d5688693a9e20bf175dfaa9a3e.patch;
168− sha256 = "102mq1qgmla40hhj8mda70inhakdazm9agyah98kq9931scvf0c9";
169− stripLen = 2;
170− extraPrefix = "opencv_contrib/";
171− }) ++
172− # https://github.com/opencv/opencv/pull/13254
173− lib.optional enablePython (fetchpatch {
174− url = https://github.com/opencv/opencv/commit/ad35b79e3f98b4ce30481e0299cca550ed77aef0.patch;
175− sha256 = "0rkvg6wm5fyncszfpd83wa4lvsb8srvk21r1jcld758i4f334sws";
176− });
177−
178163 # This prevents cmake from using libraries in impure paths (which
179164 # causes build failure on non NixOS)
180165 # Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with
pkgs/development/libraries/qmlbox2d/default.nix+3−3
@@ -1,11 +1,11 @@
11{stdenv, qtdeclarative, fetchFromGitHub, qmake }:
22stdenv.mkDerivation rec {
3− name = "qml-box2d-2018-03-16";
3+ name = "qml-box2d-2018-04-06";
44 src = fetchFromGitHub {
55 owner = "qml-box2d";
66 repo = "qml-box2d";
7− sha256 = "1fbsvv28b4r0szcv8bk5gxpf8v534jp2axyfp438384sy757wsq2";
8− rev = "21e57f1";
7+ sha256 = "0gb8limy6ck23z3k0k2j7c4c4s95p40f6lbzk4szq7fjnnw22kb7";
8+ rev = "b7212d5640701f93f0cd88fbd3a32c619030ae62";
99 };
1010
1111 enableParallelBuilding = true;
pkgs/development/libraries/science/math/mkl/default.nix+14−20
@@ -1,21 +1,8 @@
11{ stdenvNoCC, writeText, fetchurl, rpmextract, undmg }:
22/*
3− Some (but not all) mkl functions require openmp, but Intel does not add these
4− to SO_NEEDED and instructs users to put openmp on their LD_LIBRARY_PATH. If
5− you are using mkl and your library/application is using some of the functions
6− that require openmp, add a setupHook like this to your package:
7−
8− setupHook = writeText "setup-hook.sh" ''
9− addOpenmp() {
10− addToSearchPath LD_LIBRARY_PATH ${openmp}/lib
11− }
12− addEnvHooks "$targetOffset" addOpenmp
13− '';
14−
15− We do not add the setup hook here, because avoiding it allows this large
16− package to be a fixed-output derivation with better cache efficiency.
17− */
18−
3+ For details on using mkl as a blas provider for python packages such as numpy,
4+ numexpr, scipy, etc., see the Python section of the NixPkgs manual.
5+*/
196stdenvNoCC.mkDerivation rec {
207 name = "mkl-${version}";
218 version = "${date}.${rel}";
@@ -43,16 +30,23 @@ stdenvNoCC.mkDerivation rec {
4330 '' else ''
4431 rpmextract rpm/intel-mkl-common-c-${date}-${rel}-${date}-${rel}.noarch.rpm
4532 rpmextract rpm/intel-mkl-core-rt-${date}-${rel}-${date}-${rel}.x86_64.rpm
33+ rpmextract rpm/intel-openmp-19.0.0-${rel}-19.0.0-${rel}.x86_64.rpm
4634 '';
4735
4836 installPhase = if stdenvNoCC.isDarwin then ''
4937 mkdir -p $out/lib
38+
5039 cp -r compilers_and_libraries_${version}/mac/mkl/include $out/
51− cp -r compilers_and_libraries_${version}/mac/mkl/lib/* $out/lib/
40+
5241 cp -r compilers_and_libraries_${version}/licensing/mkl/en/license.txt $out/lib/
42+ cp -r compilers_and_libraries_${version}/mac/compiler/lib/* $out/lib/
43+ cp -r compilers_and_libraries_${version}/mac/mkl/lib/* $out/lib/
5344 '' else ''
5445 mkdir -p $out/lib
46+
5547 cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/include $out/
48+
49+ cp -r opt/intel/compilers_and_libraries_${version}/linux/compiler/lib/intel64_lin/* $out/lib/
5650 cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/lib/intel64_lin/* $out/lib/
5751 cp license.txt $out/lib/
5852 '';
@@ -66,8 +60,8 @@ stdenvNoCC.mkDerivation rec {
6660 outputHashAlgo = "sha256";
6761 outputHashMode = "recursive";
6862 outputHash = if stdenvNoCC.isDarwin
69− then "1224dln7n8px1rk8biiggf77wjhxh8mzw0hd8zlyjm8i6j8w7i12"
70− else "0d8ai0wi8drp071acqkm1wv6vyg12010y843y56zzi1pql81xqvx";
63+ then "0000000000000000000000000000000000000000000000000000"
64+ else "1amagcaan0hk3x9v7gg03gkw02n066v4kmjb32yyzsy5rfrivb1a";
7165
7266 meta = with stdenvNoCC.lib; {
7367 description = "Intel Math Kernel Library";
@@ -78,7 +72,7 @@ stdenvNoCC.mkDerivation rec {
7872 threading models.
7973 '';
8074 homepage = https://software.intel.com/en-us/mkl;
81− license = [ licenses.issl licenses.unfreeRedistributable ];
75+ license = licenses.issl;
8276 platforms = [ "x86_64-linux" "x86_64-darwin" ];
8377 maintainers = [ maintainers.bhipple ];
8478 };
pkgs/development/libraries/science/math/openblas/default.nix+9−2
@@ -89,6 +89,15 @@ stdenv.mkDerivation rec {
8989
9090 inherit blas64;
9191
92+ patches = [
93+ # Fixes build on x86_64-darwin. See:
94+ # https://github.com/xianyi/OpenBLAS/issues/1926
95+ (fetchpatch {
96+ url = https://github.com/xianyi/OpenBLAS/commit/701ea88347461e4c5d896765438dc870281b3834.patch;
97+ sha256 = "18rcfgkjsijl9d2510jn961wqvz7zdlz2fgy1yjmax29kvv8fqd9";
98+ })
99+ ];
100+
92101 # Some hardening features are disabled due to sporadic failures in
93102 # OpenBLAS-based programs. The problem may not be with OpenBLAS itself, but
94103 # with how these flags interact with hardening measures used downstream.
@@ -118,8 +127,6 @@ stdenv.mkDerivation rec {
118127 ] ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "musl") "NO_AFFINITY=1"
119128 ++ mapAttrsToList (var: val: var + "=" + val) config;
120129
121− patches = [];
122−
123130 doCheck = true;
124131 checkTarget = "tests";
125132
pkgs/development/libraries/wlroots/default.nix+1−18
@@ -2,28 +2,11 @@
22, wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman
33, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa_noglu
44, libpng, ffmpeg_4
5−, python3Packages # TODO: Temporary
65}:
76
87let
98 pname = "wlroots";
109 version = "0.2";
11− meson480 = meson.overrideAttrs (oldAttrs: rec {
12− name = pname + "-" + version;
13− pname = "meson";
14− version = "0.48.0";
15−
16− src = python3Packages.fetchPypi {
17− inherit pname version;
18− sha256 = "0qawsm6px1vca3babnqwn0hmkzsxy4w0gi345apd2qk3v0cv7ipc";
19− };
20− # Remove gir-fallback-path.patch and
21− # a87496addd9160300837aa50193f4798c6f1d251.patch (already in 0.48.0):
22− patches = builtins.filter
23− (str: !(stdenv.lib.hasSuffix "gir-fallback-path.patch" str
24− || stdenv.lib.hasSuffix "a87496addd9160300837aa50193f4798c6f1d251.patch" str))
25− oldAttrs.patches;
26− });
2710in stdenv.mkDerivation rec {
2811 name = "${pname}-${version}";
2912
@@ -43,7 +26,7 @@ in stdenv.mkDerivation rec {
4326 # programs (in examples) AND rootston
4427 outputs = [ "out" "bin" "examples" ];
4528
46− nativeBuildInputs = [ meson480 ninja pkgconfig ];
29+ nativeBuildInputs = [ meson ninja pkgconfig ];
4730
4831 buildInputs = [
4932 wayland libGL wayland-protocols libinput libxkbcommon pixman
pkgs/development/libraries/wt/default.nix+2−2
@@ -48,7 +48,7 @@ in {
4848 };
4949
5050 wt4 = generic {
51− version = "4.0.4";
52− sha256 = "17kq9fxc0xqx7q7kyryiph3mg0d3hnd3jw0rl55zvzfsdd71220w";
51+ version = "4.0.5";
52+ sha256 = "1gn8f30mjmn9aaxdazk49wijz37nglfww15ydrjiyhl6v5xhsjdv";
5353 };
5454}
pkgs/development/mobile/adb-sync/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, python3, androidsdk, makeWrapper }:
1+{ stdenv, fetchgit, python3, platform-tools, makeWrapper }:
22
33stdenv.mkDerivation rec {
44 name = "adb-sync-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "1y016bjky5sn58v91jyqfz7vw8qfqnfhb9s9jd32k8y29hy5vy4d";
1111 };
1212
13− buildInputs = [ python3 androidsdk makeWrapper ];
13+ buildInputs = [ python3 platform-tools makeWrapper ];
1414
1515 phases = "installPhase";
1616
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 mkdir -p $out/bin
1919 cp $src/adb-channel $src/adb-sync $out/bin/
2020 patchShebangs $out/bin
21− wrapProgram $out/bin/adb-sync --suffix PATH : ${androidsdk}/bin
21+ wrapProgram $out/bin/adb-sync --suffix PATH : ${platform-tools}/bin
2222 '';
2323
2424 meta = with stdenv.lib; {
pkgs/development/mobile/adbfs-rootless/default.nix+1−1
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424
2525 postPatch = ''
2626 # very ugly way of replacing the adb calls
27− sed -e 's|"adb |"${stdenv.lib.getBin adb}/bin/adb |g' \
27+ sed -e 's|"adb |"${adb}/bin/adb |g' \
2828 -i adbfs.cpp
2929 '';
3030
pkgs/development/mobile/androidenv/addon.xmldeleted−1614
@@ -1,1614 +0,0 @@
1−<?xml version="1.0" ?>
2−<sdk:sdk-addon xmlns:sdk="http://schemas.android.com/sdk/android/addon/7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
3− <!--Generated on 2018-09-27 12:07:52.862255 with ADRT.-->
4− <sdk:license id="android-sdk-license" type="text">Terms and Conditions
5−
6−This is the Android Software Development Kit License Agreement
7−
8−1. Introduction
9−
10−1.1 The Android Software Development Kit (referred to in the License Agreement as the &quot;SDK&quot; 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.
11−
12−1.2 &quot;Android&quot; 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.
13−
14−1.3 A &quot;compatible implementation&quot; 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).
15−
16−1.4 &quot;Google&quot; means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
17−
18−
19−2. Accepting the License Agreement
20−
21−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.
22−
23−2.2 By clicking to accept, you hereby agree to the terms of the License Agreement.
24−
25−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.
26−
27−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.
28−
29−
30−3. SDK License from Google
31−
32−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.
33−
34−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.
35−
36−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. &quot;Intellectual Property Rights&quot; 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.
37−
38−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.
39−
40−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.
41−
42−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.
43−
44−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.
45−
46−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.
47−
48−
49−4. Use of the SDK by You
50−
51−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.
52−
53−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).
54−
55−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.
56−
57−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.
58−
59−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.
60−
61−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.
62−
63−5. Your Developer Credentials
64−
65−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.
66−
67−6. Privacy and Information
68−
69−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.
70−
71−6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy.
72−
73−
74−7. Third Party Applications
75−
76−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.
77−
78−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.
79−
80−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.
81−
82−
83−8. Using Android APIs
84−
85−8.1 Google Data APIs
86−
87−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.
88−
89−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.
90−
91−
92−9. Terminating the License Agreement
93−
94−9.1 The License Agreement will continue to apply until terminated by either you or Google as set out below.
95−
96−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.
97−
98−9.3 Google may at any time, terminate the License Agreement with you if:
99−(A) you have breached any provision of the License Agreement; or
100−(B) Google is required to do so by law; or
101−(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
102−(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.
103−
104−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.
105−
106−
107−10. DISCLAIMER OF WARRANTIES
108−
109−10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE SDK IS PROVIDED &quot;AS IS&quot; AND &quot;AS AVAILABLE&quot; WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
110−
111−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.
112−
113−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.
114−
115−
116−11. LIMITATION OF LIABILITY
117−
118−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.
119−
120−
121−12. Indemnification
122−
123−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.
124−
125−
126−13. Changes to the License Agreement
127−
128−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.
129−
130−
131−14. General Legal Terms
132−
133−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.
134−
135−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.
136−
137−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.
138−
139−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.
140−
141−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.
142−
143−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.
144−
145−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.
146−
147−
148−November 20, 2015</sdk:license>
149− <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.
150−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.
151−
152−This is the Android SDK Preview License Agreement (the &quot;License Agreement&quot;).
153−
154−1. Introduction
155−
156−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.
157−
158−1.2 &quot;Android&quot; 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.
159−
160−1.3 &quot;Google&quot; means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
161−
162−2. Accepting the License Agreement
163−
164−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.
165−
166−2.2 By clicking to accept and/or using the Preview, you hereby agree to the terms of the License Agreement.
167−
168−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.
169−
170−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.
171−
172−3. Preview License from Google
173−
174−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.
175−
176−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. &quot;Intellectual Property Rights&quot; 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.
177−
178−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.
179−
180−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.
181−
182−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.
183−
184−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.
185−
186−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.
187−
188−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.
189−
190−4. Use of the Preview by You
191−
192−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.
193−
194−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).
195−
196−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.
197−
198−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.
199−
200−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.
201−
202−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.
203−
204−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.
205−
206−5. Your Developer Credentials
207−
208−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.
209−
210−6. Privacy and Information
211−
212−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.
213−
214−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/.
215−
216−7. Third Party Applications
217−
218−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.
219−
220−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.
221−
222−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.
223−
224−8. Using Google APIs
225−
226−8.1 Google APIs
227−
228−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.
229−
230−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.
231−
232−9. Terminating the License Agreement
233−
234−9.1 the License Agreement will continue to apply until terminated by either you or Google as set out below.
235−
236−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.
237−
238−9.3 Google may at any time, terminate the License Agreement, with or without cause, upon notice to you.
239−
240−9.4 The License Agreement will automatically terminate without notice or other action upon the earlier of:
241−(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
242−(B) Google issues a final release version of the Android SDK.
243−
244−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.
245−
246−10. DISCLAIMERS
247−
248−10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE PREVIEW IS AT YOUR SOLE RISK AND THAT THE PREVIEW IS PROVIDED &quot;AS IS&quot; AND &quot;AS AVAILABLE&quot; WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
249−
250−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.
251−
252−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.
253−
254−11. LIMITATION OF LIABILITY
255−
256−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.
257−
258−12. Indemnification
259−
260−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.
261−
262−13. Changes to the License Agreement
263−
264−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.
265−
266−14. General Legal Terms
267−
268−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.
269−
270−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.
271−
272−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.
273−
274−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.
275−
276−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.
277−
278−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.
279−
280−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.
281−
282−June 2014.</sdk:license>
283− <sdk:license id="android-googletv-license" type="text">Terms and Conditions
284−
285−This is the Google TV Add-on for the Android Software Development Kit License Agreement.
286−
287−1. Introduction
288−
289−1.1 The Google TV Add-on for the Android Software Development Kit (referred to in this License Agreement as the &quot;Google TV Add-on&quot; 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.
290−
291−1.2 &quot;Google&quot; means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
292−
293−2. Accepting this License Agreement
294−
295−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.
296−
297−2.2 You can accept this License Agreement by:
298−
299−(A) clicking to accept or agree to this License Agreement, where this option is made available to you; or
300−
301−(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.
302−
303−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.
304−
305−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.
306−
307−3. Google TV Add-on License from Google
308−
309−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.
310−
311−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. &quot;Intellectual Property Rights&quot; 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.
312−
313−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.
314−
315−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.
316−
317−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.
318−
319−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.
320−
321−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.
322−
323−4. Use of the Google TV Add-on by You
324−
325−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.
326−
327−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).
328−
329−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.
330−
331−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.
332−
333−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.
334−
335−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.
336−
337−5. Your Developer Credentials
338−
339−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.
340−
341−6. Privacy and Information
342−
343−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.
344−
345−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.
346−
347−7. Third Party Applications for the Google TV Platform
348−
349−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.
350−
351−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.
352−
353−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.
354−
355−8. Using Google TV APIs
356−
357−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
358−
359−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.
360−
361−8.3 Except as explicitly permitted in Section 3 (Google TV Add-on License from Google), you must:
362−
363−(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;
364−
365−(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
366−
367−(c) not create any commercial audience measurement tool or service using the Google TV API Content
368−
369−9. Terminating this License Agreement
370−
371−9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below.
372−
373−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.
374−
375−9.3 Google may at any time, terminate this License Agreement with you if:
376−
377−(A) you have breached any provision of this License Agreement; or
378−
379−(B) Google is required to do so by law; or
380−
381−(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
382−
383−(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.
384−
385−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.
386−
387−10. DISCLAIMER OF WARRANTIES
388−
389−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 &quot;AS IS&quot; AND &quot;AS AVAILABLE&quot; WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
390−
391−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.
392−
393−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.
394−
395−11. LIMITATION OF LIABILITY
396−
397−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.
398−
399−12. Indemnification
400−
401−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.
402−
403−13. Changes to the License Agreement
404−
405−13.1 Google may make changes to the License Agreement as it distributes new versions of the Google TV Add-on.
406−
407−14. General Legal Terms
408−
409−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.
410−
411−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.
412−
413−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.
414−
415−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.
416−
417−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.
418−
419−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.
420−
421−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.
422−
423−
424−August 15, 2011</sdk:license>
425− <sdk:license id="google-gdk-license" type="text">This is a Developer Preview of the GDK that is subject to change.
426−
427−Terms and Conditions
428−
429−This is the Glass Development Kit License Agreement.
430−
431−1. Introduction
432−
433−1.1 The Glass Development Kit (referred to in this License Agreement as the &quot;GDK&quot; 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.
434−
435−1.2 &quot;Glass&quot; means Glass devices and the Glass software stack for use on Glass devices.
436−
437−
438−1.3 &quot;Android&quot; 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.
439−
440−1.4 &quot;Google&quot; means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
441−
442−2. Accepting this License Agreement
443−
444−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.
445−
446−2.2 By clicking to accept, you hereby agree to the terms of this License Agreement.
447−
448−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.
449−
450−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.
451−
452−3. GDK License from Google
453−
454−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.
455−
456−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. &quot;Intellectual Property Rights&quot; 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.
457−
458−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.
459−
460−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.
461−
462−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.
463−
464−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.
465−
466−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.
467−
468−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.
469−
470−
471−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.
472−
473−4. Use of the GDK by You
474−
475−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.
476−
477−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).
478−
479−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.
480−
481−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.
482−
483−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.
484−
485−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.
486−
487−
488−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.
489−
490−5. Your Developer Credentials
491−
492−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.
493−
494−6. Privacy and Information
495−
496−
497−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.
498−
499−6.2 The data collected is examined in the aggregate to improve the GDK and is maintained in accordance with Google's Privacy Policy.
500−
501−7. Third Party Applications
502−
503−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.
504−
505−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.
506−
507−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.
508−
509−8. Using Google APIs
510−
511−8.1 Google APIs
512−
513−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.
514−
515−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.
516−
517−9. Terminating this License Agreement
518−
519−9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below.
520−
521−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.
522−
523−9.3 Google may at any time, terminate this License Agreement with you if:
524−(A) you have breached any provision of this License Agreement; or
525−(B) Google is required to do so by law; or
526−(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
527−(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.
528−
529−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.
530−
531−10. DISCLAIMER OF WARRANTIES
532−
533−10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE GDK IS AT YOUR SOLE RISK AND THAT THE GDK IS PROVIDED &quot;AS IS&quot; AND &quot;AS AVAILABLE&quot; WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
534−
535−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.
536−
537−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.
538−
539−11. LIMITATION OF LIABILITY
540−
541−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.
542−
543−12. Indemnification
544−
545−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.
546−
547−13. Changes to the License Agreement
548−
549−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.
550−
551−14. General Legal Terms
552−
553−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.
554−
555−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.
556−
557−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.
558−
559−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.
560−
561−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.
562−
563−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.
564−
565−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.
566−
567−November 19, 2013</sdk:license>
568− <sdk:license id="intel-android-extra-license" type="text">Intel (R) Hardware Accelerated Execution Manager
569−End-User License Agreement
570−
571−Copyright (c) 2012 Intel Corporation.
572−All rights reserved.
573−
574−Redistribution. Redistribution and use in binary form, without modification, are permitted provided that the following conditions are met:
575−
576−1.Redistributions must reproduce the above copyright notice and the following disclaimer in the documentation and/or other materials provided with the distribution.
577−
578−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.
579−
580−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 (&quot;Utilize&quot;) 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.
581−
582−DISCLAIMER.
583−THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&quot; 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>
584− <sdk:add-on>
585− <!--Generated from bid:12617722, branch:perforce-->
586− <sdk:obsolete/>
587− <sdk:revision>3</sdk:revision>
588− <sdk:archives>
589− <sdk:archive>
590− <!--Built on: Sat May 19 22:41:19 2018.-->
591− <sdk:size>34908058</sdk:size>
592− <sdk:checksum type="sha1">1f92abf3a76be66ae8032257fc7620acbd2b2e3a</sdk:checksum>
593− <sdk:url>google_apis-3-r03.zip</sdk:url>
594− </sdk:archive>
595− </sdk:archives>
596− <sdk:uses-license ref="android-sdk-license"/>
597− <sdk:vendor-id>google</sdk:vendor-id>
598− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
599− <sdk:name-id>google_apis</sdk:name-id>
600− <sdk:name-display>Google APIs</sdk:name-display>
601− <sdk:api-level>3</sdk:api-level>
602− <sdk:description>Android + Google APIs</sdk:description>
603− <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
604− <sdk:libs>
605− <sdk:lib>
606− <sdk:name>com.google.android.maps</sdk:name>
607− <sdk:description>API for Google Maps</sdk:description>
608− </sdk:lib>
609− </sdk:libs>
610− </sdk:add-on>
611− <sdk:add-on>
612− <!--Generated from bid:13752552, branch:perforce-->
613− <sdk:obsolete/>
614− <sdk:revision>2</sdk:revision>
615− <sdk:archives>
616− <sdk:archive>
617− <!--Built on: Sun Jun 3 14:03:04 2018.-->
618− <sdk:size>42435735</sdk:size>
619− <sdk:checksum type="sha1">9b6e86d8568558de4d606a7debc4f6049608dbd0</sdk:checksum>
620− <sdk:url>google_apis-4_r02.zip</sdk:url>
621− </sdk:archive>
622− </sdk:archives>
623− <sdk:uses-license ref="android-sdk-license"/>
624− <sdk:vendor-id>google</sdk:vendor-id>
625− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
626− <sdk:name-id>google_apis</sdk:name-id>
627− <sdk:name-display>Google APIs</sdk:name-display>
628− <sdk:api-level>4</sdk:api-level>
629− <sdk:description>Android + Google APIs</sdk:description>
630− <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
631− <sdk:libs>
632− <sdk:lib>
633− <sdk:name>com.google.android.maps</sdk:name>
634− <sdk:description>API for Google Maps</sdk:description>
635− </sdk:lib>
636− </sdk:libs>
637− </sdk:add-on>
638− <sdk:add-on>
639− <!--Generated from bid:13245770, branch:perforce-->
640− <sdk:obsolete/>
641− <sdk:revision>1</sdk:revision>
642− <sdk:archives>
643− <sdk:archive>
644− <!--Built on: Tue Jun 5 17:50:33 2018.-->
645− <sdk:size>49123776</sdk:size>
646− <sdk:checksum type="sha1">46eaeb56b645ee7ffa24ede8fa17f3df70db0503</sdk:checksum>
647− <sdk:url>google_apis-5_r01.zip</sdk:url>
648− </sdk:archive>
649− </sdk:archives>
650− <sdk:uses-license ref="android-sdk-license"/>
651− <sdk:vendor-id>google</sdk:vendor-id>
652− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
653− <sdk:name-id>google_apis</sdk:name-id>
654− <sdk:name-display>Google APIs</sdk:name-display>
655− <sdk:api-level>5</sdk:api-level>
656− <sdk:description>Android + Google APIs</sdk:description>
657− <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
658− <sdk:libs>
659− <sdk:lib>
660− <sdk:name>com.google.android.maps</sdk:name>
661− <sdk:description>API for Google Maps</sdk:description>
662− </sdk:lib>
663− </sdk:libs>
664− </sdk:add-on>
665− <sdk:add-on>
666− <!--Generated from bid:13752552, branch:perforce-->
667− <sdk:obsolete/>
668− <sdk:revision>1</sdk:revision>
669− <sdk:archives>
670− <sdk:archive>
671− <!--Built on: Sun Jun 10 12:37:49 2018.-->
672− <sdk:size>53382941</sdk:size>
673− <sdk:checksum type="sha1">5ff545d96e031e09580a6cf55713015c7d4936b2</sdk:checksum>
674− <sdk:url>google_apis-6_r01.zip</sdk:url>
675− </sdk:archive>
676− </sdk:archives>
677− <sdk:uses-license ref="android-sdk-license"/>
678− <sdk:vendor-id>google</sdk:vendor-id>
679− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
680− <sdk:name-id>google_apis</sdk:name-id>
681− <sdk:name-display>Google APIs</sdk:name-display>
682− <sdk:api-level>6</sdk:api-level>
683− <sdk:description>Android + Google APIs</sdk:description>
684− <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
685− <sdk:libs>
686− <sdk:lib>
687− <sdk:name>com.google.android.maps</sdk:name>
688− <sdk:description>API for Google Maps</sdk:description>
689− </sdk:lib>
690− </sdk:libs>
691− </sdk:add-on>
692− <sdk:add-on>
693− <!--Generated from bid:14140606, branch:perforce-->
694− <sdk:obsolete/>
695− <sdk:revision>1</sdk:revision>
696− <sdk:archives>
697− <sdk:archive>
698− <!--Built on: Wed May 30 22:32:20 2018.-->
699− <sdk:size>53691339</sdk:size>
700− <sdk:checksum type="sha1">2e7f91e0fe34fef7f58aeced973c6ae52361b5ac</sdk:checksum>
701− <sdk:url>google_apis-7_r01.zip</sdk:url>
702− </sdk:archive>
703− </sdk:archives>
704− <sdk:uses-license ref="android-sdk-license"/>
705− <sdk:vendor-id>google</sdk:vendor-id>
706− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
707− <sdk:name-id>google_apis</sdk:name-id>
708− <sdk:name-display>Google APIs</sdk:name-display>
709− <sdk:api-level>7</sdk:api-level>
710− <sdk:description>Android + Google APIs</sdk:description>
711− <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
712− <sdk:libs>
713− <sdk:lib>
714− <sdk:name>com.google.android.maps</sdk:name>
715− <sdk:description>API for Google Maps</sdk:description>
716− </sdk:lib>
717− </sdk:libs>
718− </sdk:add-on>
719− <sdk:add-on>
720− <!--Generated from bid:16286500, branch:perforce-->
721− <sdk:obsolete/>
722− <sdk:revision>2</sdk:revision>
723− <sdk:archives>
724− <sdk:archive>
725− <!--Built on: Mon Jun 11 03:39:55 2018.-->
726− <sdk:size>59505020</sdk:size>
727− <sdk:checksum type="sha1">3079958e7ec87222cac1e6b27bc471b27bf2c352</sdk:checksum>
728− <sdk:url>google_apis-8_r02.zip</sdk:url>
729− </sdk:archive>
730− </sdk:archives>
731− <sdk:uses-license ref="android-sdk-license"/>
732− <sdk:vendor-id>google</sdk:vendor-id>
733− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
734− <sdk:name-id>google_apis</sdk:name-id>
735− <sdk:name-display>Google APIs</sdk:name-display>
736− <sdk:api-level>8</sdk:api-level>
737− <sdk:description>Android + Google APIs</sdk:description>
738− <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
739− <sdk:libs>
740− <sdk:lib>
741− <sdk:name>com.google.android.maps</sdk:name>
742− <sdk:description>API for Google Maps</sdk:description>
743− </sdk:lib>
744− </sdk:libs>
745− </sdk:add-on>
746− <sdk:add-on>
747− <!--Generated from bid:19092731, branch:perforce-->
748− <sdk:obsolete/>
749− <sdk:revision>2</sdk:revision>
750− <sdk:archives>
751− <sdk:archive>
752− <!--Built on: Wed May 23 15:52:14 2018.-->
753− <sdk:size>63401546</sdk:size>
754− <sdk:checksum type="sha1">78664645a1e9accea4430814f8694291a7f1ea5d</sdk:checksum>
755− <sdk:url>google_apis-9_r02.zip</sdk:url>
756− </sdk:archive>
757− </sdk:archives>
758− <sdk:uses-license ref="android-sdk-license"/>
759− <sdk:vendor-id>google</sdk:vendor-id>
760− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
761− <sdk:name-id>google_apis</sdk:name-id>
762− <sdk:name-display>Google APIs</sdk:name-display>
763− <sdk:api-level>9</sdk:api-level>
764− <sdk:description>Android + Google APIs</sdk:description>
765− <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
766− <sdk:libs>
767− <sdk:lib>
768− <sdk:name>com.google.android.maps</sdk:name>
769− <sdk:description>API for Google Maps</sdk:description>
770− </sdk:lib>
771− </sdk:libs>
772− </sdk:add-on>
773− <sdk:add-on>
774− <!--Generated from bid:21121559, branch:perforce-->
775− <sdk:obsolete/>
776− <sdk:revision>2</sdk:revision>
777− <sdk:archives>
778− <sdk:archive>
779− <!--Built on: Tue May 29 03:55:38 2018.-->
780− <sdk:size>65781578</sdk:size>
781− <sdk:checksum type="sha1">cc0711857c881fa7534f90cf8cc09b8fe985484d</sdk:checksum>
782− <sdk:url>google_apis-10_r02.zip</sdk:url>
783− </sdk:archive>
784− </sdk:archives>
785− <sdk:uses-license ref="android-sdk-license"/>
786− <sdk:vendor-id>google</sdk:vendor-id>
787− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
788− <sdk:name-id>google_apis</sdk:name-id>
789− <sdk:name-display>Google APIs</sdk:name-display>
790− <sdk:api-level>10</sdk:api-level>
791− <sdk:description>Android + Google APIs</sdk:description>
792− <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
793− <sdk:libs>
794− <sdk:lib>
795− <sdk:name>com.google.android.maps</sdk:name>
796− <sdk:description>API for Google Maps</sdk:description>
797− </sdk:lib>
798− <sdk:lib>
799− <sdk:name>com.android.future.usb.accessory</sdk:name>
800− <sdk:description>API for USB Accessories</sdk:description>
801− </sdk:lib>
802− </sdk:libs>
803− </sdk:add-on>
804− <sdk:add-on>
805− <!--Generated from bid:19633933, branch:perforce-->
806− <sdk:obsolete/>
807− <sdk:revision>1</sdk:revision>
808− <sdk:archives>
809− <sdk:archive>
810− <!--Built on: Thu Jun 14 15:13:30 2018.-->
811− <sdk:size>83477179</sdk:size>
812− <sdk:checksum type="sha1">5eab5e81addee9f3576d456d205208314b5146a5</sdk:checksum>
813− <sdk:url>google_apis-11_r01.zip</sdk:url>
814− </sdk:archive>
815− </sdk:archives>
816− <sdk:uses-license ref="android-sdk-license"/>
817− <sdk:vendor-id>google</sdk:vendor-id>
818− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
819− <sdk:name-id>google_apis</sdk:name-id>
820− <sdk:name-display>Google APIs</sdk:name-display>
821− <sdk:api-level>11</sdk:api-level>
822− <sdk:description>Android + Google APIs</sdk:description>
823− <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
824− <sdk:libs>
825− <sdk:lib>
826− <sdk:name>com.google.android.maps</sdk:name>
827− <sdk:description>API for Google Maps</sdk:description>
828− </sdk:lib>
829− </sdk:libs>
830− </sdk:add-on>
831− <sdk:add-on>
832− <!--Generated from bid:21121559, branch:perforce-->
833− <sdk:obsolete/>
834− <sdk:revision>1</sdk:revision>
835− <sdk:archives>
836− <sdk:archive>
837− <!--Built on: Mon Jun 11 10:52:20 2018.-->
838− <sdk:size>86099835</sdk:size>
839− <sdk:checksum type="sha1">e9999f4fa978812174dfeceec0721c793a636e5d</sdk:checksum>
840− <sdk:url>google_apis-12_r01.zip</sdk:url>
841− </sdk:archive>
842− </sdk:archives>
843− <sdk:uses-license ref="android-sdk-license"/>
844− <sdk:vendor-id>google</sdk:vendor-id>
845− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
846− <sdk:name-id>google_apis</sdk:name-id>
847− <sdk:name-display>Google APIs</sdk:name-display>
848− <sdk:api-level>12</sdk:api-level>
849− <sdk:description>Android + Google APIs</sdk:description>
850− <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
851− <sdk:libs>
852− <sdk:lib>
853− <sdk:name>com.google.android.maps</sdk:name>
854− <sdk:description>API for Google Maps</sdk:description>
855− </sdk:lib>
856− <sdk:lib>
857− <sdk:name>com.android.future.usb.accessory</sdk:name>
858− <sdk:description>API for USB Accessories</sdk:description>
859− </sdk:lib>
860− </sdk:libs>
861− </sdk:add-on>
862− <sdk:add-on>
863− <!--Generated from bid:22531000, branch:perforce-->
864− <sdk:obsolete/>
865− <sdk:revision>1</sdk:revision>
866− <sdk:archives>
867− <sdk:archive>
868− <!--Built on: Sun May 27 03:09:43 2018.-->
869− <sdk:size>88615525</sdk:size>
870− <sdk:checksum type="sha1">3b153edd211c27dc736c893c658418a4f9041417</sdk:checksum>
871− <sdk:url>google_apis-13_r01.zip</sdk:url>
872− </sdk:archive>
873− </sdk:archives>
874− <sdk:uses-license ref="android-sdk-license"/>
875− <sdk:vendor-id>google</sdk:vendor-id>
876− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
877− <sdk:name-id>google_apis</sdk:name-id>
878− <sdk:name-display>Google APIs</sdk:name-display>
879− <sdk:api-level>13</sdk:api-level>
880− <sdk:description>Android + Google APIs</sdk:description>
881− <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
882− <sdk:libs>
883− <sdk:lib>
884− <sdk:name>com.google.android.maps</sdk:name>
885− <sdk:description>API for Google Maps</sdk:description>
886− </sdk:lib>
887− <sdk:lib>
888− <sdk:name>com.android.future.usb.accessory</sdk:name>
889− <sdk:description>API for USB Accessories</sdk:description>
890− </sdk:lib>
891− </sdk:libs>
892− </sdk:add-on>
893− <sdk:add-on>
894− <!--Generated from bid:26085354, branch:perforce-->
895− <sdk:obsolete/>
896− <sdk:revision>2</sdk:revision>
897− <sdk:archives>
898− <sdk:archive>
899− <!--Built on: Wed Jun 13 22:44:43 2018.-->
900− <sdk:size>106533714</sdk:size>
901− <sdk:checksum type="sha1">f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39</sdk:checksum>
902− <sdk:url>google_apis-14_r02.zip</sdk:url>
903− </sdk:archive>
904− </sdk:archives>
905− <sdk:uses-license ref="android-sdk-license"/>
906− <sdk:vendor-id>google</sdk:vendor-id>
907− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
908− <sdk:name-id>google_apis</sdk:name-id>
909− <sdk:name-display>Google APIs</sdk:name-display>
910− <sdk:api-level>14</sdk:api-level>
911− <sdk:description>Android + Google APIs</sdk:description>
912− <sdk:libs>
913− <sdk:lib>
914− <sdk:name>com.google.android.maps</sdk:name>
915− <sdk:description>API for Google Maps</sdk:description>
916− </sdk:lib>
917− <sdk:lib>
918− <sdk:name>com.android.future.usb.accessory</sdk:name>
919− <sdk:description>API for USB Accessories</sdk:description>
920− </sdk:lib>
921− </sdk:libs>
922− </sdk:add-on>
923− <sdk:add-on>
924− <!--Generated from bid:95160078, branch:perforce-->
925− <sdk:revision>3</sdk:revision>
926− <sdk:archives>
927− <sdk:archive>
928− <!--Built on: Fri Jun 15 19:37:58 2018.-->
929− <sdk:size>106624396</sdk:size>
930− <sdk:checksum type="sha1">d0d2bf26805eb271693570a1aaec33e7dc3f45e9</sdk:checksum>
931− <sdk:url>google_apis-15_r03.zip</sdk:url>
932− </sdk:archive>
933− </sdk:archives>
934− <sdk:uses-license ref="android-sdk-license"/>
935− <sdk:vendor-id>google</sdk:vendor-id>
936− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
937− <sdk:name-id>google_apis</sdk:name-id>
938− <sdk:name-display>Google APIs</sdk:name-display>
939− <sdk:api-level>15</sdk:api-level>
940− <sdk:description>Android + Google APIs</sdk:description>
941− <sdk:libs>
942− <sdk:lib>
943− <sdk:name>com.google.android.maps</sdk:name>
944− <sdk:description>API for Google Maps</sdk:description>
945− </sdk:lib>
946− <sdk:lib>
947− <sdk:name>com.android.future.usb.accessory</sdk:name>
948− <sdk:description>API for USB Accessories</sdk:description>
949− </sdk:lib>
950− <sdk:lib>
951− <sdk:name>com.google.android.media.effects</sdk:name>
952− <sdk:description>Collection of video effects</sdk:description>
953− </sdk:lib>
954− </sdk:libs>
955− </sdk:add-on>
956− <sdk:add-on>
957− <!--Generated from bid:95160078, branch:perforce-->
958− <sdk:revision>4</sdk:revision>
959− <sdk:archives>
960− <sdk:archive>
961− <!--Built on: Sun Jun 10 20:07:39 2018.-->
962− <sdk:size>127341982</sdk:size>
963− <sdk:checksum type="sha1">ee6acf1b01020bfa8a8e24725dbc4478bee5e792</sdk:checksum>
964− <sdk:url>google_apis-16_r04.zip</sdk:url>
965− </sdk:archive>
966− </sdk:archives>
967− <sdk:uses-license ref="android-sdk-license"/>
968− <sdk:vendor-id>google</sdk:vendor-id>
969− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
970− <sdk:name-id>google_apis</sdk:name-id>
971− <sdk:name-display>Google APIs</sdk:name-display>
972− <sdk:api-level>16</sdk:api-level>
973− <sdk:description>Android + Google APIs</sdk:description>
974− <sdk:libs>
975− <sdk:lib>
976− <sdk:name>com.google.android.maps</sdk:name>
977− <sdk:description>API for Google Maps</sdk:description>
978− </sdk:lib>
979− <sdk:lib>
980− <sdk:name>com.android.future.usb.accessory</sdk:name>
981− <sdk:description>API for USB Accessories</sdk:description>
982− </sdk:lib>
983− <sdk:lib>
984− <sdk:name>com.google.android.media.effects</sdk:name>
985− <sdk:description>Collection of video effects</sdk:description>
986− </sdk:lib>
987− </sdk:libs>
988− </sdk:add-on>
989− <sdk:add-on>
990− <!--Generated from bid:94805340, branch:perforce-->
991− <sdk:revision>4</sdk:revision>
992− <sdk:archives>
993− <sdk:archive>
994− <!--Built on: Wed May 30 17:17:51 2018.-->
995− <sdk:size>137231243</sdk:size>
996− <sdk:checksum type="sha1">a076be0677f38df8ca5536b44dfb411a0c808c4f</sdk:checksum>
997− <sdk:url>google_apis-17_r04.zip</sdk:url>
998− </sdk:archive>
999− </sdk:archives>
1000− <sdk:uses-license ref="android-sdk-license"/>
1001− <sdk:vendor-id>google</sdk:vendor-id>
1002− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
1003− <sdk:name-id>google_apis</sdk:name-id>
1004− <sdk:name-display>Google APIs</sdk:name-display>
1005− <sdk:api-level>17</sdk:api-level>
1006− <sdk:description>Android + Google APIs</sdk:description>
1007− <sdk:libs>
1008− <sdk:lib>
1009− <sdk:name>com.google.android.maps</sdk:name>
1010− <sdk:description>API for Google Maps</sdk:description>
1011− </sdk:lib>
1012− <sdk:lib>
1013− <sdk:name>com.android.future.usb.accessory</sdk:name>
1014− <sdk:description>API for USB Accessories</sdk:description>
1015− </sdk:lib>
1016− <sdk:lib>
1017− <sdk:name>com.google.android.media.effects</sdk:name>
1018− <sdk:description>Collection of video effects</sdk:description>
1019− </sdk:lib>
1020− </sdk:libs>
1021− </sdk:add-on>
1022− <sdk:add-on>
1023− <!--Generated from bid:94805340, branch:perforce-->
1024− <sdk:revision>4</sdk:revision>
1025− <sdk:archives>
1026− <sdk:archive>
1027− <!--Built on: Sun May 27 23:13:56 2018.-->
1028− <sdk:size>143195183</sdk:size>
1029− <sdk:checksum type="sha1">6109603409debdd40854d4d4a92eaf8481462c8b</sdk:checksum>
1030− <sdk:url>google_apis-18_r04.zip</sdk:url>
1031− </sdk:archive>
1032− </sdk:archives>
1033− <sdk:uses-license ref="android-sdk-license"/>
1034− <sdk:vendor-id>google</sdk:vendor-id>
1035− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
1036− <sdk:name-id>google_apis</sdk:name-id>
1037− <sdk:name-display>Google APIs</sdk:name-display>
1038− <sdk:api-level>18</sdk:api-level>
1039− <sdk:description>Android + Google APIs</sdk:description>
1040− <sdk:libs>
1041− <sdk:lib>
1042− <sdk:name>com.google.android.maps</sdk:name>
1043− <sdk:description>API for Google Maps</sdk:description>
1044− </sdk:lib>
1045− <sdk:lib>
1046− <sdk:name>com.android.future.usb.accessory</sdk:name>
1047− <sdk:description>API for USB Accessories</sdk:description>
1048− </sdk:lib>
1049− <sdk:lib>
1050− <sdk:name>com.google.android.media.effects</sdk:name>
1051− <sdk:description>Collection of video effects</sdk:description>
1052− </sdk:lib>
1053− </sdk:libs>
1054− </sdk:add-on>
1055− <sdk:add-on>
1056− <!--Generated from bid:2884604, branch:git_klp-emu-release-->
1057− <sdk:revision>20</sdk:revision>
1058− <sdk:archives>
1059− <sdk:archive>
1060− <!--Built on: Sat Jun 2 14:21:02 2018.-->
1061− <sdk:size>147081</sdk:size>
1062− <sdk:checksum type="sha1">5b933abe830b2f25b4c0f171d45e9e0651e56311</sdk:checksum>
1063− <sdk:url>google_apis-19_r20.zip</sdk:url>
1064− </sdk:archive>
1065− </sdk:archives>
1066− <sdk:uses-license ref="android-sdk-license"/>
1067− <sdk:vendor-id>google</sdk:vendor-id>
1068− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
1069− <sdk:name-id>google_apis</sdk:name-id>
1070− <sdk:name-display>Google APIs</sdk:name-display>
1071− <sdk:api-level>19</sdk:api-level>
1072− <sdk:description>Android + Google APIs</sdk:description>
1073− <sdk:libs>
1074− <sdk:lib>
1075− <sdk:name>com.google.android.maps</sdk:name>
1076− <sdk:description>API for Google Maps</sdk:description>
1077− </sdk:lib>
1078− <sdk:lib>
1079− <sdk:name>com.android.future.usb.accessory</sdk:name>
1080− <sdk:description>API for USB Accessories</sdk:description>
1081− </sdk:lib>
1082− <sdk:lib>
1083− <sdk:name>com.google.android.media.effects</sdk:name>
1084− <sdk:description>Collection of video effects</sdk:description>
1085− </sdk:lib>
1086− </sdk:libs>
1087− </sdk:add-on>
1088− <sdk:add-on>
1089− <!--Generated from bid:3249234, branch:git_nyc-emu-release-->
1090− <sdk:revision>1</sdk:revision>
1091− <sdk:archives>
1092− <sdk:archive>
1093− <!--Built on: Fri Jun 1 04:12:18 2018.-->
1094− <sdk:size>154865</sdk:size>
1095− <sdk:checksum type="sha1">31361c2868f27343ee917fbd259c1463821b6145</sdk:checksum>
1096− <sdk:url>google_apis-24_r1.zip</sdk:url>
1097− </sdk:archive>
1098− </sdk:archives>
1099− <sdk:uses-license ref="android-sdk-license"/>
1100− <sdk:vendor-id>google</sdk:vendor-id>
1101− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
1102− <sdk:name-id>google_apis</sdk:name-id>
1103− <sdk:name-display>Google APIs</sdk:name-display>
1104− <sdk:api-level>24</sdk:api-level>
1105− <sdk:description>Android + Google APIs</sdk:description>
1106− <sdk:libs>
1107− <sdk:lib>
1108− <sdk:name>com.google.android.maps</sdk:name>
1109− <sdk:description>API for Google Maps</sdk:description>
1110− </sdk:lib>
1111− <sdk:lib>
1112− <sdk:name>com.android.future.usb.accessory</sdk:name>
1113− <sdk:description>API for USB Accessories</sdk:description>
1114− </sdk:lib>
1115− <sdk:lib>
1116− <sdk:name>com.google.android.media.effects</sdk:name>
1117− <sdk:description>Collection of video effects</sdk:description>
1118− </sdk:lib>
1119− </sdk:libs>
1120− </sdk:add-on>
1121− <sdk:add-on>
1122− <!--Generated from bid:3756122, branch:git_nyc-mr1-emu-release-->
1123− <sdk:revision>1</sdk:revision>
1124− <sdk:archives>
1125− <sdk:archive>
1126− <!--Built on: Tue Jun 12 20:09:06 2018.-->
1127− <sdk:size>154871</sdk:size>
1128− <sdk:checksum type="sha1">550e83eea9513ab11c44919ac6da54b36084a9f3</sdk:checksum>
1129− <sdk:url>google_apis-25_r1.zip</sdk:url>
1130− </sdk:archive>
1131− </sdk:archives>
1132− <sdk:uses-license ref="android-sdk-license"/>
1133− <sdk:vendor-id>google</sdk:vendor-id>
1134− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
1135− <sdk:name-id>google_apis</sdk:name-id>
1136− <sdk:name-display>Google APIs</sdk:name-display>
1137− <sdk:api-level>23</sdk:api-level>
1138− <sdk:description>Android + Google APIs</sdk:description>
1139− <sdk:libs>
1140− <sdk:lib>
1141− <sdk:name>com.google.android.maps</sdk:name>
1142− <sdk:description>API for Google Maps</sdk:description>
1143− </sdk:lib>
1144− <sdk:lib>
1145− <sdk:name>com.android.future.usb.accessory</sdk:name>
1146− <sdk:description>API for USB Accessories</sdk:description>
1147− </sdk:lib>
1148− <sdk:lib>
1149− <sdk:name>com.google.android.media.effects</sdk:name>
1150− <sdk:description>Collection of video effects</sdk:description>
1151− </sdk:lib>
1152− </sdk:libs>
1153− </sdk:add-on>
1154− <sdk:add-on>
1155− <!--Generated from bid:77907680, branch:perforce-->
1156− <sdk:revision>1</sdk:revision>
1157− <sdk:archives>
1158− <sdk:archive>
1159− <!--Built on: Mon Jun 11 05:08:59 2018.-->
1160− <sdk:size>179499</sdk:size>
1161− <sdk:checksum type="sha1">66a754efb24e9bb07cc51648426443c7586c9d4a</sdk:checksum>
1162− <sdk:url>google_apis-21_r01.zip</sdk:url>
1163− </sdk:archive>
1164− </sdk:archives>
1165− <sdk:uses-license ref="android-sdk-license"/>
1166− <sdk:vendor-id>google</sdk:vendor-id>
1167− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
1168− <sdk:name-id>google_apis</sdk:name-id>
1169− <sdk:name-display>Google APIs</sdk:name-display>
1170− <sdk:api-level>21</sdk:api-level>
1171− <sdk:description>Android + Google APIs</sdk:description>
1172− <sdk:libs>
1173− <sdk:lib>
1174− <sdk:name>com.google.android.maps</sdk:name>
1175− <sdk:description>API for Google Maps</sdk:description>
1176− </sdk:lib>
1177− <sdk:lib>
1178− <sdk:name>com.android.future.usb.accessory</sdk:name>
1179− <sdk:description>API for USB Accessories</sdk:description>
1180− </sdk:lib>
1181− <sdk:lib>
1182− <sdk:name>com.google.android.media.effects</sdk:name>
1183− <sdk:description>Collection of video effects</sdk:description>
1184− </sdk:lib>
1185− </sdk:libs>
1186− </sdk:add-on>
1187− <sdk:add-on>
1188− <!--Generated from bid:87569863, branch:perforce-->
1189− <sdk:revision>1</sdk:revision>
1190− <sdk:archives>
1191− <sdk:archive>
1192− <!--Built on: Fri Jun 15 06:11:24 2018.-->
1193− <sdk:size>179259</sdk:size>
1194− <sdk:checksum type="sha1">5def0f42160cba8acff51b9c0c7e8be313de84f5</sdk:checksum>
1195− <sdk:url>google_apis-22_r01.zip</sdk:url>
1196− </sdk:archive>
1197− </sdk:archives>
1198− <sdk:uses-license ref="android-sdk-license"/>
1199− <sdk:vendor-id>google</sdk:vendor-id>
1200− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
1201− <sdk:name-id>google_apis</sdk:name-id>
1202− <sdk:name-display>Google APIs</sdk:name-display>
1203− <sdk:api-level>22</sdk:api-level>
1204− <sdk:description>Android + Google APIs</sdk:description>
1205− <sdk:libs>
1206− <sdk:lib>
1207− <sdk:name>com.google.android.maps</sdk:name>
1208− <sdk:description>API for Google Maps</sdk:description>
1209− </sdk:lib>
1210− <sdk:lib>
1211− <sdk:name>com.android.future.usb.accessory</sdk:name>
1212− <sdk:description>API for USB Accessories</sdk:description>
1213− </sdk:lib>
1214− <sdk:lib>
1215− <sdk:name>com.google.android.media.effects</sdk:name>
1216− <sdk:description>Collection of video effects</sdk:description>
1217− </sdk:lib>
1218− </sdk:libs>
1219− </sdk:add-on>
1220− <sdk:add-on>
1221− <!--Generated from bid:100722913, branch:perforce-->
1222− <sdk:revision>1</sdk:revision>
1223− <sdk:archives>
1224− <sdk:archive>
1225− <!--Built on: Sun Jun 10 08:57:09 2018.-->
1226− <sdk:size>179900</sdk:size>
1227− <sdk:checksum type="sha1">04c5cc1a7c88967250ebba9561d81e24104167db</sdk:checksum>
1228− <sdk:url>google_apis-23_r01.zip</sdk:url>
1229− </sdk:archive>
1230− </sdk:archives>
1231− <sdk:uses-license ref="android-sdk-license"/>
1232− <sdk:vendor-id>google</sdk:vendor-id>
1233− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
1234− <sdk:name-id>google_apis</sdk:name-id>
1235− <sdk:name-display>Google APIs</sdk:name-display>
1236− <sdk:api-level>23</sdk:api-level>
1237− <sdk:description>Android + Google APIs</sdk:description>
1238− <sdk:libs>
1239− <sdk:lib>
1240− <sdk:name>com.google.android.maps</sdk:name>
1241− <sdk:description>API for Google Maps</sdk:description>
1242− </sdk:lib>
1243− <sdk:lib>
1244− <sdk:name>com.android.future.usb.accessory</sdk:name>
1245− <sdk:description>API for USB Accessories</sdk:description>
1246− </sdk:lib>
1247− <sdk:lib>
1248− <sdk:name>com.google.android.media.effects</sdk:name>
1249− <sdk:description>Collection of video effects</sdk:description>
1250− </sdk:lib>
1251− </sdk:libs>
1252− </sdk:add-on>
1253− <sdk:add-on>
1254− <!--Generated from bid:24379226, branch:perforce-->
1255− <sdk:obsolete/>
1256− <sdk:revision>2</sdk:revision>
1257− <sdk:archives>
1258− <sdk:archive>
1259− <!--Built on: Sun May 27 03:16:19 2018.-->
1260− <sdk:size>78266751</sdk:size>
1261− <sdk:checksum type="sha1">92128a12e7e8b0fb5bac59153d7779b717e7b840</sdk:checksum>
1262− <sdk:url>google_tv-12_r02.zip</sdk:url>
1263− </sdk:archive>
1264− </sdk:archives>
1265− <sdk:uses-license ref="android-googletv-license"/>
1266− <sdk:vendor-id>google</sdk:vendor-id>
1267− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
1268− <sdk:name-id>google_tv_addon</sdk:name-id>
1269− <sdk:name-display>Google TV Addon</sdk:name-display>
1270− <sdk:api-level>12</sdk:api-level>
1271− <sdk:description></sdk:description>
1272− <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
1273− <sdk:libs/>
1274− </sdk:add-on>
1275− <sdk:add-on>
1276− <!--Generated from bid:41196280, branch:perforce-->
1277− <sdk:obsolete/>
1278− <sdk:revision>1</sdk:revision>
1279− <sdk:archives>
1280− <sdk:archive>
1281− <!--Built on: Tue Jun 19 05:04:20 2018.-->
1282− <sdk:size>87721879</sdk:size>
1283− <sdk:checksum type="sha1">b73f7c66011ac8180b44aa4e83b8d78c66ea9a09</sdk:checksum>
1284− <sdk:url>google_tv-13_r01.zip</sdk:url>
1285− </sdk:archive>
1286− </sdk:archives>
1287− <sdk:uses-license ref="android-googletv-license"/>
1288− <sdk:vendor-id>google</sdk:vendor-id>
1289− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
1290− <sdk:name-id>google_tv_addon</sdk:name-id>
1291− <sdk:name-display>Google TV Addon</sdk:name-display>
1292− <sdk:api-level>13</sdk:api-level>
1293− <sdk:description></sdk:description>
1294− <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
1295− <sdk:libs/>
1296− </sdk:add-on>
1297− <sdk:extra>
1298− <!--Generated from bid:3841166, branch:git_nyc-support-release-->
1299− <sdk:revision>
1300− <sdk:major>47</sdk:major>
1301− <sdk:minor>0</sdk:minor>
1302− <sdk:micro>0</sdk:micro>
1303− </sdk:revision>
1304− <sdk:archives>
1305− <sdk:archive>
1306− <!--Built on: Mon Jun 11 04:51:54 2018.-->
1307− <sdk:size>355529608</sdk:size>
1308− <sdk:checksum type="sha1">a0d22beacc106a6977321f2b07d692ce4979e96a</sdk:checksum>
1309− <sdk:url>android_m2repository_r47.zip</sdk:url>
1310− </sdk:archive>
1311− </sdk:archives>
1312− <sdk:uses-license ref="android-sdk-license"/>
1313− <sdk:vendor-id>android</sdk:vendor-id>
1314− <sdk:vendor-display>Android</sdk:vendor-display>
1315− <sdk:description>Local Maven repository for Support Libraries</sdk:description>
1316− <sdk:name-display>Android Support Repository</sdk:name-display>
1317− <sdk:path>m2repository</sdk:path>
1318− </sdk:extra>
1319− <sdk:extra>
1320− <!--Generated from bid:167710051, branch:perforce-->
1321− <sdk:revision>
1322− <sdk:major>58</sdk:major>
1323− </sdk:revision>
1324− <sdk:archives>
1325− <sdk:archive>
1326− <!--Built on: Mon Jun 11 11:10:27 2018.-->
1327− <sdk:size>215426029</sdk:size>
1328− <sdk:checksum type="sha1">05086add9e3a0eb1b67111108d7757a4337c3f10</sdk:checksum>
1329− <sdk:url>google_m2repository_gms_v11_3_rc05_wear_2_0_5.zip</sdk:url>
1330− </sdk:archive>
1331− </sdk:archives>
1332− <sdk:uses-license ref="android-sdk-license"/>
1333− <sdk:vendor-id>google</sdk:vendor-id>
1334− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
1335− <sdk:description>Local Maven repository for Support Libraries</sdk:description>
1336− <sdk:name-display>Google Repository</sdk:name-display>
1337− <sdk:path>m2repository</sdk:path>
1338− </sdk:extra>
1339− <sdk:extra>
1340− <!--Generated from bid:28113395, branch:perforce-->
1341− <sdk:revision>
1342− <sdk:major>1</sdk:major>
1343− </sdk:revision>
1344− <sdk:archives>
1345− <sdk:archive>
1346− <!--Built on: Sun Jun 10 01:20:16 2018.-->
1347− <sdk:size>75109</sdk:size>
1348− <sdk:checksum type="sha1">355e8dc304a92a5616db235af8ee7bd554356254</sdk:checksum>
1349− <sdk:url>market_licensing-r02.zip</sdk:url>
1350− </sdk:archive>
1351− </sdk:archives>
1352− <sdk:uses-license ref="android-sdk-license"/>
1353− <sdk:vendor-id>google</sdk:vendor-id>
1354− <sdk:vendor-display></sdk:vendor-display>
1355− <sdk:description>Android Market Licensing client library</sdk:description>
1356− <sdk:desc-url>http://developer.android.com/guide/publishing/licensing.html</sdk:desc-url>
1357− <sdk:name-display>Google Play Licensing Library</sdk:name-display>
1358− <sdk:path>market_licensing</sdk:path>
1359− </sdk:extra>
1360− <sdk:extra>
1361− <!--Generated from bid:42096985, branch:perforce-->
1362− <sdk:revision>
1363− <sdk:major>1</sdk:major>
1364− </sdk:revision>
1365− <sdk:archives>
1366− <sdk:archive>
1367− <!--Built on: Sun Jun 17 19:31:02 2018.-->
1368− <sdk:size>110201</sdk:size>
1369− <sdk:checksum type="sha1">5305399dc1a56814e86b8459ce24871916f78b8c</sdk:checksum>
1370− <sdk:url>market_apk_expansion-r03.zip</sdk:url>
1371− </sdk:archive>
1372− </sdk:archives>
1373− <sdk:uses-license ref="android-sdk-license"/>
1374− <sdk:vendor-id>google</sdk:vendor-id>
1375− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
1376− <sdk:description>Android Market APK Expansion library</sdk:description>
1377− <sdk:desc-url>http://developer.android.com/guide/market/expansion-files.html</sdk:desc-url>
1378− <sdk:name-display>Google Play APK Expansion library</sdk:name-display>
1379− <sdk:path>market_apk_expansion</sdk:path>
1380− </sdk:extra>
1381− <sdk:extra>
1382− <!--Generated from bid:52571120, branch:perforce-->
1383− <sdk:obsolete/>
1384− <sdk:revision>
1385− <sdk:major>12</sdk:major>
1386− </sdk:revision>
1387− <sdk:archives>
1388− <sdk:archive>
1389− <!--Built on: Sun May 27 10:44:16 2018.-->
1390− <sdk:size>5265389</sdk:size>
1391− <sdk:checksum type="sha1">92558dbc380bba3d55d0ec181167fb05ce7c79d9</sdk:checksum>
1392− <sdk:url>google_play_services_3265130_r12.zip</sdk:url>
1393− </sdk:archive>
1394− </sdk:archives>
1395− <sdk:uses-license ref="android-sdk-license"/>
1396− <sdk:vendor-id>google</sdk:vendor-id>
1397− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
1398− <sdk:description>Google Play services client library and sample code</sdk:description>
1399− <sdk:desc-url>https://developers.google.com/android/google-play-services/index</sdk:desc-url>
1400− <sdk:name-display>Google Play services for Froyo</sdk:name-display>
1401− <sdk:path>google_play_services_froyo</sdk:path>
1402− </sdk:extra>
1403− <sdk:extra>
1404− <!--Generated from bid:189640690, branch:perforce-->
1405− <sdk:revision>
1406− <sdk:major>49</sdk:major>
1407− </sdk:revision>
1408− <sdk:archives>
1409− <sdk:archive>
1410− <!--Built on: Mon Jun 11 08:08:54 2018.-->
1411− <sdk:size>15456884</sdk:size>
1412− <sdk:checksum type="sha1">f95bf19634e2ab0430923247fe2c50246432d2e9</sdk:checksum>
1413− <sdk:url>google_play_services_v16_1_rc09.zip</sdk:url>
1414− </sdk:archive>
1415− </sdk:archives>
1416− <sdk:uses-license ref="android-sdk-license"/>
1417− <sdk:vendor-id>google</sdk:vendor-id>
1418− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
1419− <sdk:description>Google Play services Javadocs and sample code</sdk:description>
1420− <sdk:desc-url>https://developers.google.com/android/google-play-services/index</sdk:desc-url>
1421− <sdk:name-display>Google Play services</sdk:name-display>
1422− <sdk:path>google_play_services</sdk:path>
1423− </sdk:extra>
1424− <sdk:extra>
1425− <!--Generated from bid:75820409, branch:perforce-->
1426− <sdk:revision>
1427− <sdk:major>11</sdk:major>
1428− </sdk:revision>
1429− <sdk:archives>
1430− <sdk:archive>
1431− <!--Built on: Thu Jun 7 01:53:27 2018.-->
1432− <sdk:size>8682859</sdk:size>
1433− <sdk:checksum type="sha1">dc8a2ed2fbd7246d4caf9ab10ffe7749dc35d1cc</sdk:checksum>
1434− <sdk:url>usb_driver_r11-windows.zip</sdk:url>
1435− <sdk:host-os>windows</sdk:host-os>
1436− </sdk:archive>
1437− </sdk:archives>
1438− <sdk:uses-license ref="android-sdk-license"/>
1439− <sdk:vendor-id>google</sdk:vendor-id>
1440− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
1441− <sdk:description>USB Driver for Windows, revision 11</sdk:description>
1442− <sdk:desc-url>http://developer.android.com/</sdk:desc-url>
1443− <sdk:name-display>Google USB Driver</sdk:name-display>
1444− <sdk:path>usb_driver</sdk:path>
1445− </sdk:extra>
1446− <sdk:extra>
1447− <!--Generated from bid:45484492, branch:perforce-->
1448− <sdk:obsolete/>
1449− <sdk:revision>
1450− <sdk:major>11</sdk:major>
1451− </sdk:revision>
1452− <sdk:archives>
1453− <sdk:archive>
1454− <!--Built on: Thu Jun 7 11:48:51 2018.-->
1455− <sdk:size>704512</sdk:size>
1456− <sdk:checksum type="sha1">0102859d9575baa0bf4fd5eb422af2ad0fe6cb82</sdk:checksum>
1457− <sdk:url>GoogleAdMobAdsSdkAndroid-6.4.1.zip</sdk:url>
1458− </sdk:archive>
1459− </sdk:archives>
1460− <sdk:uses-license ref="android-sdk-license"/>
1461− <sdk:vendor-id>google</sdk:vendor-id>
1462− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
1463− <sdk:description>AdMob Ads SDK</sdk:description>
1464− <sdk:desc-url>https://developers.google.com/mobile-ads-sdk/docs/</sdk:desc-url>
1465− <sdk:name-display>Google AdMob Ads SDK</sdk:name-display>
1466− <sdk:path>admob_ads_sdk</sdk:path>
1467− </sdk:extra>
1468− <sdk:extra>
1469− <!--Generated from bid:44867123, branch:perforce-->
1470− <sdk:obsolete/>
1471− <sdk:revision>
1472− <sdk:major>3</sdk:major>
1473− </sdk:revision>
1474− <sdk:archives>
1475− <sdk:archive>
1476− <!--Built on: Tue Jun 5 05:29:27 2018.-->
1477− <sdk:size>211432</sdk:size>
1478− <sdk:checksum type="sha1">dc14026bf0ce78315cb5dd00552607de0894de83</sdk:checksum>
1479− <sdk:url>GoogleAnalyticsAndroid_2.0beta5.zip</sdk:url>
1480− </sdk:archive>
1481− </sdk:archives>
1482− <sdk:uses-license ref="android-sdk-license"/>
1483− <sdk:vendor-id>google</sdk:vendor-id>
1484− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
1485− <sdk:description>Analytics App Tracking SDK</sdk:description>
1486− <sdk:desc-url>http://developers.google.com/analytics/devguides/collection/</sdk:desc-url>
1487− <sdk:name-display>Google Analytics App Tracking SDK</sdk:name-display>
1488− <sdk:path>analytics_sdk_v2</sdk:path>
1489− </sdk:extra>
1490− <sdk:extra>
1491− <!--Generated from bid:25118237, branch:perforce-->
1492− <sdk:revision>
1493− <sdk:major>2</sdk:major>
1494− </sdk:revision>
1495− <sdk:archives>
1496− <sdk:archive>
1497− <!--Built on: Thu May 31 20:21:33 2018.-->
1498− <sdk:size>4055193</sdk:size>
1499− <sdk:checksum type="sha1">13f3a3b2670a5fc04a7342861644be9a01b07e38</sdk:checksum>
1500− <sdk:url>webdriver_r02.zip</sdk:url>
1501− </sdk:archive>
1502− </sdk:archives>
1503− <sdk:uses-license ref="android-sdk-license"/>
1504− <sdk:vendor-id>google</sdk:vendor-id>
1505− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
1506− <sdk:description></sdk:description>
1507− <sdk:desc-url>http://selenium.googlecode.com</sdk:desc-url>
1508− <sdk:name-display>Google Web Driver</sdk:name-display>
1509− <sdk:path>webdriver</sdk:path>
1510− </sdk:extra>
1511− <sdk:extra>
1512− <!--Generated from bid:32432700, branch:perforce-->
1513− <sdk:obsolete/>
1514− <sdk:revision>
1515− <sdk:major>3</sdk:major>
1516− </sdk:revision>
1517− <sdk:archives>
1518− <sdk:archive>
1519− <!--Built on: Sun May 27 10:27:10 2018.-->
1520− <sdk:size>5901400</sdk:size>
1521− <sdk:checksum type="sha1">ad066fd0dc7fc99d8aadac09c65a3c2519fbc7bf</sdk:checksum>
1522− <sdk:url>gcm_r03.zip</sdk:url>
1523− </sdk:archive>
1524− </sdk:archives>
1525− <sdk:uses-license ref="android-sdk-license"/>
1526− <sdk:vendor-id>google</sdk:vendor-id>
1527− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
1528− <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>
1529− <sdk:desc-url>https://developers.google.com/android/gcm/index</sdk:desc-url>
1530− <sdk:name-display>Google Cloud Messaging for Android Library</sdk:name-display>
1531− <sdk:path>gcm</sdk:path>
1532− </sdk:extra>
1533− <sdk:extra>
1534− <!--Generated from bid:80165500, branch:perforce-->
1535− <sdk:revision>
1536− <sdk:major>1</sdk:major>
1537− </sdk:revision>
1538− <sdk:archives>
1539− <sdk:archive>
1540− <!--Built on: Tue Jun 5 14:06:56 2018.-->
1541− <sdk:size>2167286</sdk:size>
1542− <sdk:checksum type="sha1">4fb5344e34e8faab4db18af07dace44c50db26a7</sdk:checksum>
1543− <sdk:url>simulator_r01.zip</sdk:url>
1544− </sdk:archive>
1545− </sdk:archives>
1546− <sdk:uses-license ref="android-sdk-license"/>
1547− <sdk:vendor-id>google</sdk:vendor-id>
1548− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
1549− <sdk:description>Android Auto API testing simulators</sdk:description>
1550− <sdk:desc-url>http://developer.android.com/auto</sdk:desc-url>
1551− <sdk:name-display>Android Auto API Simulators</sdk:name-display>
1552− <sdk:path>simulators</sdk:path>
1553− </sdk:extra>
1554− <sdk:extra>
1555− <!--Generated from bid:107062527, branch:perforce-->
1556− <sdk:revision>
1557− <sdk:major>1</sdk:major>
1558− <sdk:minor>1</sdk:minor>
1559− </sdk:revision>
1560− <sdk:archives>
1561− <sdk:archive>
1562− <!--Built on: Sat Jun 16 20:44:31 2018.-->
1563− <sdk:size>1346009</sdk:size>
1564− <sdk:checksum type="sha1">202a6e1b3009a0eb815f8c672d2d5b3717de6169</sdk:checksum>
1565− <sdk:url>desktop-head-unit-linux_r01.1.zip</sdk:url>
1566− <sdk:host-os>linux</sdk:host-os>
1567− </sdk:archive>
1568− <sdk:archive>
1569− <!--Built on: Tue Jun 12 06:56:07 2018.-->
1570− <sdk:size>2375533</sdk:size>
1571− <sdk:checksum type="sha1">8179cbb3914493ebc5eb65b731cba061582f2e84</sdk:checksum>
1572− <sdk:url>desktop-head-unit-macosx_r01.1.zip</sdk:url>
1573− <sdk:host-os>macosx</sdk:host-os>
1574− </sdk:archive>
1575− <sdk:archive>
1576− <!--Built on: Tue Jun 12 13:47:09 2018.-->
1577− <sdk:size>2691901</sdk:size>
1578− <sdk:checksum type="sha1">99c4a7172d73673552119347bc24c58b47da177b</sdk:checksum>
1579− <sdk:url>desktop-head-unit-windows_r01.1.zip</sdk:url>
1580− <sdk:host-os>windows</sdk:host-os>
1581− </sdk:archive>
1582− </sdk:archives>
1583− <sdk:uses-license ref="android-sdk-license"/>
1584− <sdk:vendor-id>google</sdk:vendor-id>
1585− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
1586− <sdk:description>Head unit emulator for developers targeting the Android Auto platform.</sdk:description>
1587− <sdk:desc-url>http://developer.android.com/tools/help/desktop-head-unit.html</sdk:desc-url>
1588− <sdk:name-display>Android Auto Desktop Head Unit emulator</sdk:name-display>
1589− <sdk:path>auto</sdk:path>
1590− </sdk:extra>
1591− <sdk:extra>
1592− <!--Generated from bid:214678223, branch:perforce-->
1593− <sdk:revision>
1594− <sdk:major>1</sdk:major>
1595− <sdk:minor>5</sdk:minor>
1596− <sdk:micro>0</sdk:micro>
1597− </sdk:revision>
1598− <sdk:archives>
1599− <sdk:archive>
1600− <!--Built on: Wed Sep 26 15:20:22 2018.-->
1601− <sdk:size>33351418</sdk:size>
1602− <sdk:checksum type="sha1">6c282b9c686e819fe7f5ac8f2249d2479acb63b4</sdk:checksum>
1603− <sdk:url>iasdk-1.5.0-1538000167.zip</sdk:url>
1604− </sdk:archive>
1605− </sdk:archives>
1606− <sdk:uses-license ref="android-sdk-license"/>
1607− <sdk:vendor-id>google</sdk:vendor-id>
1608− <sdk:vendor-display>Google Inc.</sdk:vendor-display>
1609− <sdk:description>Google Play Instant Development SDK</sdk:description>
1610− <sdk:desc-url>https://developer.android.com/topic/google-play-instant/</sdk:desc-url>
1611− <sdk:name-display>Google Play Instant Development SDK</sdk:name-display>
1612− <sdk:path>instantapps</sdk:path>
1613− </sdk:extra>
1614−</sdk:sdk-addon>
pkgs/development/mobile/androidenv/addons.nixdeleted−321
@@ -1,321 +0,0 @@
1−
2−# This file is generated from generate-addons.sh. DO NOT EDIT.
3−# Execute generate-addons.sh or fetch.sh to update the file.
4−{stdenv, fetchurl, unzip}:
5−
6−let
7− buildGoogleApis = args:
8− stdenv.mkDerivation (args // {
9− buildInputs = [ unzip ];
10− buildCommand = ''
11− mkdir -p $out
12− cd $out
13− unzip $src
14− '';
15− });
16−in
17−{
18−
19− google_apis_3 = buildGoogleApis {
20− name = "google_apis-3";
21− src = fetchurl {
22− url = https://dl.google.com/android/repository/google_apis-3-r03.zip;
23− sha1 = "1f92abf3a76be66ae8032257fc7620acbd2b2e3a";
24− };
25− meta = {
26− description = "Android + Google APIs";
27− url = http://developer.android.com/;
28− };
29− };
30−
31− google_apis_4 = buildGoogleApis {
32− name = "google_apis-4";
33− src = fetchurl {
34− url = https://dl.google.com/android/repository/google_apis-4_r02.zip;
35− sha1 = "9b6e86d8568558de4d606a7debc4f6049608dbd0";
36− };
37− meta = {
38− description = "Android + Google APIs";
39− url = http://developer.android.com/;
40− };
41− };
42−
43− google_apis_5 = buildGoogleApis {
44− name = "google_apis-5";
45− src = fetchurl {
46− url = https://dl.google.com/android/repository/google_apis-5_r01.zip;
47− sha1 = "46eaeb56b645ee7ffa24ede8fa17f3df70db0503";
48− };
49− meta = {
50− description = "Android + Google APIs";
51− url = http://developer.android.com/;
52− };
53− };
54−
55− google_apis_6 = buildGoogleApis {
56− name = "google_apis-6";
57− src = fetchurl {
58− url = https://dl.google.com/android/repository/google_apis-6_r01.zip;
59− sha1 = "5ff545d96e031e09580a6cf55713015c7d4936b2";
60− };
61− meta = {
62− description = "Android + Google APIs";
63− url = http://developer.android.com/;
64− };
65− };
66−
67− google_apis_7 = buildGoogleApis {
68− name = "google_apis-7";
69− src = fetchurl {
70− url = https://dl.google.com/android/repository/google_apis-7_r01.zip;
71− sha1 = "2e7f91e0fe34fef7f58aeced973c6ae52361b5ac";
72− };
73− meta = {
74− description = "Android + Google APIs";
75− url = http://developer.android.com/;
76− };
77− };
78−
79− google_apis_8 = buildGoogleApis {
80− name = "google_apis-8";
81− src = fetchurl {
82− url = https://dl.google.com/android/repository/google_apis-8_r02.zip;
83− sha1 = "3079958e7ec87222cac1e6b27bc471b27bf2c352";
84− };
85− meta = {
86− description = "Android + Google APIs";
87− url = http://developer.android.com/;
88− };
89− };
90−
91− google_apis_9 = buildGoogleApis {
92− name = "google_apis-9";
93− src = fetchurl {
94− url = https://dl.google.com/android/repository/google_apis-9_r02.zip;
95− sha1 = "78664645a1e9accea4430814f8694291a7f1ea5d";
96− };
97− meta = {
98− description = "Android + Google APIs";
99− url = http://developer.android.com/;
100− };
101− };
102−
103− google_apis_10 = buildGoogleApis {
104− name = "google_apis-10";
105− src = fetchurl {
106− url = https://dl.google.com/android/repository/google_apis-10_r02.zip;
107− sha1 = "cc0711857c881fa7534f90cf8cc09b8fe985484d";
108− };
109− meta = {
110− description = "Android + Google APIs";
111− url = http://developer.android.com/;
112− };
113− };
114−
115− google_apis_11 = buildGoogleApis {
116− name = "google_apis-11";
117− src = fetchurl {
118− url = https://dl.google.com/android/repository/google_apis-11_r01.zip;
119− sha1 = "5eab5e81addee9f3576d456d205208314b5146a5";
120− };
121− meta = {
122− description = "Android + Google APIs";
123− url = http://developer.android.com/;
124− };
125− };
126−
127− google_apis_12 = buildGoogleApis {
128− name = "google_apis-12";
129− src = fetchurl {
130− url = https://dl.google.com/android/repository/google_apis-12_r01.zip;
131− sha1 = "e9999f4fa978812174dfeceec0721c793a636e5d";
132− };
133− meta = {
134− description = "Android + Google APIs";
135− url = http://developer.android.com/;
136− };
137− };
138−
139− google_apis_13 = buildGoogleApis {
140− name = "google_apis-13";
141− src = fetchurl {
142− url = https://dl.google.com/android/repository/google_apis-13_r01.zip;
143− sha1 = "3b153edd211c27dc736c893c658418a4f9041417";
144− };
145− meta = {
146− description = "Android + Google APIs";
147− url = http://developer.android.com/;
148− };
149− };
150−
151− google_apis_14 = buildGoogleApis {
152− name = "google_apis-14";
153− src = fetchurl {
154− url = https://dl.google.com/android/repository/google_apis-14_r02.zip;
155− sha1 = "f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39";
156− };
157− meta = {
158− description = "Android + Google APIs";
159−
160− };
161− };
162−
163− google_apis_15 = buildGoogleApis {
164− name = "google_apis-15";
165− src = fetchurl {
166− url = https://dl.google.com/android/repository/google_apis-15_r03.zip;
167− sha1 = "d0d2bf26805eb271693570a1aaec33e7dc3f45e9";
168− };
169− meta = {
170− description = "Android + Google APIs";
171−
172− };
173− };
174−
175− google_apis_16 = buildGoogleApis {
176− name = "google_apis-16";
177− src = fetchurl {
178− url = https://dl.google.com/android/repository/google_apis-16_r04.zip;
179− sha1 = "ee6acf1b01020bfa8a8e24725dbc4478bee5e792";
180− };
181− meta = {
182− description = "Android + Google APIs";
183−
184− };
185− };
186−
187− google_apis_17 = buildGoogleApis {
188− name = "google_apis-17";
189− src = fetchurl {
190− url = https://dl.google.com/android/repository/google_apis-17_r04.zip;
191− sha1 = "a076be0677f38df8ca5536b44dfb411a0c808c4f";
192− };
193− meta = {
194− description = "Android + Google APIs";
195−
196− };
197− };
198−
199− google_apis_18 = buildGoogleApis {
200− name = "google_apis-18";
201− src = fetchurl {
202− url = https://dl.google.com/android/repository/google_apis-18_r04.zip;
203− sha1 = "6109603409debdd40854d4d4a92eaf8481462c8b";
204− };
205− meta = {
206− description = "Android + Google APIs";
207−
208− };
209− };
210−
211− google_apis_19 = buildGoogleApis {
212− name = "google_apis-19";
213− src = fetchurl {
214− url = https://dl.google.com/android/repository/google_apis-19_r20.zip;
215− sha1 = "5b933abe830b2f25b4c0f171d45e9e0651e56311";
216− };
217− meta = {
218− description = "Android + Google APIs";
219−
220− };
221− };
222−
223− google_apis_21 = buildGoogleApis {
224− name = "google_apis-21";
225− src = fetchurl {
226− url = https://dl.google.com/android/repository/google_apis-21_r01.zip;
227− sha1 = "66a754efb24e9bb07cc51648426443c7586c9d4a";
228− };
229− meta = {
230− description = "Android + Google APIs";
231−
232− };
233− };
234−
235− google_apis_22 = buildGoogleApis {
236− name = "google_apis-22";
237− src = fetchurl {
238− url = https://dl.google.com/android/repository/google_apis-22_r01.zip;
239− sha1 = "5def0f42160cba8acff51b9c0c7e8be313de84f5";
240− };
241− meta = {
242− description = "Android + Google APIs";
243−
244− };
245− };
246−
247− google_apis_23 = buildGoogleApis {
248− name = "google_apis-23";
249− src = fetchurl {
250− url = https://dl.google.com/android/repository/google_apis-23_r01.zip;
251− sha1 = "04c5cc1a7c88967250ebba9561d81e24104167db";
252− };
253− meta = {
254− description = "Android + Google APIs";
255−
256− };
257− };
258−
259− google_apis_24 = buildGoogleApis {
260− name = "google_apis-24";
261− src = fetchurl {
262− url = https://dl.google.com/android/repository/google_apis-24_r1.zip;
263− sha1 = "31361c2868f27343ee917fbd259c1463821b6145";
264− };
265− meta = {
266− description = "Android + Google APIs";
267−
268− };
269− };
270−
271− google_apis_25 = buildGoogleApis {
272− name = "google_apis-25";
273− src = fetchurl {
274− url = https://dl.google.com/android/repository/google_apis-25_r1.zip;
275− sha1 = "550e83eea9513ab11c44919ac6da54b36084a9f3";
276− };
277− meta = {
278− description = "Android + Google APIs";
279−
280− };
281− };
282−
283− android_support_extra = buildGoogleApis {
284− name = "android_support_extra";
285− src = fetchurl {
286− url = https://dl.google.com/android/repository/support_r23.2.1.zip;
287− sha1 = "41121bbc412c2fce0be170d589d20cfa3e78e857";
288− };
289− meta = {
290− description = "Android Support Library";
291− url = http://developer.android.com/;
292− };
293− };
294−
295−
296− google_play_services = buildGoogleApis {
297− name = "google_play_services";
298− src = fetchurl {
299− url = https://dl.google.com/android/repository/google_play_services_v16_1_rc09.zip;
300− sha1 = "f95bf19634e2ab0430923247fe2c50246432d2e9";
301− };
302− meta = {
303− description = "Google Play services client library and sample code";
304− url = http://developer.android.com/;
305− };
306− };
307−
308− instant_apps = buildGoogleApis {
309− name = "instant_apps_sdk";
310− src = fetchurl {
311− url = https://dl.google.com/android/repository/iasdk-1.5.0-1538000167.zip;
312− sha1 = "6c282b9c686e819fe7f5ac8f2249d2479acb63b4";
313− };
314− meta = {
315− description = "Android Instant Apps Development SDK";
316− url = "https://developer.android.com/";
317− };
318− };
319−
320−
321−}
pkgs/development/mobile/androidenv/androidndk.nixdeleted−120
@@ -1,120 +0,0 @@
1−{ stdenv, fetchurl, zlib, ncurses5, unzip, lib, makeWrapper
2−, coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which
3−, platformTools, python3, libcxx, version, sha1s, bash, runCommand
4−, fullNDK ? false # set to true if you want other parts of the NDK
5− # that is not used by Nixpkgs like sources,
6− # examples, docs, or LLVM toolchains
7−}:
8−
9−let
10− makeStandaloneToolchain = api: arch: let
11− full_ndk = (ndk true);
12− in runCommand "makeStandaloneToolchain-${version}" {} ''
13− ${full_ndk}/libexec/${full_ndk.name}/build/tools/make_standalone_toolchain.py --api ${toString api} --arch ${arch} --install-dir $out
14− '';
15− ndk = fullNDK: stdenv.mkDerivation rec {
16− name = "android-ndk-r${version}";
17− inherit version;
18−
19− src = fetchurl {
20− url = "https://dl.google.com/android/repository/${name}-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}.zip";
21− sha1 = sha1s.${stdenv.hostPlatform.system} or (throw "platform ${stdenv.hostPlatform.system} not supported!");
22− };
23−
24− phases = "buildPhase";
25−
26− nativeBuildInputs = [ unzip makeWrapper file ];
27−
28− buildCommand = let
29− bin_path = "$out/bin";
30− pkg_path = "$out/libexec/${name}";
31− sed_script_1 =
32− "'s|^PROGDIR=`dirname $0`" +
33− "|PROGDIR=`dirname $(readlink -f $(which $0))`|'";
34− runtime_paths = (lib.makeBinPath [
35− coreutils file findutils
36− gawk gnugrep gnused
37− jdk python3 which
38− ]) + ":${platformTools}/platform-tools";
39− in ''
40− mkdir -pv $out/libexec
41− cd $out/libexec
42− unzip -qq $src
43−
44− # so that it doesn't fail because of read-only permissions set
45− cd -
46− ${if (version == "10e") then
47− ''
48− patch -p1 \
49− --no-backup-if-mismatch \
50− -d $out/libexec/${name} < ${ ./make-standalone-toolchain_r10e.patch }
51− ''
52− else
53− ''
54− patch -p1 \
55− --no-backup-if-mismatch \
56− -d $out/libexec/${name} < ${ ./. + "/make_standalone_toolchain.py_" + "${version}" + ".patch" }
57−
58− sed -i 's,#!/usr/bin/env python,#!${python3}/bin/python,g' ${pkg_path}/build/tools/make_standalone_toolchain.py
59− sed -i 's,#!/bin/bash,#!${bash}/bin/bash,g' ${pkg_path}/build/tools/make_standalone_toolchain.py
60− wrapProgram ${pkg_path}/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}"
61− ''
62− }
63−
64− patchShebangs ${pkg_path}
65−
66− cd ${pkg_path}
67−
68− '' + lib.optionalString (!fullNDK) ''
69− # Steps to reduce output size
70− rm -rf docs sources tests
71− # We only support cross compiling with gcc for now
72− rm -rf toolchains/*-clang* toolchains/llvm*
73− '' +
74−
75− ''
76− find ${pkg_path}/toolchains \( \
77− \( -type f -a -name "*.so*" \) -o \
78− \( -type f -a -perm -0100 \) \
79− \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
80− --set-rpath ${stdenv.lib.makeLibraryPath [ libcxx zlib ncurses5 ]} {} \;
81− # fix ineffective PROGDIR / MYNDKDIR determination
82− for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py"}
83− do
84− sed -i -e ${sed_script_1} $i
85− done
86−
87− # wrap
88− for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py ndk-which"}
89− do
90− wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}"
91− done
92−
93− ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") ''
94− for i in ${pkg_path}/prebuilt/linux-x86_64/bin/*
95− do
96− if ! isELF $i; then continue; fi
97− patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i
98− patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64 $i
99− done
100− ''}
101−
102− # make some executables available in PATH
103− mkdir -pv ${bin_path}
104− for i in \
105− ndk-build ${lib.optionalString (version == "10e") "ndk-depends ndk-gdb ndk-gdb-py ndk-gdb.py ndk-stack ndk-which"}
106− do
107− ln -sf ${pkg_path}/$i ${bin_path}/$i
108− done
109− '';
110−
111− meta = {
112− platforms = builtins.attrNames sha1s;
113− hydraPlatforms = [];
114− license = stdenv.lib.licenses.asl20;
115− };
116− };
117− passthru = {
118− inherit makeStandaloneToolchain;
119− };
120−in lib.extendDerivation true passthru (ndk fullNDK)
pkgs/development/mobile/androidenv/androidndk_r8e.nixdeleted−88
@@ -1,88 +0,0 @@
1−{ stdenv, fetchurl, zlib, ncurses, lib, makeWrapper
2−, coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which
3−, platformTools
4−, fullNDK ? false # set to true if you want other parts of the NDK
5− # that is not used by Nixpkgs like sources,
6− # examples, docs, or LLVM toolchains
7−}:
8−
9−stdenv.mkDerivation rec {
10− name = "android-ndk-r8e";
11−
12− src = if stdenv.hostPlatform.system == "i686-linux"
13− then fetchurl {
14− url = "http://dl.google.com/android/ndk/${name}-linux-x86.tar.bz2";
15− sha256 = "c2c4e0c8b3037149a0f5dbb08d72f814a52af4da9fff9d80328c675457e95a98";
16− }
17− else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl {
18− url = "http://dl.google.com/android/ndk/${name}-linux-x86_64.tar.bz2";
19− sha256 = "093gf55zbh38p2gk5bdykj1vg9p5l774wjdzw5mhk4144jm1wdq7";
20− }
21− else throw "platform ${stdenv.hostPlatform.system} not supported!";
22−
23− phases = "buildPhase";
24−
25− nativeBuildInputs = [ makeWrapper ];
26−
27− buildCommand = let
28− bin_path = "$out/bin";
29− pkg_path = "$out/libexec/${name}";
30− sed_script_1 =
31− "'s|^PROGDIR=`dirname $0`" +
32− "|PROGDIR=`dirname $(readlink -f $(which $0))`|'";
33− sed_script_2 =
34− "'s|^MYNDKDIR=`dirname $0`" +
35− "|MYNDKDIR=`dirname $(readlink -f $(which $0))`|'";
36− runtime_paths = (lib.makeBinPath [
37− coreutils file findutils
38− gawk gnugrep gnused
39− jdk
40− which
41− ]) + ":${platformTools}/platform-tools";
42− in ''
43− set -x
44− mkdir -pv $out/libexec
45− cd $out/libexec
46− tar -xjf $src
47−
48− # so that it doesn't fail because of read-only permissions set
49− cd -
50− patch -p1 \
51− --no-backup-if-mismatch \
52− -d $out/libexec/${name} < ${ ./make-standalone-toolchain_r8e.patch }
53− cd ${pkg_path}
54−
55− '' + lib.optionalString (!fullNDK) ''
56− # Steps to reduce output size
57− rm -rf docs sources tests
58− # We only support cross compiling with gcc for now
59− rm -rf toolchains/*-clang* toolchains/llvm-*
60−
61− '' + ''
62− find ${pkg_path}/toolchains \( \
63− \( -type f -a -name "*.so*" \) -o \
64− \( -type f -a -perm -0100 \) \
65− \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
66− --set-rpath ${stdenv.lib.makeLibraryPath [ zlib ncurses ]} {} \;
67− # fix ineffective PROGDIR / MYNDKDIR determination
68− for i in ndk-build ndk-gdb ndk-gdb-py
69− do
70− sed -i -e ${sed_script_1} $i
71− done
72− sed -i -e ${sed_script_2} ndk-which
73− # a bash script
74− patchShebangs ndk-which
75− # wrap
76− for i in ndk-build ndk-gdb ndk-gdb-py ndk-which
77− do
78− wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}"
79− done
80− # make some executables available in PATH
81− mkdir -pv ${bin_path}
82− for i in \
83− ndk-build ndk-depends ndk-gdb ndk-gdb-py ndk-gdb.py ndk-stack ndk-which
84− do
85− ln -sf ${pkg_path}/$i ${bin_path}/$i
86− done
87− '';
88−}
pkgs/development/mobile/androidenv/androidsdk.nixdeleted−296
@@ -1,296 +0,0 @@
1−{ stdenv, stdenv_32bit, fetchurl, fetchzip, unzip, makeWrapper
2−, platformTools, buildTools, support, supportRepository, platforms, sysimages, addons, sources
3−, libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, libGLU_combined, alsaLib
4−, freetype, fontconfig, glib, gtk2, atk, file, jdk, coreutils, libpulseaudio, dbus
5−, zlib, glxinfo, xkeyboardconfig
6−, includeSources
7−, licenseAccepted
8−}:
9−{ platformVersions, abiVersions, useGoogleAPIs, buildToolsVersions ? [], useExtraSupportLibs ? false
10−, useGooglePlayServices ? false, useInstantApps ? false }:
11−
12−if !licenseAccepted then throw ''
13− You must accept the Android Software Development Kit License Agreement at
14− https://developer.android.com/studio/terms
15− by setting nixpkgs config option 'android_sdk.accept_license = true;'
16− ''
17−else assert licenseAccepted;
18−
19−let inherit (stdenv.lib) makeLibraryPath;
20−
21− googleRepository = let version = "gms_v9_rc41_wear_2_0_rc6";
22− in fetchzip rec {
23− url = "https://dl-ssl.google.com/android/repository/google_m2repository_${version}.zip";
24− sha256 = "0k99xmynv0k62d301zx5jnjkddflr51i5lb02l9incg7m5cn8kzx";
25− };
26−
27−in
28−
29−stdenv.mkDerivation rec {
30− name = "android-sdk-${version}";
31− version = "26.1.1";
32−
33− src = if (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux")
34− then fetchurl {
35− url = "https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip";
36− sha256 = "1yfy0qqxz1ixpsci1pizls1nrncmi8p16wcb9rimdn4q3mdfxzwj";
37− }
38− else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl {
39− url = "https://dl.google.com/android/repository/sdk-tools-darwin-4333796.zip";
40− sha256 = "0gl5c30m40kx0vvrpbaa8cw8wq2vb89r14hgzb1df4qgpic97cpc";
41− }
42− else throw "platform not ${stdenv.hostPlatform.system} supported!";
43−
44− emulator = fetchurl {
45− url = "https://dl.google.com/android/repository/emulator-linux-4969155.zip";
46− sha256 = "0iw0j6j3w9zpfalsa7xq2czz4vzgq96zk2zddjhanwwx4p8fhrfd";
47− };
48−
49− buildCommand = ''
50− mkdir -p $out/libexec
51− cd $out/libexec
52− unpackFile $src
53− unpackFile $emulator
54− cd tools
55−
56− for f in monitor bin/monkeyrunner bin/uiautomatorviewer
57− do
58− sed -i -e "s|/bin/ls|${coreutils}/bin/ls|" "$f"
59− done
60−
61− ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux")
62− ''
63− # There are a number of native binaries. We must patch them to let them find the interpreter and libstdc++
64−
65− for i in mksdcard
66− do
67− patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 $i
68− patchelf --set-rpath ${stdenv_32bit.cc.cc.lib}/lib $i
69− done
70−
71− # The following scripts used SWT and wants to dynamically load some GTK+ stuff.
72− # Creating these wrappers ensure that they can be found:
73−
74− wrapProgram `pwd`/android \
75− --prefix PATH : ${jdk}/bin \
76− --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ glib gtk2 libXtst ]}
77−
78− wrapProgram `pwd`/bin/uiautomatorviewer \
79− --prefix PATH : ${jdk}/bin \
80− --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]}
81−
82− # The emulators need additional libraries, which are dynamically loaded => let's wrap them
83−
84− ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") ''
85− cd ..
86− for i in emulator/emulator* emulator/qemu/linux-x86_64/qemu-system-*
87− do
88− patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i
89− wrapProgram `pwd`/$i \
90− --prefix PATH : ${stdenv.lib.makeBinPath [ file glxinfo ]} \
91− --suffix LD_LIBRARY_PATH : `pwd`/lib:${makeLibraryPath [ stdenv.cc.cc libX11 libxcb libXau libXdmcp libXext libGLU_combined alsaLib zlib libpulseaudio dbus.lib ]} \
92− --suffix QT_XKB_CONFIG_ROOT : ${xkeyboardconfig}/share/X11/xkb
93− done
94− cd tools
95− ''}
96− ''}
97−
98− patchShebangs .
99−
100− ${if stdenv.hostPlatform.system == "i686-linux" then
101− ''
102− # The monitor requires some more patching
103−
104− cd lib/monitor-x86
105− patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 monitor
106− patchelf --set-rpath ${makeLibraryPath [ libX11 libXext libXrender freetype fontconfig ]} libcairo-swt.so
107−
108− wrapProgram `pwd`/monitor \
109− --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ gtk2 atk stdenv.cc.cc libXtst ]}
110−
111− cd ../..
112− ''
113− else if stdenv.hostPlatform.system == "x86_64-linux" then
114− ''
115− # The monitor requires some more patching
116−
117− cd lib/monitor-x86_64
118− patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 monitor
119− patchelf --set-rpath ${makeLibraryPath [ libX11 libXext libXrender freetype fontconfig ]} libcairo-swt.so
120−
121− wrapProgram `pwd`/monitor \
122− --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ gtk2 atk stdenv.cc.cc libXtst ]}
123−
124− cd ../..
125− ''
126− else ""}
127−
128− # Symlink the other sub packages
129−
130− cd ..
131− ln -s ${platformTools}/platform-tools
132− ln -s ${support}/support
133−
134− mkdir -p build-tools
135− cd build-tools
136−
137− ${stdenv.lib.concatMapStrings
138− (v: "ln -s ${builtins.getAttr "v${builtins.replaceStrings ["."] ["_"] v}" buildTools}/build-tools/*")
139− (if (builtins.length buildToolsVersions) == 0 then platformVersions else buildToolsVersions)}
140−
141− cd ..
142−
143− # Symlink required Google API add-ons
144−
145− mkdir -p add-ons
146− cd add-ons
147−
148− ${if useGoogleAPIs then
149− stdenv.lib.concatMapStrings (platformVersion:
150− if (builtins.hasAttr ("google_apis_"+platformVersion) addons) then
151− let
152− googleApis = builtins.getAttr ("google_apis_"+platformVersion) addons;
153− in
154− "ln -s ${googleApis}/* addon-google_apis-${platformVersion}\n"
155− else "") platformVersions
156− else ""}
157−
158− cd ..
159−
160− # Symlink required extras
161−
162− mkdir -p extras/android
163− cd extras/android
164−
165− ln -s ${supportRepository}/m2repository
166−
167− ${if useExtraSupportLibs then
168− "ln -s ${addons.android_support_extra}/support ."
169− else ""}
170−
171− cd ..
172− mkdir -p google
173− cd google
174−
175− ${if useGooglePlayServices then
176− "ln -s ${addons.google_play_services}/google-play-services google_play_services"
177− else ""}
178−
179− ${stdenv.lib.optionalString useInstantApps
180− "ln -s ${addons.instant_apps}/whsdk instantapps"}
181−
182− ln -s ${googleRepository} m2repository
183−
184− cd ../..
185−
186− # Symlink required sources
187− mkdir -p sources
188− cd sources
189−
190− ${if includeSources then
191− stdenv.lib.concatMapStrings (platformVersion:
192− if (builtins.hasAttr ("source_"+platformVersion) sources) then
193− let
194− source = builtins.getAttr ("source_"+platformVersion) sources;
195− in
196− "ln -s ${source}/* android-${platformVersion}\n"
197− else "") platformVersions
198− else ""}
199−
200− cd ..
201−
202− # Symlink required platforms
203−
204− mkdir -p platforms
205− cd platforms
206−
207− ${stdenv.lib.concatMapStrings (platformVersion:
208− if (builtins.hasAttr ("platform_"+platformVersion) platforms) then
209− let
210− platform = builtins.getAttr ("platform_"+platformVersion) platforms;
211− in
212− "ln -s ${platform}/* android-${platformVersion}\n"
213− else ""
214− ) platformVersions}
215−
216− cd ..
217−
218− # Symlink required system images
219−
220− mkdir -p system-images
221− cd system-images
222−
223− ${stdenv.lib.concatMapStrings (abiVersion:
224− stdenv.lib.concatMapStrings (platformVersion:
225− if (builtins.hasAttr ("sysimg_" + abiVersion + "_" + platformVersion) sysimages) then
226− let
227− sysimg = builtins.getAttr ("sysimg_" + abiVersion + "_" + platformVersion) sysimages;
228− in
229− ''
230− mkdir -p android-${platformVersion}
231− cd android-${platformVersion}
232− ln -s ${sysimg}/*
233− cd ..
234− ''
235− else ""
236− ) platformVersions
237− ) abiVersions}
238−
239− # Create wrappers to the most important tools and platform tools so that we can run them if the SDK is in our PATH
240−
241− mkdir -p $out/bin
242−
243− for i in $out/libexec/tools/*
244− do
245− if [ ! -d $i ] && [ -x $i ]
246− then
247− ln -sf $i $out/bin/$(basename $i)
248− fi
249− done
250−
251− for i in $out/libexec/tools/bin/*
252− do
253− if [ ! -d $i ] && [ -x $i ]
254− then
255− ln -sf $i $out/bin/$(basename $i)
256− fi
257− done
258−
259− for i in $out/libexec/platform-tools/*
260− do
261− if [ ! -d $i ] && [ -x $i ]
262− then
263− ln -sf $i $out/bin/$(basename $i)
264− fi
265− done
266−
267− for i in $out/libexec/build-tools/*/*
268− do
269− if [ ! -d $i ] && [ -x $i ]
270− then
271− ln -sf $i $out/bin/$(basename $i)
272− fi
273− done
274−
275− for i in $out/libexec/emulator/*
276− do
277− if [ ! -d $i ] && [ -x $i ]
278− then
279− ln -sf $i $out/bin/$(basename $i)
280− fi
281− done
282−
283− wrapProgram $out/bin/sdkmanager \
284− --set JAVA_HOME ${jdk}
285−
286− yes | ANDROID_SDK_HOME=$(mktemp -d) $out/bin/sdkmanager --licenses || true
287− '';
288−
289− buildInputs = [ unzip makeWrapper ];
290−
291− meta = {
292− platforms = stdenv.lib.platforms.unix;
293− hydraPlatforms = [];
294− license = stdenv.lib.licenses.unfree;
295− };
296−}
pkgs/development/mobile/androidenv/build-app.nix+22−25
@@ -1,28 +1,26 @@
1−{ stdenv, androidsdk, jdk, ant, androidndk, gnumake, gawk, file, which }:
2−args@{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false, antFlags ? ""
1+{ composeAndroidPackages, stdenv, ant, jdk, gnumake, gawk }:
2+
3+{ name
34, release ? false, keyStore ? null, keyAlias ? null, keyStorePassword ? null, keyAliasPassword ? null
4−, useNDK ? false, ...
5−}:
5+, antFlags ? ""
6+, ...
7+}@args:
68
79assert release -> keyStore != null && keyAlias != null && keyStorePassword != null && keyAliasPassword != null;
810
911let
10− androidsdkComposition = androidsdk {
11− inherit platformVersions useGoogleAPIs;
12− abiVersions = [];
13− };
12+ androidSdkFormalArgs = builtins.functionArgs composeAndroidPackages;
13+ androidArgs = builtins.intersectAttrs androidSdkFormalArgs args;
14+ androidsdk = (composeAndroidPackages androidArgs).androidsdk;
15+
16+ extraArgs = removeAttrs args ([ "name" ] ++ builtins.attrNames androidSdkFormalArgs);
1417in
1518stdenv.mkDerivation ({
16− name = stdenv.lib.replaceChars [" "] [""] name;
17−
18− ANDROID_HOME = "${androidsdkComposition}/libexec";
19−
20− buildInputs = [ jdk ant ] ++
21− stdenv.lib.optional useNDK [ androidndk gnumake gawk file which ];
22−
19+ name = stdenv.lib.replaceChars [" "] [""] name; # Android APKs may contain white spaces in their names, but Nix store paths cannot
20+ ANDROID_HOME = "${androidsdk}/libexec/android-sdk";
21+ buildInputs = [ jdk ant ];
2322 buildPhase = ''
2423 ${stdenv.lib.optionalString release ''
25−
2624 # Provide key singing attributes
2725 ( echo "key.store=${keyStore}"
2826 echo "key.alias=${keyAlias}"
@@ -32,20 +30,19 @@ stdenv.mkDerivation ({
3230 ''}
3331
3432 export ANDROID_SDK_HOME=`pwd` # Key files cannot be stored in the user's home directory. This overrides it.
35− ${if useNDK then ''
36− export GNUMAKE=${gnumake}/bin/make
37− export NDK_HOST_AWK=${gawk}/bin/gawk
38− ${androidndk}/bin/ndk-build
39− '' else ""}
33+
34+ ${stdenv.lib.optionalString (args ? includeNDK && args.includeNDK) ''
35+ export GNUMAKE=${gnumake}/bin/make
36+ export NDK_HOST_AWK=${gawk}/bin/gawk
37+ ${androidsdk}/libexec/android-sdk/ndk-bundle/ndk-build
38+ ''}
4039 ant ${antFlags} ${if release then "release" else "debug"}
4140 '';
42−
4341 installPhase = ''
4442 mkdir -p $out
4543 mv bin/*-${if release then "release" else "debug"}.apk $out
46−
44+
4745 mkdir -p $out/nix-support
4846 echo "file binary-dist \"$(echo $out/*.apk)\"" > $out/nix-support/hydra-build-products
4947 '';
50−} //
51−builtins.removeAttrs args ["name"])
48+} // extraArgs)
pkgs/development/mobile/androidenv/build-gradle-app.nixdeleted−108
@@ -1,108 +0,0 @@
1−{ stdenv, androidsdk, jdk, androidndk, gnumake, gawk, file
2−, which, gradle, fetchurl, buildEnv, runCommand }:
3−
4−args@{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false
5− , useExtraSupportLibs ? false, useGooglePlayServices ? false
6− , release ? false, keyStore ? null, keyAlias ? null
7− , keyStorePassword ? null, keyAliasPassword ? null
8− , useNDK ? false, buildInputs ? [], mavenDeps, gradleTask
9− , buildDirectory ? "./.", acceptAndroidSdkLicenses ? false }:
10−
11−assert release -> keyStore != null;
12−assert release -> keyAlias != null;
13−assert release -> keyStorePassword != null;
14−assert release -> keyAliasPassword != null;
15−assert acceptAndroidSdkLicenses;
16−
17−let
18− inherit (stdenv.lib) optionalString;
19−
20− m2install = { repo, version, artifactId, groupId
21− , jarSha256, pomSha256, aarSha256, suffix ? "" }:
22− let m2Name = "${artifactId}-${version}";
23− m2Path = "${builtins.replaceStrings ["."] ["/"] groupId}/${artifactId}/${version}";
24− in runCommand m2Name {} (''
25− mkdir -p $out/m2/${m2Path}
26− '' + optionalString (jarSha256 != null) ''
27− install -D ${fetchurl {
28− url = "${repo}${m2Path}/${m2Name}${suffix}.jar";
29− sha256 = jarSha256;
30− }} $out/m2/${m2Path}/${m2Name}${suffix}.jar
31− '' + optionalString (pomSha256 != null) ''
32− install -D ${fetchurl {
33− url = "${repo}${m2Path}/${m2Name}${suffix}.pom";
34− sha256 = pomSha256;
35− }} $out/m2/${m2Path}/${m2Name}${suffix}.pom
36− '' + optionalString (aarSha256 != null) ''
37− install -D ${fetchurl {
38− url = "${repo}${m2Path}/${m2Name}${suffix}.aar";
39− sha256 = aarSha256;
40− }} $out/m2/${m2Path}/${m2Name}${suffix}.aar
41− '');
42−
43− androidsdkComposition = androidsdk {
44− inherit platformVersions useGoogleAPIs
45− useExtraSupportLibs useGooglePlayServices;
46− abiVersions = [ "armeabi-v7a" ];
47− };
48−in
49−stdenv.mkDerivation ({
50− name = stdenv.lib.replaceChars [" "] [""] name;
51−
52− ANDROID_HOME = "${androidsdkComposition}/libexec";
53− ANDROID_NDK_HOME = "${androidndk}/libexec/${androidndk.name}";
54−
55− buildInputs = [ jdk gradle ] ++
56− stdenv.lib.optional useNDK [ androidndk gnumake gawk file which ] ++
57− buildInputs;
58−
59− DEPENDENCIES = buildEnv { name = "${name}-maven-deps";
60− paths = map m2install mavenDeps;
61− };
62−
63− buildPhase = ''
64− ${optionalString release ''
65− # Provide key signing attributes
66− ( echo "RELEASE_STORE_FILE=${keyStore}"
67− echo "RELEASE_KEY_ALIAS=${keyAlias}"
68− echo "RELEASE_STORE_PASSWORD=${keyStorePassword}"
69− echo "RELEASE_KEY_PASSWORD=${keyAliasPassword}"
70− ) >> gradle.properties
71− ''}
72− buildDir=`pwd`
73− cp -r $ANDROID_HOME $buildDir/local_sdk
74− chmod -R 755 local_sdk
75− export ANDROID_HOME=$buildDir/local_sdk
76− # Key files cannot be stored in the user's home directory. This
77− # overrides it.
78− export ANDROID_SDK_HOME=`pwd`
79−
80− mkdir -p "$ANDROID_HOME/licenses"
81− echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
82− echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
83−
84− export APP_HOME=`pwd`
85−
86− mkdir -p .m2/repository
87− if [ -d "$DEPENDENCIES/m2" ] ; then
88− cp -RL "$DEPENDENCIES"/m2/* .m2/repository/
89− fi
90− chmod -R 755 .m2
91− mkdir -p .m2/repository/com/android/support
92− cp -RL local_sdk/extras/android/m2repository/com/android/support/* .m2/repository/com/android/support/
93− cp -RL local_sdk/extras/google/m2repository/* .m2/repository/
94− gradle ${gradleTask} --offline --no-daemon -g ./tmp -Dmaven.repo.local=`pwd`/.m2/repository
95− '';
96−
97− installPhase = ''
98− mkdir -p $out
99− mv ${buildDirectory}/build/outputs/apk/*.apk $out
100−
101− mkdir -p $out/nix-support
102− echo "file binary-dist \"$(echo $out/*.apk)\"" > $out/nix-support/hydra-build-products
103− '';
104−
105− meta = {
106− license = stdenv.lib.licenses.unfree;
107− };
108−} // builtins.removeAttrs args ["name" "mavenDeps"])
pkgs/development/mobile/androidenv/build-tools-srcs-linux.nixdeleted−376
@@ -1,376 +0,0 @@
1−
2−# This file is generated from generate-tools.sh. DO NOT EDIT.
3−# Execute generate-tools.sh or fetch.sh to update the file.
4−{ fetchurl }:
5−
6−{
7−
8− v17 = {
9− version = "17.0.0";
10− src = fetchurl {
11− url = https://dl.google.com/android/repository/build-tools_r17-linux.zip;
12− sha1 = "2c2872bc3806aabf16a12e3959c2183ddc866e6d";
13− };
14− };
15−
16− v18_0_1 = {
17− version = "18.0.1";
18− src = fetchurl {
19− url = https://dl.google.com/android/repository/build-tools_r18.0.1-linux.zip;
20− sha1 = "f11618492b0d2270c332325d45d752d3656a9640";
21− };
22− };
23−
24− v18_1_0 = {
25− version = "18.1.0";
26− src = fetchurl {
27− url = https://dl.google.com/android/repository/build-tools_r18.1-linux.zip;
28− sha1 = "f314a0599e51397f0886fe888b50dd98f2f050d8";
29− };
30− };
31−
32− v18_1_1 = {
33− version = "18.1.1";
34− src = fetchurl {
35− url = https://dl.google.com/android/repository/build-tools_r18.1.1-linux.zip;
36− sha1 = "68c9acbfc0cec2d51b19efaed39831a17055d998";
37− };
38− };
39−
40− v19 = {
41− version = "19.0.0";
42− src = fetchurl {
43− url = https://dl.google.com/android/repository/build-tools_r19-linux.zip;
44− sha1 = "55c1a6cf632e7d346f0002b275ec41fd3137fd83";
45− };
46− };
47−
48− v19_0_1 = {
49− version = "19.0.1";
50− src = fetchurl {
51− url = https://dl.google.com/android/repository/build-tools_r19.0.1-linux.zip;
52− sha1 = "18d2312dc4368858914213087f4e61445aca4517";
53− };
54− };
55−
56− v19_0_2 = {
57− version = "19.0.2";
58− src = fetchurl {
59− url = https://dl.google.com/android/repository/build-tools_r19.0.2-linux.zip;
60− sha1 = "a03a6bdea0091aea32e1b35b90a7294c9f04e3dd";
61− };
62− };
63−
64− v19_0_3 = {
65− version = "19.0.3";
66− src = fetchurl {
67− url = https://dl.google.com/android/repository/build-tools_r19.0.3-linux.zip;
68− sha1 = "c2d6055478e9d2d4fba476ee85f99181ddd1160c";
69− };
70− };
71−
72− v19_1_0 = {
73− version = "19.1.0";
74− src = fetchurl {
75− url = https://dl.google.com/android/repository/build-tools_r19.1-linux.zip;
76− sha1 = "1ff20ac15fa47a75d00346ec12f180d531b3ca89";
77− };
78− };
79−
80− v20 = {
81− version = "20.0.0";
82− src = fetchurl {
83− url = https://dl.google.com/android/repository/build-tools_r20-linux.zip;
84− sha1 = "b688905526a5584d1327a662d871a635ff502758";
85− };
86− };
87−
88− v21 = {
89− version = "21.0.0";
90− src = fetchurl {
91− url = https://dl.google.com/android/repository/build-tools_r21-linux.zip;
92− sha1 = "4933328fdeecbd554a29528f254f4993468e1cf4";
93− };
94− };
95−
96− v21_0_1 = {
97− version = "21.0.1";
98− src = fetchurl {
99− url = https://dl.google.com/android/repository/build-tools_r21.0.1-linux.zip;
100− sha1 = "e573069eea3e5255e7a65bedeb767f4fd0a5f49a";
101− };
102− };
103−
104− v21_0_2 = {
105− version = "21.0.2";
106− src = fetchurl {
107− url = https://dl.google.com/android/repository/build-tools_r21.0.2-linux.zip;
108− sha1 = "e1236ab8897b62b57414adcf04c132567b2612a5";
109− };
110− };
111−
112− v21_1_0 = {
113− version = "21.1.0";
114− src = fetchurl {
115− url = https://dl.google.com/android/repository/build-tools_r21.1-linux.zip;
116− sha1 = "b7455e543784d52a8925f960bc880493ed1478cb";
117− };
118− };
119−
120− v21_1_1 = {
121− version = "21.1.1";
122− src = fetchurl {
123− url = https://dl.google.com/android/repository/build-tools_r21.1.1-linux.zip;
124− sha1 = "1c712ee3a1ba5a8b0548f9c32f17d4a0ddfd727d";
125− };
126− };
127−
128− v21_1_2 = {
129− version = "21.1.2";
130− src = fetchurl {
131− url = https://dl.google.com/android/repository/build-tools_r21.1.2-linux.zip;
132− sha1 = "5e35259843bf2926113a38368b08458735479658";
133− };
134− };
135−
136− v22 = {
137− version = "22.0.0";
138− src = fetchurl {
139− url = https://dl.google.com/android/repository/build-tools_r22-linux.zip;
140− sha1 = "a8a1619dd090e44fac957bce6842e62abf87965b";
141− };
142− };
143−
144− v22_0_1 = {
145− version = "22.0.1";
146− src = fetchurl {
147− url = https://dl.google.com/android/repository/build-tools_r22.0.1-linux.zip;
148− sha1 = "da8b9c5c3ede39298e6cf0283c000c2ee9029646";
149− };
150− };
151−
152− v23 = {
153− version = "23.0.0";
154− src = fetchurl {
155− url = https://dl.google.com/android/repository/build-tools_r23-linux.zip;
156− sha1 = "c1d6209212b01469f80fa804e0c1d39a06bc9060";
157− };
158− };
159−
160− v23_0_1 = {
161− version = "23.0.1";
162− src = fetchurl {
163− url = https://dl.google.com/android/repository/build-tools_r23.0.1-linux.zip;
164− sha1 = "b6ba7c399d5fa487d95289d8832e4ad943aed556";
165− };
166− };
167−
168− v23_0_2 = {
169− version = "23.0.2";
170− src = fetchurl {
171− url = https://dl.google.com/android/repository/build-tools_r23.0.2-linux.zip;
172− sha1 = "8a9f2b37f6fcf7a9fa784dc21aeaeb41bbb9f2c3";
173− };
174− };
175−
176− v23_0_3 = {
177− version = "23.0.3";
178− src = fetchurl {
179− url = https://dl.google.com/android/repository/build-tools_r23.0.3-linux.zip;
180− sha1 = "368f2600feac7e9b511b82f53d1f2240ae4a91a3";
181− };
182− };
183−
184− v24 = {
185− version = "24.0.0";
186− src = fetchurl {
187− url = https://dl.google.com/android/repository/build-tools_r24-linux.zip;
188− sha1 = "c6271c4d78a5612ea6c7150688bcd5b7313de8d1";
189− };
190− };
191−
192− v24_0_1 = {
193− version = "24.0.1";
194− src = fetchurl {
195− url = https://dl.google.com/android/repository/build-tools_r24.0.1-linux.zip;
196− sha1 = "84f18c392919a074fcbb9b1d967984e6b2fef8b4";
197− };
198− };
199−
200− v24_0_2 = {
201− version = "24.0.2";
202− src = fetchurl {
203− url = https://dl.google.com/android/repository/build-tools_r24.0.2-linux.zip;
204− sha1 = "f199a7a788c3fefbed102eea34d6007737b803cf";
205− };
206− };
207−
208− v24_0_3 = {
209− version = "24.0.3";
210− src = fetchurl {
211− url = https://dl.google.com/android/repository/build-tools_r24.0.3-linux.zip;
212− sha1 = "9e8cc49d66e03fa1a8ecc1ac3e58f1324f5da304";
213− };
214− };
215−
216− v25 = {
217− version = "25.0.0";
218− src = fetchurl {
219− url = https://dl.google.com/android/repository/build-tools_r25-linux.zip;
220− sha1 = "f2bbda60403e75cabd0f238598c3b4dfca56ea44";
221− };
222− };
223−
224− v25_0_1 = {
225− version = "25.0.1";
226− src = fetchurl {
227− url = https://dl.google.com/android/repository/build-tools_r25.0.1-linux.zip;
228− sha1 = "ff063d252ab750d339f5947d06ff782836f22bac";
229− };
230− };
231−
232− v25_0_2 = {
233− version = "25.0.2";
234− src = fetchurl {
235− url = https://dl.google.com/android/repository/build-tools_r25.0.2-linux.zip;
236− sha1 = "ff953c0177e317618fda40516f3e9d95fd43c7ae";
237− };
238− };
239−
240− v25_0_3 = {
241− version = "25.0.3";
242− src = fetchurl {
243− url = https://dl.google.com/android/repository/build-tools_r25.0.3-linux.zip;
244− sha1 = "db95f3a0ae376534d4d69f4cdb6fad20649f3509";
245− };
246− };
247−
248− v26 = {
249− version = "26.0.0";
250− src = fetchurl {
251− url = https://dl.google.com/android/repository/build-tools_r26-linux.zip;
252− sha1 = "1cbe72929876f8a872ab1f1b1040a9f720261f59";
253− };
254− };
255−
256− v26_rc1 = {
257− version = "26.0.0-rc1";
258− src = fetchurl {
259− url = https://dl.google.com/android/repository/build-tools_r26-rc1-linux.zip;
260− sha1 = "8cd6388dc96db2d7a49d06159cf990d3bbc78d04";
261− };
262− };
263−
264− v26_rc2 = {
265− version = "26.0.0-rc2";
266− src = fetchurl {
267− url = https://dl.google.com/android/repository/build-tools_r26-rc2-linux.zip;
268− sha1 = "629bbd8d2e415bf64871fb0b4c0540fd6d0347a0";
269− };
270− };
271−
272− v26_0_1 = {
273− version = "26.0.1";
274− src = fetchurl {
275− url = https://dl.google.com/android/repository/build-tools_r26.0.1-linux.zip;
276− sha1 = "5378c2c78091b414d0eac40a6bd37f2faa31a365";
277− };
278− };
279−
280− v26_0_2 = {
281− version = "26.0.2";
282− src = fetchurl {
283− url = https://dl.google.com/android/repository/build-tools_r26.0.2-linux.zip;
284− sha1 = "5b2b7b66c7bf2151f2af183b5b50a17808850592";
285− };
286− };
287−
288− v26_0_3 = {
289− version = "26.0.3";
290− src = fetchurl {
291− url = https://dl.google.com/android/repository/build-tools_r26.0.3-linux.zip;
292− sha1 = "8a2e6c1bcd845844523a68aa17e5442f0dce328c";
293− };
294− };
295−
296− v27 = {
297− version = "27.0.0";
298− src = fetchurl {
299− url = https://dl.google.com/android/repository/build-tools_r27-linux.zip;
300− sha1 = "28542332ba97cf4a08c3eddfcf5edd70e3cf1260";
301− };
302− };
303−
304− v27_0_1 = {
305− version = "27.0.1";
306− src = fetchurl {
307− url = https://dl.google.com/android/repository/build-tools_r27.0.1-linux.zip;
308− sha1 = "7f4eedb1077ef948b848040dcd15de9e8a759f4a";
309− };
310− };
311−
312− v27_0_2 = {
313− version = "27.0.2";
314− src = fetchurl {
315− url = https://dl.google.com/android/repository/build-tools_r27.0.2-linux.zip;
316− sha1 = "b687ddf6be84f11607871138aad32cf857d0b837";
317− };
318− };
319−
320− v27_0_3 = {
321− version = "27.0.3";
322− src = fetchurl {
323− url = https://dl.google.com/android/repository/build-tools_r27.0.3-linux.zip;
324− sha1 = "d85e7a6320eddffe7eeace3437605079dac938ca";
325− };
326− };
327−
328− v28 = {
329− version = "28.0.0";
330− src = fetchurl {
331− url = https://dl.google.com/android/repository/build-tools_r28-linux.zip;
332− sha1 = "d9f8a754d833ccd334f56fcc6089c5925cd82abb";
333− };
334− };
335−
336− v28_rc1 = {
337− version = "28.0.0-rc1";
338− src = fetchurl {
339− url = https://dl.google.com/android/repository/build-tools_r28-rc1-linux.zip;
340− sha1 = "1601977fae25fd478bcfaa0481ca5ea3c609d840";
341− };
342− };
343−
344− v28_rc2 = {
345− version = "28.0.0-rc2";
346− src = fetchurl {
347− url = https://dl.google.com/android/repository/build-tools_r28-rc2-linux.zip;
348− sha1 = "efe9c0dde0646a07544c864276390ca6e96b24dc";
349− };
350− };
351−
352− v28_0_1 = {
353− version = "28.0.1";
354− src = fetchurl {
355− url = https://dl.google.com/android/repository/build-tools_r28.0.1-linux.zip;
356− sha1 = "ee70dfa1fccb58b37cebc9544830511f36a137a0";
357− };
358− };
359−
360− v28_0_2 = {
361− version = "28.0.2";
362− src = fetchurl {
363− url = https://dl.google.com/android/repository/build-tools_r28.0.2-linux.zip;
364− sha1 = "b4492209810a3fd48deaa982f9852fef12433d55";
365− };
366− };
367−
368− v28_0_3 = {
369− version = "28.0.3";
370− src = fetchurl {
371− url = https://dl.google.com/android/repository/build-tools_r28.0.3-linux.zip;
372− sha1 = "ea6f2f7103cd9da9ff0bdf6e37fbbba548fa4165";
373− };
374− };
375−
376−}
pkgs/development/mobile/androidenv/build-tools-srcs-macosx.nixdeleted−376
@@ -1,376 +0,0 @@
1−
2−# This file is generated from generate-tools.sh. DO NOT EDIT.
3−# Execute generate-tools.sh or fetch.sh to update the file.
4−{ fetchurl }:
5−
6−{
7−
8− v17 = {
9− version = "17.0.0";
10− src = fetchurl {
11− url = https://dl.google.com/android/repository/build-tools_r17-macosx.zip;
12− sha1 = "602ee709be9dbb8f179b1e4075148a57f9419930";
13− };
14− };
15−
16− v18_0_1 = {
17− version = "18.0.1";
18− src = fetchurl {
19− url = https://dl.google.com/android/repository/build-tools_r18.0.1-macosx.zip;
20− sha1 = "d84f5692fb44d60fc53e5b2507cebf9f24626902";
21− };
22− };
23−
24− v18_1_0 = {
25− version = "18.1.0";
26− src = fetchurl {
27− url = https://dl.google.com/android/repository/build-tools_r18.1-macosx.zip;
28− sha1 = "16ddb299b8b43063e5bb3387ec17147c5053dfd8";
29− };
30− };
31−
32− v18_1_1 = {
33− version = "18.1.1";
34− src = fetchurl {
35− url = https://dl.google.com/android/repository/build-tools_r18.1.1-macosx.zip;
36− sha1 = "a9d9d37f6ddf859e57abc78802a77aaa166e48d4";
37− };
38− };
39−
40− v19 = {
41− version = "19.0.0";
42− src = fetchurl {
43− url = https://dl.google.com/android/repository/build-tools_r19-macosx.zip;
44− sha1 = "86ec1c12db1bc446b7bcaefc5cc14eb361044e90";
45− };
46− };
47−
48− v19_0_1 = {
49− version = "19.0.1";
50− src = fetchurl {
51− url = https://dl.google.com/android/repository/build-tools_r19.0.1-macosx.zip;
52− sha1 = "efaf50fb19a3edb8d03efbff76f89a249ad2920b";
53− };
54− };
55−
56− v19_0_2 = {
57− version = "19.0.2";
58− src = fetchurl {
59− url = https://dl.google.com/android/repository/build-tools_r19.0.2-macosx.zip;
60− sha1 = "145bc43065d45f756d99d87329d899052b9a9288";
61− };
62− };
63−
64− v19_0_3 = {
65− version = "19.0.3";
66− src = fetchurl {
67− url = https://dl.google.com/android/repository/build-tools_r19.0.3-macosx.zip;
68− sha1 = "651cf8754373b2d52e7f6aab2c52eabffe4e9ea4";
69− };
70− };
71−
72− v19_1_0 = {
73− version = "19.1.0";
74− src = fetchurl {
75− url = https://dl.google.com/android/repository/build-tools_r19.1-macosx.zip;
76− sha1 = "0d11aae3417de1efb4b9a0e0a7855904a61bcec1";
77− };
78− };
79−
80− v20 = {
81− version = "20.0.0";
82− src = fetchurl {
83− url = https://dl.google.com/android/repository/build-tools_r20-macosx.zip;
84− sha1 = "1240f629411c108a714c4ddd756937c7fab93f83";
85− };
86− };
87−
88− v21 = {
89− version = "21.0.0";
90− src = fetchurl {
91− url = https://dl.google.com/android/repository/build-tools_r21-macosx.zip;
92− sha1 = "9bef7989b51436bd4e5114d8a0330359f077cbfa";
93− };
94− };
95−
96− v21_0_1 = {
97− version = "21.0.1";
98− src = fetchurl {
99− url = https://dl.google.com/android/repository/build-tools_r21.0.1-macosx.zip;
100− sha1 = "b60c8f9b810c980abafa04896706f3911be1ade7";
101− };
102− };
103−
104− v21_0_2 = {
105− version = "21.0.2";
106− src = fetchurl {
107− url = https://dl.google.com/android/repository/build-tools_r21.0.2-macosx.zip;
108− sha1 = "f17471c154058f3734729ef3cc363399b1cd3de1";
109− };
110− };
111−
112− v21_1_0 = {
113− version = "21.1.0";
114− src = fetchurl {
115− url = https://dl.google.com/android/repository/build-tools_r21.1-macosx.zip;
116− sha1 = "df619356c2359aa5eacdd48699d15b335d9bd246";
117− };
118− };
119−
120− v21_1_1 = {
121− version = "21.1.1";
122− src = fetchurl {
123− url = https://dl.google.com/android/repository/build-tools_r21.1.1-macosx.zip;
124− sha1 = "836a146eab0504aa9387a5132e986fe7c7381571";
125− };
126− };
127−
128− v21_1_2 = {
129− version = "21.1.2";
130− src = fetchurl {
131− url = https://dl.google.com/android/repository/build-tools_r21.1.2-macosx.zip;
132− sha1 = "e7c906b4ba0eea93b32ba36c610dbd6b204bff48";
133− };
134− };
135−
136− v22 = {
137− version = "22.0.0";
138− src = fetchurl {
139− url = https://dl.google.com/android/repository/build-tools_r22-macosx.zip;
140− sha1 = "af95429b24088d704bc5db9bd606e34ac1b82c0d";
141− };
142− };
143−
144− v22_0_1 = {
145− version = "22.0.1";
146− src = fetchurl {
147− url = https://dl.google.com/android/repository/build-tools_r22.0.1-macosx.zip;
148− sha1 = "53dad7f608e01d53b17176ba11165acbfccc5bbf";
149− };
150− };
151−
152− v23 = {
153− version = "23.0.0";
154− src = fetchurl {
155− url = https://dl.google.com/android/repository/build-tools_r23-macosx.zip;
156− sha1 = "90ba6e716f7703a236cd44b2e71c5ff430855a03";
157− };
158− };
159−
160− v23_0_1 = {
161− version = "23.0.1";
162− src = fetchurl {
163− url = https://dl.google.com/android/repository/build-tools_r23.0.1-macosx.zip;
164− sha1 = "d96ec1522721e9a179ae2c591c99f75d31d39718";
165− };
166− };
167−
168− v23_0_2 = {
169− version = "23.0.2";
170− src = fetchurl {
171− url = https://dl.google.com/android/repository/build-tools_r23.0.2-macosx.zip;
172− sha1 = "482c4cbceef8ff58aefd92d8155a38610158fdaf";
173− };
174− };
175−
176− v23_0_3 = {
177− version = "23.0.3";
178− src = fetchurl {
179− url = https://dl.google.com/android/repository/build-tools_r23.0.3-macosx.zip;
180− sha1 = "fbc98cd303fd15a31d472de6c03bd707829f00b0";
181− };
182− };
183−
184− v24 = {
185− version = "24.0.0";
186− src = fetchurl {
187− url = https://dl.google.com/android/repository/build-tools_r24-macosx.zip;
188− sha1 = "97fc4ed442f23989cc488d02c1d1de9bdde241de";
189− };
190− };
191−
192− v24_0_1 = {
193− version = "24.0.1";
194− src = fetchurl {
195− url = https://dl.google.com/android/repository/build-tools_r24.0.1-macosx.zip;
196− sha1 = "5c6457fcdfa07724fb086d8ff4e8316fc0742848";
197− };
198− };
199−
200− v24_0_2 = {
201− version = "24.0.2";
202− src = fetchurl {
203− url = https://dl.google.com/android/repository/build-tools_r24.0.2-macosx.zip;
204− sha1 = "8bb8fc575477491d5957de743089df412de55cda";
205− };
206− };
207−
208− v24_0_3 = {
209− version = "24.0.3";
210− src = fetchurl {
211− url = https://dl.google.com/android/repository/build-tools_r24.0.3-macosx.zip;
212− sha1 = "a01c15f1b105c34595681075e1895d58b3fff48c";
213− };
214− };
215−
216− v25 = {
217− version = "25.0.0";
218− src = fetchurl {
219− url = https://dl.google.com/android/repository/build-tools_r25-macosx.zip;
220− sha1 = "273c5c29a65cbed00e44f3aa470bbd7dce556606";
221− };
222− };
223−
224− v25_0_1 = {
225− version = "25.0.1";
226− src = fetchurl {
227− url = https://dl.google.com/android/repository/build-tools_r25.0.1-macosx.zip;
228− sha1 = "7bf7f22d7d48ef20b6ab0e3d7a2912e5c088340f";
229− };
230− };
231−
232− v25_0_2 = {
233− version = "25.0.2";
234− src = fetchurl {
235− url = https://dl.google.com/android/repository/build-tools_r25.0.2-macosx.zip;
236− sha1 = "12a5204bb3b6e39437535469fde7ddf42da46b16";
237− };
238− };
239−
240− v25_0_3 = {
241− version = "25.0.3";
242− src = fetchurl {
243− url = https://dl.google.com/android/repository/build-tools_r25.0.3-macosx.zip;
244− sha1 = "160d2fefb5ce68e443427fc30a793a703b63e26e";
245− };
246− };
247−
248− v26 = {
249− version = "26.0.0";
250− src = fetchurl {
251− url = https://dl.google.com/android/repository/build-tools_r26-macosx.zip;
252− sha1 = "d01a1aeca03747245f1f5936b3cb01759c66d086";
253− };
254− };
255−
256− v26_rc1 = {
257− version = "26.0.0-rc1";
258− src = fetchurl {
259− url = https://dl.google.com/android/repository/build-tools_r26-rc1-macosx.zip;
260− sha1 = "5c5a1de7d5f4f000d36ae349229fe0be846d6137";
261− };
262− };
263−
264− v26_rc2 = {
265− version = "26.0.0-rc2";
266− src = fetchurl {
267− url = https://dl.google.com/android/repository/build-tools_r26-rc2-macosx.zip;
268− sha1 = "cb1eb738a1f7003025af267a9b8cc2d259533c70";
269− };
270− };
271−
272− v26_0_1 = {
273− version = "26.0.1";
274− src = fetchurl {
275− url = https://dl.google.com/android/repository/build-tools_r26.0.1-macosx.zip;
276− sha1 = "cbde59de198916b390777dd0227921bfa2120832";
277− };
278− };
279−
280− v26_0_2 = {
281− version = "26.0.2";
282− src = fetchurl {
283− url = https://dl.google.com/android/repository/build-tools_r26.0.2-macosx.zip;
284− sha1 = "d9ed7c7f149ce38be5dc08979aea8acec1459ca0";
285− };
286− };
287−
288− v26_0_3 = {
289− version = "26.0.3";
290− src = fetchurl {
291− url = https://dl.google.com/android/repository/build-tools_r26.0.3-macosx.zip;
292− sha1 = "5bb90ed935d99e5bc90686f43b852e68c5ad40df";
293− };
294− };
295−
296− v27 = {
297− version = "27.0.0";
298− src = fetchurl {
299− url = https://dl.google.com/android/repository/build-tools_r27-macosx.zip;
300− sha1 = "fb4e8d7e6b8d29a77090e34024077a80458d5ae1";
301− };
302− };
303−
304− v27_0_1 = {
305− version = "27.0.1";
306− src = fetchurl {
307− url = https://dl.google.com/android/repository/build-tools_r27.0.1-macosx.zip;
308− sha1 = "1edd07bfdbadd95652d093040e16d858f7489594";
309− };
310− };
311−
312− v27_0_2 = {
313− version = "27.0.2";
314− src = fetchurl {
315− url = https://dl.google.com/android/repository/build-tools_r27.0.2-macosx.zip;
316− sha1 = "6d5d9cf2a47877f273f4b742b19e712a051a31be";
317− };
318− };
319−
320− v27_0_3 = {
321− version = "27.0.3";
322− src = fetchurl {
323− url = https://dl.google.com/android/repository/build-tools_r27.0.3-macosx.zip;
324− sha1 = "61d9fb18790c68d66ff73bf1e7ad56bc1f1eef2d";
325− };
326− };
327−
328− v28 = {
329− version = "28.0.0";
330− src = fetchurl {
331− url = https://dl.google.com/android/repository/build-tools_r28-macosx.zip;
332− sha1 = "72088d32d1d82cc3c2cf7cf6618b6130c0c84ade";
333− };
334− };
335−
336− v28_rc1 = {
337− version = "28.0.0-rc1";
338− src = fetchurl {
339− url = https://dl.google.com/android/repository/build-tools_r28-rc1-macosx.zip;
340− sha1 = "2c77821967a2330b7b227072d0b1c02ef19fe2fc";
341− };
342− };
343−
344− v28_rc2 = {
345− version = "28.0.0-rc2";
346− src = fetchurl {
347− url = https://dl.google.com/android/repository/build-tools_r28-rc2-macosx.zip;
348− sha1 = "0d0314b353589feb10e528b44c5a685b6658d797";
349− };
350− };
351−
352− v28_0_1 = {
353− version = "28.0.1";
354− src = fetchurl {
355− url = https://dl.google.com/android/repository/build-tools_r28.0.1-macosx.zip;
356− sha1 = "aeef42ad953f1630dd6f5d71eefdc0b825211462";
357− };
358− };
359−
360− v28_0_2 = {
361− version = "28.0.2";
362− src = fetchurl {
363− url = https://dl.google.com/android/repository/build-tools_r28.0.2-macosx.zip;
364− sha1 = "c10dd5a7825578622fb362a8a34f76eb3ba0c0a9";
365− };
366− };
367−
368− v28_0_3 = {
369− version = "28.0.3";
370− src = fetchurl {
371− url = https://dl.google.com/android/repository/build-tools_r28.0.3-macosx.zip;
372− sha1 = "f8c333a2991b1ab05a671bc6248b78e00edcd83a";
373− };
374− };
375−
376−}
pkgs/development/mobile/androidenv/build-tools.nix+19−53
@@ -1,53 +1,19 @@
1−{stdenv, lib, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit, file, zlib, ncurses, coreutils, buildToolsSources}:
2−
3−let buildBuildTools = name: { version, src }:
4− stdenv.mkDerivation rec {
5− inherit version src;
6− name = "android-build-tools-r${version}";
7− buildCommand = ''
8− mkdir -p $out/build-tools
9− cd $out/build-tools
10− unzip $src
11− mv android-* ${version}
12−
13− cd ${version}
14−
15− for f in $(grep -Rl /bin/ls .); do
16− sed -i -e "s|/bin/ls|${coreutils}/bin/ls|" "$f"
17− done
18−
19− ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux")
20− ''
21−
22− ln -s ${ncurses.out}/lib/libncurses.so.5 `pwd`/lib64/libtinfo.so.5
23−
24− find . -type f -print0 | while IFS= read -r -d "" file
25− do
26− type=$(file "$file")
27− ## Patch 64-bit binaries
28− if grep -q "ELF 64-bit" <<< "$type"
29− then
30− if grep -q "interpreter" <<< "$type"
31− then
32− patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 "$file"
33− fi
34− patchelf --set-rpath `pwd`/lib64:${stdenv.cc.cc.lib.out}/lib:${zlib.out}/lib:${ncurses.out}/lib "$file"
35− ## Patch 32-bit binaries
36− elif grep -q "ELF 32-bit" <<< "$type"
37− then
38− if grep -q "interpreter" <<< "$type"
39− then
40− patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 "$file"
41− fi
42− patchelf --set-rpath ${stdenv_32bit.cc.cc.lib.out}/lib:${zlib_32bit.out}/lib:${ncurses_32bit.out}/lib "$file"
43− fi
44− done
45− ''}
46−
47− patchShebangs .
48− '';
49−
50− buildInputs = [ unzip file ];
51− };
52−in
53− lib.mapAttrs buildBuildTools buildToolsSources
1+{deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgs_i686}:
2+
3+deployAndroidPackage {
4+ inherit package os;
5+ buildInputs = [ autoPatchelfHook makeWrapper ] ++
6+ lib.optional (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs_i686.glibc pkgs_i686.zlib pkgs_i686.ncurses5 ];
7+ patchInstructions = ''
8+ ${lib.optionalString (os == "linux") ''
9+ addAutoPatchelfSearchPath $packageBaseDir/lib
10+ addAutoPatchelfSearchPath $packageBaseDir/lib64
11+ autoPatchelf --no-recurse $packageBaseDir/lib64
12+ autoPatchelf --no-recurse $packageBaseDir
13+ ''}
14+
15+ wrapProgram $PWD/mainDexClasses \
16+ --prefix PATH : ${pkgs.jdk8}/bin
17+ '';
18+ noAuditTmpdir = true; # The checker script gets confused by the build-tools path that is incorrectly identified as a reference to /build
19+}
pkgs/development/mobile/androidenv/cmake.nixnew file+10
@@ -0,0 +1,10 @@
1+{deployAndroidPackage, lib, package, os, autoPatchelfHook, pkgs}:
2+
3+deployAndroidPackage {
4+ inherit package os;
5+ buildInputs = [ autoPatchelfHook ]
6+ ++ lib.optional (os == "linux") [ pkgs.stdenv.glibc pkgs.stdenv.cc.cc ];
7+ patchInstructions = lib.optionalString (os == "linux") ''
8+ autoPatchelf $packageBaseDir/bin
9+ '';
10+}
pkgs/development/mobile/androidenv/compose-android-packages.nixnew file+262
@@ -0,0 +1,262 @@
1+{stdenv, fetchurl, requireFile, makeWrapper, unzip, autoPatchelfHook, pkgs, pkgs_i686, licenseAccepted ? false}:
2+
3+{ toolsVersion ? "25.2.5"
4+, platformToolsVersion ? "28.0.1"
5+, buildToolsVersions ? [ "28.0.3" ]
6+, includeEmulator ? false
7+, emulatorVersion ? "28.0.14"
8+, platformVersions ? []
9+, includeSources ? false
10+, includeDocs ? false
11+, includeSystemImages ? false
12+, systemImageTypes ? [ "default" ]
13+, abiVersions ? [ "armeabi-v7a" ]
14+, lldbVersions ? [ ]
15+, cmakeVersions ? [ ]
16+, includeNDK ? false
17+, ndkVersion ? "18.1.5063045"
18+, useGoogleAPIs ? false
19+, useGoogleTVAddOns ? false
20+, includeExtras ? []
21+}:
22+
23+if !licenseAccepted then throw ''
24+ You must accept the Android Software Development Kit License Agreement at
25+ https://developer.android.com/studio/terms
26+ by setting nixpkgs config option 'android_sdk.accept_license = true;'
27+ ''
28+else assert licenseAccepted;
29+
30+let
31+ inherit (pkgs) stdenv fetchurl makeWrapper unzip;
32+
33+ # Determine the Android os identifier from Nix's system identifier
34+ os = if stdenv.system == "x86_64-linux" then "linux"
35+ else if stdenv.system == "x86_64-darwin" then "macosx"
36+ else "No tarballs found for system architecture: ${stdenv.system}";
37+
38+ # Generated Nix packages
39+ packages = import ./generated/packages.nix {
40+ inherit fetchurl;
41+ };
42+
43+ # Generated system images
44+ system-images-packages-android = import ./generated/system-images-android.nix {
45+ inherit fetchurl;
46+ };
47+
48+ system-images-packages-android-tv = import ./generated/system-images-android-tv.nix {
49+ inherit fetchurl;
50+ };
51+
52+ system-images-packages-android-wear = import ./generated/system-images-android-wear.nix {
53+ inherit fetchurl;
54+ };
55+
56+ system-images-packages-android-wear-cn = import ./generated/system-images-android-wear-cn.nix {
57+ inherit fetchurl;
58+ };
59+
60+ system-images-packages-google_apis = import ./generated/system-images-google_apis.nix {
61+ inherit fetchurl;
62+ };
63+
64+ system-images-packages-google_apis_playstore = import ./generated/system-images-google_apis_playstore.nix {
65+ inherit fetchurl;
66+ };
67+
68+ system-images-packages =
69+ stdenv.lib.recursiveUpdate
70+ system-images-packages-android
71+ (stdenv.lib.recursiveUpdate system-images-packages-android-tv
72+ (stdenv.lib.recursiveUpdate system-images-packages-android-wear
73+ (stdenv.lib.recursiveUpdate system-images-packages-android-wear-cn
74+ (stdenv.lib.recursiveUpdate system-images-packages-google_apis system-images-packages-google_apis_playstore))));
75+
76+ # Generated addons
77+ addons = import ./generated/addons.nix {
78+ inherit fetchurl;
79+ };
80+in
81+rec {
82+ deployAndroidPackage = import ./deploy-androidpackage.nix {
83+ inherit stdenv unzip;
84+ };
85+
86+ platform-tools = import ./platform-tools.nix {
87+ inherit deployAndroidPackage os autoPatchelfHook pkgs;
88+ inherit (stdenv) lib;
89+ package = packages.platform-tools."${platformToolsVersion}";
90+ };
91+
92+ build-tools = map (version:
93+ import ./build-tools.nix {
94+ inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgs_i686;
95+ inherit (stdenv) lib;
96+ package = packages.build-tools."${version}";
97+ }
98+ ) buildToolsVersions;
99+
100+ docs = deployAndroidPackage {
101+ inherit os;
102+ package = packages.docs."1";
103+ };
104+
105+ emulator = import ./emulator.nix {
106+ inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgs_i686;
107+ inherit (stdenv) lib;
108+ package = packages.emulator."${emulatorVersion}"."${os}";
109+ };
110+
111+ platforms = map (version:
112+ deployAndroidPackage {
113+ inherit os;
114+ package = packages.platforms."${version}";
115+ }
116+ ) platformVersions;
117+
118+ sources = map (version:
119+ deployAndroidPackage {
120+ inherit os;
121+ package = packages.sources."${version}";
122+ }
123+ ) platformVersions;
124+
125+ system-images = stdenv.lib.flatten (map (apiVersion:
126+ map (type:
127+ map (abiVersion:
128+ deployAndroidPackage {
129+ inherit os;
130+ package = system-images-packages.${apiVersion}.${type}.${abiVersion};
131+ }
132+ ) abiVersions
133+ ) systemImageTypes
134+ ) platformVersions);
135+
136+ lldb = map (version:
137+ import ./lldb.nix {
138+ inherit deployAndroidPackage os autoPatchelfHook pkgs;
139+ inherit (stdenv) lib;
140+ package = packages.lldb."${version}";
141+ }
142+ ) lldbVersions;
143+
144+ cmake = map (version:
145+ import ./cmake.nix {
146+ inherit deployAndroidPackage os autoPatchelfHook pkgs;
147+ inherit (stdenv) lib;
148+ package = packages.cmake."${version}";
149+ }
150+ ) cmakeVersions;
151+
152+ ndk-bundle = import ./ndk-bundle {
153+ inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs platform-tools;
154+ inherit (stdenv) lib;
155+ package = packages.ndk-bundle."${ndkVersion}";
156+ };
157+
158+ google-apis = map (version:
159+ deployAndroidPackage {
160+ inherit os;
161+ package = addons.addons."${version}".google_apis;
162+ }
163+ ) (builtins.filter (platformVersion: platformVersion < "26") platformVersions); # API level 26 and higher include Google APIs by default
164+
165+ google-tv-addons = map (version:
166+ deployAndroidPackage {
167+ inherit os;
168+ package = addons.addons."${version}".google_tv_addon;
169+ }
170+ ) platformVersions;
171+
172+ # Function that automatically links all plugins for which multiple versions can coexist
173+ linkPlugins = {name, plugins}:
174+ stdenv.lib.optionalString (plugins != []) ''
175+ mkdir -p ${name}
176+ ${stdenv.lib.concatMapStrings (plugin: ''
177+ ln -s ${plugin}/libexec/android-sdk/${name}/* ${name}
178+ '') plugins}
179+ '';
180+
181+ # Function that automatically links a plugin for which only one version exists
182+ linkPlugin = {name, plugin, check ? true}:
183+ stdenv.lib.optionalString check ''
184+ ln -s ${plugin}/libexec/android-sdk/* ${name}
185+ '';
186+
187+ # Links all plugins related to a requested platform
188+ linkPlatformPlugins = {name, plugins, check}:
189+ stdenv.lib.optionalString check ''
190+ mkdir -p ${name}
191+ ${stdenv.lib.concatMapStrings (plugin: ''
192+ ln -s ${plugin}/libexec/android-sdk/${name}/* ${name}
193+ '') plugins}
194+ ''; # */
195+
196+ # This derivation deploys the tools package and symlinks all the desired
197+ # plugins that we want to use.
198+
199+ androidsdk = import ./tools.nix {
200+ inherit deployAndroidPackage requireFile packages toolsVersion autoPatchelfHook makeWrapper os pkgs pkgs_i686;
201+ inherit (stdenv) lib;
202+
203+ postInstall = ''
204+ # Symlink all requested plugins
205+
206+ ${linkPlugin { name = "platform-tools"; plugin = platform-tools; }}
207+ ${linkPlugins { name = "build-tools"; plugins = build-tools; }}
208+ ${linkPlugin { name = "emulator"; plugin = emulator; check = includeEmulator; }}
209+ ${linkPlugin { name = "docs"; plugin = docs; check = includeDocs; }}
210+ ${linkPlugins { name = "platforms"; plugins = platforms; }}
211+ ${linkPlatformPlugins { name = "sources"; plugins = sources; check = includeSources; }}
212+ ${linkPlugins { name = "lldb"; plugins = lldb; }}
213+ ${linkPlugins { name = "cmake"; plugins = cmake; }}
214+ ${linkPlugin { name = "ndk-bundle"; plugin = ndk-bundle; check = includeNDK; }}
215+
216+ ${stdenv.lib.optionalString includeSystemImages ''
217+ mkdir -p system-images
218+ ${stdenv.lib.concatMapStrings (system-image: ''
219+ apiVersion=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*))
220+ type=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*/*))
221+ mkdir -p system-images/$apiVersion/$type
222+ ln -s ${system-image}/libexec/android-sdk/system-images/$apiVersion/$type/* system-images/$apiVersion/$type
223+ '') system-images}
224+ ''}
225+
226+ ${linkPlatformPlugins { name = "add-ons"; plugins = google-apis; check = useGoogleAPIs; }}
227+ ${linkPlatformPlugins { name = "add-ons"; plugins = google-apis; check = useGoogleTVAddOns; }}
228+
229+ # Link extras
230+ ${stdenv.lib.concatMapStrings (identifier:
231+ let
232+ path = addons.extras."${identifier}".path;
233+ addon = deployAndroidPackage {
234+ inherit os;
235+ package = addons.extras."${identifier}";
236+ };
237+ in
238+ ''
239+ targetDir=$(dirname ${path})
240+ mkdir -p $targetDir
241+ ln -s ${addon}/libexec/android-sdk/${path} $targetDir
242+ '') includeExtras}
243+
244+ # Expose common executables in bin/
245+ mkdir -p $out/bin
246+ find $PWD/tools -not -path '*/\.*' -type f -executable -mindepth 1 -maxdepth 1 | while read i
247+ do
248+ ln -s $i $out/bin
249+ done
250+
251+ find $PWD/tools/bin -not -path '*/\.*' -type f -executable -mindepth 1 -maxdepth 1 | while read i
252+ do
253+ ln -s $i $out/bin
254+ done
255+
256+ for i in ${platform-tools}/bin/*
257+ do
258+ ln -s $i $out/bin
259+ done
260+ '';
261+ };
262+}
pkgs/development/mobile/androidenv/convertaddons.xslnew file+128
@@ -0,0 +1,128 @@
1+<?xml version="1.0"?>
2+
3+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
4+ xmlns:addon="http://schemas.android.com/sdk/android/repo/addon2/01"
5+ xmlns:sdk="http://schemas.android.com/repository/android/common/01"
6+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
7+
8+ <xsl:output omit-xml-declaration="yes" indent="no" />
9+
10+ <!-- Template that puts a google HTTP prefix in front of relative URLs -->
11+ <xsl:template name="repository-url">
12+ <xsl:variable name="raw-url" select="complete/url"/>
13+ <xsl:choose>
14+ <xsl:when test="starts-with($raw-url, 'http')">
15+ <xsl:value-of select="$raw-url"/>
16+ </xsl:when>
17+ <xsl:otherwise>
18+ <xsl:text>https://dl.google.com/android/repository/</xsl:text>
19+ <xsl:value-of select="$raw-url"/>
20+ </xsl:otherwise>
21+ </xsl:choose>
22+ </xsl:template>
23+
24+ <xsl:template match="/addon:sdk-addon">
25+{fetchurl}:
26+
27+{
28+ addons = {
29+ <!-- Convert all addons, but skip the entry for google APIs version 25 because it is inconsistent with the spec -->
30+ <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" />
31+ "<xsl:value-of select="type-details/api-level" />"."<xsl:value-of select="type-details/tag/id" />" = {
32+ name = "<xsl:value-of select="type-details/tag/id" />";
33+ path = "<xsl:value-of select="translate(@path, ';', '/')" />";
34+ revision = "<xsl:value-of select="type-details/api-level" />";
35+ displayName = "<xsl:value-of select="display-name" />";
36+ archives = {
37+ <xsl:for-each select="archives/archive[not(host-os)]">
38+ all = fetchurl {
39+ url = <xsl:call-template name="repository-url"/>;
40+ sha1 = "<xsl:value-of select="complete/checksum" />";
41+ };
42+ </xsl:for-each>
43+ <xsl:for-each select="archives/archive[host-os and not(host-os = 'windows')]">
44+ <xsl:value-of select="host-os" /> = fetchurl {
45+ url = <xsl:call-template name="repository-url"/>;
46+ sha1 = "<xsl:value-of select="complete/checksum" />";
47+ };
48+ </xsl:for-each>
49+ };
50+ };
51+ </xsl:for-each>
52+
53+ <!-- Workaround to make google APIs version 25 work. Hopefully, we can get rid of this at some point -->
54+ <xsl:for-each select="remotePackage[type-details/@xsi:type='addon:addonDetailsType' and archives/archive/complete/url = 'google_apis-25_r1.zip' ]">
55+ "<xsl:value-of select="25" />"."<xsl:value-of select="type-details/tag/id" />" = {
56+ name = "<xsl:value-of select="type-details/tag/id" />";
57+ path = "add-ons/addon-google_apis-google-25";
58+ revision = "<xsl:value-of select="25" />";
59+ displayName = "<xsl:value-of select="display-name" />";
60+ archives = {
61+ <xsl:for-each select="archives/archive[not(host-os)]">
62+ all = fetchurl {
63+ url = <xsl:call-template name="repository-url"/>;
64+ sha1 = "<xsl:value-of select="complete/checksum" />";
65+ };
66+ </xsl:for-each>
67+ <xsl:for-each select="archives/archive[host-os and not(host-os = 'windows')]">
68+ <xsl:value-of select="host-os" /> = fetchurl {
69+ url = <xsl:call-template name="repository-url"/>;
70+ sha1 = "<xsl:value-of select="complete/checksum" />";
71+ };
72+ </xsl:for-each>
73+ };
74+ };
75+ </xsl:for-each>
76+ };
77+
78+ extras = {
79+ <!-- Convert all extras and maven artefacts -->
80+ <xsl:for-each select="remotePackage[type-details/@xsi:type='addon:extraDetailsType' or type-details/@xsi:type='addon:mavenType']"><xsl:sort select="@path" />
81+
82+ <!-- Compose revision string from revision attributes -->
83+ <xsl:variable name="revision">
84+ <xsl:choose>
85+ <xsl:when test="revision/major">
86+ <xsl:value-of select="revision/major" />
87+ </xsl:when>
88+ </xsl:choose>
89+ <xsl:choose>
90+ <xsl:when test="revision/minor">.<xsl:value-of select="revision/minor" />
91+ </xsl:when>
92+ </xsl:choose>
93+ <xsl:choose>
94+ <xsl:when test="revision/micro">.<xsl:value-of select="revision/micro" />
95+ </xsl:when>
96+ </xsl:choose>
97+ <xsl:choose>
98+ <xsl:when test="revision/preview">-rc<xsl:value-of select="revision/preview" />
99+ </xsl:when>
100+ </xsl:choose>
101+ </xsl:variable>
102+
103+ "<xsl:value-of select="@path" />" = {
104+ name = "<xsl:value-of select="translate(@path, ';', '-')" />";
105+ path = "<xsl:value-of select="translate(@path, ';', '/')" />";
106+ revision = "<xsl:value-of select="$revision" />";
107+ displayName = "<xsl:value-of select="display-name" />";
108+ archives = {
109+ <xsl:for-each select="archives/archive[not(host-os)]">
110+ all = fetchurl {
111+ url = <xsl:call-template name="repository-url"/>;
112+ sha1 = "<xsl:value-of select="complete/checksum" />";
113+ };
114+ </xsl:for-each>
115+ <xsl:for-each select="archives/archive[host-os and not(host-os = 'windows')]">
116+ <xsl:value-of select="host-os" /> = fetchurl {
117+ url = <xsl:call-template name="repository-url"/>;
118+ sha1 = "<xsl:value-of select="complete/checksum" />";
119+ };
120+ </xsl:for-each>
121+ };
122+ };
123+ </xsl:for-each>
124+ };
125+}
126+ </xsl:template>
127+
128+</xsl:stylesheet>
pkgs/development/mobile/androidenv/convertpackages.xslnew file+116
@@ -0,0 +1,116 @@
1+<?xml version="1.0"?>
2+
3+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
4+ xmlns:common="http://schemas.android.com/repository/android/common/01"
5+ xmlns:generic="http://schemas.android.com/repository/android/generic/01"
6+ xmlns:sdk="http://schemas.android.com/sdk/android/repo/repository2/01"
7+ xmlns:sdk-common="http://schemas.android.com/sdk/android/repo/common/01"
8+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
9+
10+ <xsl:output omit-xml-declaration="yes" indent="no" />
11+
12+ <!-- Template that puts a google HTTP prefix in front of relative URLs -->
13+ <xsl:template name="repository-url">
14+ <xsl:variable name="raw-url" select="complete/url"/>
15+ <xsl:choose>
16+ <xsl:when test="starts-with($raw-url, 'http')">
17+ <xsl:value-of select="$raw-url"/>
18+ </xsl:when>
19+ <xsl:otherwise>
20+ <xsl:text>https://dl.google.com/android/repository/</xsl:text>
21+ <xsl:value-of select="$raw-url"/>
22+ </xsl:otherwise>
23+ </xsl:choose>
24+ </xsl:template>
25+
26+ <xsl:template match="/sdk:sdk-repository">
27+{fetchurl}:
28+
29+{
30+ <!-- Convert all remote packages -->
31+ <xsl:for-each select="remotePackage"><xsl:sort select="@path" />
32+
33+ <!-- Extract the package name from the path -->
34+ <xsl:variable name="name">
35+ <xsl:choose>
36+ <xsl:when test="contains(@path, ';')">
37+ <xsl:value-of select="substring-before(@path, ';')" />
38+ </xsl:when>
39+ <xsl:otherwise>
40+ <xsl:value-of select="@path" />
41+ </xsl:otherwise>
42+ </xsl:choose>
43+ </xsl:variable>
44+
45+ <!-- Compose version string from version attributes -->
46+ <xsl:variable name="revision">
47+ <xsl:choose>
48+ <!-- Compose revision for a generic package from the revision attributes -->
49+ <xsl:when test="type-details/@xsi:type='generic:genericDetailsType'">
50+ <xsl:choose>
51+ <xsl:when test="revision/major">
52+ <xsl:value-of select="revision/major" />
53+ </xsl:when>
54+ </xsl:choose>
55+ <xsl:choose>
56+ <xsl:when test="revision/minor">.<xsl:value-of select="revision/minor" />
57+ </xsl:when>
58+ </xsl:choose>
59+ <xsl:choose>
60+ <xsl:when test="revision/micro">.<xsl:value-of select="revision/micro" />
61+ </xsl:when>
62+ </xsl:choose>
63+ <xsl:choose>
64+ <xsl:when test="revision/preview">-rc<xsl:value-of select="revision/preview" />
65+ </xsl:when>
66+ </xsl:choose>
67+ </xsl:when>
68+ <!-- Compose revision of a platform SDK from the API-level or codename if the latter exists -->
69+ <xsl:when test="type-details/@xsi:type='sdk:platformDetailsType'">
70+ <xsl:choose>
71+ <xsl:when test="not(type-details/codename='')">
72+ <xsl:value-of select="type-details/codename" />
73+ </xsl:when>
74+ <xsl:otherwise>
75+ <xsl:value-of select="type-details/api-level" />
76+ </xsl:otherwise>
77+ </xsl:choose>
78+ </xsl:when>
79+ <!-- Compose revision of a source SDK from the API-level -->
80+ <xsl:when test="type-details/@xsi:type='sdk:sourceDetailsType'">
81+ <xsl:value-of select="type-details/api-level" />
82+ </xsl:when>
83+ </xsl:choose>
84+ </xsl:variable>
85+
86+ <xsl:choose>
87+ <xsl:when test="@path='emulator'"> <!-- An emulator package provides one archive per operating system but the same versions -->
88+ "<xsl:value-of select="$name" />"."<xsl:value-of select="$revision" />".<xsl:value-of select="archives/archive/host-os" /> = {
89+ </xsl:when>
90+ <xsl:otherwise>
91+ "<xsl:value-of select="$name" />"."<xsl:value-of select="$revision" />" = {
92+ </xsl:otherwise>
93+ </xsl:choose>
94+ name = "<xsl:value-of select="$name" />";
95+ path = "<xsl:value-of select="translate(@path, ';', '/')" />";
96+ revision = "<xsl:value-of select="$revision" />";
97+ displayName = "<xsl:value-of select="display-name" />";
98+ archives = {
99+ <xsl:for-each select="archives/archive[not(host-os)]">
100+ all = fetchurl {
101+ url = <xsl:call-template name="repository-url"/>;
102+ sha1 = "<xsl:value-of select="complete/checksum" />";
103+ };
104+ </xsl:for-each>
105+ <xsl:for-each select="archives/archive[host-os and not(host-os = 'windows')]">
106+ <xsl:value-of select="host-os" /> = fetchurl {
107+ url = <xsl:call-template name="repository-url"/>;
108+ sha1 = "<xsl:value-of select="complete/checksum" />";
109+ };
110+ </xsl:for-each>
111+ };
112+ };
113+ </xsl:for-each>
114+}
115+ </xsl:template>
116+</xsl:stylesheet>
pkgs/development/mobile/androidenv/convertsystemimages.xslnew file+47
@@ -0,0 +1,47 @@
1+<?xml version="1.0"?>
2+
3+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
4+ xmlns:sys-img="http://schemas.android.com/sdk/android/repo/sys-img2/01"
5+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
6+
7+ <xsl:param name="imageType" />
8+
9+ <xsl:output omit-xml-declaration="yes" indent="no" />
10+
11+ <xsl:template name="repository-url">
12+ <xsl:variable name="raw-url" select="complete/url"/>
13+ <xsl:choose>
14+ <xsl:when test="starts-with($raw-url, 'http')">
15+ <xsl:value-of select="$raw-url"/>
16+ </xsl:when>
17+ <xsl:otherwise>
18+ https://dl.google.com/android/repository/sys-img/<xsl:value-of select="$imageType" />/<xsl:value-of select="$raw-url"/>
19+ </xsl:otherwise>
20+ </xsl:choose>
21+ </xsl:template>
22+
23+ <xsl:template match="/sys-img:sdk-sys-img">
24+{fetchurl}:
25+
26+{
27+ <xsl:for-each select="remotePackage[starts-with(@path, 'system-images;')]">
28+ <xsl:variable name="revision">
29+ <xsl:value-of select="type-details/api-level" />-<xsl:value-of select="type-details/tag/id" />-<xsl:value-of select="type-details/abi" />
30+ </xsl:variable>
31+
32+ "<xsl:value-of select="type-details/api-level" />".<xsl:value-of select="type-details/tag/id" />."<xsl:value-of select="type-details/abi" />" = {
33+ name = "system-image-<xsl:value-of select="$revision" />";
34+ path = "<xsl:value-of select="translate(@path, ';', '/')" />";
35+ revision = "<xsl:value-of select="$revision" />";
36+ displayName = "<xsl:value-of select="display-name" />";
37+ archives.all = fetchurl {
38+ <xsl:for-each select="archives/archive">
39+ url = <xsl:call-template name="repository-url"/>;
40+ sha1 = "<xsl:value-of select="complete/checksum" />";
41+ </xsl:for-each>
42+ };
43+ };
44+ </xsl:for-each>
45+}
46+ </xsl:template>
47+</xsl:stylesheet>
pkgs/development/mobile/androidenv/default.nix+12−366
@@ -1,380 +1,26 @@
1−{ buildPackages, pkgs, pkgs_i686, targetPackages
2−, includeSources ? true, licenseAccepted ? false
1+{ pkgs ? import <nixpkgs> {}
2+, pkgs_i686 ? import <nixpkgs> { system = "i686-linux"; }
3+, licenseAccepted ? false
34}:
45
5−# TODO: use callPackage instead of import to avoid so many inherits
6−
76rec {
8− platformTools = import ./platform-tools.nix {
9− inherit buildPackages pkgs;
10− };
11−
12− buildToolsSources = let
13− system = pkgs.stdenv.hostPlatform.system;
14− path = if (system == "i686-linux" || system == "x86_64-linux")
15− then ./build-tools-srcs-linux.nix
16− else if system == "x86_64-darwin"
17− then ./build-tools-srcs-macosx.nix
18− else throw "System: ${system} not supported!";
19− in
20− import path { inherit (pkgs) fetchurl; };
21−
22− buildTools = import ./build-tools.nix {
23− inherit (pkgs) stdenv lib fetchurl unzip zlib file coreutils;
24− inherit buildToolsSources;
25− stdenv_32bit = pkgs_i686.stdenv;
26− zlib_32bit = pkgs_i686.zlib;
27− ncurses_32bit = pkgs_i686.ncurses5;
28− ncurses = pkgs.ncurses5;
29− };
30−
31− support = import ./support.nix {
32− inherit (pkgs) stdenv fetchurl unzip;
33− };
34−
35− supportRepository = import ./support-repository.nix {
36− inherit (pkgs) stdenv fetchurl unzip;
37− };
38−
39− platforms = if (pkgs.stdenv.hostPlatform.system == "i686-linux" || pkgs.stdenv.hostPlatform.system == "x86_64-linux")
40− then import ./platforms-linux.nix {
41− inherit (pkgs) stdenv fetchurl unzip;
42− }
43− else if pkgs.stdenv.hostPlatform.system == "x86_64-darwin"
44− then import ./platforms-macosx.nix {
45− inherit (pkgs) stdenv fetchurl unzip;
46− }
47− else throw "Platform: ${pkgs.stdenv.hostPlatform.system} not supported!";
48−
49− sysimages = import ./sysimages.nix {
50− inherit (pkgs) stdenv fetchurl unzip;
51− };
52−
53− addons = import ./addons.nix {
54− inherit (pkgs) stdenv fetchurl unzip;
55− };
56−
57− sources = import ./sources.nix {
58− inherit (pkgs) stdenv fetchurl unzip;
59− };
60−
61− androidsdk = import ./androidsdk.nix {
62− inherit (pkgs) stdenv fetchurl unzip makeWrapper zlib
63− glxinfo freetype fontconfig glib gtk2 atk
64− libGLU_combined file alsaLib jdk coreutils
65− libpulseaudio dbus fetchzip;
66− inherit (pkgs.xorg) libX11 libXext libXrender
67− libxcb libXau libXdmcp libXtst xkeyboardconfig;
68−
69− inherit platformTools buildTools support
70− supportRepository platforms sysimages
71− addons sources includeSources licenseAccepted;
72−
73− stdenv_32bit = pkgs_i686.stdenv;
74− };
75−
76− androidsdk_2_1 = androidsdk {
77− platformVersions = [ "7" ];
78− abiVersions = [ "armeabi-v7a" ];
79− useGoogleAPIs = true;
80− };
81−
82− androidsdk_2_2 = androidsdk {
83− platformVersions = [ "8" ];
84− abiVersions = [ "armeabi-v7a" ];
85− useGoogleAPIs = true;
86− };
87−
88− androidsdk_2_3_3 = androidsdk {
89− platformVersions = [ "10" ];
90− abiVersions = [ "armeabi-v7a" ];
91− useGoogleAPIs = true;
92− };
93−
94− androidsdk_3_0 = androidsdk {
95− platformVersions = [ "11" ];
96− abiVersions = [ "armeabi-v7a" ];
97− useGoogleAPIs = true;
98− };
99−
100− androidsdk_3_1 = androidsdk {
101− platformVersions = [ "12" ];
102− abiVersions = [ "armeabi-v7a" ];
103− useGoogleAPIs = true;
104− };
105−
106− androidsdk_3_2 = androidsdk {
107− platformVersions = [ "13" ];
108− abiVersions = [ "armeabi-v7a" ];
109− useGoogleAPIs = true;
110− };
111−
112− androidsdk_4_0 = androidsdk {
113− platformVersions = [ "14" ];
114− abiVersions = [ "armeabi-v7a" ];
115− useGoogleAPIs = true;
116− };
117−
118− androidsdk_4_0_3 = androidsdk {
119− platformVersions = [ "15" ];
120− abiVersions = [ "armeabi-v7a" ];
121− useGoogleAPIs = true;
122− };
123−
124− androidsdk_4_1 = androidsdk {
125− platformVersions = [ "16" ];
126− abiVersions = [ "armeabi-v7a" ];
127− useGoogleAPIs = true;
128− };
129−
130− androidsdk_4_2 = androidsdk {
131− platformVersions = [ "17" ];
132− abiVersions = [ "armeabi-v7a" ];
133− useGoogleAPIs = true;
134− };
135−
136− androidsdk_4_3 = androidsdk {
137− platformVersions = [ "18" ];
138− abiVersions = [ "armeabi-v7a" "x86" ];
139− useGoogleAPIs = true;
140− };
141−
142− androidsdk_4_4 = androidsdk {
143− platformVersions = [ "19" ];
144− abiVersions = [ "armeabi-v7a" "x86" ];
145− useGoogleAPIs = true;
146− };
147−
148− androidsdk_5_0_1 = androidsdk {
149− platformVersions = [ "21" ];
150− abiVersions = [ "armeabi-v7a" "x86" ];
151− useGoogleAPIs = true;
152− };
153−
154− androidsdk_5_0_1_extras = androidsdk {
155− platformVersions = [ "21" ];
156− abiVersions = [ "armeabi-v7a" "x86" ];
157− useGoogleAPIs = true;
158− useExtraSupportLibs = true;
159− useGooglePlayServices = true;
160− };
161−
162− androidsdk_5_1_1 = androidsdk {
163− platformVersions = [ "22" ];
164− abiVersions = [ "armeabi-v7a" "x86" "x86_64"];
165− useGoogleAPIs = true;
166− };
167−
168− androidsdk_5_1_1_extras = androidsdk {
169− platformVersions = [ "22" ];
170− abiVersions = [ "armeabi-v7a" "x86" "x86_64"];
171− useGoogleAPIs = true;
172− useExtraSupportLibs = true;
173− useGooglePlayServices = true;
174− };
175−
176− androidsdk_6_0 = androidsdk {
177− platformVersions = [ "23" ];
178− abiVersions = [ "armeabi-v7a" "x86" "x86_64"];
179− useGoogleAPIs = true;
180− };
181−
182− androidsdk_6_0_extras = androidsdk {
183− platformVersions = [ "23" ];
184− abiVersions = [ "armeabi-v7a" "x86" "x86_64"];
185− useGoogleAPIs = true;
186− useExtraSupportLibs = true;
187− useGooglePlayServices = true;
188− useInstantApps = true;
189− };
190−
191− androidsdk_7_0 = androidsdk {
192− platformVersions = [ "24" ];
193− abiVersions = [ "x86" "x86_64"];
194− useGoogleAPIs = true;
195− };
196−
197− androidsdk_7_0_extras = androidsdk {
198− platformVersions = [ "24" ];
199− abiVersions = [ "x86" "x86_64"];
200− useGoogleAPIs = true;
201− useExtraSupportLibs = true;
202− useGooglePlayServices = true;
203− useInstantApps = true;
204− };
205−
206− androidsdk_7_1_1 = androidsdk {
207− platformVersions = [ "25" ];
208− abiVersions = [ "x86" "x86_64"];
209− useGoogleAPIs = true;
210− };
211−
212− androidsdk_7_1_1_extras = androidsdk {
213− platformVersions = [ "25" ];
214− abiVersions = [ "x86" "x86_64"];
215− useGoogleAPIs = true;
216− useExtraSupportLibs = true;
217− useGooglePlayServices = true;
218− useInstantApps = true;
219− };
220−
221− androidsdk_8_0 = androidsdk {
222− platformVersions = [ "26" ];
223− abiVersions = [ "x86" "x86_64"];
224− useGoogleAPIs = true;
225− };
226−
227− androidsdk_8_0_extras = androidsdk {
228− platformVersions = [ "26" ];
229− abiVersions = [ "x86" "x86_64"];
230− useGoogleAPIs = true;
231− useExtraSupportLibs = true;
232− useGooglePlayServices = true;
233− useInstantApps = true;
234− };
235−
236− androidsdk_8_1 = androidsdk {
237− platformVersions = [ "27" ];
238− abiVersions = [ "x86" "x86_64"];
239− useGoogleAPIs = true;
240− };
241−
242− androidsdk_8_1_extras = androidsdk {
243− platformVersions = [ "27" ];
244− abiVersions = [ "x86" "x86_64"];
245− useGoogleAPIs = true;
246− useExtraSupportLibs = true;
247− useGooglePlayServices = true;
248− useInstantApps = true;
249− };
250−
251− androidsdk_9_0 = androidsdk {
252− platformVersions = [ "28" ];
253− abiVersions = [ "x86" "x86_64"];
254− useGoogleAPIs = true;
255− };
256−
257− androidsdk_9_0_extras = androidsdk {
258− platformVersions = [ "28" ];
259− abiVersions = [ "x86" "x86_64"];
260− useGoogleAPIs = true;
261− useExtraSupportLibs = true;
262− useGooglePlayServices = true;
263− useInstantApps = true;
264− };
265−
266− androidsdk_latest = androidsdk_9_0;
267−
268− androidndk_10e = pkgs.callPackage ./androidndk.nix {
269− inherit (buildPackages)
270− unzip makeWrapper;
271− inherit (pkgs)
272− stdenv fetchurl zlib ncurses5 lib python3 libcxx
273− coreutils file findutils gawk gnugrep gnused jdk which;
274− inherit platformTools;
275− version = "10e";
276− sha1s = {
277− x86_64-darwin = "6be8598e4ed3d9dd42998c8cb666f0ee502b1294";
278− x86_64-linux = "f692681b007071103277f6edc6f91cb5c5494a32";
279− };
280− };
281−
282− androidndk_16b = pkgs.callPackage ./androidndk.nix {
283− inherit (buildPackages)
284− unzip makeWrapper;
285− inherit (pkgs)
286− stdenv fetchurl zlib ncurses5 lib python3 libcxx
287− coreutils file findutils gawk gnugrep gnused jdk which;
288− inherit platformTools;
289− version = "16b";
290− sha1s = {
291− x86_64-darwin = "e51e615449b98c716cf912057e2682e75d55e2de";
292− x86_64-linux = "42aa43aae89a50d1c66c3f9fdecd676936da6128";
293− };
294− };
295−
296− androidndk_17c = pkgs.callPackage ./androidndk.nix {
297− inherit (buildPackages)
298− unzip makeWrapper;
299− inherit (pkgs)
300− stdenv fetchurl zlib ncurses5 lib python3 libcxx
301− coreutils file findutils gawk gnugrep gnused jdk which;
302− inherit platformTools;
303− version = "17c";
304− sha1s = {
305− x86_64-darwin = "f97e3d7711497e3b4faf9e7b3fa0f0da90bb649c";
306− x86_64-linux = "12cacc70c3fd2f40574015631c00f41fb8a39048";
307− };
308− };
309−
310− androidndk_18b = pkgs.callPackage ./androidndk.nix {
311− inherit (buildPackages)
312− unzip makeWrapper;
313− inherit (pkgs)
314− stdenv fetchurl zlib ncurses5 lib python3 libcxx
315− coreutils file findutils gawk gnugrep gnused jdk which;
316− inherit platformTools;
317− version = "18b";
318− sha1s = {
319− x86_64-darwin = "98cb9909aa8c2dab32db188bbdc3ac6207e09440";
320− x86_64-linux = "500679655da3a86aecf67007e8ab230ea9b4dd7b";
321− };
322− };
323− androidndk = androidndk_18b;
324−
325− androidndk_r8e = import ./androidndk_r8e.nix {
326− inherit (buildPackages)
327− makeWrapper;
328− inherit (pkgs)
329− stdenv fetchurl zlib ncurses lib
330− coreutils file findutils gawk gnugrep gnused jdk which;
331− inherit platformTools;
7+ composeAndroidPackages = import ./compose-android-packages.nix {
8+ inherit (pkgs) stdenv fetchurl requireFile makeWrapper unzip autoPatchelfHook;
9+ inherit pkgs pkgs_i686 licenseAccepted;
33210 };
33311
33412 buildApp = import ./build-app.nix {
335− inherit (pkgs) stdenv jdk ant gnumake gawk file which;
336− inherit androidsdk androidndk;
13+ inherit (pkgs) stdenv jdk ant gnumake gawk;
14+ inherit composeAndroidPackages;
33715 };
33816
33917 emulateApp = import ./emulate-app.nix {
34018 inherit (pkgs) stdenv;
341− inherit androidsdk;
19+ inherit composeAndroidPackages;
34220 };
34321
344− androidndkPkgs_17c = import ./androidndk-pkgs.nix {
345− inherit (buildPackages)
346− makeWrapper;
347− inherit (pkgs)
348− lib stdenv
349− runCommand wrapBintoolsWith wrapCCWith;
350− # buildPackages.foo rather than buildPackages.buildPackages.foo would work,
351− # but for splicing messing up on infinite recursion for the variants we
352− # *dont't* use. Using this workaround, but also making a test to ensure
353− # these two really are the same.
354− buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk_17c;
355− androidndk = androidndk_17c;
356− targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs_17c;
357− };
358− androidndkPkgs = androidndkPkgs_17c;
359−
360− androidndkPkgs_10e = import ./androidndk-pkgs.nix {
361− inherit (buildPackages)
362− makeWrapper;
363− inherit (pkgs)
364− lib stdenv
365− runCommand wrapBintoolsWith wrapCCWith;
366− # buildPackages.foo rather than buildPackages.buildPackages.foo would work,
367− # but for splicing messing up on infinite recursion for the variants we
368− # *dont't* use. Using this workaround, but also making a test to ensure
369− # these two really are the same.
370− buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk_10e;
371− androidndk = androidndk_10e;
372− targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs_10e;
373− };
374−
375− buildGradleApp = import ./build-gradle-app.nix {
376− inherit (pkgs) stdenv jdk gnumake gawk file runCommand
377− which gradle fetchurl buildEnv;
378− inherit androidsdk androidndk;
22+ androidPkgs_9_0 = composeAndroidPackages {
23+ platformVersions = [ "28" ];
24+ abiVersions = [ "x86" "x86_64"];
37925 };
38026}
pkgs/development/mobile/androidenv/deploy-androidpackage.nixnew file+44
@@ -0,0 +1,44 @@
1+{stdenv, unzip}:
2+{package, os ? null, buildInputs ? [], patchInstructions ? "", meta ? {}, ...}@args:
3+
4+let
5+ extraParams = removeAttrs args [ "package" "os" "buildInputs" "patchInstructions" ];
6+in
7+stdenv.mkDerivation ({
8+ name = package.name + "-" + package.revision;
9+ src = if os != null && builtins.hasAttr os package.archives then package.archives.${os} else package.archives.all;
10+ buildInputs = [ unzip ] ++ buildInputs;
11+
12+ # Most Android Zip packages have a root folder, but some don't. We unpack
13+ # the zip file in a folder and we try to discover whether it has a single root
14+ # folder. If this is the case, we adjust the current working folder.
15+ unpackPhase = ''
16+ mkdir extractedzip
17+ cd extractedzip
18+ unpackFile "$src"
19+ if [ "$(find . -mindepth 1 -maxdepth 1 -type d | wc -l)" -eq 1 ]
20+ then
21+ cd "$(find . -mindepth 1 -maxdepth 1 -type d)"
22+ fi
23+ sourceRoot="$PWD"
24+ '';
25+
26+ installPhase = ''
27+ packageBaseDir=$out/libexec/android-sdk/${package.path}
28+ mkdir -p $packageBaseDir
29+ cd $packageBaseDir
30+ cp -av $sourceRoot/* .
31+ ${patchInstructions}
32+ '';
33+
34+ # We never attempt to strip. This is not required since we're doing binary
35+ # deployments. Moreover, some executables that have been patched with patchelf
36+ # may not work any longer after they have been stripped.
37+ dontStrip = true;
38+ dontPatchELF = true;
39+ dontAutoPatchelf = true;
40+
41+ meta = {
42+ description = package.displayName;
43+ } // meta;
44+} // extraParams)
pkgs/development/mobile/androidenv/emulate-app.nix+52−41
@@ -1,33 +1,41 @@
1−{stdenv, androidsdk}:
1+{ composeAndroidPackages, stdenv }:
22{ name, app ? null
3−, platformVersion ? "8", abiVersion ? "armeabi-v7a", useGoogleAPIs ? false
3+, platformVersion ? "16", abiVersion ? "armeabi-v7a", systemImageType ? "default", useGoogleAPIs ? false
44, enableGPU ? false, extraAVDFiles ? []
55, package ? null, activity ? null
66, avdHomeDir ? null
7−}:
7+}@args:
88
99let
10− androidsdkComposition = androidsdk {
11− inherit useGoogleAPIs;
10+ androidSdkArgNames = builtins.attrNames (builtins.functionArgs composeAndroidPackages);
11+ extraParams = removeAttrs args ([ "name" ] ++ androidSdkArgNames);
12+
13+ # Extract the parameters meant for the Android SDK
14+ androidParams = {
1215 platformVersions = [ platformVersion ];
16+ includeEmulator = true;
17+ includeSystemImages = true;
18+ systemImageTypes = [ systemImageType ];
1319 abiVersions = [ abiVersion ];
1420 };
21+
22+ androidsdkComposition = (composeAndroidPackages androidParams).androidsdk;
1523in
1624stdenv.mkDerivation {
1725 inherit name;
18−
26+
1927 buildCommand = ''
2028 mkdir -p $out/bin
21−
29+
2230 cat > $out/bin/run-test-emulator << "EOF"
2331 #! ${stdenv.shell} -e
24−
32+
2533 # We need a TMPDIR
2634 if [ "$TMPDIR" = "" ]
2735 then
2836 export TMPDIR=/tmp
2937 fi
30−
38+
3139 ${if avdHomeDir == null then ''
3240 # Store the virtual devices somewhere else, instead of polluting a user's HOME directory
3341 export ANDROID_SDK_HOME=$(mktemp -d $TMPDIR/nix-android-vm-XXXX)
@@ -35,20 +43,23 @@ stdenv.mkDerivation {
3543 mkdir -p "${avdHomeDir}"
3644 export ANDROID_SDK_HOME="${avdHomeDir}"
3745 ''}
38−
46+
47+ # We need to specify the location of the Android SDK root folder
48+ export ANDROID_SDK_ROOT=${androidsdkComposition}/libexec/android-sdk
49+
3950 # We have to look for a free TCP port
40−
51+
4152 echo "Looking for a free TCP port in range 5554-5584" >&2
42−
53+
4354 for i in $(seq 5554 2 5584)
4455 do
45− if [ -z "$(${androidsdkComposition}/libexec/platform-tools/adb devices | grep emulator-$i)" ]
56+ if [ -z "$(${androidsdkComposition}/libexec/android-sdk/platform-tools/adb devices | grep emulator-$i)" ]
4657 then
4758 port=$i
4859 break
4960 fi
5061 done
51−
62+
5263 if [ -z "$port" ]
5364 then
5465 echo "Unfortunately, the emulator port space is exhausted!" >&2
@@ -56,57 +67,57 @@ stdenv.mkDerivation {
5667 else
5768 echo "We have a free TCP port: $port" >&2
5869 fi
59−
70+
6071 export ANDROID_SERIAL="emulator-$port"
61−
72+
6273 # Create a virtual android device for testing if it does not exists
63−
64− if [ "$(${androidsdkComposition}/libexec/tools/android list avd | grep 'Name: device')" = "" ]
74+ ${androidsdkComposition}/libexec/android-sdk/tools/android list targets
75+
76+ if [ "$(${androidsdkComposition}/libexec/android-sdk/tools/android list avd | grep 'Name: device')" = "" ]
6577 then
6678 # Create a virtual android device
67− 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
68−
79+ yes "" | ${androidsdkComposition}/libexec/android-sdk/tools/android create avd -n device -t 1 --abi ${systemImageType}/${abiVersion} $NIX_ANDROID_AVD_FLAGS
80+
6981 ${stdenv.lib.optionalString enableGPU ''
7082 # Enable GPU acceleration
7183 echo "hw.gpu.enabled=yes" >> $ANDROID_SDK_HOME/.android/avd/device.avd/config.ini
7284 ''}
73−
85+
7486 ${stdenv.lib.concatMapStrings (extraAVDFile: ''
7587 ln -sf ${extraAVDFile} $ANDROID_SDK_HOME/.android/avd/device.avd
7688 '') extraAVDFiles}
7789 fi
78−
90+
7991 # Launch the emulator
80− ${androidsdkComposition}/libexec/tools/emulator -avd device -no-boot-anim -port $port $NIX_ANDROID_EMULATOR_FLAGS &
92+ ${androidsdkComposition}/libexec/android-sdk/emulator/emulator -avd device -no-boot-anim -port $port $NIX_ANDROID_EMULATOR_FLAGS &
8193
8294 # Wait until the device has completely booted
83−
8495 echo "Waiting until the emulator has booted the device and the package manager is ready..." >&2
85−
86− ${androidsdkComposition}/libexec/platform-tools/adb -s emulator-$port wait-for-device
87−
96+
97+ ${androidsdkComposition}/libexec/android-sdk/platform-tools/adb -s emulator-$port wait-for-device
98+
8899 echo "Device state has been reached" >&2
89−
90− while [ -z "$(${androidsdkComposition}/libexec/platform-tools/adb -s emulator-$port shell getprop dev.bootcomplete | grep 1)" ]
100+
101+ while [ -z "$(${androidsdkComposition}/libexec/android-sdk/platform-tools/adb -s emulator-$port shell getprop dev.bootcomplete | grep 1)" ]
91102 do
92103 sleep 5
93104 done
94−
105+
95106 echo "dev.bootcomplete property is 1" >&2
96−
97− #while [ -z "$(${androidsdkComposition}/libexec/platform-tools/adb -s emulator-$port shell getprop sys.boot_completed | grep 1)" ]
107+
108+ #while [ -z "$(${androidsdkComposition}/libexec/android-sdk/platform-tools/adb -s emulator-$port shell getprop sys.boot_completed | grep 1)" ]
98109 #do
99110 #sleep 5
100111 #done
101−
112+
102113 #echo "sys.boot_completed property is 1" >&2
103−
114+
104115 echo "ready" >&2
105−
116+
106117 ${stdenv.lib.optionalString (app != null) ''
107118 # Install the App through the debugger, if it has not been installed yet
108−
109− if [ -z "${package}" ] || [ "$(${androidsdkComposition}/libexec/platform-tools/adb -s emulator-$port shell pm list packages | grep package:${package})" = "" ]
119+
120+ if [ -z "${package}" ] || [ "$(${androidsdkComposition}/libexec/android-sdk/platform-tools/adb -s emulator-$port shell pm list packages | grep package:${package})" = "" ]
110121 then
111122 if [ -d "${app}" ]
112123 then
@@ -114,13 +125,13 @@ stdenv.mkDerivation {
114125 else
115126 appPath="${app}"
116127 fi
117−
118− ${androidsdkComposition}/libexec/platform-tools/adb -s emulator-$port install "$appPath"
128+
129+ ${androidsdkComposition}/libexec/android-sdk/platform-tools/adb -s emulator-$port install "$appPath"
119130 fi
120−
131+
121132 # Start the application
122133 ${stdenv.lib.optionalString (package != null && activity != null) ''
123− ${androidsdkComposition}/libexec/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/${activity}
134+ ${androidsdkComposition}/libexec/android-sdk/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/${activity}
124135 ''}
125136 ''}
126137 EOF
pkgs/development/mobile/androidenv/emulator.nixnew file+20
@@ -0,0 +1,20 @@
1+{deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgs_i686}:
2+
3+deployAndroidPackage {
4+ inherit package os;
5+ buildInputs = [ autoPatchelfHook makeWrapper ]
6+ ++ 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 ];
7+ patchInstructions = lib.optionalString (os == "linux") ''
8+ addAutoPatchelfSearchPath $packageBaseDir/lib
9+ addAutoPatchelfSearchPath $packageBaseDir/lib64
10+ addAutoPatchelfSearchPath $packageBaseDir/lib64/qt/lib
11+ autoPatchelf $out
12+
13+ # Wrap emulator so that it can load libdbus-1.so at runtime and it no longer complains about XKB keymaps
14+ wrapProgram $out/libexec/android-sdk/emulator/emulator \
15+ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.dbus ]} \
16+ --set QT_XKB_CONFIG_ROOT ${pkgs.xkeyboard_config}/share/X11/xkb \
17+ --set QTCOMPOSE ${pkgs.xorg.libX11.out}/share/X11/locale
18+ '';
19+ dontMoveLib64 = true;
20+}
pkgs/development/mobile/androidenv/fetch.shdeleted−14
@@ -1,14 +0,0 @@
1−#! /usr/bin/env nix-shell
2−#! nix-shell -i bash --pure -p curl libxslt
3−
4−# we skip the intel addons, as they are Windows+osX only
5−# we skip the default sys-img (arm?) because it is empty
6−curl -o repository-11.xml https://dl.google.com/android/repository/repository-11.xml
7−curl -o addon.xml https://dl.google.com/android/repository/addon.xml
8−curl -o sys-img.xml https://dl.google.com/android/repository/sys-img/android/sys-img.xml
9−
10−./generate-addons.sh
11−./generate-platforms.sh
12−./generate-sysimages.sh
13−./generate-sources.sh
14−./generate-tools.sh
pkgs/development/mobile/androidenv/generate-addons.shdeleted−3
@@ -1,3 +0,0 @@
1−#!/bin/sh -e
2−
3−xsltproc generate-addons.xsl addon.xml > addons.nix
pkgs/development/mobile/androidenv/generate-addons.xsldeleted−82
@@ -1,82 +0,0 @@
1−<?xml version="1.0"?>
2−
3−<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
4− xmlns:sdk="http://schemas.android.com/sdk/android/addon/7">
5−
6− <xsl:output omit-xml-declaration="yes" indent="no" />
7− <xsl:template match="/sdk:sdk-addon">
8−# This file is generated from generate-addons.sh. DO NOT EDIT.
9−# Execute generate-addons.sh or fetch.sh to update the file.
10−{stdenv, fetchurl, unzip}:
11−
12−let
13− buildGoogleApis = args:
14− stdenv.mkDerivation (args // {
15− buildInputs = [ unzip ];
16− buildCommand = ''
17− mkdir -p $out
18− cd $out
19− unzip $src
20− '';
21− });
22−in
23−{
24−<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"/>
25− google_apis_<xsl:value-of select="sdk:api-level" /> = buildGoogleApis {
26− name = "<xsl:value-of select="sdk:name-id" />-<xsl:value-of select="sdk:api-level" />";
27− src = fetchurl {
28− url = https://dl.google.com/android/repository/<xsl:value-of select="sdk:archives/sdk:archive/sdk:url" />;
29− sha1 = "<xsl:value-of select="sdk:archives/sdk:archive/sdk:checksum[@type='sha1']" />";
30− };
31− meta = {
32− description = "<xsl:value-of select="sdk:description" />";
33−<xsl:for-each select="sdk:desc-url"> url = <xsl:value-of select="." />;</xsl:for-each>
34− };
35− };
36−</xsl:for-each>
37−
38−<xsl:for-each select="sdk:extra[sdk:path='support']">
39− android_support_extra = buildGoogleApis {
40− name = "android_support_extra";
41− src = fetchurl {
42− url = https://dl.google.com/android/repository/<xsl:value-of select="sdk:archives/sdk:archive/sdk:url"/>;
43− sha1 = "<xsl:value-of select="sdk:archives/sdk:archive/sdk:checksum[@type='sha1']" />";
44− };
45− meta = {
46− description = "Android Support Library";
47− url = http://developer.android.com/;
48− };
49− };
50−</xsl:for-each><xsl:for-each select="sdk:extra[sdk:path='google_play_services']">
51− google_play_services = buildGoogleApis {
52− name = "google_play_services";
53− src = fetchurl {
54− url = https://dl.google.com/android/repository/<xsl:value-of select="sdk:archives/sdk:archive/sdk:url"/>;
55− sha1 = "<xsl:value-of select="sdk:archives/sdk:archive/sdk:checksum[@type='sha1']" />";
56− };
57− meta = {
58− description = "Google Play services client library and sample code";
59− url = http://developer.android.com/;
60− };
61− };
62−</xsl:for-each>
63−
64−<!-- Instant apps -->
65−<xsl:for-each select="sdk:extra[sdk:path='instantapps']">
66− instant_apps = buildGoogleApis {
67− name = "instant_apps_sdk";
68− src = fetchurl {
69− url = https://dl.google.com/android/repository/<xsl:value-of select="sdk:archives/sdk:archive/sdk:url"/>;
70− sha1 = "<xsl:value-of select="sdk:archives/sdk:archive/sdk:checksum[@type='sha1']" />";
71− };
72− meta = {
73− description = "Android Instant Apps Development SDK";
74− url = "https://developer.android.com/";
75− };
76− };
77−</xsl:for-each>
78−
79−}
80−</xsl:template>
81−
82−</xsl:stylesheet>
pkgs/development/mobile/androidenv/generate-platforms.shdeleted−4
@@ -1,4 +0,0 @@
1−#!/bin/sh -e
2−
3−xsltproc --stringparam os linux generate-platforms.xsl repository-11.xml > platforms-linux.nix
4−xsltproc --stringparam os macosx generate-platforms.xsl repository-11.xml > platforms-macosx.nix
pkgs/development/mobile/androidenv/generate-platforms.xsldeleted−54
@@ -1,54 +0,0 @@
1−<?xml version="1.0"?>
2−
3−<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
4− xmlns:sdk="http://schemas.android.com/sdk/android/repository/11">
5−
6− <xsl:param name="os" />
7− <xsl:output omit-xml-declaration="yes" indent="no" />
8−
9− <xsl:template name="repository-url">
10− <xsl:variable name="raw-url" select="sdk:archives/sdk:archive[sdk:host-os=$os or count(sdk:host-os) = 0]/sdk:url"/>
11− <xsl:choose>
12− <xsl:when test="starts-with($raw-url, 'http')">
13− <xsl:value-of select="$raw-url"/>
14− </xsl:when>
15− <xsl:otherwise>
16− <xsl:text>https://dl.google.com/android/repository/</xsl:text>
17− <xsl:value-of select="$raw-url"/>
18− </xsl:otherwise>
19− </xsl:choose>
20− </xsl:template>
21−
22− <xsl:template match="/sdk:sdk-repository">
23−# This file is generated from generate-platforms.sh. DO NOT EDIT.
24−# Execute generate-platforms.sh or fetch.sh to update the file.
25−{stdenv, fetchurl, unzip}:
26−
27−let
28− buildPlatform = args:
29− stdenv.mkDerivation (args // {
30− buildInputs = [ unzip ];
31− buildCommand = ''
32− mkdir -p $out
33− cd $out
34− unzip $src
35− '';
36− });
37−in
38−{
39− <xsl:for-each select="sdk:platform"><xsl:sort select="sdk:api-level" data-type="number"/>
40− platform_<xsl:value-of select="sdk:api-level" /> = buildPlatform {
41− name = "android-platform-<xsl:value-of select="sdk:version" />";
42− src = fetchurl {
43− url = <xsl:call-template name="repository-url"/>;
44− sha1 = "<xsl:value-of select="sdk:archives/sdk:archive[sdk:host-os=$os or count(sdk:host-os) = 0]/sdk:checksum[@type='sha1']" />";
45− };
46− meta = {
47− description = "<xsl:value-of select="sdk:description" />";
48−<xsl:for-each select="sdk:desc-url"> homepage = <xsl:value-of select="." />;</xsl:for-each>
49− };
50− };
51−</xsl:for-each>
52−}
53−</xsl:template>
54−</xsl:stylesheet>
pkgs/development/mobile/androidenv/generate-sources.shdeleted−3
@@ -1,3 +0,0 @@
1−#!/bin/sh -e
2−
3−xsltproc generate-sources.xsl repository-11.xml > sources.nix
pkgs/development/mobile/androidenv/generate-sources.xsldeleted−52
@@ -1,52 +0,0 @@
1−<?xml version="1.0"?>
2−
3−<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
4− xmlns:sdk="http://schemas.android.com/sdk/android/repository/11">
5−
6− <xsl:output omit-xml-declaration="yes" indent="no" />
7−
8− <xsl:template name="repository-url">
9− <xsl:variable name="raw-url" select="sdk:archives/sdk:archive/sdk:url"/>
10− <xsl:choose>
11− <xsl:when test="starts-with($raw-url, 'http')">
12− <xsl:value-of select="$raw-url"/>
13− </xsl:when>
14− <xsl:otherwise>
15− <xsl:text>https://dl.google.com/android/repository/</xsl:text>
16− <xsl:value-of select="$raw-url"/>
17− </xsl:otherwise>
18− </xsl:choose>
19− </xsl:template>
20−
21− <xsl:template match="/sdk:sdk-repository">
22−# This file is generated from generate-sources.sh. DO NOT EDIT.
23−# Execute generate-sources.sh or fetch.sh to update the file.
24−{stdenv, fetchurl, unzip}:
25−
26−let
27− buildSource = args:
28− stdenv.mkDerivation (args // {
29− buildInputs = [ unzip ];
30− buildCommand = ''
31− mkdir -p $out
32− cd $out
33− unzip $src
34− '';
35− });
36−in
37−{
38−<xsl:for-each select="sdk:source"><xsl:sort select="sdk:api-level" data-type="number"/>
39− source_<xsl:value-of select="sdk:api-level" /> = buildSource {
40− name = "android-source-<xsl:value-of select="sdk:api-level" />";
41− src = fetchurl {
42− url = <xsl:call-template name="repository-url"/>;
43− sha1 = "<xsl:value-of select="sdk:archives/sdk:archive/sdk:checksum[@type='sha1']" />";
44− };
45− meta = {
46− description = "Source code for Android API <xsl:value-of select="sdk:api-level" />";
47− };
48− };
49−</xsl:for-each>
50−}
51−</xsl:template>
52−</xsl:stylesheet>
pkgs/development/mobile/androidenv/generate-sysimages.shdeleted−26
@@ -1,26 +0,0 @@
1−#!/bin/sh -e
2−
3−cat > sysimages.nix << "EOF"
4−# This file is generated from generate-sysimages.sh. DO NOT EDIT.
5−# Execute generate-sysimages.sh or fetch.sh to update the file.
6−{stdenv, fetchurl, unzip}:
7−
8−let
9− buildSystemImage = args:
10− stdenv.mkDerivation (args // {
11− buildInputs = [ unzip ];
12− buildCommand = ''
13− mkdir -p $out
14− cd $out
15− unzip $src
16− '';
17− });
18−in
19−{
20−EOF
21−
22−xsltproc generate-sysimages.xsl sys-img.xml >> sysimages.nix
23−
24−cat >> sysimages.nix << "EOF"
25−}
26−EOF
pkgs/development/mobile/androidenv/generate-sysimages.xsldeleted−20
@@ -1,20 +0,0 @@
1−<?xml version="1.0"?>
2−
3−<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
4− xmlns:str="http://exslt.org/strings"
5− xmlns:sdk="http://schemas.android.com/sdk/android/sys-img/3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
6−
7− <xsl:output omit-xml-declaration="yes" indent="no" />
8−
9− <xsl:template match="/sdk:sdk-sys-img">
10− <xsl:for-each select="sdk:system-image"><xsl:sort select="sdk:api-level" data-type="number"/><xsl:sort select="sdk:abi"/>
11− sysimg_<xsl:value-of select="sdk:abi" />_<xsl:value-of select="sdk:api-level" /> = buildSystemImage {
12− name = "sysimg-<xsl:value-of select="sdk:abi" />-<xsl:value-of select="sdk:api-level" />";
13− src = fetchurl {
14− 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" />;
15− sha1 = "<xsl:value-of select="sdk:archives/sdk:archive/sdk:checksum[@type='sha1']" />";
16− };
17− };
18−</xsl:for-each>
19− </xsl:template>
20−</xsl:stylesheet>
pkgs/development/mobile/androidenv/generate-tools.shdeleted−4
@@ -1,4 +0,0 @@
1−#!/bin/sh -e
2−
3−xsltproc --stringparam os linux generate-tools.xsl repository-11.xml > build-tools-srcs-linux.nix
4−xsltproc --stringparam os macosx generate-tools.xsl repository-11.xml > build-tools-srcs-macosx.nix
pkgs/development/mobile/androidenv/generate-tools.xsldeleted−43
@@ -1,43 +0,0 @@
1−<?xml version="1.0"?>
2−
3−<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
4− xmlns:sdk="http://schemas.android.com/sdk/android/repository/11">
5−
6− <xsl:param name="os" />
7− <xsl:output omit-xml-declaration="yes" indent="no" />
8−
9− <xsl:template name="repository-url">
10− <xsl:variable name="raw-url" select="sdk:archives/sdk:archive[sdk:host-os=$os or count(sdk:host-os) = 0]/sdk:url"/>
11− <xsl:choose>
12− <xsl:when test="starts-with($raw-url, 'http')">
13− <xsl:value-of select="$raw-url"/>
14− </xsl:when>
15− <xsl:otherwise>
16− <xsl:text>https://dl.google.com/android/repository/</xsl:text>
17− <xsl:value-of select="$raw-url"/>
18− </xsl:otherwise>
19− </xsl:choose>
20− </xsl:template>
21−
22− <xsl:template match="/sdk:sdk-repository">
23−# This file is generated from generate-tools.sh. DO NOT EDIT.
24−# Execute generate-tools.sh or fetch.sh to update the file.
25−{ fetchurl }:
26−
27−{
28− <xsl:for-each select="sdk:build-tool">
29− <xsl:sort select="sdk:revision/sdk:major" data-type="number"/>
30− <xsl:sort select="sdk:revision/sdk:minor" data-type="number"/>
31− <xsl:sort select="sdk:revision/sdk:micro" data-type="number"/>
32− <xsl:sort select="sdk:revision/sdk:preview" data-type="number"/>
33− 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> = {
34− 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>";
35− src = fetchurl {
36− url = <xsl:call-template name="repository-url"/>;
37− sha1 = "<xsl:value-of select="sdk:archives/sdk:archive[sdk:host-os=$os or count(sdk:host-os) = 0]/sdk:checksum[@type='sha1']" />";
38− };
39− };
40−</xsl:for-each>
41−}
42−</xsl:template>
43−</xsl:stylesheet>
pkgs/development/mobile/androidenv/generate.shnew file+16
@@ -0,0 +1,16 @@
1+#!/bin/sh -e
2+
3+# Convert base packages
4+curl https://dl.google.com/android/repository/repository2-1.xml -o xml/repository2-1.xml
5+xsltproc convertpackages.xsl xml/repository2-1.xml > generated/packages.nix
6+
7+# Convert system images
8+for img in android android-tv android-wear android-wear-cn google_apis google_apis_playstore
9+do
10+ curl https://dl.google.com/android/repository/sys-img/$img/sys-img2-1.xml -o xml/$img-sys-img2-1.xml
11+ xsltproc --stringparam imageType $img convertsystemimages.xsl xml/$img-sys-img2-1.xml > generated/system-images-$img.nix
12+done
13+
14+# Convert system addons
15+curl https://dl.google.com/android/repository/addon2-1.xml -o xml/addon2-1.xml
16+xsltproc convertaddons.xsl xml/addon2-1.xml > generated/addons.nix
pkgs/development/mobile/androidenv/generated/addons.nixnew file+1145
@@ -0,0 +1,1145 @@
1+
2+{fetchurl}:
3+
4+{
5+ addons = {
6+
7+ "10"."google_apis" = {
8+ name = "google_apis";
9+ path = "add-ons/addon-google_apis-google-10";
10+ revision = "10";
11+ displayName = "Google APIs";
12+ archives = {
13+
14+ all = fetchurl {
15+ url = https://dl.google.com/android/repository/google_apis-10_r02.zip;
16+ sha1 = "cc0711857c881fa7534f90cf8cc09b8fe985484d";
17+ };
18+
19+ };
20+ };
21+
22+ "11"."google_apis" = {
23+ name = "google_apis";
24+ path = "add-ons/addon-google_apis-google-11";
25+ revision = "11";
26+ displayName = "Google APIs";
27+ archives = {
28+
29+ all = fetchurl {
30+ url = https://dl.google.com/android/repository/google_apis-11_r01.zip;
31+ sha1 = "5eab5e81addee9f3576d456d205208314b5146a5";
32+ };
33+
34+ };
35+ };
36+
37+ "12"."google_apis" = {
38+ name = "google_apis";
39+ path = "add-ons/addon-google_apis-google-12";
40+ revision = "12";
41+ displayName = "Google APIs";
42+ archives = {
43+
44+ all = fetchurl {
45+ url = https://dl.google.com/android/repository/google_apis-12_r01.zip;
46+ sha1 = "e9999f4fa978812174dfeceec0721c793a636e5d";
47+ };
48+
49+ };
50+ };
51+
52+ "13"."google_apis" = {
53+ name = "google_apis";
54+ path = "add-ons/addon-google_apis-google-13";
55+ revision = "13";
56+ displayName = "Google APIs";
57+ archives = {
58+
59+ all = fetchurl {
60+ url = https://dl.google.com/android/repository/google_apis-13_r01.zip;
61+ sha1 = "3b153edd211c27dc736c893c658418a4f9041417";
62+ };
63+
64+ };
65+ };
66+
67+ "14"."google_apis" = {
68+ name = "google_apis";
69+ path = "add-ons/addon-google_apis-google-14";
70+ revision = "14";
71+ displayName = "Google APIs";
72+ archives = {
73+
74+ all = fetchurl {
75+ url = https://dl.google.com/android/repository/google_apis-14_r02.zip;
76+ sha1 = "f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39";
77+ };
78+
79+ };
80+ };
81+
82+ "15"."google_apis" = {
83+ name = "google_apis";
84+ path = "add-ons/addon-google_apis-google-15";
85+ revision = "15";
86+ displayName = "Google APIs";
87+ archives = {
88+
89+ all = fetchurl {
90+ url = https://dl.google.com/android/repository/google_apis-15_r03.zip;
91+ sha1 = "d0d2bf26805eb271693570a1aaec33e7dc3f45e9";
92+ };
93+
94+ };
95+ };
96+
97+ "16"."google_apis" = {
98+ name = "google_apis";
99+ path = "add-ons/addon-google_apis-google-16";
100+ revision = "16";
101+ displayName = "Google APIs";
102+ archives = {
103+
104+ all = fetchurl {
105+ url = https://dl.google.com/android/repository/google_apis-16_r04.zip;
106+ sha1 = "ee6acf1b01020bfa8a8e24725dbc4478bee5e792";
107+ };
108+
109+ };
110+ };
111+
112+ "17"."google_apis" = {
113+ name = "google_apis";
114+ path = "add-ons/addon-google_apis-google-17";
115+ revision = "17";
116+ displayName = "Google APIs";
117+ archives = {
118+
119+ all = fetchurl {
120+ url = https://dl.google.com/android/repository/google_apis-17_r04.zip;
121+ sha1 = "a076be0677f38df8ca5536b44dfb411a0c808c4f";
122+ };
123+
124+ };
125+ };
126+
127+ "18"."google_apis" = {
128+ name = "google_apis";
129+ path = "add-ons/addon-google_apis-google-18";
130+ revision = "18";
131+ displayName = "Google APIs";
132+ archives = {
133+
134+ all = fetchurl {
135+ url = https://dl.google.com/android/repository/google_apis-18_r04.zip;
136+ sha1 = "6109603409debdd40854d4d4a92eaf8481462c8b";
137+ };
138+
139+ };
140+ };
141+
142+ "19"."google_apis" = {
143+ name = "google_apis";
144+ path = "add-ons/addon-google_apis-google-19";
145+ revision = "19";
146+ displayName = "Google APIs";
147+ archives = {
148+
149+ all = fetchurl {
150+ url = https://dl.google.com/android/repository/google_apis-19_r20.zip;
151+ sha1 = "5b933abe830b2f25b4c0f171d45e9e0651e56311";
152+ };
153+
154+ };
155+ };
156+
157+ "21"."google_apis" = {
158+ name = "google_apis";
159+ path = "add-ons/addon-google_apis-google-21";
160+ revision = "21";
161+ displayName = "Google APIs";
162+ archives = {
163+
164+ all = fetchurl {
165+ url = https://dl.google.com/android/repository/google_apis-21_r01.zip;
166+ sha1 = "66a754efb24e9bb07cc51648426443c7586c9d4a";
167+ };
168+
169+ };
170+ };
171+
172+ "22"."google_apis" = {
173+ name = "google_apis";
174+ path = "add-ons/addon-google_apis-google-22";
175+ revision = "22";
176+ displayName = "Google APIs";
177+ archives = {
178+
179+ all = fetchurl {
180+ url = https://dl.google.com/android/repository/google_apis-22_r01.zip;
181+ sha1 = "5def0f42160cba8acff51b9c0c7e8be313de84f5";
182+ };
183+
184+ };
185+ };
186+
187+ "23"."google_apis" = {
188+ name = "google_apis";
189+ path = "add-ons/addon-google_apis-google-23";
190+ revision = "23";
191+ displayName = "Google APIs";
192+ archives = {
193+
194+ all = fetchurl {
195+ url = https://dl.google.com/android/repository/google_apis-23_r01.zip;
196+ sha1 = "04c5cc1a7c88967250ebba9561d81e24104167db";
197+ };
198+
199+ };
200+ };
201+
202+ "24"."google_apis" = {
203+ name = "google_apis";
204+ path = "add-ons/addon-google_apis-google-24";
205+ revision = "24";
206+ displayName = "Google APIs";
207+ archives = {
208+
209+ all = fetchurl {
210+ url = https://dl.google.com/android/repository/google_apis-24_r1.zip;
211+ sha1 = "31361c2868f27343ee917fbd259c1463821b6145";
212+ };
213+
214+ };
215+ };
216+
217+ "3"."google_apis" = {
218+ name = "google_apis";
219+ path = "add-ons/addon-google_apis-google-3";
220+ revision = "3";
221+ displayName = "Google APIs";
222+ archives = {
223+
224+ all = fetchurl {
225+ url = https://dl.google.com/android/repository/google_apis-3-r03.zip;
226+ sha1 = "1f92abf3a76be66ae8032257fc7620acbd2b2e3a";
227+ };
228+
229+ };
230+ };
231+
232+ "4"."google_apis" = {
233+ name = "google_apis";
234+ path = "add-ons/addon-google_apis-google-4";
235+ revision = "4";
236+ displayName = "Google APIs";
237+ archives = {
238+
239+ all = fetchurl {
240+ url = https://dl.google.com/android/repository/google_apis-4_r02.zip;
241+ sha1 = "9b6e86d8568558de4d606a7debc4f6049608dbd0";
242+ };
243+
244+ };
245+ };
246+
247+ "5"."google_apis" = {
248+ name = "google_apis";
249+ path = "add-ons/addon-google_apis-google-5";
250+ revision = "5";
251+ displayName = "Google APIs";
252+ archives = {
253+
254+ all = fetchurl {
255+ url = https://dl.google.com/android/repository/google_apis-5_r01.zip;
256+ sha1 = "46eaeb56b645ee7ffa24ede8fa17f3df70db0503";
257+ };
258+
259+ };
260+ };
261+
262+ "6"."google_apis" = {
263+ name = "google_apis";
264+ path = "add-ons/addon-google_apis-google-6";
265+ revision = "6";
266+ displayName = "Google APIs";
267+ archives = {
268+
269+ all = fetchurl {
270+ url = https://dl.google.com/android/repository/google_apis-6_r01.zip;
271+ sha1 = "5ff545d96e031e09580a6cf55713015c7d4936b2";
272+ };
273+
274+ };
275+ };
276+
277+ "7"."google_apis" = {
278+ name = "google_apis";
279+ path = "add-ons/addon-google_apis-google-7";
280+ revision = "7";
281+ displayName = "Google APIs";
282+ archives = {
283+
284+ all = fetchurl {
285+ url = https://dl.google.com/android/repository/google_apis-7_r01.zip;
286+ sha1 = "2e7f91e0fe34fef7f58aeced973c6ae52361b5ac";
287+ };
288+
289+ };
290+ };
291+
292+ "8"."google_apis" = {
293+ name = "google_apis";
294+ path = "add-ons/addon-google_apis-google-8";
295+ revision = "8";
296+ displayName = "Google APIs";
297+ archives = {
298+
299+ all = fetchurl {
300+ url = https://dl.google.com/android/repository/google_apis-8_r02.zip;
301+ sha1 = "3079958e7ec87222cac1e6b27bc471b27bf2c352";
302+ };
303+
304+ };
305+ };
306+
307+ "9"."google_apis" = {
308+ name = "google_apis";
309+ path = "add-ons/addon-google_apis-google-9";
310+ revision = "9";
311+ displayName = "Google APIs";
312+ archives = {
313+
314+ all = fetchurl {
315+ url = https://dl.google.com/android/repository/google_apis-9_r02.zip;
316+ sha1 = "78664645a1e9accea4430814f8694291a7f1ea5d";
317+ };
318+
319+ };
320+ };
321+
322+ "12"."google_tv_addon" = {
323+ name = "google_tv_addon";
324+ path = "add-ons/addon-google_tv_addon-google-12";
325+ revision = "12";
326+ displayName = "Google TV Addon";
327+ archives = {
328+
329+ all = fetchurl {
330+ url = https://dl.google.com/android/repository/google_tv-12_r02.zip;
331+ sha1 = "92128a12e7e8b0fb5bac59153d7779b717e7b840";
332+ };
333+
334+ };
335+ };
336+
337+ "13"."google_tv_addon" = {
338+ name = "google_tv_addon";
339+ path = "add-ons/addon-google_tv_addon-google-13";
340+ revision = "13";
341+ displayName = "Google TV Addon";
342+ archives = {
343+
344+ all = fetchurl {
345+ url = https://dl.google.com/android/repository/google_tv-13_r01.zip;
346+ sha1 = "b73f7c66011ac8180b44aa4e83b8d78c66ea9a09";
347+ };
348+
349+ };
350+ };
351+
352+ "25"."google_apis" = {
353+ name = "google_apis";
354+ path = "add-ons/addon-google_apis-google-25";
355+ revision = "25";
356+ displayName = "Google APIs";
357+ archives = {
358+
359+ all = fetchurl {
360+ url = https://dl.google.com/android/repository/google_apis-25_r1.zip;
361+ sha1 = "550e83eea9513ab11c44919ac6da54b36084a9f3";
362+ };
363+
364+ };
365+ };
366+
367+ };
368+
369+ extras = {
370+
371+
372+ "extras;android;gapid;1" = {
373+ name = "extras-android-gapid-1";
374+ path = "extras/android/gapid/1";
375+ revision = "1.0.3";
376+ displayName = "GPU Debugging tools";
377+ archives = {
378+ linux = fetchurl {
379+ url = https://dl.google.com/android/repository/gapid_r01_linux.zip;
380+ sha1 = "7c9ef7544cf0aea030bcc29bd8e12c04fd53e653";
381+ };
382+ macosx = fetchurl {
383+ url = https://dl.google.com/android/repository/gapid_r01_osx.zip;
384+ sha1 = "597eb271349d890566274861eba2770a84ee4c69";
385+ };
386+
387+ };
388+ };
389+
390+
391+ "extras;android;gapid;3" = {
392+ name = "extras-android-gapid-3";
393+ path = "extras/android/gapid/3";
394+ revision = "3.1.0";
395+ displayName = "GPU Debugging tools";
396+ archives = {
397+ linux = fetchurl {
398+ url = https://dl.google.com/android/repository/gapid_2994895_linux.zip;
399+ sha1 = "e40371ba191f617e4e79bc760d0ab2948ba8cf46";
400+ };
401+ macosx = fetchurl {
402+ url = https://dl.google.com/android/repository/gapid_2994895_osx.zip;
403+ sha1 = "ad86a2350b7b9908300277bf03d41649659de384";
404+ };
405+
406+ };
407+ };
408+
409+
410+ "extras;android;m2repository" = {
411+ name = "extras-android-m2repository";
412+ path = "extras/android/m2repository";
413+ revision = "47.0.0";
414+ displayName = "Android Support Repository";
415+ archives = {
416+
417+ all = fetchurl {
418+ url = https://dl.google.com/android/repository/android_m2repository_r47.zip;
419+ sha1 = "a0d22beacc106a6977321f2b07d692ce4979e96a";
420+ };
421+
422+ };
423+ };
424+
425+
426+ "extras;google;admob_ads_sdk" = {
427+ name = "extras-google-admob_ads_sdk";
428+ path = "extras/google/admob_ads_sdk";
429+ revision = "11";
430+ displayName = "Google AdMob Ads SDK";
431+ archives = {
432+
433+ all = fetchurl {
434+ url = https://dl.google.com/android/repository/GoogleAdMobAdsSdkAndroid-6.4.1.zip;
435+ sha1 = "0102859d9575baa0bf4fd5eb422af2ad0fe6cb82";
436+ };
437+
438+ };
439+ };
440+
441+
442+ "extras;google;analytics_sdk_v2" = {
443+ name = "extras-google-analytics_sdk_v2";
444+ path = "extras/google/analytics_sdk_v2";
445+ revision = "3";
446+ displayName = "Google Analytics App Tracking SDK";
447+ archives = {
448+
449+ all = fetchurl {
450+ url = https://dl.google.com/android/repository/GoogleAnalyticsAndroid_2.0beta5.zip;
451+ sha1 = "dc14026bf0ce78315cb5dd00552607de0894de83";
452+ };
453+
454+ };
455+ };
456+
457+
458+ "extras;google;auto" = {
459+ name = "extras-google-auto";
460+ path = "extras/google/auto";
461+ revision = "1.1";
462+ displayName = "Android Auto Desktop Head Unit emulator";
463+ archives = {
464+ linux = fetchurl {
465+ url = https://dl.google.com/android/repository/desktop-head-unit-linux_r01.1.zip;
466+ sha1 = "202a6e1b3009a0eb815f8c672d2d5b3717de6169";
467+ };
468+ macosx = fetchurl {
469+ url = https://dl.google.com/android/repository/desktop-head-unit-macosx_r01.1.zip;
470+ sha1 = "8179cbb3914493ebc5eb65b731cba061582f2e84";
471+ };
472+
473+ };
474+ };
475+
476+
477+ "extras;google;gcm" = {
478+ name = "extras-google-gcm";
479+ path = "extras/google/gcm";
480+ revision = "3";
481+ displayName = "Google Cloud Messaging for Android Library";
482+ archives = {
483+
484+ all = fetchurl {
485+ url = https://dl.google.com/android/repository/gcm_r03.zip;
486+ sha1 = "ad066fd0dc7fc99d8aadac09c65a3c2519fbc7bf";
487+ };
488+
489+ };
490+ };
491+
492+
493+ "extras;google;google_play_services" = {
494+ name = "extras-google-google_play_services";
495+ path = "extras/google/google_play_services";
496+ revision = "49";
497+ displayName = "Google Play services";
498+ archives = {
499+
500+ all = fetchurl {
501+ url = https://dl.google.com/android/repository/google_play_services_v16_1_rc09.zip;
502+ sha1 = "f95bf19634e2ab0430923247fe2c50246432d2e9";
503+ };
504+
505+ };
506+ };
507+
508+
509+ "extras;google;google_play_services_froyo" = {
510+ name = "extras-google-google_play_services_froyo";
511+ path = "extras/google/google_play_services_froyo";
512+ revision = "12";
513+ displayName = "Google Play services for Froyo";
514+ archives = {
515+
516+ all = fetchurl {
517+ url = https://dl.google.com/android/repository/google_play_services_3265130_r12.zip;
518+ sha1 = "92558dbc380bba3d55d0ec181167fb05ce7c79d9";
519+ };
520+
521+ };
522+ };
523+
524+
525+ "extras;google;instantapps" = {
526+ name = "extras-google-instantapps";
527+ path = "extras/google/instantapps";
528+ revision = "1.5.0";
529+ displayName = "Google Play Instant Development SDK";
530+ archives = {
531+
532+ all = fetchurl {
533+ url = https://dl.google.com/android/repository/iasdk-1.5.0-1538000167.zip;
534+ sha1 = "6c282b9c686e819fe7f5ac8f2249d2479acb63b4";
535+ };
536+
537+ };
538+ };
539+
540+
541+ "extras;google;m2repository" = {
542+ name = "extras-google-m2repository";
543+ path = "extras/google/m2repository";
544+ revision = "58";
545+ displayName = "Google Repository";
546+ archives = {
547+
548+ all = fetchurl {
549+ url = https://dl.google.com/android/repository/google_m2repository_gms_v11_3_rc05_wear_2_0_5.zip;
550+ sha1 = "05086add9e3a0eb1b67111108d7757a4337c3f10";
551+ };
552+
553+ };
554+ };
555+
556+
557+ "extras;google;market_apk_expansion" = {
558+ name = "extras-google-market_apk_expansion";
559+ path = "extras/google/market_apk_expansion";
560+ revision = "1";
561+ displayName = "Google Play APK Expansion library";
562+ archives = {
563+
564+ all = fetchurl {
565+ url = https://dl.google.com/android/repository/market_apk_expansion-r03.zip;
566+ sha1 = "5305399dc1a56814e86b8459ce24871916f78b8c";
567+ };
568+
569+ };
570+ };
571+
572+
573+ "extras;google;market_licensing" = {
574+ name = "extras-google-market_licensing";
575+ path = "extras/google/market_licensing";
576+ revision = "1";
577+ displayName = "Google Play Licensing Library";
578+ archives = {
579+
580+ all = fetchurl {
581+ url = https://dl.google.com/android/repository/market_licensing-r02.zip;
582+ sha1 = "355e8dc304a92a5616db235af8ee7bd554356254";
583+ };
584+
585+ };
586+ };
587+
588+
589+ "extras;google;simulators" = {
590+ name = "extras-google-simulators";
591+ path = "extras/google/simulators";
592+ revision = "1";
593+ displayName = "Android Auto API Simulators";
594+ archives = {
595+
596+ all = fetchurl {
597+ url = https://dl.google.com/android/repository/simulator_r01.zip;
598+ sha1 = "4fb5344e34e8faab4db18af07dace44c50db26a7";
599+ };
600+
601+ };
602+ };
603+
604+
605+ "extras;google;usb_driver" = {
606+ name = "extras-google-usb_driver";
607+ path = "extras/google/usb_driver";
608+ revision = "11";
609+ displayName = "Google USB Driver";
610+ archives = {
611+
612+ };
613+ };
614+
615+
616+ "extras;google;webdriver" = {
617+ name = "extras-google-webdriver";
618+ path = "extras/google/webdriver";
619+ revision = "2";
620+ displayName = "Google Web Driver";
621+ archives = {
622+
623+ all = fetchurl {
624+ url = https://dl.google.com/android/repository/webdriver_r02.zip;
625+ sha1 = "13f3a3b2670a5fc04a7342861644be9a01b07e38";
626+ };
627+
628+ };
629+ };
630+
631+
632+ "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0" = {
633+ name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0";
634+ path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0";
635+ revision = "1";
636+ displayName = "Solver for ConstraintLayout 1.0.0";
637+ archives = {
638+
639+ all = fetchurl {
640+ url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0.zip;
641+ sha1 = "b621b9d5adf273bb0725948589863e60e96eeaf1";
642+ };
643+
644+ };
645+ };
646+
647+
648+ "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha2" = {
649+ name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha2";
650+ path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha2";
651+ revision = "1";
652+ displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha2";
653+ archives = {
654+
655+ all = fetchurl {
656+ url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha2.zip;
657+ sha1 = "2e7fd5d8d158f4517ba52af824f84466ffede879";
658+ };
659+
660+ };
661+ };
662+
663+
664+ "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha3" = {
665+ name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha3";
666+ path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha3";
667+ revision = "1";
668+ displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha3";
669+ archives = {
670+
671+ all = fetchurl {
672+ url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha3.zip;
673+ sha1 = "cd1cbbb2621c9034b835e9b69243dc558cdee4dc";
674+ };
675+
676+ };
677+ };
678+
679+
680+ "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = {
681+ name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4";
682+ path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4";
683+ revision = "1";
684+ displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4";
685+ archives = {
686+
687+ all = fetchurl {
688+ url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip;
689+ sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8";
690+ };
691+
692+ };
693+ };
694+
695+
696+ "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha5" = {
697+ name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha5";
698+ path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha5";
699+ revision = "1";
700+ displayName = "Solver for ConstraintLayout 1.0.0-alpha5";
701+ archives = {
702+
703+ all = fetchurl {
704+ url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha5.zip;
705+ sha1 = "7ba6c82c7645ac023cf45c1e27a6ae3added308a";
706+ };
707+
708+ };
709+ };
710+
711+
712+ "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha6" = {
713+ name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha6";
714+ path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha6";
715+ revision = "1";
716+ displayName = "Solver for ConstraintLayout 1.0.0-alpha6";
717+ archives = {
718+
719+ all = fetchurl {
720+ url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha6.zip;
721+ sha1 = "b7e390f940704f4f78e1eaa5f5a5dba3bc3e81ad";
722+ };
723+
724+ };
725+ };
726+
727+
728+ "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha7" = {
729+ name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha7";
730+ path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha7";
731+ revision = "1";
732+ displayName = "Solver for ConstraintLayout 1.0.0-alpha7";
733+ archives = {
734+
735+ all = fetchurl {
736+ url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha7.zip;
737+ sha1 = "f08be3c306bf878de31c465e46a266c52014a13f";
738+ };
739+
740+ };
741+ };
742+
743+
744+ "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha8" = {
745+ name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha8";
746+ path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha8";
747+ revision = "1";
748+ displayName = "Solver for ConstraintLayout 1.0.0-alpha8";
749+ archives = {
750+
751+ all = fetchurl {
752+ url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha8.zip;
753+ sha1 = "cd13d16a8f0198c1d6040ec8b1d0d4e5bb7feb6a";
754+ };
755+
756+ };
757+ };
758+
759+
760+ "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha9" = {
761+ name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha9";
762+ path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha9";
763+ revision = "1";
764+ displayName = "Solver for ConstraintLayout 1.0.0-alpha9";
765+ archives = {
766+
767+ all = fetchurl {
768+ url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha9.zip;
769+ sha1 = "2c52ddd883d83230a17042b8f4ba03669f0f5f40";
770+ };
771+
772+ };
773+ };
774+
775+
776+ "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta1" = {
777+ name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta1";
778+ path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta1";
779+ revision = "1";
780+ displayName = "Solver for ConstraintLayout 1.0.0-beta1";
781+ archives = {
782+
783+ all = fetchurl {
784+ url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta1.zip;
785+ sha1 = "042c25575e7650e96f0f5f5d1d3c54ed38eb821a";
786+ };
787+
788+ };
789+ };
790+
791+
792+ "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta2" = {
793+ name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta2";
794+ path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta2";
795+ revision = "1";
796+ displayName = "Solver for ConstraintLayout 1.0.0-beta2";
797+ archives = {
798+
799+ all = fetchurl {
800+ url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta2.zip;
801+ sha1 = "28492fd42b20ae1586591ff906556d459cfdaae8";
802+ };
803+
804+ };
805+ };
806+
807+
808+ "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta3" = {
809+ name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta3";
810+ path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta3";
811+ revision = "1";
812+ displayName = "Solver for ConstraintLayout 1.0.0-beta3";
813+ archives = {
814+
815+ all = fetchurl {
816+ url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta3.zip;
817+ sha1 = "268e763fa64bd217d8d830e59ce76be19aaba631";
818+ };
819+
820+ };
821+ };
822+
823+
824+ "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta4" = {
825+ name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta4";
826+ path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta4";
827+ revision = "1";
828+ displayName = "Solver for ConstraintLayout 1.0.0-beta4";
829+ archives = {
830+
831+ all = fetchurl {
832+ url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta4.zip;
833+ sha1 = "2213bf37e7a2869db2635895b8e90ca6841e79d2";
834+ };
835+
836+ };
837+ };
838+
839+
840+ "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta5" = {
841+ name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta5";
842+ path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta5";
843+ revision = "1";
844+ displayName = "Solver for ConstraintLayout 1.0.0-beta5";
845+ archives = {
846+
847+ all = fetchurl {
848+ url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta5.zip;
849+ sha1 = "3918cfef73e64048d0b3e048068e208b414e7e91";
850+ };
851+
852+ };
853+ };
854+
855+
856+ "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1" = {
857+ name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.1";
858+ path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.1";
859+ revision = "1";
860+ displayName = "Solver for ConstraintLayout 1.0.1";
861+ archives = {
862+
863+ all = fetchurl {
864+ url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.1.zip;
865+ sha1 = "76f8823def9a6da8954a54737762a6820bc1d043";
866+ };
867+
868+ };
869+ };
870+
871+
872+ "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2" = {
873+ name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.2";
874+ path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.2";
875+ revision = "1";
876+ displayName = "Solver for ConstraintLayout 1.0.2";
877+ archives = {
878+
879+ all = fetchurl {
880+ url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.2.zip;
881+ sha1 = "96d7ff669f0e808e9833b2c2e320702826ccc8be";
882+ };
883+
884+ };
885+ };
886+
887+
888+ "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" = {
889+ name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0";
890+ path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0";
891+ revision = "1";
892+ displayName = "ConstraintLayout for Android 1.0.0";
893+ archives = {
894+
895+ all = fetchurl {
896+ url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0.zip;
897+ sha1 = "70acf99689b933bc6735645d5c3d92b91954b6cb";
898+ };
899+
900+ };
901+ };
902+
903+
904+ "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha2" = {
905+ name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha2";
906+ path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha2";
907+ revision = "1";
908+ displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha2";
909+ archives = {
910+
911+ all = fetchurl {
912+ url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha2.zip;
913+ sha1 = "2edb4fc33745cc9d69d985f29fd48fefcd0aa9f0";
914+ };
915+
916+ };
917+ };
918+
919+
920+ "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha3" = {
921+ name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha3";
922+ path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha3";
923+ revision = "1";
924+ displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha3";
925+ archives = {
926+
927+ all = fetchurl {
928+ url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha3.zip;
929+ sha1 = "1a26fb79d98421f315ead7ad15be167727533026";
930+ };
931+
932+ };
933+ };
934+
935+
936+ "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = {
937+ name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4";
938+ path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4";
939+ revision = "1";
940+ displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha4";
941+ archives = {
942+
943+ all = fetchurl {
944+ url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip;
945+ sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe";
946+ };
947+
948+ };
949+ };
950+
951+
952+ "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha5" = {
953+ name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha5";
954+ path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha5";
955+ revision = "1";
956+ displayName = "ConstraintLayout for Android 1.0.0-alpha5";
957+ archives = {
958+
959+ all = fetchurl {
960+ url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha5.zip;
961+ sha1 = "24f78daf491dcad74bcb2acfa79ea2d8e906f53b";
962+ };
963+
964+ };
965+ };
966+
967+
968+ "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha6" = {
969+ name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha6";
970+ path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha6";
971+ revision = "1";
972+ displayName = "ConstraintLayout for Android 1.0.0-alpha6";
973+ archives = {
974+
975+ all = fetchurl {
976+ url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha6.zip;
977+ sha1 = "cb60e9ad4f6d3cc3c5b1b98cd3610c8d3204e651";
978+ };
979+
980+ };
981+ };
982+
983+
984+ "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha7" = {
985+ name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha7";
986+ path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha7";
987+ revision = "1";
988+ displayName = "ConstraintLayout for Android 1.0.0-alpha7";
989+ archives = {
990+
991+ all = fetchurl {
992+ url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha7.zip;
993+ sha1 = "17ac210c85d24d7e8ace62847f05e4e45b640b73";
994+ };
995+
996+ };
997+ };
998+
999+
1000+ "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha8" = {
1001+ name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha8";
1002+ path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha8";
1003+ revision = "1";
1004+ displayName = "ConstraintLayout for Android 1.0.0-alpha8";
1005+ archives = {
1006+
1007+ all = fetchurl {
1008+ url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha8.zip;
1009+ sha1 = "7912ba03b04831f918f523648f118c4ee4da7604";
1010+ };
1011+
1012+ };
1013+ };
1014+
1015+
1016+ "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha9" = {
1017+ name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha9";
1018+ path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha9";
1019+ revision = "1";
1020+ displayName = "ConstraintLayout for Android 1.0.0-alpha9";
1021+ archives = {
1022+
1023+ all = fetchurl {
1024+ url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha9.zip;
1025+ sha1 = "89c2bbc005d4731c7a830a4d5aa98dae121a46a4";
1026+ };
1027+
1028+ };
1029+ };
1030+
1031+
1032+ "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta1" = {
1033+ name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta1";
1034+ path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta1";
1035+ revision = "1";
1036+ displayName = "ConstraintLayout for Android 1.0.0-beta1";
1037+ archives = {
1038+
1039+ all = fetchurl {
1040+ url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta1.zip;
1041+ sha1 = "11f2f5cec4ff02986bad75435e5be77b704b4c64";
1042+ };
1043+
1044+ };
1045+ };
1046+
1047+
1048+ "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta2" = {
1049+ name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta2";
1050+ path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta2";
1051+ revision = "1";
1052+ displayName = "ConstraintLayout for Android 1.0.0-beta2";
1053+ archives = {
1054+
1055+ all = fetchurl {
1056+ url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta2.zip;
1057+ sha1 = "623939865ede2e5c2c975dc55963e0d182bcce95";
1058+ };
1059+
1060+ };
1061+ };
1062+
1063+
1064+ "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta3" = {
1065+ name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta3";
1066+ path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta3";
1067+ revision = "1";
1068+ displayName = "ConstraintLayout for Android 1.0.0-beta3";
1069+ archives = {
1070+
1071+ all = fetchurl {
1072+ url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta3.zip;
1073+ sha1 = "d78bb6a8ce92005fb1e4ed55d892a65b4258c60b";
1074+ };
1075+
1076+ };
1077+ };
1078+
1079+
1080+ "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta4" = {
1081+ name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta4";
1082+ path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta4";
1083+ revision = "1";
1084+ displayName = "ConstraintLayout for Android 1.0.0-beta4";
1085+ archives = {
1086+
1087+ all = fetchurl {
1088+ url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta4.zip;
1089+ sha1 = "dc60844aab93a09a54a3c107685a77b18d7c1c39";
1090+ };
1091+
1092+ };
1093+ };
1094+
1095+
1096+ "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta5" = {
1097+ name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta5";
1098+ path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta5";
1099+ revision = "1";
1100+ displayName = "ConstraintLayout for Android 1.0.0-beta5";
1101+ archives = {
1102+
1103+ all = fetchurl {
1104+ url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta5.zip;
1105+ sha1 = "4660f6c7a576ea1364f0c3225db71c29ca660d9a";
1106+ };
1107+
1108+ };
1109+ };
1110+
1111+
1112+ "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1" = {
1113+ name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.1";
1114+ path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.1";
1115+ revision = "1";
1116+ displayName = "ConstraintLayout for Android 1.0.1";
1117+ archives = {
1118+
1119+ all = fetchurl {
1120+ url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.1.zip;
1121+ sha1 = "342b0894b8651fff37586f80f383733e97aba9f9";
1122+ };
1123+
1124+ };
1125+ };
1126+
1127+
1128+ "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2" = {
1129+ name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.2";
1130+ path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.2";
1131+ revision = "1";
1132+ displayName = "ConstraintLayout for Android 1.0.2";
1133+ archives = {
1134+
1135+ all = fetchurl {
1136+ url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.2.zip;
1137+ sha1 = "3d9688a50fe0ed7348275f85d1b02278f616d8a4";
1138+ };
1139+
1140+ };
1141+ };
1142+
1143+ };
1144+}
1145+
pkgs/development/mobile/androidenv/generated/packages.nixnew file+1910
@@ -0,0 +1,1910 @@
1+
2+{fetchurl}:
3+
4+{
5+
6+ "build-tools"."17.0.0" = {
7+
8+ name = "build-tools";
9+ path = "build-tools/17.0.0";
10+ revision = "17.0.0";
11+ displayName = "Android SDK Build-Tools 17";
12+ archives = {
13+ linux = fetchurl {
14+ url = https://dl.google.com/android/repository/build-tools_r17-linux.zip;
15+ sha1 = "2c2872bc3806aabf16a12e3959c2183ddc866e6d";
16+ };
17+ macosx = fetchurl {
18+ url = https://dl.google.com/android/repository/build-tools_r17-macosx.zip;
19+ sha1 = "602ee709be9dbb8f179b1e4075148a57f9419930";
20+ };
21+
22+ };
23+ };
24+
25+ "build-tools"."18.0.1" = {
26+
27+ name = "build-tools";
28+ path = "build-tools/18.0.1";
29+ revision = "18.0.1";
30+ displayName = "Android SDK Build-Tools 18.0.1";
31+ archives = {
32+ linux = fetchurl {
33+ url = https://dl.google.com/android/repository/build-tools_r18.0.1-linux.zip;
34+ sha1 = "f11618492b0d2270c332325d45d752d3656a9640";
35+ };
36+ macosx = fetchurl {
37+ url = https://dl.google.com/android/repository/build-tools_r18.0.1-macosx.zip;
38+ sha1 = "d84f5692fb44d60fc53e5b2507cebf9f24626902";
39+ };
40+
41+ };
42+ };
43+
44+ "build-tools"."18.1.0" = {
45+
46+ name = "build-tools";
47+ path = "build-tools/18.1.0";
48+ revision = "18.1.0";
49+ displayName = "Android SDK Build-Tools 18.1";
50+ archives = {
51+ linux = fetchurl {
52+ url = https://dl.google.com/android/repository/build-tools_r18.1-linux.zip;
53+ sha1 = "f314a0599e51397f0886fe888b50dd98f2f050d8";
54+ };
55+ macosx = fetchurl {
56+ url = https://dl.google.com/android/repository/build-tools_r18.1-macosx.zip;
57+ sha1 = "16ddb299b8b43063e5bb3387ec17147c5053dfd8";
58+ };
59+
60+ };
61+ };
62+
63+ "build-tools"."18.1.1" = {
64+
65+ name = "build-tools";
66+ path = "build-tools/18.1.1";
67+ revision = "18.1.1";
68+ displayName = "Android SDK Build-Tools 18.1.1";
69+ archives = {
70+ linux = fetchurl {
71+ url = https://dl.google.com/android/repository/build-tools_r18.1.1-linux.zip;
72+ sha1 = "68c9acbfc0cec2d51b19efaed39831a17055d998";
73+ };
74+ macosx = fetchurl {
75+ url = https://dl.google.com/android/repository/build-tools_r18.1.1-macosx.zip;
76+ sha1 = "a9d9d37f6ddf859e57abc78802a77aaa166e48d4";
77+ };
78+
79+ };
80+ };
81+
82+ "build-tools"."19.0.0" = {
83+
84+ name = "build-tools";
85+ path = "build-tools/19.0.0";
86+ revision = "19.0.0";
87+ displayName = "Android SDK Build-Tools 19";
88+ archives = {
89+ linux = fetchurl {
90+ url = https://dl.google.com/android/repository/build-tools_r19-linux.zip;
91+ sha1 = "55c1a6cf632e7d346f0002b275ec41fd3137fd83";
92+ };
93+ macosx = fetchurl {
94+ url = https://dl.google.com/android/repository/build-tools_r19-macosx.zip;
95+ sha1 = "86ec1c12db1bc446b7bcaefc5cc14eb361044e90";
96+ };
97+
98+ };
99+ };
100+
101+ "build-tools"."19.0.1" = {
102+
103+ name = "build-tools";
104+ path = "build-tools/19.0.1";
105+ revision = "19.0.1";
106+ displayName = "Android SDK Build-Tools 19.0.1";
107+ archives = {
108+ linux = fetchurl {
109+ url = https://dl.google.com/android/repository/build-tools_r19.0.1-linux.zip;
110+ sha1 = "18d2312dc4368858914213087f4e61445aca4517";
111+ };
112+ macosx = fetchurl {
113+ url = https://dl.google.com/android/repository/build-tools_r19.0.1-macosx.zip;
114+ sha1 = "efaf50fb19a3edb8d03efbff76f89a249ad2920b";
115+ };
116+
117+ };
118+ };
119+
120+ "build-tools"."19.0.2" = {
121+
122+ name = "build-tools";
123+ path = "build-tools/19.0.2";
124+ revision = "19.0.2";
125+ displayName = "Android SDK Build-Tools 19.0.2";
126+ archives = {
127+ linux = fetchurl {
128+ url = https://dl.google.com/android/repository/build-tools_r19.0.2-linux.zip;
129+ sha1 = "a03a6bdea0091aea32e1b35b90a7294c9f04e3dd";
130+ };
131+ macosx = fetchurl {
132+ url = https://dl.google.com/android/repository/build-tools_r19.0.2-macosx.zip;
133+ sha1 = "145bc43065d45f756d99d87329d899052b9a9288";
134+ };
135+
136+ };
137+ };
138+
139+ "build-tools"."19.0.3" = {
140+
141+ name = "build-tools";
142+ path = "build-tools/19.0.3";
143+ revision = "19.0.3";
144+ displayName = "Android SDK Build-Tools 19.0.3";
145+ archives = {
146+ linux = fetchurl {
147+ url = https://dl.google.com/android/repository/build-tools_r19.0.3-linux.zip;
148+ sha1 = "c2d6055478e9d2d4fba476ee85f99181ddd1160c";
149+ };
150+ macosx = fetchurl {
151+ url = https://dl.google.com/android/repository/build-tools_r19.0.3-macosx.zip;
152+ sha1 = "651cf8754373b2d52e7f6aab2c52eabffe4e9ea4";
153+ };
154+
155+ };
156+ };
157+
158+ "build-tools"."19.1.0" = {
159+
160+ name = "build-tools";
161+ path = "build-tools/19.1.0";
162+ revision = "19.1.0";
163+ displayName = "Android SDK Build-Tools 19.1";
164+ archives = {
165+ linux = fetchurl {
166+ url = https://dl.google.com/android/repository/build-tools_r19.1-linux.zip;
167+ sha1 = "1ff20ac15fa47a75d00346ec12f180d531b3ca89";
168+ };
169+ macosx = fetchurl {
170+ url = https://dl.google.com/android/repository/build-tools_r19.1-macosx.zip;
171+ sha1 = "0d11aae3417de1efb4b9a0e0a7855904a61bcec1";
172+ };
173+
174+ };
175+ };
176+
177+ "build-tools"."20.0.0" = {
178+
179+ name = "build-tools";
180+ path = "build-tools/20.0.0";
181+ revision = "20.0.0";
182+ displayName = "Android SDK Build-Tools 20";
183+ archives = {
184+ linux = fetchurl {
185+ url = https://dl.google.com/android/repository/build-tools_r20-linux.zip;
186+ sha1 = "b688905526a5584d1327a662d871a635ff502758";
187+ };
188+ macosx = fetchurl {
189+ url = https://dl.google.com/android/repository/build-tools_r20-macosx.zip;
190+ sha1 = "1240f629411c108a714c4ddd756937c7fab93f83";
191+ };
192+
193+ };
194+ };
195+
196+ "build-tools"."21.0.0" = {
197+
198+ name = "build-tools";
199+ path = "build-tools/21.0.0";
200+ revision = "21.0.0";
201+ displayName = "Android SDK Build-Tools 21";
202+ archives = {
203+ linux = fetchurl {
204+ url = https://dl.google.com/android/repository/build-tools_r21-linux.zip;
205+ sha1 = "4933328fdeecbd554a29528f254f4993468e1cf4";
206+ };
207+ macosx = fetchurl {
208+ url = https://dl.google.com/android/repository/build-tools_r21-macosx.zip;
209+ sha1 = "9bef7989b51436bd4e5114d8a0330359f077cbfa";
210+ };
211+
212+ };
213+ };
214+
215+ "build-tools"."21.0.1" = {
216+
217+ name = "build-tools";
218+ path = "build-tools/21.0.1";
219+ revision = "21.0.1";
220+ displayName = "Android SDK Build-Tools 21.0.1";
221+ archives = {
222+ linux = fetchurl {
223+ url = https://dl.google.com/android/repository/build-tools_r21.0.1-linux.zip;
224+ sha1 = "e573069eea3e5255e7a65bedeb767f4fd0a5f49a";
225+ };
226+ macosx = fetchurl {
227+ url = https://dl.google.com/android/repository/build-tools_r21.0.1-macosx.zip;
228+ sha1 = "b60c8f9b810c980abafa04896706f3911be1ade7";
229+ };
230+
231+ };
232+ };
233+
234+ "build-tools"."21.0.2" = {
235+
236+ name = "build-tools";
237+ path = "build-tools/21.0.2";
238+ revision = "21.0.2";
239+ displayName = "Android SDK Build-Tools 21.0.2";
240+ archives = {
241+ linux = fetchurl {
242+ url = https://dl.google.com/android/repository/build-tools_r21.0.2-linux.zip;
243+ sha1 = "e1236ab8897b62b57414adcf04c132567b2612a5";
244+ };
245+ macosx = fetchurl {
246+ url = https://dl.google.com/android/repository/build-tools_r21.0.2-macosx.zip;
247+ sha1 = "f17471c154058f3734729ef3cc363399b1cd3de1";
248+ };
249+
250+ };
251+ };
252+
253+ "build-tools"."21.1.0" = {
254+
255+ name = "build-tools";
256+ path = "build-tools/21.1.0";
257+ revision = "21.1.0";
258+ displayName = "Android SDK Build-Tools 21.1";
259+ archives = {
260+ linux = fetchurl {
261+ url = https://dl.google.com/android/repository/build-tools_r21.1-linux.zip;
262+ sha1 = "b7455e543784d52a8925f960bc880493ed1478cb";
263+ };
264+ macosx = fetchurl {
265+ url = https://dl.google.com/android/repository/build-tools_r21.1-macosx.zip;
266+ sha1 = "df619356c2359aa5eacdd48699d15b335d9bd246";
267+ };
268+
269+ };
270+ };
271+
272+ "build-tools"."21.1.1" = {
273+
274+ name = "build-tools";
275+ path = "build-tools/21.1.1";
276+ revision = "21.1.1";
277+ displayName = "Android SDK Build-Tools 21.1.1";
278+ archives = {
279+ linux = fetchurl {
280+ url = https://dl.google.com/android/repository/build-tools_r21.1.1-linux.zip;
281+ sha1 = "1c712ee3a1ba5a8b0548f9c32f17d4a0ddfd727d";
282+ };
283+ macosx = fetchurl {
284+ url = https://dl.google.com/android/repository/build-tools_r21.1.1-macosx.zip;
285+ sha1 = "836a146eab0504aa9387a5132e986fe7c7381571";
286+ };
287+
288+ };
289+ };
290+
291+ "build-tools"."21.1.2" = {
292+
293+ name = "build-tools";
294+ path = "build-tools/21.1.2";
295+ revision = "21.1.2";
296+ displayName = "Android SDK Build-Tools 21.1.2";
297+ archives = {
298+ linux = fetchurl {
299+ url = https://dl.google.com/android/repository/build-tools_r21.1.2-linux.zip;
300+ sha1 = "5e35259843bf2926113a38368b08458735479658";
301+ };
302+ macosx = fetchurl {
303+ url = https://dl.google.com/android/repository/build-tools_r21.1.2-macosx.zip;
304+ sha1 = "e7c906b4ba0eea93b32ba36c610dbd6b204bff48";
305+ };
306+
307+ };
308+ };
309+
310+ "build-tools"."22.0.0" = {
311+
312+ name = "build-tools";
313+ path = "build-tools/22.0.0";
314+ revision = "22.0.0";
315+ displayName = "Android SDK Build-Tools 22";
316+ archives = {
317+ linux = fetchurl {
318+ url = https://dl.google.com/android/repository/build-tools_r22-linux.zip;
319+ sha1 = "a8a1619dd090e44fac957bce6842e62abf87965b";
320+ };
321+ macosx = fetchurl {
322+ url = https://dl.google.com/android/repository/build-tools_r22-macosx.zip;
323+ sha1 = "af95429b24088d704bc5db9bd606e34ac1b82c0d";
324+ };
325+
326+ };
327+ };
328+
329+ "build-tools"."22.0.1" = {
330+
331+ name = "build-tools";
332+ path = "build-tools/22.0.1";
333+ revision = "22.0.1";
334+ displayName = "Android SDK Build-Tools 22.0.1";
335+ archives = {
336+ linux = fetchurl {
337+ url = https://dl.google.com/android/repository/build-tools_r22.0.1-linux.zip;
338+ sha1 = "da8b9c5c3ede39298e6cf0283c000c2ee9029646";
339+ };
340+ macosx = fetchurl {
341+ url = https://dl.google.com/android/repository/build-tools_r22.0.1-macosx.zip;
342+ sha1 = "53dad7f608e01d53b17176ba11165acbfccc5bbf";
343+ };
344+
345+ };
346+ };
347+
348+ "build-tools"."23.0.0" = {
349+
350+ name = "build-tools";
351+ path = "build-tools/23.0.0";
352+ revision = "23.0.0";
353+ displayName = "Android SDK Build-Tools 23";
354+ archives = {
355+ linux = fetchurl {
356+ url = https://dl.google.com/android/repository/build-tools_r23-linux.zip;
357+ sha1 = "c1d6209212b01469f80fa804e0c1d39a06bc9060";
358+ };
359+ macosx = fetchurl {
360+ url = https://dl.google.com/android/repository/build-tools_r23-macosx.zip;
361+ sha1 = "90ba6e716f7703a236cd44b2e71c5ff430855a03";
362+ };
363+
364+ };
365+ };
366+
367+ "build-tools"."23.0.1" = {
368+
369+ name = "build-tools";
370+ path = "build-tools/23.0.1";
371+ revision = "23.0.1";
372+ displayName = "Android SDK Build-Tools 23.0.1";
373+ archives = {
374+ linux = fetchurl {
375+ url = https://dl.google.com/android/repository/build-tools_r23.0.1-linux.zip;
376+ sha1 = "b6ba7c399d5fa487d95289d8832e4ad943aed556";
377+ };
378+ macosx = fetchurl {
379+ url = https://dl.google.com/android/repository/build-tools_r23.0.1-macosx.zip;
380+ sha1 = "d96ec1522721e9a179ae2c591c99f75d31d39718";
381+ };
382+
383+ };
384+ };
385+
386+ "build-tools"."23.0.2" = {
387+
388+ name = "build-tools";
389+ path = "build-tools/23.0.2";
390+ revision = "23.0.2";
391+ displayName = "Android SDK Build-Tools 23.0.2";
392+ archives = {
393+ linux = fetchurl {
394+ url = https://dl.google.com/android/repository/build-tools_r23.0.2-linux.zip;
395+ sha1 = "8a9f2b37f6fcf7a9fa784dc21aeaeb41bbb9f2c3";
396+ };
397+ macosx = fetchurl {
398+ url = https://dl.google.com/android/repository/build-tools_r23.0.2-macosx.zip;
399+ sha1 = "482c4cbceef8ff58aefd92d8155a38610158fdaf";
400+ };
401+
402+ };
403+ };
404+
405+ "build-tools"."23.0.3" = {
406+
407+ name = "build-tools";
408+ path = "build-tools/23.0.3";
409+ revision = "23.0.3";
410+ displayName = "Android SDK Build-Tools 23.0.3";
411+ archives = {
412+ linux = fetchurl {
413+ url = https://dl.google.com/android/repository/build-tools_r23.0.3-linux.zip;
414+ sha1 = "368f2600feac7e9b511b82f53d1f2240ae4a91a3";
415+ };
416+ macosx = fetchurl {
417+ url = https://dl.google.com/android/repository/build-tools_r23.0.3-macosx.zip;
418+ sha1 = "fbc98cd303fd15a31d472de6c03bd707829f00b0";
419+ };
420+
421+ };
422+ };
423+
424+ "build-tools"."24.0.0" = {
425+
426+ name = "build-tools";
427+ path = "build-tools/24.0.0";
428+ revision = "24.0.0";
429+ displayName = "Android SDK Build-Tools 24";
430+ archives = {
431+ linux = fetchurl {
432+ url = https://dl.google.com/android/repository/build-tools_r24-linux.zip;
433+ sha1 = "c6271c4d78a5612ea6c7150688bcd5b7313de8d1";
434+ };
435+ macosx = fetchurl {
436+ url = https://dl.google.com/android/repository/build-tools_r24-macosx.zip;
437+ sha1 = "97fc4ed442f23989cc488d02c1d1de9bdde241de";
438+ };
439+
440+ };
441+ };
442+
443+ "build-tools"."24.0.1" = {
444+
445+ name = "build-tools";
446+ path = "build-tools/24.0.1";
447+ revision = "24.0.1";
448+ displayName = "Android SDK Build-Tools 24.0.1";
449+ archives = {
450+ linux = fetchurl {
451+ url = https://dl.google.com/android/repository/build-tools_r24.0.1-linux.zip;
452+ sha1 = "84f18c392919a074fcbb9b1d967984e6b2fef8b4";
453+ };
454+ macosx = fetchurl {
455+ url = https://dl.google.com/android/repository/build-tools_r24.0.1-macosx.zip;
456+ sha1 = "5c6457fcdfa07724fb086d8ff4e8316fc0742848";
457+ };
458+
459+ };
460+ };
461+
462+ "build-tools"."24.0.2" = {
463+
464+ name = "build-tools";
465+ path = "build-tools/24.0.2";
466+ revision = "24.0.2";
467+ displayName = "Android SDK Build-Tools 24.0.2";
468+ archives = {
469+ linux = fetchurl {
470+ url = https://dl.google.com/android/repository/build-tools_r24.0.2-linux.zip;
471+ sha1 = "f199a7a788c3fefbed102eea34d6007737b803cf";
472+ };
473+ macosx = fetchurl {
474+ url = https://dl.google.com/android/repository/build-tools_r24.0.2-macosx.zip;
475+ sha1 = "8bb8fc575477491d5957de743089df412de55cda";
476+ };
477+
478+ };
479+ };
480+
481+ "build-tools"."24.0.3" = {
482+
483+ name = "build-tools";
484+ path = "build-tools/24.0.3";
485+ revision = "24.0.3";
486+ displayName = "Android SDK Build-Tools 24.0.3";
487+ archives = {
488+ linux = fetchurl {
489+ url = https://dl.google.com/android/repository/build-tools_r24.0.3-linux.zip;
490+ sha1 = "9e8cc49d66e03fa1a8ecc1ac3e58f1324f5da304";
491+ };
492+ macosx = fetchurl {
493+ url = https://dl.google.com/android/repository/build-tools_r24.0.3-macosx.zip;
494+ sha1 = "a01c15f1b105c34595681075e1895d58b3fff48c";
495+ };
496+
497+ };
498+ };
499+
500+ "build-tools"."25.0.0" = {
501+
502+ name = "build-tools";
503+ path = "build-tools/25.0.0";
504+ revision = "25.0.0";
505+ displayName = "Android SDK Build-Tools 25";
506+ archives = {
507+ linux = fetchurl {
508+ url = https://dl.google.com/android/repository/build-tools_r25-linux.zip;
509+ sha1 = "f2bbda60403e75cabd0f238598c3b4dfca56ea44";
510+ };
511+ macosx = fetchurl {
512+ url = https://dl.google.com/android/repository/build-tools_r25-macosx.zip;
513+ sha1 = "273c5c29a65cbed00e44f3aa470bbd7dce556606";
514+ };
515+
516+ };
517+ };
518+
519+ "build-tools"."25.0.1" = {
520+
521+ name = "build-tools";
522+ path = "build-tools/25.0.1";
523+ revision = "25.0.1";
524+ displayName = "Android SDK Build-Tools 25.0.1";
525+ archives = {
526+ linux = fetchurl {
527+ url = https://dl.google.com/android/repository/build-tools_r25.0.1-linux.zip;
528+ sha1 = "ff063d252ab750d339f5947d06ff782836f22bac";
529+ };
530+ macosx = fetchurl {
531+ url = https://dl.google.com/android/repository/build-tools_r25.0.1-macosx.zip;
532+ sha1 = "7bf7f22d7d48ef20b6ab0e3d7a2912e5c088340f";
533+ };
534+
535+ };
536+ };
537+
538+ "build-tools"."25.0.2" = {
539+
540+ name = "build-tools";
541+ path = "build-tools/25.0.2";
542+ revision = "25.0.2";
543+ displayName = "Android SDK Build-Tools 25.0.2";
544+ archives = {
545+ linux = fetchurl {
546+ url = https://dl.google.com/android/repository/build-tools_r25.0.2-linux.zip;
547+ sha1 = "ff953c0177e317618fda40516f3e9d95fd43c7ae";
548+ };
549+ macosx = fetchurl {
550+ url = https://dl.google.com/android/repository/build-tools_r25.0.2-macosx.zip;
551+ sha1 = "12a5204bb3b6e39437535469fde7ddf42da46b16";
552+ };
553+
554+ };
555+ };
556+
557+ "build-tools"."25.0.3" = {
558+
559+ name = "build-tools";
560+ path = "build-tools/25.0.3";
561+ revision = "25.0.3";
562+ displayName = "Android SDK Build-Tools 25.0.3";
563+ archives = {
564+ linux = fetchurl {
565+ url = https://dl.google.com/android/repository/build-tools_r25.0.3-linux.zip;
566+ sha1 = "db95f3a0ae376534d4d69f4cdb6fad20649f3509";
567+ };
568+ macosx = fetchurl {
569+ url = https://dl.google.com/android/repository/build-tools_r25.0.3-macosx.zip;
570+ sha1 = "160d2fefb5ce68e443427fc30a793a703b63e26e";
571+ };
572+
573+ };
574+ };
575+
576+ "build-tools"."26.0.0" = {
577+
578+ name = "build-tools";
579+ path = "build-tools/26.0.0";
580+ revision = "26.0.0";
581+ displayName = "Android SDK Build-Tools 26";
582+ archives = {
583+ linux = fetchurl {
584+ url = https://dl.google.com/android/repository/build-tools_r26-linux.zip;
585+ sha1 = "1cbe72929876f8a872ab1f1b1040a9f720261f59";
586+ };
587+ macosx = fetchurl {
588+ url = https://dl.google.com/android/repository/build-tools_r26-macosx.zip;
589+ sha1 = "d01a1aeca03747245f1f5936b3cb01759c66d086";
590+ };
591+
592+ };
593+ };
594+
595+ "build-tools"."26.0.0-rc1" = {
596+
597+ name = "build-tools";
598+ path = "build-tools/26.0.0-rc1";
599+ revision = "26.0.0-rc1";
600+ displayName = "Android SDK Build-Tools 26-rc1";
601+ archives = {
602+ linux = fetchurl {
603+ url = https://dl.google.com/android/repository/build-tools_r26-rc1-linux.zip;
604+ sha1 = "8cd6388dc96db2d7a49d06159cf990d3bbc78d04";
605+ };
606+ macosx = fetchurl {
607+ url = https://dl.google.com/android/repository/build-tools_r26-rc1-macosx.zip;
608+ sha1 = "5c5a1de7d5f4f000d36ae349229fe0be846d6137";
609+ };
610+
611+ };
612+ };
613+
614+ "build-tools"."26.0.0-rc2" = {
615+
616+ name = "build-tools";
617+ path = "build-tools/26.0.0-rc2";
618+ revision = "26.0.0-rc2";
619+ displayName = "Android SDK Build-Tools 26-rc2";
620+ archives = {
621+ linux = fetchurl {
622+ url = https://dl.google.com/android/repository/build-tools_r26-rc2-linux.zip;
623+ sha1 = "629bbd8d2e415bf64871fb0b4c0540fd6d0347a0";
624+ };
625+ macosx = fetchurl {
626+ url = https://dl.google.com/android/repository/build-tools_r26-rc2-macosx.zip;
627+ sha1 = "cb1eb738a1f7003025af267a9b8cc2d259533c70";
628+ };
629+
630+ };
631+ };
632+
633+ "build-tools"."26.0.1" = {
634+
635+ name = "build-tools";
636+ path = "build-tools/26.0.1";
637+ revision = "26.0.1";
638+ displayName = "Android SDK Build-Tools 26.0.1";
639+ archives = {
640+ linux = fetchurl {
641+ url = https://dl.google.com/android/repository/build-tools_r26.0.1-linux.zip;
642+ sha1 = "5378c2c78091b414d0eac40a6bd37f2faa31a365";
643+ };
644+ macosx = fetchurl {
645+ url = https://dl.google.com/android/repository/build-tools_r26.0.1-macosx.zip;
646+ sha1 = "cbde59de198916b390777dd0227921bfa2120832";
647+ };
648+
649+ };
650+ };
651+
652+ "build-tools"."26.0.2" = {
653+
654+ name = "build-tools";
655+ path = "build-tools/26.0.2";
656+ revision = "26.0.2";
657+ displayName = "Android SDK Build-Tools 26.0.2";
658+ archives = {
659+ linux = fetchurl {
660+ url = https://dl.google.com/android/repository/build-tools_r26.0.2-linux.zip;
661+ sha1 = "5b2b7b66c7bf2151f2af183b5b50a17808850592";
662+ };
663+ macosx = fetchurl {
664+ url = https://dl.google.com/android/repository/build-tools_r26.0.2-macosx.zip;
665+ sha1 = "d9ed7c7f149ce38be5dc08979aea8acec1459ca0";
666+ };
667+
668+ };
669+ };
670+
671+ "build-tools"."26.0.3" = {
672+
673+ name = "build-tools";
674+ path = "build-tools/26.0.3";
675+ revision = "26.0.3";
676+ displayName = "Android SDK Build-Tools 26.0.3";
677+ archives = {
678+ linux = fetchurl {
679+ url = https://dl.google.com/android/repository/build-tools_r26.0.3-linux.zip;
680+ sha1 = "8a2e6c1bcd845844523a68aa17e5442f0dce328c";
681+ };
682+ macosx = fetchurl {
683+ url = https://dl.google.com/android/repository/build-tools_r26.0.3-macosx.zip;
684+ sha1 = "5bb90ed935d99e5bc90686f43b852e68c5ad40df";
685+ };
686+
687+ };
688+ };
689+
690+ "build-tools"."27.0.0" = {
691+
692+ name = "build-tools";
693+ path = "build-tools/27.0.0";
694+ revision = "27.0.0";
695+ displayName = "Android SDK Build-Tools 27";
696+ archives = {
697+ linux = fetchurl {
698+ url = https://dl.google.com/android/repository/build-tools_r27-linux.zip;
699+ sha1 = "28542332ba97cf4a08c3eddfcf5edd70e3cf1260";
700+ };
701+ macosx = fetchurl {
702+ url = https://dl.google.com/android/repository/build-tools_r27-macosx.zip;
703+ sha1 = "fb4e8d7e6b8d29a77090e34024077a80458d5ae1";
704+ };
705+
706+ };
707+ };
708+
709+ "build-tools"."27.0.1" = {
710+
711+ name = "build-tools";
712+ path = "build-tools/27.0.1";
713+ revision = "27.0.1";
714+ displayName = "Android SDK Build-Tools 27.0.1";
715+ archives = {
716+ linux = fetchurl {
717+ url = https://dl.google.com/android/repository/build-tools_r27.0.1-linux.zip;
718+ sha1 = "7f4eedb1077ef948b848040dcd15de9e8a759f4a";
719+ };
720+ macosx = fetchurl {
721+ url = https://dl.google.com/android/repository/build-tools_r27.0.1-macosx.zip;
722+ sha1 = "1edd07bfdbadd95652d093040e16d858f7489594";
723+ };
724+
725+ };
726+ };
727+
728+ "build-tools"."27.0.2" = {
729+
730+ name = "build-tools";
731+ path = "build-tools/27.0.2";
732+ revision = "27.0.2";
733+ displayName = "Android SDK Build-Tools 27.0.2";
734+ archives = {
735+ linux = fetchurl {
736+ url = https://dl.google.com/android/repository/build-tools_r27.0.2-linux.zip;
737+ sha1 = "b687ddf6be84f11607871138aad32cf857d0b837";
738+ };
739+ macosx = fetchurl {
740+ url = https://dl.google.com/android/repository/build-tools_r27.0.2-macosx.zip;
741+ sha1 = "6d5d9cf2a47877f273f4b742b19e712a051a31be";
742+ };
743+
744+ };
745+ };
746+
747+ "build-tools"."27.0.3" = {
748+
749+ name = "build-tools";
750+ path = "build-tools/27.0.3";
751+ revision = "27.0.3";
752+ displayName = "Android SDK Build-Tools 27.0.3";
753+ archives = {
754+ linux = fetchurl {
755+ url = https://dl.google.com/android/repository/build-tools_r27.0.3-linux.zip;
756+ sha1 = "d85e7a6320eddffe7eeace3437605079dac938ca";
757+ };
758+ macosx = fetchurl {
759+ url = https://dl.google.com/android/repository/build-tools_r27.0.3-macosx.zip;
760+ sha1 = "61d9fb18790c68d66ff73bf1e7ad56bc1f1eef2d";
761+ };
762+
763+ };
764+ };
765+
766+ "build-tools"."28.0.0" = {
767+
768+ name = "build-tools";
769+ path = "build-tools/28.0.0";
770+ revision = "28.0.0";
771+ displayName = "Android SDK Build-Tools 28";
772+ archives = {
773+ linux = fetchurl {
774+ url = https://dl.google.com/android/repository/build-tools_r28-linux.zip;
775+ sha1 = "d9f8a754d833ccd334f56fcc6089c5925cd82abb";
776+ };
777+ macosx = fetchurl {
778+ url = https://dl.google.com/android/repository/build-tools_r28-macosx.zip;
779+ sha1 = "72088d32d1d82cc3c2cf7cf6618b6130c0c84ade";
780+ };
781+
782+ };
783+ };
784+
785+ "build-tools"."28.0.0-rc1" = {
786+
787+ name = "build-tools";
788+ path = "build-tools/28.0.0-rc1";
789+ revision = "28.0.0-rc1";
790+ displayName = "Android SDK Build-Tools 28-rc1";
791+ archives = {
792+ linux = fetchurl {
793+ url = https://dl.google.com/android/repository/build-tools_r28-rc1-linux.zip;
794+ sha1 = "1601977fae25fd478bcfaa0481ca5ea3c609d840";
795+ };
796+ macosx = fetchurl {
797+ url = https://dl.google.com/android/repository/build-tools_r28-rc1-macosx.zip;
798+ sha1 = "2c77821967a2330b7b227072d0b1c02ef19fe2fc";
799+ };
800+
801+ };
802+ };
803+
804+ "build-tools"."28.0.0-rc2" = {
805+
806+ name = "build-tools";
807+ path = "build-tools/28.0.0-rc2";
808+ revision = "28.0.0-rc2";
809+ displayName = "Android SDK Build-Tools 28-rc2";
810+ archives = {
811+ linux = fetchurl {
812+ url = https://dl.google.com/android/repository/build-tools_r28-rc2-linux.zip;
813+ sha1 = "efe9c0dde0646a07544c864276390ca6e96b24dc";
814+ };
815+ macosx = fetchurl {
816+ url = https://dl.google.com/android/repository/build-tools_r28-rc2-macosx.zip;
817+ sha1 = "0d0314b353589feb10e528b44c5a685b6658d797";
818+ };
819+
820+ };
821+ };
822+
823+ "build-tools"."28.0.1" = {
824+
825+ name = "build-tools";
826+ path = "build-tools/28.0.1";
827+ revision = "28.0.1";
828+ displayName = "Android SDK Build-Tools 28.0.1";
829+ archives = {
830+ linux = fetchurl {
831+ url = https://dl.google.com/android/repository/build-tools_r28.0.1-linux.zip;
832+ sha1 = "ee70dfa1fccb58b37cebc9544830511f36a137a0";
833+ };
834+ macosx = fetchurl {
835+ url = https://dl.google.com/android/repository/build-tools_r28.0.1-macosx.zip;
836+ sha1 = "aeef42ad953f1630dd6f5d71eefdc0b825211462";
837+ };
838+
839+ };
840+ };
841+
842+ "build-tools"."28.0.2" = {
843+
844+ name = "build-tools";
845+ path = "build-tools/28.0.2";
846+ revision = "28.0.2";
847+ displayName = "Android SDK Build-Tools 28.0.2";
848+ archives = {
849+ linux = fetchurl {
850+ url = https://dl.google.com/android/repository/build-tools_r28.0.2-linux.zip;
851+ sha1 = "b4492209810a3fd48deaa982f9852fef12433d55";
852+ };
853+ macosx = fetchurl {
854+ url = https://dl.google.com/android/repository/build-tools_r28.0.2-macosx.zip;
855+ sha1 = "c10dd5a7825578622fb362a8a34f76eb3ba0c0a9";
856+ };
857+
858+ };
859+ };
860+
861+ "build-tools"."28.0.3" = {
862+
863+ name = "build-tools";
864+ path = "build-tools/28.0.3";
865+ revision = "28.0.3";
866+ displayName = "Android SDK Build-Tools 28.0.3";
867+ archives = {
868+ linux = fetchurl {
869+ url = https://dl.google.com/android/repository/build-tools_r28.0.3-linux.zip;
870+ sha1 = "ea6f2f7103cd9da9ff0bdf6e37fbbba548fa4165";
871+ };
872+ macosx = fetchurl {
873+ url = https://dl.google.com/android/repository/build-tools_r28.0.3-macosx.zip;
874+ sha1 = "f8c333a2991b1ab05a671bc6248b78e00edcd83a";
875+ };
876+
877+ };
878+ };
879+
880+ "cmake"."3.10.2" = {
881+
882+ name = "cmake";
883+ path = "cmake/3.10.2.4988404";
884+ revision = "3.10.2";
885+ displayName = "CMake 3.10.2.4988404";
886+ archives = {
887+ macosx = fetchurl {
888+ url = https://dl.google.com/android/repository/cmake-3.10.2-darwin-x86_64.zip;
889+ sha1 = "f227a85cb53dcb927ac52a5a717f647c4a29bf3b";
890+ };
891+ linux = fetchurl {
892+ url = https://dl.google.com/android/repository/cmake-3.10.2-linux-x86_64.zip;
893+ sha1 = "439e8799bf59f724f104bf62784b2985f1bfe561";
894+ };
895+
896+ };
897+ };
898+
899+ "cmake"."3.6.4111459" = {
900+
901+ name = "cmake";
902+ path = "cmake/3.6.4111459";
903+ revision = "3.6.4111459";
904+ displayName = "CMake 3.6.4111459";
905+ archives = {
906+ macosx = fetchurl {
907+ url = https://dl.google.com/android/repository/cmake-3.6.4111459-darwin-x86_64.zip;
908+ sha1 = "c9b02d630079783c6d67cb91488b622cfcd9765c";
909+ };
910+ linux = fetchurl {
911+ url = https://dl.google.com/android/repository/cmake-3.6.4111459-linux-x86_64.zip;
912+ sha1 = "71c539b9c33f0943e9ad6251fea0b161c0b70782";
913+ };
914+
915+ };
916+ };
917+
918+ "docs"."1" = {
919+
920+ name = "docs";
921+ path = "docs";
922+ revision = "1";
923+ displayName = "Documentation for Android SDK";
924+ archives = {
925+
926+ all = fetchurl {
927+ url = https://dl.google.com/android/repository/docs-24_r01.zip;
928+ sha1 = "eef58238949ee9544876cb3e002f2d58e4ee7b5d";
929+ };
930+
931+ };
932+ };
933+
934+ "emulator"."27.3.10".linux = {
935+
936+ name = "emulator";
937+ path = "emulator";
938+ revision = "27.3.10";
939+ displayName = "Android Emulator";
940+ archives = {
941+ linux = fetchurl {
942+ url = https://dl.google.com/android/repository/emulator-linux-4969155.zip;
943+ sha1 = "5b037b25bc6567fda3071457f0009c057670d9e8";
944+ };
945+
946+ };
947+ };
948+
949+ "emulator"."27.3.10".macosx = {
950+
951+ name = "emulator";
952+ path = "emulator";
953+ revision = "27.3.10";
954+ displayName = "Android Emulator";
955+ archives = {
956+ macosx = fetchurl {
957+ url = https://dl.google.com/android/repository/emulator-darwin-4969155.zip;
958+ sha1 = "28d2b51ee5c84bc544deee433419f33dc9e05b66";
959+ };
960+
961+ };
962+ };
963+
964+ "emulator"."27.3.10".windows = {
965+
966+ name = "emulator";
967+ path = "emulator";
968+ revision = "27.3.10";
969+ displayName = "Android Emulator";
970+ archives = {
971+
972+ };
973+ };
974+
975+ "emulator"."28.0.14".linux = {
976+
977+ name = "emulator";
978+ path = "emulator";
979+ revision = "28.0.14";
980+ displayName = "Android Emulator";
981+ archives = {
982+ linux = fetchurl {
983+ url = https://dl.google.com/android/repository/emulator-linux-5092175.zip;
984+ sha1 = "062ef9a1f6759481de897d6c5602d9d66e958a0b";
985+ };
986+
987+ };
988+ };
989+
990+ "emulator"."28.0.14".macosx = {
991+
992+ name = "emulator";
993+ path = "emulator";
994+ revision = "28.0.14";
995+ displayName = "Android Emulator";
996+ archives = {
997+ macosx = fetchurl {
998+ url = https://dl.google.com/android/repository/emulator-darwin-5092175.zip;
999+ sha1 = "6dc13599bddd5c2acdb559b25201c92a801d157c";
1000+ };
1001+
1002+ };
1003+ };
1004+
1005+ "emulator"."28.0.14".windows = {
1006+
1007+ name = "emulator";
1008+ path = "emulator";
1009+ revision = "28.0.14";
1010+ displayName = "Android Emulator";
1011+ archives = {
1012+
1013+ };
1014+ };
1015+
1016+ "lldb"."2.0.2558144" = {
1017+
1018+ name = "lldb";
1019+ path = "lldb/2.0";
1020+ revision = "2.0.2558144";
1021+ displayName = "LLDB 2.0";
1022+ archives = {
1023+ macosx = fetchurl {
1024+ url = https://dl.google.com/android/repository/lldb-2.0.2558144-darwin-x86_64.zip;
1025+ sha1 = "d92e2f4c8284413eed4f27986e62b167d947033c";
1026+ };
1027+ linux = fetchurl {
1028+ url = https://dl.google.com/android/repository/lldb-2.0.2558144-linux-x86_64.zip;
1029+ sha1 = "e7060d9b2ba58b28fd7b1a0ea85a151c8371a326";
1030+ };
1031+
1032+ };
1033+ };
1034+
1035+ "lldb"."2.1.2852477" = {
1036+
1037+ name = "lldb";
1038+ path = "lldb/2.1";
1039+ revision = "2.1.2852477";
1040+ displayName = "LLDB 2.1";
1041+ archives = {
1042+ macosx = fetchurl {
1043+ url = https://dl.google.com/android/repository/lldb-2.1.2852477-darwin-x86_64.zip;
1044+ sha1 = "d1e33880a53f1aa8c7e73534adef83a06f091185";
1045+ };
1046+ linux = fetchurl {
1047+ url = https://dl.google.com/android/repository/lldb-2.1.2852477-linux-x86_64.zip;
1048+ sha1 = "eb9b96d320210fdfe82495b0597ad43e77f1c240";
1049+ };
1050+
1051+ };
1052+ };
1053+
1054+ "lldb"."2.2.3271982" = {
1055+
1056+ name = "lldb";
1057+ path = "lldb/2.2";
1058+ revision = "2.2.3271982";
1059+ displayName = "LLDB 2.2";
1060+ archives = {
1061+ macosx = fetchurl {
1062+ url = https://dl.google.com/android/repository/lldb-2.2.3271982-darwin-x86_64.zip;
1063+ sha1 = "62089f4e35775e6cedb82d1fa377fdc1de898005";
1064+ };
1065+ linux = fetchurl {
1066+ url = https://dl.google.com/android/repository/lldb-2.2.3271982-linux-x86_64.zip;
1067+ sha1 = "413649617d97dd9ef163528f64c0500e1b7c4113";
1068+ };
1069+
1070+ };
1071+ };
1072+
1073+ "lldb"."2.3.3614996" = {
1074+
1075+ name = "lldb";
1076+ path = "lldb/2.3";
1077+ revision = "2.3.3614996";
1078+ displayName = "LLDB 2.3";
1079+ archives = {
1080+ macosx = fetchurl {
1081+ url = https://dl.google.com/android/repository/lldb-2.3.3614996-darwin-x86_64.zip;
1082+ sha1 = "6b0df112c7b9fa41654497fde2fcce990c831e52";
1083+ };
1084+ linux = fetchurl {
1085+ url = https://dl.google.com/android/repository/lldb-2.3.3614996-linux-x86_64.zip;
1086+ sha1 = "d7abe655650efe9f6989df31835fa3b3f95c2d13";
1087+ };
1088+
1089+ };
1090+ };
1091+
1092+ "lldb"."3.0.4213617" = {
1093+
1094+ name = "lldb";
1095+ path = "lldb/3.0";
1096+ revision = "3.0.4213617";
1097+ displayName = "LLDB 3.0";
1098+ archives = {
1099+ macosx = fetchurl {
1100+ url = https://dl.google.com/android/repository/lldb-3.0.4213617-darwin-x86_64.zip;
1101+ sha1 = "2492651690a215317b86c755cd4d584ec9838677";
1102+ };
1103+ linux = fetchurl {
1104+ url = https://dl.google.com/android/repository/lldb-3.0.4213617-linux-x86_64.zip;
1105+ sha1 = "61d49b6a58953faa61546d631409af5f60d8d9db";
1106+ };
1107+
1108+ };
1109+ };
1110+
1111+ "lldb"."3.1.4508709" = {
1112+
1113+ name = "lldb";
1114+ path = "lldb/3.1";
1115+ revision = "3.1.4508709";
1116+ displayName = "LLDB 3.1";
1117+ archives = {
1118+ macosx = fetchurl {
1119+ url = https://dl.google.com/android/repository/lldb-3.1.4508709-darwin-x86_64.zip;
1120+ sha1 = "2b37aa55b81a7e5b8a369febf1ac0bad6c7c5d58";
1121+ };
1122+ linux = fetchurl {
1123+ url = https://dl.google.com/android/repository/lldb-3.1.4508709-linux-x86_64.zip;
1124+ sha1 = "462711c9ee94fec9ff8be5fa8180afec04d1af6f";
1125+ };
1126+
1127+ };
1128+ };
1129+
1130+ "ndk-bundle"."18.1.5063045" = {
1131+
1132+ name = "ndk-bundle";
1133+ path = "ndk-bundle";
1134+ revision = "18.1.5063045";
1135+ displayName = "NDK";
1136+ archives = {
1137+ macosx = fetchurl {
1138+ url = https://dl.google.com/android/repository/android-ndk-r18b-darwin-x86_64.zip;
1139+ sha1 = "98cb9909aa8c2dab32db188bbdc3ac6207e09440";
1140+ };
1141+ linux = fetchurl {
1142+ url = https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip;
1143+ sha1 = "500679655da3a86aecf67007e8ab230ea9b4dd7b";
1144+ };
1145+
1146+ };
1147+ };
1148+
1149+ "patcher"."1" = {
1150+
1151+ name = "patcher";
1152+ path = "patcher/v4";
1153+ revision = "1";
1154+ displayName = "SDK Patch Applier v4";
1155+ archives = {
1156+
1157+ all = fetchurl {
1158+ url = https://dl.google.com/android/repository/3534162-studio.sdk-patcher.zip.bak;
1159+ sha1 = "046699c5e2716ae11d77e0bad814f7f33fab261e";
1160+ };
1161+
1162+ };
1163+ };
1164+
1165+ "platform-tools"."28.0.1" = {
1166+
1167+ name = "platform-tools";
1168+ path = "platform-tools";
1169+ revision = "28.0.1";
1170+ displayName = "Android SDK Platform-Tools";
1171+ archives = {
1172+ macosx = fetchurl {
1173+ url = https://dl.google.com/android/repository/platform-tools_r28.0.1-darwin.zip;
1174+ sha1 = "ed1edad4a48c27655ce98d0a5821e7296e9de145";
1175+ };
1176+ linux = fetchurl {
1177+ url = https://dl.google.com/android/repository/platform-tools_r28.0.1-linux.zip;
1178+ sha1 = "74ff83bc203f01c4f04bd9316ab5a2573f023fd1";
1179+ };
1180+
1181+ };
1182+ };
1183+
1184+ "platforms"."10" = {
1185+
1186+ name = "platforms";
1187+ path = "platforms/android-10";
1188+ revision = "10";
1189+ displayName = "Android SDK Platform 10";
1190+ archives = {
1191+
1192+ all = fetchurl {
1193+ url = https://dl.google.com/android/repository/android-2.3.3_r02.zip;
1194+ sha1 = "887e37783ec32f541ea33c2c649dda648e8e6fb3";
1195+ };
1196+
1197+ };
1198+ };
1199+
1200+ "platforms"."11" = {
1201+
1202+ name = "platforms";
1203+ path = "platforms/android-11";
1204+ revision = "11";
1205+ displayName = "Android SDK Platform 11";
1206+ archives = {
1207+
1208+ all = fetchurl {
1209+ url = https://dl.google.com/android/repository/android-3.0_r02.zip;
1210+ sha1 = "2c7d4bd13f276e76f6bbd87315fe27aba351dd37";
1211+ };
1212+
1213+ };
1214+ };
1215+
1216+ "platforms"."12" = {
1217+
1218+ name = "platforms";
1219+ path = "platforms/android-12";
1220+ revision = "12";
1221+ displayName = "Android SDK Platform 12";
1222+ archives = {
1223+
1224+ all = fetchurl {
1225+ url = https://dl.google.com/android/repository/android-3.1_r03.zip;
1226+ sha1 = "4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf";
1227+ };
1228+
1229+ };
1230+ };
1231+
1232+ "platforms"."13" = {
1233+
1234+ name = "platforms";
1235+ path = "platforms/android-13";
1236+ revision = "13";
1237+ displayName = "Android SDK Platform 13";
1238+ archives = {
1239+
1240+ all = fetchurl {
1241+ url = https://dl.google.com/android/repository/android-3.2_r01.zip;
1242+ sha1 = "6189a500a8c44ae73a439604363de93591163cd9";
1243+ };
1244+
1245+ };
1246+ };
1247+
1248+ "platforms"."14" = {
1249+
1250+ name = "platforms";
1251+ path = "platforms/android-14";
1252+ revision = "14";
1253+ displayName = "Android SDK Platform 14";
1254+ archives = {
1255+
1256+ all = fetchurl {
1257+ url = https://dl.google.com/android/repository/android-14_r04.zip;
1258+ sha1 = "d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c";
1259+ };
1260+
1261+ };
1262+ };
1263+
1264+ "platforms"."15" = {
1265+
1266+ name = "platforms";
1267+ path = "platforms/android-15";
1268+ revision = "15";
1269+ displayName = "Android SDK Platform 15";
1270+ archives = {
1271+
1272+ all = fetchurl {
1273+ url = https://dl.google.com/android/repository/android-15_r05.zip;
1274+ sha1 = "69ab4c443b37184b2883af1fd38cc20cbeffd0f3";
1275+ };
1276+
1277+ };
1278+ };
1279+
1280+ "platforms"."16" = {
1281+
1282+ name = "platforms";
1283+ path = "platforms/android-16";
1284+ revision = "16";
1285+ displayName = "Android SDK Platform 16";
1286+ archives = {
1287+
1288+ all = fetchurl {
1289+ url = https://dl.google.com/android/repository/android-16_r05.zip;
1290+ sha1 = "12a5ce6235a76bc30f62c26bda1b680e336abd07";
1291+ };
1292+
1293+ };
1294+ };
1295+
1296+ "platforms"."17" = {
1297+
1298+ name = "platforms";
1299+ path = "platforms/android-17";
1300+ revision = "17";
1301+ displayName = "Android SDK Platform 17";
1302+ archives = {
1303+
1304+ all = fetchurl {
1305+ url = https://dl.google.com/android/repository/android-17_r03.zip;
1306+ sha1 = "dbe14101c06e6cdb34e300393e64e64f8c92168a";
1307+ };
1308+
1309+ };
1310+ };
1311+
1312+ "platforms"."18" = {
1313+
1314+ name = "platforms";
1315+ path = "platforms/android-18";
1316+ revision = "18";
1317+ displayName = "Android SDK Platform 18";
1318+ archives = {
1319+
1320+ all = fetchurl {
1321+ url = https://dl.google.com/android/repository/android-18_r03.zip;
1322+ sha1 = "e6b09b3505754cbbeb4a5622008b907262ee91cb";
1323+ };
1324+
1325+ };
1326+ };
1327+
1328+ "platforms"."19" = {
1329+
1330+ name = "platforms";
1331+ path = "platforms/android-19";
1332+ revision = "19";
1333+ displayName = "Android SDK Platform 19";
1334+ archives = {
1335+
1336+ all = fetchurl {
1337+ url = https://dl.google.com/android/repository/android-19_r04.zip;
1338+ sha1 = "2ff20d89e68f2f5390981342e009db5a2d456aaa";
1339+ };
1340+
1341+ };
1342+ };
1343+
1344+ "platforms"."2" = {
1345+
1346+ name = "platforms";
1347+ path = "platforms/android-2";
1348+ revision = "2";
1349+ displayName = "Android SDK Platform 2";
1350+ archives = {
1351+ linux = fetchurl {
1352+ url = https://dl.google.com/android/repository/android-1.1_r1-linux.zip;
1353+ sha1 = "c054d25c9b4c6251fa49c2f9c54336998679d3fe";
1354+ };
1355+ macosx = fetchurl {
1356+ url = https://dl.google.com/android/repository/android-1.1_r1-macosx.zip;
1357+ sha1 = "e21dbcff45b7356657449ebb3c7e941be2bb5ebe";
1358+ };
1359+
1360+ };
1361+ };
1362+
1363+ "platforms"."20" = {
1364+
1365+ name = "platforms";
1366+ path = "platforms/android-20";
1367+ revision = "20";
1368+ displayName = "Android SDK Platform 20";
1369+ archives = {
1370+
1371+ all = fetchurl {
1372+ url = https://dl.google.com/android/repository/android-20_r02.zip;
1373+ sha1 = "a9251f8a3f313ab05834a07a963000927637e01d";
1374+ };
1375+
1376+ };
1377+ };
1378+
1379+ "platforms"."21" = {
1380+
1381+ name = "platforms";
1382+ path = "platforms/android-21";
1383+ revision = "21";
1384+ displayName = "Android SDK Platform 21";
1385+ archives = {
1386+
1387+ all = fetchurl {
1388+ url = https://dl.google.com/android/repository/android-21_r02.zip;
1389+ sha1 = "53536556059bb29ae82f414fd2e14bc335a4eb4c";
1390+ };
1391+
1392+ };
1393+ };
1394+
1395+ "platforms"."22" = {
1396+
1397+ name = "platforms";
1398+ path = "platforms/android-22";
1399+ revision = "22";
1400+ displayName = "Android SDK Platform 22";
1401+ archives = {
1402+
1403+ all = fetchurl {
1404+ url = https://dl.google.com/android/repository/android-22_r02.zip;
1405+ sha1 = "5d1bd10fea962b216a0dece1247070164760a9fc";
1406+ };
1407+
1408+ };
1409+ };
1410+
1411+ "platforms"."23" = {
1412+
1413+ name = "platforms";
1414+ path = "platforms/android-23";
1415+ revision = "23";
1416+ displayName = "Android SDK Platform 23";
1417+ archives = {
1418+
1419+ all = fetchurl {
1420+ url = https://dl.google.com/android/repository/platform-23_r03.zip;
1421+ sha1 = "027fede3de6aa1649115bbd0bffff30ccd51c9a0";
1422+ };
1423+
1424+ };
1425+ };
1426+
1427+ "platforms"."24" = {
1428+
1429+ name = "platforms";
1430+ path = "platforms/android-24";
1431+ revision = "24";
1432+ displayName = "Android SDK Platform 24";
1433+ archives = {
1434+
1435+ all = fetchurl {
1436+ url = https://dl.google.com/android/repository/platform-24_r02.zip;
1437+ sha1 = "8912da3d4bfe7a9f28f0e5ce92d3a8dc96342aee";
1438+ };
1439+
1440+ };
1441+ };
1442+
1443+ "platforms"."25" = {
1444+
1445+ name = "platforms";
1446+ path = "platforms/android-25";
1447+ revision = "25";
1448+ displayName = "Android SDK Platform 25";
1449+ archives = {
1450+
1451+ all = fetchurl {
1452+ url = https://dl.google.com/android/repository/platform-25_r03.zip;
1453+ sha1 = "00c2c5765e8988504be10a1eb66ed71fcdbd7fe8";
1454+ };
1455+
1456+ };
1457+ };
1458+
1459+ "platforms"."26" = {
1460+
1461+ name = "platforms";
1462+ path = "platforms/android-26";
1463+ revision = "26";
1464+ displayName = "Android SDK Platform 26";
1465+ archives = {
1466+
1467+ all = fetchurl {
1468+ url = https://dl.google.com/android/repository/platform-26_r02.zip;
1469+ sha1 = "e4ae5d7aa557a3c827135838ee400da8443ac4ef";
1470+ };
1471+
1472+ };
1473+ };
1474+
1475+ "platforms"."27" = {
1476+
1477+ name = "platforms";
1478+ path = "platforms/android-27";
1479+ revision = "27";
1480+ displayName = "Android SDK Platform 27";
1481+ archives = {
1482+
1483+ all = fetchurl {
1484+ url = https://dl.google.com/android/repository/platform-27_r03.zip;
1485+ sha1 = "35f747e7e70b2d16e0e4246876be28d15ea1c353";
1486+ };
1487+
1488+ };
1489+ };
1490+
1491+ "platforms"."28" = {
1492+
1493+ name = "platforms";
1494+ path = "platforms/android-28";
1495+ revision = "28";
1496+ displayName = "Android SDK Platform 28";
1497+ archives = {
1498+
1499+ all = fetchurl {
1500+ url = https://dl.google.com/android/repository/platform-28_r06.zip;
1501+ sha1 = "9a4e52b1d55bd2e24216b150aafae2503d3efba6";
1502+ };
1503+
1504+ };
1505+ };
1506+
1507+ "platforms"."3" = {
1508+
1509+ name = "platforms";
1510+ path = "platforms/android-3";
1511+ revision = "3";
1512+ displayName = "Android SDK Platform 3";
1513+ archives = {
1514+ linux = fetchurl {
1515+ url = https://dl.google.com/android/repository/android-1.5_r04-linux.zip;
1516+ sha1 = "5c134b7df5f4b8bd5b61ba93bdaebada8fa3468c";
1517+ };
1518+ macosx = fetchurl {
1519+ url = https://dl.google.com/android/repository/android-1.5_r04-macosx.zip;
1520+ sha1 = "d3a67c2369afa48b6c3c7624de5031c262018d1e";
1521+ };
1522+
1523+ };
1524+ };
1525+
1526+ "platforms"."4" = {
1527+
1528+ name = "platforms";
1529+ path = "platforms/android-4";
1530+ revision = "4";
1531+ displayName = "Android SDK Platform 4";
1532+ archives = {
1533+ linux = fetchurl {
1534+ url = https://dl.google.com/android/repository/android-1.6_r03-linux.zip;
1535+ sha1 = "483ed088e45bbdf3444baaf9250c8b02e5383cb0";
1536+ };
1537+ macosx = fetchurl {
1538+ url = https://dl.google.com/android/repository/android-1.6_r03-macosx.zip;
1539+ sha1 = "bdafad44f5df9f127979bdb21a1fdd87ee3cd625";
1540+ };
1541+
1542+ };
1543+ };
1544+
1545+ "platforms"."5" = {
1546+
1547+ name = "platforms";
1548+ path = "platforms/android-5";
1549+ revision = "5";
1550+ displayName = "Android SDK Platform 5";
1551+ archives = {
1552+ linux = fetchurl {
1553+ url = https://dl.google.com/android/repository/android-2.0_r01-linux.zip;
1554+ sha1 = "be9be6a99ca32875c96ec7f91160ca9fce7e3c7d";
1555+ };
1556+ macosx = fetchurl {
1557+ url = https://dl.google.com/android/repository/android-2.0_r01-macosx.zip;
1558+ sha1 = "2a866d0870dbba18e0503cd41e5fae988a21b314";
1559+ };
1560+
1561+ };
1562+ };
1563+
1564+ "platforms"."6" = {
1565+
1566+ name = "platforms";
1567+ path = "platforms/android-6";
1568+ revision = "6";
1569+ displayName = "Android SDK Platform 6";
1570+ archives = {
1571+ linux = fetchurl {
1572+ url = https://dl.google.com/android/repository/android-2.0.1_r01-linux.zip;
1573+ sha1 = "ce2c971dce352aa28af06bda92a070116aa5ae1a";
1574+ };
1575+ macosx = fetchurl {
1576+ url = https://dl.google.com/android/repository/android-2.0.1_r01-macosx.zip;
1577+ sha1 = "c3096f80d75a6fc8cb38ef8a18aec920e53d42c0";
1578+ };
1579+
1580+ };
1581+ };
1582+
1583+ "platforms"."7" = {
1584+
1585+ name = "platforms";
1586+ path = "platforms/android-7";
1587+ revision = "7";
1588+ displayName = "Android SDK Platform 7";
1589+ archives = {
1590+
1591+ all = fetchurl {
1592+ url = https://dl.google.com/android/repository/android-2.1_r03.zip;
1593+ sha1 = "5ce51b023ac19f8738500b1007a1da5de2349a1e";
1594+ };
1595+
1596+ };
1597+ };
1598+
1599+ "platforms"."8" = {
1600+
1601+ name = "platforms";
1602+ path = "platforms/android-8";
1603+ revision = "8";
1604+ displayName = "Android SDK Platform 8";
1605+ archives = {
1606+
1607+ all = fetchurl {
1608+ url = https://dl.google.com/android/repository/android-2.2_r03.zip;
1609+ sha1 = "231262c63eefdff8fd0386e9ccfefeb27a8f9202";
1610+ };
1611+
1612+ };
1613+ };
1614+
1615+ "platforms"."9" = {
1616+
1617+ name = "platforms";
1618+ path = "platforms/android-9";
1619+ revision = "9";
1620+ displayName = "Android SDK Platform 9";
1621+ archives = {
1622+
1623+ all = fetchurl {
1624+ url = https://dl.google.com/android/repository/android-2.3.1_r02.zip;
1625+ sha1 = "209f8a7a8b2cb093fce858b8b55fed3ba5206773";
1626+ };
1627+
1628+ };
1629+ };
1630+
1631+ "sources"."14" = {
1632+
1633+ name = "sources";
1634+ path = "sources/android-14";
1635+ revision = "14";
1636+ displayName = "Sources for Android 14";
1637+ archives = {
1638+
1639+ all = fetchurl {
1640+ url = https://dl.google.com/android/repository/sources-14_r01.zip;
1641+ sha1 = "eaf4ed7dcac46e68516a1b4aa5b0d9e5a39a7555";
1642+ };
1643+
1644+ };
1645+ };
1646+
1647+ "sources"."15" = {
1648+
1649+ name = "sources";
1650+ path = "sources/android-15";
1651+ revision = "15";
1652+ displayName = "Sources for Android 15";
1653+ archives = {
1654+
1655+ all = fetchurl {
1656+ url = https://dl.google.com/android/repository/sources-15_r02.zip;
1657+ sha1 = "e5992a5747c9590783fbbdd700337bf0c9f6b1fa";
1658+ };
1659+
1660+ };
1661+ };
1662+
1663+ "sources"."16" = {
1664+
1665+ name = "sources";
1666+ path = "sources/android-16";
1667+ revision = "16";
1668+ displayName = "Sources for Android 16";
1669+ archives = {
1670+
1671+ all = fetchurl {
1672+ url = https://dl.google.com/android/repository/sources-16_r02.zip;
1673+ sha1 = "0f83c14ed333c45d962279ab5d6bc98a0269ef84";
1674+ };
1675+
1676+ };
1677+ };
1678+
1679+ "sources"."17" = {
1680+
1681+ name = "sources";
1682+ path = "sources/android-17";
1683+ revision = "17";
1684+ displayName = "Sources for Android 17";
1685+ archives = {
1686+
1687+ all = fetchurl {
1688+ url = https://dl.google.com/android/repository/sources-17_r01.zip;
1689+ sha1 = "6f1f18cd2d2b1852d7f6892df9cee3823349d43a";
1690+ };
1691+
1692+ };
1693+ };
1694+
1695+ "sources"."18" = {
1696+
1697+ name = "sources";
1698+ path = "sources/android-18";
1699+ revision = "18";
1700+ displayName = "Sources for Android 18";
1701+ archives = {
1702+
1703+ all = fetchurl {
1704+ url = https://dl.google.com/android/repository/sources-18_r01.zip;
1705+ sha1 = "8b49fdf7433f4881a2bfb559b5dd05d8ec65fb78";
1706+ };
1707+
1708+ };
1709+ };
1710+
1711+ "sources"."19" = {
1712+
1713+ name = "sources";
1714+ path = "sources/android-19";
1715+ revision = "19";
1716+ displayName = "Sources for Android 19";
1717+ archives = {
1718+
1719+ all = fetchurl {
1720+ url = https://dl.google.com/android/repository/sources-19_r02.zip;
1721+ sha1 = "433a1d043ef77561571250e94cb7a0ef24a202e7";
1722+ };
1723+
1724+ };
1725+ };
1726+
1727+ "sources"."20" = {
1728+
1729+ name = "sources";
1730+ path = "sources/android-20";
1731+ revision = "20";
1732+ displayName = "Sources for Android 20";
1733+ archives = {
1734+
1735+ all = fetchurl {
1736+ url = https://dl.google.com/android/repository/sources-20_r01.zip;
1737+ sha1 = "8da3e40f2625f9f7ef38b7e403f49f67226c0d76";
1738+ };
1739+
1740+ };
1741+ };
1742+
1743+ "sources"."21" = {
1744+
1745+ name = "sources";
1746+ path = "sources/android-21";
1747+ revision = "21";
1748+ displayName = "Sources for Android 21";
1749+ archives = {
1750+
1751+ all = fetchurl {
1752+ url = https://dl.google.com/android/repository/sources-21_r01.zip;
1753+ sha1 = "137a5044915d32bea297a8c1552684802bbc2e25";
1754+ };
1755+
1756+ };
1757+ };
1758+
1759+ "sources"."22" = {
1760+
1761+ name = "sources";
1762+ path = "sources/android-22";
1763+ revision = "22";
1764+ displayName = "Sources for Android 22";
1765+ archives = {
1766+
1767+ all = fetchurl {
1768+ url = https://dl.google.com/android/repository/sources-22_r01.zip;
1769+ sha1 = "98320e13976d11597a4a730a8d203ac9a03ed5a6";
1770+ };
1771+
1772+ };
1773+ };
1774+
1775+ "sources"."23" = {
1776+
1777+ name = "sources";
1778+ path = "sources/android-23";
1779+ revision = "23";
1780+ displayName = "Sources for Android 23";
1781+ archives = {
1782+
1783+ all = fetchurl {
1784+ url = https://dl.google.com/android/repository/sources-23_r01.zip;
1785+ sha1 = "b0f15da2762b42f543c5e364c2b15b198cc99cc2";
1786+ };
1787+
1788+ };
1789+ };
1790+
1791+ "sources"."24" = {
1792+
1793+ name = "sources";
1794+ path = "sources/android-24";
1795+ revision = "24";
1796+ displayName = "Sources for Android 24";
1797+ archives = {
1798+
1799+ all = fetchurl {
1800+ url = https://dl.google.com/android/repository/sources-24_r01.zip;
1801+ sha1 = "6b96115830a83d654479f32ce4b724ca9011148b";
1802+ };
1803+
1804+ };
1805+ };
1806+
1807+ "sources"."25" = {
1808+
1809+ name = "sources";
1810+ path = "sources/android-25";
1811+ revision = "25";
1812+ displayName = "Sources for Android 25";
1813+ archives = {
1814+
1815+ all = fetchurl {
1816+ url = https://dl.google.com/android/repository/sources-25_r01.zip;
1817+ sha1 = "bbc72efd1a9bad87cc507e308f0d29aad438c52c";
1818+ };
1819+
1820+ };
1821+ };
1822+
1823+ "sources"."26" = {
1824+
1825+ name = "sources";
1826+ path = "sources/android-26";
1827+ revision = "26";
1828+ displayName = "Sources for Android 26";
1829+ archives = {
1830+
1831+ all = fetchurl {
1832+ url = https://dl.google.com/android/repository/sources-26_r01.zip;
1833+ sha1 = "2af701ee3223d580409288540b1d06932fd8f9b9";
1834+ };
1835+
1836+ };
1837+ };
1838+
1839+ "sources"."27" = {
1840+
1841+ name = "sources";
1842+ path = "sources/android-27";
1843+ revision = "27";
1844+ displayName = "Sources for Android 27";
1845+ archives = {
1846+
1847+ all = fetchurl {
1848+ url = https://dl.google.com/android/repository/sources-27_r01.zip;
1849+ sha1 = "7b714670561d08f54751af42aca929867b806596";
1850+ };
1851+
1852+ };
1853+ };
1854+
1855+ "sources"."28" = {
1856+
1857+ name = "sources";
1858+ path = "sources/android-28";
1859+ revision = "28";
1860+ displayName = "Sources for Android 28";
1861+ archives = {
1862+
1863+ all = fetchurl {
1864+ url = https://dl.google.com/android/repository/sources-28_r01.zip;
1865+ sha1 = "5610e0c24235ee3fa343c899ddd551be30315255";
1866+ };
1867+
1868+ };
1869+ };
1870+
1871+ "tools"."25.2.5" = {
1872+
1873+ name = "tools";
1874+ path = "tools";
1875+ revision = "25.2.5";
1876+ displayName = "Android SDK Tools 25.2.5";
1877+ archives = {
1878+ linux = fetchurl {
1879+ url = https://dl.google.com/android/repository/tools_r25.2.5-linux.zip;
1880+ sha1 = "72df3aa1988c0a9003ccdfd7a13a7b8bd0f47fc1";
1881+ };
1882+ macosx = fetchurl {
1883+ url = https://dl.google.com/android/repository/tools_r25.2.5-macosx.zip;
1884+ sha1 = "d2168d963ac5b616e3d3ddaf21511d084baf3659";
1885+ };
1886+
1887+ };
1888+ };
1889+
1890+ "tools"."26.1.1" = {
1891+
1892+ name = "tools";
1893+ path = "tools";
1894+ revision = "26.1.1";
1895+ displayName = "Android SDK Tools";
1896+ archives = {
1897+ macosx = fetchurl {
1898+ url = https://dl.google.com/android/repository/sdk-tools-darwin-4333796.zip;
1899+ sha1 = "ed85ea7b59bc3483ce0af4c198523ba044e083ad";
1900+ };
1901+ linux = fetchurl {
1902+ url = https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip;
1903+ sha1 = "8c7c28554a32318461802c1291d76fccfafde054";
1904+ };
1905+
1906+ };
1907+ };
1908+
1909+}
1910+
pkgs/development/mobile/androidenv/generated/system-images-android-tv.nixnew file+157
@@ -0,0 +1,157 @@
1+
2+{fetchurl}:
3+
4+{
5+
6+
7+ "21".android-tv."x86" = {
8+ name = "system-image-21-android-tv-x86";
9+ path = "system-images/android-21/android-tv/x86";
10+ revision = "21-android-tv-x86";
11+ displayName = "Android TV Intel x86 Atom System Image";
12+ archives.all = fetchurl {
13+
14+ url =
15+ https://dl.google.com/android/repository/sys-img/android-tv/x86-21_r03.zip;
16+ sha1 = "2f8a1988188d6abfd6c6395baeb4471a034dc1e8";
17+
18+ };
19+ };
20+
21+
22+ "21".android-tv."armeabi-v7a" = {
23+ name = "system-image-21-android-tv-armeabi-v7a";
24+ path = "system-images/android-21/android-tv/armeabi-v7a";
25+ revision = "21-android-tv-armeabi-v7a";
26+ displayName = "Android TV ARM EABI v7a System Image";
27+ archives.all = fetchurl {
28+
29+ url =
30+ https://dl.google.com/android/repository/sys-img/android-tv/armeabi-v7a-21_r03.zip;
31+ sha1 = "b63e28a47f11b639dd94981a458b7abfa89ac331";
32+
33+ };
34+ };
35+
36+
37+ "22".android-tv."x86" = {
38+ name = "system-image-22-android-tv-x86";
39+ path = "system-images/android-22/android-tv/x86";
40+ revision = "22-android-tv-x86";
41+ displayName = "Android TV Intel x86 Atom System Image";
42+ archives.all = fetchurl {
43+
44+ url =
45+ https://dl.google.com/android/repository/sys-img/android-tv/x86-22_r03.zip;
46+ sha1 = "c78efd5a155622eb490be9d326f5783993375c35";
47+
48+ };
49+ };
50+
51+
52+ "23".android-tv."x86" = {
53+ name = "system-image-23-android-tv-x86";
54+ path = "system-images/android-23/android-tv/x86";
55+ revision = "23-android-tv-x86";
56+ displayName = "Android TV Intel x86 Atom System Image";
57+ archives.all = fetchurl {
58+
59+ url =
60+ https://dl.google.com/android/repository/sys-img/android-tv/x86-23_r17.zip;
61+ sha1 = "6d42eb8f07e1c49c000e530fdb7de894144ea19b";
62+
63+ };
64+ };
65+
66+
67+ "23".android-tv."armeabi-v7a" = {
68+ name = "system-image-23-android-tv-armeabi-v7a";
69+ path = "system-images/android-23/android-tv/armeabi-v7a";
70+ revision = "23-android-tv-armeabi-v7a";
71+ displayName = "Android TV ARM EABI v7a System Image";
72+ archives.all = fetchurl {
73+
74+ url =
75+ https://dl.google.com/android/repository/sys-img/android-tv/armeabi-v7a-23_r12.zip;
76+ sha1 = "bd84678ae8caf71d584f5210e866b2807e7b4b52";
77+
78+ };
79+ };
80+
81+
82+ "24".android-tv."x86" = {
83+ name = "system-image-24-android-tv-x86";
84+ path = "system-images/android-24/android-tv/x86";
85+ revision = "24-android-tv-x86";
86+ displayName = "Android TV Intel x86 Atom System Image";
87+ archives.all = fetchurl {
88+
89+ url =
90+ https://dl.google.com/android/repository/sys-img/android-tv/x86-24_r19.zip;
91+ sha1 = "478e7073f9fcd588bcce89946aa632fbf302ac6a";
92+
93+ };
94+ };
95+
96+
97+ "25".android-tv."x86" = {
98+ name = "system-image-25-android-tv-x86";
99+ path = "system-images/android-25/android-tv/x86";
100+ revision = "25-android-tv-x86";
101+ displayName = "Android TV Intel x86 Atom System Image";
102+ archives.all = fetchurl {
103+
104+ url =
105+ https://dl.google.com/android/repository/sys-img/android-tv/x86-25_r13.zip;
106+ sha1 = "fda1743a87331b43b1ff35cd70f3276ae0b1836d";
107+
108+ };
109+ };
110+
111+
112+ "26".android-tv."x86" = {
113+ name = "system-image-26-android-tv-x86";
114+ path = "system-images/android-26/android-tv/x86";
115+ revision = "26-android-tv-x86";
116+ displayName = "Android TV Intel x86 Atom System Image";
117+ archives.all = fetchurl {
118+
119+ url =
120+ https://dl.google.com/android/repository/sys-img/android-tv/x86-26_r11.zip;
121+ sha1 = "5c4b0b3c0b9d04a3364956a7ba31d30c33ea57e7";
122+
123+ };
124+ };
125+
126+
127+ "27".android-tv."x86" = {
128+ name = "system-image-27-android-tv-x86";
129+ path = "system-images/android-27/android-tv/x86";
130+ revision = "27-android-tv-x86";
131+ displayName = "Android TV Intel x86 Atom System Image";
132+ archives.all = fetchurl {
133+
134+ url =
135+ https://dl.google.com/android/repository/sys-img/android-tv/x86-27_r06.zip;
136+ sha1 = "6b69f1e95a3db3d973e19a95ab5da1adc7750d54";
137+
138+ };
139+ };
140+
141+
142+ "28".android-tv."x86" = {
143+ name = "system-image-28-android-tv-x86";
144+ path = "system-images/android-28/android-tv/x86";
145+ revision = "28-android-tv-x86";
146+ displayName = "Android TV Intel x86 Atom System Image";
147+ archives.all = fetchurl {
148+
149+ url =
150+ https://dl.google.com/android/repository/sys-img/android-tv/x86-28_r07.zip;
151+ sha1 = "3ed7e51036957cf350db7fa128cb485b61cbd061";
152+
153+ };
154+ };
155+
156+}
157+
pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nixnew file+67
@@ -0,0 +1,67 @@
1+
2+{fetchurl}:
3+
4+{
5+
6+
7+ "25".android-wear."armeabi-v7a" = {
8+ name = "system-image-25-android-wear-armeabi-v7a";
9+ path = "system-images/android-25/android-wear-cn/armeabi-v7a";
10+ revision = "25-android-wear-armeabi-v7a";
11+ displayName = "China version of Android Wear ARM EABI v7a System Image";
12+ archives.all = fetchurl {
13+
14+ url =
15+ https://dl.google.com/android/repository/sys-img/android-wear-cn/armeabi-v7a-25_r04.zip;
16+ sha1 = "02d7bc86df054d1e89fe5856b3af1d2c142cab41";
17+
18+ };
19+ };
20+
21+
22+ "25".android-wear."x86" = {
23+ name = "system-image-25-android-wear-x86";
24+ path = "system-images/android-25/android-wear-cn/x86";
25+ revision = "25-android-wear-x86";
26+ displayName = "China version of Android Wear Intel x86 Atom System Image";
27+ archives.all = fetchurl {
28+
29+ url =
30+ https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-25_r04.zip;
31+ sha1 = "73eab14c7cf2f6941e1fee61e0038ead7a2c7f4d";
32+
33+ };
34+ };
35+
36+
37+ "26".android-wear."x86" = {
38+ name = "system-image-26-android-wear-x86";
39+ path = "system-images/android-26/android-wear-cn/x86";
40+ revision = "26-android-wear-x86";
41+ displayName = "China version of Android Wear Intel x86 Atom System Image";
42+ archives.all = fetchurl {
43+
44+ url =
45+ https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-26_r04.zip;
46+ sha1 = "fdc8a313f889a2d6522de1fbc00ee9e13547d096";
47+
48+ };
49+ };
50+
51+
52+ "28".android-wear."x86" = {
53+ name = "system-image-28-android-wear-x86";
54+ path = "system-images/android-P/android-wear-cn/x86";
55+ revision = "28-android-wear-x86";
56+ displayName = "China version of Wear OS Intel x86 Atom System Image";
57+ archives.all = fetchurl {
58+
59+ url =
60+ https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-P_r02.zip;
61+ sha1 = "a61a2e453a11f77ab15b3e0bf1e017e0bb9d1bcc";
62+
63+ };
64+ };
65+
66+}
67+
pkgs/development/mobile/androidenv/generated/system-images-android-wear.nixnew file+97
@@ -0,0 +1,97 @@
1+
2+{fetchurl}:
3+
4+{
5+
6+
7+ "23".android-wear."armeabi-v7a" = {
8+ name = "system-image-23-android-wear-armeabi-v7a";
9+ path = "system-images/android-23/android-wear/armeabi-v7a";
10+ revision = "23-android-wear-armeabi-v7a";
11+ displayName = "Android Wear ARM EABI v7a System Image";
12+ archives.all = fetchurl {
13+
14+ url =
15+ https://dl.google.com/android/repository/sys-img/android-wear/armeabi-v7a-23_r06.zip;
16+ sha1 = "0df5d34b1cdaaaa3805a2f06bb889901eabe2e71";
17+
18+ };
19+ };
20+
21+
22+ "23".android-wear."x86" = {
23+ name = "system-image-23-android-wear-x86";
24+ path = "system-images/android-23/android-wear/x86";
25+ revision = "23-android-wear-x86";
26+ displayName = "Android Wear Intel x86 Atom System Image";
27+ archives.all = fetchurl {
28+
29+ url =
30+ https://dl.google.com/android/repository/sys-img/android-wear/x86-23_r06.zip;
31+ sha1 = "3b15c123f3f71459d5b60c1714d49c5d90a5525e";
32+
33+ };
34+ };
35+
36+
37+ "25".android-wear."armeabi-v7a" = {
38+ name = "system-image-25-android-wear-armeabi-v7a";
39+ path = "system-images/android-25/android-wear/armeabi-v7a";
40+ revision = "25-android-wear-armeabi-v7a";
41+ displayName = "Android Wear ARM EABI v7a System Image";
42+ archives.all = fetchurl {
43+
44+ url =
45+ https://dl.google.com/android/repository/sys-img/android-wear/armeabi-v7a-25_r03.zip;
46+ sha1 = "76d3568a4e08023047af7d13025a35c9bf1d7e5c";
47+
48+ };
49+ };
50+
51+
52+ "25".android-wear."x86" = {
53+ name = "system-image-25-android-wear-x86";
54+ path = "system-images/android-25/android-wear/x86";
55+ revision = "25-android-wear-x86";
56+ displayName = "Android Wear Intel x86 Atom System Image";
57+ archives.all = fetchurl {
58+
59+ url =
60+ https://dl.google.com/android/repository/sys-img/android-wear/x86-25_r03.zip;
61+ sha1 = "693fce7b487a65491a4e88e9f740959688c9dbe6";
62+
63+ };
64+ };
65+
66+
67+ "26".android-wear."x86" = {
68+ name = "system-image-26-android-wear-x86";
69+ path = "system-images/android-26/android-wear/x86";
70+ revision = "26-android-wear-x86";
71+ displayName = "Android Wear Intel x86 Atom System Image";
72+ archives.all = fetchurl {
73+
74+ url =
75+ https://dl.google.com/android/repository/sys-img/android-wear/x86-26_r04.zip;
76+ sha1 = "fbffa91b936ca18fcc1e0bab2b52a8b0835cbb1c";
77+
78+ };
79+ };
80+
81+
82+ "28".android-wear."x86" = {
83+ name = "system-image-28-android-wear-x86";
84+ path = "system-images/android-P/android-wear/x86";
85+ revision = "28-android-wear-x86";
86+ displayName = "Wear OS Intel x86 Atom System Image";
87+ archives.all = fetchurl {
88+
89+ url =
90+ https://dl.google.com/android/repository/sys-img/android-wear/x86-P_r02.zip;
91+ sha1 = "cd0d3a56e114dbb0a2a77d58942d344db464b514";
92+
93+ };
94+ };
95+
96+}
97+
pkgs/development/mobile/androidenv/generated/system-images-android.nixnew file+547
@@ -0,0 +1,547 @@
1+
2+{fetchurl}:
3+
4+{
5+
6+
7+ "10".default."armeabi-v7a" = {
8+ name = "system-image-10-default-armeabi-v7a";
9+ path = "system-images/android-10/default/armeabi-v7a";
10+ revision = "10-default-armeabi-v7a";
11+ displayName = "ARM EABI v7a System Image";
12+ archives.all = fetchurl {
13+
14+ url =
15+ https://dl.google.com/android/repository/sys-img/android/armv7-10_r04.zip;
16+ sha1 = "54680383118eb5c95a11e1cc2a14aa572c86ee69";
17+
18+ };
19+ };
20+
21+
22+ "14".default."armeabi-v7a" = {
23+ name = "system-image-14-default-armeabi-v7a";
24+ path = "system-images/android-14/default/armeabi-v7a";
25+ revision = "14-default-armeabi-v7a";
26+ displayName = "ARM EABI v7a System Image";
27+ archives.all = fetchurl {
28+
29+ url =
30+ https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-14_r02.zip;
31+ sha1 = "d8991b0c06b18d7d6ed4169d67460ee1add6661b";
32+
33+ };
34+ };
35+
36+
37+ "15".default."armeabi-v7a" = {
38+ name = "system-image-15-default-armeabi-v7a";
39+ path = "system-images/android-15/default/armeabi-v7a";
40+ revision = "15-default-armeabi-v7a";
41+ displayName = "ARM EABI v7a System Image";
42+ archives.all = fetchurl {
43+
44+ url =
45+ https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-15_r04.zip;
46+ sha1 = "363223bd62f5afc0b2bd760b54ce9d26b31eacf1";
47+
48+ };
49+ };
50+
51+
52+ "16".default."armeabi-v7a" = {
53+ name = "system-image-16-default-armeabi-v7a";
54+ path = "system-images/android-16/default/armeabi-v7a";
55+ revision = "16-default-armeabi-v7a";
56+ displayName = "ARM EABI v7a System Image";
57+ archives.all = fetchurl {
58+
59+ url =
60+ https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-16_r04.zip;
61+ sha1 = "39c093ea755098f0ee79f607be7df9e54ba4943f";
62+
63+ };
64+ };
65+
66+
67+ "17".default."armeabi-v7a" = {
68+ name = "system-image-17-default-armeabi-v7a";
69+ path = "system-images/android-17/default/armeabi-v7a";
70+ revision = "17-default-armeabi-v7a";
71+ displayName = "ARM EABI v7a System Image";
72+ archives.all = fetchurl {
73+
74+ url =
75+ https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-17_r05.zip;
76+ sha1 = "7460e8110f4a87f9644f1bdb5511a66872d50fd9";
77+
78+ };
79+ };
80+
81+
82+ "18".default."armeabi-v7a" = {
83+ name = "system-image-18-default-armeabi-v7a";
84+ path = "system-images/android-18/default/armeabi-v7a";
85+ revision = "18-default-armeabi-v7a";
86+ displayName = "ARM EABI v7a System Image";
87+ archives.all = fetchurl {
88+
89+ url =
90+ https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-18_r04.zip;
91+ sha1 = "0bf34ecf4ddd53f6b1b7fe7dfa12f2887c17e642";
92+
93+ };
94+ };
95+
96+
97+ "19".default."armeabi-v7a" = {
98+ name = "system-image-19-default-armeabi-v7a";
99+ path = "system-images/android-19/default/armeabi-v7a";
100+ revision = "19-default-armeabi-v7a";
101+ displayName = "ARM EABI v7a System Image";
102+ archives.all = fetchurl {
103+
104+ url =
105+ https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-19_r05.zip;
106+ sha1 = "d1a5fd4f2e1c013c3d3d9bfe7e9db908c3ed56fa";
107+
108+ };
109+ };
110+
111+
112+ "21".default."armeabi-v7a" = {
113+ name = "system-image-21-default-armeabi-v7a";
114+ path = "system-images/android-21/default/armeabi-v7a";
115+ revision = "21-default-armeabi-v7a";
116+ displayName = "ARM EABI v7a System Image";
117+ archives.all = fetchurl {
118+
119+ url =
120+ https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-21_r04.zip;
121+ sha1 = "8c606f81306564b65e41303d2603e4c42ded0d10";
122+
123+ };
124+ };
125+
126+
127+ "22".default."armeabi-v7a" = {
128+ name = "system-image-22-default-armeabi-v7a";
129+ path = "system-images/android-22/default/armeabi-v7a";
130+ revision = "22-default-armeabi-v7a";
131+ displayName = "ARM EABI v7a System Image";
132+ archives.all = fetchurl {
133+
134+ url =
135+ https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-22_r02.zip;
136+ sha1 = "2114ec015dbf3a16cbcb4f63e8a84a1b206a07a1";
137+
138+ };
139+ };
140+
141+
142+ "23".default."armeabi-v7a" = {
143+ name = "system-image-23-default-armeabi-v7a";
144+ path = "system-images/android-23/default/armeabi-v7a";
145+ revision = "23-default-armeabi-v7a";
146+ displayName = "ARM EABI v7a System Image";
147+ archives.all = fetchurl {
148+
149+ url =
150+ https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-23_r06.zip;
151+ sha1 = "7cf2ad756e54a3acfd81064b63cb0cb9dff2798d";
152+
153+ };
154+ };
155+
156+
157+ "24".default."armeabi-v7a" = {
158+ name = "system-image-24-default-armeabi-v7a";
159+ path = "system-images/android-24/default/armeabi-v7a";
160+ revision = "24-default-armeabi-v7a";
161+ displayName = "ARM EABI v7a System Image";
162+ archives.all = fetchurl {
163+
164+ url =
165+ https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-24_r07.zip;
166+ sha1 = "3454546b4eed2d6c3dd06d47757d6da9f4176033";
167+
168+ };
169+ };
170+
171+
172+ "24".default."arm64-v8a" = {
173+ name = "system-image-24-default-arm64-v8a";
174+ path = "system-images/android-24/default/arm64-v8a";
175+ revision = "24-default-arm64-v8a";
176+ displayName = "ARM 64 v8a System Image";
177+ archives.all = fetchurl {
178+
179+ url =
180+ https://dl.google.com/android/repository/sys-img/android/arm64-v8a-24_r07.zip;
181+ sha1 = "e8ab2e49e4efe4b064232b33b5eeaded61437d7f";
182+
183+ };
184+ };
185+
186+
187+ "16".default."mips" = {
188+ name = "system-image-16-default-mips";
189+ path = "system-images/android-16/default/mips";
190+ revision = "16-default-mips";
191+ displayName = "MIPS System Image";
192+ archives.all = fetchurl {
193+
194+ url =
195+ https://dl.google.com/android/repository/sys-img/android/sysimg_mips-16_r04.zip;
196+ sha1 = "67943c54fb3943943ffeb05fdd39c0b753681f6e";
197+
198+ };
199+ };
200+
201+
202+ "17".default."mips" = {
203+ name = "system-image-17-default-mips";
204+ path = "system-images/android-17/default/mips";
205+ revision = "17-default-mips";
206+ displayName = "MIPS System Image";
207+ archives.all = fetchurl {
208+
209+ url =
210+ https://dl.google.com/android/repository/sys-img/android/sysimg_mips-17_r01.zip;
211+ sha1 = "f0c6e153bd584c29e51b5c9723cfbf30f996a05d";
212+
213+ };
214+ };
215+
216+
217+ "10".default."x86" = {
218+ name = "system-image-10-default-x86";
219+ path = "system-images/android-10/default/x86";
220+ revision = "10-default-x86";
221+ displayName = "Intel x86 Atom System Image";
222+ archives.all = fetchurl {
223+
224+ url =
225+ https://dl.google.com/android/repository/sys-img/android/x86-10_r04.zip;
226+ sha1 = "655ffc5cc89dd45a3aca154b254009016e473aeb";
227+
228+ };
229+ };
230+
231+
232+ "15".default."x86" = {
233+ name = "system-image-15-default-x86";
234+ path = "system-images/android-15/default/x86";
235+ revision = "15-default-x86";
236+ displayName = "Intel x86 Atom System Image";
237+ archives.all = fetchurl {
238+
239+ url =
240+ https://dl.google.com/android/repository/sys-img/android/x86-15_r04.zip;
241+ sha1 = "e45c728b64881c0e86529a8f7ea9c103a3cd14c1";
242+
243+ };
244+ };
245+
246+
247+ "16".default."x86" = {
248+ name = "system-image-16-default-x86";
249+ path = "system-images/android-16/default/x86";
250+ revision = "16-default-x86";
251+ displayName = "Intel x86 Atom System Image";
252+ archives.all = fetchurl {
253+
254+ url =
255+ https://dl.google.com/android/repository/sys-img/android/x86-16_r06.zip;
256+ sha1 = "bf1bf8c5591346118d2235da1ad20e7be8a3e9cd";
257+
258+ };
259+ };
260+
261+
262+ "17".default."x86" = {
263+ name = "system-image-17-default-x86";
264+ path = "system-images/android-17/default/x86";
265+ revision = "17-default-x86";
266+ displayName = "Intel x86 Atom System Image";
267+ archives.all = fetchurl {
268+
269+ url =
270+ https://dl.google.com/android/repository/sys-img/android/x86-17_r04.zip;
271+ sha1 = "03c6d022ab2dcbbcf655d78ba5ccb0431cadcaec";
272+
273+ };
274+ };
275+
276+
277+ "18".default."x86" = {
278+ name = "system-image-18-default-x86";
279+ path = "system-images/android-18/default/x86";
280+ revision = "18-default-x86";
281+ displayName = "Intel x86 Atom System Image";
282+ archives.all = fetchurl {
283+
284+ url =
285+ https://dl.google.com/android/repository/sys-img/android/x86-18_r03.zip;
286+ sha1 = "03a0cb23465c3de15215934a1dbc9715b56e9458";
287+
288+ };
289+ };
290+
291+
292+ "19".default."x86" = {
293+ name = "system-image-19-default-x86";
294+ path = "system-images/android-19/default/x86";
295+ revision = "19-default-x86";
296+ displayName = "Intel x86 Atom System Image";
297+ archives.all = fetchurl {
298+
299+ url =
300+ https://dl.google.com/android/repository/sys-img/android/x86-19_r06.zip;
301+ sha1 = "2ac82153aae97f7eae4c5a0761224fe04321d03d";
302+
303+ };
304+ };
305+
306+
307+ "21".default."x86" = {
308+ name = "system-image-21-default-x86";
309+ path = "system-images/android-21/default/x86";
310+ revision = "21-default-x86";
311+ displayName = "Intel x86 Atom System Image";
312+ archives.all = fetchurl {
313+
314+ url =
315+ https://dl.google.com/android/repository/sys-img/android/x86-21_r05.zip;
316+ sha1 = "00f0eb0a1003efe3316347f762e20a85d8749cff";
317+
318+ };
319+ };
320+
321+
322+ "22".default."x86" = {
323+ name = "system-image-22-default-x86";
324+ path = "system-images/android-22/default/x86";
325+ revision = "22-default-x86";
326+ displayName = "Intel x86 Atom System Image";
327+ archives.all = fetchurl {
328+
329+ url =
330+ https://dl.google.com/android/repository/sys-img/android/x86-22_r06.zip;
331+ sha1 = "e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e";
332+
333+ };
334+ };
335+
336+
337+ "23".default."x86" = {
338+ name = "system-image-23-default-x86";
339+ path = "system-images/android-23/default/x86";
340+ revision = "23-default-x86";
341+ displayName = "Intel x86 Atom System Image";
342+ archives.all = fetchurl {
343+
344+ url =
345+ https://dl.google.com/android/repository/sys-img/android/x86-23_r10.zip;
346+ sha1 = "f6c3e3dd7bd951454795aa75c3a145fd05ac25bb";
347+
348+ };
349+ };
350+
351+
352+ "24".default."x86" = {
353+ name = "system-image-24-default-x86";
354+ path = "system-images/android-24/default/x86";
355+ revision = "24-default-x86";
356+ displayName = "Intel x86 Atom System Image";
357+ archives.all = fetchurl {
358+
359+ url =
360+ https://dl.google.com/android/repository/sys-img/android/x86-24_r08.zip;
361+ sha1 = "c1cae7634b0216c0b5990f2c144eb8ca948e3511";
362+
363+ };
364+ };
365+
366+
367+ "25".default."x86" = {
368+ name = "system-image-25-default-x86";
369+ path = "system-images/android-25/default/x86";
370+ revision = "25-default-x86";
371+ displayName = "Intel x86 Atom System Image";
372+ archives.all = fetchurl {
373+
374+ url =
375+ https://dl.google.com/android/repository/sys-img/android/x86-25_r01.zip;
376+ sha1 = "78ce7eb1387d598685633b9f7cbb300c3d3aeb5f";
377+
378+ };
379+ };
380+
381+
382+ "26".default."x86" = {
383+ name = "system-image-26-default-x86";
384+ path = "system-images/android-26/default/x86";
385+ revision = "26-default-x86";
386+ displayName = "Intel x86 Atom System Image";
387+ archives.all = fetchurl {
388+
389+ url =
390+ https://dl.google.com/android/repository/sys-img/android/x86-26_r01.zip;
391+ sha1 = "e613d6e0da668e30daf547f3c6627a6352846f90";
392+
393+ };
394+ };
395+
396+
397+ "27".default."x86" = {
398+ name = "system-image-27-default-x86";
399+ path = "system-images/android-27/default/x86";
400+ revision = "27-default-x86";
401+ displayName = "Intel x86 Atom System Image";
402+ archives.all = fetchurl {
403+
404+ url =
405+ https://dl.google.com/android/repository/sys-img/android/x86-27_r01.zip;
406+ sha1 = "4ec990fac7b62958decd12e18a4cd389dfe7c582";
407+
408+ };
409+ };
410+
411+
412+ "28".default."x86" = {
413+ name = "system-image-28-default-x86";
414+ path = "system-images/android-28/default/x86";
415+ revision = "28-default-x86";
416+ displayName = "Intel x86 Atom System Image";
417+ archives.all = fetchurl {
418+
419+ url =
420+ https://dl.google.com/android/repository/sys-img/android/x86-28_r04.zip;
421+ sha1 = "ce03c42d80c0fc6dc47f6455dbee7aa275d02780";
422+
423+ };
424+ };
425+
426+
427+ "21".default."x86_64" = {
428+ name = "system-image-21-default-x86_64";
429+ path = "system-images/android-21/default/x86_64";
430+ revision = "21-default-x86_64";
431+ displayName = "Intel x86 Atom_64 System Image";
432+ archives.all = fetchurl {
433+
434+ url =
435+ https://dl.google.com/android/repository/sys-img/android/x86_64-21_r05.zip;
436+ sha1 = "9078a095825a69e5e215713f0866c83cef65a342";
437+
438+ };
439+ };
440+
441+
442+ "22".default."x86_64" = {
443+ name = "system-image-22-default-x86_64";
444+ path = "system-images/android-22/default/x86_64";
445+ revision = "22-default-x86_64";
446+ displayName = "Intel x86 Atom_64 System Image";
447+ archives.all = fetchurl {
448+
449+ url =
450+ https://dl.google.com/android/repository/sys-img/android/x86_64-22_r06.zip;
451+ sha1 = "5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4";
452+
453+ };
454+ };
455+
456+
457+ "23".default."x86_64" = {
458+ name = "system-image-23-default-x86_64";
459+ path = "system-images/android-23/default/x86_64";
460+ revision = "23-default-x86_64";
461+ displayName = "Intel x86 Atom_64 System Image";
462+ archives.all = fetchurl {
463+
464+ url =
465+ https://dl.google.com/android/repository/sys-img/android/x86_64-23_r10.zip;
466+ sha1 = "7cbc291483ca07dc67b71268c5f08a5755f50f51";
467+
468+ };
469+ };
470+
471+
472+ "24".default."x86_64" = {
473+ name = "system-image-24-default-x86_64";
474+ path = "system-images/android-24/default/x86_64";
475+ revision = "24-default-x86_64";
476+ displayName = "Intel x86 Atom_64 System Image";
477+ archives.all = fetchurl {
478+
479+ url =
480+ https://dl.google.com/android/repository/sys-img/android/x86_64-24_r08.zip;
481+ sha1 = "f6559e1949a5879f31a9662f4f0e50ad60181684";
482+
483+ };
484+ };
485+
486+
487+ "25".default."x86_64" = {
488+ name = "system-image-25-default-x86_64";
489+ path = "system-images/android-25/default/x86_64";
490+ revision = "25-default-x86_64";
491+ displayName = "Intel x86 Atom_64 System Image";
492+ archives.all = fetchurl {
493+
494+ url =
495+ https://dl.google.com/android/repository/sys-img/android/x86_64-25_r01.zip;
496+ sha1 = "7093d7b39216020226ff430a3b7b81c94d31ad37";
497+
498+ };
499+ };
500+
501+
502+ "26".default."x86_64" = {
503+ name = "system-image-26-default-x86_64";
504+ path = "system-images/android-26/default/x86_64";
505+ revision = "26-default-x86_64";
506+ displayName = "Intel x86 Atom_64 System Image";
507+ archives.all = fetchurl {
508+
509+ url =
510+ https://dl.google.com/android/repository/sys-img/android/x86_64-26_r01.zip;
511+ sha1 = "432f149c048bffce7f9de526ec65b336daf7a0a3";
512+
513+ };
514+ };
515+
516+
517+ "27".default."x86_64" = {
518+ name = "system-image-27-default-x86_64";
519+ path = "system-images/android-27/default/x86_64";
520+ revision = "27-default-x86_64";
521+ displayName = "Intel x86 Atom_64 System Image";
522+ archives.all = fetchurl {
523+
524+ url =
525+ https://dl.google.com/android/repository/sys-img/android/x86_64-27_r01.zip;
526+ sha1 = "2878261011a59ca3de29dc5b457a495fdb268d60";
527+
528+ };
529+ };
530+
531+
532+ "28".default."x86_64" = {
533+ name = "system-image-28-default-x86_64";
534+ path = "system-images/android-28/default/x86_64";
535+ revision = "28-default-x86_64";
536+ displayName = "Intel x86 Atom_64 System Image";
537+ archives.all = fetchurl {
538+
539+ url =
540+ https://dl.google.com/android/repository/sys-img/android/x86_64-28_r04.zip;
541+ sha1 = "d47a85c8f4e9fd57df97814ad8884eeb0f3a0ef0";
542+
543+ };
544+ };
545+
546+}
547+
pkgs/development/mobile/androidenv/generated/system-images-google_apis.nixnew file+502
@@ -0,0 +1,502 @@
1+
2+{fetchurl}:
3+
4+{
5+
6+
7+ "10".google_apis."armeabi-v7a" = {
8+ name = "system-image-10-google_apis-armeabi-v7a";
9+ path = "system-images/android-10/google_apis/armeabi-v7a";
10+ revision = "10-google_apis-armeabi-v7a";
11+ displayName = "Google APIs ARM EABI v7a System Image";
12+ archives.all = fetchurl {
13+
14+ url =
15+ https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-10_r05.zip;
16+ sha1 = "cb60221d4ff6686ae96560970d48d9aa60e80b3f";
17+
18+ };
19+ };
20+
21+
22+ "10".google_apis."x86" = {
23+ name = "system-image-10-google_apis-x86";
24+ path = "system-images/android-10/google_apis/x86";
25+ revision = "10-google_apis-x86";
26+ displayName = "Google APIs Intel x86 Atom System Image";
27+ archives.all = fetchurl {
28+
29+ url =
30+ https://dl.google.com/android/repository/sys-img/google_apis/x86-10_r05.zip;
31+ sha1 = "b8e8a4ab26890c4a395fb796bf9cb7ceb51c880e";
32+
33+ };
34+ };
35+
36+
37+ "15".google_apis."armeabi-v7a" = {
38+ name = "system-image-15-google_apis-armeabi-v7a";
39+ path = "system-images/android-15/google_apis/armeabi-v7a";
40+ revision = "15-google_apis-armeabi-v7a";
41+ displayName = "Google APIs ARM EABI v7a System Image";
42+ archives.all = fetchurl {
43+
44+ url =
45+ https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-15_r05.zip;
46+ sha1 = "1ec4e6f9014fcbe694511280f5b497aaf7dd750f";
47+
48+ };
49+ };
50+
51+
52+ "15".google_apis."x86" = {
53+ name = "system-image-15-google_apis-x86";
54+ path = "system-images/android-15/google_apis/x86";
55+ revision = "15-google_apis-x86";
56+ displayName = "Google APIs Intel x86 Atom System Image";
57+ archives.all = fetchurl {
58+
59+ url =
60+ https://dl.google.com/android/repository/sys-img/google_apis/x86-15_r05.zip;
61+ sha1 = "f2b98baaf847ff5b82b82fdc6c396b229067307b";
62+
63+ };
64+ };
65+
66+
67+ "16".google_apis."x86" = {
68+ name = "system-image-16-google_apis-x86";
69+ path = "system-images/android-16/google_apis/x86";
70+ revision = "16-google_apis-x86";
71+ displayName = "Google APIs Intel x86 Atom System Image";
72+ archives.all = fetchurl {
73+
74+ url =
75+ https://dl.google.com/android/repository/sys-img/google_apis/x86-16_r05.zip;
76+ sha1 = "7edc5c0836fa32f8d453788c002ca0ee1bc5a0a2";
77+
78+ };
79+ };
80+
81+
82+ "17".google_apis."armeabi-v7a" = {
83+ name = "system-image-17-google_apis-armeabi-v7a";
84+ path = "system-images/android-17/google_apis/armeabi-v7a";
85+ revision = "17-google_apis-armeabi-v7a";
86+ displayName = "Google APIs ARM EABI v7a System Image";
87+ archives.all = fetchurl {
88+
89+ url =
90+ https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-17_r05.zip;
91+ sha1 = "c990f2a81c24a61f9f1da5d5d205f2924ce548ae";
92+
93+ };
94+ };
95+
96+
97+ "17".google_apis."x86" = {
98+ name = "system-image-17-google_apis-x86";
99+ path = "system-images/android-17/google_apis/x86";
100+ revision = "17-google_apis-x86";
101+ displayName = "Google APIs Intel x86 Atom System Image";
102+ archives.all = fetchurl {
103+
104+ url =
105+ https://dl.google.com/android/repository/sys-img/google_apis/x86-17_r06.zip;
106+ sha1 = "7864c34faf0402b8923d8c6e609a5339f74cc8d6";
107+
108+ };
109+ };
110+
111+
112+ "18".google_apis."armeabi-v7a" = {
113+ name = "system-image-18-google_apis-armeabi-v7a";
114+ path = "system-images/android-18/google_apis/armeabi-v7a";
115+ revision = "18-google_apis-armeabi-v7a";
116+ displayName = "Google APIs ARM EABI v7a System Image";
117+ archives.all = fetchurl {
118+
119+ url =
120+ https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-18_r05.zip;
121+ sha1 = "c4e69a96d4584f7e311e358fe4ad0e5d1bf1605b";
122+
123+ };
124+ };
125+
126+
127+ "18".google_apis."x86" = {
128+ name = "system-image-18-google_apis-x86";
129+ path = "system-images/android-18/google_apis/x86";
130+ revision = "18-google_apis-x86";
131+ displayName = "Google APIs Intel x86 Atom System Image";
132+ archives.all = fetchurl {
133+
134+ url =
135+ https://dl.google.com/android/repository/sys-img/google_apis/x86-18_r05.zip;
136+ sha1 = "2b34741693eba9419cb6bf1a467596783234d37a";
137+
138+ };
139+ };
140+
141+
142+ "19".google_apis."x86" = {
143+ name = "system-image-19-google_apis-x86";
144+ path = "system-images/android-19/google_apis/x86";
145+ revision = "19-google_apis-x86";
146+ displayName = "Google APIs Intel x86 Atom System Image";
147+ archives.all = fetchurl {
148+
149+ url =
150+ https://dl.google.com/android/repository/sys-img/google_apis/x86-19_r37.zip;
151+ sha1 = "f02473420a166b3df7821d8ae5a623524058b4b8";
152+
153+ };
154+ };
155+
156+
157+ "19".google_apis."armeabi-v7a" = {
158+ name = "system-image-19-google_apis-armeabi-v7a";
159+ path = "system-images/android-19/google_apis/armeabi-v7a";
160+ revision = "19-google_apis-armeabi-v7a";
161+ displayName = "Google APIs ARM EABI v7a System Image";
162+ archives.all = fetchurl {
163+
164+ url =
165+ https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-19_r37.zip;
166+ sha1 = "b388072493ed010fe2ddf607c8c4239f54ce1a0b";
167+
168+ };
169+ };
170+
171+
172+ "21".google_apis."x86" = {
173+ name = "system-image-21-google_apis-x86";
174+ path = "system-images/android-21/google_apis/x86";
175+ revision = "21-google_apis-x86";
176+ displayName = "Google APIs Intel x86 Atom System Image";
177+ archives.all = fetchurl {
178+
179+ url =
180+ https://dl.google.com/android/repository/sys-img/google_apis/x86-21_r29.zip;
181+ sha1 = "1f5ac49e0ae603b0bfeda0c94cd7e0b850b9b50e";
182+
183+ };
184+ };
185+
186+
187+ "21".google_apis."x86_64" = {
188+ name = "system-image-21-google_apis-x86_64";
189+ path = "system-images/android-21/google_apis/x86_64";
190+ revision = "21-google_apis-x86_64";
191+ displayName = "Google APIs Intel x86 Atom_64 System Image";
192+ archives.all = fetchurl {
193+
194+ url =
195+ https://dl.google.com/android/repository/sys-img/google_apis/x86_64-21_r29.zip;
196+ sha1 = "74ac387aec286fcee01259dcccd4762cbdb4b517";
197+
198+ };
199+ };
200+
201+
202+ "21".google_apis."armeabi-v7a" = {
203+ name = "system-image-21-google_apis-armeabi-v7a";
204+ path = "system-images/android-21/google_apis/armeabi-v7a";
205+ revision = "21-google_apis-armeabi-v7a";
206+ displayName = "Google APIs ARM EABI v7a System Image";
207+ archives.all = fetchurl {
208+
209+ url =
210+ https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-21_r29.zip;
211+ sha1 = "1d0c428ac7f5eb49c7389ad0beb09f07cb989b45";
212+
213+ };
214+ };
215+
216+
217+ "22".google_apis."x86" = {
218+ name = "system-image-22-google_apis-x86";
219+ path = "system-images/android-22/google_apis/x86";
220+ revision = "22-google_apis-x86";
221+ displayName = "Google APIs Intel x86 Atom System Image";
222+ archives.all = fetchurl {
223+
224+ url =
225+ https://dl.google.com/android/repository/sys-img/google_apis/x86-22_r23.zip;
226+ sha1 = "4ceda9ffd69d5b827a8cc2f56ccac62e72982b33";
227+
228+ };
229+ };
230+
231+
232+ "22".google_apis."armeabi-v7a" = {
233+ name = "system-image-22-google_apis-armeabi-v7a";
234+ path = "system-images/android-22/google_apis/armeabi-v7a";
235+ revision = "22-google_apis-armeabi-v7a";
236+ displayName = "Google APIs ARM EABI v7a System Image";
237+ archives.all = fetchurl {
238+
239+ url =
240+ https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-22_r23.zip;
241+ sha1 = "0a11bdffa6132303baf87e4a531987a74d5f0792";
242+
243+ };
244+ };
245+
246+
247+ "22".google_apis."x86_64" = {
248+ name = "system-image-22-google_apis-x86_64";
249+ path = "system-images/android-22/google_apis/x86_64";
250+ revision = "22-google_apis-x86_64";
251+ displayName = "Google APIs Intel x86 Atom_64 System Image";
252+ archives.all = fetchurl {
253+
254+ url =
255+ https://dl.google.com/android/repository/sys-img/google_apis/x86_64-22_r23.zip;
256+ sha1 = "1dfee1c382574c18e3aa2bc2047793169f3ab125";
257+
258+ };
259+ };
260+
261+
262+ "23".google_apis."x86" = {
263+ name = "system-image-23-google_apis-x86";
264+ path = "system-images/android-23/google_apis/x86";
265+ revision = "23-google_apis-x86";
266+ displayName = "Google APIs Intel x86 Atom System Image";
267+ archives.all = fetchurl {
268+
269+ url =
270+ https://dl.google.com/android/repository/sys-img/google_apis/x86-23_r30.zip;
271+ sha1 = "1b8fd61e7e7c76d8c05a41b19370edfb015ed240";
272+
273+ };
274+ };
275+
276+
277+ "23".google_apis."x86_64" = {
278+ name = "system-image-23-google_apis-x86_64";
279+ path = "system-images/android-23/google_apis/x86_64";
280+ revision = "23-google_apis-x86_64";
281+ displayName = "Google APIs Intel x86 Atom_64 System Image";
282+ archives.all = fetchurl {
283+
284+ url =
285+ https://dl.google.com/android/repository/sys-img/google_apis/x86_64-23_r30.zip;
286+ sha1 = "69a17c23c4e05e81a2820fe49884807fcebba546";
287+
288+ };
289+ };
290+
291+
292+ "23".google_apis."armeabi-v7a" = {
293+ name = "system-image-23-google_apis-armeabi-v7a";
294+ path = "system-images/android-23/google_apis/armeabi-v7a";
295+ revision = "23-google_apis-armeabi-v7a";
296+ displayName = "Google APIs ARM EABI v7a System Image";
297+ archives.all = fetchurl {
298+
299+ url =
300+ https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-23_r30.zip;
301+ sha1 = "c3966e3a25623a915902d879f90f6d9253dbb619";
302+
303+ };
304+ };
305+
306+
307+ "24".google_apis."x86" = {
308+ name = "system-image-24-google_apis-x86";
309+ path = "system-images/android-24/google_apis/x86";
310+ revision = "24-google_apis-x86";
311+ displayName = "Google APIs Intel x86 Atom System Image";
312+ archives.all = fetchurl {
313+
314+ url =
315+ https://dl.google.com/android/repository/sys-img/google_apis/x86-24_r24.zip;
316+ sha1 = "7a1adb4aa13946830763644d014fc9c6cc1f921d";
317+
318+ };
319+ };
320+
321+
322+ "24".google_apis."x86_64" = {
323+ name = "system-image-24-google_apis-x86_64";
324+ path = "system-images/android-24/google_apis/x86_64";
325+ revision = "24-google_apis-x86_64";
326+ displayName = "Google APIs Intel x86 Atom_64 System Image";
327+ archives.all = fetchurl {
328+
329+ url =
330+ https://dl.google.com/android/repository/sys-img/google_apis/x86_64-24_r24.zip;
331+ sha1 = "53b26e8868c7cd27dda31c71ee2bcf999d6b9ce2";
332+
333+ };
334+ };
335+
336+
337+ "24".google_apis."armeabi-v7a" = {
338+ name = "system-image-24-google_apis-armeabi-v7a";
339+ path = "system-images/android-24/google_apis/armeabi-v7a";
340+ revision = "24-google_apis-armeabi-v7a";
341+ displayName = "Google APIs ARM EABI v7a System Image";
342+ archives.all = fetchurl {
343+
344+ url =
345+ https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-24_r24.zip;
346+ sha1 = "85068d55673bbf9417db8d70107ceed0952b5a28";
347+
348+ };
349+ };
350+
351+
352+ "24".google_apis."arm64-v8a" = {
353+ name = "system-image-24-google_apis-arm64-v8a";
354+ path = "system-images/android-24/google_apis/arm64-v8a";
355+ revision = "24-google_apis-arm64-v8a";
356+ displayName = "Google APIs ARM 64 v8a System Image";
357+ archives.all = fetchurl {
358+
359+ url =
360+ https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-24_r24.zip;
361+ sha1 = "93ab33d90fcdbb30ca2e927cd3eea447e933dfd9";
362+
363+ };
364+ };
365+
366+
367+ "25".google_apis."x86" = {
368+ name = "system-image-25-google_apis-x86";
369+ path = "system-images/android-25/google_apis/x86";
370+ revision = "25-google_apis-x86";
371+ displayName = "Google APIs Intel x86 Atom System Image";
372+ archives.all = fetchurl {
373+
374+ url =
375+ https://dl.google.com/android/repository/sys-img/google_apis/x86-25_r15.zip;
376+ sha1 = "5948473077341265a0b21a53a7e0afc2f980187c";
377+
378+ };
379+ };
380+
381+
382+ "25".google_apis."x86_64" = {
383+ name = "system-image-25-google_apis-x86_64";
384+ path = "system-images/android-25/google_apis/x86_64";
385+ revision = "25-google_apis-x86_64";
386+ displayName = "Google APIs Intel x86 Atom_64 System Image";
387+ archives.all = fetchurl {
388+
389+ url =
390+ https://dl.google.com/android/repository/sys-img/google_apis/x86_64-25_r15.zip;
391+ sha1 = "5a81fc218a7fe82cc6af01f7fae54a8000900443";
392+
393+ };
394+ };
395+
396+
397+ "25".google_apis."armeabi-v7a" = {
398+ name = "system-image-25-google_apis-armeabi-v7a";
399+ path = "system-images/android-25/google_apis/armeabi-v7a";
400+ revision = "25-google_apis-armeabi-v7a";
401+ displayName = "Google APIs ARM EABI v7a System Image";
402+ archives.all = fetchurl {
403+
404+ url =
405+ https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-25_r15.zip;
406+ sha1 = "813e25f9a5f6d775670ed6c5e67a39bffa1411bf";
407+
408+ };
409+ };
410+
411+
412+ "25".google_apis."arm64-v8a" = {
413+ name = "system-image-25-google_apis-arm64-v8a";
414+ path = "system-images/android-25/google_apis/arm64-v8a";
415+ revision = "25-google_apis-arm64-v8a";
416+ displayName = "Google APIs ARM 64 v8a System Image";
417+ archives.all = fetchurl {
418+
419+ url =
420+ https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-25_r15.zip;
421+ sha1 = "c3049e32f031140757f71acb5b8f0179e6f27303";
422+
423+ };
424+ };
425+
426+
427+ "26".google_apis."x86" = {
428+ name = "system-image-26-google_apis-x86";
429+ path = "system-images/android-26/google_apis/x86";
430+ revision = "26-google_apis-x86";
431+ displayName = "Google APIs Intel x86 Atom System Image";
432+ archives.all = fetchurl {
433+
434+ url =
435+ https://dl.google.com/android/repository/sys-img/google_apis/x86-26_r12.zip;
436+ sha1 = "167c83bcfd87127c7376ce986b34701f74fe87ff";
437+
438+ };
439+ };
440+
441+
442+ "26".google_apis."x86_64" = {
443+ name = "system-image-26-google_apis-x86_64";
444+ path = "system-images/android-26/google_apis/x86_64";
445+ revision = "26-google_apis-x86_64";
446+ displayName = "Google APIs Intel x86 Atom_64 System Image";
447+ archives.all = fetchurl {
448+
449+ url =
450+ https://dl.google.com/android/repository/sys-img/google_apis/x86_64-26_r12.zip;
451+ sha1 = "fcd46121c3486e2a759d0707c015e0b12bbab9db";
452+
453+ };
454+ };
455+
456+
457+ "27".google_apis."x86" = {
458+ name = "system-image-27-google_apis-x86";
459+ path = "system-images/android-27/google_apis/x86";
460+ revision = "27-google_apis-x86";
461+ displayName = "Google APIs Intel x86 Atom System Image";
462+ archives.all = fetchurl {
463+
464+ url =
465+ https://dl.google.com/android/repository/sys-img/google_apis/x86-27_r08.zip;
466+ sha1 = "623ee2638713b7dfde8044c91280c2afad5a1ade";
467+
468+ };
469+ };
470+
471+
472+ "28".google_apis."x86" = {
473+ name = "system-image-28-google_apis-x86";
474+ path = "system-images/android-28/google_apis/x86";
475+ revision = "28-google_apis-x86";
476+ displayName = "Google APIs Intel x86 Atom System Image";
477+ archives.all = fetchurl {
478+
479+ url =
480+ https://dl.google.com/android/repository/sys-img/google_apis/x86-28_r07.zip;
481+ sha1 = "fe5d58355545ae82b0e6a55adc1d41573ac7dec1";
482+
483+ };
484+ };
485+
486+
487+ "28".google_apis."x86_64" = {
488+ name = "system-image-28-google_apis-x86_64";
489+ path = "system-images/android-28/google_apis/x86_64";
490+ revision = "28-google_apis-x86_64";
491+ displayName = "Google APIs Intel x86 Atom_64 System Image";
492+ archives.all = fetchurl {
493+
494+ url =
495+ https://dl.google.com/android/repository/sys-img/google_apis/x86_64-28_r07.zip;
496+ sha1 = "068468683a56725326f741f75b6913ee1e7955ff";
497+
498+ };
499+ };
500+
501+}
502+
pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nixnew file+97
@@ -0,0 +1,97 @@
1+
2+{fetchurl}:
3+
4+{
5+
6+
7+ "24".google_apis_playstore."x86" = {
8+ name = "system-image-24-google_apis_playstore-x86";
9+ path = "system-images/android-24/google_apis_playstore/x86";
10+ revision = "24-google_apis_playstore-x86";
11+ displayName = "Google Play Intel x86 Atom System Image";
12+ archives.all = fetchurl {
13+
14+ url =
15+ https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-24_r19.zip;
16+ sha1 = "b52e9593ffdde65c1a0970256a32e8967c89cc22";
17+
18+ };
19+ };
20+
21+
22+ "25".google_apis_playstore."x86" = {
23+ name = "system-image-25-google_apis_playstore-x86";
24+ path = "system-images/android-25/google_apis_playstore/x86";
25+ revision = "25-google_apis_playstore-x86";
26+ displayName = "Google Play Intel x86 Atom System Image";
27+ archives.all = fetchurl {
28+
29+ url =
30+ https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-25_r09.zip;
31+ sha1 = "6f6668954f7fd52f896fe7528aa122028c9b026c";
32+
33+ };
34+ };
35+
36+
37+ "26".google_apis_playstore."x86" = {
38+ name = "system-image-26-google_apis_playstore-x86";
39+ path = "system-images/android-26/google_apis_playstore/x86";
40+ revision = "26-google_apis_playstore-x86";
41+ displayName = "Google Play Intel x86 Atom System Image";
42+ archives.all = fetchurl {
43+
44+ url =
45+ https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-26_r07.zip;
46+ sha1 = "2c8bee7b97a309f099941532e63c42a7d4a06e19";
47+
48+ };
49+ };
50+
51+
52+ "27".google_apis_playstore."x86" = {
53+ name = "system-image-27-google_apis_playstore-x86";
54+ path = "system-images/android-27/google_apis_playstore/x86";
55+ revision = "27-google_apis_playstore-x86";
56+ displayName = "Google Play Intel x86 Atom System Image";
57+ archives.all = fetchurl {
58+
59+ url =
60+ https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-27_r03.zip;
61+ sha1 = "eb5a944ceb691ca0648d0a6f0d93893a47223b5d";
62+
63+ };
64+ };
65+
66+
67+ "28".google_apis_playstore."x86" = {
68+ name = "system-image-28-google_apis_playstore-x86";
69+ path = "system-images/android-28/google_apis_playstore/x86";
70+ revision = "28-google_apis_playstore-x86";
71+ displayName = "Google Play Intel x86 Atom System Image";
72+ archives.all = fetchurl {
73+
74+ url =
75+ https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-28_r05.zip;
76+ sha1 = "4c570d259e93b0b27f97bad1aca2ac47f1e9b51a";
77+
78+ };
79+ };
80+
81+
82+ "28".google_apis_playstore."x86_64" = {
83+ name = "system-image-28-google_apis_playstore-x86_64";
84+ path = "system-images/android-28/google_apis_playstore/x86_64";
85+ revision = "28-google_apis_playstore-x86_64";
86+ displayName = "Google Play Intel x86 Atom_64 System Image";
87+ archives.all = fetchurl {
88+
89+ url =
90+ https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-28_r05.zip;
91+ sha1 = "5f6b238e4c7de41fd2a1c66841093bcf517255a1";
92+
93+ };
94+ };
95+
96+}
97+
pkgs/development/mobile/androidenv/lldb.nixnew file+12
@@ -0,0 +1,12 @@
1+{deployAndroidPackage, lib, package, os, autoPatchelfHook, pkgs}:
2+
3+deployAndroidPackage {
4+ inherit package os;
5+ buildInputs = [ autoPatchelfHook ]
6+ ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.zlib pkgs.openssl.out pkgs.ncurses5 ];
7+ patchInstructions = lib.optionalString (os == "linux") ''
8+ addAutoPatchelfSearchPath $packageBaseDir/lib
9+ autoPatchelf $packageBaseDir/lib
10+ autoPatchelf $packageBaseDir/bin
11+ '';
12+}
pkgs/development/mobile/androidenv/make-standalone-toolchain_r10e.patchdeleted−13
@@ -1,13 +0,0 @@
1−diff -ru android-ndk-r10c.old/build/tools/make-standalone-toolchain.sh android-ndk-r10c/build/tools/make-standalone-toolchain.sh
2−--- android-ndk-r10c.old/build/tools/make-standalone-toolchain.sh 2014-10-16 03:46:32.000000000 +0200
3−+++ android-ndk-r10c/build/tools/make-standalone-toolchain.sh 2014-10-24 23:46:22.544928306 +0200
4−@@ -310,6 +310,9 @@
5− # Now copy the GCC toolchain prebuilt binaries
6− run copy_directory "$TOOLCHAIN_PATH" "$TMPDIR"
7−
8−+# Making it writable again
9−+chmod -R +w "$TMPDIR"
10−+
11− # Replace soft-link mcld by real file
12− ALL_LDS=`find $TMPDIR -name "*mcld"`
13− for LD in $ALL_LDS; do
pkgs/development/mobile/androidenv/make-standalone-toolchain_r8e.patchdeleted−13
@@ -1,13 +0,0 @@
1−diff -ru android-ndk-r8e.old/build/tools/make-standalone-toolchain.sh android-ndk-r8e/build/tools/make-standalone-toolchain.sh
2−--- android-ndk-r8e.old/build/tools/make-standalone-toolchain.sh 2014-10-16 03:46:32.000000000 +0200
3−+++ android-ndk-r8e/build/tools/make-standalone-toolchain.sh 2014-10-24 23:46:22.544928306 +0200
4−@@ -194,6 +194,9 @@
5− # Now copy the GCC toolchain prebuilt binaries
6− run copy_directory "$TOOLCHAIN_PATH" "$TMPDIR"
7−
8−+# Making it writable again
9−+chmod -R +w "$TMPDIR"
10−+
11− if [ -n "$LLVM_VERSION" ]; then
12− # Copy the clang/llvm toolchain prebuilt binaries
13− run copy_directory "$LLVM_TOOLCHAIN_PATH" "$TMPDIR"
pkgs/development/mobile/androidenv/make_standalone_toolchain.py_16b.patchdeleted−119
@@ -1,119 +0,0 @@
1−diff --git a/build/tools/make_standalone_toolchain.py b/build/tools/make_standalone_toolchain.py
2−index a6ae8448..2739912e 100755
3−--- a/build/tools/make_standalone_toolchain.py
4−+++ b/build/tools/make_standalone_toolchain.py
5−@@ -398,7 +398,9 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
6− sysroot_path, stl, host_tag):
7− """Create a standalone toolchain."""
8− copy_directory_contents(gcc_path, install_path)
9−+ os.system('chmod -R +w "{}"'.format(install_path))
10− copy_directory_contents(clang_path, install_path)
11−+ os.system('chmod -R +w "{}"'.format(install_path))
12− triple = get_triple(arch)
13− make_clang_scripts(
14− install_path, triple, api, host_tag.startswith('windows'))
15−@@ -406,23 +408,28 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
16− sysroot = os.path.join(NDK_DIR, 'sysroot')
17− install_sysroot = os.path.join(install_path, 'sysroot')
18− shutil.copytree(sysroot, install_sysroot)
19−+ os.system('chmod -R +w "{}"'.format(install_path))
20−
21− arch_headers = os.path.join(sysroot, 'usr/include', triple)
22− copy_directory_contents(
23− arch_headers, os.path.join(install_sysroot, 'usr/include'))
24−+ os.system('chmod -R +w "{}"'.format(install_path))
25−
26− lib_path = os.path.join(sysroot_path, 'usr/lib')
27− lib_install = os.path.join(install_sysroot, 'usr/lib')
28− if os.path.exists(lib_path):
29− shutil.copytree(lib_path, lib_install)
30−+ os.system('chmod -R +w "{}"'.format(install_path))
31−
32− lib64_path = os.path.join(sysroot_path, 'usr/lib64')
33− lib64_install = os.path.join(install_sysroot, 'usr/lib64')
34− if os.path.exists(lib64_path):
35− shutil.copytree(lib64_path, lib64_install)
36−+ os.system('chmod -R +w "{}"'.format(install_path))
37−
38− prebuilt_path = os.path.join(NDK_DIR, 'prebuilt', host_tag)
39− copy_directory_contents(prebuilt_path, install_path)
40−+ os.system('chmod -R +w "{}"'.format(install_path))
41−
42− toolchain_lib_dir = os.path.join(gcc_path, 'lib/gcc', triple)
43− dirs = os.listdir(toolchain_lib_dir)
44−@@ -444,29 +451,37 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
45− if stl == 'gnustl':
46− gnustl_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/gnu-libstdc++/4.9')
47− shutil.copytree(os.path.join(gnustl_dir, 'include'), cxx_headers)
48−+ os.system('chmod -R +w "{}"'.format(install_path))
49−
50− for abi in get_abis(arch):
51− copy_gnustl_abi_headers(gnustl_dir, install_path, gcc_ver, triple,
52− abi)
53−+ os.system('chmod -R +w "{}"'.format(install_path))
54− copy_gnustl_libs(gnustl_dir, install_path, triple, abi)
55−+ os.system('chmod -R +w "{}"'.format(install_path))
56− if arch == 'arm':
57− copy_gnustl_abi_headers(gnustl_dir, install_path, gcc_ver,
58− triple, abi, thumb=True)
59−+ os.system('chmod -R +w "{}"'.format(install_path))
60− copy_gnustl_libs(gnustl_dir, install_path, triple, abi,
61− thumb=True)
62−+ os.system('chmod -R +w "{}"'.format(install_path))
63− elif stl == 'libc++':
64− libcxx_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/llvm-libc++')
65− libcxxabi_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/llvm-libc++abi')
66− support_dir = os.path.join(NDK_DIR, 'sources/android/support')
67− copy_directory_contents(os.path.join(libcxx_dir, 'include'),
68− cxx_headers)
69−+ os.system('chmod -R +w "{}"'.format(install_path))
70− copy_directory_contents(os.path.join(support_dir, 'include'),
71− support_headers)
72−+ os.system('chmod -R +w "{}"'.format(install_path))
73−
74− # I have no idea why we need this, but the old one does it too.
75− copy_directory_contents(
76− os.path.join(libcxxabi_dir, 'include'),
77− os.path.join(install_path, 'include/llvm-libc++abi/include'))
78−+ os.system('chmod -R +w "{}"'.format(install_path))
79−
80− headers = [
81− 'cxxabi.h',
82−@@ -482,21 +497,25 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
83− dest_libdir = get_dest_libdir(install_path, triple, abi)
84− include_libunwind = arch == 'arm'
85− copy_libcxx_libs(src_libdir, dest_libdir, include_libunwind)
86−+ os.system('chmod -R +w "{}"'.format(install_path))
87− if arch == 'arm':
88− thumb_libdir = os.path.join(dest_libdir, 'thumb')
89− copy_libcxx_libs(src_libdir, thumb_libdir, include_libunwind)
90−+ os.system('chmod -R +w "{}"'.format(install_path))
91− elif stl == 'stlport':
92− stlport_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/stlport')
93− gabixx_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/gabi++')
94−
95− copy_directory_contents(
96− os.path.join(stlport_dir, 'stlport'), cxx_headers)
97−+ os.system('chmod -R +w "{}"'.format(install_path))
98−
99− # Same as for libc++. Not sure why we have this extra directory, but
100− # keep the cruft for diff.
101− copy_directory_contents(
102− os.path.join(gabixx_dir, 'include'),
103− os.path.join(install_path, 'include/gabi++/include'))
104−+ os.system('chmod -R +w "{}"'.format(install_path))
105−
106− headers = [
107− 'cxxabi.h',
108−@@ -512,9 +531,11 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
109−
110− for abi in get_abis(arch):
111− copy_stlport_libs(stlport_dir, install_path, triple, abi)
112−+ os.system('chmod -R +w "{}"'.format(install_path))
113− if arch == 'arm':
114− copy_stlport_libs(stlport_dir, install_path, triple, abi,
115− thumb=True)
116−+ os.system('chmod -R +w "{}"'.format(install_path))
117− else:
118− raise ValueError(stl)
119−
pkgs/development/mobile/androidenv/make_standalone_toolchain.py_17c.patchdeleted−119
@@ -1,119 +0,0 @@
1−diff --git a/build/tools/make_standalone_toolchain.py b/build/tools/make_standalone_toolchain.py
2−index daba3351..424b7fef 100755
3−--- a/build/tools/make_standalone_toolchain.py
4−+++ b/build/tools/make_standalone_toolchain.py
5−@@ -421,7 +421,9 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
6− platforms_path, stl, host_tag):
7− """Create a standalone toolchain."""
8− copy_directory_contents(gcc_path, install_path)
9−+ os.system('chmod -R +w "{}"'.format(install_path))
10− copy_directory_contents(clang_path, install_path)
11−+ os.system('chmod -R +w "{}"'.format(install_path))
12− triple = get_triple(arch)
13− make_clang_scripts(
14− install_path, triple, api, host_tag.startswith('windows'))
15−@@ -432,9 +434,11 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
16− install_headers = os.path.join(install_sysroot, 'usr/include')
17− os.makedirs(os.path.dirname(install_headers))
18− shutil.copytree(headers, install_headers)
19−+ os.system('chmod -R +w "{}"'.format(install_path))
20−
21− arch_headers = os.path.join(sysroot, 'usr/include', triple)
22− copy_directory_contents(arch_headers, os.path.join(install_headers))
23−+ os.system('chmod -R +w "{}"'.format(install_path))
24−
25− for lib_suffix in ('', '64'):
26− lib_path = os.path.join(platforms_path, 'usr/lib{}'.format(lib_suffix))
27−@@ -442,20 +446,24 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
28− install_sysroot, 'usr/lib{}'.format(lib_suffix))
29− if os.path.exists(lib_path):
30− shutil.copytree(lib_path, lib_install)
31−+ os.system('chmod -R +w "{}"'.format(install_path))
32−
33− static_lib_path = os.path.join(sysroot, 'usr/lib', triple)
34− static_lib_install = os.path.join(install_sysroot, 'usr/lib')
35− if arch == 'x86_64':
36− static_lib_install += '64'
37− copy_directory_contents(static_lib_path, static_lib_install)
38−+ os.system('chmod -R +w "{}"'.format(install_path))
39−
40− prebuilt_path = os.path.join(NDK_DIR, 'prebuilt', host_tag)
41− copy_directory_contents(prebuilt_path, install_path)
42−+ os.system('chmod -R +w "{}"'.format(install_path))
43−
44− gdbserver_path = os.path.join(
45− NDK_DIR, 'prebuilt', 'android-' + arch, 'gdbserver')
46− gdbserver_install = os.path.join(install_path, 'share', 'gdbserver')
47− shutil.copytree(gdbserver_path, gdbserver_install)
48−+ os.system('chmod -R +w "{}"'.format(install_path))
49−
50− toolchain_lib_dir = os.path.join(gcc_path, 'lib/gcc', triple)
51− dirs = os.listdir(toolchain_lib_dir)
52−@@ -481,26 +489,33 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
53− for abi in get_abis(arch):
54− copy_gnustl_abi_headers(gnustl_dir, install_path, gcc_ver, triple,
55− abi)
56−+ os.system('chmod -R +w "{}"'.format(install_path))
57− copy_gnustl_libs(gnustl_dir, install_path, triple, abi)
58−+ os.system('chmod -R +w "{}"'.format(install_path))
59− if arch == 'arm':
60− copy_gnustl_abi_headers(gnustl_dir, install_path, gcc_ver,
61− triple, abi, thumb=True)
62−+ os.system('chmod -R +w "{}"'.format(install_path))
63− copy_gnustl_libs(gnustl_dir, install_path, triple, abi,
64− thumb=True)
65−+ os.system('chmod -R +w "{}"'.format(install_path))
66− elif stl == 'libc++':
67− libcxx_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/llvm-libc++')
68− libcxxabi_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/llvm-libc++abi')
69− copy_directory_contents(os.path.join(libcxx_dir, 'include'),
70− cxx_headers)
71−+ os.system('chmod -R +w "{}"'.format(install_path))
72− if api < 21:
73− support_dir = os.path.join(NDK_DIR, 'sources/android/support')
74− copy_directory_contents(os.path.join(support_dir, 'include'),
75− support_headers)
76−+ os.system('chmod -R +w "{}"'.format(install_path))
77−
78− # I have no idea why we need this, but the old one does it too.
79− copy_directory_contents(
80− os.path.join(libcxxabi_dir, 'include'),
81− os.path.join(install_path, 'include/llvm-libc++abi/include'))
82−+ os.system('chmod -R +w "{}"'.format(install_path))
83−
84− headers = [
85− 'cxxabi.h',
86−@@ -515,21 +530,25 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
87− src_libdir = get_src_libdir(libcxx_dir, abi)
88− dest_libdir = get_dest_libdir(install_path, triple, abi)
89− copy_libcxx_libs(src_libdir, dest_libdir, abi, api)
90−+ os.system('chmod -R +w "{}"'.format(install_path))
91− if arch == 'arm':
92− thumb_libdir = os.path.join(dest_libdir, 'thumb')
93− copy_libcxx_libs(src_libdir, thumb_libdir, abi, api)
94−+ os.system('chmod -R +w "{}"'.format(install_path))
95− elif stl == 'stlport':
96− stlport_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/stlport')
97− gabixx_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/gabi++')
98−
99− copy_directory_contents(
100− os.path.join(stlport_dir, 'stlport'), cxx_headers)
101−+ os.system('chmod -R +w "{}"'.format(install_path))
102−
103− # Same as for libc++. Not sure why we have this extra directory, but
104− # keep the cruft for diff.
105− copy_directory_contents(
106− os.path.join(gabixx_dir, 'include'),
107− os.path.join(install_path, 'include/gabi++/include'))
108−+ os.system('chmod -R +w "{}"'.format(install_path))
109−
110− headers = [
111− 'cxxabi.h',
112−@@ -548,6 +567,7 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
113− if arch == 'arm':
114− copy_stlport_libs(stlport_dir, install_path, triple, abi,
115− thumb=True)
116−+ os.system('chmod -R +w "{}"'.format(install_path))
117− else:
118− raise ValueError(stl)
119−
pkgs/development/mobile/androidenv/ndk-bundle/default.nixnew file+51
@@ -0,0 +1,51 @@
1+{deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, platform-tools}:
2+
3+let
4+ 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";
5+in
6+deployAndroidPackage {
7+ inherit package os;
8+ buildInputs = [ autoPatchelfHook makeWrapper pkgs.python2 ]
9+ ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.ncurses5 pkgs.zlib pkgs.libcxx.out ];
10+ patchInstructions = lib.optionalString (os == "linux") ''
11+ patchShebangs .
12+
13+ patch -p1 \
14+ --no-backup-if-mismatch < ${./make_standalone_toolchain.py_18.patch}
15+ wrapProgram $(pwd)/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}"
16+
17+ # TODO: allow this stuff
18+ rm -rf docs tests
19+
20+ # Patch the executables of the toolchains, but not the libraries -- they are needed for crosscompiling
21+
22+ addAutoPatchelfSearchPath $out/libexec/android-sdk/ndk-bundle/toolchains/renderscript/prebuilt/linux-x86_64/lib64
23+ find toolchains -type d -name bin | while read dir
24+ do
25+ autoPatchelf "$dir"
26+ done
27+
28+ # fix ineffective PROGDIR / MYNDKDIR determination
29+ for i in ndk-build
30+ do
31+ sed -i -e 's|^PROGDIR=`dirname $0`|PROGDIR=`dirname $(readlink -f $(which $0))`|' $i
32+ done
33+
34+ # Patch executables
35+ autoPatchelf prebuilt/linux-x86_64
36+
37+ # wrap
38+ for i in ndk-build
39+ do
40+ wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}"
41+ done
42+
43+ # make some executables available in PATH
44+ mkdir -p $out/bin
45+ for i in ndk-build
46+ do
47+ ln -sf ../../libexec/android-sdk/ndk-bundle/$i $out/bin/$i
48+ done
49+ '';
50+ noAuditTmpdir = true; # Audit script gets invoked by the build/ component in the path for the make standalone script
51+}
pkgs/development/mobile/androidenv/ndk-bundle/make_standalone_toolchain.py_18.patchnew file+44
@@ -0,0 +1,44 @@
1+diff -Naur android-ndk-r18b/build/tools/make_standalone_toolchain.py android-ndk-r18b-new/build/tools/make_standalone_toolchain.py
2+--- android-ndk-r18b/build/tools/make_standalone_toolchain.py 2018-10-11 12:49:38.000000000 +0200
3++++ android-ndk-r18b-new/build/tools/make_standalone_toolchain.py 2018-11-20 21:55:52.689991420 +0100
4+@@ -30,7 +30,7 @@
5+ import sys
6+ import tempfile
7+ import textwrap
8+-
9++import subprocess
10+
11+ THIS_DIR = os.path.realpath(os.path.dirname(__file__))
12+ NDK_DIR = os.path.realpath(os.path.join(THIS_DIR, '../..'))
13+@@ -173,6 +173,7 @@
14+ logger().debug('Copying %s', src_file)
15+ shutil.copy2(src_file, dst_dir)
16+
17++ subprocess.check_call(["chmod", "-R", "+w", dst])
18+
19+ def make_clang_scripts(install_dir, triple, api, windows):
20+ """Creates Clang wrapper scripts.
21+@@ -365,6 +366,7 @@
22+ install_headers = os.path.join(install_sysroot, 'usr/include')
23+ os.makedirs(os.path.dirname(install_headers))
24+ shutil.copytree(headers, install_headers)
25++ subprocess.check_call(["chmod", "-R", "+w", install_path])
26+
27+ arch_headers = os.path.join(sysroot, 'usr/include', triple)
28+ copy_directory_contents(arch_headers, os.path.join(install_headers))
29+@@ -375,6 +377,7 @@
30+ install_sysroot, 'usr/lib{}'.format(lib_suffix))
31+ if os.path.exists(lib_path):
32+ shutil.copytree(lib_path, lib_install)
33++ subprocess.check_call(["chmod", "-R", "+w", install_path])
34+
35+ static_lib_path = os.path.join(sysroot, 'usr/lib', triple)
36+ static_lib_install = os.path.join(install_sysroot, 'usr/lib')
37+@@ -389,6 +392,7 @@
38+ NDK_DIR, 'prebuilt', 'android-' + arch, 'gdbserver')
39+ gdbserver_install = os.path.join(install_path, 'share', 'gdbserver')
40+ shutil.copytree(gdbserver_path, gdbserver_install)
41++ subprocess.check_call(["chmod", "-R", "+w", install_path])
42+
43+ toolchain_lib_dir = os.path.join(gcc_path, 'lib/gcc', triple)
44+ dirs = os.listdir(toolchain_lib_dir)
pkgs/development/mobile/androidenv/platform-tools.nix+12−44

This diff is too big to show here.

pkgs/development/mobile/androidenv/platforms-linux.nixdeleted−343

This diff is too big to show here.

pkgs/development/mobile/androidenv/platforms-macosx.nixdeleted−343

This diff is too big to show here.

pkgs/development/mobile/androidenv/querypackages.shnew file+27

This diff is too big to show here.

pkgs/development/mobile/androidenv/repository-11.xmldeleted−2834

This diff is too big to show here.

pkgs/development/mobile/androidenv/sources.nixdeleted−184

This diff is too big to show here.

pkgs/development/mobile/androidenv/support-repository.nixdeleted−18

This diff is too big to show here.

pkgs/development/mobile/androidenv/support.nixdeleted−18

This diff is too big to show here.

pkgs/development/mobile/androidenv/sys-img.xmldeleted−1026

This diff is too big to show here.

pkgs/development/mobile/androidenv/sysimages.nixdeleted−305

This diff is too big to show here.

pkgs/development/mobile/androidenv/tools.nixnew file+26

This diff is too big to show here.

pkgs/development/mobile/androidenv/tools/25.nixnew file+62

This diff is too big to show here.

pkgs/development/mobile/androidenv/tools/26.nixnew file+40

This diff is too big to show here.

pkgs/development/mobile/flashtool/default.nix+3−3

This diff is too big to show here.

pkgs/development/mobile/titaniumenv/build-app.nix+146−165

This diff is too big to show here.

pkgs/development/mobile/titaniumenv/default.nix+8−16

This diff is too big to show here.

pkgs/development/mobile/titaniumenv/examples/default.nixdeleted−91

This diff is too big to show here.

pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nixdeleted−10

This diff is too big to show here.

pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nixdeleted−44

This diff is too big to show here.

pkgs/development/mobile/titaniumenv/examples/kitchensink/generatekeystore.shdeleted−10

This diff is too big to show here.

pkgs/development/mobile/titaniumenv/examples/kitchensink/keystoredeleted

Binary file not shown.

pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nixdeleted−7

This diff is too big to show here.

pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nixdeleted−43

This diff is too big to show here.

pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix+6−6

This diff is too big to show here.

pkgs/development/mobile/xcodeenv/build-app.nix+52−49

This diff is too big to show here.

pkgs/development/mobile/xcodeenv/xcodewrapper.nix → pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nixrenamed+5−1

This diff is too big to show here.

pkgs/development/mobile/xcodeenv/default.nix+5−5

This diff is too big to show here.

pkgs/development/mobile/xcodeenv/install.html.template+3−3

This diff is too big to show here.

pkgs/development/mobile/xcodeenv/simulate-app.nix+35−26

This diff is too big to show here.

pkgs/development/ocaml-modules/cmdliner/default.nix+2−2

This diff is too big to show here.

pkgs/development/ocaml-modules/csv/lwt.nixnew file+14

This diff is too big to show here.

pkgs/development/ocaml-modules/curses/default.nix+3−3

This diff is too big to show here.

pkgs/development/pharo/vm/build-vm.nix+47−4

This diff is too big to show here.

pkgs/development/pharo/vm/vms.nix+20−1

This diff is too big to show here.

pkgs/development/python-modules/absl-py/default.nix+7−1

This diff is too big to show here.

pkgs/development/python-modules/aioconsole/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/azure-mgmt-compute/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/azure-mgmt-network/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/azure-mgmt-nspkg/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/azure-mgmt-resource/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/azure-mgmt-storage/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/behave/default.nix+9−1

This diff is too big to show here.

pkgs/development/python-modules/cherrypy/default.nix+3−1

This diff is too big to show here.

pkgs/development/python-modules/cli-helpers/default.nix+4−1

This diff is too big to show here.

pkgs/development/python-modules/cypari2/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/django/1_11.nix+5−4

This diff is too big to show here.

pkgs/development/python-modules/django/1_8.nix+2−3

This diff is too big to show here.

pkgs/development/python-modules/django/2_1.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/dominate/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/dropbox/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/elpy/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/facebook-sdk/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/fints/default.nixnew file+25

This diff is too big to show here.

pkgs/development/python-modules/flask-migrate/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/flit/default.nix+3−2

This diff is too big to show here.

pkgs/development/python-modules/folium/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/github3_py/default.nix+12−10

This diff is too big to show here.

pkgs/development/python-modules/google_cloud_vision/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/graphite-web/default.nix+1−1

This diff is too big to show here.

pkgs/development/python-modules/ipykernel/default.nix+9

This diff is too big to show here.

pkgs/development/python-modules/jupytext/default.nixnew file+47

This diff is too big to show here.

pkgs/development/python-modules/kafka-python/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/manhole/default.nix+4−1

This diff is too big to show here.

pkgs/development/python-modules/mt-940/default.nix+16−14

This diff is too big to show here.

pkgs/development/python-modules/mt-940/no-coverage.patchdeleted−26

This diff is too big to show here.

pkgs/development/python-modules/mysqlclient/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/nose-randomly/default.nix+4

This diff is too big to show here.

pkgs/development/python-modules/numexpr/default.nix+1−7

This diff is too big to show here.

pkgs/development/python-modules/numpy/default.nix−2

This diff is too big to show here.

pkgs/development/python-modules/nvchecker/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/objgraph/default.nix+5−2

This diff is too big to show here.

pkgs/development/python-modules/path.py/default.nix+4−6

This diff is too big to show here.

pkgs/development/python-modules/peewee/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/pg8000/default.nix+3−2

This diff is too big to show here.

pkgs/development/python-modules/pyaxmlparser/default.nix+18−4

This diff is too big to show here.

pkgs/development/python-modules/pyjet/default.nix+10−1

This diff is too big to show here.

pkgs/development/python-modules/pyliblo/default.nix+5−4

This diff is too big to show here.

pkgs/development/python-modules/pyqt/5.x.nix+1

This diff is too big to show here.

pkgs/development/python-modules/raven/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/ruamel_yaml/default.nix+1−2

This diff is too big to show here.

pkgs/development/python-modules/scrapy/default.nix+24−10

This diff is too big to show here.

pkgs/development/python-modules/sepaxml/default.nixnew file+22

This diff is too big to show here.

pkgs/development/python-modules/sh/default.nix+11−2

This diff is too big to show here.

pkgs/development/python-modules/sh/disable-broken-tests-darwin.patchnew file+49

This diff is too big to show here.

pkgs/development/python-modules/sip/default.nix+1

This diff is too big to show here.

pkgs/development/python-modules/snscrape/default.nixnew file+35

This diff is too big to show here.

pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/thumbor/default.nix+4−4

This diff is too big to show here.

pkgs/development/python-modules/typed-ast/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/uritemplate_py/default.nixdeleted−22

This diff is too big to show here.

pkgs/development/python-modules/wptserve/default.nix+2−1

This diff is too big to show here.

pkgs/development/python-modules/zeep/default.nix+2−2

This diff is too big to show here.

pkgs/development/ruby-modules/bundix/default.nix+1−1

This diff is too big to show here.

pkgs/development/ruby-modules/bundler/default.nix+2−2

This diff is too big to show here.

pkgs/development/ruby-modules/gem-config/default.nix+9−1

This diff is too big to show here.

pkgs/development/tools/ammonite/default.nix+2−2

This diff is too big to show here.

pkgs/development/tools/analysis/pmd/default.nix+2−2

This diff is too big to show here.

pkgs/development/tools/analysis/valgrind/default.nix+5−6

This diff is too big to show here.

pkgs/development/tools/apktool/default.nix+2−2

This diff is too big to show here.

pkgs/development/tools/build-managers/bazel/default.nix+2−1

This diff is too big to show here.

pkgs/development/tools/cloudfoundry-cli/default.nix+16−7

This diff is too big to show here.

pkgs/development/tools/database/liquibase/default.nix+13−1

This diff is too big to show here.

pkgs/development/tools/misc/sysbench/default.nix+3−3

This diff is too big to show here.

pkgs/development/tools/pipenv/default.nix+2−2

This diff is too big to show here.

pkgs/development/tools/pyre/default.nix+6−2

This diff is too big to show here.

pkgs/development/tools/skopeo/default.nix+2−2

This diff is too big to show here.

pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patchnew file+97

This diff is too big to show here.

pkgs/development/tools/vagrant/default.nix+16−9

This diff is too big to show here.

pkgs/development/tools/vagrant/gemset_libvirt.nix+105−6

This diff is too big to show here.

pkgs/development/tools/vagrant/vagrant-libvirt.json.innew file+9

This diff is too big to show here.

pkgs/games/boohu/default.nix+2−2

This diff is too big to show here.

pkgs/games/bzflag/default.nix+5−3

This diff is too big to show here.

pkgs/games/gcompris/default.nix+2−2

This diff is too big to show here.

pkgs/games/ivan/default.nix+3−6

This diff is too big to show here.

pkgs/games/ivan/new.patchdeleted−33

This diff is too big to show here.

pkgs/games/liquidwar/default.nix+7−3

This diff is too big to show here.

pkgs/games/openra/default.nix+9−3

This diff is too big to show here.

pkgs/games/openspades/default.nix+13−2

This diff is too big to show here.

pkgs/games/ue4demos/default.nix+24−17

This diff is too big to show here.

pkgs/misc/drivers/sc-controller/default.nix+2−2

This diff is too big to show here.

pkgs/misc/emulators/blastem/default.nix+2

This diff is too big to show here.

pkgs/misc/emulators/retroarch/cores.nix+1−1

This diff is too big to show here.

pkgs/misc/emulators/snes9x-gtk/default.nix+2−2

This diff is too big to show here.

pkgs/misc/emulators/wine/sources.nix+4−4

This diff is too big to show here.

pkgs/misc/scrcpy/default.nix+2−2

This diff is too big to show here.

pkgs/misc/vim-plugins/generated.nix+10

This diff is too big to show here.

pkgs/misc/vim-plugins/vim-plugin-names+1

This diff is too big to show here.

pkgs/os-specific/linux/fuse/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/fwts/default.nix+4−2

This diff is too big to show here.

pkgs/os-specific/linux/kernel/common-config.nix+1−1

This diff is too big to show here.

pkgs/os-specific/linux/kernel/linux-4.14.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/kernel/linux-4.19.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/kernel/linux-4.20.nixnew file+18

This diff is too big to show here.

pkgs/os-specific/linux/kernel/linux-4.4.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/kernel/linux-4.9.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/kernel/linux-libre.nix+3−3

This diff is too big to show here.

pkgs/os-specific/linux/sysdig/default.nix+2−2

This diff is too big to show here.

pkgs/servers/clickhouse/default.nix+7−2

This diff is too big to show here.

pkgs/servers/foundationdb/default.nix+2−2

This diff is too big to show here.

pkgs/servers/home-assistant/cli.nixnew file+35

This diff is too big to show here.

pkgs/servers/home-assistant/component-packages.nix+1−1

This diff is too big to show here.

pkgs/servers/home-assistant/default.nix+5−5

This diff is too big to show here.

pkgs/servers/home-assistant/frontend.nix+2−2

This diff is too big to show here.

pkgs/servers/http/unit/default.nix+38−36

This diff is too big to show here.

pkgs/servers/matrix-synapse/default.nix+9−3

This diff is too big to show here.

pkgs/servers/miniflux/default.nix+4−4

This diff is too big to show here.

pkgs/servers/nosql/aerospike/default.nix+1−2

This diff is too big to show here.

pkgs/servers/nosql/redis/default.nix+2−2

This diff is too big to show here.

pkgs/servers/plex/default.nix+3−3

This diff is too big to show here.

pkgs/shells/zsh/zsh-completions/default.nix+2−2

This diff is too big to show here.

pkgs/stdenv/cross/default.nix+1−1

This diff is too big to show here.

pkgs/tools/admin/nomachine-client/default.nix+10−5

This diff is too big to show here.

pkgs/tools/admin/pulumi/default.nix+3−3

This diff is too big to show here.

pkgs/tools/archivers/fsarchiver/default.nixnew file+43

This diff is too big to show here.

pkgs/tools/audio/abcm2ps/default.nix+2−2

This diff is too big to show here.

pkgs/tools/audio/playerctl/default.nix+5−8

This diff is too big to show here.

pkgs/tools/compression/mozlz4a/default.nix+3−3

This diff is too big to show here.

pkgs/tools/filesystems/duperemove/default.nix+1−1

This diff is too big to show here.

pkgs/tools/filesystems/sshfs-fuse/default.nix+2−2

This diff is too big to show here.

pkgs/tools/graphics/guff/default.nixnew file+25

This diff is too big to show here.

pkgs/tools/misc/datamash/default.nix+2−2

This diff is too big to show here.

pkgs/tools/misc/diskus/default.nix+4−2

This diff is too big to show here.

pkgs/tools/misc/hyperledger-fabric/default.nixnew file+35

This diff is too big to show here.

pkgs/tools/misc/qt5ct/default.nix+2−2

This diff is too big to show here.

pkgs/tools/misc/you-get/default.nix+2−2

This diff is too big to show here.

pkgs/tools/networking/bud/default.nix+2

This diff is too big to show here.

pkgs/tools/networking/gnirehtet/default.nix+1−1

This diff is too big to show here.

pkgs/tools/networking/nss-pam-ldapd/default.nix+9−5

This diff is too big to show here.

pkgs/tools/networking/strongswan/default.nix+5−1

This diff is too big to show here.

pkgs/tools/networking/tgt/default.nix+8−3

This diff is too big to show here.

pkgs/tools/networking/wireguard-tools/default.nix+2−2

This diff is too big to show here.

pkgs/tools/package-management/cde/default.nix+2

This diff is too big to show here.

pkgs/tools/package-management/nix-review/default.nix+2−2

This diff is too big to show here.

pkgs/tools/security/b2sum/default.nix+2−1

This diff is too big to show here.

pkgs/tools/security/monkeysphere/default.nix+23−9

This diff is too big to show here.

pkgs/tools/security/monkeysphere/openssh-nixos-sandbox.patchnew file+17

This diff is too big to show here.

pkgs/tools/security/neopg/default.nix+2−2

This diff is too big to show here.

pkgs/tools/security/vault/default.nix+2−2

This diff is too big to show here.

pkgs/tools/system/collectd/default.nix+54−41

This diff is too big to show here.

pkgs/tools/system/localtime/default.nix+12−6

This diff is too big to show here.

pkgs/tools/system/osquery/default.nix+16−2

This diff is too big to show here.

pkgs/tools/system/syslog-ng/default.nix+2−2

This diff is too big to show here.

pkgs/tools/video/bento4/default.nix+1−1

This diff is too big to show here.

pkgs/tools/virtualization/google-compute-engine-oslogin/default.nixnew file+48

This diff is too big to show here.

pkgs/top-level/aliases.nix+1

This diff is too big to show here.

pkgs/top-level/all-packages.nix+114−69

This diff is too big to show here.

pkgs/top-level/ocaml-packages.nix+2

This diff is too big to show here.

pkgs/top-level/php-packages.nix+4−4

This diff is too big to show here.

pkgs/top-level/python-packages.nix+11−5

This diff is too big to show here.