diff options
Diffstat (limited to 'pkgs')
334 files changed, 7514 insertions, 5248 deletions
diff --git a/pkgs/applications/altcoins/litecoin.nix b/pkgs/applications/altcoins/litecoin.nix index b23f3ad42434..33ac2be18322 100644 --- a/pkgs/applications/altcoins/litecoin.nix +++ b/pkgs/applications/altcoins/litecoin.nix @@ -11,13 +11,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "0.16.2"; + version = "0.16.3"; src = fetchFromGitHub { owner = "litecoin-project"; repo = "litecoin"; rev = "v${version}"; - sha256 = "0xfwh7cxxz6w8kgr4kl48w3zm81n1hv8fxb5l9zx3460im1ffgy6"; + sha256 = "0vc184qfdkjky1qffa7309k6973k4197bkzwcmffc9r5sdfhrhkp"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index e999672f4ab3..034d2059283d 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -4,7 +4,7 @@ , gobjectIntrospection, wrapGAppsHook }: python3.pkgs.buildPythonApplication rec { - version = "0.9.605"; + version = "0.9.607"; name = "lollypop-${version}"; format = "other"; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "10d9k7ssh4snrrjy1hb3y39by6175493cmn50aq88xby2mdy3p74"; + sha256 = "04giwp4i7j1qad41fiqlb8s3w03f1ww0p2mhi8n162sajnflr1rd"; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 546a47118a03..3649a0a68863 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.27.1"; + version = "3.28.1"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "00qlvfwfn7kybrx6rlj5h862syw3d5yak4sjqpxvacp7i5n1arsk"; + sha256 = "0yph01z8lw0r5bw3aa14w0l7z1ymxvpmb131gbaw3ib0srssgz64"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index f7463207045d..a5dae1d05607 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -44,13 +44,13 @@ let ]; in stdenv.mkDerivation rec { name = "pulseeffects-${version}"; - version = "4.3.7"; + version = "4.3.9"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "1x1jnbpbc9snya9k2xq39gssf0k4lnd1hr4cjrnwscg5rqybxqsk"; + sha256 = "1vir05hy2n0nk0gaqbn680bx53ixcyi2y0hq4grgm73bbb1jzqq6"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index c9fd4f9c4ab9..3de4067f55d5 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -4,7 +4,7 @@ }: let - version = "0.17.0"; + version = "0.18.0"; in mkDerivation rec { name = "sddm-${version}"; @@ -13,12 +13,11 @@ in mkDerivation rec { owner = "sddm"; repo = "sddm"; rev = "v${version}"; - sha256 = "1m35ly6miwy8ivsln3j1bfv0nxbc4gyqnj7f847zzp53jsqrm3mq"; + sha256 = "16xnm02iqgy4hydzd6my0widq981glbazbhxnihhclgsaczh8mfq"; }; patches = [ ./sddm-ignore-config-mtime.patch - ./qt511.patch ]; postPatch = diff --git a/pkgs/applications/display-managers/sddm/qt511.patch b/pkgs/applications/display-managers/sddm/qt511.patch deleted file mode 100644 index 6430e60ed417..000000000000 --- a/pkgs/applications/display-managers/sddm/qt511.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 005c9ad..71b46d7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -93,7 +93,7 @@ find_package(XCB REQUIRED) - find_package(XKB REQUIRED) - - # Qt 5 --find_package(Qt5 5.6.0 CONFIG REQUIRED Core DBus Gui Qml Quick LinguistTools) -+find_package(Qt5 5.6.0 CONFIG REQUIRED Core DBus Gui Qml Quick LinguistTools Test) - - # find qt5 imports dir - get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION) -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index c9d935a..bb85ddd 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -2,9 +2,8 @@ set(QT_USE_QTTEST TRUE) - - include_directories(../src/common) - -- - set(ConfigurationTest_SRCS ConfigurationTest.cpp ../src/common/ConfigReader.cpp) - add_executable(ConfigurationTest ${ConfigurationTest_SRCS}) - add_test(NAME Configuration COMMAND ConfigurationTest) - --qt5_use_modules(ConfigurationTest Test) -+target_link_libraries(ConfigurationTest Qt5::Core Qt5::Test) diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix new file mode 100644 index 000000000000..dbdc13ece2a8 --- /dev/null +++ b/pkgs/applications/editors/featherpad/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pkgconfig, qt5, fetchFromGitHub }: + +with qt5; + +stdenv.mkDerivation rec { + version = "0.9.1"; + name = "featherpad-${version}"; + src = fetchFromGitHub { + owner = "tsujan"; + repo = "FeatherPad"; + rev = "V${version}"; + sha256 = "053j14f6fw31cdnfr8hqpxw6jh2v65z43qchdsymbrk5zji8gxla"; + }; + nativeBuildInputs = [ qmake pkgconfig qttools ]; + buildInputs = [ qtbase qtsvg qtx11extras ]; + meta = with stdenv.lib; { + description = "Lightweight Qt5 Plain-Text Editor for Linux"; + homepage = https://github.com/tsujan/FeatherPad; + platforms = platforms.linux; + maintainers = [ maintainers.flosse ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 23ecfb0c19d3..f5fbf1b5f03d 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -289,12 +289,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2018.2.4"; /* updated by script */ + version = "2018.2.5"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "1syrxkp4pk95bvx02g2hg0mvn36w098h82k0qv0j6aqv0sidfzjy"; /* updated by script */ + sha256 = "0jnnmhn1gba670q2yprlh3ypa6k21pbg91pshz9aqkdhhmzk4759"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA Release"; @@ -302,12 +302,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2018.2.4"; /* updated by script */ + version = "2018.2.5"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; - sha256 = "0z1ga6lzmkn7y7y24984vmp3ilrfc1ak1ddcgsdkwkiq5bx67ck8"; /* updated by script */ + sha256 = "105mzbqm3bx05bmkwyfykz76bzgzzgb9hb6wcagb9fv7dvqyggg6"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA Release"; diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix index 259c319c70ff..494ad686ee3b 100644 --- a/pkgs/applications/editors/kile/default.nix +++ b/pkgs/applications/editors/kile/default.nix @@ -1,6 +1,6 @@ { mkDerivation , lib -, fetchgit +, fetchurl , extra-cmake-modules , kdoctools , wrapGAppsHook @@ -22,13 +22,11 @@ }: mkDerivation rec { - name = "kile-${version}"; - version = "2017-02-09"; + name = "kile-2.9.92"; - src = fetchgit { - url = git://anongit.kde.org/kile.git; - rev = "f77f6e627487c152f111e307ad6dc71699ade746"; - sha256 = "0wpqaix9ssa28cm7qqjj0zfrscjgk8s3kmi5b4kk8h583gsrikib"; + src = fetchurl { + url = "mirror://sourceforge/kile/${name}.tar.bz2"; + sha256 = "177372dc25b1d109e037a7dbfc64b5dab2efe538320c87f4a8ceada21e9097f2"; }; diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index b0c834934f9c..8e99005bbf6c 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -4,14 +4,14 @@ with stdenv.lib; pythonPackages.buildPythonPackage rec { pname = "neovim-remote"; - version = "2.0.5"; + version = "2.1.0"; disabled = !pythonPackages.isPy3k; src = fetchFromGitHub { owner = "mhinz"; repo = "neovim-remote"; rev = "v${version}"; - sha256 = "08qsi61ba5d69ca77layypzvi7nalx4niy97xn4w88jibnbmbrxw"; + sha256 = "0gri4d8gg5hvywffvj8r123d06x006qhink7d54yk6lvplw64gyc"; }; propagatedBuildInputs = with pythonPackages; [ neovim psutil ]; diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 1a5c9d65583f..9d8c430630e5 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -6,7 +6,7 @@ let verMajor = "1"; verMinor = "1"; - verPatch = "456"; + verPatch = "463"; version = "${verMajor}.${verMinor}.${verPatch}"; ginVer = "1.5"; gwtVer = "2.7.0"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "rstudio"; repo = "rstudio"; rev = "v${version}"; - sha256 = "0hv07qrbjwapbjrkddasglsgk0x5j7qal468i5rv77krsp09s4fz"; + sha256 = "014g984znsczzy1fyn9y1ly3rbsngryfs674lfgciz60mqnl8im6"; }; # Hack RStudio to only use the input R. diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix index cccf59f3e7bb..ba68a5420a88 100644 --- a/pkgs/applications/editors/thonny/default.nix +++ b/pkgs/applications/editors/thonny/default.nix @@ -4,13 +4,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "thonny"; - version = "3.0.1"; + version = "3.0.5"; src = fetchFromBitbucket { owner = "plas"; repo = pname; - rev = "f66bd266deda11534561a01ede53cf1b71d2c3c0"; - sha256 = "0mjskb0gyddybvlbhm10ch1rwzvmci95b018x67bh67bybdl4hm7"; + rev = "e5a1ad4ae9d24066a769489b1e168b4bd6e00b03"; + sha256 = "1lrl5pj9dpw9i5ij863hd47gfd15nmvglqkl2ldwgfn7kgpsdkz5"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index dcec9fdfef95..6d92c0471574 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.1.0450"; + version = "8.1.0490"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "1zhggpn4i704apfqn2kqr717kz9dvkjwnbmc3ydza621zjyrnxb2"; + sha256 = "0gmlz2w066pcrn0jzpv3gk1qwx148f33gvgf5nkfy4nl1ljki81r"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix index 6ed6326f16e5..3517351090d7 100644 --- a/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "OpenOrienteering-Mapper-${version}"; - version = "0.8.2"; + version = "0.8.3"; buildInputs = [ gdal qtbase qttools qtlocation qtimageformats qtsensors clipper zlib proj doxygen cups]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "OpenOrienteering"; repo = "mapper"; rev = "v${version}"; - sha256 = "02lga6nlal4c7898zc3lv1pcwyv1wpkn7v2xji2kgq68r6aw6j59"; + sha256 = "0pnqwvmg97mgc2ci3abmx07l0njxcrbljh75w8ym31g0jq76pgr9"; }; cmakeFlags = diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index e0aea87c90c3..7777be918975 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -1,23 +1,24 @@ { stdenv, makeDesktopItem, fetchurl, unzip -, gdk_pixbuf, glib, gtk2, atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome2 -, xorg, mozjpeg +, gdk_pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome3 +, xorg, mozjpeg, makeWrapper, gsettings-desktop-schemas }: stdenv.mkDerivation rec { name = "avocode-${version}"; - version = "3.4.0"; + version = "3.6.2"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "1dk4vgam9r5nl8dvpfwrn52gq6r4zxs4zz63p3c4gk73d8qnh4dl"; + sha256 = "1slxxr3j0djqdnbk645sriwl99jp9imndyxiwd8aqggmmlp145a2"; }; - libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome2; [ + libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome3; [ stdenv.cc.cc.lib gdk_pixbuf glib - gtk2 + gtk3 atk + at-spi2-atk pango cairo freetype @@ -29,7 +30,6 @@ stdenv.mkDerivation rec { cups expat udev - GConf libX11 libxcb libXi @@ -54,7 +54,8 @@ stdenv.mkDerivation rec { comment = "The bridge between designers and developers"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [makeWrapper]; + buildInputs = [ unzip gtk3 gsettings-desktop-schemas]; # src is producing multiple folder on unzip so we must # override unpackCmd to extract it into newly created folder @@ -85,6 +86,10 @@ stdenv.mkDerivation rec { for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do patchelf --set-rpath ${libPath}:$out/ $file done + for file in $out/bin/*; do + wrapProgram $file \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + done ''; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/batik/default.nix b/pkgs/applications/graphics/batik/default.nix index 4032e2e3fee3..51156dea4a17 100644 --- a/pkgs/applications/graphics/batik/default.nix +++ b/pkgs/applications/graphics/batik/default.nix @@ -15,5 +15,11 @@ stdenv.mkDerivation { homepage = https://xmlgraphics.apache.org/batik; license = licenses.asl20; platforms = platforms.unix; + knownVulnerabilities = [ + # vulnerabilities as of 16th October 2018 from https://xmlgraphics.apache.org/security.html: + "CVE-2018-8013" + "CVE-2017-5662" + "CVE-2015-0250" + ]; }; } diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 9aa80fc789c9..ce2bdcbd298c 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -10,11 +10,11 @@ mkDerivation rec { name = "krita-${version}"; - version = "4.1.3"; + version = "4.1.5"; src = fetchurl { url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz"; - sha256 = "0d546dxs552z0pxnaka1jm7ksravw17f777wf593z0pl4ds8dgdx"; + sha256 = "1by8p8ifdp03f05bhg8ygdd1j036anfpjjnzbx63l2fbmy9k6q10"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/applications/misc/dmrconfig/default.nix b/pkgs/applications/misc/dmrconfig/default.nix new file mode 100644 index 000000000000..20c6ff57b241 --- /dev/null +++ b/pkgs/applications/misc/dmrconfig/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub +, libusb1, systemd }: + +stdenv.mkDerivation rec { + name = "dmrconfig-${version}"; + version = "2018-10-20"; + + src = fetchFromGitHub { + owner = "sergev"; + repo = "dmrconfig"; + rev = "a4c5f893d2749727493427320c7f01768966ba51"; + sha256 = "0h7hv6fv6v5g922nvgrb0w7hsqbhaw7xmdc6vydh2p3l7sp31vg2"; + }; + + buildInputs = [ + libusb1 systemd + ]; + + preConfigure = '' + substituteInPlace Makefile --replace /usr/local/bin/dmrconfig $out/bin/dmrconfig + ''; + + preInstall = '' + mkdir -p $out/bin + ''; + + meta = with stdenv.lib; { + description = "Configuration utility for DMR radios"; + longDescription = '' + DMRconfig is a utility for programming digital radios via USB programming cable. + ''; + homepage = https://github.com/sergev/dmrconfig; + license = licenses.asl20; + maintainers = [ maintainers.etu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 537627a10d2d..843257a74e55 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "022iw4cq0c009wvqn7wd815jc0nv8198lq3cawn8h6c28hw2mhs1"; + sha256 = "139kzapas1l61w1in9f7c6ybricid4fzryfnvsrfhpaqh83ydn2c"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index 8d095b78cdbf..9ea8210e67e7 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -103,5 +103,8 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ robbinch ]; + knownVulnerabilities = [ + "CVE-2015-1032" + ]; }; } diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 7068d8aedd37..daeb8b159f7a 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -13,12 +13,12 @@ let inherit (python2.pkgs) paramiko pycairo pyodbc; in stdenv.mkDerivation rec { pname = "mysql-workbench"; - version = "8.0.12"; + version = "8.0.13"; name = "${pname}-${version}"; src = fetchurl { url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz"; - sha256 = "0d6k1kw0bi3q5dlilzlgds1gcrlf7pis4asm3d6pssh2jmn5hh82"; + sha256 = "1p4xy2a5cin1l06j4ixpgp1ynhjdj5gax4fjhznspch3c63jp9hj"; }; patches = [ diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index d97f2d2c0489..051e7139a23d 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "nnn-${version}"; - version = "1.9"; + version = "2.0"; src = fetchFromGitHub { owner = "jarun"; repo = "nnn"; rev = "v${version}"; - sha256 = "0z7mr9lql5hz0518wzkj8fdsdp8yh17fr418arjxjn66md4kwgpg"; + sha256 = "16c6fimr1ayb2x3mvli70x2va3nz106jdfyqn53bhss7zjqvszxl"; }; configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf); diff --git a/pkgs/applications/misc/slic3r/prusa3d.nix b/pkgs/applications/misc/slic3r/prusa3d.nix index 7df4007cf403..cc9133257a0c 100644 --- a/pkgs/applications/misc/slic3r/prusa3d.nix +++ b/pkgs/applications/misc/slic3r/prusa3d.nix @@ -33,7 +33,7 @@ let in stdenv.mkDerivation rec { name = "slic3r-prusa-edition-${version}"; - version = "1.41.0"; + version = "1.41.1"; enableParallelBuilding = true; @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "prusa3d"; repo = "Slic3r"; - sha256 = "1al60hrqbhl05dnsr99hzbmxmn26fyx19sc5zxv816x3q6px9n2d"; + sha256 = "0068wwsjwmnxql7653vy3labcyslzf17kr8xdr4lg2jplm022hvy"; rev = "version_${version}"; }; diff --git a/pkgs/applications/misc/soapysdr/default.nix b/pkgs/applications/misc/soapysdr/default.nix index 6230f2f6f6a6..90639fc57056 100644 --- a/pkgs/applications/misc/soapysdr/default.nix +++ b/pkgs/applications/misc/soapysdr/default.nix @@ -6,7 +6,7 @@ } : let - version = "0.6.1"; + version = "0.7.0"; in stdenv.mkDerivation { name = "soapysdr-${version}"; @@ -15,7 +15,7 @@ in stdenv.mkDerivation { owner = "pothosware"; repo = "SoapySDR"; rev = "soapy-sdr-${version}"; - sha256 = "1azbb2j6dv0b2dd5ks6yqd31j17sdhi9p82czwc8zy2isymax0l9"; + sha256 = "14fjwnfj7jz9ixvim2gy4f52y6s7d4xggzxn2ck7g4q35d879x13"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/applications/misc/tabula/default.nix b/pkgs/applications/misc/tabula/default.nix new file mode 100644 index 000000000000..52e39b98a3b6 --- /dev/null +++ b/pkgs/applications/misc/tabula/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchzip, jre, makeWrapper }: + + +stdenv.mkDerivation rec { + name = "tabula-${version}"; + version = "1.2.1"; + + + src = fetchzip { + url = "https://github.com/tabulapdf/tabula/releases/download/v${version}/tabula-jar-${version}.zip"; + sha256 = "0lkpv8hkji81fanyxm7ph8421fr9a6phqc3pbhw2bc4gljg7sgxi"; + }; + + + buildInputs = [ makeWrapper ]; + + + installPhase = '' + mkdir -pv $out/share/tabula + cp -v * $out/share/tabula + + makeWrapper ${jre}/bin/java $out/bin/tabula --add-flags "-jar $out/share/tabula/tabula.jar" + ''; + + + meta = with stdenv.lib; { + description = "A tool for liberating data tables locked inside PDF files"; + longDescription = '' + If you’ve ever tried to do anything with data provided to you in PDFs, you + know how painful it is — there's no easy way to copy-and-paste rows of data + out of PDF files. Tabula allows you to extract that data into a CSV or + Microsoft Excel spreadsheet using a simple, easy-to-use interface. + ''; + homepage = https://tabula.technology/; + license = licenses.mit; + maintainers = [ maintainers.dpaetzel ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix index dba492ca8dd1..2d370113873e 100644 --- a/pkgs/applications/misc/urh/default.nix +++ b/pkgs/applications/misc/urh/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urh-${version}"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "jopohl"; repo = "urh"; rev = "v${version}"; - sha256 = "1n105lwz8w5fiw93w9amasq0f4gknihl3x9kj0q77lw7ha1lvdfz"; + sha256 = "0cwbqcv0yffg6fa3g4zknwffa6119i6827w6jm74fhlfa9kwy34c"; }; buildInputs = [ hackrf rtl-sdr ]; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index c18f77f8f996..a011d0a892e9 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,4 +1,4 @@ -{ stdenv, gn, ninja, which, nodejs, fetchurl, fetchpatch, gnutar +{ stdenv, llvmPackages, gn, ninja, which, nodejs, fetchurl, fetchpatch, gnutar # default dependencies , bzip2, flac, speex, libopus @@ -92,11 +92,6 @@ let buildPath = "out/${buildType}"; libExecPath = "$out/libexec/${packageName}"; - freetype_source = fetchurl { - url = http://anduin.linuxfromscratch.org/BLFS/other/chromium-freetype.tar.xz; - sha256 = "1vhslc4xg0d6wzlsi99zpah2xzjziglccrxn55k7qna634wyxg77"; - }; - versionRange = min-version: upto-version: let inherit (upstream-info) version; result = versionAtLeast version min-version && versionOlder version upto-version; @@ -132,22 +127,28 @@ let ++ optional pulseSupport libpulseaudio ++ optional (versionAtLeast version "71") at-spi2-core; - patches = [ - # As major versions are added, you can trawl the gentoo and arch repos at - # https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/ - # https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium - # for updated patches and hints about build flags - # (gentooPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000") - ./patches/fix-freetype.patch + patches = optional enableWideVine ./patches/widevine.patch ++ [ ./patches/nix_plugin_paths_68.patch ./patches/remove-webp-include-69.patch - ] ++ optional enableWideVine ./patches/widevine.patch - ++ optional ((versionRange "69" "70") && stdenv.isAarch64) - (fetchpatch { - url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/0001-vpx_sum_squares_2d_i16_neon-Make-s2-a-uint64x1_t.patch; - sha256 = "0f37rsjx7jcvdngkj8y6600091nwgn4jci0ny7bxlapq0zx2a4x7"; - }) - ++ optional stdenv.isAarch64 + + # Unfortunately, chromium regularly breaks on major updates and + # then needs various patches backported in order to be compiled with GCC. + # Good sources for such patches and other hints: + # - https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/ + # - https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium + # - https://github.com/chromium/chromium/search?q=GCC&s=committer-date&type=Commits + # + # ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) + ] ++ optionals (!stdenv.cc.isClang && (versionRange "70" "71")) [ + ( githubPatch "cbdb8bd6567c8143dc8c1e5e86a21a8ea064eea4" "0258qlffp6f6izswczb11p8zdpn550z5yqa9z7gdg2rg5171n5i8" ) + ( githubPatch "e98f8ef8b2f236ecbb01df8c39e6ee1c8fbe8d7d" "1ky5xrzch6aya87kn0bgb31lksl3g8kh2v8k676ks7pdl2v132p9" ) + ( githubPatch "a4de8da116585357c123d71e5f54d1103824c6df" "1y7afnjrsz6j2l3vy1ms8mrkbb51xhcafw9r371algi48il7rajm" ) + ( githubPatch "b033d2ba32da5ea237656568c25908d4f12b7bac" "008dg8vk822wyrinirx4nh92yq9bki4mwfwvcwnxdjmvz3y0jfcc" ) + ( githubPatch "2f9563e49f6c28dfe52940901417a4031b95a49b" "1q8qhpzx611yzrxa8lgpw0bad9bxx84rsrvczl4xvk5qh93zna7i" ) + ( githubPatch "a66e0a3f3f57eb045639e2752a99ade348dc17e9" "1c5x9856b167z270357wr8l6m1wrznxcx89ykj6kfz5djqmv251g" ) + ( githubPatch "4d9714247f617bf9e1cf95f735148f5e598a9529" "1423jf3lzbljzgbcwvfrrfyhyl3fab988hsyjvk95zyclxff7iij" ) + ( githubPatch "87902b3202f81d689dd314c17006ffc907fe12a1" "15q37cd26s73girq1imcs52fb1irh0qlfvhksh6g0l0jjrdyzk6r" ) + ] ++ optional stdenv.isAarch64 (if (versionOlder version "71") then fetchpatch { url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/aarch64-skia-build-fix.patch; @@ -160,7 +161,7 @@ let sha256 = "018fbdzyw9rvia8m0qkk5gv8q8gl7x34rrjbn7mi1fgxdsayn22s"; } ); - + postPatch = '' # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ @@ -193,11 +194,6 @@ let mkdir -p third_party/node/linux/node-linux-x64/bin ln -s $(which node) third_party/node/linux/node-linux-x64/bin/node - # use patched freetype - # FIXME https://bugs.chromium.org/p/pdfium/issues/detail?id=733 - # FIXME http://savannah.nongnu.org/bugs/?51156 - tar -xJf ${freetype_source} - # remove unused third-party # in third_party/crashpad third_party/zlib contains just a header-adapter for lib in ${toString gnSystemLibraries}; do @@ -213,10 +209,16 @@ let '' + optionalString stdenv.isAarch64 '' substituteInPlace build/toolchain/linux/BUILD.gn \ --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' + '' + optionalString stdenv.cc.isClang '' + mkdir -p third_party/llvm-build/Release+Asserts/bin + ln -s ${stdenv.cc}/bin/clang third_party/llvm-build/Release+Asserts/bin/clang + ln -s ${stdenv.cc}/bin/clang++ third_party/llvm-build/Release+Asserts/bin/clang++ + ln -s ${llvmPackages.llvm}/bin/llvm-ar third_party/llvm-build/Release+Asserts/bin/llvm-ar ''; gnFlags = mkGnFlags ({ linux_use_bundled_binutils = false; + use_lld = false; use_gold = true; gold_path = "${stdenv.cc}/bin"; is_debug = false; @@ -230,7 +232,7 @@ let use_cups = cupsSupport; treat_warnings_as_errors = false; - is_clang = false; + is_clang = stdenv.cc.isClang; clang_use_chrome_plugins = false; remove_webcore_debug_symbols = true; enable_swiftshader = false; @@ -243,8 +245,6 @@ let google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI"; google_default_client_id = "404761575300.apps.googleusercontent.com"; google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D"; - } // optionalAttrs (versionRange "60" "70") { - use_gtk3 = true; } // optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 686e8fadec34..88b0a89db4b1 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,4 +1,4 @@ -{ newScope, stdenv, makeWrapper, makeDesktopItem, ed +{ newScope, stdenv, llvmPackages, makeWrapper, makeDesktopItem, ed , glib, gtk3, gnome3, gsettings-desktop-schemas # package customization @@ -14,12 +14,13 @@ , commandLineArgs ? "" }: +assert stdenv.cc.isClang -> (stdenv == llvmPackages.stdenv); let callPackage = newScope chromium; chromium = { - inherit stdenv; - + inherit stdenv llvmPackages; + upstream-info = (callPackage ./update.nix {}).getChannel channel; mkChromiumDerivation = callPackage ./common.nix { diff --git a/pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch b/pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch deleted file mode 100644 index cc380a55abe0..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/third_party/freetype/BUILD.gn -+++ b/third_party/freetype/BUILD.gn -@@ -63,10 +63,12 @@ source_set("freetype_source") { - "src/src/base/ftbase.c", - "src/src/base/ftbbox.c", - "src/src/base/ftbitmap.c", -+ "src/src/base/ftfntfmt.c", - "src/src/base/ftfstype.c", - "src/src/base/ftgasp.c", - "src/src/base/ftglyph.c", - "src/src/base/ftinit.c", -+ "src/src/base/ftlcdfil.c", - "src/src/base/ftmm.c", - "src/src/base/ftstroke.c", - "src/src/base/fttype1.c", diff --git a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch b/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch index 3c80dbcec004..da6a4c92b460 100644 --- a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch +++ b/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch @@ -50,15 +50,6 @@ index f4e119d..d9775bd 100644 return false; cur = cur.Append(kPepperFlashBaseDirectory); break; -@@ -323,7 +316,7 @@ bool PathProvider(int key, base::FilePath* result) { - // We currently need a path here to look up whether the plugin is disabled - // and what its permissions are. - case chrome::FILE_NACL_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "NACL")) - return false; - cur = cur.Append(kInternalNaClPluginFileName); - break; @@ -358,7 +351,7 @@ bool PathProvider(int key, base::FilePath* result) { cur = cur.DirName(); } diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index c5622f0c63cb..ed3a58f62dbd 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -1,4 +1,4 @@ -{ stdenv +{ stdenv, gcc , jshon , glib , nspr @@ -69,7 +69,7 @@ let ! find -iname '*.so' -exec ldd {} + | grep 'not found' ''; - PATCH_RPATH = mkrpath [ stdenv.cc.cc glib nspr nss ]; + PATCH_RPATH = mkrpath [ gcc.cc glib nspr nss ]; patchPhase = '' chmod +x libwidevinecdm.so libwidevinecdmadapter.so @@ -110,7 +110,7 @@ let patchPhase = '' chmod +x libpepflashplayer.so - patchelf --set-rpath "${mkrpath [ stdenv.cc.cc ]}" libpepflashplayer.so + patchelf --set-rpath "${mkrpath [ gcc.cc ]}" libpepflashplayer.so ''; doCheck = true; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index a26c8b8ddded..8162f43776da 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "16biicw86mnjrmjazfbml2pf4rykhbvsz854cyfnpjhcvmlh24jp"; - sha256bin64 = "07jr1sqsxfdy3rymylkbpbgi79j9b2pax4igdzj943d0nbka84y5"; - version = "70.0.3538.35"; + sha256 = "0kkdfp5f3gmzngfj1nfw023bpyvm47h94k9rpwml2kxlijswd1gl"; + sha256bin64 = "13ghx5ysl8f2iphdvjh698q4jksh765ljjrd74m6x0ih6qm0ksaq"; + version = "71.0.3578.20"; }; dev = { - sha256 = "0fmkhvvydinv5f543n7rrmsv99rf0skwwhlpmszvspx6y4wz9smv"; - sha256bin64 = "0plr8ph78kfg2dpyacjy3aw3msfif95fqpb8xx0n8whkkpbl9968"; - version = "71.0.3559.6"; + sha256 = "1d7q8hbqbxy2izdvv4d9126ljiglsfc3w7wns3zbbbiyqa2rj00y"; + sha256bin64 = "0v6yahsvsgxcqg6k84lgr589rnx9af1r2axn7cggyn1a2lk63jck"; + version = "72.0.3590.0"; }; stable = { - sha256 = "0dcyzsb70ssx5hd2b25ab3ydpqh7crhxab9zzi5gn99ywxh1afg3"; - sha256bin64 = "0w56k7hmdi9knjaw67kdmyz0fdkjmk2ldh2n4l1c6szkr66vq30q"; - version = "69.0.3497.100"; + sha256 = "0j84556r3m4igigqsx9zvw4kvbn4psfsi7m8xhcvfxc39ingh569"; + sha256bin64 = "082cf9d1wm36w4i09ai4xnprvxfqdar6cbgsxz5q5srd41mqdy6p"; + version = "70.0.3538.77"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 6c6e05133bdc..54b588fb0979 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,995 +1,995 @@ { - version = "62.0.3"; + version = "63.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ach/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ach/firefox-63.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "bcf519e0080aca1cf232ec327ea65973e71230dd60204bc1fef3284dd94fa123f4a60421b647a3f64352829b1ef3b0e0b689a1fa7a06f6b1848c5acb1d33b917"; + sha512 = "0557937473fe8758371d21ec4b0d983ac2db59e8b9d3d627a318d3adf9a0cd0712f3e9b375f0cd6d9acf3f39b0c42fbcdb31364c5973916c7287f618a5f074ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/af/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/af/firefox-63.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "5b145ab068216846169303dd75ad3b5a40e82129234cee35cd7a559cde0dcbc6abb1d6ce50680b9a8180828db82f3c23d62e9dc46015a88b0a3c75eb164c17df"; + sha512 = "4b0d715ba2a7edd648bcc2c396ea764e8a29fce69d526803e6621053f3886df44d758fdbf2c8af8a9e3acd307e10dcdcf3e13eff0e60bce28885b699cf2426d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/an/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/an/firefox-63.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "92a7b8eda43a1d6323e058d285e5b599b14ff8a7275d8e900d9ad8d5dc8160ddbfeb8134b877cbd078b3e3ce9919c2906f4cf7f9224f807f6c0ebf0c6e906be3"; + sha512 = "79665a9586e0fceacb0a49560d0fc2a72a76187799563b0f8ef972043020744dafc971cb94b52b30df6056673aea4e0885f994d55c99c7976f9f7805c30e5796"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ar/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ar/firefox-63.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "2592b6808abd04054ab6d71b8f44d94eb040c92f53c755b2258e4a10a3c8cd80241dedc2e57924e9410717cc8943947248b27c753c6223aa57352b0a08cd64dd"; + sha512 = "d338b5fdf1dc4bb920bd372ba69934ddf39bdc7e37b725a010fbc9fd71ff487181d898e863c7ce9a21039d51d256c4ec1ca2cdcf0da078788243e867b0bc151f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/as/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/as/firefox-63.0.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "224c3d09c1122f2444d2bc75833d6db60a7cbdacc819d16d40a3d5e6537e275a5720f1b6d4616ed318868683b99547d03aedc21175781eab0b32ec8c6be87495"; + sha512 = "2022a993455456d0c900ddaf8e6a74a3d5478edec456df0cba627dfa1ad41f0274053c21b9c1ca4ca6b640e26993d60ffcc2f879c68143699f6e31d43f7acc19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ast/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ast/firefox-63.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "26b316efd6d4d238726e5a1fef3a6ad00af3f42cd45846598e4562b9c5b2d35af3372e283efd30713464c440715de82ce49ce3d73569ff528d90ec479264110b"; + sha512 = "1eca2ca8385215a886a16de77988d76e41b7257a41fceacd3df18e21ba82c8c67df045aa8201a2b18032f1690997b4b8bfb55a80c47341335aab45cbb15eefd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/az/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/az/firefox-63.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "29935c406c955692a469762a9c53762d6a8f7ccd4555b53c31283f4767db2547a17819f7e55aafd011b3570c30839e350dfe74a52d322047647ddaae58b23919"; + sha512 = "3788f68a69a8605e3185e5e776edf3339a650e010fc4810f574e5c0a62c9aaf30c84151ea169c005c1f381c3eaa4c3a8f6758c336a9423cfeaffb83aef96dc73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/be/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/be/firefox-63.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "e4a438ff8a9100126f0fac456bd6aa7d0713bf2e22e7ce6490c4f3ec5643087b668bb5d8d867c9466a289a964f957ce958dd9545ada53b207bf026f3f8200373"; + sha512 = "f538b9f8d566f7f3c5bc92a24127966d618b47dd368ecbb4fae0e5c90045bb75cb1b921edd865227ca6c34e3e2e037acb81d9f7368cfdee59cbdcf6ff2798ffe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/bg/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/bg/firefox-63.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "3b17536b1bd6cbb94548b7b2b0d05ced711ef116acc4687309c3392f77ec0b51cb4814efbeee26ceb51328a4ae5b5ee1c4d8e69e57c2580be8cb1989bb082cba"; + sha512 = "497a95b4309e60093ec3f1b0a72ac05d1b9a47d78799ca33492394c7bf0b81e64e60103218c479b4ff3a3b2acfcf95493f43be23feb89fbdfebe42ec8a124132"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/bn-BD/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/bn-BD/firefox-63.0.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "d9969a8d0fda1bc4d108f0c24e934235186420734df1be38db9608e303d7928b45007b40857681d0b29826bc26628b3b86388c81925059ebb23b6ccbeb80f375"; + sha512 = "3c2123b34ebb2e3c6def220c679069b31b3d7a2110ec2eadea88a930b6582fcab0452bce97f0302a39af324ca1b58ec49ed49aa865ade7d814152bf16fd1cadc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/bn-IN/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/bn-IN/firefox-63.0.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "7e449679b8bece1eed95ca5e3bfbe1a303d9dfa8bd4b9e53d14f99198e01a4dc4367112de48ad50b61c3cc54eaaba8caf143c36336da3c86c2815828ca5a2a80"; + sha512 = "55fdb9a3efe54db994706fb8345918f5c19f1a24f77107e6819dd1272a09900ef3534897c1d3b38c331c94813446694b2422356ae6ca2356338d6253e15a37e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/br/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/br/firefox-63.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "328deff7045bfa2187c19a66ca03a0c8f25e266eb6ea9c19715c201702245a0c338458254297974aa18466350231dc800f20b72c552f4633d5eea176f45adf80"; + sha512 = "c35e40bfd6b1fb06c8426c6f9f834f8a6d658ced8892c575079d852dbb2e24f09657b1f37bc8af3588cc2c8b9ba1924cf5a85c7be0d6db4334c592f03abeb142"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/bs/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/bs/firefox-63.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "20f85e5ca5f7a7be5079778b426e252c98112550849fb6e16e3b0d52a15570e638c8a664976a9252891a2254be59fe436dcda0d65b1f9ad5cdbe0cc5636cb93f"; + sha512 = "ea63659f3a930b4d0a8add69cd8ca1a3d98e015aab1b6bc607c8e0fbd610de8fdc49ac290c61bcd762092d4f56554f70f029a18be4bcf426cafffc6fe9677699"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ca/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ca/firefox-63.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "7abd7b7220c6a5b1cbb4c8f9ee6c55d15682bba5bc1e1356a038f9b1ae7ec351c57ef4dd19a02f8216f6789342d5d91cf76a00ecf13e71c8fad0f1fbc315e775"; + sha512 = "10993691fe9072706f1c092199dadea2f1ffbcfecede53771326dd03b88387133aa23e75f96bebe7117eb02ea2775e5758c36064c5ddd72f7aab441feca659e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/cak/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/cak/firefox-63.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "2a8070bcd971261d994ae2ded0366b9e07961e1b98aa76c117d1e949a8f9990a22ba461ebda223b76f33c7ca94e1862a888b000642a4f874b8b92d2b5f470736"; + sha512 = "0413afe78e4c8ca1af3edad09c801607c73069366a255d4d1d9e6d4589ba3757c732a2cd691b8f223ab10cc99cdcc322e98d8daca49b3107082a8cb41cd278ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/cs/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/cs/firefox-63.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "8beb5c0ee3a0b2a556b455e41887dda126a0892df50aba4e283f0db819c99c4601427370c70c09d176f1a6ee8d629e1ec5f8b803d51b9444237e56c7a273cc0a"; + sha512 = "d4ee0844c1587ed0d65d40a444fd130022f99831749f721523b0f594d4967e723fd8af10c363f53b4fdca91f676962882e93327dd5b1529d3d66c27f17bf29a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/cy/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/cy/firefox-63.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "ec1a4fb0c8f753454aea88fdcfb3a340d0328d9c059653d9390a71841098573d667c2329c0c8dc88a2fc52eedfd8dbc584df2fe44fff273f8aeec8a3f1eaa0f6"; + sha512 = "103177bdcb204d0da7dc8fbfcd82a52bbf3956b13f716de1547252a076d68b21f9bf4684ed63a62aa4635fa39cb776a64942d81333ebf41dfc5f12d6087261af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/da/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/da/firefox-63.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "79532e1cf94447797d9d816cdc342fe0f8c37915494ff000bbc7148c2d42a1adeb7226887d51999774b6068f62d71bbb54b0951bc606003a91df12e9f24e7691"; + sha512 = "38cc06165c713ffdb5a2bcef9b8e6c7f55c2e821c4e4c87d30b613cd78aa6320761e709f3a784a0f55da283dd7088ab67d0e58a16a90bbd182985d29691bd50e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/de/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/de/firefox-63.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "5f0d10736912f6ad4bd38538601ceb8db10cf97dd414446366218ccb03ae010037114d688409cd724e194126524bdd442f71b1cf646f1f3ac46499afecc082d6"; + sha512 = "076276ef8556922e80bf74aaf3624e6604eb904ec6dda35df7f91edf99c62015d1309ea1a5cc28d84ce96f9924dc908c81f959ecf93f2419156d07bb303fcbd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/dsb/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/dsb/firefox-63.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "2cafc29c75b055e4c21e12fe2b2ca3c974ad53fed43c8b082e09323bd1854ae7179da13c7d33edf41f783fe0016053d52292bafbccdcff79cc69d8ffedf01ab9"; + sha512 = "979013e2bc62db710891d95d8898857e51bc1a2073e3a56948af57c9676fdbc87b6a9d827177a5a1d7926f71d83e9df706c42ea98bca98fab998815daf50458d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/el/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/el/firefox-63.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "b1246b56eb0d61d5ac874383ee279d3c9dfe559127052c4d4403ab0009d702a76711d05f1ebb781f972d9cbe6cee9a6b3c1aea9cb74866e497f2569480a2cbf1"; + sha512 = "1f4e5983ca94ecd9da6d65ec7c39ef7e01296f957cbe3812a20981bafdd9a2c0e07bb5814b5caab781ed1f2f6fb2ce2079557e3b9bbc1422b2fb7d882b921ffb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/en-CA/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/en-CA/firefox-63.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "8d344a08fce1be002b5710031250aa0f13d237bd38386cb31d5f6a75cc29ee17dffd01e1375e4a26b1a136d268db6ebaa591fc23789b3fbd7771f42a6bb59979"; + sha512 = "77a9038b33a15a2f12db383039f89d29f1e855aad6354375517726d28c5e1984fe77993cb802f17975488441ef36ac143c1e4e2d29c7104143db511229e9b28a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/en-GB/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/en-GB/firefox-63.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "88899808190f9013eba157345adc740fbd1889fd1ac963209cf093e9bd9f1e9b3f35126e85c5d3a1590e02ff1da8c09fa390ec519bc0ab01bab7c37d9b5d4bed"; + sha512 = "62f5374d07b90e80d9f67b04a647f68fc75af267e9b9c04674d754b0d023ed9d78241a693f11504d5b74902328c68414be394923493c17c551a62d06621edf4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/en-US/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/en-US/firefox-63.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "577cdf1e1c4845e0b22c174833b0e20375443121e429a57d16f1f0e3af86533a6c27d35d8451ab25b3f7ba10ee9385d0f497866b50d4f37a81f9663137aa3395"; + sha512 = "906376e344b9f01c5eca8a6e24386927a68613a74202062fe52de5bc1b9d1073103e9c59d19f40f33efabf0f5e4852210195691a73f1bd05db790e7c1eac5f28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/en-ZA/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/en-ZA/firefox-63.0.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "ee679b5bab64492bd069cd9b3b7509db7a5296a019d8712afd12a5b6ffeb1911fc4daaf63483b895b79652f67f9095b66be780a2b0dce3e7b9b57fb5fcda316a"; + sha512 = "895f9dbd5ef281a48e5c3124dcb668b9fe4d6b41a3402850e68e138190b756ab10292bd002c36a1f8391ff3598c48a8623552ac35d18d0948dbe194b28684f81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/eo/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/eo/firefox-63.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "32e54f1a83e4b3cf8f7296fad200abedafb5c7d4bd409c7acd2806944a241b6923794a33a7999754e4d2010f2788ea3a3d08ee72a9354713b6cc2ee1dc73a665"; + sha512 = "defe31badc0ce4c41785abf6aef543584778e5c6f373300c2fc3582c89daaa500cc9aedac55e1a1569abd8eb0de207268e31b9eae61565e76a43eecf41ef774f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/es-AR/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/es-AR/firefox-63.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "ce740d773ecc016eb89e9fe4370e199294f8c51c4f5f74bbe7f09a5ac060b374d23e80fd8a27b63c6149bcaec2b93d58a892ba7f53c08628c141b406838e2d58"; + sha512 = "bfe81fbc669fa156c6741c62b00c9ebcf74fb2f49c92206c5ca79986358e7b8ec29d98d206c4d0e21e81a781ed8216fde5b072f0f1a19604ed7c3784b82829c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/es-CL/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/es-CL/firefox-63.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "9ea5c06200091975c98587627ca371bb492cef91ec200a52409b4b30092aeeda64360913b8950ce56031aef34e66364bea71bb071df5549736dc0900ac54f7f2"; + sha512 = "cd3bc97552a30c9eabf8627ef97db2d4f48f2fbce4c72b5e6b41000a623ab1782f87ee8ac61dde5e3fccc59a91f87b4a3b279b90de3b08e90293329bc85976d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/es-ES/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/es-ES/firefox-63.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "df71790d420798b17e64aaeb007f7f8585037d48b7c8933f5760b75385c945ef16e815c84b5872cfef8a2ebafd3293cbb4910befc4844b166f16774947a9b32b"; + sha512 = "1d761d479df22483c576598db8248b3ab6a7b838c518058c6903d7097452c4027b9c38cacd206063816669ce664501c138741044369de04eafcd40087ccc3688"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/es-MX/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/es-MX/firefox-63.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "02e0948d3f4855a9c9e502627cf5d199364c0f0a7ee7f4314d69c9977f8504e43c3dc1cb8e80c9aa6bb6f4d75609108f6aafa8c9acdac31aedb908b5df26e1a1"; + sha512 = "934aabdcb204dcdc80d9e35cf19aaf83dc235f95d597f5b2a6302635275aa68245932f4b5f1b2725ec84711e8d0f2c830aaa45406ada91efa2d21c8b31995939"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/et/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/et/firefox-63.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "776bed6ba54f1ac29836681a99ec673741dd439501b7859a68c1d6645693f566fb3dbaf2e827cb23d3ab993ff4ca290008de7256aa28cc6e29625eda4048db27"; + sha512 = "5b669b4adb7d14eb4550fcbcd05a1e7a1a186954bfba39d491248b177d057662227b672d2902273315c12e9d57bb944ea2df41d7cb35514fa00d79d235c178c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/eu/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/eu/firefox-63.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "7e95ac325fd4726def5aed67ee110693dbeb7953aa5672913c18cb1b91f8a884500e6096a5100e89d9266c28ede9d677be91fb00227944d379a946938ffc752e"; + sha512 = "c8555e93e6cc7d4fe179ad68ad1b2fe3f0735134c8a30bb9911b0bf5475e169e07640eee85afa2c7193b27d96c8cebe2227d38e1ff7499b3470b68a04bff2953"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/fa/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/fa/firefox-63.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "6cc8d99ddd690f7dac9da19d23666e655aa65a576cf912b195ec3f83ece9b5a6677d656a1d187930897adfc021ee3d16e3113a8d8454fb9b4a9f878c615b49ab"; + sha512 = "c607251f6b855fd86504fec3780ba66d8d451d76a16d0541fe5b96ba5b8d809ecd7d591209f3320bfb044463470b394862a6c0717cd9398048a154d6c2b93bad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ff/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ff/firefox-63.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "026976b48352d2c292d27b0df8f17f75f2bbdc0822d89b722bd1e58d9189ce35c925da6de287f0f89e18ac9f64134a1bf5dbd3b6da609da823686acfcea5b05b"; + sha512 = "d9850e4d78d6bebb9d342898bea876d66a9811ac62ffcd56ab8ca662a4db6bd872a643ac233e02fdebb9dc107349d7f0f258ad790ac11bfdd791a2d8336197a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/fi/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/fi/firefox-63.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "8d7621858ba33c340248df277f3822c120b4beea5cfb9811afd61b85fc2b5dfdb100c475d0b291c9bedeffae4ba52bea653d925571af8c68bafae6c997beba74"; + sha512 = "8be60c2bc3c175aedc3a1c062107c5368f503bbea245e87f5f269c9faed3832ff8c93f221815637b3947c474b44be31f3ea09955e7a87d2be67454dbb4d4e9b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/fr/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/fr/firefox-63.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "23f73a32cfa388bc21c1e202886d83a36c21a8b4fd83f7001ce72a911be800d9dd2d49e21cdd9d9cf48a82121d4684802dcaa7d97b3bb47b762ec4c95be49011"; + sha512 = "ac559deff6caa20f40bb561e350129e765ba7f63ee8758dc01542fb5f685262c0bd6ec0d13fd65c196aecb352b72b62d10335d121edcca11500684fdb1be8be3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/fy-NL/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/fy-NL/firefox-63.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "2d3c4d546d1d8f03ab407c2bf481e23bb4bf191b84e9e0da533b2b00a0c8f7cea7c5730fcadd777b909c9515981e61a1fef25fd1037d75bdab15901a877c9fb6"; + sha512 = "c6a19730d2861a20a69ec8a7ded79377849554f21143e3b55ef0b009519b52d9ba2fa0f2e58ef592f3eba00305d0e2dcf44df958ed22043a83a86ed7fa72362a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ga-IE/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ga-IE/firefox-63.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "7f52631104ef48631d2d2d5434a50d1f62447b314329e9571915bf16b246c9910a8875500077474303806edc05993d79c72b60a2b6f3a64389446609092320d0"; + sha512 = "28c68d871e4e025eb22f19fc1c4d786185934bd6254f03061b95eea8459776c9c28a903e30edbcd53f6e0cc5b24b6c65e2311a6483e18620b246ca8ce2fc5470"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/gd/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/gd/firefox-63.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "98b9275029ad64dbebebeb697ccfeb1dfd2b0d51e437899a8417292f2a14421a5a83f07164cd4158250aa08d5e45bbe4c97e1fc7ebf3fa02cf42d7dac740aa0d"; + sha512 = "d6e9b226b893050925259a7de5dfc67104b6defc76778272adb8e5b41427a646549ddf6e38d58d9ee4bd27c476406ac9e65244fc57f78a3ef54d7c7bc758df80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/gl/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/gl/firefox-63.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "6abd8e3d990983094880056924fa60c14efb6c133f05ef129294c7cd83725df1e32a85bc08ddffc22f3e3d4414744345f67ca5f055af74a93a0eaf8838f38f8e"; + sha512 = "3f73ec82235a8345c2e1e86b521f062a5f45bf0fdb884533c22f1661bff430c1a3c440c5fa5c209474c2eb542d1be25ab2c6a4aa50b872ffe34bb66ef2da6e0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/gn/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/gn/firefox-63.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "043471a8b62dc300f1c719ea33a6c8b3690f38876697cf57625e26bf1d66ec2a4b6f952c836359da19f9b346851c3fc20525fad32596c9e91b9f5b23ca1672d3"; + sha512 = "4be814c72579653264990737b7eefed0ed7f332da1317bbff3a0a1d6f45aecdac12552eb0e6897ac0bae64f261de6b46b36588623a8523a51b880d1bde5d763c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/gu-IN/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/gu-IN/firefox-63.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "ae849a0f9350fd0382e859ae9fde0217d73014c3fb7a7974b635b3bb2f7d62087c7b40c62707ff64eabd37ca700faa0f392e737b1ace15494d44fd6a87599b69"; + sha512 = "00670cb7caec8f841f17e613a86554182512e0aa49ff7c8298c9d3c9d364d7fd391063b890461cc41966e5facde0a8a325ac97e08bd0bd9d25858b32c348fa81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/he/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/he/firefox-63.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "49a350f95858916d73aa71be60bc3f162bee24556c06524ccc5d10eb7658e91affe4c8945d92c7c6958eb7c8bb3879211d6096a1912bc4b50a9e35b465ddd219"; + sha512 = "653538026ba533c7446108a2277dc7f87a2e519583d27c028be2b056c67299ceb9b2296dd83f94c3a043a2bb9fbb05de2260248d408f3279a7c8fc49e0e84416"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hi-IN/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/hi-IN/firefox-63.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "a55d2647fa5ffe06fc479675676700edf460c7d7600fe18ae468fc3e13a8cb3cc025dd64bff244b61724ee213835a64c71e51e2d59a0ac2eaaca0a29a692dfaa"; + sha512 = "a4989edea0edf4f509d4387b225340a4b67805b3f8cd7af67b575b1b3b5a8cc98f9a8d6d2a05ee878e15dd8ac2b0c35f43fae52917a8b667098f1812e361fbef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hr/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/hr/firefox-63.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "6d961a7936c46dbdeb4d66a6ba91414a158593120a58f9f454ae77839cfedd5af2dc9d3dde02bd2d36e21f946b5ff9de0727abf44c2ea78f6e618cb84242892a"; + sha512 = "b762c1bf922e72a9cd8570012962fb63c5658de25fa08ce4532c6c96b7b06c0e13bc71b2306219a6e0219a8ef7aef168a8523cf39b1cc1e6362198fac0696545"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hsb/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/hsb/firefox-63.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "eba4e20491a61d9de7a25373bec43fac62b9ac3b461be5e593117ff4d31884acee63c2c6bbb56cc7eeef67bd36b7d3bfc748169fd7fc49877efdf7656813ee5d"; + sha512 = "22ea6afb26555d88680cea7bc1fba6570aa7e0b8517b23f4f5a7d3f2fee285315e29e818954dacd29768642e62a57adea282fa35116a7733c1012d2578647bbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hu/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/hu/firefox-63.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "d78c29d57143a3aa443ff79718afcc9c7ddd72b8f9fa3dfebcd6c19279947685a7560fbc4ba2de42589cdf4d9a71de94e335fd6641ce284fc60418e483895b97"; + sha512 = "cbd0d026cfb693c7eda3f58f0954bad41ec260e307b8a4a9d4e774e2277786420f99c8afab9ee0fc9f7cf7f9e4542904c6d1c1b92c1c3bffa62f8dd9aedd8a73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hy-AM/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/hy-AM/firefox-63.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "e7239c2f90870322c16e9af03da9156d8d36b6ef5b71053006f78f94af9da068e81521eb155abfa74195a83a63f7181cafba270c9bda2d4bea63f9cedf9aabef"; + sha512 = "59315b0561ccccfc031b240b699b019c3b6d2769cda6d816bd60c359ca1a4076c4fcd8342bbff6cd4cf66243dc5164e1c0066bc7821275cf5c11caff0e86a6e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ia/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ia/firefox-63.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "e614f2a89feb9b2555d2d3de019c1c6b74b6891eb4e9b7d9e055444ec923689442e6c7ec8f2d8605236e0556c79827a031a870989635234439e678eaf1846e39"; + sha512 = "2addd61131770c825227639d5d7790bc0c9f0be430077fa31cb11cf74f6ec191f6dbdd88c4e0b2fc199eeee7ecc39c6dce8c790924224ab0603e0af41e082a63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/id/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/id/firefox-63.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "2e5e40dbe997459c14432f80d50075029ef79d1fbcf64fffa527bfffbd5c348ad84a2f2909045ddf98f2b268c26a20b1bec0c00ca753e64782a0e7dda972727a"; + sha512 = "81a68f78f003685e1a06d242ca3c24df27b7a0b28d0a5df2f41cbe9b92e312b32a35608c7e094ca136d6f6356e523c62baded1cc027d19342ba44cf88b479843"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/is/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/is/firefox-63.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "77875a40aa36692f594ee0e714ad9cffcca0d036669f10dc31ce8492c1b372a885642b9a3f9cb85ab94833cd7accd425ea673535fbbcb93d3255ae74711b0ccf"; + sha512 = "cabbb8d0f7b5009aa6e889c983046a5c806f1c077c8e27f7cd148b54a25c9cadb5010acb97b2cdbe6480463f205bd7a4edb966fae0a92a8380439082542dd9bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/it/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/it/firefox-63.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "6e737a1911bc5a97c6bc3ccdf33d72b5b964b2e155672ae583268393b3d9ec785765d55a0cbbdb0deb4fd4bd8bbd2bdd0849ed27ab782116f3d09293f441f40f"; + sha512 = "8d3eb041fccf54dfe389566cd11b2dad4276fee3b902914bdb4a8cf06c6613a39f4ebe7d00d33a1873bcee32f398b0527d4807d08ee91e0accabb92205eff51f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ja/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ja/firefox-63.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "eb69cae70ef52c96b21f74fcf339ae031c4dde08817b211b4deed493d0ed63c87b28cea1d67123fc2f36ec4ff375f8d8a4f6eb07f0e55be87e1ae74d001dff77"; + sha512 = "facf7aa7f639104956f44dd4f2a6f4064ac4474d3c3bf2e355f1934c68831bb774172b719b2f0685435e3f3cd56ed589980d06a1d2dbb6e405a5f5c32395136f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ka/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ka/firefox-63.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "87c7a6872de8829615834706fc76f1eb093c57f9c7866a45a4a43f2974288f05d7a98a3b563b65b2464e649c8a34972a9d779b6386bd904283db907981064f58"; + sha512 = "c8d5407fd932d83fe6d55fa012c9fab70a4d67fc6043dc4c9e18c6f6e25bd4fb8feb0dba97ec7a8a3f1cccfa37c46cae482b9fab90ac29c34b57a35387742b66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/kab/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/kab/firefox-63.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "c65d155fcc48d9b57590bc09ccea6303b85c1a7bffb8ab6783e39408ea271c341f558ca6800eae145baef263af54ed19b882b0aa39ed75b38bfa8a4f5b3842a7"; + sha512 = "0949d40892060b97c1fdf69d9777893b2456d5c936d29876832aa41492c01c1a07c88665fb669d53b8cb91f23757cd14636f87ecfae7aa112384658288afd4e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/kk/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/kk/firefox-63.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "2858283a1721fffac6af65505c26d3c761331df82a7a17d5e107d3b9151cb08e448cf7d80eb3bef29068b9a4d0bc2f268207f86e0afa692a50b8c9e6623bf835"; + sha512 = "30d3e966ebad9eca27d255c20bf11bdc5c6073f0cec8954c568c4abda86f689e5a9c4c2f508cbe09687e0efdd2ea8f5f8ef5de781c3fde399f39bd9b229bd187"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/km/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/km/firefox-63.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "fb77850dbdbd2078ca6b7933fd630550d52ddc57615a789265756b460840cf6389dbe138be82136612762f48fcc8da2f8aecf94c3ffbf8962b6c1dd6f60cf52f"; + sha512 = "f9514178a460bc3f1a6e56878f951208d6afe92de893ff1861e38ece04909535d9a5de8d59359b6de32f0bf4ad462c6958b0b881c3678da074cddcc5a6ad8150"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/kn/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/kn/firefox-63.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "cea7b6c2c1c82b6d5ab14bbcd9345325c826600bb1c736ac898358e9a5d96f0e58eefdbc03190a51d21b4e3ecdc477e6b2e88f493e3a787219dab6970cc3eb40"; + sha512 = "cc229a04e851f479f785d1abc0e2b486f20797ae0269d62cb64aa6bf8a3925958b9271bcbaf0acc3dcd7fe7f39b9077b1a8a7650055d2fceeb2ca6db676240e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ko/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ko/firefox-63.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "1f8b2af8a153d1b166ca62cdbb652e255653e8ecca33eb10d81b71007f5f6d3645cb33613f3def21f6384137ddd54697a880f9acf77908ab0b800a88b4420813"; + sha512 = "6d7ccf3e6d062014af2c59abf03b3f9300a1045855cd6f6c37d8a9c9733ec7c2775fb702ce219b96d6c0aea4dc1121188805324e1f65e5b222190c5fe34a9fd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/lij/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/lij/firefox-63.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "0806dce8a381741d7df769e87061c15df57b6839fe3230be30936be5406939d79502602b02202654d78fa45f284e33aaa88c1d62b4cead4230e7368737105761"; + sha512 = "3ab2e904fd162bada37cb2536c928fb2f5bec09d8023556b42c9b0a77395f1288f65cec792d0bb6def19952e0d49dc6e3ae7a8398697ba2341750d7707c89fef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/lt/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/lt/firefox-63.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "5184b3525d094e80bb16acbacd9e8323f83f25a3a1652d82f0bad6a78f6750081140a6c007a4c2fad8c2955fad2aea07577642341dbef01bde1f7c06947a87c7"; + sha512 = "3e821ba12956af86bedc0d179542cff85631fd20bec53c34c410f5e3315be076634548ea512041241d82c46a88387a830af483fcb35cc6a4d897f09f3fb93be8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/lv/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/lv/firefox-63.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "49f878a62d140a6667a76e89b129f28cef1a56e02212aaadf6eaceed2c776e54f4ad23bbe58c6e013a16c29bf81c06ef942451c726b7372a20391cf75e08b1ae"; + sha512 = "21d5e0fad3bd77c2e414044dae95e8464d33fa41badaa0049294a142b04ccdeb62708f209b5ad8c07d7eb5064479b6f4a58433b0ca7fd0436e62ccbb5ff52786"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/mai/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/mai/firefox-63.0.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "4b24b433fd5c695960476fff3ad678e094bab5d81f9e7cd2d1c6a3c56075f0bdbd4f24f6c6009e0ac5b5a4a25a7e72b2d566fca0f08e6cbada8131b9b5700be4"; + sha512 = "c3e34de39bf5c77cf1c61d3e691b838ac4a560ce098540d6e58be13d7b1760a670f00aff505bbbb417b37190e494e48426bba73cee3e8e2454a73c15975465ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/mk/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/mk/firefox-63.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "2c500c446c3ba9aa6735df3fca9673e056d04b8d8a059ed50bcb4cd7b5819fb224e12fffde3d33d5658adab93eb9f53c296bb422556264eb3bdc08e4a386e238"; + sha512 = "9a26b08ba538caf677e1a2f3f3c98e5c67e51e7dec72e73097036c6f34bbab2d5b77ec9bcc96679bd3ab7ae83c3bd94d2c3307843d82f8b1e9ea95455ec91308"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ml/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ml/firefox-63.0.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "3e743c899e60cea9010c28355f0b1d3f5f34da6c4865f7c284edfa81ae835bb8ba21e378c3aef36310cdecffcb1be3cc0d06b9e7c9ce2ff15482db3bfee93bcc"; + sha512 = "924193b490fb8d65604fc7f61a6f00b79074b61ba437060fc35efdfa117d5014144c285ab149fe7b9dcdb75486ffe516ef1109eb751a6951c88e317d0c3bf222"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/mr/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/mr/firefox-63.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "53864ac115e5f84f50b4f33103d549942b4c19286bdb4c236a794239bd9f40bceded9272c43aa808405eabc2a75ad36d2e643caaf30732a57bfa7d2de4c908a4"; + sha512 = "163b3aee29777bef44bdfb56a637c3fd06c435acd05294818f3993f32f8062d0f1ae4fce96c48c05d99a9d97521e58230fa7ee7a9129b63956fd5522722b5c8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ms/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ms/firefox-63.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "8820b20add1fcfe14f30a4b54428008cf770feb321b0e9aa27a0896c94bfca84aa1b4d3c4c7acaa30ea5a615c94259837bc9539c0b96f6702a3a5b093842dcde"; + sha512 = "7eb5b0f2d0b69e56e01c3aed184a995e3634853a267d30fb5149850269c3f1efcabdda8625a367ffd0b70282d5853158084e5890c1e79078818c19a94630d9e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/my/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/my/firefox-63.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "6a34963674a7448a2454e2b84cd732cf679b65db568f165d13c699651efaf1ca4804b0602181a9dbb301aad7e5dd39646b19fb3dc73469792d82f02220a7d9c7"; + sha512 = "41eda41795d4db0198bf3b603ce097cafcab58e37bb58678aaef7ffad424fb6b9bf462801052a78c9d02092fef58a845cff5ab5640714efaf7eb94adeae2a669"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/nb-NO/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/nb-NO/firefox-63.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "cffe42d175570493c853044e0bf774155e1b7020d4d26aec7e578a6bc5cbaad057c125d30c7fe92f818bd9b2c982c775f19ac5535f606346b46bab095dd99b18"; + sha512 = "d87d4b281238d8c54468196c3a3ac55a2774fc4d04a4e9939cb47f526c57fbc1366c2ffc590d01767bdb14448edf9a11a21e8e221044529d0b0bb83532476040"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ne-NP/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ne-NP/firefox-63.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "72ae1ef7e071b665abb92dd07add0b4023cefb64aeed09638768152a0c15d7370686849199771e7f19272b5df8042f72f76bb02e57f9a304c6dc930d49c2d04b"; + sha512 = "3cb49431e5831d63dd849aec87affb63e170f4feabd6701d520fbebe9ca16aafe448152231b4823c494d0595d23eae81fa79e5b9778a1c1a08d5011e7ad25908"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/nl/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/nl/firefox-63.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "b290a26a41a6fa0b0d1d89076aa5beec4a250ad2ff053e83c19108164c95c78ccb50ad1fdc6e1091605bfdb1a829d108fdd4528747309682fbe472b1332ab741"; + sha512 = "d29c06e0829eb07930605ac1c438175c65029f9635d0feda571c944e91e93332c99a697c47acd55f27f0adab49f46fae5f81955e783ae70cb1247029b0687de8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/nn-NO/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/nn-NO/firefox-63.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "9f4ea82b06102744696c1c842cec65250e4361c6e37607ef5cb8e03abb31bf97ac8032de7120f369362199d4aaae1274563a09f61f04dec07d50aa94358e13b4"; + sha512 = "2f9acb29eeba9aaff86ebec0de7e67a6b17ec48607b5bd1c9c9466d465fba2825d41c86e0ae7492873e093f7ac36ffaaf1c744a5e3ffe0f3b2b5ac468aa43c33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/oc/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/oc/firefox-63.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "e75d1a8c0af6424f7cb7575797c70b230919d840086f4bfef850febe36b863d9663d0dd45c6488528794f7f7356e0042c21dbac8e607689989d55b51cc64f3d8"; + sha512 = "bad2f0d5f7a9a7013d74002ead12768d16cf949b7bb5ac3a130c5cfd1a8911a68da27d4682a7cfb31ba20f4d826ece3578aa46258c8773def49449e21d0bdbd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/or/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/or/firefox-63.0.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "563dc60168a9e686c6058117ec12ab84f55836ff442f606f0a7ae6af663cf73228956c8d12141a0dce0a80d75386623002ede2fdf89c07b6a00379c08d00b544"; + sha512 = "aca0bdc501ca0d4de6f8036b3aa3670ac6044563d54aac931fdeb154f796b2814a420432644a53329d46677cf7b77d5d3a8e4a3f6aab5469708ef9e4364590ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/pa-IN/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/pa-IN/firefox-63.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "2fca31b8ec096191733a1a7ee6ecca37b3ce2acec56be01e23556f68ca7e6d3cc56fd1ff0a3dec7b2bb090d28606d545690f567d6432e25e8b335d7b238fd601"; + sha512 = "e20d542fc62d4610f85c0c02737c294f4ffe14f88da9f15f557ae170c332f131900a59718cd725dccaf282fe29c22c85c8466267f6b0d16464f5992e9876b536"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/pl/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/pl/firefox-63.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "0c2f125b0aca823fb2a99567ede66e18ce9ebe1dfb649f9d6ef5bb4683c61813d9f9efe94c2224dc7ad441fe0f2b3136a3d090ac1335246ea4c4304229c106a0"; + sha512 = "e3848d7706e78f36ff41ad10656976b11ca12c98285bd5b18afb13dae9cfd43f2a38378ccdbbd741b6a2603daa1b3ed72eda4e8f47153e2eedcb066cf073877e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/pt-BR/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/pt-BR/firefox-63.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "15563039e10ae5a6464ed0d20c0afab6d6a3bb5e54bea507db87fa03c48be22d7f325af22f776d052e49b9ebf9659c36ad77e92a22f884a0c443e3d49462b003"; + sha512 = "9848181304658218d4bc0e2c21dbd878f40d3ec5a7d93d9ca6c7e1efc803f957e845344b15f697f347da0a743b7f25bce2e5b822a81c4e0f038380ea95509605"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/pt-PT/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/pt-PT/firefox-63.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "93eb9f47254a1119074e462c892698de6339bf68ecb3c1f3d4ccc9c97758ee3a0ce54cc026b8084b50283f7ad7960245efa9f345761ec8a50b4363ec52d86aee"; + sha512 = "8d9e9f52b80bd790a919442a970dc8e0f19f8ed5b64de22c4756fa9c0f7d1b72998a62aa249a9e8f3dc1caed1e74a07cc91ea15ee5b3f5ed1e5e340cf148eec7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/rm/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/rm/firefox-63.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "96295dfe17a2e066f838add7f3002e6307d1ef7e0212c0c3bc543bf7e3ae3be9da5a49bc6850b3c4b5f5bf46e112bc690824e528eb90f15864d43c7ab55d0eaa"; + sha512 = "ea7cfa4dcf6b3cd3a483b73c8360b525d8002773a5c766887306320d99183b035f6acb9761384cd44cf5cf3391e3fc06d554e68cc95814ddd3548de5ff2e311b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ro/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ro/firefox-63.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "2782b44a49d116e8d15c0df9de710f432195a56cb46934e3d5659e9c91a190dfa49289cac64c738323fc2399058dd9e3bf607fb01d52cc9ee671499c4c29e10c"; + sha512 = "97271af95125b146c4d3655daa99e59c2b3f1dba57e9c947b7337cfacebdda5517be62f14a5a3eda723bd1dbba6437c0825e0f5200f9895fe678ae80708b53ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ru/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ru/firefox-63.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "fec5ece757f19a19e5dd4d92a073c8e1fbde56757e12e038a7247edef11e4fc9daf27264b560ea9bf8f37008432df4d306f8209baf826c537360ed8c6ffbb538"; + sha512 = "e8e3fefa17ae3ff51bec782b163049eb10398cb1a46b2fbc8124e9000ea0a37a0adaeb71794ef392fbad501bb4c04b0f98765cb94f90cdee4a46a30fa07dd925"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/si/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/si/firefox-63.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "cceac95143d3444e6b4a589d6685ef6740ece81b4ea26c0b31b4253a117b4ee239468d404bdd9caec9543e645e9e985304eb8a354000796e2124d71e23b74921"; + sha512 = "d16d3ae7c5b5ef04b09b6c0afcf4fc55f8e47b20729bef33d2278bcf4727703710f27cfc610b78ebf8e9d45f80bdb3119f438da2598a4922a43cdd88967485f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sk/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/sk/firefox-63.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "1e4b31480a5c75bdd350cc17b159e2e14fcb53ba39215d565510ed54cd7d12d4e9d6901b1ed0909140e03e31f7c1005ba8e1a48a3a2f6d91bca1e51490cb30d0"; + sha512 = "3d23ce446b62314b5b6281aa4e8fa7e38ae3ea9ed7be7ae3d37d223b69ab8ab20a2e2d772d278538db8a572b839d59ebf4b7aa40211049f81641784c523e6fcc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sl/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/sl/firefox-63.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "6ce2f2c338ac8481224518bfaae55ff66e8005ef40ca7a13cec294e1b797723b6c3874f96b6c2e4fb78ae526232ad267cfa407b8952d454fa5f4eb40bbcd19a8"; + sha512 = "25e2bb9a9e92ebe5507ecea35302792acb7be4666fcbfe3dc7b0cd8ffe77ccfd514f92b9762346a5a71d55e28ed654ad55752b4ca82686d3e8fba97473afb6b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/son/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/son/firefox-63.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "24ad351629771a6f3ad8d381508bad99094ae441f6ffaff9ec19d8018fc711ab852a42b9d1d0f447e8a4da79c1fc177ee9368940f15b1e89344dc7beff49946f"; + sha512 = "13f167d22fb355b90b02c4d8fd8f9aa38e7f6e626c633276a34088d5ea83e410cf3a0c00d33560c4ab48aac4613cb0d422751f8c8b7440c0fd59b8e8be0ef204"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sq/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/sq/firefox-63.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "d8c80ea61e545f29a8a2b0bb4ee2be81650c131123693f1d6955d00364d67c4bd78ee6c85903d84d62c2405bc0df4f45f08301d1a13c30f6f33cb24ce4e9d7c6"; + sha512 = "f57dc4ec2cd1b8a45ac114b7f838d34f766f4f1f4fa9308504e6c9bfce05fb977e2982c1d83f433a957098d9069b58dc0c578af948b38f3d5f53ed59ecd3ef24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sr/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/sr/firefox-63.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "c9455bec9df85347e6aff71b252f57f4859bbb8f378d274010ce402da0ba6931d9bb0a6d0f2dfdd4d87700ac68b039ada9fe7f673f5fbc7d95aeff738980e68f"; + sha512 = "89ab6e7a42ccc21b0a2c3c2a55b0e3920d0addb4505dcdb98ff6d93e995f18130b31dc92c55a0f72301c59cccbd142f439a24962e19ae24ee25af59c6611c668"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sv-SE/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/sv-SE/firefox-63.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "7b80caa0fafdd82fe1d0e1909656f894515439fe21f6c41a05455a06c89afcd72fed37c846c8168e874da47598d1eb87c676637ed9047943d0483322acb027ab"; + sha512 = "e5e1e25d4c5d1c97e715bb984c0862237602329a786776b3b3a5407e585399fc3d5ea7c8e6927292f25b97924a568c95bcd758e23b74ce71cb7592877a5da3ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ta/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ta/firefox-63.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "47a13f1bb090ea5271aea1add660f765e330b351ea6c77edacb380c74d5dd1939428b98ddd4f4cceaed38af9ca99f6f499298289f44c5f5d7c78c9ee3fceb9d1"; + sha512 = "4f9e44175061339559ee743528f4e7dbe4e9b0a3d92cc178879aa71f1a30fb260be307ff75722a2f69259e3fb13e509228ab86d4a6e9708564c3696ac3531afe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/te/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/te/firefox-63.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "7d0c21a749be9d7bdca8a7b6baae2044335244ce35932d913575cfba1eb63b4cc2a41ab79a5e19b6d3ef0607eaccb0e6303f57cfa9d44fa21deca86a34b52843"; + sha512 = "99e52a537ec1048b63dd77a9a9ccd1e44e8a00af256ad8b0f61ecd4e2767591550a000e66cfc1b3db4819580cb05dd7a76f2d64a4839a9e72dc43e65940afb73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/th/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/th/firefox-63.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "d02a77da738db455e419fb2bc519650d911b4612e5d5e282c54100e719d8b119b5e3119cb458f652ae532128ca64afad1153cf4b3434bffecf2cdbdd67cfc029"; + sha512 = "2db11524432184bff0646b86f665431cf71a1f3389185e1e85312af7cc75be26f55f0d899262405db411acc21a549a8d451b63d1c060fb892040c72b996c0b0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/tr/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/tr/firefox-63.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "87ec0311160aac012e601ed753599019b499b08e73f256d78c68a695ed6c1ecab53095ff16b007a4be08ffe54feb0dcdf31e7465271a3f48928abbcc5b80d5ac"; + sha512 = "90b2543238e92f66981c0aa6cc0e563eb1bd623c7bfcc9a72aa3f158b52ddf8fc7c0b550312cdb279dbb192c3cb5d2f9019817435a17d79b31239564771ea644"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/uk/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/uk/firefox-63.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "d80c098d00c9681220c9ababf0f62b69607ab6b71ba34d177941332450ec51a5b9120e0c3e629e0eaef91c64beb9b10aaafce2fd094f931cb976a99266d63a10"; + sha512 = "cc3973e6ebcc956a626292e09629a5041bdab89e92c94c4ef461e01f2384021b39057c04981d61deaae238bcfc6cbf0eda2ac19e271fb7fecc4c22f42808ed36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ur/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ur/firefox-63.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "98d1553710997d61efa48c7d84fbad2fba5d730d0259b9213811b7a5f47ef1e4ca8940f4e17708e8dfb7949b4fd908bf80dd5e9faaa86b3e3d2c3a07b3a3d7e9"; + sha512 = "0efd6d37984445601e5076cfd19e345c2f0d038d4eb88e4543c90b27c468164ee16bf7695fe8a8f1d6fc2fdec1c8ff6525886da5b84ccb8ee6ceee8d751884b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/uz/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/uz/firefox-63.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "7a6074c2d7f1d40c41a5969fb33839df065fb398e7161ca7bf4d6aabf22a87deaeec7d623f0d36f992f8907d696c5aa53136cdee33bb623dfed94cc402b1fc46"; + sha512 = "61ff04342906c902710dae18b8c83e40e14120bba2276aa677543032bb0667b12ff7c9df70ed5e478eb3fe79fcc1ba306b738ec5ea2b3bed2728698f49f7b1c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/vi/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/vi/firefox-63.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "013c9210066a5b72f9640a5d7d647312391daeadf757e5b13484a035d5bffe2405f80d4fd750e7afe81990daf14baa49c6c4d77cce7e1a60a3483340aa115524"; + sha512 = "615754da0770dc5ac5347f7fd3ab5d4ef7aad96167deb5e7b22714595ad96e59069794abb676bc553b8aff226fe37f3db84c63ee2f662a71bd3f9163698beb0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/xh/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/xh/firefox-63.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "b104815968385980a7bb297d83fea2dba4ec18bd853ecb70ac7065f30e0fcf5fd3708376f8202840d71c2d9e6bb3c48dcfa866594d334dc7a5ae3cbf3b83c888"; + sha512 = "4f82fe26348a515871f1c5775dc0ef4b31fff9a3bf48944379d08aed499bab55b314227e354ca17fe644807f1d2b1f732b8204c3179907c05f9c6d168c7fca3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/zh-CN/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/zh-CN/firefox-63.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "7961e947a3c34343c54d06e62e522f503375d83c8fda6648197b1408ec0916e54dadf6da982650c99d4b7215889eba015b5f1c8e5ddc0a48b9aa6c0925286540"; + sha512 = "2d13d782b2988389d2bbdb5560d494c77d2ef0ec479289ab683a3a7336200d2775577b2508f23587bcc8d3441693c07593c3f040fa767ea19a8adf29ed9b9b0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/zh-TW/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/zh-TW/firefox-63.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "e09fdc1b84093c49fa8918310fc2a44b0285247548941bb5150a5a64ebff12c1ceacd6e8e397137da14ca6d8336bb2411dac9f4d1126c266da679d1214ba6974"; + sha512 = "af0c5f6d98fa4cd4556c46740edbbaa76653630d1b8fe265e63caa54e51977e6eacfbe4523ab29d3b9c9af466775dae5f62b00468cc644d6e84332d59605d6e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ach/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ach/firefox-63.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "f0544809f924d264af750456abd6331af1b4116710ee9149604bbc11745070a76d84cb50f4810307a078e8ae4d2966b6771c318243215a3eef8ad957b8127414"; + sha512 = "d4b255e6675e460c80df56aac8a81a531d90c4b6ebeab018a1c5d333da440d780a89ece811f2a24616949bd71e7471925059b13fd32a3376b636012b0b035f84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/af/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/af/firefox-63.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "3c96ed1cb9408d888478fdce554d577930d2d365d10dba7c3fb7ce93db8032df25ccfad1f055ae849dfc63428afb9935dde013ffdc737f364704d4b693d9d751"; + sha512 = "61ce8c74d62b9b2e35d7a46e0b1284ffcc3837247b12e8e5ae0242049631b5c8050b353ea07ecf7a925e237dec111d10fe10c86e49fada11f007db0b3ef3c29d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/an/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/an/firefox-63.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "87038254a3f4a6e200b5de6b6269adc0eca198e9f2739bb810f00fb028f746a989b50b5433fe3577bf63250893b69b45bc7a5184d2a6c050818e86213b1b64be"; + sha512 = "eeb42821c1e94ab24cb4438245aa018d44b84c89afcbbf271e4905929e6908ddc922768868b3c9bb4e6a83ccb266ea6b4f2d82f4a3a35c527130f3bb2aab88cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ar/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ar/firefox-63.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "a7f2231f026fa90f53952bb9cc7c36663226c87afc6629466fe1d15e379048bb9e464876b0d8c79382536bed850c2f806c1e8b06fbbbaa1c02551f778767ca89"; + sha512 = "068310cf06b3149b8c54cbc8f56f4334eb1a5b0cab1ba5d7bcb899f507836240528d48c3762af4f37e4d5a9a1eb7bb0a5610d66e0911aba47c3e1ead3a0281b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/as/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/as/firefox-63.0.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "9a101cbb2d9b689d05b976035e524f2026154508a3c18a9f1e238e600be0924d36573a951ef3a54a28e62311f661008f66ca8438d40e985357e537bfb7b71d33"; + sha512 = "1487c99d76cf37a4a53b6849501670fa8a80c6f7431f6b9503bd493dceb4786697685bb6d3970c4f47b121c8cf83299225112421217a314640ea7027cfc2c0bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ast/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ast/firefox-63.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "3305cd08c09726e04ee0d3a3f0228092e596641d1f80e5703c869ce5d3588fb37bec2d80a2db5690e5fee5517c8745f13e9bf723627a03b499e59c7672ce932e"; + sha512 = "cd8205327bcef45ef0610c4c8e5010c6eb3b488401b776186350351f433a3dd3639f9c8c7a2fc26c3a3d578f85f49a1f3525a84b40a473443ca81d8d8823454a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/az/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/az/firefox-63.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "138b35496601a577752dc1362dab7a5c8dc8b3a78b0c252748dbd15b1bb1013e304aff8d8ef1a9f5138e4e26dee74149c7f66eef752fb77ea75a6dfb8d388895"; + sha512 = "0a7f11ea5f476e0a45e70bf8a1c6779ba32b96f81bff2f88c8cfd6ff29b6951456dc9aba4146ff13faaa35481c1fdb26ca944709dbbc72e4c11d9854cfc2476e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/be/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/be/firefox-63.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "7f6608f932f96bd84f57902482b691aca966814f1475bbb0479356c792a16e4698a289f944d7462db71e77552f368df1dad3181280e3d0e07a5261ad90c2bf63"; + sha512 = "8e34c1b191e2d2cae88c94d99dc3d5bf6afd8a658601fb723d1b0f75f3dc7dc85b9f3bb6ecf24bb75e94a411f82c56fc88dd8a548c670351f19fc4137ad77751"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/bg/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/bg/firefox-63.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "c284d6ddc03c3bcaf82756a8f9909e12ca193b9b2a21096f84383c71e1dd5ca7369a4eb6c02876ce741ee38e6418e45fec2ad4936e7c6d48ef270ea45ada462d"; + sha512 = "b7ba0be703e7e52abd61e8e27a25ee7a8868c1872f4babf82b3b1775abfd073c4112f738eb1ff9f341c56a15bbce5d5663895f342618e7b81fea0cfa35f3ae2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/bn-BD/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/bn-BD/firefox-63.0.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "eb9b3e070e6a2882a6b43d2a0fa7792f2b8700df9f64ca70e6f616e6237e0cb15c5d5a642db8f7b236c7cb2f4392dbc553072c544e81e0223c8f4d6d85c36be1"; + sha512 = "ccf789ace9b1e5b378a8e37fa8e1c68e52f70247305e369c536981424f6baa9d8bb132475b4af512780a6b881d5e2090ee985c9fc9481c0a0718b0028b516dd2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/bn-IN/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/bn-IN/firefox-63.0.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "73c4c67bb9f4fbc47509c53820319456c614a74dabe8ba14d05b365a3ba9429d1d9ad9ebbc6d1edc7bf18f4a387ed9dd92850478268f2eea3541929558f14e6e"; + sha512 = "4ca51c703f5a394b149e7c9fec038a84558fc2eab0f8ac7a2b7109e5e73207b94cfa998c9fa8f4d2ac4bec65e7f6ebdee804c5f0801bc815dc5aaa50aeda3db5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/br/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/br/firefox-63.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "78921d68f06c26f029f29fea01a15c5dd54f55f59150e08d38e05f640612355a494f72d88c0e80bbb2ea6f54ec26b3a5716c3249f1118202843c4ab1ef05f891"; + sha512 = "750480cb435134377e0d09a1c0b342e104903bcec9c68ba08827ea20027754f55cde63b0d44bc248800f85f26747f5d5552bffb7f5344bd5848d6fd7d72d0269"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/bs/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/bs/firefox-63.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "643d5ebb610d3e83a6ed85a3239a8631c150a86925ddfaf5a4adc87d0a8add022a5e35ed20fafe5e6f1a6835b3ec105ae1734cac6552d79d95b83bd34c1e73ce"; + sha512 = "1d8fdd486341c623b46a93d36bce8ce71e92269348f7e344122b9f8908c6db882d79f5d46b2498e3177df73b5344747f809b6938ee5f59f4fee43a3e1b116624"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ca/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ca/firefox-63.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "ceb8f81f3fde233be921da104d993546b1200ee348b19340f43dc697685b87c80a4377d406dc72080701614896f7b1cdcc27f364a89a92e433639603e08a6611"; + sha512 = "760d086dec533bd4bd98760a9de99557591c9916bfd930de061105bccf97420d2662b9286287f6d92d5d81f37a08bc30fa57874d992592eca0c531faa61f98eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/cak/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/cak/firefox-63.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "04f5dbdcfcfc2b996a912130335ed855612e5fd2f27bd4cc615a369be2fc2dad14ba43511dfb2bf47a9fde3d28b8b5913cefbbf34b89383eb36bfdcdb96cfb3a"; + sha512 = "e6238a1dd0ce26d80b3237f70ee822bcde3ec9149a55a152f24d4f9a44021044b8e15a2a386f731a4d7b026391fa72f3a28055f1f02dcae11d6feff670581f00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/cs/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/cs/firefox-63.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "b82cfd9dc6b57e0bd147f508a38bf41bedbf8fd9c6725434fcbdc8871cf6f683898ff0507e0e2fc202077d234096cea252acce56e6faaca738e60512b3b9e1d7"; + sha512 = "e96e451f5ad543bdcc44b87227190716f0e864408a006043dfebb37d6f5d464e08ace9c98c0fb9e51531c7aba364532a2b3147519bf6d521336d6950e4d54078"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/cy/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/cy/firefox-63.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "8f9d4ea520c99d3595d8ebfbb8732e1bbb73b7d39ab707e0a3f86d3cb928231e1b7d84c7ef017d9f685a2d2893c0b486f27cd4a704f05cd7518465452010df97"; + sha512 = "0ea943b9b5156f4e814e501c8b7a589d888e1a2f9340f0c064b134d2299e40fc766e5fb8ac89ba82e3c5c586b410af16cc86caeb71285b94efde9e171652f57f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/da/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/da/firefox-63.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "28ad6674fdb830d07837b826ead67503a943b7cb2330655b75ae7bdb5f348458f19af37ab775d820a0f0131a6f7d5dda52bdabdedb5b0deccc1605912e46b9c1"; + sha512 = "6e2b71137d36912e6c4f28907b251a19bcb1f6a3f9d830b6c7b3e90fd28c5d4dfd5f31496ec45728141596b6b37c78b3c29fcf07b85fe0facf1e47c4953edf31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/de/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/de/firefox-63.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "b94ebbfaa81bea44e452d0ae69c3069bf100178c82bc28b3d2841ee14dfb4bc2c55b99d325fa4d8049afad93e674d24160f6bdc235e329e9575b49842c731d5a"; + sha512 = "def2445efecbd7a998cf846c438e85e4b751655d36212b46227aa95483b474a78249e46e5d44beeb8a2ceb4baaf1e0ea84cb742993941fa2ec0f90f13f11f098"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/dsb/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/dsb/firefox-63.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "c292abb164b948ba76b13548c44fb41033ec9d394b3d3d710dadb72f666c56d16fa7d72dc5c3aa4543b81ccfd2ff76bd5e94cefaf88f537bfa7c8b16b9290f71"; + sha512 = "3cf731e4247dfc99ac7eaf85001b70413447a5409518a8aa7791e8affe85efa703c607ee9b2c3896b1ab3c640e0d80610bcca3600b057c8d0c09cedcc9e3b93e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/el/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/el/firefox-63.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "35e01baea98785db080f801b911023c6ef3d5bc6c61d8e3a5e8ea1ecf7e51153e4f2646db7a8fd32dd1f778e1804cd2065efc28e8d79e8475105d9f12c9b0a7a"; + sha512 = "8ac061359a5806661eabe8c5e22c30ce795b0e019abf6f2d6b673d37b2842887525a4ced40b6aecc6fb2f02ec841d309866fe638f105ffef8576af5d3fc6cb9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/en-CA/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/en-CA/firefox-63.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "ccf68a4f05f4c5b0dbaec25c69fe66eb9d1c23f3ad21e6fa2be14704fd5227fbfbac8d46dbd036a6e17f0e94b58a4fecbe91520da45d56a2901074bcd7031516"; + sha512 = "9d62cfe7f055db10bdb8dd152d6dbbc40ce12b9ef4fe59086fe9818f87d95c9ea79092d25d3bf8a34cf2977b28a505f3ded4406a864d493a6f4bf2d625bf124e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/en-GB/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/en-GB/firefox-63.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "49eda2efa176054adc5579ec26a9da92df9903c16d989d761b8b566568740b135f851e5c2b983512b644e80074171895431b3c1689708dda9d86c757dd7d2599"; + sha512 = "ce98acdad497391f8872ee0c41d2fed73a51c0d52e8e812aa7a426684bc0f39103f95cbda3bde1006aeb95d8662275211efd32cfe82609a344178089153db2bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/en-US/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/en-US/firefox-63.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "08e3ca5f859a531b2895a5442734112de9c450bc8bdc2eea9a8fe3231f3b97b8a243cfb408311c56c1703dce63fc2f5201026719fa01b9c76061a204d59942d4"; + sha512 = "06d5c79c57ac5b46cbd452a3a095ff0b87ed9a4cdfdb02d73d90947c29a8ab4c34f2bfc3f537a0dc2e60c83350531aae07f58d1808a08bd57a79bf2881144ee5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/en-ZA/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/en-ZA/firefox-63.0.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "7629e33144c955d015a17bbed4d1e570ae74045511c6ea1db9131b711ac58c67e76748e22ecfaee5b594651f7c736cb0d6d87697ba9dca46705e5328bdfbdb2f"; + sha512 = "a162dc2aaa5f2036849bd73bf0014f073235c853b3fab0e3571c08a85f6fefcbd9a7d3c033d5515126e72eb1cb54ad9f68241201ca9bbc786253f0c84f6e3590"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/eo/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/eo/firefox-63.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "13430d5a4462e8e00467f0d39d2ad03ac684e0cdebb21901cd0ee4f2411794794cf5024ec51d915e3917660de6077d6dfc08aef30fe6c342f5b8588f07883f33"; + sha512 = "1639bf250506d4dc4aff272ab0517c76eff75cc3fb4e8e9fadd2028f877e204d0bf19e3eccd7107fe448f1372e3f6dd19c99ad2f8aa1891b1c3b2dbb4b8c34ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/es-AR/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/es-AR/firefox-63.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "44ca9daf57afbf9dccbb158712e9218d87db4254855838604250b8a4254fed7adadc266e3e1fd49d23b34ba0176dfe5f25fca42dd5fd6d1c322c857337de35b9"; + sha512 = "b9afb2474208530ca83b4d8bbd59176f02558d21143227f695a8705a70b16e6089d86316105deff2c89b857fd14a5c5bbd6c057aa9b66e9ebaaaff763321a86a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/es-CL/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/es-CL/firefox-63.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "09e43c14a99c54ae123364ceea46ba7b1b38e30da8d15bdb734b873a63e37b6b4292edb6f8ec4ee731e97bd12194ea76ec35e710d29ebbdfcf7fb41b1997934e"; + sha512 = "134eefbb975dc1ad3f98cf340b0c544f084bd2a1bd1432594bf228e0a23e402461e936e777ee3fe0c9a86bfc59947c35f6c6d7cd74deaf6cdbf1224c9fbdf4ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/es-ES/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/es-ES/firefox-63.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "cc1f5b4e421813c9b044c50f66a28f9204196f9ba2574ae537dc3040d04ffb6eafcdca971536387cf2d79c4c35de5ae3a5335f4796aed878aa5ba817dd7bb308"; + sha512 = "66fac925408ea40d3348f207716e732f878bf5bf5837499a9a27a9b1e8e4a9210c3400fe90faf2807aa30d49f67dae2324e7b41d80a21daeb531e907bbdb35b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/es-MX/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/es-MX/firefox-63.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "5ca49c92ea11127ed80fc48c5699ef541287bb6f53ea7ac96df990e7a82854cf8bfa8c61f21d0bea2fa245a3b0ded7aa7b3afb662b1639c421525900f8e7d688"; + sha512 = "e1dd051782b59f9b2601b051459e4f23bbf949b0d257dd70cd8bd171429f661274f3b7bd5d8d16a5daacf5a08a488db85b462c667c3c3ce0ea280648c5b2820c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/et/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/et/firefox-63.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "074986b9e80ccf1dea362bc7a28f7e44d2fcb9c19878a8456e63b64bb1e0abad293b6dceb6672bae200cff1aac1c774cc99faeb7ce52d7e6a4b3a154dccdf4ab"; + sha512 = "9b46809e42acaa8dbbcdce1df8f7471d20cf40b0a84384edafaad1a0afd17a1f2385c6d41d7eb5b472205e80c528e3408282ba0d81cd19b8d92c7f0550c4a5a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/eu/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/eu/firefox-63.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "b823fa6c5aeced11c6e0878e11cba561a18893e531c28e9d7713e449905225ce8aed35e1240876976c4335e958e6a68d5e39037fdc59e9f0e900d5d822236c89"; + sha512 = "790dcd461764cad902cba93054c35539d2aeb30bb5fd3a6f940ae125368944e20fdbdba9899f3b52b6774fd27fe73a13c0eed7e269b20a7b73dc4fa123122a1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/fa/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/fa/firefox-63.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "e842e26e5095f008fee36f7b84a9932cc9ab868e9145d92f8069d2f7f24017ecf538db7d0525f7233bc7cae8a2709fa2da8bade077e864cc05c1813ba4a1ff57"; + sha512 = "4e0608da711a17faa10b5a043192b52e6d88360752d9c388e173bbee3de86bddf9693dfc75cba7ac42153e95a8056c6d0ba48141cde476b524d1fadfe3a3bc10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ff/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ff/firefox-63.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "0eb63c6a996dd29ade92ce88f2f9065da63737cea459d8b2e7c79356b51b43eddcb639af9efa85476f500885a249b77347964982ac297cb22adc501590dbb8f5"; + sha512 = "1f50eae02bed18b0230c824c9768b13e2ede4c622e42120f6cc684f7cdfae4753eb31f867cfb272710b2fb2ad9e649a99d2187eeefa74a5afc1999e002b6cfaa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/fi/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/fi/firefox-63.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "db4da21885411214805a45bf4279776144c3270845a6dba20da95a54ddc5cf3205132ce2762ee997895b7a6f83e2f31cc618c17668df4d4211646a1e3b24edf6"; + sha512 = "5f089861d3a67b754e5ddad49858789d6d6ee309507baf9ff5198e011c26f970cef54ed37398458a3729beebfe9451fb16981ef32607cf1635cc40b7556a7f9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/fr/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/fr/firefox-63.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "12f3fbcd0f085f4547a4406b25d83858425a4653ea9bb2bd5700e21687c2d2ec8e1a032f76a242edd72be99813cabea3332c18921f16c54edd8c430a017e4948"; + sha512 = "5f8963809cc8cc33dfce49b2ce7e44c8351d8a3d193766eea99c668533abdea89d53233ced42c9a8d57356195a3f31f549a486a42f9f06c8ee6d32720856ab1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/fy-NL/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/fy-NL/firefox-63.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "033bc2ffed09faa76e67258bed77597bdebbe20eb0a8c17765c7f3261e9abb7cec558aeb8dc913344e4d0179b85928ad49c71979eb6f20c6a092fb7d68b9b8a6"; + sha512 = "50e1a6c68daa2d330ce9f8b070413e100bfc29f7a0f1a7794c58473de04961ff62f776e2c343452ed6ddc3cb309f615ebdada91e4d259e60f066398068141e3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ga-IE/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ga-IE/firefox-63.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "5481287ee60e87e9f71baebe196254f30f6fd793be8b07e4c216bbb9af3d81c321f0cdf77d4459ef6e50c3fbcd7ea6929eaff38bdda2f8ec18acaf44495f7b9f"; + sha512 = "42b2b796a5ab27137e5207ead28daec4d9a0a0fdd58336064c30a56f13a4389d49188c91b6d2101d49550b071584ebefb81d1c3fcc3d9948e2b14f00a7c0feb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/gd/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/gd/firefox-63.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "5ab61163854e8255e8cfef5ed8674f6de79cd084839c65b5e2758530135acea5dc159f7001f3ee26f9bbc6d931bf1fd0fbe360a3a570add9560493a8b7e18629"; + sha512 = "794193059ee643092981491b0c32886e77be4faef7948c5db2b79a76e3ad4baf30dc149cc63d935a9210c02ccaa843521398e9274dacfa6f98ef4f49caf65c70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/gl/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/gl/firefox-63.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "ce59c0e9cef75ad9b762d9d8c31f5c3606c047736ef20fca91a12376ee15bd67a46016d0d84da7303af61e78f1ebb6be0d99f343dd2cced01cdbcac536b0fb87"; + sha512 = "3a494f60eefef37ad8b62b30d1e32ce9e783bbea29e594668839bceb416d6cc16786a95f9cba06f31b027b4bd40528738ad26c955adac3a433ac083e49642b90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/gn/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/gn/firefox-63.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "c73b5e5b2ea49fc13f2acf0397d0f98d0178f25ee2ee303fc0647ee4f939eaa465d329affb2e3a41eb6a0d46f413918b01cb7e01b3776f42712d81472e1cb325"; + sha512 = "ddc555b5f0aeefd9fd435442a457c7c37d4bf4e338b16bf10e1f1798735c52a758b30beab270f03d425dae187bf9d83f828afee627c7d0eb3dc7615bf22f684d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/gu-IN/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/gu-IN/firefox-63.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "3a98d619ddfaaa94d0696d05b940d82d12c6696c98dc4356190a6c6a45a602abe14e84888a2282f6b685f26d8954e3efbbd0778b594ac63ed629e922d91549dd"; + sha512 = "a3b67578d9ab00920489d088d59f3ff1845319d9b4467ae3854ad9b08df72a07be94f2436f93db7524bed13a467ed0acf1d271dd6faa86ba9ce74535aee3d35d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/he/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/he/firefox-63.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "9e5fd865c107b2b9daf9ebac3ffc1d0c41b35e5d2b10c930e2cbb1da4aabe1040d4c522940b63e42c2cb2dc0923b851dd6a8ad9fd65da73026d9bf2d44dcd238"; + sha512 = "a6da54477d9a4ba632ab0c077904ead3f83c1e268781ca2bd8fbeecf15da62a3d1393c8cf316716c3c22f7c949a48e2cc7e90bf6d394b5dbf5559cb8c92c8097"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hi-IN/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/hi-IN/firefox-63.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "0d625b2ba90172d4e42e17ed7daf1b030ddbaa4327f9d321c67beb0c71e20572705bc54b9ac709fce67384dc6d188fb6832ff7d6e85c79acba8c975cf06455c2"; + sha512 = "708c9f75ff02efca7cbc7a2483aba15cbe1b22fcc5d4a743633d027afcb22a0ca5778fa05ce40786279a1d145f75c4b9bb64a16bdcad87c9f6f6a439ff748fd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hr/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/hr/firefox-63.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "317c6fe9bb37418cfa8fe2d48d5afde58a3e5c192d2feef515865ad4669d65010ff5ca0f82efe22003f9ca763cb132798e1c86216f3ef2875178d367b894d651"; + sha512 = "6cc028e94748d9133887398299e21f70abffa4df216ab629eb579270be8c5ff9b600fbc2094b9d47ec60c577a2158ef3d3e81d63492954260d4b53bc19868769"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hsb/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/hsb/firefox-63.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "298dd184b47db389e1b40872dec2c40814c063ef6eda8582fa6fbef647b6f91e11d49026806aa7b5f735ddd02dd48128adf8c5f9bfe17f4b9bc9e6c01ceb302c"; + sha512 = "81e8f54353a6279041694ff9e95eeb730d3ccf7438cf0b1c4c45425144b3f9e655656b9ac912405f85b9206ddd37ea31bcd6e975b25a14b179849a33368c0693"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hu/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/hu/firefox-63.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "53df50c2e877dab2bf1d7ee40312f77bfac977ba3a041f98c350c1b9d188b539d409f460134f0e79d07c6a3d53fe063e53b1451fd84e7a817b98d6f5b2564717"; + sha512 = "cbdc13d964387f0a5add945cb5f5f71fe2d4c6da9d37f77883074a5ffb22121c293e7c665580bea27a43d98547e2459c7d42cec60af80f44b0d5650b3b6d9042"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hy-AM/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/hy-AM/firefox-63.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "eec4295b544ccf4ddd46176e3b391b42c04d2ebba73edbde24a6cd0043c31d5f06e7a1e6cb03d7ed02327a07f2aaecce7d8c55f09156f413ae3e8f2c18f08649"; + sha512 = "16aa31cd906a9dcc41cdee45e00df6fbffd1fc83fe9fe5a7c10e0b6007f3ab542bfe328b456f8ec68283a6633d63457ce61dde4661283e75917a0198b38c1a72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ia/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ia/firefox-63.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "b9bafd5b616722d5e0b19abe9e2080ede9c0e3d2e971cc1c00f0e3d2678489e5e4268837341fa7eed34e2076c69880e7ec726814729ede4731fc1336f4b5269f"; + sha512 = "f622f1a1c95bff1b68beb21398fc22e88e05350a2ca1d6d0c018db4d30962f1b5ee4bcc0b9fee7484b02bf06326596f702a1a9e5b0acad5e0fdb73be1c1dab45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/id/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/id/firefox-63.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "07a271e3c9b479018de9184b32bb5a164d3ac2ce5431bf714f3b53ff7bf5c324e6e9413b514748b6ef84e2e57b66145ae775b5116e88d1b695f5c9dd001ad530"; + sha512 = "9d44617bac45ccfc191ee02a3c6f994734c9a1bbd5f6cb160808361522430a57798493a33b774eeb331846c99ac09b46788e06abfc716a0a634324b2992085ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/is/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/is/firefox-63.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "f101472751e16e29c2928e3d19acd25afeca20abf7f943be14297e6e03762f67edab1ba59db5e22b8ffeac398208083f91ad97772905fe3436e7daac6d554fcf"; + sha512 = "6c64320f40b41fc0ba93b94302d83cfdeaa90992681a5ef810399b35fb1f1d40406b2ed80148cecbf6603bd9dc1298dc6b3b334b98a13ffcbdc0b2e19615051f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/it/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/it/firefox-63.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "dfa7a5f9cc4c53f392d061b8bc9491dc541deecb6ef5bc7386a2bda353a8980dfbbccbd16b5a2c167cd523b4f52a9993403bd44ab05b38e03b9b0308a61da261"; + sha512 = "deaf12ee7fa25a650116dc21b2507df41ed0535821f43cf7e469d870154f4e0d9d66ade3ed3463742e1c5b28d4526f4cccecba4f3995178ad7f6b82d29ea0e88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ja/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ja/firefox-63.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "b84f5317b7917be27d1d93d39b0b3ce0143396642d3f5c2a41a656f16074b31aaa549690bfba0675b3ec8cc2ada383929745ed2823ae6afa399bb7407557ca24"; + sha512 = "e4c1a5724c77bd99d9d10bff3f9e011f35bc130aa711e629df458e7ee46a3bdf1fcfb4bdeba4852bd0dda773b8327bb3ddeba2115406517c77d0f4d224267af6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ka/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ka/firefox-63.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "5d56a8f8cfa5132c3cd5cc3c1bbc56cf3c076eabbf21f98747c493c3b64076c8506150262ad65cb62880e31cc37ad7a9ab5728094a8d8e1f704fcea145c3a049"; + sha512 = "1040735b4e1f6616ac9b2676b7007435c7423116e5fdcf8a0a9b472c5cb0c17c089dda5d711fa10129d6bb1c84082602adf20161f5d6d560fbfa12f6225635c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/kab/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/kab/firefox-63.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "d86d69559d9e7eec6bb111fe05ffb380ba49c2f47a957e6eac8470f81213a544ca44ae685456e22644b08958c54ffe5f815b0812bd045514d1f70a08a5fe9790"; + sha512 = "511ccb5a8745fb1b93fdd49ec9369498b577a155fe5134b9990e6740505f342e76b0da136cb3ebfd2a15921b677be7cab6099cdc8cdea9d6040b989cb12672db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/kk/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/kk/firefox-63.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "0cab56f34acb5df1b9a83c48f1a1d2f41c68e79c7896ee4da8ba11bd44e3477214e59697c9e9efec802f633171177ed2653e3184c000d145b7d73089a33930d5"; + sha512 = "1e5d5aec9db2fc36a56acd1d9e723659c3425ab4f048966f0550eb1723ffa27b0b91acf8daf8cac9bd6f9929a5fd880edbb4ec1aa4359282f4d4c4532bd6636d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/km/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/km/firefox-63.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "4fe39d6a89138111c2e98d1f449adaf474d3011a966c4e17627f9793d599eeef04cc1081c6cac85df235d8854db6b57de1548834abcf3a96baabb30c797e9073"; + sha512 = "76063e3d83454f4850849af7084d9489baf4d354001277a9f606a28db089e589147033c132320b34c59032b2dfc7611ee52786c960bd280b5426781a0a0b7be3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/kn/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/kn/firefox-63.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "563dca7d5874717937747a1771a9ff32d2012205e2da9274f4cff76ae29782d92d7a20eec8c792564d3a4929458cc5c2722fa38d8b08edcc879dc9ea184c67b4"; + sha512 = "14fdec60154ffe181f00808f8877de3b045c72b91b0a6c017951033eae786ee26e4f96555034b8161318edafb8ff07ac41203a9bce91ddc20215be87571c5e11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ko/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ko/firefox-63.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "69d10aa7d2b91197bb9062ea5bcf1b89e08cd474003e4d9c203f9f4c7df14dac5b991a15c74fad38843d2534ecc5b08878536ca45c2b80e83ec4c8f6168c5acb"; + sha512 = "7990af9dc0df8f9fae35d928ee5b476dde1e12db6294f5a3033d37e73e44fb8d0bcbf7916f79459dcc6c8f05ef065ff4b0dea95bc2c342ae81f2161fd61b2fd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/lij/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/lij/firefox-63.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "01bb7b7bea7e528e2fb4ad910e591642539e68a8a3771be2b2d28c3f1b54e95d74394f3d9411d8ae9bd13f991ac4dc788e98cbc8532a552fd70e83b6b3cae38b"; + sha512 = "42faccbb1029df56f17b94c7a5d9e6f6d5fcd7c5e6b623a6fe8f89f143c909961dba135e02d0ade1bd57399bed1279a61ae16381402ca391aeb55761428f97dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/lt/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/lt/firefox-63.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "0bb6582347ccdf31dee98a09577380f7a66e8b3222127fb222000d64cb09c4d0ab19d4084d98be2b47ecccfaed51793c1b4fa263634f61eed059da27da0e42bb"; + sha512 = "b4079f36c1a4788f8da2a4e1efd0ab4bb166ec45dcda1ff0077746a85ed5d34b8cd498a0f1d12463349d4fcfae820db39946caf7e55f4ae9ff1c9ec587a95fd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/lv/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/lv/firefox-63.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "3357a5fdf0e41b88e13c24c37243bb8bcefe75134df4944f286364d4f926efb9188e66a91ead78c7d9228275b394a8375ff9f24ac83489c987b42e34132d9224"; + sha512 = "5a8eeb1274c30e57f7ecaf307e23eddaabbd7272128063ece88f480c7a8bdf96efbf8d2db2416e0232773457b10474a531ace2eac264175e590050662c8d606b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/mai/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/mai/firefox-63.0.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "172783f25dacda040e65ac980d6f3d33125cb6721c2c3568255a27f494e6d80beae3d61783171448caaca89358735a4c3b64dd9be47ca5c904d5727a3e0ab419"; + sha512 = "b2ff3a58ff0216df0d980c941648e143a3dea87e1c90c4ef1367a3a75d5052b1c1e54b07476602a91adb691bca2fe4e9b70d89895773b3a021944257b0429518"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/mk/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/mk/firefox-63.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "8f3b31e48b1b423df1cdca1c240db88978f8d03a7409727842339096f5c1c6099e87c2fe1d6a122a6874c080b61ae59bcba1303479d80b944b4cc8d938eb7a00"; + sha512 = "4ee9b4744ed73d866d6d2e73d0a9aae983d063af3fb4e313e8c6a2fec055b10bb1d414cbf87c0909119f1f804cd64eacb981b5c17ecc87e29ab246d736b6f9df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ml/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ml/firefox-63.0.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "dec1bae8329c9f8498fa9d95547abb2c2ec737df03b63ab44600b5132fe6037454070ab3bdb2ec0be1de48bb97c014d985fdc8530b97803c4202793a14e5e6d7"; + sha512 = "9bdd87f047491ba138796e48e46dd4fefbccac03adb4d652978d51b933327f007ca89d41929c075dc61353584cfb5a3fbd94986ca791750117b55a4ed65b7994"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/mr/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/mr/firefox-63.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "1e876518b8c73eea6aa4f51384e6ba9d7dfa983e7ea878bbc26becc248e2badd4647f3a44d273e33a742e5b6f99ed5ad364d621eff314c830612e0971ff268cb"; + sha512 = "7680c9af0d556599120b3d8a2883a4bfb9bd0dca47a2d2b3dec669fe2852de39c134cfaec0f53082b269245a28588bc699250d438668264c778c7cbf3037a50f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ms/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ms/firefox-63.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "3c72bd0536ada586d31d02cb0b59184889a064d09cf30f73bcb93417064fc6e7905fe084c554d249d0a29cc6ef6c57dfddde7d97d658c14958861397455f267f"; + sha512 = "ae78016ae552d10f4220e68259b464097464081cc2b3c114648a6e36e4381df7e9333f7c13c08e0346bdaaaaaadbbc9a111dea55cb6b4daafef29ff0b0db5afd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/my/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/my/firefox-63.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "1118b4d8caf8dc2b4a4aa6ee01805bef409e9238e38182ad8561bd8cd1885c22e2462b7baa00355aadbd103279ac0aa008299beca0157356f49773040916c3bf"; + sha512 = "e682f1e998a946053672d61f880a75472d692ea9f7232df9e2a51c6b3d27f7d5496138144dc17a56cd07378b20bde48450a27157782e9ff0463ce922c08c6e3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/nb-NO/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/nb-NO/firefox-63.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "b0243d6642d51e9a81d58951e9251cf586080a7c90849adefef1678c856a34c0cac710752efa4f3cf1f9d099461968d0a15327d9610bf1792e451bfb38296c56"; + sha512 = "b6b68de70089bc3f02741de04138922b3a4b6ea760d5b43c00bc636a3f60fdc510886e76b989facbc4db23e72e0659db9ed38705c8c56851ef9cb9209524d58a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ne-NP/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ne-NP/firefox-63.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "668498eb589927f92fc53806111c47b7b130d08c53c8a3d997edab4efe52ac7aa1388dedaf976fe46cc45603249b99922b803f32b5306888df194bf4d6547aa9"; + sha512 = "057ba9953a8ff6824567de1d3629b7d995924a7da49f9b03e1b5e872cafe750dfafe05a74b72cc360c932237445712bddb646cad2a961523d29a8b5327ca3bc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/nl/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/nl/firefox-63.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "c6db81626bfb20724faadc34e113eba0cc3da7e251d1ea9e859ea4b1c82e2d8ecdc01ae3b60c12eab5b071e62c3cfb85a28cddb43573a9da39d3a07cbe78b7ac"; + sha512 = "abfa808668e527940d7f344522650cccb4272555b67e4d90398faeb7aa31766002287c5e73f259b2ebeafdba890b0ca9940fe0bd12926f8b748ce172ff786abd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/nn-NO/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/nn-NO/firefox-63.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "dcac12899163fac3d191104542f1d834a2406388f69faa78b871106408772a0cf01f73caf267cda6731e557cb872c341d6ddcaa1be9c972007e7a3cd9c0781a4"; + sha512 = "e5048346227c41b20534e71042a911a74348e403283ecbcd3a90f1ecf3154907e0c7c21eb26b67f2ba09a6e8d04200c990f7a4babe4ea5782a847a31a6a880ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/oc/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/oc/firefox-63.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "1318631847b588dcf4662a3a82a80fb8bd1eac1fe1e78cd4bb5b1bb8990bc7c2adceef1dc057df1ff54cfb195a05612fc5957ddf22bf8355341d6744e1938df6"; + sha512 = "ec1f24de15020cd6a16d95d47db8e2e73d1b3aa269e27d30421c15e3d71b57625c10e7c20427fb1fcf2ca7b2e1aeb0f16b254c1107aee28c2e8522fb535d4a5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/or/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/or/firefox-63.0.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "6d9a2af2ab431eaa6205958239e33d336f11ff789ee2cd62b90533153ce41b9e17ce3c8204d679c8949c1edbbf493efbc96d009b463e5ac96b3200ab8ab7d707"; + sha512 = "c55f10e0a9a3cd3403eb9167139b4c6f0e8a5f66e3f33b12efb40bb6b2bbb7d1dc2aa365b1ab375f41da34e7d21d2848223934ffd2ab61fa93220bccbe9fc720"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/pa-IN/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/pa-IN/firefox-63.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "e7a0b4ff68c428d0028eb098dc0f1da82e14de691ae77d2d94e32465ef50c8af70dc9abe21f92db4606ce4a42d443b181e11bf2157363faad874b07f9c0e0110"; + sha512 = "f74dd4d54680d94ea270bb7755f6ea4fe058899cea2472c08ebe5f34b8323be7157b060abc83ec80aef8f2ca63f3c806a7a4d831a4e72025ad25d4ca40783cd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/pl/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/pl/firefox-63.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "780886f9fa3136ea6d3981e2b63124e3c625acc971c144978840e254e1fb77da5e65fbc7b6b7edc6a363e5f24fbb09bfe16bcd89d3171e6e92efe18a58946e54"; + sha512 = "05c82b2e08f65e37d4e82fd93d3d2ebe6a5d5441ab11069cbc66b18af0ed93e877466daf1d804c53ac3c712307aea475c99f922b5064cb551d136e5378e23765"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/pt-BR/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/pt-BR/firefox-63.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "d922b1294bb2aea2019034e7af38b9f01cc7aac316a223ddc54137219f01fa1a6d34b23830d82dc9ce816024532cf0535d2753a55b36e952da1f867e487924d2"; + sha512 = "c8f2d36ada67a2fa7717527355a0e083ca5891ece1de70505efeac51dad5f6985666e2be0bdf23ad0f4402d6ee96fa2e12af50369297a3e46b9804cb0b830c89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/pt-PT/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/pt-PT/firefox-63.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "86760623c1aa85efb05fe66929f1668fc6c7b2f631b77c9c93d1b12a23c6409345caebc25a70a6891f480dff2112966f283e3658e08951a49bac700de754c975"; + sha512 = "5e4478ab220636c747ce9c5564a1b71554b1c67999722bc55204f747d0ad430eb2a0b71336997e80ca391d7680ebf92c66ea7ef4d25dc568f8c6860cd31ee26b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/rm/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/rm/firefox-63.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "b66f542b8ce0e878fb9ad599233adc136a20e09f1b77a82050273e16903b56b6f3f8f94a33fdc7a2a1ff0eae94d20cccd4ec6ade8c2ddaabad3c32547303d5ee"; + sha512 = "67438f3cb1a89a0258890448de6d16be5f79291d4c0989691d9c8f38966a7a4ba2f8eaccb26ee4458a81a733ae9513555a22f8b57652b4fce1eb1e3ab2368848"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ro/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ro/firefox-63.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "393fdf5d1ffe51694b50f5027243d19c2f1d5d25daf9ad88f14f21ce3bc3e0d5bece8cce2f3192d263e873a8e55e1fdd6ec22ce014c43c71ae9fe9833a7b0df9"; + sha512 = "3cdc7f593af3bbd858285237a9ffaa07aa76cbfc67c0f7d22d5cf261a19756ba3aa8971d54a10b820344beb509810b601faf0cc89c86636bc60ea1a6d8421873"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ru/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ru/firefox-63.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "a1af73215c8e3151e45e8a0a7b1c4eee51301065b3a724f904005f41101018eb11313319c1b8206432c4958d5a415575baebc64ff782b4e3b993b71d4a66e829"; + sha512 = "7b6b03cca2fe3887d7ee86eeb8ee699157a6cd828108737e26724a48af72cf3fe326024f41c6afc13f7e332c262a4e991728ad5d46ac6fb6942c5c3b4ea93a9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/si/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/si/firefox-63.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "ee3a7b6b1e9a5b10661390b7f1d1fa61ef9589d59e4f869ef8ff6c4a1719fb15014e2abcd8472769c4a17b3f74ab7ae2671f3f79ad94a1d3d875f2fbdd03eb8b"; + sha512 = "10f9fe43304931dbce1d0073ec4e827f369291b3705b322a3f3ba8f7002a974c019be8f5a594d8c88add527667d9295a27e85f2b1072e16ef1720e9e433111b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sk/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/sk/firefox-63.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "478eefc7afb725496e3a17615c8458d29e44dc200dfb4534c32cd15d3c45ec15ddf9f5b1fcaad312e00d693a06d9bcd116038177d9844273a64f81b531b6e676"; + sha512 = "6b90fd21c51d48ca997ad47025aef3a4280e30152a0f18d0ab8948e055b80e5aa7cf1374b2eeeb1432d8892fb07de505adb9ae6c57e776ced4c429859577f040"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sl/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/sl/firefox-63.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "f07fae5f52528899ef3dc680ecc551311496125d9c10c2117e35d0ac8af387d99236ac9a3f921a9ad2e40102d70df91fcb43526ccb8910d5ded1379a42bf5914"; + sha512 = "55faeb2d5310266395a442d0d9ce4a1020197d0ce7655caa8d00efd022db9e1c9926b7418f4cfa380d04e1971ed47e7025d434a36ca0fe6f58f02be7f0e26a69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/son/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/son/firefox-63.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "f20dbcdea88828cdaa4d9bc2e8ffd2792e06929495b0268814808f842c1bb9ccd87f86df16b005af989edd3c470d53ef6254288664ea192d15620ed10ef2682d"; + sha512 = "63f104da43ff4103b40e271de6c962fae3d77891f50fe5b39698d3c2e382b4234dad41a3a64794015ad88d34a7e2b819c0ecb62b1bb44a4d8e83eadbc1803151"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sq/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/sq/firefox-63.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "9a548ee02d1290c112ac3a72be6cf96163cb67448a8a5ae00a88e3e115f907945899cfb5a5edbf3e37a13c16550ebe7b6f67f94c05be6659c168a5e0043adc04"; + sha512 = "534ce38e5dec85de50e9dd541f6d8445e95fdfac074a51866c993e97d020b9a310abebffa2162fc513572d202f9fec8e3a267207bf9c401b27c8541534ee2aaf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sr/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/sr/firefox-63.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "ff081635cf761293ca77ce7d3574e0a1b6a57d7dfd5649089e9554c27b85de544a39b2973205e293152a33d69137ae373110a884f6427dd58788c5832caa7773"; + sha512 = "1174da8c998cdd62370bb8c80c6a47360cdcc84144b03ab33f10367b5622ecf6ff3058e4f525e46ddb523f13e29b6fe557b7442dfec92956b34eaf507bd5f8c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sv-SE/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/sv-SE/firefox-63.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "28686a08fc1c4cc63a084cbfa094e6f1b8ace446a5746f3892ea37d1b916806a15641875ef08c850c316059078a116a2060294f754e722d84d1fdc2817ed7618"; + sha512 = "7c24f0d4552ca7bc3076b9b0485c757e0547713a58d09cd568e506e37dd6133c5c7a7ad3edcffdd387cc0c5661d3602f4252d778174bf78812788ad1daa9384a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ta/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ta/firefox-63.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "43b3db7262fc43b19f66cc586af56a404b6b0feaa98d31b53766deaa8d4f5314279dd6aaee5e3373f8c1bb9f4c152e2ae6d7aa5b9e4b1123a5dec7b42c6b68ae"; + sha512 = "4387b1cfd77da777a3257e714b014c686ad8c5ff1edb7ba0e2d01f62621eaec92766ccc3bbeb93be45c0b414b9b31676692e75b366a7ed0fb8e0526f95126807"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/te/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/te/firefox-63.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "05936a5de6d723edf72c1155aa0f18c9a6eb5275dac4f4de58fe93cfd9a814e7ef349fa6c630d043d6b39ca5dab6fe5f3c92c45c36d5b515b4748bff6493063f"; + sha512 = "8ad96e47cfc1066d27560a5ad26659dba098724374605520198d580867be3bcc05a63120865745055ef00163b8c7cb97ac35f18bfcdc3d171e7eed6a05f50855"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/th/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/th/firefox-63.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "5ececcf6b3404f1010b48956bb2423907261f7d544a695e775900e1a3cbc09e71b008b94118ee39651ff6469cf8c456afc5ab9c9fdf0b9fa4a9c41f76e16788b"; + sha512 = "74272739144c6ae69dba8229420894b10e0dd9d75ae386f1221b17f8e54baf8c3d921591c5707ab5d8847deedad2daa3061fff03add11a2e450fdf691dd49f9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/tr/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/tr/firefox-63.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "29cc67dc15acf77589fe72d0e28591b5f4403de5cdfc6cfa7cd9f16ccf7315ed19c2d38872b5c76c1f4a78b2688e9401417b6e6ccba1985c27becb54baba4d22"; + sha512 = "0cddf14cd7a7cd4594ca04d1416b3ab32db42a287e62b68197fe8e08078999028e47074e563302c77e480d02563932d20ceffdd89c53b53c79221f3cc309e802"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/uk/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/uk/firefox-63.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "e7814a55b835051c8d02b74e4343739241ea60d69b8060a496f60b6b323b81d8628541d346281e0080d83d9ef4183640c907c144743d3d444499c887c34709ef"; + sha512 = "17e3d498e900ddfc4b00e3ea99b7b2f55c0252e88eede45b47b020293131d6adf5642c1bf94c39bba5b9042e2f9e20ba5399e6717e6965e65d90c4717a236832"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ur/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ur/firefox-63.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "e6323528d7a916473a62edd9565ed8d67832e3298fba51c7aca32f9d0c2d401ac74d2df5770962e191f7fc79fbbe6f22ae242475075423a23f09c8f11c26afa9"; + sha512 = "cef0ade8282d3360e27d51b4c5487882ae8dc78c598b4150cd3053cc442843cd58f5c362ed6c5ea8362517633dfbb2751a894c6cbc45bac796c181f32f095dc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/uz/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/uz/firefox-63.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "759e63deb63e59166d137e109f81ecd57a314aa045eb97a54ae82fe04a418bc3ac73c83bb663d65fc1b66233ed49e43ba7ba5a8db1bce5138fc6b65b7377b230"; + sha512 = "e8dc2b26f35f5ddbc93e4891d7b9b4dfd932ba6c7d1da19a6bec1f5c259f78c1c3105d9f2c89cd97c91f4032489f95a339ba5a22dc4daf3c948a968bf580d4bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/vi/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/vi/firefox-63.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "cdd1e2fb71043fa628bc9653a1be4c7a4d64779383b25d2b1812ea7af2eea3711cc2777c09be1acaf2fcba9c931cd212c99bde69d067d331a294825b89c2addb"; + sha512 = "6dc0945c634052824326cfe8558d1eddb192dbb4eca9eac458b8cfb3680cb1cf5537dd8ff4237ed32264d730e95287d9504fd0b1528fa33907dc1a2b4558ea61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xh/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/xh/firefox-63.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "97eb405cc8379cd803af5db55166b9db1e489c5a0e29fc316cdeeb49e2c2beca2ba87f7f01e9117dd22639d0cbfddc26ca90aa4187a522462a1b42126bee89a7"; + sha512 = "3792ce77db9de5080437b2aad6537f00963593ff98cdd47a145ffef8243a5ea23e8cd42f82e217885601b04df4c17d833aa88b9d15cad7a6840978af3a756b05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/zh-CN/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/zh-CN/firefox-63.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "7559ae148ce548d2b766be291667e7f04d9c28bca0de467cb36f37772736d2f44cb3724e0bf0c95bdd11ac2a84ab07238e14902d6f8f23280796505cf5b9e471"; + sha512 = "8043f8900ef35f85cb05f2092829899d119e079210dcb8bd9d369c7d73ff901e80afc4eecb25421058b65e5e267f7cf671c62cdec5849c2ff0da104f4ec12ad2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/zh-TW/firefox-62.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/zh-TW/firefox-63.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "95829dba29e96497f047e2f03a4bcbe36d61c0a36637087e56300f889f9b191c7b6c4ce936604283145f4a8be8ee4b129fefdeba7efd201cd0a647a0016ebde1"; + sha512 = "614b7835c82f80dd27c841023aca6aa8580bdadac8241f08fc053fe7657f069d6337e3edbe0bebcc4018d47f3d9f2d328176add89aacd9847393ebd21f3e9230"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index b72e3703ef7e..16c9b548325e 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -10,6 +10,7 @@ , hunspell, libevent, libstartup_notification, libvpx , icu, libpng, jemalloc, glib , autoconf213, which, gnused, cargo, rustc, llvmPackages +, rust-cbindgen, nodejs , debugBuild ? false ### optionals @@ -111,7 +112,6 @@ stdenv.mkDerivation rec { "-I${glib.dev}/include/gio-unix-2.0" ] ++ lib.optionals (!isTorBrowserLike) [ - "-I${nspr.dev}/include/nspr" "-I${nss.dev}/include/nss" ] ++ lib.optional stdenv.isDarwin [ @@ -121,12 +121,15 @@ stdenv.mkDerivation rec { postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace js/src/jsmath.cpp --replace 'defined(HAVE___SINCOS)' 0 + '' + lib.optionalString (lib.versionAtLeast ffversion "63.0" && !isTorBrowserLike) '' + substituteInPlace third_party/prio/prio/rand.c --replace 'nspr/prinit.h' 'prinit.h' ''; nativeBuildInputs = [ autoconf213 which gnused pkgconfig perl python2 cargo rustc ] ++ lib.optional gtk3Support wrapGAppsHook ++ lib.optionals stdenv.isDarwin [ xcbuild rsync ] + ++ lib.optionals (lib.versionAtLeast ffversion "63.0") [ rust-cbindgen nodejs ] ++ extraNativeBuildInputs; preConfigure = '' diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index bd42cf2d9d0b..826956eb5640 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -26,10 +26,10 @@ rec { firefox = common rec { pname = "firefox"; - ffversion = "62.0.3"; + ffversion = "63.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0kvb664s47bmmdq2ppjsnyqy8yaiig1xj81r25s36c3i8igfq3zxvws10k2dlmmmrwyc5k4g9i9imgkxj7r3xwwqxc72dl429wvfys8"; + sha512 = "095nn50g72l4ihbv26qqqs2jg4ahnmd54vxvm7nxwrnkx901aji7pph6c91zfpf7df26ib1b0pqyir9vsac40sdxc8yrzm6d0lyl1m2"; }; patches = nixpkgsPatches ++ [ diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 8a21f2f0cc2a..7ef2bde68f20 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "vivaldi"; - version = "2.0.1309.29-2"; + version = "2.1.1337.36-1"; src = fetchurl { url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb"; - sha256 = "09vaf191djbrfijvhklivh2ifj8w68car2vz956gsw4lhz07kzck"; + sha256 = "14qf3gk46m65yfc7q7gsnkj6av8yhg7byi0h1yv24sr7n4rrnrsc"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index 87ca350731db..349ef233ae21 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "vivaldi-ffmpeg-codecs"; - version = "69.0.3497.73"; + version = "70.0.3538.77"; src = fetchurl { url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz"; - sha512 = "3qyzxdybiszwy62izr35wffnh1a1plg9y536vrmd4b2xl8p4nz18c7439blr0cdzsr5qplgrdl64446a27mkyhbw8c3iy0gb4zgb5j9"; + sha512 = "128hvkcbyw70j31dj4jviqqjrzyfx38689nb8v0kk5vi2zlgfy5ibz2gyrv4bvrb53ld262y9pvam51nbdmrx2vqd9xrs173py7v0a0"; }; buildInputs = [ ]; diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 70d272187837..fd9fe0bdfbfc 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -3,11 +3,11 @@ let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "0.16.5"; + version = "0.17.0"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "1b82d82pfv4kjdxghc8y78zwmnc89hi7arvql2bx0zyfhzxj6drl"; + sha256 = "1ffbwz7wp1xhfv8a5nhrhw97nl5ybf0j97dkk2sy9cdlribzxs04"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 29a65b5d9bc1..f123770197fd 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -56,11 +56,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.17.0"; + version = "1.17.1"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0daxp8ychvvr4lqz8wni8lkalk3w409pzwnikvf92f1whxs76xj0"; + sha256 = "1cvgjllnbdsr61pz6r4dkbbz58cf69k7p8wriyp1vpzkdi7k5bpl"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 513407a0b710..7ed237ce6aa2 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -30,12 +30,12 @@ let weechat = assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "2.2"; + version = "2.3"; name = "weechat-${version}"; src = fetchurl { - url = "http://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "0p4nhh7f7w4q77g7jm9i6fynndqlgjkc9dk5g1xb4gf9imiisqlg"; + url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; + sha256 = "0mi4pfnyny0vqc35r0scn6yy21y790a5iwq8ms7kch7b7z11jn9w"; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; @@ -70,13 +70,6 @@ let done ''; - # remove when bumping to the latest version. - # This patch basically rebases `fcf7469d7664f37e94d5f6d0b3fe6fce6413f88c` - # from weechat upstream to weechat-2.2. - patches = [ - ./aggregate-commands.patch - ]; - meta = { homepage = http://www.weechat.org/; description = "A fast, light and extensible chat client"; diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix index eb4d710857c1..72b9ce09d76d 100644 --- a/pkgs/applications/networking/mailreaders/inboxer/default.nix +++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "inboxer-${version}"; - version = "1.1.5"; + version = "1.2.1"; meta = with stdenv.lib; { description = "Unofficial, free and open-source Google Inbox Desktop App"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/denysdovhan/inboxer/releases/download/v${version}/inboxer_${version}_amd64.deb"; - sha256 = "11xid07rqn7j6nxn0azxwf0g8g3jhams2fmf9q7xc1is99zfy7z4"; + sha256 = "0nyxas07d6ckgjazxapmc6iyakd2cddla6wflr5rhfp78d7kax3a"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 753defb0b4f0..5d82b1174866 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -17,6 +17,7 @@ let in stdenv.mkDerivation { name = "wireshark-${variant}-${version}"; + outputs = [ "out" "dev" ]; src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; @@ -87,6 +88,16 @@ in stdenv.mkDerivation { --replace "Exec=wireshark" "Exec=$out/bin/wireshark" install -Dm644 ../image/wsicon.svg $out/share/icons/wireshark.svg + mkdir $dev/include/{epan/{wmem,ftypes,dfilter},wsutil,wiretap} -pv + + cp config.h $dev/include/ + cp ../ws_*.h $dev/include + cp ../epan/*.h $dev/include/epan/ + cp ../epan/wmem/*.h $dev/include/epan/wmem/ + cp ../epan/ftypes/*.h $dev/include/epan/ftypes/ + cp ../epan/dfilter/*.h $dev/include/epan/dfilter/ + cp ../wsutil/*.h $dev/include/wsutil/ + cp ../wiretap/*.h $dev/include/wiretap ''; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index 861e7d24275d..2f736dd5856d 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -4,6 +4,9 @@ , withTcl ? false, tcl , withCyrus ? true, cyrus_sasl , withUnicode ? true, icu +, withZlib ? true, zlib +, withIPv6 ? true +, withDebug ? false }: with stdenv.lib; @@ -24,7 +27,8 @@ stdenv.mkDerivation rec { ++ optional withPython python3 ++ optional withTcl tcl ++ optional withCyrus cyrus_sasl - ++ optional withUnicode icu; + ++ optional withUnicode icu + ++ optional withZlib zlib; configureFlags = [ (stdenv.lib.enableFeature withPerl "perl") @@ -32,7 +36,8 @@ stdenv.mkDerivation rec { (stdenv.lib.enableFeature withTcl "tcl") (stdenv.lib.withFeatureAs withTcl "tcl" "${tcl}/lib") (stdenv.lib.enableFeature withCyrus "cyrus") - ]; + ] ++ optional (!withIPv6) [ "--disable-ipv6" ] + ++ optional withDebug [ "--enable-debug" ]; meta = with stdenv.lib; { description = "Advanced IRC bouncer"; diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index a799df2d1ed0..42d2093ee3a0 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -9,6 +9,8 @@ let inherit buildPhase; inherit installPhase; + buildInputs = znc.buildInputs; + meta = a.meta // { platforms = stdenv.lib.platforms.unix; }; passthru.module_name = module_name; }); diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index a7d93c3b0cb9..740224b15b3d 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -1,16 +1,16 @@ -{ stdenv, python3, glibcLocales }: +{ stdenv, python3, glibcLocales, fetchpatch }: let inherit (python3.pkgs) buildPythonApplication fetchPypi; in buildPythonApplication rec { pname = "todoman"; - version = "3.4.0"; + version = "3.4.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "09441fdrwz2irsbrxnpwys51372z6rn6gnxn87p95r3fv9gmh0fw"; + sha256 = "1rvid1rklvgvsf6xmxd91j2fi46v4fzn5z6zbs5yn0wpb0k605r5"; }; LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux @@ -29,9 +29,17 @@ buildPythonApplication rec { makeWrapperArgs = [ "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive" "--set CHARSET en_us.UTF-8" ]; + patches = [ + (fetchpatch { + url = "https://github.com/pimutils/todoman/commit/3e191111b72df9ec91a773befefa291799374422.patch"; + sha256 = "12mskbp0d8p2lllkxm3m9wyy2hsbnz2qs297civsc3ly2l5bcrag"; + }) + ]; + preCheck = '' # Remove one failing test that only checks whether the command line works rm tests/test_main.py + rm tests/test_cli.py ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index b86f9d1aa0de..f631fe38a5b0 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -58,6 +58,13 @@ stdenv.mkDerivation rec { url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/sagemath-lcalc-c++11.patch?h=packages/sagemath&id=0e31ae526ab7c6b5c0bfacb3f8b1c4fd490035aa"; sha256 = "0p5wnvbx65i7cp0bjyaqgp4rly8xgnk12pqwaq3dqby0j2bk6ijb"; }) + + # https://trac.sagemath.org/ticket/26360 + (fetchpatch { + name = "arb-2.15.1.patch"; + url = "https://git.sagemath.org/sage.git/patch/?id=30cc778d46579bd0c7537ed33e8d7a4f40fd5c31"; + sha256 = "13vc2q799dh745sm59xjjabllfj0sfjzcacf8k59kwj04x755d30"; + }) ]; patches = nixPatches ++ packageUpgradePatches ++ [ diff --git a/pkgs/applications/science/math/sage/sage-wrapper.nix b/pkgs/applications/science/math/sage/sage-wrapper.nix index 06b667f426fa..4b2f9c461c18 100644 --- a/pkgs/applications/science/math/sage/sage-wrapper.nix +++ b/pkgs/applications/science/math/sage/sage-wrapper.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = sage.version; - name = "sage-wrapper-${version}"; + name = "sage-${version}"; buildInputs = [ makeWrapper diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix index b1e5d7278b0f..ad9a32e0ca56 100644 --- a/pkgs/applications/science/math/sage/sage.nix +++ b/pkgs/applications/science/math/sage/sage.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = sage-with-env.version; - name = "sage-${version}"; + name = "sage-tests-${version}"; buildInputs = [ makeWrapper diff --git a/pkgs/applications/version-management/gitaly/default.nix b/pkgs/applications/version-management/gitaly/default.nix index 9523059b42f2..88bd0b9f10db 100644 --- a/pkgs/applications/version-management/gitaly/default.nix +++ b/pkgs/applications/version-management/gitaly/default.nix @@ -7,14 +7,14 @@ let gemdir = ./.; }; in buildGoPackage rec { - version = "0.125.0"; + version = "0.125.1"; name = "gitaly-${version}"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "14a4qgpnspzw9cjqh6gbw3771bxfm789ibvmvb8jc4pklvbyl4mi"; + sha256 = "0vbxjqjs1r5c350r67812andasby5zk25xlaqp201lmlvamiv0ni"; }; goPackagePath = "gitlab.com/gitlab-org/gitaly"; diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix index 16acf2a91d70..3fab965bf547 100644 --- a/pkgs/applications/version-management/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchFromGitLab, git, go }: + stdenv.mkDerivation rec { name = "gitlab-workhorse-${version}"; - version = "6.1.1"; + version = "7.0.0"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "1dwvk86bfsqgkp0mwz71yis3i7aypjf96r3hsjkgpd27hwbjgxbr"; + sha256 = "1mmfb7h5sbva2kv9h9cxfg7dyksxrwwikq7jwggfawqaadzwm677"; }; buildInputs = [ git go ]; diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index c1a4392ec0ef..ba37091c433f 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -11,29 +11,29 @@ let groups = [ "default" "unicorn" "ed25519" "metrics" ]; }; - version = "11.3.4"; + version = "11.4.0"; sources = if gitlabEnterprise then { gitlabDeb = fetchurl { url = "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_${version}-ee.0_amd64.deb/download.deb"; - sha256 = "1cgwm6g1mij1958mdyds8f76qjw39nllsr23dvsqgf60h4vbsdfd"; + sha256 = "1y2a8acgsgrgcjazijsflhxq4fwqvd9yhrjx5pcncb24vl0x6dg4"; }; gitlab = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-ee"; rev = "v${version}-ee"; - sha256 = "1ifaa879l85d4yfzrgszrgj04bfjxjh3n7v31zfb6lsqmh87xbm4"; + sha256 = "1pyqk1c5bml7chs4pq1fcxkrhk5r327xx9my6zmp2cb503s5m590"; }; } else { gitlabDeb = fetchurl { url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_${version}-ce.0_amd64.deb/download.deb"; - sha256 = "0hls81ns9n10xrzw0b9pn1916445irqrysbicsdl8kdn83ds35p7"; + sha256 = "0wiizjihn1a6hg6a2wpwmnh5a34n102va4djac3sgx74mwx4bniq"; }; gitlab = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-ce"; rev = "v${version}"; - sha256 = "0dymr706yn917niybg2gj1pkgrzgiirbv4ib9pkgs140kbf3hn0c"; + sha256 = "1a8pavqc9bblss5z9ikc9b0k0ra33vw73zy7rvn0v1wgvbqpc24k"; }; }; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile index f14e05d43e06..ecbfba0827d2 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile @@ -80,16 +80,14 @@ gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap' gem 'net-ldap' # Git Wiki -# Required manually in config/initializers/gollum.rb to control load order +# Only used to compute wiki page slugs gem 'gitlab-gollum-lib', '~> 4.2', require: false -gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false - # Language detection gem 'github-linguist', '~> 5.3.3', require: 'linguist' # API -gem 'grape', '~> 1.0' +gem 'grape', '~> 1.1' gem 'grape-entity', '~> 0.7.1' gem 'rack-cors', '~> 1.0.0', require: 'rack/cors' @@ -112,9 +110,6 @@ gem 'hamlit', '~> 2.8.8' gem 'carrierwave', '= 1.2.3' gem 'mini_magick' -# Drag and Drop UI -gem 'dropzonejs-rails', '~> 0.7.1' - # for backups gem 'fog-aws', '~> 2.0.1' gem 'fog-core', '~> 1.44' @@ -137,6 +132,7 @@ gem 'seed-fu', '~> 2.3.7' gem 'html-pipeline', '~> 2.8' gem 'deckar01-task_list', '2.0.0' gem 'gitlab-markup', '~> 1.6.4' +gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'redcarpet', '~> 3.4' gem 'commonmarker', '~> 0.17' gem 'RedCloth', '~> 4.3.2' @@ -170,10 +166,9 @@ gem 'state_machines-activerecord', '~> 0.5.1' gem 'acts-as-taggable-on', '~> 5.0' # Background jobs -gem 'sidekiq', '~> 5.1' +gem 'sidekiq', '~> 5.2.1' gem 'sidekiq-cron', '~> 0.6.0' gem 'redis-namespace', '~> 1.6.0' -gem 'sidekiq-limit_fetch', '~> 3.4', require: false # Cron Parser gem 'rufus-scheduler', '~> 3.4' @@ -300,7 +295,7 @@ gem 'peek-mysql2', '~> 1.1.0', group: :mysql gem 'peek-pg', '~> 1.3.0', group: :postgres gem 'peek-rblineprof', '~> 0.2.0' gem 'peek-redis', '~> 1.2.0' -gem 'peek-sidekiq', '~> 1.0.3' +gem 'gitlab-sidekiq-fetcher', require: 'sidekiq-reliable-fetch' # Metrics group :metrics do @@ -425,7 +420,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 0.117.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.118.1', require: 'gitaly' gem 'grpc', '~> 1.11.0' # Locked until https://github.com/google/protobuf/issues/4210 is closed diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock index e41719ec79d3..9837a195d8c7 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock @@ -86,7 +86,7 @@ GEM bindata (2.4.3) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootsnap (1.3.1) + bootsnap (1.3.2) msgpack (~> 1.0) bootstrap_form (2.7.0) brakeman (4.2.1) @@ -133,14 +133,14 @@ GEM concurrent-ruby (1.0.5) concurrent-ruby-ext (1.0.5) concurrent-ruby (= 1.0.5) - connection_pool (2.2.1) + connection_pool (2.2.2) crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.4) creole (0.5.0) css_parser (1.5.0) addressable - daemons (1.2.3) + daemons (1.2.6) database_cleaner (1.5.3) debug_inspector (0.0.2) debugger-ruby_core_source (1.3.8) @@ -175,8 +175,6 @@ GEM doorkeeper-openid_connect (1.5.0) doorkeeper (~> 4.3) json-jwt (~> 1.6) - dropzonejs-rails (0.7.2) - rails (> 3.1) ed25519 (1.2.4) email_reply_trimmer (0.1.6) email_spec (2.2.0) @@ -189,7 +187,7 @@ GEM escape_utils (1.1.1) et-orbi (1.0.3) tzinfo - eventmachine (1.0.8) + eventmachine (1.2.7) excon (0.62.0) execjs (2.6.0) expression_parser (0.9.0) @@ -276,7 +274,7 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (0.117.0) + gitaly-proto (0.118.1) google-protobuf (~> 3.1) grpc (~> 1.10) github-linguist (5.3.3) @@ -297,15 +295,14 @@ GEM rouge (~> 3.1) sanitize (~> 4.6.4) stringex (~> 2.6) - gitlab-gollum-rugged_adapter (0.4.4.1) - mime-types (>= 1.15) - rugged (~> 0.25) gitlab-grit (2.8.2) charlock_holmes (~> 0.6) diff-lcs (~> 1.1) mime-types (>= 1.16) posix-spawn (~> 0.3) gitlab-markup (1.6.4) + gitlab-sidekiq-fetcher (0.3.0) + sidekiq (~> 5) gitlab-styles (2.4.1) rubocop (~> 0.54.0) rubocop-gitlab-security (~> 0.1.0) @@ -343,7 +340,7 @@ GEM signet (~> 0.7) gpgme (2.0.13) mini_portile2 (~> 2.1) - grape (1.0.3) + grape (1.1.0) activesupport builder mustermann-grape (~> 1.0.0) @@ -493,7 +490,7 @@ GEM mime-types-data (3.2016.0521) mimemagic (0.3.0) mini_magick (4.8.0) - mini_mime (1.0.0) + mini_mime (1.0.1) mini_portile2 (2.3.0) minitest (5.7.0) mousetrap-rails (1.4.6) @@ -501,7 +498,7 @@ GEM multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) - mustermann (1.0.2) + mustermann (1.0.3) mustermann-grape (1.0.0) mustermann (~> 1.0.0) mysql2 (0.4.10) @@ -605,10 +602,6 @@ GEM atomic (>= 1.0.0) peek redis - peek-sidekiq (1.0.3) - atomic (>= 1.0.0) - peek - sidekiq pg (0.18.4) po_to_json (1.0.1) json (>= 1.6.0) @@ -633,9 +626,9 @@ GEM pry-byebug (3.4.3) byebug (>= 9.0, < 9.1) pry (~> 0.10) - pry-rails (0.3.5) - pry (>= 0.9.10) - public_suffix (3.0.2) + pry-rails (0.3.6) + pry (>= 0.10.4) + public_suffix (3.0.3) pyu-ruby-sasl (0.0.3.3) rack (1.6.10) rack-accept (0.4.5) @@ -649,7 +642,7 @@ GEM httpclient (>= 2.4) multi_json (>= 1.3.6) rack (>= 1.1) - rack-protection (2.0.1) + rack-protection (2.0.3) rack rack-proxy (0.6.0) rack @@ -735,7 +728,7 @@ GEM retriable (3.1.2) rinku (2.0.0) rotp (2.1.2) - rouge (3.2.1) + rouge (3.3.0) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -843,16 +836,13 @@ GEM rack shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - sidekiq (5.1.3) - concurrent-ruby (~> 1.0) - connection_pool (~> 2.2, >= 2.2.0) + sidekiq (5.2.1) + connection_pool (~> 2.2, >= 2.2.2) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) sidekiq-cron (0.6.0) rufus-scheduler (>= 3.3.0) sidekiq (>= 4.2.1) - sidekiq-limit_fetch (3.4.0) - sidekiq (>= 4) signet (0.8.1) addressable (~> 2.3) faraday (~> 0.9) @@ -865,7 +855,7 @@ GEM simplecov-html (~> 0.10.0) simplecov-html (0.10.0) slack-notifier (1.5.1) - spring (2.0.1) + spring (2.0.2) activesupport (>= 4.2) spring-commands-rspec (1.0.4) spring (>= 0.9.1) @@ -895,7 +885,7 @@ GEM test_after_commit (1.1.0) activerecord (>= 3.2) text (1.3.1) - thin (1.7.0) + thin (1.7.2) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) @@ -954,7 +944,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - webpack-rails (0.9.10) + webpack-rails (0.9.11) railties (>= 3.2.0) wikicloth (0.8.1) builder @@ -1013,7 +1003,6 @@ DEPENDENCIES diffy (~> 3.1.0) doorkeeper (~> 4.3) doorkeeper-openid_connect (~> 1.5) - dropzonejs-rails (~> 0.7.1) ed25519 (~> 1.2) email_reply_trimmer (~> 0.1) email_spec (~> 2.2.0) @@ -1038,19 +1027,20 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 0.117.0) + gitaly-proto (~> 0.118.1) github-linguist (~> 5.3.3) + github-markup (~> 1.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-gollum-lib (~> 4.2) - gitlab-gollum-rugged_adapter (~> 0.4.4) gitlab-markup (~> 1.6.4) + gitlab-sidekiq-fetcher gitlab-styles (~> 2.4) gitlab_omniauth-ldap (~> 2.0.4) gon (~> 6.2) google-api-client (~> 0.23) google-protobuf (= 3.5.1) gpgme - grape (~> 1.0) + grape (~> 1.1) grape-entity (~> 0.7.1) grape-path-helpers (~> 1.0) grape_logging (~> 1.7) @@ -1114,7 +1104,6 @@ DEPENDENCIES peek-pg (~> 1.3.0) peek-rblineprof (~> 0.2.0) peek-redis (~> 1.2.0) - peek-sidekiq (~> 1.0.3) pg (~> 0.18.2) premailer-rails (~> 1.9.7) prometheus-client-mmap (~> 0.9.4) @@ -1166,9 +1155,8 @@ DEPENDENCIES settingslogic (~> 2.0.9) sham_rack (~> 1.3.6) shoulda-matchers (~> 3.1.2) - sidekiq (~> 5.1) + sidekiq (~> 5.2.1) sidekiq-cron (~> 0.6.0) - sidekiq-limit_fetch (~> 3.4) simple_po_parser (~> 1.1.2) simplecov (~> 0.14.0) slack-notifier (~> 1.5.1) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix index 65aac9891037..ee262b6b5d96 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix @@ -301,10 +301,10 @@ dependencies = ["msgpack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3llrdqkndxzhv1a7a2yjpavmdabyq5ps296vmb32hv8fy95xk9"; + sha256 = "0g6r784lmjfhwi046w82phsk244byq9wkj1q3lddwxg9z559bmhy"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.2"; }; bootstrap_form = { source = { @@ -504,10 +504,10 @@ connection_pool = { source = { remotes = ["https://rubygems.org"]; - sha256 = "17vpaj6kyf2i8bimaxz7rg1kyadf4d10642ja67qiqlhwgczl2w7"; + sha256 = "0lflx29mlznf1hn0nihkgllzbj8xp5qasn8j7h838465pi399k68"; type = "gem"; }; - version = "2.2.1"; + version = "2.2.2"; }; crack = { dependencies = ["safe_yaml"]; @@ -546,10 +546,10 @@ daemons = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0b839hryy9sg7x3knsa1d6vfiyvn0mlsnhsb6an8zsalyrz1zgqg"; + sha256 = "0lxqq6dgb8xhliywar2lvkwqy2ssraf9dk4b501pb4ixc2mvxbp2"; type = "gem"; }; - version = "1.2.3"; + version = "1.2.6"; }; database_cleaner = { source = { @@ -695,15 +695,6 @@ }; version = "1.5.0"; }; - dropzonejs-rails = { - dependencies = ["rails"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vqqxzv6qdqy47m2q28adnmccfvc17p2bmkkaqjvrczrhvkkha64"; - type = "gem"; - }; - version = "0.7.2"; - }; ed25519 = { source = { remotes = ["https://rubygems.org"]; @@ -773,10 +764,10 @@ eventmachine = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1frvpk3p73xc64qkn0ymll3flvn4xcycq5yx8a43zd3gyzc1ifjp"; + sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; type = "gem"; }; - version = "1.0.8"; + version = "1.2.7"; }; excon = { source = { @@ -1078,10 +1069,10 @@ dependencies = ["google-protobuf" "grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ixgzw4clmhjhmv3fy9niq4x16k1yn9iyjbc99z5674xlp7nm40i"; + sha256 = "19nyx75xnb3lsap6rr3p1avqsw1dcrm8d3ggmmihd58a9s762fki"; type = "gem"; }; - version = "0.117.0"; + version = "0.118.1"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; @@ -1118,15 +1109,6 @@ }; version = "4.2.7.5"; }; - gitlab-gollum-rugged_adapter = { - dependencies = ["mime-types" "rugged"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "092i02k3kd4ghk1h1l5yrvi9b180dgfxrvwni26facb2kc9f3wbi"; - type = "gem"; - }; - version = "0.4.4.1"; - }; gitlab-grit = { dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"]; source = { @@ -1144,6 +1126,15 @@ }; version = "1.6.4"; }; + gitlab-sidekiq-fetcher = { + dependencies = ["sidekiq"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dvrp4iapwfaakc3qgf7mw05blxzfywpjfr7bhswwflih0pm67l7"; + type = "gem"; + }; + version = "0.3.0"; + }; gitlab-styles = { dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"]; source = { @@ -1237,10 +1228,10 @@ dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lz17804lpip6cm3g0j9xyzc38lxsn84cl3v3ixn6djnwlmp6427"; + sha256 = "04bam0iq9sad1df361317zz4knwci905yig502khl8gm1lp1168c"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; }; grape-entity = { dependencies = ["activesupport" "multi_json"]; @@ -1779,10 +1770,10 @@ mini_mime = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1lwhlvjqaqfm6k3ms4v29sby9y7m518ylsqz2j74i740715yl5c8"; + sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; mini_portile2 = { source = { @@ -1843,10 +1834,10 @@ mustermann = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07sb7fckrraqh48fjnqf6yl7vxxabfx0qrsrhfdz67pd838g4k8g"; + sha256 = "0lycgkmnyy0bf29nnd2zql5a6pcf8sp69g9v4xw0gcfcxgpwp7i1"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; mustermann-grape = { dependencies = ["mustermann"]; @@ -2207,15 +2198,6 @@ }; version = "1.2.0"; }; - peek-sidekiq = { - dependencies = ["atomic" "peek" "sidekiq"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0y7s32p6cp66z1hpd1wcv4crmvvvcag5i39aazclckjsfpdfn24x"; - type = "gem"; - }; - version = "1.0.3"; - }; pg = { source = { remotes = ["https://rubygems.org"]; @@ -2314,18 +2296,18 @@ dependencies = ["pry"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v8xlzzb535k7wcl0vrpday237xwc04rr9v3gviqzasl7ydw32x6"; + sha256 = "0k2d43bwmqbswfra4fkadjjbszwb11pr7qdkma91qrcrk62wqxvy"; type = "gem"; }; - version = "0.3.5"; + version = "0.3.6"; }; public_suffix = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s"; + sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; type = "gem"; }; - version = "3.0.2"; + version = "3.0.3"; }; pyu-ruby-sasl = { source = { @@ -2382,10 +2364,10 @@ dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ywmgh7x8ljf7jfnq5hmfzki3f803waji3fcvi107w7mlyflbng7"; + sha256 = "1z5598qipilmnf45428jnxi63ykrgvnyywa5ckpr52zv2vpd8jdp"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.3"; }; rack-proxy = { dependencies = ["rack"]; @@ -2699,10 +2681,10 @@ rouge = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f"; + sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql"; type = "gem"; }; - version = "3.2.1"; + version = "3.3.0"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -3072,13 +3054,13 @@ version = "3.1.2"; }; sidekiq = { - dependencies = ["concurrent-ruby" "connection_pool" "rack-protection" "redis"]; + dependencies = ["connection_pool" "rack-protection" "redis"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0af7sh9ckds36wv80azlanw1ch29nbvr1w3m00mlj1hbk2il6cxh"; + sha256 = "0s57vl2hwfaga73yiscak2rs7byg1q0z44wa9si9vl92qcmbik2j"; type = "gem"; }; - version = "5.1.3"; + version = "5.2.1"; }; sidekiq-cron = { dependencies = ["rufus-scheduler" "sidekiq"]; @@ -3089,15 +3071,6 @@ }; version = "0.6.0"; }; - sidekiq-limit_fetch = { - dependencies = ["sidekiq"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ykpqw2nc9fs4v0slk5n4m42n3ihwwkk5mcyw3rz51blrdzj92kr"; - type = "gem"; - }; - version = "3.4.0"; - }; signet = { dependencies = ["addressable" "faraday" "jwt" "multi_json"]; source = { @@ -3144,10 +3117,10 @@ dependencies = ["activesupport"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wwbyg2nab2k4hdpd1i65qmnfixry29b4yqynrqfnmjghn0xvc7x"; + sha256 = "168yz9c1fv21wc5i8q7n43b9nk33ivg3ws1fn6x0afgryz3ssx75"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.2"; }; spring-commands-rspec = { dependencies = ["spring"]; @@ -3288,10 +3261,10 @@ dependencies = ["daemons" "eventmachine" "rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dq9q7qyjyg4444bmn12r2s0mir8dqnvc037y0zidhbyaavrv95q"; + sha256 = "0nagbf9pwy1vg09k6j4xqhbjjzrg5dwzvkn4ffvlj76fsn6vv61f"; type = "gem"; }; - version = "1.7.0"; + version = "1.7.2"; }; thor = { source = { @@ -3518,10 +3491,10 @@ dependencies = ["railties"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l0jzw05yk1c19q874nhkanrn2ik7hjbr2vjcdnk1fqp2f3ypzvv"; + sha256 = "0fsjxw730bh4k1dfnbjm645fgjyqrh830l1z7brqbsm6306ig1rr"; type = "gem"; }; - version = "0.9.10"; + version = "0.9.11"; }; wikicloth = { dependencies = ["builder" "expression_parser" "rinku"]; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile index 86502db9d26e..ef14aace277e 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile @@ -83,16 +83,14 @@ gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap' gem 'net-ldap' # Git Wiki -# Required manually in config/initializers/gollum.rb to control load order +# Only used to compute wiki page slugs gem 'gitlab-gollum-lib', '~> 4.2', require: false -gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false - # Language detection gem 'github-linguist', '~> 5.3.3', require: 'linguist' # API -gem 'grape', '~> 1.0' +gem 'grape', '~> 1.1' gem 'grape-entity', '~> 0.7.1' gem 'rack-cors', '~> 1.0.0', require: 'rack/cors' @@ -115,9 +113,6 @@ gem 'hamlit', '~> 2.8.8' gem 'carrierwave', '= 1.2.3' gem 'mini_magick' -# Drag and Drop UI -gem 'dropzonejs-rails', '~> 0.7.1' - # for backups gem 'fog-aws', '~> 2.0.1' gem 'fog-core', '~> 1.44' @@ -147,6 +142,7 @@ gem 'faraday_middleware-aws-signers-v4' gem 'html-pipeline', '~> 2.8' gem 'deckar01-task_list', '2.0.0' gem 'gitlab-markup', '~> 1.6.4' +gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'redcarpet', '~> 3.4' gem 'commonmarker', '~> 0.17' gem 'RedCloth', '~> 4.3.2' @@ -180,10 +176,9 @@ gem 'state_machines-activerecord', '~> 0.5.1' gem 'acts-as-taggable-on', '~> 5.0' # Background jobs -gem 'sidekiq', '~> 5.1' +gem 'sidekiq', '~> 5.2.1' gem 'sidekiq-cron', '~> 0.6.0' gem 'redis-namespace', '~> 1.6.0' -gem 'sidekiq-limit_fetch', '~> 3.4', require: false # Cron Parser gem 'rufus-scheduler', '~> 3.4' @@ -312,7 +307,7 @@ gem 'peek-mysql2', '~> 1.1.0', group: :mysql gem 'peek-pg', '~> 1.3.0', group: :postgres gem 'peek-rblineprof', '~> 0.2.0' gem 'peek-redis', '~> 1.2.0' -gem 'peek-sidekiq', '~> 1.0.3' +gem 'gitlab-sidekiq-fetcher', require: 'sidekiq-reliable-fetch' # Metrics group :metrics do @@ -440,7 +435,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 0.117.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.118.1', require: 'gitaly' gem 'grpc', '~> 1.11.0' # Locked until https://github.com/google/protobuf/issues/4210 is closed diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock index d7c4f80efd15..4355b3ae2717 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock @@ -94,7 +94,7 @@ GEM bindata (2.4.3) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootsnap (1.3.1) + bootsnap (1.3.2) msgpack (~> 1.0) bootstrap_form (2.7.0) brakeman (4.2.1) @@ -141,14 +141,14 @@ GEM concurrent-ruby (1.0.5) concurrent-ruby-ext (1.0.5) concurrent-ruby (= 1.0.5) - connection_pool (2.2.1) + connection_pool (2.2.2) crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.4) creole (0.5.0) css_parser (1.5.0) addressable - daemons (1.2.3) + daemons (1.2.6) database_cleaner (1.5.3) debug_inspector (0.0.2) debugger-ruby_core_source (1.3.8) @@ -183,8 +183,6 @@ GEM doorkeeper-openid_connect (1.5.0) doorkeeper (~> 4.3) json-jwt (~> 1.6) - dropzonejs-rails (0.7.2) - rails (> 3.1) ed25519 (1.2.4) elasticsearch (5.0.3) elasticsearch-api (= 5.0.3) @@ -210,7 +208,7 @@ GEM escape_utils (1.1.1) et-orbi (1.0.3) tzinfo - eventmachine (1.0.8) + eventmachine (1.2.7) excon (0.62.0) execjs (2.6.0) expression_parser (0.9.0) @@ -300,7 +298,7 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (0.117.0) + gitaly-proto (0.118.1) google-protobuf (~> 3.1) grpc (~> 1.10) github-linguist (5.3.3) @@ -321,9 +319,6 @@ GEM rouge (~> 3.1) sanitize (~> 4.6.4) stringex (~> 2.6) - gitlab-gollum-rugged_adapter (0.4.4.1) - mime-types (>= 1.15) - rugged (~> 0.25) gitlab-grit (2.8.2) charlock_holmes (~> 0.6) diff-lcs (~> 1.1) @@ -331,6 +326,8 @@ GEM posix-spawn (~> 0.3) gitlab-license (1.0.0) gitlab-markup (1.6.4) + gitlab-sidekiq-fetcher (0.3.0) + sidekiq (~> 5) gitlab-styles (2.4.1) rubocop (~> 0.54.0) rubocop-gitlab-security (~> 0.1.0) @@ -368,7 +365,7 @@ GEM signet (~> 0.7) gpgme (2.0.13) mini_portile2 (~> 2.1) - grape (1.0.3) + grape (1.1.0) activesupport builder mustermann-grape (~> 1.0.0) @@ -521,7 +518,7 @@ GEM mime-types-data (3.2016.0521) mimemagic (0.3.0) mini_magick (4.8.0) - mini_mime (1.0.0) + mini_mime (1.0.1) mini_portile2 (2.3.0) minitest (5.7.0) mousetrap-rails (1.4.6) @@ -529,7 +526,7 @@ GEM multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) - mustermann (1.0.2) + mustermann (1.0.3) mustermann-grape (1.0.0) mustermann (~> 1.0.0) mysql2 (0.4.10) @@ -634,10 +631,6 @@ GEM atomic (>= 1.0.0) peek redis - peek-sidekiq (1.0.3) - atomic (>= 1.0.0) - peek - sidekiq pg (0.18.4) po_to_json (1.0.1) json (>= 1.6.0) @@ -662,9 +655,9 @@ GEM pry-byebug (3.4.3) byebug (>= 9.0, < 9.1) pry (~> 0.10) - pry-rails (0.3.5) - pry (>= 0.9.10) - public_suffix (3.0.2) + pry-rails (0.3.6) + pry (>= 0.10.4) + public_suffix (3.0.3) pyu-ruby-sasl (0.0.3.3) rack (1.6.10) rack-accept (0.4.5) @@ -678,7 +671,7 @@ GEM httpclient (>= 2.4) multi_json (>= 1.3.6) rack (>= 1.1) - rack-protection (2.0.1) + rack-protection (2.0.3) rack rack-proxy (0.6.0) rack @@ -764,7 +757,7 @@ GEM retriable (3.1.2) rinku (2.0.0) rotp (2.1.2) - rouge (3.2.1) + rouge (3.3.0) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -872,16 +865,13 @@ GEM rack shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - sidekiq (5.1.3) - concurrent-ruby (~> 1.0) - connection_pool (~> 2.2, >= 2.2.0) + sidekiq (5.2.1) + connection_pool (~> 2.2, >= 2.2.2) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) sidekiq-cron (0.6.0) rufus-scheduler (>= 3.3.0) sidekiq (>= 4.2.1) - sidekiq-limit_fetch (3.4.0) - sidekiq (>= 4) signet (0.8.1) addressable (~> 2.3) faraday (~> 0.9) @@ -894,7 +884,7 @@ GEM simplecov-html (~> 0.10.0) simplecov-html (0.10.0) slack-notifier (1.5.1) - spring (2.0.1) + spring (2.0.2) activesupport (>= 4.2) spring-commands-rspec (1.0.4) spring (>= 0.9.1) @@ -924,7 +914,7 @@ GEM test_after_commit (1.1.0) activerecord (>= 3.2) text (1.3.1) - thin (1.7.0) + thin (1.7.2) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) @@ -983,7 +973,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - webpack-rails (0.9.10) + webpack-rails (0.9.11) railties (>= 3.2.0) wikicloth (0.8.1) builder @@ -1043,7 +1033,6 @@ DEPENDENCIES diffy (~> 3.1.0) doorkeeper (~> 4.3) doorkeeper-openid_connect (~> 1.5) - dropzonejs-rails (~> 0.7.1) ed25519 (~> 1.2) elasticsearch-api (= 5.0.3) elasticsearch-model (~> 0.1.9) @@ -1072,20 +1061,21 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 0.117.0) + gitaly-proto (~> 0.118.1) github-linguist (~> 5.3.3) + github-markup (~> 1.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-gollum-lib (~> 4.2) - gitlab-gollum-rugged_adapter (~> 0.4.4) gitlab-license (~> 1.0) gitlab-markup (~> 1.6.4) + gitlab-sidekiq-fetcher gitlab-styles (~> 2.4) gitlab_omniauth-ldap (~> 2.0.4) gon (~> 6.2) google-api-client (~> 0.23) google-protobuf (= 3.5.1) gpgme - grape (~> 1.0) + grape (~> 1.1) grape-entity (~> 0.7.1) grape-path-helpers (~> 1.0) grape_logging (~> 1.7) @@ -1151,7 +1141,6 @@ DEPENDENCIES peek-pg (~> 1.3.0) peek-rblineprof (~> 0.2.0) peek-redis (~> 1.2.0) - peek-sidekiq (~> 1.0.3) pg (~> 0.18.2) premailer-rails (~> 1.9.7) prometheus-client-mmap (~> 0.9.4) @@ -1203,9 +1192,8 @@ DEPENDENCIES settingslogic (~> 2.0.9) sham_rack (~> 1.3.6) shoulda-matchers (~> 3.1.2) - sidekiq (~> 5.1) + sidekiq (~> 5.2.1) sidekiq-cron (~> 0.6.0) - sidekiq-limit_fetch (~> 3.4) simple_po_parser (~> 1.1.2) simplecov (~> 0.14.0) slack-notifier (~> 1.5.1) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix index a067d1e42722..03efc4e9600f 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix @@ -336,10 +336,10 @@ dependencies = ["msgpack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3llrdqkndxzhv1a7a2yjpavmdabyq5ps296vmb32hv8fy95xk9"; + sha256 = "0g6r784lmjfhwi046w82phsk244byq9wkj1q3lddwxg9z559bmhy"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.2"; }; bootstrap_form = { source = { @@ -539,10 +539,10 @@ connection_pool = { source = { remotes = ["https://rubygems.org"]; - sha256 = "17vpaj6kyf2i8bimaxz7rg1kyadf4d10642ja67qiqlhwgczl2w7"; + sha256 = "0lflx29mlznf1hn0nihkgllzbj8xp5qasn8j7h838465pi399k68"; type = "gem"; }; - version = "2.2.1"; + version = "2.2.2"; }; crack = { dependencies = ["safe_yaml"]; @@ -581,10 +581,10 @@ daemons = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0b839hryy9sg7x3knsa1d6vfiyvn0mlsnhsb6an8zsalyrz1zgqg"; + sha256 = "0lxqq6dgb8xhliywar2lvkwqy2ssraf9dk4b501pb4ixc2mvxbp2"; type = "gem"; }; - version = "1.2.3"; + version = "1.2.6"; }; database_cleaner = { source = { @@ -730,15 +730,6 @@ }; version = "1.5.0"; }; - dropzonejs-rails = { - dependencies = ["rails"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vqqxzv6qdqy47m2q28adnmccfvc17p2bmkkaqjvrczrhvkkha64"; - type = "gem"; - }; - version = "0.7.2"; - }; ed25519 = { source = { remotes = ["https://rubygems.org"]; @@ -852,10 +843,10 @@ eventmachine = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1frvpk3p73xc64qkn0ymll3flvn4xcycq5yx8a43zd3gyzc1ifjp"; + sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; type = "gem"; }; - version = "1.0.8"; + version = "1.2.7"; }; excon = { source = { @@ -1166,10 +1157,10 @@ dependencies = ["google-protobuf" "grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ixgzw4clmhjhmv3fy9niq4x16k1yn9iyjbc99z5674xlp7nm40i"; + sha256 = "19nyx75xnb3lsap6rr3p1avqsw1dcrm8d3ggmmihd58a9s762fki"; type = "gem"; }; - version = "0.117.0"; + version = "0.118.1"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; @@ -1206,15 +1197,6 @@ }; version = "4.2.7.5"; }; - gitlab-gollum-rugged_adapter = { - dependencies = ["mime-types" "rugged"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "092i02k3kd4ghk1h1l5yrvi9b180dgfxrvwni26facb2kc9f3wbi"; - type = "gem"; - }; - version = "0.4.4.1"; - }; gitlab-grit = { dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"]; source = { @@ -1240,6 +1222,15 @@ }; version = "1.6.4"; }; + gitlab-sidekiq-fetcher = { + dependencies = ["sidekiq"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dvrp4iapwfaakc3qgf7mw05blxzfywpjfr7bhswwflih0pm67l7"; + type = "gem"; + }; + version = "0.3.0"; + }; gitlab-styles = { dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"]; source = { @@ -1333,10 +1324,10 @@ dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lz17804lpip6cm3g0j9xyzc38lxsn84cl3v3ixn6djnwlmp6427"; + sha256 = "04bam0iq9sad1df361317zz4knwci905yig502khl8gm1lp1168c"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; }; grape-entity = { dependencies = ["activesupport" "multi_json"]; @@ -1892,10 +1883,10 @@ mini_mime = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1lwhlvjqaqfm6k3ms4v29sby9y7m518ylsqz2j74i740715yl5c8"; + sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; mini_portile2 = { source = { @@ -1956,10 +1947,10 @@ mustermann = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07sb7fckrraqh48fjnqf6yl7vxxabfx0qrsrhfdz67pd838g4k8g"; + sha256 = "0lycgkmnyy0bf29nnd2zql5a6pcf8sp69g9v4xw0gcfcxgpwp7i1"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; mustermann-grape = { dependencies = ["mustermann"]; @@ -2328,15 +2319,6 @@ }; version = "1.2.0"; }; - peek-sidekiq = { - dependencies = ["atomic" "peek" "sidekiq"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0y7s32p6cp66z1hpd1wcv4crmvvvcag5i39aazclckjsfpdfn24x"; - type = "gem"; - }; - version = "1.0.3"; - }; pg = { source = { remotes = ["https://rubygems.org"]; @@ -2435,18 +2417,18 @@ dependencies = ["pry"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v8xlzzb535k7wcl0vrpday237xwc04rr9v3gviqzasl7ydw32x6"; + sha256 = "0k2d43bwmqbswfra4fkadjjbszwb11pr7qdkma91qrcrk62wqxvy"; type = "gem"; }; - version = "0.3.5"; + version = "0.3.6"; }; public_suffix = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s"; + sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; type = "gem"; }; - version = "3.0.2"; + version = "3.0.3"; }; pyu-ruby-sasl = { source = { @@ -2503,10 +2485,10 @@ dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ywmgh7x8ljf7jfnq5hmfzki3f803waji3fcvi107w7mlyflbng7"; + sha256 = "1z5598qipilmnf45428jnxi63ykrgvnyywa5ckpr52zv2vpd8jdp"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.3"; }; rack-proxy = { dependencies = ["rack"]; @@ -2820,10 +2802,10 @@ rouge = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f"; + sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql"; type = "gem"; }; - version = "3.2.1"; + version = "3.3.0"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -3193,13 +3175,13 @@ version = "3.1.2"; }; sidekiq = { - dependencies = ["concurrent-ruby" "connection_pool" "rack-protection" "redis"]; + dependencies = ["connection_pool" "rack-protection" "redis"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0af7sh9ckds36wv80azlanw1ch29nbvr1w3m00mlj1hbk2il6cxh"; + sha256 = "0s57vl2hwfaga73yiscak2rs7byg1q0z44wa9si9vl92qcmbik2j"; type = "gem"; }; - version = "5.1.3"; + version = "5.2.1"; }; sidekiq-cron = { dependencies = ["rufus-scheduler" "sidekiq"]; @@ -3210,15 +3192,6 @@ }; version = "0.6.0"; }; - sidekiq-limit_fetch = { - dependencies = ["sidekiq"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ykpqw2nc9fs4v0slk5n4m42n3ihwwkk5mcyw3rz51blrdzj92kr"; - type = "gem"; - }; - version = "3.4.0"; - }; signet = { dependencies = ["addressable" "faraday" "jwt" "multi_json"]; source = { @@ -3265,10 +3238,10 @@ dependencies = ["activesupport"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wwbyg2nab2k4hdpd1i65qmnfixry29b4yqynrqfnmjghn0xvc7x"; + sha256 = "168yz9c1fv21wc5i8q7n43b9nk33ivg3ws1fn6x0afgryz3ssx75"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.2"; }; spring-commands-rspec = { dependencies = ["spring"]; @@ -3409,10 +3382,10 @@ dependencies = ["daemons" "eventmachine" "rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dq9q7qyjyg4444bmn12r2s0mir8dqnvc037y0zidhbyaavrv95q"; + sha256 = "0nagbf9pwy1vg09k6j4xqhbjjzrg5dwzvkn4ffvlj76fsn6vv61f"; type = "gem"; }; - version = "1.7.0"; + version = "1.7.2"; }; thor = { source = { @@ -3639,10 +3612,10 @@ dependencies = ["railties"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l0jzw05yk1c19q874nhkanrn2ik7hjbr2vjcdnk1fqp2f3ypzvv"; + sha256 = "0fsjxw730bh4k1dfnbjm645fgjyqrh830l1z7brqbsm6306ig1rr"; type = "gem"; }; - version = "0.9.10"; + version = "0.9.11"; }; wikicloth = { dependencies = ["builder" "expression_parser" "rinku"]; diff --git a/pkgs/applications/video/mapmap/default.nix b/pkgs/applications/video/mapmap/default.nix index c44bd25b91a7..4dd2e019d1d3 100644 --- a/pkgs/applications/video/mapmap/default.nix +++ b/pkgs/applications/video/mapmap/default.nix @@ -57,6 +57,8 @@ mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.erictapen ]; platforms = platforms.linux; + # binary segfaults at the moment + broken = true; }; } diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 7d9ce1ac453b..3464b7aaeaa2 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "27.0.0"; + version = "28.2.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "0pcf0bzs588p0a4j01jzcy5y9c4hiblz3kwfznn1sjcyxm552z6n"; + sha256 = "162qj5z9wzm63im6jnd0n95ggzdk6fzq5bxgrr0l3y82ahfb7qwa"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index b08ff812ace4..6cba5236a5f1 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -12,6 +12,7 @@ , withQt5 ? true, qtbase ? null, qtsvg ? null, qtx11extras ? null , jackSupport ? false , fetchpatch +, removeReferencesTo }: with stdenv.lib; @@ -42,7 +43,7 @@ stdenv.mkDerivation rec { ] ++ optionals withQt5 [ qtbase qtsvg qtx11extras ] ++ optional jackSupport libjack2; - nativeBuildInputs = [ autoreconfHook perl pkgconfig ]; + nativeBuildInputs = [ autoreconfHook perl pkgconfig removeReferencesTo ]; enableParallelBuilding = true; @@ -60,10 +61,14 @@ stdenv.mkDerivation rec { /usr/share/fonts/truetype/freefont ${freefont_ttf}/share/fonts/truetype ''; - # https://github.com/NixOS/nixpkgs/pull/35124#issuecomment-370552830 + # - Touch plugins (plugins cache keyed off mtime and file size: + # https://github.com/NixOS/nixpkgs/pull/35124#issuecomment-370552830 + # - Remove references to the Qt development headers (used in error messages) postFixup = '' find $out/lib/vlc/plugins -exec touch -d @1 '{}' ';' $out/lib/vlc/vlc-cache-gen $out/vlc/plugins + + remove-references-to -t "${qtbase.dev}" $out/lib/vlc/plugins/gui/libqt_plugin.so ''; # Most of the libraries are auto-detected so we don't need to set a bunch of @@ -72,6 +77,11 @@ stdenv.mkDerivation rec { "--with-kde-solid=$out/share/apps/solid/actions" ] ++ optional onlyLibVLC "--disable-vlc"; + # Remove runtime dependencies on libraries + postConfigure = '' + sed -i 's|^#define CONFIGURE_LINE.*$|#define CONFIGURE_LINE "<removed>"|g' config.h + ''; + meta = with stdenv.lib; { description = "Cross-platform media player and streaming server"; homepage = http://www.videolan.org/vlc/; diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix new file mode 100644 index 000000000000..79dbddfab550 --- /dev/null +++ b/pkgs/applications/virtualization/cntr/default.nix @@ -0,0 +1,24 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + name = "cntr-${version}"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "Mic92"; + repo = "cntr"; + rev = version; + sha256 = "0lmbsnjia44h4rskqkv9yc7xb6f3qjgbg8kcr9zqnr7ivr5fjcxg"; + }; + + cargoSha256 = "0gainr5gfy0bbhr6078zvgx0kzp53slxjp37d3da091ikgzgfn51"; + + meta = with stdenv.lib; { + description = "A container debugging tool based on FUSE"; + homepage = https://github.com/Mic92/cntr; + license = licenses.mit; + # aarch64 support will be fixed soon + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index a1ff9bde3ed8..bd44b4fcbfeb 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { name = "containerd-${version}"; - version = "1.1.4"; + version = "1.2.0"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "1d4qnviv20zi3zk17zz8271mlfqqgfrxblw86izwwfvj3cvsyrah"; + sha256 = "03d244v85975bavmlg66kd283jdb22yyvwkwcgy91n63jhvvbadk"; }; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index f65118ba4a64..252a0ff521fd 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -2,7 +2,7 @@ { crateName, dependencies, crateFeatures, libName, release, libPath, - crateType, metadata, crateBin, + crateType, metadata, crateBin, hasCrateBin, extraRustcOpts, verbose, colors }: let @@ -13,6 +13,17 @@ (if release then "-C opt-level=3" else "-C debuginfo=2") (["-C codegen-units=1"] ++ extraRustcOpts); rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}"; + + # Some platforms have different names for rustc. + rustPlatform = + with stdenv.hostPlatform.parsed; + let cpu_ = if cpu.name == "armv7a" then "armv7" + else cpu.name; + vendor_ = vendor.name; + kernel_ = kernel.name; + abi_ = abi.name; + in + "${cpu_}-${vendor_}-${kernel_}-${abi_}"; in '' runHook preBuild norm="" @@ -32,7 +43,8 @@ lib_src=$1 echo_build_heading $lib_src ${libName} - noisily rustc --crate-name $CRATE_NAME $lib_src --crate-type ${crateType} \ + noisily rustc --crate-name $CRATE_NAME $lib_src \ + ${lib.strings.concatStrings (map (x: " --crate-type ${x}") crateType)} \ ${rustcOpts} ${rustcMeta} ${crateFeatures} --out-dir target/lib \ --emit=dep-info,link -L dependency=target/deps ${deps} --cap-lints allow \ $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors} @@ -54,7 +66,8 @@ noisily rustc --crate-name $crate_name_ $main_file --crate-type bin ${rustcOpts}\ ${crateFeatures} --out-dir target/bin --emit=dep-info,link -L dependency=target/deps \ $LINK ${deps}$EXTRA_LIB --cap-lints allow \ - $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors} + $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors} \ + ${if stdenv.hostPlatform != stdenv.buildPlatform then "--target ${rustPlatform} -C linker=${stdenv.hostPlatform.config}-gcc" else ""} if [ "$crate_name_" != "$crate_name" ]; then mv target/bin/$crate_name_ target/bin/$crate_name fi @@ -103,9 +116,9 @@ tr '\n' ' ' < target/link > target/link_ LINK=$(cat target/link_) fi - - mkdir -p target/bin + ${lib.optionalString (crateBin != "") '' printf "%s\n" "${crateBin}" | head -n1 | tr -s ',' '\n' | while read -r BIN_NAME BIN_PATH; do + mkdir -p target/bin # filter empty entries / empty "lines" if [[ -z "$BIN_NAME" ]]; then continue @@ -141,13 +154,15 @@ fi build_bin "$BIN_NAME" "$BIN_PATH" done + ''} - - ${lib.optionalString (crateBin == "") '' + ${lib.optionalString (crateBin == "" && !hasCrateBin) '' if [[ -e src/main.rs ]]; then + mkdir -p target/bin build_bin ${crateName} src/main.rs fi for i in src/bin/*.rs; do #*/ + mkdir -p target/bin build_bin "$(basename $i .rs)" "$i" done ''} diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index a11cef9f1f46..ec11472bbaeb 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -4,7 +4,7 @@ # This can be useful for deploying packages with NixOps, and to share # binary dependencies between projects. -{ lib, stdenv, defaultCrateOverrides, fetchCrate, ncurses, rustc }: +{ lib, stdenv, defaultCrateOverrides, fetchCrate, rustc }: let # This doesn't appear to be officially documented anywhere yet. @@ -16,7 +16,7 @@ let makeDeps = dependencies: (lib.concatMapStringsSep " " (dep: let extern = lib.strings.replaceStrings ["-"] ["_"] dep.libName; in - (if dep.crateType == "lib" then + (if lib.lists.any (x: x == "lib") dep.crateType then " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}.rlib" else " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}") @@ -86,7 +86,8 @@ stdenv.mkDerivation (rec { else fetchCrate { inherit (crate) crateName version sha256; }; name = "rust_${crate.crateName}-${crate.version}"; - buildInputs = [ rust ncurses ] ++ (crate.buildInputs or []) ++ buildInputs_; + depsBuildBuild = [ rust stdenv.cc ]; + buildInputs = (crate.buildInputs or []) ++ buildInputs_; dependencies = builtins.map (dep: dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; }) @@ -122,15 +123,16 @@ stdenv.mkDerivation (rec { ) "" crate.crateBin else ""; + hasCrateBin = crate ? crateBin; build = crate.build or ""; workspace_member = crate.workspace_member or "."; crateVersion = crate.version; crateAuthors = if crate ? authors && lib.isList crate.authors then crate.authors else []; crateType = - if lib.attrByPath ["procMacro"] false crate then "proc-macro" else - if lib.attrByPath ["plugin"] false crate then "dylib" else - (crate.type or "lib"); + if lib.attrByPath ["procMacro"] false crate then ["proc-macro"] else + if lib.attrByPath ["plugin"] false crate then ["dylib"] else + (crate.type or ["lib"]); colors = lib.attrByPath [ "colors" ] "always" crate; extraLinkFlags = builtins.concatStringsSep " " (crate.extraLinkFlags or []); configurePhase = configureCrate { @@ -143,7 +145,7 @@ stdenv.mkDerivation (rec { buildPhase = buildCrate { inherit crateName dependencies crateFeatures libName release libPath crateType - metadata crateBin verbose colors + metadata crateBin hasCrateBin verbose colors extraRustcOpts; }; installPhase = installCrate crateName metadata; diff --git a/pkgs/build-support/rust/build-rust-crate/helpers.nix b/pkgs/build-support/rust/build-rust-crate/helpers.nix new file mode 100644 index 000000000000..e04324684e50 --- /dev/null +++ b/pkgs/build-support/rust/build-rust-crate/helpers.nix @@ -0,0 +1,24 @@ +{stdenv, lib}: +{ + kernel = stdenv.hostPlatform.parsed.kernel.name; + abi = stdenv.hostPlatform.parsed.abi.name; + updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); + mapFeatures = features: map (fun: fun { features = features; }); + mkFeatures = feat: lib.lists.foldl (features: featureName: + if feat.${featureName} or false then + [ featureName ] ++ features + else + features + ) [] (builtins.attrNames feat); + include = includedFiles: src: builtins.filterSource (path: type: + lib.lists.any (f: + let p = toString (src + ("/" + f)); in + (path == p) || (type == "directory" && lib.strings.hasPrefix path p) + ) includedFiles + ) src; + exclude = excludedFiles: src: builtins.filterSource (path: type: + lib.lists.all (f: + !lib.strings.hasPrefix (toString (src + ("/" + f))) path + ) excludedFiles + ) src; +} diff --git a/pkgs/build-support/rust/carnix.nix b/pkgs/build-support/rust/carnix.nix index 0b8b3d60b6c9..7a0d92f81b45 100644 --- a/pkgs/build-support/rust/carnix.nix +++ b/pkgs/build-support/rust/carnix.nix @@ -1,1444 +1,251 @@ -# Generated by carnix 0.7.2: carnix nix -{ lib, stdenv, buildRustCrate, fetchgit }: -let kernel = stdenv.hostPlatform.parsed.kernel.name; - abi = stdenv.hostPlatform.parsed.abi.name; - updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); - mapFeatures = features: map (fun: fun { features = features; }); - mkFeatures = feat: lib.lists.foldl (features: featureName: - if feat.${featureName} or false then - [ featureName ] ++ features - else - features - ) [] (builtins.attrNames feat); +# Generated by carnix 0.8.11: carnix generate-nix +{ lib, buildPlatform, buildRustCrate, buildRustCrateHelpers, cratesIO, fetchgit }: +with buildRustCrateHelpers; +let inherit (lib.lists) fold; + inherit (lib.attrsets) recursiveUpdate; in +let crates = cratesIO; in rec { - carnix = f: carnix_0_7_2 { features = carnix_0_7_2_features { carnix_0_7_2 = f; }; }; + carnix = crates.crates.carnix."0.8.11" deps; __all = [ (carnix {}) ]; - aho_corasick_0_6_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "aho-corasick"; - version = "0.6.4"; - authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; - sha256 = "189v919mp6rzzgjp1khpn4zlq8ls81gh43x1lmc8kbkagdlpq888"; - libName = "aho_corasick"; - crateBin = [ { name = "aho-corasick-dot"; } ]; - inherit dependencies buildDependencies features; + deps.aho_corasick."0.6.8" = { + memchr = "2.1.0"; + }; + deps.ansi_term."0.11.0" = { + winapi = "0.3.6"; + }; + deps.argon2rs."0.2.5" = { + blake2_rfc = "0.2.18"; + scoped_threadpool = "0.1.9"; + }; + deps.arrayvec."0.4.7" = { + nodrop = "0.1.12"; + }; + deps.atty."0.2.11" = { + termion = "1.5.1"; + libc = "0.2.43"; + winapi = "0.3.6"; + }; + deps.backtrace."0.3.9" = { + cfg_if = "0.1.6"; + rustc_demangle = "0.1.9"; + backtrace_sys = "0.1.24"; + libc = "0.2.43"; + winapi = "0.3.6"; + }; + deps.backtrace_sys."0.1.24" = { + libc = "0.2.43"; + cc = "1.0.25"; + }; + deps.bitflags."1.0.4" = {}; + deps.blake2_rfc."0.2.18" = { + arrayvec = "0.4.7"; + constant_time_eq = "0.1.3"; + }; + deps.carnix."0.8.11" = { + clap = "2.32.0"; + dirs = "1.0.4"; + env_logger = "0.5.13"; + error_chain = "0.12.0"; + itertools = "0.7.8"; + log = "0.4.5"; + nom = "3.2.1"; + regex = "1.0.5"; + rusqlite = "0.14.0"; + serde = "1.0.80"; + serde_derive = "1.0.80"; + serde_json = "1.0.32"; + tempdir = "0.3.7"; + toml = "0.4.8"; + }; + deps.cc."1.0.25" = {}; + deps.cfg_if."0.1.6" = {}; + deps.clap."2.32.0" = { + atty = "0.2.11"; + bitflags = "1.0.4"; + strsim = "0.7.0"; + textwrap = "0.10.0"; + unicode_width = "0.1.5"; + vec_map = "0.8.1"; + ansi_term = "0.11.0"; + }; + deps.constant_time_eq."0.1.3" = {}; + deps.dirs."1.0.4" = { + redox_users = "0.2.0"; + libc = "0.2.43"; + winapi = "0.3.6"; + }; + deps.either."1.5.0" = {}; + deps.env_logger."0.5.13" = { + atty = "0.2.11"; + humantime = "1.1.1"; + log = "0.4.5"; + regex = "1.0.5"; + termcolor = "1.0.4"; + }; + deps.error_chain."0.12.0" = { + backtrace = "0.3.9"; + }; + deps.failure."0.1.3" = { + backtrace = "0.3.9"; + failure_derive = "0.1.3"; + }; + deps.failure_derive."0.1.3" = { + proc_macro2 = "0.4.20"; + quote = "0.6.8"; + syn = "0.15.13"; + synstructure = "0.10.0"; + }; + deps.fuchsia_zircon."0.3.3" = { + bitflags = "1.0.4"; + fuchsia_zircon_sys = "0.3.3"; + }; + deps.fuchsia_zircon_sys."0.3.3" = {}; + deps.humantime."1.1.1" = { + quick_error = "1.2.2"; + }; + deps.itertools."0.7.8" = { + either = "1.5.0"; + }; + deps.itoa."0.4.3" = {}; + deps.lazy_static."1.1.0" = { + version_check = "0.1.5"; + }; + deps.libc."0.2.43" = {}; + deps.libsqlite3_sys."0.9.3" = { + pkg_config = "0.3.14"; + }; + deps.linked_hash_map."0.4.2" = {}; + deps.log."0.4.5" = { + cfg_if = "0.1.6"; + }; + deps.lru_cache."0.1.1" = { + linked_hash_map = "0.4.2"; + }; + deps.memchr."1.0.2" = { + libc = "0.2.43"; + }; + deps.memchr."2.1.0" = { + cfg_if = "0.1.6"; + libc = "0.2.43"; + version_check = "0.1.5"; + }; + deps.nodrop."0.1.12" = {}; + deps.nom."3.2.1" = { + memchr = "1.0.2"; + }; + deps.pkg_config."0.3.14" = {}; + deps.proc_macro2."0.4.20" = { + unicode_xid = "0.1.0"; + }; + deps.quick_error."1.2.2" = {}; + deps.quote."0.6.8" = { + proc_macro2 = "0.4.20"; + }; + deps.rand."0.4.3" = { + fuchsia_zircon = "0.3.3"; + libc = "0.2.43"; + winapi = "0.3.6"; + }; + deps.redox_syscall."0.1.40" = {}; + deps.redox_termios."0.1.1" = { + redox_syscall = "0.1.40"; + }; + deps.redox_users."0.2.0" = { + argon2rs = "0.2.5"; + failure = "0.1.3"; + rand = "0.4.3"; + redox_syscall = "0.1.40"; + }; + deps.regex."1.0.5" = { + aho_corasick = "0.6.8"; + memchr = "2.1.0"; + regex_syntax = "0.6.2"; + thread_local = "0.3.6"; + utf8_ranges = "1.0.1"; + }; + deps.regex_syntax."0.6.2" = { + ucd_util = "0.1.1"; + }; + deps.remove_dir_all."0.5.1" = { + winapi = "0.3.6"; + }; + deps.rusqlite."0.14.0" = { + bitflags = "1.0.4"; + libsqlite3_sys = "0.9.3"; + lru_cache = "0.1.1"; + time = "0.1.40"; + }; + deps.rustc_demangle."0.1.9" = {}; + deps.ryu."0.2.6" = {}; + deps.scoped_threadpool."0.1.9" = {}; + deps.serde."1.0.80" = {}; + deps.serde_derive."1.0.80" = { + proc_macro2 = "0.4.20"; + quote = "0.6.8"; + syn = "0.15.13"; + }; + deps.serde_json."1.0.32" = { + itoa = "0.4.3"; + ryu = "0.2.6"; + serde = "1.0.80"; + }; + deps.strsim."0.7.0" = {}; + deps.syn."0.15.13" = { + proc_macro2 = "0.4.20"; + quote = "0.6.8"; + unicode_xid = "0.1.0"; + }; + deps.synstructure."0.10.0" = { + proc_macro2 = "0.4.20"; + quote = "0.6.8"; + syn = "0.15.13"; + unicode_xid = "0.1.0"; + }; + deps.tempdir."0.3.7" = { + rand = "0.4.3"; + remove_dir_all = "0.5.1"; + }; + deps.termcolor."1.0.4" = { + wincolor = "1.0.1"; + }; + deps.termion."1.5.1" = { + libc = "0.2.43"; + redox_syscall = "0.1.40"; + redox_termios = "0.1.1"; + }; + deps.textwrap."0.10.0" = { + unicode_width = "0.1.5"; + }; + deps.thread_local."0.3.6" = { + lazy_static = "1.1.0"; + }; + deps.time."0.1.40" = { + libc = "0.2.43"; + redox_syscall = "0.1.40"; + winapi = "0.3.6"; + }; + deps.toml."0.4.8" = { + serde = "1.0.80"; + }; + deps.ucd_util."0.1.1" = {}; + deps.unicode_width."0.1.5" = {}; + deps.unicode_xid."0.1.0" = {}; + deps.utf8_ranges."1.0.1" = {}; + deps.vcpkg."0.2.6" = {}; + deps.vec_map."0.8.1" = {}; + deps.version_check."0.1.5" = {}; + deps.winapi."0.3.6" = { + winapi_i686_pc_windows_gnu = "0.4.0"; + winapi_x86_64_pc_windows_gnu = "0.4.0"; + }; + deps.winapi_i686_pc_windows_gnu."0.4.0" = {}; + deps.winapi_util."0.1.1" = { + winapi = "0.3.6"; + }; + deps.winapi_x86_64_pc_windows_gnu."0.4.0" = {}; + deps.wincolor."1.0.1" = { + winapi = "0.3.6"; + winapi_util = "0.1.1"; }; - ansi_term_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "ansi_term"; - version = "0.11.0"; - authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) <ryan.havvy@gmail.com>" "Josh Triplett <josh@joshtriplett.org>" ]; - sha256 = "08fk0p2xvkqpmz3zlrwnf6l8sj2vngw464rvzspzp31sbgxbwm4v"; - inherit dependencies buildDependencies features; - }; - atty_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "atty"; - version = "0.2.8"; - authors = [ "softprops <d.tangren@gmail.com>" ]; - sha256 = "03w1q3h4w7vhcdxdwa9cirjkzdjz3ja636fj3g64659z6yax6p6d"; - inherit dependencies buildDependencies features; - }; - backtrace_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "backtrace"; - version = "0.3.6"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" "The Rust Project Developers" ]; - sha256 = "00p77iqrv2p47m4y5lq1clb8fi1xfmnz2520frqx88497ff4zhrx"; - inherit dependencies buildDependencies features; - }; - backtrace_sys_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "backtrace-sys"; - version = "0.1.16"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "1cn2c8q3dn06crmnk0p62czkngam4l8nf57wy33nz1y5g25pszwy"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - bitflags_1_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "bitflags"; - version = "1.0.1"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0p4b3nr0s5nda2qmm7xdhnvh4lkqk3xd8l9ffmwbvqw137vx7mj1"; - inherit dependencies buildDependencies features; - }; - carnix_0_7_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "carnix"; - version = "0.7.2"; - authors = [ "pe@pijul.org <pe@pijul.org>" ]; - sha256 = "0zsmc4wiz7vill676mcdh6ibyzmr9rn030j555ncqgavs7k5yhq5"; - crateBin = [ { name = "cargo-generate-nixfile"; path = "src/cargo-generate-nixfile.rs"; } { name = "carnix"; path = "src/main.rs"; } ]; - inherit dependencies buildDependencies features; - }; - cc_1_0_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "cc"; - version = "1.0.10"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "0fqchrxcrd2j2b9x7cqs49ck7b3ilsap8s9xhs75gzgl6c1ylpdn"; - inherit dependencies buildDependencies features; - }; - cfg_if_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "cfg-if"; - version = "0.1.2"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "0x06hvrrqy96m97593823vvxcgvjaxckghwyy2jcyc8qc7c6cyhi"; - inherit dependencies buildDependencies features; - }; - clap_2_31_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "clap"; - version = "2.31.2"; - authors = [ "Kevin K. <kbknapp@gmail.com>" ]; - sha256 = "0r24ziw85a8y1sf2l21y4mvv5qan3rjafcshpyfsjfadqfxsij72"; - inherit dependencies buildDependencies features; - }; - dtoa_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "dtoa"; - version = "0.4.2"; - authors = [ "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "1bxsh6fags7nr36vlz07ik2a1rzyipc8x1y30kjk832hf2pzadmw"; - inherit dependencies buildDependencies features; - }; - either_1_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "either"; - version = "1.5.0"; - authors = [ "bluss" ]; - sha256 = "1f7kl2ln01y02m8fpd2zrdjiwqmgfvl9nxxrfry3k19d1gd2bsvz"; - inherit dependencies buildDependencies features; - }; - env_logger_0_5_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "env_logger"; - version = "0.5.7"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0wgd9fashmwbx5ssrxx69naam6hlb5c7qmh1nln645q4gms35i2l"; - inherit dependencies buildDependencies features; - }; - error_chain_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "error-chain"; - version = "0.11.0"; - authors = [ "Brian Anderson <banderson@mozilla.com>" "Paul Colomiets <paul@colomiets.name>" "Colin Kiegel <kiegel@gmx.de>" "Yamakaky <yamakaky@yamaworld.fr>" ]; - sha256 = "19nz17q6dzp0mx2jhh9qbj45gkvvgcl7zq9z2ai5a8ihbisfj6d7"; - inherit dependencies buildDependencies features; - }; - fuchsia_zircon_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "fuchsia-zircon"; - version = "0.3.3"; - authors = [ "Raph Levien <raph@google.com>" ]; - sha256 = "0jrf4shb1699r4la8z358vri8318w4mdi6qzfqy30p2ymjlca4gk"; - inherit dependencies buildDependencies features; - }; - fuchsia_zircon_sys_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "fuchsia-zircon-sys"; - version = "0.3.3"; - authors = [ "Raph Levien <raph@google.com>" ]; - sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5"; - inherit dependencies buildDependencies features; - }; - humantime_1_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "humantime"; - version = "1.1.1"; - authors = [ "Paul Colomiets <paul@colomiets.name>" ]; - sha256 = "1lzdfsfzdikcp1qb6wcdvnsdv16pmzr7p7cv171vnbnyz2lrwbgn"; - libPath = "src/lib.rs"; - inherit dependencies buildDependencies features; - }; - itertools_0_7_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "itertools"; - version = "0.7.8"; - authors = [ "bluss" ]; - sha256 = "0ib30cd7d1icjxsa13mji1gry3grp72kx8p33yd84mphdbc3d357"; - inherit dependencies buildDependencies features; - }; - itoa_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "itoa"; - version = "0.4.1"; - authors = [ "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "1jyrsmrm5q4r2ipmq5hvvkqg0mgnlbk44lm7gr0v9ymvbrh2gbij"; - inherit dependencies buildDependencies features; - }; - lazy_static_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "lazy_static"; - version = "1.0.0"; - authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ]; - sha256 = "0wfvqyr2nvx2mbsrscg5y7gfa9skhb8p72ayanl8vl49pw24v4fh"; - inherit dependencies buildDependencies features; - }; - libc_0_2_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "libc"; - version = "0.2.40"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1xfc39237ldzgr8x8wcflgdr8zssi3wif7g2zxc02d94gzkjsw83"; - inherit dependencies buildDependencies features; - }; - libsqlite3_sys_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "libsqlite3-sys"; - version = "0.9.1"; - authors = [ "John Gallagher <jgallagher@bignerdranch.com>" ]; - sha256 = "1j599xygsh564xmx29942w0sq7w05c1jipk6dsyrxj6b33kw3fw7"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - linked_hash_map_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "linked-hash-map"; - version = "0.4.2"; - authors = [ "Stepan Koltsov <stepan.koltsov@gmail.com>" "Andrew Paseltiner <apaseltiner@gmail.com>" ]; - sha256 = "04da208h6jb69f46j37jnvsw2i1wqplglp4d61csqcrhh83avbgl"; - inherit dependencies buildDependencies features; - }; - log_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "log"; - version = "0.4.1"; - authors = [ "The Rust Project Developers" ]; - sha256 = "01vm8yy3wngvyj6qp1x3xpcb4xq7v67yn9l7fsma8kz28mliz90d"; - inherit dependencies buildDependencies features; - }; - lru_cache_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "lru-cache"; - version = "0.1.1"; - authors = [ "Stepan Koltsov <stepan.koltsov@gmail.com>" ]; - sha256 = "1hl6kii1g54sq649gnscv858mmw7a02xj081l4vcgvrswdi2z8fw"; - inherit dependencies buildDependencies features; - }; - memchr_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "memchr"; - version = "1.0.2"; - authors = [ "Andrew Gallant <jamslam@gmail.com>" "bluss" ]; - sha256 = "0dfb8ifl9nrc9kzgd5z91q6qg87sh285q1ih7xgrsglmqfav9lg7"; - inherit dependencies buildDependencies features; - }; - memchr_2_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "memchr"; - version = "2.0.1"; - authors = [ "Andrew Gallant <jamslam@gmail.com>" "bluss" ]; - sha256 = "0ls2y47rjwapjdax6bp974gdp06ggm1v8d1h69wyydmh1nhgm5gr"; - inherit dependencies buildDependencies features; - }; - nom_3_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "nom"; - version = "3.2.1"; - authors = [ "contact@geoffroycouprie.com" ]; - sha256 = "1vcllxrz9hdw6j25kn020ka3psz1vkaqh1hm3yfak2240zrxgi07"; - inherit dependencies buildDependencies features; - }; - num_traits_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num-traits"; - version = "0.2.2"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1gcqhcd27gi72al5salxlp3m374qr3xnc3zh249f7dsrxc9rmgh0"; - inherit dependencies buildDependencies features; - }; - pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "pkg-config"; - version = "0.3.9"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146"; - inherit dependencies buildDependencies features; - }; - proc_macro2_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "proc-macro2"; - version = "0.3.6"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "1viqlvsknzvgc2j0bcz53n94zxv7c816py7hv2r27y0bv1dq4iqp"; - inherit dependencies buildDependencies features; - }; - quick_error_1_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "quick-error"; - version = "1.2.1"; - authors = [ "Paul Colomiets <paul@colomiets.name>" "Colin Kiegel <kiegel@gmx.de>" ]; - sha256 = "0vq41csw68ynaq2fy5dvldh4lx7pnbw6pr332kv5rvrz4pz0jnq6"; - inherit dependencies buildDependencies features; - }; - quote_0_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "quote"; - version = "0.5.1"; - authors = [ "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "0jppgddqp6vp67ns4hpyf644n5678fligp711isp0xkvfv19la3r"; - inherit dependencies buildDependencies features; - }; - rand_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rand"; - version = "0.4.2"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0h8pkg23wb67i8904sm76iyr1jlmhklb85vbpz9c9191a24xzkfm"; - inherit dependencies buildDependencies features; - }; - redox_syscall_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "redox_syscall"; - version = "0.1.37"; - authors = [ "Jeremy Soller <jackpot51@gmail.com>" ]; - sha256 = "0qa0jl9cr3qp80an8vshp2mcn8rzvwiavs1398hq1vsjw7pc3h2v"; - libName = "syscall"; - inherit dependencies buildDependencies features; - }; - redox_termios_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "redox_termios"; - version = "0.1.1"; - authors = [ "Jeremy Soller <jackpot51@gmail.com>" ]; - sha256 = "04s6yyzjca552hdaqlvqhp3vw0zqbc304md5czyd3axh56iry8wh"; - libPath = "src/lib.rs"; - inherit dependencies buildDependencies features; - }; - regex_0_2_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "regex"; - version = "0.2.10"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0cwdmcllssm984b5nnpr55rgla1yzw31kmp2imxdpgk6hvlhf1ca"; - inherit dependencies buildDependencies features; - }; - regex_syntax_0_5_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "regex-syntax"; - version = "0.5.5"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1m5v66r6xxglgkdl1ci23qq0bl0k2wqplm6li4pmg1k7szvgxcbp"; - inherit dependencies buildDependencies features; - }; - remove_dir_all_0_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "remove_dir_all"; - version = "0.5.0"; - authors = [ "Aaronepower <theaaronepower@gmail.com>" ]; - sha256 = "0cgmlm9xvf19z84zcb7d62c2lfv60g6gd58c9717giq7c9ib284y"; - inherit dependencies buildDependencies features; - }; - rusqlite_0_13_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rusqlite"; - version = "0.13.0"; - authors = [ "John Gallagher <jgallagher@bignerdranch.com>" ]; - sha256 = "1hj2464ar2y4324sk3jx7m9byhkcp60krrrs1v1i8dlhhlnkb9hc"; - inherit dependencies buildDependencies features; - }; - rustc_demangle_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rustc-demangle"; - version = "0.1.7"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "0wrln6jvwmqrhyvqlw5vq9a2s4r04ja8mrybxjj9aaaar1fyvns6"; - inherit dependencies buildDependencies features; - }; - serde_1_0_38_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde"; - version = "1.0.38"; - authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "0dri7vmzjsfmak1qq5wdinykqqvd5shpms504p8acpgyx7817jgk"; - inherit dependencies buildDependencies features; - }; - serde_derive_1_0_38_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde_derive"; - version = "1.0.38"; - authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "027c13sbnqkfzc8vxx0m6wnkr68im8kdbkbnix07dgw1l616yw0m"; - procMacro = true; - inherit dependencies buildDependencies features; - }; - serde_derive_internals_0_23_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde_derive_internals"; - version = "0.23.1"; - authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "0bjgcn2irh6sd34q3j3xkbn5ghfgiv3cfdlffb31lh0bikwpk1b4"; - inherit dependencies buildDependencies features; - }; - serde_json_1_0_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde_json"; - version = "1.0.14"; - authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "053n2vbcx32f28pr8fxi0fxq7m3g0gm94kz9i1fmi1kiwq9j5lsj"; - inherit dependencies buildDependencies features; - }; - strsim_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "strsim"; - version = "0.7.0"; - authors = [ "Danny Guo <dannyguo91@gmail.com>" ]; - sha256 = "0fy0k5f2705z73mb3x9459bpcvrx4ky8jpr4zikcbiwan4bnm0iv"; - inherit dependencies buildDependencies features; - }; - syn_0_13_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "syn"; - version = "0.13.1"; - authors = [ "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "1pimp7fpvillhz06xz0k6450h9nis3ab6h1j2hzrzykrpxs2qnyg"; - inherit dependencies buildDependencies features; - }; - tempdir_0_3_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tempdir"; - version = "0.3.7"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0y53sxybyljrr7lh0x0ysrsa7p7cljmwv9v80acy3rc6n97g67vy"; - inherit dependencies buildDependencies features; - }; - termcolor_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "termcolor"; - version = "0.3.6"; - authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; - sha256 = "0w609sa1apl1kii67ln2g82r4rrycw45zgjq7mxxjrx1fa21v05z"; - inherit dependencies buildDependencies features; - }; - termion_1_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "termion"; - version = "1.5.1"; - authors = [ "ticki <Ticki@users.noreply.github.com>" "gycos <alexandre.bury@gmail.com>" "IGI-111 <igi-111@protonmail.com>" ]; - sha256 = "02gq4vd8iws1f3gjrgrgpajsk2bk43nds5acbbb4s8dvrdvr8nf1"; - inherit dependencies buildDependencies features; - }; - textwrap_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "textwrap"; - version = "0.9.0"; - authors = [ "Martin Geisler <martin@geisler.net>" ]; - sha256 = "18jg79ndjlwndz01mlbh82kkr2arqm658yn5kwp65l5n1hz8w4yb"; - inherit dependencies buildDependencies features; - }; - thread_local_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "thread_local"; - version = "0.3.5"; - authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ]; - sha256 = "0mkp0sp91aqsk7brgygai4igv751r1754rsxn37mig3ag5rx8np6"; - inherit dependencies buildDependencies features; - }; - time_0_1_39_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "time"; - version = "0.1.39"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1ryy3bwhvyzj6fym123il38mk9ranm4vradj2a47l5ij8jd7w5if"; - inherit dependencies buildDependencies features; - }; - toml_0_4_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "toml"; - version = "0.4.6"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "0rfl7lyb5f67spk69s604nw87f97g7fvv36hj9v88qlr2bwyrn8v"; - inherit dependencies buildDependencies features; - }; - ucd_util_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "ucd-util"; - version = "0.1.1"; - authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; - sha256 = "02a8h3siipx52b832xc8m8rwasj6nx9jpiwfldw8hp6k205hgkn0"; - inherit dependencies buildDependencies features; - }; - unicode_width_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-width"; - version = "0.1.4"; - authors = [ "kwantam <kwantam@gmail.com>" ]; - sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl"; - inherit dependencies buildDependencies features; - }; - unicode_xid_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-xid"; - version = "0.1.0"; - authors = [ "erick.tryzelaar <erick.tryzelaar@gmail.com>" "kwantam <kwantam@gmail.com>" ]; - sha256 = "05wdmwlfzxhq3nhsxn6wx4q8dhxzzfb9szsz6wiw092m1rjj01zj"; - inherit dependencies buildDependencies features; - }; - unreachable_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unreachable"; - version = "1.0.0"; - authors = [ "Jonathan Reem <jonathan.reem@gmail.com>" ]; - sha256 = "1am8czbk5wwr25gbp2zr007744fxjshhdqjz9liz7wl4pnv3whcf"; - inherit dependencies buildDependencies features; - }; - utf8_ranges_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "utf8-ranges"; - version = "1.0.0"; - authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; - sha256 = "0rzmqprwjv9yp1n0qqgahgm24872x6c0xddfym5pfndy7a36vkn0"; - inherit dependencies buildDependencies features; - }; - vcpkg_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "vcpkg"; - version = "0.2.3"; - authors = [ "Jim McGrath <jimmc2@gmail.com>" ]; - sha256 = "0achi8sfy0wm4q04gj7nwpq9xfx8ynk6vv4r12a3ijg26hispq0c"; - inherit dependencies buildDependencies features; - }; - vec_map_0_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "vec_map"; - version = "0.8.0"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" "Jorge Aparicio <japaricious@gmail.com>" "Alexis Beingessner <a.beingessner@gmail.com>" "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon <aturon@mozilla.com>" "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood <csouth3@illinois.edu>" "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens <markus@m-siemens.de>" "Josh Branchaud <jbranchaud@gmail.com>" "Huon Wilson <dbau.pp@gmail.com>" "Corey Farwell <coref@rwell.org>" "Aaron Liblong <>" "Nick Cameron <nrc@ncameron.org>" "Patrick Walton <pcwalton@mimiga.net>" "Felix S Klock II <>" "Andrew Paseltiner <apaseltiner@gmail.com>" "Sean McArthur <sean.monstar@gmail.com>" "Vadim Petrochenkov <>" ]; - sha256 = "07sgxp3cf1a4cxm9n3r27fcvqmld32bl2576mrcahnvm34j11xay"; - inherit dependencies buildDependencies features; - }; - void_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "void"; - version = "1.0.2"; - authors = [ "Jonathan Reem <jonathan.reem@gmail.com>" ]; - sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3"; - inherit dependencies buildDependencies features; - }; - winapi_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi"; - version = "0.3.4"; - authors = [ "Peter Atashian <retep998@gmail.com>" ]; - sha256 = "1qbrf5dcnd8j36cawby5d9r5vx07r0l4ryf672pfncnp8895k9lx"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - winapi_i686_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi-i686-pc-windows-gnu"; - version = "0.4.0"; - authors = [ "Peter Atashian <retep998@gmail.com>" ]; - sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - winapi_x86_64_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi-x86_64-pc-windows-gnu"; - version = "0.4.0"; - authors = [ "Peter Atashian <retep998@gmail.com>" ]; - sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - wincolor_0_1_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "wincolor"; - version = "0.1.6"; - authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; - sha256 = "0f8m3l86pw6qi31jidqj78pgd15xj914850lyvsxkbln4f1drv47"; - inherit dependencies buildDependencies features; - }; - aho_corasick_0_6_4 = { features?(aho_corasick_0_6_4_features {}) }: aho_corasick_0_6_4_ { - dependencies = mapFeatures features ([ memchr_2_0_1 ]); - }; - aho_corasick_0_6_4_features = f: updateFeatures f (rec { - aho_corasick_0_6_4.default = (f.aho_corasick_0_6_4.default or true); - memchr_2_0_1.default = true; - }) [ memchr_2_0_1_features ]; - ansi_term_0_11_0 = { features?(ansi_term_0_11_0_features {}) }: ansi_term_0_11_0_ { - dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); - }; - ansi_term_0_11_0_features = f: updateFeatures f (rec { - ansi_term_0_11_0.default = (f.ansi_term_0_11_0.default or true); - winapi_0_3_4.consoleapi = true; - winapi_0_3_4.default = true; - winapi_0_3_4.errhandlingapi = true; - winapi_0_3_4.processenv = true; - }) [ winapi_0_3_4_features ]; - atty_0_2_8 = { features?(atty_0_2_8_features {}) }: atty_0_2_8_ { - dependencies = (if kernel == "redox" then mapFeatures features ([ termion_1_5_1 ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_40 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); - }; - atty_0_2_8_features = f: updateFeatures f (rec { - atty_0_2_8.default = (f.atty_0_2_8.default or true); - libc_0_2_40.default = (f.libc_0_2_40.default or false); - termion_1_5_1.default = true; - winapi_0_3_4.consoleapi = true; - winapi_0_3_4.default = true; - winapi_0_3_4.minwinbase = true; - winapi_0_3_4.minwindef = true; - winapi_0_3_4.processenv = true; - winapi_0_3_4.winbase = true; - }) [ termion_1_5_1_features libc_0_2_40_features winapi_0_3_4_features ]; - backtrace_0_3_6 = { features?(backtrace_0_3_6_features {}) }: backtrace_0_3_6_ { - dependencies = mapFeatures features ([ cfg_if_0_1_2 rustc_demangle_0_1_7 ]) - ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then mapFeatures features ([ ] - ++ (if features.backtrace_0_3_6.backtrace-sys or false then [ backtrace_sys_0_1_16 ] else [])) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_40 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ ] - ++ (if features.backtrace_0_3_6.winapi or false then [ winapi_0_3_4 ] else [])) else []); - features = mkFeatures (features.backtrace_0_3_6 or {}); - }; - backtrace_0_3_6_features = f: updateFeatures f (rec { - backtrace_0_3_6.addr2line = - (f.backtrace_0_3_6.addr2line or false) || - (f.backtrace_0_3_6.gimli-symbolize or false) || - (backtrace_0_3_6.gimli-symbolize or false); - backtrace_0_3_6.backtrace-sys = - (f.backtrace_0_3_6.backtrace-sys or false) || - (f.backtrace_0_3_6.libbacktrace or false) || - (backtrace_0_3_6.libbacktrace or false); - backtrace_0_3_6.coresymbolication = - (f.backtrace_0_3_6.coresymbolication or false) || - (f.backtrace_0_3_6.default or false) || - (backtrace_0_3_6.default or false); - backtrace_0_3_6.dbghelp = - (f.backtrace_0_3_6.dbghelp or false) || - (f.backtrace_0_3_6.default or false) || - (backtrace_0_3_6.default or false); - backtrace_0_3_6.default = (f.backtrace_0_3_6.default or true); - backtrace_0_3_6.dladdr = - (f.backtrace_0_3_6.dladdr or false) || - (f.backtrace_0_3_6.default or false) || - (backtrace_0_3_6.default or false); - backtrace_0_3_6.findshlibs = - (f.backtrace_0_3_6.findshlibs or false) || - (f.backtrace_0_3_6.gimli-symbolize or false) || - (backtrace_0_3_6.gimli-symbolize or false); - backtrace_0_3_6.gimli = - (f.backtrace_0_3_6.gimli or false) || - (f.backtrace_0_3_6.gimli-symbolize or false) || - (backtrace_0_3_6.gimli-symbolize or false); - backtrace_0_3_6.libbacktrace = - (f.backtrace_0_3_6.libbacktrace or false) || - (f.backtrace_0_3_6.default or false) || - (backtrace_0_3_6.default or false); - backtrace_0_3_6.libunwind = - (f.backtrace_0_3_6.libunwind or false) || - (f.backtrace_0_3_6.default or false) || - (backtrace_0_3_6.default or false); - backtrace_0_3_6.memmap = - (f.backtrace_0_3_6.memmap or false) || - (f.backtrace_0_3_6.gimli-symbolize or false) || - (backtrace_0_3_6.gimli-symbolize or false); - backtrace_0_3_6.object = - (f.backtrace_0_3_6.object or false) || - (f.backtrace_0_3_6.gimli-symbolize or false) || - (backtrace_0_3_6.gimli-symbolize or false); - backtrace_0_3_6.rustc-serialize = - (f.backtrace_0_3_6.rustc-serialize or false) || - (f.backtrace_0_3_6.serialize-rustc or false) || - (backtrace_0_3_6.serialize-rustc or false); - backtrace_0_3_6.serde = - (f.backtrace_0_3_6.serde or false) || - (f.backtrace_0_3_6.serialize-serde or false) || - (backtrace_0_3_6.serialize-serde or false); - backtrace_0_3_6.serde_derive = - (f.backtrace_0_3_6.serde_derive or false) || - (f.backtrace_0_3_6.serialize-serde or false) || - (backtrace_0_3_6.serialize-serde or false); - backtrace_0_3_6.winapi = - (f.backtrace_0_3_6.winapi or false) || - (f.backtrace_0_3_6.dbghelp or false) || - (backtrace_0_3_6.dbghelp or false); - backtrace_sys_0_1_16.default = true; - cfg_if_0_1_2.default = true; - libc_0_2_40.default = true; - rustc_demangle_0_1_7.default = true; - winapi_0_3_4.dbghelp = true; - winapi_0_3_4.default = true; - winapi_0_3_4.minwindef = true; - winapi_0_3_4.processthreadsapi = true; - winapi_0_3_4.std = true; - winapi_0_3_4.winnt = true; - }) [ cfg_if_0_1_2_features rustc_demangle_0_1_7_features backtrace_sys_0_1_16_features libc_0_2_40_features winapi_0_3_4_features ]; - backtrace_sys_0_1_16 = { features?(backtrace_sys_0_1_16_features {}) }: backtrace_sys_0_1_16_ { - dependencies = mapFeatures features ([ libc_0_2_40 ]); - buildDependencies = mapFeatures features ([ cc_1_0_10 ]); - }; - backtrace_sys_0_1_16_features = f: updateFeatures f (rec { - backtrace_sys_0_1_16.default = (f.backtrace_sys_0_1_16.default or true); - cc_1_0_10.default = true; - libc_0_2_40.default = true; - }) [ libc_0_2_40_features cc_1_0_10_features ]; - bitflags_1_0_1 = { features?(bitflags_1_0_1_features {}) }: bitflags_1_0_1_ { - features = mkFeatures (features.bitflags_1_0_1 or {}); - }; - bitflags_1_0_1_features = f: updateFeatures f (rec { - bitflags_1_0_1.default = (f.bitflags_1_0_1.default or true); - bitflags_1_0_1.example_generated = - (f.bitflags_1_0_1.example_generated or false) || - (f.bitflags_1_0_1.default or false) || - (bitflags_1_0_1.default or false); - }) []; - carnix_0_7_2 = { features?(carnix_0_7_2_features {}) }: carnix_0_7_2_ { - dependencies = mapFeatures features ([ clap_2_31_2 env_logger_0_5_7 error_chain_0_11_0 itertools_0_7_8 log_0_4_1 nom_3_2_1 regex_0_2_10 rusqlite_0_13_0 serde_1_0_38 serde_derive_1_0_38 serde_json_1_0_14 tempdir_0_3_7 toml_0_4_6 ]); - }; - carnix_0_7_2_features = f: updateFeatures f (rec { - carnix_0_7_2.default = (f.carnix_0_7_2.default or true); - clap_2_31_2.default = true; - env_logger_0_5_7.default = true; - error_chain_0_11_0.default = true; - itertools_0_7_8.default = true; - log_0_4_1.default = true; - nom_3_2_1.default = true; - regex_0_2_10.default = true; - rusqlite_0_13_0.default = true; - serde_1_0_38.default = true; - serde_derive_1_0_38.default = true; - serde_json_1_0_14.default = true; - tempdir_0_3_7.default = true; - toml_0_4_6.default = true; - }) [ clap_2_31_2_features env_logger_0_5_7_features error_chain_0_11_0_features itertools_0_7_8_features log_0_4_1_features nom_3_2_1_features regex_0_2_10_features rusqlite_0_13_0_features serde_1_0_38_features serde_derive_1_0_38_features serde_json_1_0_14_features tempdir_0_3_7_features toml_0_4_6_features ]; - cc_1_0_10 = { features?(cc_1_0_10_features {}) }: cc_1_0_10_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.cc_1_0_10 or {}); - }; - cc_1_0_10_features = f: updateFeatures f (rec { - cc_1_0_10.default = (f.cc_1_0_10.default or true); - cc_1_0_10.rayon = - (f.cc_1_0_10.rayon or false) || - (f.cc_1_0_10.parallel or false) || - (cc_1_0_10.parallel or false); - }) []; - cfg_if_0_1_2 = { features?(cfg_if_0_1_2_features {}) }: cfg_if_0_1_2_ {}; - cfg_if_0_1_2_features = f: updateFeatures f (rec { - cfg_if_0_1_2.default = (f.cfg_if_0_1_2.default or true); - }) []; - clap_2_31_2 = { features?(clap_2_31_2_features {}) }: clap_2_31_2_ { - dependencies = mapFeatures features ([ bitflags_1_0_1 textwrap_0_9_0 unicode_width_0_1_4 ] - ++ (if features.clap_2_31_2.atty or false then [ atty_0_2_8 ] else []) - ++ (if features.clap_2_31_2.strsim or false then [ strsim_0_7_0 ] else []) - ++ (if features.clap_2_31_2.vec_map or false then [ vec_map_0_8_0 ] else [])) - ++ (if !(kernel == "windows") then mapFeatures features ([ ] - ++ (if features.clap_2_31_2.ansi_term or false then [ ansi_term_0_11_0 ] else [])) else []); - features = mkFeatures (features.clap_2_31_2 or {}); - }; - clap_2_31_2_features = f: updateFeatures f (rec { - ansi_term_0_11_0.default = true; - atty_0_2_8.default = true; - bitflags_1_0_1.default = true; - clap_2_31_2.ansi_term = - (f.clap_2_31_2.ansi_term or false) || - (f.clap_2_31_2.color or false) || - (clap_2_31_2.color or false); - clap_2_31_2.atty = - (f.clap_2_31_2.atty or false) || - (f.clap_2_31_2.color or false) || - (clap_2_31_2.color or false); - clap_2_31_2.clippy = - (f.clap_2_31_2.clippy or false) || - (f.clap_2_31_2.lints or false) || - (clap_2_31_2.lints or false); - clap_2_31_2.color = - (f.clap_2_31_2.color or false) || - (f.clap_2_31_2.default or false) || - (clap_2_31_2.default or false); - clap_2_31_2.default = (f.clap_2_31_2.default or true); - clap_2_31_2.strsim = - (f.clap_2_31_2.strsim or false) || - (f.clap_2_31_2.suggestions or false) || - (clap_2_31_2.suggestions or false); - clap_2_31_2.suggestions = - (f.clap_2_31_2.suggestions or false) || - (f.clap_2_31_2.default or false) || - (clap_2_31_2.default or false); - clap_2_31_2.term_size = - (f.clap_2_31_2.term_size or false) || - (f.clap_2_31_2.wrap_help or false) || - (clap_2_31_2.wrap_help or false); - clap_2_31_2.vec_map = - (f.clap_2_31_2.vec_map or false) || - (f.clap_2_31_2.default or false) || - (clap_2_31_2.default or false); - clap_2_31_2.yaml = - (f.clap_2_31_2.yaml or false) || - (f.clap_2_31_2.doc or false) || - (clap_2_31_2.doc or false); - clap_2_31_2.yaml-rust = - (f.clap_2_31_2.yaml-rust or false) || - (f.clap_2_31_2.yaml or false) || - (clap_2_31_2.yaml or false); - strsim_0_7_0.default = true; - textwrap_0_9_0.default = true; - textwrap_0_9_0.term_size = - (f.textwrap_0_9_0.term_size or false) || - (clap_2_31_2.wrap_help or false) || - (f.clap_2_31_2.wrap_help or false); - unicode_width_0_1_4.default = true; - vec_map_0_8_0.default = true; - }) [ atty_0_2_8_features bitflags_1_0_1_features strsim_0_7_0_features textwrap_0_9_0_features unicode_width_0_1_4_features vec_map_0_8_0_features ansi_term_0_11_0_features ]; - dtoa_0_4_2 = { features?(dtoa_0_4_2_features {}) }: dtoa_0_4_2_ {}; - dtoa_0_4_2_features = f: updateFeatures f (rec { - dtoa_0_4_2.default = (f.dtoa_0_4_2.default or true); - }) []; - either_1_5_0 = { features?(either_1_5_0_features {}) }: either_1_5_0_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.either_1_5_0 or {}); - }; - either_1_5_0_features = f: updateFeatures f (rec { - either_1_5_0.default = (f.either_1_5_0.default or true); - either_1_5_0.use_std = - (f.either_1_5_0.use_std or false) || - (f.either_1_5_0.default or false) || - (either_1_5_0.default or false); - }) []; - env_logger_0_5_7 = { features?(env_logger_0_5_7_features {}) }: env_logger_0_5_7_ { - dependencies = mapFeatures features ([ atty_0_2_8 humantime_1_1_1 log_0_4_1 termcolor_0_3_6 ] - ++ (if features.env_logger_0_5_7.regex or false then [ regex_0_2_10 ] else [])); - features = mkFeatures (features.env_logger_0_5_7 or {}); - }; - env_logger_0_5_7_features = f: updateFeatures f (rec { - atty_0_2_8.default = true; - env_logger_0_5_7.default = (f.env_logger_0_5_7.default or true); - env_logger_0_5_7.regex = - (f.env_logger_0_5_7.regex or false) || - (f.env_logger_0_5_7.default or false) || - (env_logger_0_5_7.default or false); - humantime_1_1_1.default = true; - log_0_4_1.default = true; - log_0_4_1.std = true; - regex_0_2_10.default = true; - termcolor_0_3_6.default = true; - }) [ atty_0_2_8_features humantime_1_1_1_features log_0_4_1_features regex_0_2_10_features termcolor_0_3_6_features ]; - error_chain_0_11_0 = { features?(error_chain_0_11_0_features {}) }: error_chain_0_11_0_ { - dependencies = mapFeatures features ([ ] - ++ (if features.error_chain_0_11_0.backtrace or false then [ backtrace_0_3_6 ] else [])); - features = mkFeatures (features.error_chain_0_11_0 or {}); - }; - error_chain_0_11_0_features = f: updateFeatures f (rec { - backtrace_0_3_6.default = true; - error_chain_0_11_0.backtrace = - (f.error_chain_0_11_0.backtrace or false) || - (f.error_chain_0_11_0.default or false) || - (error_chain_0_11_0.default or false); - error_chain_0_11_0.default = (f.error_chain_0_11_0.default or true); - error_chain_0_11_0.example_generated = - (f.error_chain_0_11_0.example_generated or false) || - (f.error_chain_0_11_0.default or false) || - (error_chain_0_11_0.default or false); - }) [ backtrace_0_3_6_features ]; - fuchsia_zircon_0_3_3 = { features?(fuchsia_zircon_0_3_3_features {}) }: fuchsia_zircon_0_3_3_ { - dependencies = mapFeatures features ([ bitflags_1_0_1 fuchsia_zircon_sys_0_3_3 ]); - }; - fuchsia_zircon_0_3_3_features = f: updateFeatures f (rec { - bitflags_1_0_1.default = true; - fuchsia_zircon_0_3_3.default = (f.fuchsia_zircon_0_3_3.default or true); - fuchsia_zircon_sys_0_3_3.default = true; - }) [ bitflags_1_0_1_features fuchsia_zircon_sys_0_3_3_features ]; - fuchsia_zircon_sys_0_3_3 = { features?(fuchsia_zircon_sys_0_3_3_features {}) }: fuchsia_zircon_sys_0_3_3_ {}; - fuchsia_zircon_sys_0_3_3_features = f: updateFeatures f (rec { - fuchsia_zircon_sys_0_3_3.default = (f.fuchsia_zircon_sys_0_3_3.default or true); - }) []; - humantime_1_1_1 = { features?(humantime_1_1_1_features {}) }: humantime_1_1_1_ { - dependencies = mapFeatures features ([ quick_error_1_2_1 ]); - }; - humantime_1_1_1_features = f: updateFeatures f (rec { - humantime_1_1_1.default = (f.humantime_1_1_1.default or true); - quick_error_1_2_1.default = true; - }) [ quick_error_1_2_1_features ]; - itertools_0_7_8 = { features?(itertools_0_7_8_features {}) }: itertools_0_7_8_ { - dependencies = mapFeatures features ([ either_1_5_0 ]); - features = mkFeatures (features.itertools_0_7_8 or {}); - }; - itertools_0_7_8_features = f: updateFeatures f (rec { - either_1_5_0.default = (f.either_1_5_0.default or false); - itertools_0_7_8.default = (f.itertools_0_7_8.default or true); - itertools_0_7_8.use_std = - (f.itertools_0_7_8.use_std or false) || - (f.itertools_0_7_8.default or false) || - (itertools_0_7_8.default or false); - }) [ either_1_5_0_features ]; - itoa_0_4_1 = { features?(itoa_0_4_1_features {}) }: itoa_0_4_1_ { - features = mkFeatures (features.itoa_0_4_1 or {}); - }; - itoa_0_4_1_features = f: updateFeatures f (rec { - itoa_0_4_1.default = (f.itoa_0_4_1.default or true); - itoa_0_4_1.std = - (f.itoa_0_4_1.std or false) || - (f.itoa_0_4_1.default or false) || - (itoa_0_4_1.default or false); - }) []; - lazy_static_1_0_0 = { features?(lazy_static_1_0_0_features {}) }: lazy_static_1_0_0_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.lazy_static_1_0_0 or {}); - }; - lazy_static_1_0_0_features = f: updateFeatures f (rec { - lazy_static_1_0_0.compiletest_rs = - (f.lazy_static_1_0_0.compiletest_rs or false) || - (f.lazy_static_1_0_0.compiletest or false) || - (lazy_static_1_0_0.compiletest or false); - lazy_static_1_0_0.default = (f.lazy_static_1_0_0.default or true); - lazy_static_1_0_0.nightly = - (f.lazy_static_1_0_0.nightly or false) || - (f.lazy_static_1_0_0.spin_no_std or false) || - (lazy_static_1_0_0.spin_no_std or false); - lazy_static_1_0_0.spin = - (f.lazy_static_1_0_0.spin or false) || - (f.lazy_static_1_0_0.spin_no_std or false) || - (lazy_static_1_0_0.spin_no_std or false); - }) []; - libc_0_2_40 = { features?(libc_0_2_40_features {}) }: libc_0_2_40_ { - features = mkFeatures (features.libc_0_2_40 or {}); - }; - libc_0_2_40_features = f: updateFeatures f (rec { - libc_0_2_40.default = (f.libc_0_2_40.default or true); - libc_0_2_40.use_std = - (f.libc_0_2_40.use_std or false) || - (f.libc_0_2_40.default or false) || - (libc_0_2_40.default or false); - }) []; - libsqlite3_sys_0_9_1 = { features?(libsqlite3_sys_0_9_1_features {}) }: libsqlite3_sys_0_9_1_ { - dependencies = (if abi == "msvc" then mapFeatures features ([]) else []); - buildDependencies = mapFeatures features ([ ] - ++ (if features.libsqlite3_sys_0_9_1.pkg-config or false then [ pkg_config_0_3_9 ] else [])); - features = mkFeatures (features.libsqlite3_sys_0_9_1 or {}); - }; - libsqlite3_sys_0_9_1_features = f: updateFeatures f (rec { - libsqlite3_sys_0_9_1.bindgen = - (f.libsqlite3_sys_0_9_1.bindgen or false) || - (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) || - (libsqlite3_sys_0_9_1.buildtime_bindgen or false); - libsqlite3_sys_0_9_1.cc = - (f.libsqlite3_sys_0_9_1.cc or false) || - (f.libsqlite3_sys_0_9_1.bundled or false) || - (libsqlite3_sys_0_9_1.bundled or false); - libsqlite3_sys_0_9_1.default = (f.libsqlite3_sys_0_9_1.default or true); - libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 = - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) || - (f.libsqlite3_sys_0_9_1.default or false) || - (libsqlite3_sys_0_9_1.default or false); - libsqlite3_sys_0_9_1.pkg-config = - (f.libsqlite3_sys_0_9_1.pkg-config or false) || - (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) || - (libsqlite3_sys_0_9_1.buildtime_bindgen or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false); - libsqlite3_sys_0_9_1.vcpkg = - (f.libsqlite3_sys_0_9_1.vcpkg or false) || - (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) || - (libsqlite3_sys_0_9_1.buildtime_bindgen or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false); - pkg_config_0_3_9.default = true; - }) [ pkg_config_0_3_9_features ]; - linked_hash_map_0_4_2 = { features?(linked_hash_map_0_4_2_features {}) }: linked_hash_map_0_4_2_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.linked_hash_map_0_4_2 or {}); - }; - linked_hash_map_0_4_2_features = f: updateFeatures f (rec { - linked_hash_map_0_4_2.default = (f.linked_hash_map_0_4_2.default or true); - linked_hash_map_0_4_2.heapsize = - (f.linked_hash_map_0_4_2.heapsize or false) || - (f.linked_hash_map_0_4_2.heapsize_impl or false) || - (linked_hash_map_0_4_2.heapsize_impl or false); - linked_hash_map_0_4_2.serde = - (f.linked_hash_map_0_4_2.serde or false) || - (f.linked_hash_map_0_4_2.serde_impl or false) || - (linked_hash_map_0_4_2.serde_impl or false); - linked_hash_map_0_4_2.serde_test = - (f.linked_hash_map_0_4_2.serde_test or false) || - (f.linked_hash_map_0_4_2.serde_impl or false) || - (linked_hash_map_0_4_2.serde_impl or false); - }) []; - log_0_4_1 = { features?(log_0_4_1_features {}) }: log_0_4_1_ { - dependencies = mapFeatures features ([ cfg_if_0_1_2 ]); - features = mkFeatures (features.log_0_4_1 or {}); - }; - log_0_4_1_features = f: updateFeatures f (rec { - cfg_if_0_1_2.default = true; - log_0_4_1.default = (f.log_0_4_1.default or true); - }) [ cfg_if_0_1_2_features ]; - lru_cache_0_1_1 = { features?(lru_cache_0_1_1_features {}) }: lru_cache_0_1_1_ { - dependencies = mapFeatures features ([ linked_hash_map_0_4_2 ]); - features = mkFeatures (features.lru_cache_0_1_1 or {}); - }; - lru_cache_0_1_1_features = f: updateFeatures f (rec { - linked_hash_map_0_4_2.default = true; - linked_hash_map_0_4_2.heapsize_impl = - (f.linked_hash_map_0_4_2.heapsize_impl or false) || - (lru_cache_0_1_1.heapsize_impl or false) || - (f.lru_cache_0_1_1.heapsize_impl or false); - lru_cache_0_1_1.default = (f.lru_cache_0_1_1.default or true); - lru_cache_0_1_1.heapsize = - (f.lru_cache_0_1_1.heapsize or false) || - (f.lru_cache_0_1_1.heapsize_impl or false) || - (lru_cache_0_1_1.heapsize_impl or false); - }) [ linked_hash_map_0_4_2_features ]; - memchr_1_0_2 = { features?(memchr_1_0_2_features {}) }: memchr_1_0_2_ { - dependencies = mapFeatures features ([ ] - ++ (if features.memchr_1_0_2.libc or false then [ libc_0_2_40 ] else [])); - features = mkFeatures (features.memchr_1_0_2 or {}); - }; - memchr_1_0_2_features = f: updateFeatures f (rec { - libc_0_2_40.default = (f.libc_0_2_40.default or false); - libc_0_2_40.use_std = - (f.libc_0_2_40.use_std or false) || - (memchr_1_0_2.use_std or false) || - (f.memchr_1_0_2.use_std or false); - memchr_1_0_2.default = (f.memchr_1_0_2.default or true); - memchr_1_0_2.libc = - (f.memchr_1_0_2.libc or false) || - (f.memchr_1_0_2.default or false) || - (memchr_1_0_2.default or false) || - (f.memchr_1_0_2.use_std or false) || - (memchr_1_0_2.use_std or false); - memchr_1_0_2.use_std = - (f.memchr_1_0_2.use_std or false) || - (f.memchr_1_0_2.default or false) || - (memchr_1_0_2.default or false); - }) [ libc_0_2_40_features ]; - memchr_2_0_1 = { features?(memchr_2_0_1_features {}) }: memchr_2_0_1_ { - dependencies = mapFeatures features ([ ] - ++ (if features.memchr_2_0_1.libc or false then [ libc_0_2_40 ] else [])); - features = mkFeatures (features.memchr_2_0_1 or {}); - }; - memchr_2_0_1_features = f: updateFeatures f (rec { - libc_0_2_40.default = (f.libc_0_2_40.default or false); - libc_0_2_40.use_std = - (f.libc_0_2_40.use_std or false) || - (memchr_2_0_1.use_std or false) || - (f.memchr_2_0_1.use_std or false); - memchr_2_0_1.default = (f.memchr_2_0_1.default or true); - memchr_2_0_1.libc = - (f.memchr_2_0_1.libc or false) || - (f.memchr_2_0_1.default or false) || - (memchr_2_0_1.default or false) || - (f.memchr_2_0_1.use_std or false) || - (memchr_2_0_1.use_std or false); - memchr_2_0_1.use_std = - (f.memchr_2_0_1.use_std or false) || - (f.memchr_2_0_1.default or false) || - (memchr_2_0_1.default or false); - }) [ libc_0_2_40_features ]; - nom_3_2_1 = { features?(nom_3_2_1_features {}) }: nom_3_2_1_ { - dependencies = mapFeatures features ([ memchr_1_0_2 ]); - features = mkFeatures (features.nom_3_2_1 or {}); - }; - nom_3_2_1_features = f: updateFeatures f (rec { - memchr_1_0_2.default = (f.memchr_1_0_2.default or false); - memchr_1_0_2.use_std = - (f.memchr_1_0_2.use_std or false) || - (nom_3_2_1.std or false) || - (f.nom_3_2_1.std or false); - nom_3_2_1.compiler_error = - (f.nom_3_2_1.compiler_error or false) || - (f.nom_3_2_1.nightly or false) || - (nom_3_2_1.nightly or false); - nom_3_2_1.default = (f.nom_3_2_1.default or true); - nom_3_2_1.lazy_static = - (f.nom_3_2_1.lazy_static or false) || - (f.nom_3_2_1.regexp_macros or false) || - (nom_3_2_1.regexp_macros or false); - nom_3_2_1.regex = - (f.nom_3_2_1.regex or false) || - (f.nom_3_2_1.regexp or false) || - (nom_3_2_1.regexp or false); - nom_3_2_1.regexp = - (f.nom_3_2_1.regexp or false) || - (f.nom_3_2_1.regexp_macros or false) || - (nom_3_2_1.regexp_macros or false); - nom_3_2_1.std = - (f.nom_3_2_1.std or false) || - (f.nom_3_2_1.default or false) || - (nom_3_2_1.default or false); - nom_3_2_1.stream = - (f.nom_3_2_1.stream or false) || - (f.nom_3_2_1.default or false) || - (nom_3_2_1.default or false); - }) [ memchr_1_0_2_features ]; - num_traits_0_2_2 = { features?(num_traits_0_2_2_features {}) }: num_traits_0_2_2_ { - features = mkFeatures (features.num_traits_0_2_2 or {}); - }; - num_traits_0_2_2_features = f: updateFeatures f (rec { - num_traits_0_2_2.default = (f.num_traits_0_2_2.default or true); - num_traits_0_2_2.std = - (f.num_traits_0_2_2.std or false) || - (f.num_traits_0_2_2.default or false) || - (num_traits_0_2_2.default or false); - }) []; - pkg_config_0_3_9 = { features?(pkg_config_0_3_9_features {}) }: pkg_config_0_3_9_ {}; - pkg_config_0_3_9_features = f: updateFeatures f (rec { - pkg_config_0_3_9.default = (f.pkg_config_0_3_9.default or true); - }) []; - proc_macro2_0_3_6 = { features?(proc_macro2_0_3_6_features {}) }: proc_macro2_0_3_6_ { - dependencies = mapFeatures features ([ unicode_xid_0_1_0 ]); - features = mkFeatures (features.proc_macro2_0_3_6 or {}); - }; - proc_macro2_0_3_6_features = f: updateFeatures f (rec { - proc_macro2_0_3_6.default = (f.proc_macro2_0_3_6.default or true); - proc_macro2_0_3_6.proc-macro = - (f.proc_macro2_0_3_6.proc-macro or false) || - (f.proc_macro2_0_3_6.default or false) || - (proc_macro2_0_3_6.default or false) || - (f.proc_macro2_0_3_6.nightly or false) || - (proc_macro2_0_3_6.nightly or false); - unicode_xid_0_1_0.default = true; - }) [ unicode_xid_0_1_0_features ]; - quick_error_1_2_1 = { features?(quick_error_1_2_1_features {}) }: quick_error_1_2_1_ {}; - quick_error_1_2_1_features = f: updateFeatures f (rec { - quick_error_1_2_1.default = (f.quick_error_1_2_1.default or true); - }) []; - quote_0_5_1 = { features?(quote_0_5_1_features {}) }: quote_0_5_1_ { - dependencies = mapFeatures features ([ proc_macro2_0_3_6 ]); - features = mkFeatures (features.quote_0_5_1 or {}); - }; - quote_0_5_1_features = f: updateFeatures f (rec { - proc_macro2_0_3_6.default = (f.proc_macro2_0_3_6.default or false); - proc_macro2_0_3_6.proc-macro = - (f.proc_macro2_0_3_6.proc-macro or false) || - (quote_0_5_1.proc-macro or false) || - (f.quote_0_5_1.proc-macro or false); - quote_0_5_1.default = (f.quote_0_5_1.default or true); - quote_0_5_1.proc-macro = - (f.quote_0_5_1.proc-macro or false) || - (f.quote_0_5_1.default or false) || - (quote_0_5_1.default or false); - }) [ proc_macro2_0_3_6_features ]; - rand_0_4_2 = { features?(rand_0_4_2_features {}) }: rand_0_4_2_ { - dependencies = (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_3 ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ ] - ++ (if features.rand_0_4_2.libc or false then [ libc_0_2_40 ] else [])) else []) - ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); - features = mkFeatures (features.rand_0_4_2 or {}); - }; - rand_0_4_2_features = f: updateFeatures f (rec { - fuchsia_zircon_0_3_3.default = true; - libc_0_2_40.default = true; - rand_0_4_2.default = (f.rand_0_4_2.default or true); - rand_0_4_2.i128_support = - (f.rand_0_4_2.i128_support or false) || - (f.rand_0_4_2.nightly or false) || - (rand_0_4_2.nightly or false); - rand_0_4_2.libc = - (f.rand_0_4_2.libc or false) || - (f.rand_0_4_2.std or false) || - (rand_0_4_2.std or false); - rand_0_4_2.std = - (f.rand_0_4_2.std or false) || - (f.rand_0_4_2.default or false) || - (rand_0_4_2.default or false); - winapi_0_3_4.default = true; - winapi_0_3_4.minwindef = true; - winapi_0_3_4.ntsecapi = true; - winapi_0_3_4.profileapi = true; - winapi_0_3_4.winnt = true; - }) [ fuchsia_zircon_0_3_3_features libc_0_2_40_features winapi_0_3_4_features ]; - redox_syscall_0_1_37 = { features?(redox_syscall_0_1_37_features {}) }: redox_syscall_0_1_37_ {}; - redox_syscall_0_1_37_features = f: updateFeatures f (rec { - redox_syscall_0_1_37.default = (f.redox_syscall_0_1_37.default or true); - }) []; - redox_termios_0_1_1 = { features?(redox_termios_0_1_1_features {}) }: redox_termios_0_1_1_ { - dependencies = mapFeatures features ([ redox_syscall_0_1_37 ]); - }; - redox_termios_0_1_1_features = f: updateFeatures f (rec { - redox_syscall_0_1_37.default = true; - redox_termios_0_1_1.default = (f.redox_termios_0_1_1.default or true); - }) [ redox_syscall_0_1_37_features ]; - regex_0_2_10 = { features?(regex_0_2_10_features {}) }: regex_0_2_10_ { - dependencies = mapFeatures features ([ aho_corasick_0_6_4 memchr_2_0_1 regex_syntax_0_5_5 thread_local_0_3_5 utf8_ranges_1_0_0 ]); - features = mkFeatures (features.regex_0_2_10 or {}); - }; - regex_0_2_10_features = f: updateFeatures f (rec { - aho_corasick_0_6_4.default = true; - memchr_2_0_1.default = true; - regex_0_2_10.default = (f.regex_0_2_10.default or true); - regex_0_2_10.pattern = - (f.regex_0_2_10.pattern or false) || - (f.regex_0_2_10.unstable or false) || - (regex_0_2_10.unstable or false); - regex_syntax_0_5_5.default = true; - thread_local_0_3_5.default = true; - utf8_ranges_1_0_0.default = true; - }) [ aho_corasick_0_6_4_features memchr_2_0_1_features regex_syntax_0_5_5_features thread_local_0_3_5_features utf8_ranges_1_0_0_features ]; - regex_syntax_0_5_5 = { features?(regex_syntax_0_5_5_features {}) }: regex_syntax_0_5_5_ { - dependencies = mapFeatures features ([ ucd_util_0_1_1 ]); - }; - regex_syntax_0_5_5_features = f: updateFeatures f (rec { - regex_syntax_0_5_5.default = (f.regex_syntax_0_5_5.default or true); - ucd_util_0_1_1.default = true; - }) [ ucd_util_0_1_1_features ]; - remove_dir_all_0_5_0 = { features?(remove_dir_all_0_5_0_features {}) }: remove_dir_all_0_5_0_ { - dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); - }; - remove_dir_all_0_5_0_features = f: updateFeatures f (rec { - remove_dir_all_0_5_0.default = (f.remove_dir_all_0_5_0.default or true); - winapi_0_3_4.default = true; - winapi_0_3_4.errhandlingapi = true; - winapi_0_3_4.fileapi = true; - winapi_0_3_4.std = true; - winapi_0_3_4.winbase = true; - winapi_0_3_4.winerror = true; - }) [ winapi_0_3_4_features ]; - rusqlite_0_13_0 = { features?(rusqlite_0_13_0_features {}) }: rusqlite_0_13_0_ { - dependencies = mapFeatures features ([ bitflags_1_0_1 libsqlite3_sys_0_9_1 lru_cache_0_1_1 time_0_1_39 ]); - features = mkFeatures (features.rusqlite_0_13_0 or {}); - }; - rusqlite_0_13_0_features = f: updateFeatures f (rec { - bitflags_1_0_1.default = true; - libsqlite3_sys_0_9_1.buildtime_bindgen = - (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) || - (rusqlite_0_13_0.buildtime_bindgen or false) || - (f.rusqlite_0_13_0.buildtime_bindgen or false); - libsqlite3_sys_0_9_1.bundled = - (f.libsqlite3_sys_0_9_1.bundled or false) || - (rusqlite_0_13_0.bundled or false) || - (f.rusqlite_0_13_0.bundled or false); - libsqlite3_sys_0_9_1.default = true; - libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 = - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) || - (rusqlite_0_13_0.backup or false) || - (f.rusqlite_0_13_0.backup or false); - libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 = - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) || - (rusqlite_0_13_0.trace or false) || - (f.rusqlite_0_13_0.trace or false); - libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 = - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) || - (rusqlite_0_13_0.functions or false) || - (f.rusqlite_0_13_0.functions or false); - libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 = - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false) || - (rusqlite_0_13_0.blob or false) || - (f.rusqlite_0_13_0.blob or false); - libsqlite3_sys_0_9_1.sqlcipher = - (f.libsqlite3_sys_0_9_1.sqlcipher or false) || - (rusqlite_0_13_0.sqlcipher or false) || - (f.rusqlite_0_13_0.sqlcipher or false); - lru_cache_0_1_1.default = true; - rusqlite_0_13_0.default = (f.rusqlite_0_13_0.default or true); - time_0_1_39.default = true; - }) [ bitflags_1_0_1_features libsqlite3_sys_0_9_1_features lru_cache_0_1_1_features time_0_1_39_features ]; - rustc_demangle_0_1_7 = { features?(rustc_demangle_0_1_7_features {}) }: rustc_demangle_0_1_7_ {}; - rustc_demangle_0_1_7_features = f: updateFeatures f (rec { - rustc_demangle_0_1_7.default = (f.rustc_demangle_0_1_7.default or true); - }) []; - serde_1_0_38 = { features?(serde_1_0_38_features {}) }: serde_1_0_38_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.serde_1_0_38 or {}); - }; - serde_1_0_38_features = f: updateFeatures f (rec { - serde_1_0_38.default = (f.serde_1_0_38.default or true); - serde_1_0_38.serde_derive = - (f.serde_1_0_38.serde_derive or false) || - (f.serde_1_0_38.derive or false) || - (serde_1_0_38.derive or false) || - (f.serde_1_0_38.playground or false) || - (serde_1_0_38.playground or false); - serde_1_0_38.std = - (f.serde_1_0_38.std or false) || - (f.serde_1_0_38.default or false) || - (serde_1_0_38.default or false); - serde_1_0_38.unstable = - (f.serde_1_0_38.unstable or false) || - (f.serde_1_0_38.alloc or false) || - (serde_1_0_38.alloc or false); - }) []; - serde_derive_1_0_38 = { features?(serde_derive_1_0_38_features {}) }: serde_derive_1_0_38_ { - dependencies = mapFeatures features ([ proc_macro2_0_3_6 quote_0_5_1 serde_derive_internals_0_23_1 syn_0_13_1 ]); - features = mkFeatures (features.serde_derive_1_0_38 or {}); - }; - serde_derive_1_0_38_features = f: updateFeatures f (rec { - proc_macro2_0_3_6.default = true; - quote_0_5_1.default = true; - serde_derive_1_0_38.default = (f.serde_derive_1_0_38.default or true); - serde_derive_internals_0_23_1.default = (f.serde_derive_internals_0_23_1.default or false); - syn_0_13_1.default = true; - syn_0_13_1.visit = true; - }) [ proc_macro2_0_3_6_features quote_0_5_1_features serde_derive_internals_0_23_1_features syn_0_13_1_features ]; - serde_derive_internals_0_23_1 = { features?(serde_derive_internals_0_23_1_features {}) }: serde_derive_internals_0_23_1_ { - dependencies = mapFeatures features ([ proc_macro2_0_3_6 syn_0_13_1 ]); - }; - serde_derive_internals_0_23_1_features = f: updateFeatures f (rec { - proc_macro2_0_3_6.default = true; - serde_derive_internals_0_23_1.default = (f.serde_derive_internals_0_23_1.default or true); - syn_0_13_1.clone-impls = true; - syn_0_13_1.default = (f.syn_0_13_1.default or false); - syn_0_13_1.derive = true; - syn_0_13_1.parsing = true; - }) [ proc_macro2_0_3_6_features syn_0_13_1_features ]; - serde_json_1_0_14 = { features?(serde_json_1_0_14_features {}) }: serde_json_1_0_14_ { - dependencies = mapFeatures features ([ dtoa_0_4_2 itoa_0_4_1 num_traits_0_2_2 serde_1_0_38 ]); - features = mkFeatures (features.serde_json_1_0_14 or {}); - }; - serde_json_1_0_14_features = f: updateFeatures f (rec { - dtoa_0_4_2.default = true; - itoa_0_4_1.default = true; - num_traits_0_2_2.default = (f.num_traits_0_2_2.default or false); - serde_1_0_38.default = true; - serde_json_1_0_14.default = (f.serde_json_1_0_14.default or true); - serde_json_1_0_14.linked-hash-map = - (f.serde_json_1_0_14.linked-hash-map or false) || - (f.serde_json_1_0_14.preserve_order or false) || - (serde_json_1_0_14.preserve_order or false); - }) [ dtoa_0_4_2_features itoa_0_4_1_features num_traits_0_2_2_features serde_1_0_38_features ]; - strsim_0_7_0 = { features?(strsim_0_7_0_features {}) }: strsim_0_7_0_ {}; - strsim_0_7_0_features = f: updateFeatures f (rec { - strsim_0_7_0.default = (f.strsim_0_7_0.default or true); - }) []; - syn_0_13_1 = { features?(syn_0_13_1_features {}) }: syn_0_13_1_ { - dependencies = mapFeatures features ([ proc_macro2_0_3_6 unicode_xid_0_1_0 ] - ++ (if features.syn_0_13_1.quote or false then [ quote_0_5_1 ] else [])); - features = mkFeatures (features.syn_0_13_1 or {}); - }; - syn_0_13_1_features = f: updateFeatures f (rec { - proc_macro2_0_3_6.default = (f.proc_macro2_0_3_6.default or false); - proc_macro2_0_3_6.proc-macro = - (f.proc_macro2_0_3_6.proc-macro or false) || - (syn_0_13_1.proc-macro or false) || - (f.syn_0_13_1.proc-macro or false); - quote_0_5_1.default = (f.quote_0_5_1.default or false); - quote_0_5_1.proc-macro = - (f.quote_0_5_1.proc-macro or false) || - (syn_0_13_1.proc-macro or false) || - (f.syn_0_13_1.proc-macro or false); - syn_0_13_1.clone-impls = - (f.syn_0_13_1.clone-impls or false) || - (f.syn_0_13_1.default or false) || - (syn_0_13_1.default or false); - syn_0_13_1.default = (f.syn_0_13_1.default or true); - syn_0_13_1.derive = - (f.syn_0_13_1.derive or false) || - (f.syn_0_13_1.default or false) || - (syn_0_13_1.default or false); - syn_0_13_1.parsing = - (f.syn_0_13_1.parsing or false) || - (f.syn_0_13_1.default or false) || - (syn_0_13_1.default or false); - syn_0_13_1.printing = - (f.syn_0_13_1.printing or false) || - (f.syn_0_13_1.default or false) || - (syn_0_13_1.default or false); - syn_0_13_1.proc-macro = - (f.syn_0_13_1.proc-macro or false) || - (f.syn_0_13_1.default or false) || - (syn_0_13_1.default or false); - syn_0_13_1.quote = - (f.syn_0_13_1.quote or false) || - (f.syn_0_13_1.printing or false) || - (syn_0_13_1.printing or false); - unicode_xid_0_1_0.default = true; - }) [ proc_macro2_0_3_6_features quote_0_5_1_features unicode_xid_0_1_0_features ]; - tempdir_0_3_7 = { features?(tempdir_0_3_7_features {}) }: tempdir_0_3_7_ { - dependencies = mapFeatures features ([ rand_0_4_2 remove_dir_all_0_5_0 ]); - }; - tempdir_0_3_7_features = f: updateFeatures f (rec { - rand_0_4_2.default = true; - remove_dir_all_0_5_0.default = true; - tempdir_0_3_7.default = (f.tempdir_0_3_7.default or true); - }) [ rand_0_4_2_features remove_dir_all_0_5_0_features ]; - termcolor_0_3_6 = { features?(termcolor_0_3_6_features {}) }: termcolor_0_3_6_ { - dependencies = (if kernel == "windows" then mapFeatures features ([ wincolor_0_1_6 ]) else []); - }; - termcolor_0_3_6_features = f: updateFeatures f (rec { - termcolor_0_3_6.default = (f.termcolor_0_3_6.default or true); - wincolor_0_1_6.default = true; - }) [ wincolor_0_1_6_features ]; - termion_1_5_1 = { features?(termion_1_5_1_features {}) }: termion_1_5_1_ { - dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_40 ]) else []) - ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_37 redox_termios_0_1_1 ]) else []); - }; - termion_1_5_1_features = f: updateFeatures f (rec { - libc_0_2_40.default = true; - redox_syscall_0_1_37.default = true; - redox_termios_0_1_1.default = true; - termion_1_5_1.default = (f.termion_1_5_1.default or true); - }) [ libc_0_2_40_features redox_syscall_0_1_37_features redox_termios_0_1_1_features ]; - textwrap_0_9_0 = { features?(textwrap_0_9_0_features {}) }: textwrap_0_9_0_ { - dependencies = mapFeatures features ([ unicode_width_0_1_4 ]); - }; - textwrap_0_9_0_features = f: updateFeatures f (rec { - textwrap_0_9_0.default = (f.textwrap_0_9_0.default or true); - unicode_width_0_1_4.default = true; - }) [ unicode_width_0_1_4_features ]; - thread_local_0_3_5 = { features?(thread_local_0_3_5_features {}) }: thread_local_0_3_5_ { - dependencies = mapFeatures features ([ lazy_static_1_0_0 unreachable_1_0_0 ]); - }; - thread_local_0_3_5_features = f: updateFeatures f (rec { - lazy_static_1_0_0.default = true; - thread_local_0_3_5.default = (f.thread_local_0_3_5.default or true); - unreachable_1_0_0.default = true; - }) [ lazy_static_1_0_0_features unreachable_1_0_0_features ]; - time_0_1_39 = { features?(time_0_1_39_features {}) }: time_0_1_39_ { - dependencies = mapFeatures features ([ libc_0_2_40 ]) - ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_37 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); - }; - time_0_1_39_features = f: updateFeatures f (rec { - libc_0_2_40.default = true; - redox_syscall_0_1_37.default = true; - time_0_1_39.default = (f.time_0_1_39.default or true); - winapi_0_3_4.default = true; - winapi_0_3_4.minwinbase = true; - winapi_0_3_4.minwindef = true; - winapi_0_3_4.ntdef = true; - winapi_0_3_4.profileapi = true; - winapi_0_3_4.std = true; - winapi_0_3_4.sysinfoapi = true; - winapi_0_3_4.timezoneapi = true; - }) [ libc_0_2_40_features redox_syscall_0_1_37_features winapi_0_3_4_features ]; - toml_0_4_6 = { features?(toml_0_4_6_features {}) }: toml_0_4_6_ { - dependencies = mapFeatures features ([ serde_1_0_38 ]); - }; - toml_0_4_6_features = f: updateFeatures f (rec { - serde_1_0_38.default = true; - toml_0_4_6.default = (f.toml_0_4_6.default or true); - }) [ serde_1_0_38_features ]; - ucd_util_0_1_1 = { features?(ucd_util_0_1_1_features {}) }: ucd_util_0_1_1_ {}; - ucd_util_0_1_1_features = f: updateFeatures f (rec { - ucd_util_0_1_1.default = (f.ucd_util_0_1_1.default or true); - }) []; - unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ { - features = mkFeatures (features.unicode_width_0_1_4 or {}); - }; - unicode_width_0_1_4_features = f: updateFeatures f (rec { - unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true); - }) []; - unicode_xid_0_1_0 = { features?(unicode_xid_0_1_0_features {}) }: unicode_xid_0_1_0_ { - features = mkFeatures (features.unicode_xid_0_1_0 or {}); - }; - unicode_xid_0_1_0_features = f: updateFeatures f (rec { - unicode_xid_0_1_0.default = (f.unicode_xid_0_1_0.default or true); - }) []; - unreachable_1_0_0 = { features?(unreachable_1_0_0_features {}) }: unreachable_1_0_0_ { - dependencies = mapFeatures features ([ void_1_0_2 ]); - }; - unreachable_1_0_0_features = f: updateFeatures f (rec { - unreachable_1_0_0.default = (f.unreachable_1_0_0.default or true); - void_1_0_2.default = (f.void_1_0_2.default or false); - }) [ void_1_0_2_features ]; - utf8_ranges_1_0_0 = { features?(utf8_ranges_1_0_0_features {}) }: utf8_ranges_1_0_0_ {}; - utf8_ranges_1_0_0_features = f: updateFeatures f (rec { - utf8_ranges_1_0_0.default = (f.utf8_ranges_1_0_0.default or true); - }) []; - vcpkg_0_2_3 = { features?(vcpkg_0_2_3_features {}) }: vcpkg_0_2_3_ {}; - vcpkg_0_2_3_features = f: updateFeatures f (rec { - vcpkg_0_2_3.default = (f.vcpkg_0_2_3.default or true); - }) []; - vec_map_0_8_0 = { features?(vec_map_0_8_0_features {}) }: vec_map_0_8_0_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.vec_map_0_8_0 or {}); - }; - vec_map_0_8_0_features = f: updateFeatures f (rec { - vec_map_0_8_0.default = (f.vec_map_0_8_0.default or true); - vec_map_0_8_0.serde = - (f.vec_map_0_8_0.serde or false) || - (f.vec_map_0_8_0.eders or false) || - (vec_map_0_8_0.eders or false); - vec_map_0_8_0.serde_derive = - (f.vec_map_0_8_0.serde_derive or false) || - (f.vec_map_0_8_0.eders or false) || - (vec_map_0_8_0.eders or false); - }) []; - void_1_0_2 = { features?(void_1_0_2_features {}) }: void_1_0_2_ { - features = mkFeatures (features.void_1_0_2 or {}); - }; - void_1_0_2_features = f: updateFeatures f (rec { - void_1_0_2.default = (f.void_1_0_2.default or true); - void_1_0_2.std = - (f.void_1_0_2.std or false) || - (f.void_1_0_2.default or false) || - (void_1_0_2.default or false); - }) []; - winapi_0_3_4 = { features?(winapi_0_3_4_features {}) }: winapi_0_3_4_ { - dependencies = (if kernel == "i686-pc-windows-gnu" then mapFeatures features ([ winapi_i686_pc_windows_gnu_0_4_0 ]) else []) - ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ winapi_x86_64_pc_windows_gnu_0_4_0 ]) else []); - features = mkFeatures (features.winapi_0_3_4 or {}); - }; - winapi_0_3_4_features = f: updateFeatures f (rec { - winapi_0_3_4.default = (f.winapi_0_3_4.default or true); - winapi_i686_pc_windows_gnu_0_4_0.default = true; - winapi_x86_64_pc_windows_gnu_0_4_0.default = true; - }) [ winapi_i686_pc_windows_gnu_0_4_0_features winapi_x86_64_pc_windows_gnu_0_4_0_features ]; - winapi_i686_pc_windows_gnu_0_4_0 = { features?(winapi_i686_pc_windows_gnu_0_4_0_features {}) }: winapi_i686_pc_windows_gnu_0_4_0_ {}; - winapi_i686_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec { - winapi_i686_pc_windows_gnu_0_4_0.default = (f.winapi_i686_pc_windows_gnu_0_4_0.default or true); - }) []; - winapi_x86_64_pc_windows_gnu_0_4_0 = { features?(winapi_x86_64_pc_windows_gnu_0_4_0_features {}) }: winapi_x86_64_pc_windows_gnu_0_4_0_ {}; - winapi_x86_64_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec { - winapi_x86_64_pc_windows_gnu_0_4_0.default = (f.winapi_x86_64_pc_windows_gnu_0_4_0.default or true); - }) []; - wincolor_0_1_6 = { features?(wincolor_0_1_6_features {}) }: wincolor_0_1_6_ { - dependencies = mapFeatures features ([ winapi_0_3_4 ]); - }; - wincolor_0_1_6_features = f: updateFeatures f (rec { - winapi_0_3_4.consoleapi = true; - winapi_0_3_4.default = true; - winapi_0_3_4.minwindef = true; - winapi_0_3_4.processenv = true; - winapi_0_3_4.winbase = true; - winapi_0_3_4.wincon = true; - wincolor_0_1_6.default = (f.wincolor_0_1_6.default or true); - }) [ winapi_0_3_4_features ]; } diff --git a/pkgs/build-support/rust/crates-io.nix b/pkgs/build-support/rust/crates-io.nix new file mode 100644 index 000000000000..9d9cafe4cbf2 --- /dev/null +++ b/pkgs/build-support/rust/crates-io.nix @@ -0,0 +1,2050 @@ +{ lib, buildRustCrate, buildRustCrateHelpers }: +with buildRustCrateHelpers; +let inherit (lib.lists) fold; + inherit (lib.attrsets) recursiveUpdate; +in +rec { + + crates.aho_corasick."0.6.8" = deps: { features?(features_.aho_corasick."0.6.8" deps {}) }: buildRustCrate { + crateName = "aho-corasick"; + version = "0.6.8"; + authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; + sha256 = "04bz5m32ykyn946iwxgbrl8nwca7ssxsqma140hgmkchaay80nfr"; + libName = "aho_corasick"; + crateBin = + [{ name = "aho-corasick-dot"; path = "src/main.rs"; }]; + dependencies = mapFeatures features ([ + (crates."memchr"."${deps."aho_corasick"."0.6.8"."memchr"}" deps) + ]); + }; + features_.aho_corasick."0.6.8" = deps: f: updateFeatures f (rec { + aho_corasick."0.6.8".default = (f.aho_corasick."0.6.8".default or true); + memchr."${deps.aho_corasick."0.6.8".memchr}".default = true; + }) [ + (features_.memchr."${deps."aho_corasick"."0.6.8"."memchr"}" deps) + ]; + + + crates.ansi_term."0.11.0" = deps: { features?(features_.ansi_term."0.11.0" deps {}) }: buildRustCrate { + crateName = "ansi_term"; + version = "0.11.0"; + authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) <ryan.havvy@gmail.com>" "Josh Triplett <josh@joshtriplett.org>" ]; + sha256 = "08fk0p2xvkqpmz3zlrwnf6l8sj2vngw464rvzspzp31sbgxbwm4v"; + dependencies = (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."ansi_term"."0.11.0"."winapi"}" deps) + ]) else []); + }; + features_.ansi_term."0.11.0" = deps: f: updateFeatures f (rec { + ansi_term."0.11.0".default = (f.ansi_term."0.11.0".default or true); + winapi = fold recursiveUpdate {} [ + { "${deps.ansi_term."0.11.0".winapi}"."consoleapi" = true; } + { "${deps.ansi_term."0.11.0".winapi}"."errhandlingapi" = true; } + { "${deps.ansi_term."0.11.0".winapi}"."processenv" = true; } + { "${deps.ansi_term."0.11.0".winapi}".default = true; } + ]; + }) [ + (features_.winapi."${deps."ansi_term"."0.11.0"."winapi"}" deps) + ]; + + + crates.argon2rs."0.2.5" = deps: { features?(features_.argon2rs."0.2.5" deps {}) }: buildRustCrate { + crateName = "argon2rs"; + version = "0.2.5"; + authors = [ "bryant <bryant@defrag.in>" ]; + sha256 = "1byl9b3wwyrarn8qack21v5fi2qsnn3y5clvikk2apskhmnih1rw"; + dependencies = mapFeatures features ([ + (crates."blake2_rfc"."${deps."argon2rs"."0.2.5"."blake2_rfc"}" deps) + (crates."scoped_threadpool"."${deps."argon2rs"."0.2.5"."scoped_threadpool"}" deps) + ]); + features = mkFeatures (features."argon2rs"."0.2.5" or {}); + }; + features_.argon2rs."0.2.5" = deps: f: updateFeatures f (rec { + argon2rs."0.2.5".default = (f.argon2rs."0.2.5".default or true); + blake2_rfc = fold recursiveUpdate {} [ + { "${deps.argon2rs."0.2.5".blake2_rfc}".default = true; } + { "0.2.18".simd_asm = + (f.blake2_rfc."0.2.18".simd_asm or false) || + (argon2rs."0.2.5"."simd" or false) || + (f."argon2rs"."0.2.5"."simd" or false); } + ]; + scoped_threadpool."${deps.argon2rs."0.2.5".scoped_threadpool}".default = true; + }) [ + (features_.blake2_rfc."${deps."argon2rs"."0.2.5"."blake2_rfc"}" deps) + (features_.scoped_threadpool."${deps."argon2rs"."0.2.5"."scoped_threadpool"}" deps) + ]; + + + crates.arrayvec."0.4.7" = deps: { features?(features_.arrayvec."0.4.7" deps {}) }: buildRustCrate { + crateName = "arrayvec"; + version = "0.4.7"; + authors = [ "bluss" ]; + sha256 = "0fzgv7z1x1qnyd7j32vdcadk4k9wfx897y06mr3bw1yi52iqf4z4"; + dependencies = mapFeatures features ([ + (crates."nodrop"."${deps."arrayvec"."0.4.7"."nodrop"}" deps) + ]); + features = mkFeatures (features."arrayvec"."0.4.7" or {}); + }; + features_.arrayvec."0.4.7" = deps: f: updateFeatures f (rec { + arrayvec = fold recursiveUpdate {} [ + { "0.4.7".default = (f.arrayvec."0.4.7".default or true); } + { "0.4.7".serde = + (f.arrayvec."0.4.7".serde or false) || + (f.arrayvec."0.4.7".serde-1 or false) || + (arrayvec."0.4.7"."serde-1" or false); } + { "0.4.7".std = + (f.arrayvec."0.4.7".std or false) || + (f.arrayvec."0.4.7".default or false) || + (arrayvec."0.4.7"."default" or false); } + ]; + nodrop."${deps.arrayvec."0.4.7".nodrop}".default = (f.nodrop."${deps.arrayvec."0.4.7".nodrop}".default or false); + }) [ + (features_.nodrop."${deps."arrayvec"."0.4.7"."nodrop"}" deps) + ]; + + + crates.atty."0.2.11" = deps: { features?(features_.atty."0.2.11" deps {}) }: buildRustCrate { + crateName = "atty"; + version = "0.2.11"; + authors = [ "softprops <d.tangren@gmail.com>" ]; + sha256 = "0by1bj2km9jxi4i4g76zzi76fc2rcm9934jpnyrqd95zw344pb20"; + dependencies = (if kernel == "redox" then mapFeatures features ([ + (crates."termion"."${deps."atty"."0.2.11"."termion"}" deps) + ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."libc"."${deps."atty"."0.2.11"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."atty"."0.2.11"."winapi"}" deps) + ]) else []); + }; + features_.atty."0.2.11" = deps: f: updateFeatures f (rec { + atty."0.2.11".default = (f.atty."0.2.11".default or true); + libc."${deps.atty."0.2.11".libc}".default = (f.libc."${deps.atty."0.2.11".libc}".default or false); + termion."${deps.atty."0.2.11".termion}".default = true; + winapi = fold recursiveUpdate {} [ + { "${deps.atty."0.2.11".winapi}"."consoleapi" = true; } + { "${deps.atty."0.2.11".winapi}"."minwinbase" = true; } + { "${deps.atty."0.2.11".winapi}"."minwindef" = true; } + { "${deps.atty."0.2.11".winapi}"."processenv" = true; } + { "${deps.atty."0.2.11".winapi}"."winbase" = true; } + { "${deps.atty."0.2.11".winapi}".default = true; } + ]; + }) [ + (features_.termion."${deps."atty"."0.2.11"."termion"}" deps) + (features_.libc."${deps."atty"."0.2.11"."libc"}" deps) + (features_.winapi."${deps."atty"."0.2.11"."winapi"}" deps) + ]; + + + crates.backtrace."0.3.9" = deps: { features?(features_.backtrace."0.3.9" deps {}) }: buildRustCrate { + crateName = "backtrace"; + version = "0.3.9"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" "The Rust Project Developers" ]; + sha256 = "137pjkcn89b7fqk78w65ggj92pynmf1hkr1sjz53aga4b50lkmwm"; + dependencies = mapFeatures features ([ + (crates."cfg_if"."${deps."backtrace"."0.3.9"."cfg_if"}" deps) + (crates."rustc_demangle"."${deps."backtrace"."0.3.9"."rustc_demangle"}" deps) + ]) + ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then mapFeatures features ([ + ] + ++ (if features.backtrace."0.3.9".backtrace-sys or false then [ (crates.backtrace_sys."0.1.24" deps) ] else [])) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."libc"."${deps."backtrace"."0.3.9"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + ] + ++ (if features.backtrace."0.3.9".winapi or false then [ (crates.winapi."0.3.6" deps) ] else [])) else []); + features = mkFeatures (features."backtrace"."0.3.9" or {}); + }; + features_.backtrace."0.3.9" = deps: f: updateFeatures f (rec { + backtrace = fold recursiveUpdate {} [ + { "0.3.9".addr2line = + (f.backtrace."0.3.9".addr2line or false) || + (f.backtrace."0.3.9".gimli-symbolize or false) || + (backtrace."0.3.9"."gimli-symbolize" or false); } + { "0.3.9".backtrace-sys = + (f.backtrace."0.3.9".backtrace-sys or false) || + (f.backtrace."0.3.9".libbacktrace or false) || + (backtrace."0.3.9"."libbacktrace" or false); } + { "0.3.9".coresymbolication = + (f.backtrace."0.3.9".coresymbolication or false) || + (f.backtrace."0.3.9".default or false) || + (backtrace."0.3.9"."default" or false); } + { "0.3.9".dbghelp = + (f.backtrace."0.3.9".dbghelp or false) || + (f.backtrace."0.3.9".default or false) || + (backtrace."0.3.9"."default" or false); } + { "0.3.9".default = (f.backtrace."0.3.9".default or true); } + { "0.3.9".dladdr = + (f.backtrace."0.3.9".dladdr or false) || + (f.backtrace."0.3.9".default or false) || + (backtrace."0.3.9"."default" or false); } + { "0.3.9".findshlibs = + (f.backtrace."0.3.9".findshlibs or false) || + (f.backtrace."0.3.9".gimli-symbolize or false) || + (backtrace."0.3.9"."gimli-symbolize" or false); } + { "0.3.9".gimli = + (f.backtrace."0.3.9".gimli or false) || + (f.backtrace."0.3.9".gimli-symbolize or false) || + (backtrace."0.3.9"."gimli-symbolize" or false); } + { "0.3.9".libbacktrace = + (f.backtrace."0.3.9".libbacktrace or false) || + (f.backtrace."0.3.9".default or false) || + (backtrace."0.3.9"."default" or false); } + { "0.3.9".libunwind = + (f.backtrace."0.3.9".libunwind or false) || + (f.backtrace."0.3.9".default or false) || + (backtrace."0.3.9"."default" or false); } + { "0.3.9".memmap = + (f.backtrace."0.3.9".memmap or false) || + (f.backtrace."0.3.9".gimli-symbolize or false) || + (backtrace."0.3.9"."gimli-symbolize" or false); } + { "0.3.9".object = + (f.backtrace."0.3.9".object or false) || + (f.backtrace."0.3.9".gimli-symbolize or false) || + (backtrace."0.3.9"."gimli-symbolize" or false); } + { "0.3.9".rustc-serialize = + (f.backtrace."0.3.9".rustc-serialize or false) || + (f.backtrace."0.3.9".serialize-rustc or false) || + (backtrace."0.3.9"."serialize-rustc" or false); } + { "0.3.9".serde = + (f.backtrace."0.3.9".serde or false) || + (f.backtrace."0.3.9".serialize-serde or false) || + (backtrace."0.3.9"."serialize-serde" or false); } + { "0.3.9".serde_derive = + (f.backtrace."0.3.9".serde_derive or false) || + (f.backtrace."0.3.9".serialize-serde or false) || + (backtrace."0.3.9"."serialize-serde" or false); } + { "0.3.9".winapi = + (f.backtrace."0.3.9".winapi or false) || + (f.backtrace."0.3.9".dbghelp or false) || + (backtrace."0.3.9"."dbghelp" or false); } + ]; + backtrace_sys."${deps.backtrace."0.3.9".backtrace_sys}".default = true; + cfg_if."${deps.backtrace."0.3.9".cfg_if}".default = true; + libc."${deps.backtrace."0.3.9".libc}".default = true; + rustc_demangle."${deps.backtrace."0.3.9".rustc_demangle}".default = true; + winapi = fold recursiveUpdate {} [ + { "${deps.backtrace."0.3.9".winapi}"."dbghelp" = true; } + { "${deps.backtrace."0.3.9".winapi}"."minwindef" = true; } + { "${deps.backtrace."0.3.9".winapi}"."processthreadsapi" = true; } + { "${deps.backtrace."0.3.9".winapi}"."std" = true; } + { "${deps.backtrace."0.3.9".winapi}"."winnt" = true; } + { "${deps.backtrace."0.3.9".winapi}".default = true; } + ]; + }) [ + (features_.cfg_if."${deps."backtrace"."0.3.9"."cfg_if"}" deps) + (features_.rustc_demangle."${deps."backtrace"."0.3.9"."rustc_demangle"}" deps) + (features_.backtrace_sys."${deps."backtrace"."0.3.9"."backtrace_sys"}" deps) + (features_.libc."${deps."backtrace"."0.3.9"."libc"}" deps) + (features_.winapi."${deps."backtrace"."0.3.9"."winapi"}" deps) + ]; + + + crates.backtrace_sys."0.1.24" = deps: { features?(features_.backtrace_sys."0.1.24" deps {}) }: buildRustCrate { + crateName = "backtrace-sys"; + version = "0.1.24"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "15d6jlknykiijcin3vqbx33760w24ss5qw3l1xd3hms5k4vc8305"; + build = "build.rs"; + dependencies = mapFeatures features ([ + (crates."libc"."${deps."backtrace_sys"."0.1.24"."libc"}" deps) + ]); + + buildDependencies = mapFeatures features ([ + (crates."cc"."${deps."backtrace_sys"."0.1.24"."cc"}" deps) + ]); + }; + features_.backtrace_sys."0.1.24" = deps: f: updateFeatures f (rec { + backtrace_sys."0.1.24".default = (f.backtrace_sys."0.1.24".default or true); + cc."${deps.backtrace_sys."0.1.24".cc}".default = true; + libc."${deps.backtrace_sys."0.1.24".libc}".default = true; + }) [ + (features_.libc."${deps."backtrace_sys"."0.1.24"."libc"}" deps) + (features_.cc."${deps."backtrace_sys"."0.1.24"."cc"}" deps) + ]; + + + crates.bitflags."1.0.4" = deps: { features?(features_.bitflags."1.0.4" deps {}) }: buildRustCrate { + crateName = "bitflags"; + version = "1.0.4"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1g1wmz2001qmfrd37dnd5qiss5njrw26aywmg6yhkmkbyrhjxb08"; + features = mkFeatures (features."bitflags"."1.0.4" or {}); + }; + features_.bitflags."1.0.4" = deps: f: updateFeatures f (rec { + bitflags."1.0.4".default = (f.bitflags."1.0.4".default or true); + }) []; + + + crates.blake2_rfc."0.2.18" = deps: { features?(features_.blake2_rfc."0.2.18" deps {}) }: buildRustCrate { + crateName = "blake2-rfc"; + version = "0.2.18"; + authors = [ "Cesar Eduardo Barros <cesarb@cesarb.eti.br>" ]; + sha256 = "0pyqrik4471ljk16prs0iwb2sam39z0z6axyyjxlqxdmf4wprf0l"; + dependencies = mapFeatures features ([ + (crates."arrayvec"."${deps."blake2_rfc"."0.2.18"."arrayvec"}" deps) + (crates."constant_time_eq"."${deps."blake2_rfc"."0.2.18"."constant_time_eq"}" deps) + ]); + features = mkFeatures (features."blake2_rfc"."0.2.18" or {}); + }; + features_.blake2_rfc."0.2.18" = deps: f: updateFeatures f (rec { + arrayvec."${deps.blake2_rfc."0.2.18".arrayvec}".default = (f.arrayvec."${deps.blake2_rfc."0.2.18".arrayvec}".default or false); + blake2_rfc = fold recursiveUpdate {} [ + { "0.2.18".default = (f.blake2_rfc."0.2.18".default or true); } + { "0.2.18".simd = + (f.blake2_rfc."0.2.18".simd or false) || + (f.blake2_rfc."0.2.18".simd_opt or false) || + (blake2_rfc."0.2.18"."simd_opt" or false); } + { "0.2.18".simd_opt = + (f.blake2_rfc."0.2.18".simd_opt or false) || + (f.blake2_rfc."0.2.18".simd_asm or false) || + (blake2_rfc."0.2.18"."simd_asm" or false); } + { "0.2.18".std = + (f.blake2_rfc."0.2.18".std or false) || + (f.blake2_rfc."0.2.18".default or false) || + (blake2_rfc."0.2.18"."default" or false); } + ]; + constant_time_eq."${deps.blake2_rfc."0.2.18".constant_time_eq}".default = true; + }) [ + (features_.arrayvec."${deps."blake2_rfc"."0.2.18"."arrayvec"}" deps) + (features_.constant_time_eq."${deps."blake2_rfc"."0.2.18"."constant_time_eq"}" deps) + ]; + + + crates.carnix."0.8.11" = deps: { features?(features_.carnix."0.8.11" deps {}) }: buildRustCrate { + crateName = "carnix"; + version = "0.8.11"; + authors = [ "pe@pijul.org <pe@pijul.org>" ]; + sha256 = "1i5iz51mradd3vishc19cd0nfh9r2clbmiq94f83npny65dnp6ch"; + crateBin = + [{ name = "cargo-generate-nixfile"; path = "src/cargo-generate-nixfile.rs"; }] ++ + [{ name = "carnix"; path = "src/main.rs"; }]; + dependencies = mapFeatures features ([ + (crates."clap"."${deps."carnix"."0.8.11"."clap"}" deps) + (crates."dirs"."${deps."carnix"."0.8.11"."dirs"}" deps) + (crates."env_logger"."${deps."carnix"."0.8.11"."env_logger"}" deps) + (crates."error_chain"."${deps."carnix"."0.8.11"."error_chain"}" deps) + (crates."itertools"."${deps."carnix"."0.8.11"."itertools"}" deps) + (crates."log"."${deps."carnix"."0.8.11"."log"}" deps) + (crates."nom"."${deps."carnix"."0.8.11"."nom"}" deps) + (crates."regex"."${deps."carnix"."0.8.11"."regex"}" deps) + (crates."rusqlite"."${deps."carnix"."0.8.11"."rusqlite"}" deps) + (crates."serde"."${deps."carnix"."0.8.11"."serde"}" deps) + (crates."serde_derive"."${deps."carnix"."0.8.11"."serde_derive"}" deps) + (crates."serde_json"."${deps."carnix"."0.8.11"."serde_json"}" deps) + (crates."tempdir"."${deps."carnix"."0.8.11"."tempdir"}" deps) + (crates."toml"."${deps."carnix"."0.8.11"."toml"}" deps) + ]); + }; + features_.carnix."0.8.11" = deps: f: updateFeatures f (rec { + carnix."0.8.11".default = (f.carnix."0.8.11".default or true); + clap."${deps.carnix."0.8.11".clap}".default = true; + dirs."${deps.carnix."0.8.11".dirs}".default = true; + env_logger."${deps.carnix."0.8.11".env_logger}".default = true; + error_chain."${deps.carnix."0.8.11".error_chain}".default = true; + itertools."${deps.carnix."0.8.11".itertools}".default = true; + log."${deps.carnix."0.8.11".log}".default = true; + nom."${deps.carnix."0.8.11".nom}".default = true; + regex."${deps.carnix."0.8.11".regex}".default = true; + rusqlite."${deps.carnix."0.8.11".rusqlite}".default = true; + serde."${deps.carnix."0.8.11".serde}".default = true; + serde_derive."${deps.carnix."0.8.11".serde_derive}".default = true; + serde_json."${deps.carnix."0.8.11".serde_json}".default = true; + tempdir."${deps.carnix."0.8.11".tempdir}".default = true; + toml."${deps.carnix."0.8.11".toml}".default = true; + }) [ + (features_.clap."${deps."carnix"."0.8.11"."clap"}" deps) + (features_.dirs."${deps."carnix"."0.8.11"."dirs"}" deps) + (features_.env_logger."${deps."carnix"."0.8.11"."env_logger"}" deps) + (features_.error_chain."${deps."carnix"."0.8.11"."error_chain"}" deps) + (features_.itertools."${deps."carnix"."0.8.11"."itertools"}" deps) + (features_.log."${deps."carnix"."0.8.11"."log"}" deps) + (features_.nom."${deps."carnix"."0.8.11"."nom"}" deps) + (features_.regex."${deps."carnix"."0.8.11"."regex"}" deps) + (features_.rusqlite."${deps."carnix"."0.8.11"."rusqlite"}" deps) + (features_.serde."${deps."carnix"."0.8.11"."serde"}" deps) + (features_.serde_derive."${deps."carnix"."0.8.11"."serde_derive"}" deps) + (features_.serde_json."${deps."carnix"."0.8.11"."serde_json"}" deps) + (features_.tempdir."${deps."carnix"."0.8.11"."tempdir"}" deps) + (features_.toml."${deps."carnix"."0.8.11"."toml"}" deps) + ]; + + + crates.cc."1.0.25" = deps: { features?(features_.cc."1.0.25" deps {}) }: buildRustCrate { + crateName = "cc"; + version = "1.0.25"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "0pd8fhjlpr5qan984frkf1c8nxrqp6827wmmfzhm2840229z2hq0"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."cc"."1.0.25" or {}); + }; + features_.cc."1.0.25" = deps: f: updateFeatures f (rec { + cc = fold recursiveUpdate {} [ + { "1.0.25".default = (f.cc."1.0.25".default or true); } + { "1.0.25".rayon = + (f.cc."1.0.25".rayon or false) || + (f.cc."1.0.25".parallel or false) || + (cc."1.0.25"."parallel" or false); } + ]; + }) []; + + + crates.cfg_if."0.1.6" = deps: { features?(features_.cfg_if."0.1.6" deps {}) }: buildRustCrate { + crateName = "cfg-if"; + version = "0.1.6"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "11qrix06wagkplyk908i3423ps9m9np6c4vbcq81s9fyl244xv3n"; + }; + features_.cfg_if."0.1.6" = deps: f: updateFeatures f (rec { + cfg_if."0.1.6".default = (f.cfg_if."0.1.6".default or true); + }) []; + + + crates.clap."2.32.0" = deps: { features?(features_.clap."2.32.0" deps {}) }: buildRustCrate { + crateName = "clap"; + version = "2.32.0"; + authors = [ "Kevin K. <kbknapp@gmail.com>" ]; + sha256 = "1hdjf0janvpjkwrjdjx1mm2aayzr54k72w6mriyr0n5anjkcj1lx"; + dependencies = mapFeatures features ([ + (crates."bitflags"."${deps."clap"."2.32.0"."bitflags"}" deps) + (crates."textwrap"."${deps."clap"."2.32.0"."textwrap"}" deps) + (crates."unicode_width"."${deps."clap"."2.32.0"."unicode_width"}" deps) + ] + ++ (if features.clap."2.32.0".atty or false then [ (crates.atty."0.2.11" deps) ] else []) + ++ (if features.clap."2.32.0".strsim or false then [ (crates.strsim."0.7.0" deps) ] else []) + ++ (if features.clap."2.32.0".vec_map or false then [ (crates.vec_map."0.8.1" deps) ] else [])) + ++ (if !(kernel == "windows") then mapFeatures features ([ + ] + ++ (if features.clap."2.32.0".ansi_term or false then [ (crates.ansi_term."0.11.0" deps) ] else [])) else []); + features = mkFeatures (features."clap"."2.32.0" or {}); + }; + features_.clap."2.32.0" = deps: f: updateFeatures f (rec { + ansi_term."${deps.clap."2.32.0".ansi_term}".default = true; + atty."${deps.clap."2.32.0".atty}".default = true; + bitflags."${deps.clap."2.32.0".bitflags}".default = true; + clap = fold recursiveUpdate {} [ + { "2.32.0".ansi_term = + (f.clap."2.32.0".ansi_term or false) || + (f.clap."2.32.0".color or false) || + (clap."2.32.0"."color" or false); } + { "2.32.0".atty = + (f.clap."2.32.0".atty or false) || + (f.clap."2.32.0".color or false) || + (clap."2.32.0"."color" or false); } + { "2.32.0".clippy = + (f.clap."2.32.0".clippy or false) || + (f.clap."2.32.0".lints or false) || + (clap."2.32.0"."lints" or false); } + { "2.32.0".color = + (f.clap."2.32.0".color or false) || + (f.clap."2.32.0".default or false) || + (clap."2.32.0"."default" or false); } + { "2.32.0".default = (f.clap."2.32.0".default or true); } + { "2.32.0".strsim = + (f.clap."2.32.0".strsim or false) || + (f.clap."2.32.0".suggestions or false) || + (clap."2.32.0"."suggestions" or false); } + { "2.32.0".suggestions = + (f.clap."2.32.0".suggestions or false) || + (f.clap."2.32.0".default or false) || + (clap."2.32.0"."default" or false); } + { "2.32.0".term_size = + (f.clap."2.32.0".term_size or false) || + (f.clap."2.32.0".wrap_help or false) || + (clap."2.32.0"."wrap_help" or false); } + { "2.32.0".vec_map = + (f.clap."2.32.0".vec_map or false) || + (f.clap."2.32.0".default or false) || + (clap."2.32.0"."default" or false); } + { "2.32.0".yaml = + (f.clap."2.32.0".yaml or false) || + (f.clap."2.32.0".doc or false) || + (clap."2.32.0"."doc" or false); } + { "2.32.0".yaml-rust = + (f.clap."2.32.0".yaml-rust or false) || + (f.clap."2.32.0".yaml or false) || + (clap."2.32.0"."yaml" or false); } + ]; + strsim."${deps.clap."2.32.0".strsim}".default = true; + textwrap = fold recursiveUpdate {} [ + { "${deps.clap."2.32.0".textwrap}".default = true; } + { "0.10.0".term_size = + (f.textwrap."0.10.0".term_size or false) || + (clap."2.32.0"."wrap_help" or false) || + (f."clap"."2.32.0"."wrap_help" or false); } + ]; + unicode_width."${deps.clap."2.32.0".unicode_width}".default = true; + vec_map."${deps.clap."2.32.0".vec_map}".default = true; + }) [ + (features_.atty."${deps."clap"."2.32.0"."atty"}" deps) + (features_.bitflags."${deps."clap"."2.32.0"."bitflags"}" deps) + (features_.strsim."${deps."clap"."2.32.0"."strsim"}" deps) + (features_.textwrap."${deps."clap"."2.32.0"."textwrap"}" deps) + (features_.unicode_width."${deps."clap"."2.32.0"."unicode_width"}" deps) + (features_.vec_map."${deps."clap"."2.32.0"."vec_map"}" deps) + (features_.ansi_term."${deps."clap"."2.32.0"."ansi_term"}" deps) + ]; + + + crates.constant_time_eq."0.1.3" = deps: { features?(features_.constant_time_eq."0.1.3" deps {}) }: buildRustCrate { + crateName = "constant_time_eq"; + version = "0.1.3"; + authors = [ "Cesar Eduardo Barros <cesarb@cesarb.eti.br>" ]; + sha256 = "03qri9hjf049gwqg9q527lybpg918q6y5q4g9a5lma753nff49wd"; + }; + features_.constant_time_eq."0.1.3" = deps: f: updateFeatures f (rec { + constant_time_eq."0.1.3".default = (f.constant_time_eq."0.1.3".default or true); + }) []; + + + crates.dirs."1.0.4" = deps: { features?(features_.dirs."1.0.4" deps {}) }: buildRustCrate { + crateName = "dirs"; + version = "1.0.4"; + authors = [ "Simon Ochsenreither <simon@ochsenreither.de>" ]; + sha256 = "1hp3nz0350b0gpavb3w5ajqc9l1k59cfrcsr3hcavwlkizdnpv1y"; + dependencies = (if kernel == "redox" then mapFeatures features ([ + (crates."redox_users"."${deps."dirs"."1.0.4"."redox_users"}" deps) + ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."libc"."${deps."dirs"."1.0.4"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."dirs"."1.0.4"."winapi"}" deps) + ]) else []); + }; + features_.dirs."1.0.4" = deps: f: updateFeatures f (rec { + dirs."1.0.4".default = (f.dirs."1.0.4".default or true); + libc."${deps.dirs."1.0.4".libc}".default = true; + redox_users."${deps.dirs."1.0.4".redox_users}".default = true; + winapi = fold recursiveUpdate {} [ + { "${deps.dirs."1.0.4".winapi}"."knownfolders" = true; } + { "${deps.dirs."1.0.4".winapi}"."objbase" = true; } + { "${deps.dirs."1.0.4".winapi}"."shlobj" = true; } + { "${deps.dirs."1.0.4".winapi}"."winbase" = true; } + { "${deps.dirs."1.0.4".winapi}"."winerror" = true; } + { "${deps.dirs."1.0.4".winapi}".default = true; } + ]; + }) [ + (features_.redox_users."${deps."dirs"."1.0.4"."redox_users"}" deps) + (features_.libc."${deps."dirs"."1.0.4"."libc"}" deps) + (features_.winapi."${deps."dirs"."1.0.4"."winapi"}" deps) + ]; + + + crates.either."1.5.0" = deps: { features?(features_.either."1.5.0" deps {}) }: buildRustCrate { + crateName = "either"; + version = "1.5.0"; + authors = [ "bluss" ]; + sha256 = "1f7kl2ln01y02m8fpd2zrdjiwqmgfvl9nxxrfry3k19d1gd2bsvz"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."either"."1.5.0" or {}); + }; + features_.either."1.5.0" = deps: f: updateFeatures f (rec { + either = fold recursiveUpdate {} [ + { "1.5.0".default = (f.either."1.5.0".default or true); } + { "1.5.0".use_std = + (f.either."1.5.0".use_std or false) || + (f.either."1.5.0".default or false) || + (either."1.5.0"."default" or false); } + ]; + }) []; + + + crates.env_logger."0.5.13" = deps: { features?(features_.env_logger."0.5.13" deps {}) }: buildRustCrate { + crateName = "env_logger"; + version = "0.5.13"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1q6vylngcz4bn088b4hvsl879l8yz1k2bma75waljb5p4h4kbb72"; + dependencies = mapFeatures features ([ + (crates."atty"."${deps."env_logger"."0.5.13"."atty"}" deps) + (crates."humantime"."${deps."env_logger"."0.5.13"."humantime"}" deps) + (crates."log"."${deps."env_logger"."0.5.13"."log"}" deps) + (crates."termcolor"."${deps."env_logger"."0.5.13"."termcolor"}" deps) + ] + ++ (if features.env_logger."0.5.13".regex or false then [ (crates.regex."1.0.5" deps) ] else [])); + features = mkFeatures (features."env_logger"."0.5.13" or {}); + }; + features_.env_logger."0.5.13" = deps: f: updateFeatures f (rec { + atty."${deps.env_logger."0.5.13".atty}".default = true; + env_logger = fold recursiveUpdate {} [ + { "0.5.13".default = (f.env_logger."0.5.13".default or true); } + { "0.5.13".regex = + (f.env_logger."0.5.13".regex or false) || + (f.env_logger."0.5.13".default or false) || + (env_logger."0.5.13"."default" or false); } + ]; + humantime."${deps.env_logger."0.5.13".humantime}".default = true; + log = fold recursiveUpdate {} [ + { "${deps.env_logger."0.5.13".log}"."std" = true; } + { "${deps.env_logger."0.5.13".log}".default = true; } + ]; + regex."${deps.env_logger."0.5.13".regex}".default = true; + termcolor."${deps.env_logger."0.5.13".termcolor}".default = true; + }) [ + (features_.atty."${deps."env_logger"."0.5.13"."atty"}" deps) + (features_.humantime."${deps."env_logger"."0.5.13"."humantime"}" deps) + (features_.log."${deps."env_logger"."0.5.13"."log"}" deps) + (features_.regex."${deps."env_logger"."0.5.13"."regex"}" deps) + (features_.termcolor."${deps."env_logger"."0.5.13"."termcolor"}" deps) + ]; + + + crates.error_chain."0.12.0" = deps: { features?(features_.error_chain."0.12.0" deps {}) }: buildRustCrate { + crateName = "error-chain"; + version = "0.12.0"; + authors = [ "Brian Anderson <banderson@mozilla.com>" "Paul Colomiets <paul@colomiets.name>" "Colin Kiegel <kiegel@gmx.de>" "Yamakaky <yamakaky@yamaworld.fr>" ]; + sha256 = "1m6wk1r6wqg1mn69bxxvk5k081cb4xy6bfhsxb99rv408x9wjcnl"; + dependencies = mapFeatures features ([ + ] + ++ (if features.error_chain."0.12.0".backtrace or false then [ (crates.backtrace."0.3.9" deps) ] else [])); + features = mkFeatures (features."error_chain"."0.12.0" or {}); + }; + features_.error_chain."0.12.0" = deps: f: updateFeatures f (rec { + backtrace."${deps.error_chain."0.12.0".backtrace}".default = true; + error_chain = fold recursiveUpdate {} [ + { "0.12.0".backtrace = + (f.error_chain."0.12.0".backtrace or false) || + (f.error_chain."0.12.0".default or false) || + (error_chain."0.12.0"."default" or false); } + { "0.12.0".default = (f.error_chain."0.12.0".default or true); } + { "0.12.0".example_generated = + (f.error_chain."0.12.0".example_generated or false) || + (f.error_chain."0.12.0".default or false) || + (error_chain."0.12.0"."default" or false); } + ]; + }) [ + (features_.backtrace."${deps."error_chain"."0.12.0"."backtrace"}" deps) + ]; + + + crates.failure."0.1.3" = deps: { features?(features_.failure."0.1.3" deps {}) }: buildRustCrate { + crateName = "failure"; + version = "0.1.3"; + authors = [ "Without Boats <boats@mozilla.com>" ]; + sha256 = "0cibp01z0clyxrvkl7v7kq6jszsgcg9vwv6d9l6d1drk9jqdss4s"; + dependencies = mapFeatures features ([ + ] + ++ (if features.failure."0.1.3".backtrace or false then [ (crates.backtrace."0.3.9" deps) ] else []) + ++ (if features.failure."0.1.3".failure_derive or false then [ (crates.failure_derive."0.1.3" deps) ] else [])); + features = mkFeatures (features."failure"."0.1.3" or {}); + }; + features_.failure."0.1.3" = deps: f: updateFeatures f (rec { + backtrace."${deps.failure."0.1.3".backtrace}".default = true; + failure = fold recursiveUpdate {} [ + { "0.1.3".backtrace = + (f.failure."0.1.3".backtrace or false) || + (f.failure."0.1.3".std or false) || + (failure."0.1.3"."std" or false); } + { "0.1.3".default = (f.failure."0.1.3".default or true); } + { "0.1.3".derive = + (f.failure."0.1.3".derive or false) || + (f.failure."0.1.3".default or false) || + (failure."0.1.3"."default" or false); } + { "0.1.3".failure_derive = + (f.failure."0.1.3".failure_derive or false) || + (f.failure."0.1.3".derive or false) || + (failure."0.1.3"."derive" or false); } + { "0.1.3".std = + (f.failure."0.1.3".std or false) || + (f.failure."0.1.3".default or false) || + (failure."0.1.3"."default" or false); } + ]; + failure_derive."${deps.failure."0.1.3".failure_derive}".default = true; + }) [ + (features_.backtrace."${deps."failure"."0.1.3"."backtrace"}" deps) + (features_.failure_derive."${deps."failure"."0.1.3"."failure_derive"}" deps) + ]; + + + crates.failure_derive."0.1.3" = deps: { features?(features_.failure_derive."0.1.3" deps {}) }: buildRustCrate { + crateName = "failure_derive"; + version = "0.1.3"; + authors = [ "Without Boats <woboats@gmail.com>" ]; + sha256 = "1mh7ad2d17f13g0k29bskp0f9faws0w1q4a5yfzlzi75bw9kidgm"; + procMacro = true; + build = "build.rs"; + dependencies = mapFeatures features ([ + (crates."proc_macro2"."${deps."failure_derive"."0.1.3"."proc_macro2"}" deps) + (crates."quote"."${deps."failure_derive"."0.1.3"."quote"}" deps) + (crates."syn"."${deps."failure_derive"."0.1.3"."syn"}" deps) + (crates."synstructure"."${deps."failure_derive"."0.1.3"."synstructure"}" deps) + ]); + features = mkFeatures (features."failure_derive"."0.1.3" or {}); + }; + features_.failure_derive."0.1.3" = deps: f: updateFeatures f (rec { + failure_derive."0.1.3".default = (f.failure_derive."0.1.3".default or true); + proc_macro2."${deps.failure_derive."0.1.3".proc_macro2}".default = true; + quote."${deps.failure_derive."0.1.3".quote}".default = true; + syn."${deps.failure_derive."0.1.3".syn}".default = true; + synstructure."${deps.failure_derive."0.1.3".synstructure}".default = true; + }) [ + (features_.proc_macro2."${deps."failure_derive"."0.1.3"."proc_macro2"}" deps) + (features_.quote."${deps."failure_derive"."0.1.3"."quote"}" deps) + (features_.syn."${deps."failure_derive"."0.1.3"."syn"}" deps) + (features_.synstructure."${deps."failure_derive"."0.1.3"."synstructure"}" deps) + ]; + + + crates.fuchsia_zircon."0.3.3" = deps: { features?(features_.fuchsia_zircon."0.3.3" deps {}) }: buildRustCrate { + crateName = "fuchsia-zircon"; + version = "0.3.3"; + authors = [ "Raph Levien <raph@google.com>" ]; + sha256 = "0jrf4shb1699r4la8z358vri8318w4mdi6qzfqy30p2ymjlca4gk"; + dependencies = mapFeatures features ([ + (crates."bitflags"."${deps."fuchsia_zircon"."0.3.3"."bitflags"}" deps) + (crates."fuchsia_zircon_sys"."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps) + ]); + }; + features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f (rec { + bitflags."${deps.fuchsia_zircon."0.3.3".bitflags}".default = true; + fuchsia_zircon."0.3.3".default = (f.fuchsia_zircon."0.3.3".default or true); + fuchsia_zircon_sys."${deps.fuchsia_zircon."0.3.3".fuchsia_zircon_sys}".default = true; + }) [ + (features_.bitflags."${deps."fuchsia_zircon"."0.3.3"."bitflags"}" deps) + (features_.fuchsia_zircon_sys."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps) + ]; + + + crates.fuchsia_zircon_sys."0.3.3" = deps: { features?(features_.fuchsia_zircon_sys."0.3.3" deps {}) }: buildRustCrate { + crateName = "fuchsia-zircon-sys"; + version = "0.3.3"; + authors = [ "Raph Levien <raph@google.com>" ]; + sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5"; + }; + features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f (rec { + fuchsia_zircon_sys."0.3.3".default = (f.fuchsia_zircon_sys."0.3.3".default or true); + }) []; + + + crates.humantime."1.1.1" = deps: { features?(features_.humantime."1.1.1" deps {}) }: buildRustCrate { + crateName = "humantime"; + version = "1.1.1"; + authors = [ "Paul Colomiets <paul@colomiets.name>" ]; + sha256 = "1lzdfsfzdikcp1qb6wcdvnsdv16pmzr7p7cv171vnbnyz2lrwbgn"; + libPath = "src/lib.rs"; + dependencies = mapFeatures features ([ + (crates."quick_error"."${deps."humantime"."1.1.1"."quick_error"}" deps) + ]); + }; + features_.humantime."1.1.1" = deps: f: updateFeatures f (rec { + humantime."1.1.1".default = (f.humantime."1.1.1".default or true); + quick_error."${deps.humantime."1.1.1".quick_error}".default = true; + }) [ + (features_.quick_error."${deps."humantime"."1.1.1"."quick_error"}" deps) + ]; + + + crates.itertools."0.7.8" = deps: { features?(features_.itertools."0.7.8" deps {}) }: buildRustCrate { + crateName = "itertools"; + version = "0.7.8"; + authors = [ "bluss" ]; + sha256 = "0ib30cd7d1icjxsa13mji1gry3grp72kx8p33yd84mphdbc3d357"; + dependencies = mapFeatures features ([ + (crates."either"."${deps."itertools"."0.7.8"."either"}" deps) + ]); + features = mkFeatures (features."itertools"."0.7.8" or {}); + }; + features_.itertools."0.7.8" = deps: f: updateFeatures f (rec { + either."${deps.itertools."0.7.8".either}".default = (f.either."${deps.itertools."0.7.8".either}".default or false); + itertools = fold recursiveUpdate {} [ + { "0.7.8".default = (f.itertools."0.7.8".default or true); } + { "0.7.8".use_std = + (f.itertools."0.7.8".use_std or false) || + (f.itertools."0.7.8".default or false) || + (itertools."0.7.8"."default" or false); } + ]; + }) [ + (features_.either."${deps."itertools"."0.7.8"."either"}" deps) + ]; + + + crates.itoa."0.4.3" = deps: { features?(features_.itoa."0.4.3" deps {}) }: buildRustCrate { + crateName = "itoa"; + version = "0.4.3"; + authors = [ "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "0zadimmdgvili3gdwxqg7ljv3r4wcdg1kkdfp9nl15vnm23vrhy1"; + features = mkFeatures (features."itoa"."0.4.3" or {}); + }; + features_.itoa."0.4.3" = deps: f: updateFeatures f (rec { + itoa = fold recursiveUpdate {} [ + { "0.4.3".default = (f.itoa."0.4.3".default or true); } + { "0.4.3".std = + (f.itoa."0.4.3".std or false) || + (f.itoa."0.4.3".default or false) || + (itoa."0.4.3"."default" or false); } + ]; + }) []; + + + crates.lazy_static."1.1.0" = deps: { features?(features_.lazy_static."1.1.0" deps {}) }: buildRustCrate { + crateName = "lazy_static"; + version = "1.1.0"; + authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ]; + sha256 = "1da2b6nxfc2l547qgl9kd1pn9sh1af96a6qx6xw8xdnv6hh5fag0"; + build = "build.rs"; + dependencies = mapFeatures features ([ +]); + + buildDependencies = mapFeatures features ([ + (crates."version_check"."${deps."lazy_static"."1.1.0"."version_check"}" deps) + ]); + features = mkFeatures (features."lazy_static"."1.1.0" or {}); + }; + features_.lazy_static."1.1.0" = deps: f: updateFeatures f (rec { + lazy_static = fold recursiveUpdate {} [ + { "1.1.0".default = (f.lazy_static."1.1.0".default or true); } + { "1.1.0".nightly = + (f.lazy_static."1.1.0".nightly or false) || + (f.lazy_static."1.1.0".spin_no_std or false) || + (lazy_static."1.1.0"."spin_no_std" or false); } + { "1.1.0".spin = + (f.lazy_static."1.1.0".spin or false) || + (f.lazy_static."1.1.0".spin_no_std or false) || + (lazy_static."1.1.0"."spin_no_std" or false); } + ]; + version_check."${deps.lazy_static."1.1.0".version_check}".default = true; + }) [ + (features_.version_check."${deps."lazy_static"."1.1.0"."version_check"}" deps) + ]; + + + crates.libc."0.2.43" = deps: { features?(features_.libc."0.2.43" deps {}) }: buildRustCrate { + crateName = "libc"; + version = "0.2.43"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0pshydmsq71kl9276zc2928ld50sp524ixcqkcqsgq410dx6c50b"; + features = mkFeatures (features."libc"."0.2.43" or {}); + }; + features_.libc."0.2.43" = deps: f: updateFeatures f (rec { + libc = fold recursiveUpdate {} [ + { "0.2.43".default = (f.libc."0.2.43".default or true); } + { "0.2.43".use_std = + (f.libc."0.2.43".use_std or false) || + (f.libc."0.2.43".default or false) || + (libc."0.2.43"."default" or false); } + ]; + }) []; + + + crates.libsqlite3_sys."0.9.3" = deps: { features?(features_.libsqlite3_sys."0.9.3" deps {}) }: buildRustCrate { + crateName = "libsqlite3-sys"; + version = "0.9.3"; + authors = [ "John Gallagher <jgallagher@bignerdranch.com>" ]; + sha256 = "128bv2y342iksv693bffvybr3zzi04vd8p0307zi9wixbdxyp021"; + build = "build.rs"; + dependencies = (if abi == "msvc" then mapFeatures features ([ +]) else []); + + buildDependencies = mapFeatures features ([ + ] + ++ (if features.libsqlite3_sys."0.9.3".pkg-config or false then [ (crates.pkg_config."0.3.14" deps) ] else [])); + features = mkFeatures (features."libsqlite3_sys"."0.9.3" or {}); + }; + features_.libsqlite3_sys."0.9.3" = deps: f: updateFeatures f (rec { + libsqlite3_sys = fold recursiveUpdate {} [ + { "0.9.3".bindgen = + (f.libsqlite3_sys."0.9.3".bindgen or false) || + (f.libsqlite3_sys."0.9.3".buildtime_bindgen or false) || + (libsqlite3_sys."0.9.3"."buildtime_bindgen" or false); } + { "0.9.3".cc = + (f.libsqlite3_sys."0.9.3".cc or false) || + (f.libsqlite3_sys."0.9.3".bundled or false) || + (libsqlite3_sys."0.9.3"."bundled" or false); } + { "0.9.3".default = (f.libsqlite3_sys."0.9.3".default or true); } + { "0.9.3".min_sqlite_version_3_6_8 = + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_8 or false) || + (f.libsqlite3_sys."0.9.3".default or false) || + (libsqlite3_sys."0.9.3"."default" or false); } + { "0.9.3".pkg-config = + (f.libsqlite3_sys."0.9.3".pkg-config or false) || + (f.libsqlite3_sys."0.9.3".buildtime_bindgen or false) || + (libsqlite3_sys."0.9.3"."buildtime_bindgen" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_11 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_11" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_23 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_23" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_8 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_8" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_16 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_16" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_3 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_3" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_4 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_4" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_7 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_7" or false); } + { "0.9.3".vcpkg = + (f.libsqlite3_sys."0.9.3".vcpkg or false) || + (f.libsqlite3_sys."0.9.3".buildtime_bindgen or false) || + (libsqlite3_sys."0.9.3"."buildtime_bindgen" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_11 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_11" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_23 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_23" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_8 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_8" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_16 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_16" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_3 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_3" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_4 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_4" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_7 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_7" or false); } + ]; + pkg_config."${deps.libsqlite3_sys."0.9.3".pkg_config}".default = true; + }) [ + (features_.pkg_config."${deps."libsqlite3_sys"."0.9.3"."pkg_config"}" deps) + ]; + + + crates.linked_hash_map."0.4.2" = deps: { features?(features_.linked_hash_map."0.4.2" deps {}) }: buildRustCrate { + crateName = "linked-hash-map"; + version = "0.4.2"; + authors = [ "Stepan Koltsov <stepan.koltsov@gmail.com>" "Andrew Paseltiner <apaseltiner@gmail.com>" ]; + sha256 = "04da208h6jb69f46j37jnvsw2i1wqplglp4d61csqcrhh83avbgl"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."linked_hash_map"."0.4.2" or {}); + }; + features_.linked_hash_map."0.4.2" = deps: f: updateFeatures f (rec { + linked_hash_map = fold recursiveUpdate {} [ + { "0.4.2".default = (f.linked_hash_map."0.4.2".default or true); } + { "0.4.2".heapsize = + (f.linked_hash_map."0.4.2".heapsize or false) || + (f.linked_hash_map."0.4.2".heapsize_impl or false) || + (linked_hash_map."0.4.2"."heapsize_impl" or false); } + { "0.4.2".serde = + (f.linked_hash_map."0.4.2".serde or false) || + (f.linked_hash_map."0.4.2".serde_impl or false) || + (linked_hash_map."0.4.2"."serde_impl" or false); } + { "0.4.2".serde_test = + (f.linked_hash_map."0.4.2".serde_test or false) || + (f.linked_hash_map."0.4.2".serde_impl or false) || + (linked_hash_map."0.4.2"."serde_impl" or false); } + ]; + }) []; + + + crates.log."0.4.5" = deps: { features?(features_.log."0.4.5" deps {}) }: buildRustCrate { + crateName = "log"; + version = "0.4.5"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1hdcj17al94ga90q7jx2y1rmxi68n3akra1awv3hr3s9b9zipgq6"; + dependencies = mapFeatures features ([ + (crates."cfg_if"."${deps."log"."0.4.5"."cfg_if"}" deps) + ]); + features = mkFeatures (features."log"."0.4.5" or {}); + }; + features_.log."0.4.5" = deps: f: updateFeatures f (rec { + cfg_if."${deps.log."0.4.5".cfg_if}".default = true; + log."0.4.5".default = (f.log."0.4.5".default or true); + }) [ + (features_.cfg_if."${deps."log"."0.4.5"."cfg_if"}" deps) + ]; + + + crates.lru_cache."0.1.1" = deps: { features?(features_.lru_cache."0.1.1" deps {}) }: buildRustCrate { + crateName = "lru-cache"; + version = "0.1.1"; + authors = [ "Stepan Koltsov <stepan.koltsov@gmail.com>" ]; + sha256 = "1hl6kii1g54sq649gnscv858mmw7a02xj081l4vcgvrswdi2z8fw"; + dependencies = mapFeatures features ([ + (crates."linked_hash_map"."${deps."lru_cache"."0.1.1"."linked_hash_map"}" deps) + ]); + features = mkFeatures (features."lru_cache"."0.1.1" or {}); + }; + features_.lru_cache."0.1.1" = deps: f: updateFeatures f (rec { + linked_hash_map = fold recursiveUpdate {} [ + { "${deps.lru_cache."0.1.1".linked_hash_map}".default = true; } + { "0.4.2".heapsize_impl = + (f.linked_hash_map."0.4.2".heapsize_impl or false) || + (lru_cache."0.1.1"."heapsize_impl" or false) || + (f."lru_cache"."0.1.1"."heapsize_impl" or false); } + ]; + lru_cache = fold recursiveUpdate {} [ + { "0.1.1".default = (f.lru_cache."0.1.1".default or true); } + { "0.1.1".heapsize = + (f.lru_cache."0.1.1".heapsize or false) || + (f.lru_cache."0.1.1".heapsize_impl or false) || + (lru_cache."0.1.1"."heapsize_impl" or false); } + ]; + }) [ + (features_.linked_hash_map."${deps."lru_cache"."0.1.1"."linked_hash_map"}" deps) + ]; + + + crates.memchr."1.0.2" = deps: { features?(features_.memchr."1.0.2" deps {}) }: buildRustCrate { + crateName = "memchr"; + version = "1.0.2"; + authors = [ "Andrew Gallant <jamslam@gmail.com>" "bluss" ]; + sha256 = "0dfb8ifl9nrc9kzgd5z91q6qg87sh285q1ih7xgrsglmqfav9lg7"; + dependencies = mapFeatures features ([ + ] + ++ (if features.memchr."1.0.2".libc or false then [ (crates.libc."0.2.43" deps) ] else [])); + features = mkFeatures (features."memchr"."1.0.2" or {}); + }; + features_.memchr."1.0.2" = deps: f: updateFeatures f (rec { + libc = fold recursiveUpdate {} [ + { "${deps.memchr."1.0.2".libc}".default = (f.libc."${deps.memchr."1.0.2".libc}".default or false); } + { "0.2.43".use_std = + (f.libc."0.2.43".use_std or false) || + (memchr."1.0.2"."use_std" or false) || + (f."memchr"."1.0.2"."use_std" or false); } + ]; + memchr = fold recursiveUpdate {} [ + { "1.0.2".default = (f.memchr."1.0.2".default or true); } + { "1.0.2".libc = + (f.memchr."1.0.2".libc or false) || + (f.memchr."1.0.2".default or false) || + (memchr."1.0.2"."default" or false) || + (f.memchr."1.0.2".use_std or false) || + (memchr."1.0.2"."use_std" or false); } + { "1.0.2".use_std = + (f.memchr."1.0.2".use_std or false) || + (f.memchr."1.0.2".default or false) || + (memchr."1.0.2"."default" or false); } + ]; + }) [ + (features_.libc."${deps."memchr"."1.0.2"."libc"}" deps) + ]; + + + crates.memchr."2.1.0" = deps: { features?(features_.memchr."2.1.0" deps {}) }: buildRustCrate { + crateName = "memchr"; + version = "2.1.0"; + authors = [ "Andrew Gallant <jamslam@gmail.com>" "bluss" ]; + sha256 = "02w1fc5z1ccx8fbzgcr0mpk0xf2i9g4vbx9q5c2g8pjddbaqvjjq"; + dependencies = mapFeatures features ([ + (crates."cfg_if"."${deps."memchr"."2.1.0"."cfg_if"}" deps) + ] + ++ (if features.memchr."2.1.0".libc or false then [ (crates.libc."0.2.43" deps) ] else [])); + + buildDependencies = mapFeatures features ([ + (crates."version_check"."${deps."memchr"."2.1.0"."version_check"}" deps) + ]); + features = mkFeatures (features."memchr"."2.1.0" or {}); + }; + features_.memchr."2.1.0" = deps: f: updateFeatures f (rec { + cfg_if."${deps.memchr."2.1.0".cfg_if}".default = true; + libc = fold recursiveUpdate {} [ + { "${deps.memchr."2.1.0".libc}".default = (f.libc."${deps.memchr."2.1.0".libc}".default or false); } + { "0.2.43".use_std = + (f.libc."0.2.43".use_std or false) || + (memchr."2.1.0"."use_std" or false) || + (f."memchr"."2.1.0"."use_std" or false); } + ]; + memchr = fold recursiveUpdate {} [ + { "2.1.0".default = (f.memchr."2.1.0".default or true); } + { "2.1.0".libc = + (f.memchr."2.1.0".libc or false) || + (f.memchr."2.1.0".default or false) || + (memchr."2.1.0"."default" or false) || + (f.memchr."2.1.0".use_std or false) || + (memchr."2.1.0"."use_std" or false); } + { "2.1.0".use_std = + (f.memchr."2.1.0".use_std or false) || + (f.memchr."2.1.0".default or false) || + (memchr."2.1.0"."default" or false); } + ]; + version_check."${deps.memchr."2.1.0".version_check}".default = true; + }) [ + (features_.cfg_if."${deps."memchr"."2.1.0"."cfg_if"}" deps) + (features_.libc."${deps."memchr"."2.1.0"."libc"}" deps) + (features_.version_check."${deps."memchr"."2.1.0"."version_check"}" deps) + ]; + + + crates.nodrop."0.1.12" = deps: { features?(features_.nodrop."0.1.12" deps {}) }: buildRustCrate { + crateName = "nodrop"; + version = "0.1.12"; + authors = [ "bluss" ]; + sha256 = "1b9rxvdg8061gxjc239l9slndf0ds3m6fy2sf3gs8f9kknqgl49d"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."nodrop"."0.1.12" or {}); + }; + features_.nodrop."0.1.12" = deps: f: updateFeatures f (rec { + nodrop = fold recursiveUpdate {} [ + { "0.1.12".default = (f.nodrop."0.1.12".default or true); } + { "0.1.12".nodrop-union = + (f.nodrop."0.1.12".nodrop-union or false) || + (f.nodrop."0.1.12".use_union or false) || + (nodrop."0.1.12"."use_union" or false); } + { "0.1.12".std = + (f.nodrop."0.1.12".std or false) || + (f.nodrop."0.1.12".default or false) || + (nodrop."0.1.12"."default" or false); } + ]; + }) []; + + + crates.nom."3.2.1" = deps: { features?(features_.nom."3.2.1" deps {}) }: buildRustCrate { + crateName = "nom"; + version = "3.2.1"; + authors = [ "contact@geoffroycouprie.com" ]; + sha256 = "1vcllxrz9hdw6j25kn020ka3psz1vkaqh1hm3yfak2240zrxgi07"; + dependencies = mapFeatures features ([ + (crates."memchr"."${deps."nom"."3.2.1"."memchr"}" deps) + ]); + features = mkFeatures (features."nom"."3.2.1" or {}); + }; + features_.nom."3.2.1" = deps: f: updateFeatures f (rec { + memchr = fold recursiveUpdate {} [ + { "${deps.nom."3.2.1".memchr}".default = (f.memchr."${deps.nom."3.2.1".memchr}".default or false); } + { "1.0.2".use_std = + (f.memchr."1.0.2".use_std or false) || + (nom."3.2.1"."std" or false) || + (f."nom"."3.2.1"."std" or false); } + ]; + nom = fold recursiveUpdate {} [ + { "3.2.1".compiler_error = + (f.nom."3.2.1".compiler_error or false) || + (f.nom."3.2.1".nightly or false) || + (nom."3.2.1"."nightly" or false); } + { "3.2.1".default = (f.nom."3.2.1".default or true); } + { "3.2.1".lazy_static = + (f.nom."3.2.1".lazy_static or false) || + (f.nom."3.2.1".regexp_macros or false) || + (nom."3.2.1"."regexp_macros" or false); } + { "3.2.1".regex = + (f.nom."3.2.1".regex or false) || + (f.nom."3.2.1".regexp or false) || + (nom."3.2.1"."regexp" or false); } + { "3.2.1".regexp = + (f.nom."3.2.1".regexp or false) || + (f.nom."3.2.1".regexp_macros or false) || + (nom."3.2.1"."regexp_macros" or false); } + { "3.2.1".std = + (f.nom."3.2.1".std or false) || + (f.nom."3.2.1".default or false) || + (nom."3.2.1"."default" or false); } + { "3.2.1".stream = + (f.nom."3.2.1".stream or false) || + (f.nom."3.2.1".default or false) || + (nom."3.2.1"."default" or false); } + ]; + }) [ + (features_.memchr."${deps."nom"."3.2.1"."memchr"}" deps) + ]; + + + crates.pkg_config."0.3.14" = deps: { features?(features_.pkg_config."0.3.14" deps {}) }: buildRustCrate { + crateName = "pkg-config"; + version = "0.3.14"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "0207fsarrm412j0dh87lfcas72n8mxar7q3mgflsbsrqnb140sv6"; + }; + features_.pkg_config."0.3.14" = deps: f: updateFeatures f (rec { + pkg_config."0.3.14".default = (f.pkg_config."0.3.14".default or true); + }) []; + + + crates.proc_macro2."0.4.20" = deps: { features?(features_.proc_macro2."0.4.20" deps {}) }: buildRustCrate { + crateName = "proc-macro2"; + version = "0.4.20"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "0yr74b00d3wzg21kjvfln7vzzvf9aghbaff4c747i3grbd997ys2"; + build = "build.rs"; + dependencies = mapFeatures features ([ + (crates."unicode_xid"."${deps."proc_macro2"."0.4.20"."unicode_xid"}" deps) + ]); + features = mkFeatures (features."proc_macro2"."0.4.20" or {}); + }; + features_.proc_macro2."0.4.20" = deps: f: updateFeatures f (rec { + proc_macro2 = fold recursiveUpdate {} [ + { "0.4.20".default = (f.proc_macro2."0.4.20".default or true); } + { "0.4.20".proc-macro = + (f.proc_macro2."0.4.20".proc-macro or false) || + (f.proc_macro2."0.4.20".default or false) || + (proc_macro2."0.4.20"."default" or false) || + (f.proc_macro2."0.4.20".nightly or false) || + (proc_macro2."0.4.20"."nightly" or false); } + ]; + unicode_xid."${deps.proc_macro2."0.4.20".unicode_xid}".default = true; + }) [ + (features_.unicode_xid."${deps."proc_macro2"."0.4.20"."unicode_xid"}" deps) + ]; + + + crates.quick_error."1.2.2" = deps: { features?(features_.quick_error."1.2.2" deps {}) }: buildRustCrate { + crateName = "quick-error"; + version = "1.2.2"; + authors = [ "Paul Colomiets <paul@colomiets.name>" "Colin Kiegel <kiegel@gmx.de>" ]; + sha256 = "192a3adc5phgpibgqblsdx1b421l5yg9bjbmv552qqq9f37h60k5"; + }; + features_.quick_error."1.2.2" = deps: f: updateFeatures f (rec { + quick_error."1.2.2".default = (f.quick_error."1.2.2".default or true); + }) []; + + + crates.quote."0.6.8" = deps: { features?(features_.quote."0.6.8" deps {}) }: buildRustCrate { + crateName = "quote"; + version = "0.6.8"; + authors = [ "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "0dq6j23w6pmc4l6v490arixdwypy0b82z76nrzaingqhqri4p3mh"; + dependencies = mapFeatures features ([ + (crates."proc_macro2"."${deps."quote"."0.6.8"."proc_macro2"}" deps) + ]); + features = mkFeatures (features."quote"."0.6.8" or {}); + }; + features_.quote."0.6.8" = deps: f: updateFeatures f (rec { + proc_macro2 = fold recursiveUpdate {} [ + { "${deps.quote."0.6.8".proc_macro2}".default = (f.proc_macro2."${deps.quote."0.6.8".proc_macro2}".default or false); } + { "0.4.20".proc-macro = + (f.proc_macro2."0.4.20".proc-macro or false) || + (quote."0.6.8"."proc-macro" or false) || + (f."quote"."0.6.8"."proc-macro" or false); } + ]; + quote = fold recursiveUpdate {} [ + { "0.6.8".default = (f.quote."0.6.8".default or true); } + { "0.6.8".proc-macro = + (f.quote."0.6.8".proc-macro or false) || + (f.quote."0.6.8".default or false) || + (quote."0.6.8"."default" or false); } + ]; + }) [ + (features_.proc_macro2."${deps."quote"."0.6.8"."proc_macro2"}" deps) + ]; + + + crates.rand."0.4.3" = deps: { features?(features_.rand."0.4.3" deps {}) }: buildRustCrate { + crateName = "rand"; + version = "0.4.3"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1644wri45l147822xy7dgdm4k7myxzs66cb795ga0x7dan11ci4f"; + dependencies = (if kernel == "fuchsia" then mapFeatures features ([ + (crates."fuchsia_zircon"."${deps."rand"."0.4.3"."fuchsia_zircon"}" deps) + ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + ] + ++ (if features.rand."0.4.3".libc or false then [ (crates.libc."0.2.43" deps) ] else [])) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."rand"."0.4.3"."winapi"}" deps) + ]) else []); + features = mkFeatures (features."rand"."0.4.3" or {}); + }; + features_.rand."0.4.3" = deps: f: updateFeatures f (rec { + fuchsia_zircon."${deps.rand."0.4.3".fuchsia_zircon}".default = true; + libc."${deps.rand."0.4.3".libc}".default = true; + rand = fold recursiveUpdate {} [ + { "0.4.3".default = (f.rand."0.4.3".default or true); } + { "0.4.3".i128_support = + (f.rand."0.4.3".i128_support or false) || + (f.rand."0.4.3".nightly or false) || + (rand."0.4.3"."nightly" or false); } + { "0.4.3".libc = + (f.rand."0.4.3".libc or false) || + (f.rand."0.4.3".std or false) || + (rand."0.4.3"."std" or false); } + { "0.4.3".std = + (f.rand."0.4.3".std or false) || + (f.rand."0.4.3".default or false) || + (rand."0.4.3"."default" or false); } + ]; + winapi = fold recursiveUpdate {} [ + { "${deps.rand."0.4.3".winapi}"."minwindef" = true; } + { "${deps.rand."0.4.3".winapi}"."ntsecapi" = true; } + { "${deps.rand."0.4.3".winapi}"."profileapi" = true; } + { "${deps.rand."0.4.3".winapi}"."winnt" = true; } + { "${deps.rand."0.4.3".winapi}".default = true; } + ]; + }) [ + (features_.fuchsia_zircon."${deps."rand"."0.4.3"."fuchsia_zircon"}" deps) + (features_.libc."${deps."rand"."0.4.3"."libc"}" deps) + (features_.winapi."${deps."rand"."0.4.3"."winapi"}" deps) + ]; + + + crates.redox_syscall."0.1.40" = deps: { features?(features_.redox_syscall."0.1.40" deps {}) }: buildRustCrate { + crateName = "redox_syscall"; + version = "0.1.40"; + authors = [ "Jeremy Soller <jackpot51@gmail.com>" ]; + sha256 = "132rnhrq49l3z7gjrwj2zfadgw6q0355s6a7id7x7c0d7sk72611"; + libName = "syscall"; + }; + features_.redox_syscall."0.1.40" = deps: f: updateFeatures f (rec { + redox_syscall."0.1.40".default = (f.redox_syscall."0.1.40".default or true); + }) []; + + + crates.redox_termios."0.1.1" = deps: { features?(features_.redox_termios."0.1.1" deps {}) }: buildRustCrate { + crateName = "redox_termios"; + version = "0.1.1"; + authors = [ "Jeremy Soller <jackpot51@gmail.com>" ]; + sha256 = "04s6yyzjca552hdaqlvqhp3vw0zqbc304md5czyd3axh56iry8wh"; + libPath = "src/lib.rs"; + dependencies = mapFeatures features ([ + (crates."redox_syscall"."${deps."redox_termios"."0.1.1"."redox_syscall"}" deps) + ]); + }; + features_.redox_termios."0.1.1" = deps: f: updateFeatures f (rec { + redox_syscall."${deps.redox_termios."0.1.1".redox_syscall}".default = true; + redox_termios."0.1.1".default = (f.redox_termios."0.1.1".default or true); + }) [ + (features_.redox_syscall."${deps."redox_termios"."0.1.1"."redox_syscall"}" deps) + ]; + + + crates.redox_users."0.2.0" = deps: { features?(features_.redox_users."0.2.0" deps {}) }: buildRustCrate { + crateName = "redox_users"; + version = "0.2.0"; + authors = [ "Jose Narvaez <goyox86@gmail.com>" "Wesley Hershberger <mggmugginsmc@gmail.com>" ]; + sha256 = "0s9jrh378jk8rfi1xfwxvh2r1gv6rn3bq6n7sbajkrqqq0xzijvf"; + dependencies = mapFeatures features ([ + (crates."argon2rs"."${deps."redox_users"."0.2.0"."argon2rs"}" deps) + (crates."failure"."${deps."redox_users"."0.2.0"."failure"}" deps) + (crates."rand"."${deps."redox_users"."0.2.0"."rand"}" deps) + (crates."redox_syscall"."${deps."redox_users"."0.2.0"."redox_syscall"}" deps) + ]); + }; + features_.redox_users."0.2.0" = deps: f: updateFeatures f (rec { + argon2rs."${deps.redox_users."0.2.0".argon2rs}".default = (f.argon2rs."${deps.redox_users."0.2.0".argon2rs}".default or false); + failure."${deps.redox_users."0.2.0".failure}".default = true; + rand."${deps.redox_users."0.2.0".rand}".default = true; + redox_syscall."${deps.redox_users."0.2.0".redox_syscall}".default = true; + redox_users."0.2.0".default = (f.redox_users."0.2.0".default or true); + }) [ + (features_.argon2rs."${deps."redox_users"."0.2.0"."argon2rs"}" deps) + (features_.failure."${deps."redox_users"."0.2.0"."failure"}" deps) + (features_.rand."${deps."redox_users"."0.2.0"."rand"}" deps) + (features_.redox_syscall."${deps."redox_users"."0.2.0"."redox_syscall"}" deps) + ]; + + + crates.regex."1.0.5" = deps: { features?(features_.regex."1.0.5" deps {}) }: buildRustCrate { + crateName = "regex"; + version = "1.0.5"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1nb4dva9lhb3v76bdds9qcxldb2xy998sdraqnqaqdr6axfsfp02"; + dependencies = mapFeatures features ([ + (crates."aho_corasick"."${deps."regex"."1.0.5"."aho_corasick"}" deps) + (crates."memchr"."${deps."regex"."1.0.5"."memchr"}" deps) + (crates."regex_syntax"."${deps."regex"."1.0.5"."regex_syntax"}" deps) + (crates."thread_local"."${deps."regex"."1.0.5"."thread_local"}" deps) + (crates."utf8_ranges"."${deps."regex"."1.0.5"."utf8_ranges"}" deps) + ]); + features = mkFeatures (features."regex"."1.0.5" or {}); + }; + features_.regex."1.0.5" = deps: f: updateFeatures f (rec { + aho_corasick."${deps.regex."1.0.5".aho_corasick}".default = true; + memchr."${deps.regex."1.0.5".memchr}".default = true; + regex = fold recursiveUpdate {} [ + { "1.0.5".default = (f.regex."1.0.5".default or true); } + { "1.0.5".pattern = + (f.regex."1.0.5".pattern or false) || + (f.regex."1.0.5".unstable or false) || + (regex."1.0.5"."unstable" or false); } + { "1.0.5".use_std = + (f.regex."1.0.5".use_std or false) || + (f.regex."1.0.5".default or false) || + (regex."1.0.5"."default" or false); } + ]; + regex_syntax."${deps.regex."1.0.5".regex_syntax}".default = true; + thread_local."${deps.regex."1.0.5".thread_local}".default = true; + utf8_ranges."${deps.regex."1.0.5".utf8_ranges}".default = true; + }) [ + (features_.aho_corasick."${deps."regex"."1.0.5"."aho_corasick"}" deps) + (features_.memchr."${deps."regex"."1.0.5"."memchr"}" deps) + (features_.regex_syntax."${deps."regex"."1.0.5"."regex_syntax"}" deps) + (features_.thread_local."${deps."regex"."1.0.5"."thread_local"}" deps) + (features_.utf8_ranges."${deps."regex"."1.0.5"."utf8_ranges"}" deps) + ]; + + + crates.regex_syntax."0.6.2" = deps: { features?(features_.regex_syntax."0.6.2" deps {}) }: buildRustCrate { + crateName = "regex-syntax"; + version = "0.6.2"; + authors = [ "The Rust Project Developers" ]; + sha256 = "109426mj7nhwr6szdzbcvn1a8g5zy52f9maqxjd9agm8wg87ylyw"; + dependencies = mapFeatures features ([ + (crates."ucd_util"."${deps."regex_syntax"."0.6.2"."ucd_util"}" deps) + ]); + }; + features_.regex_syntax."0.6.2" = deps: f: updateFeatures f (rec { + regex_syntax."0.6.2".default = (f.regex_syntax."0.6.2".default or true); + ucd_util."${deps.regex_syntax."0.6.2".ucd_util}".default = true; + }) [ + (features_.ucd_util."${deps."regex_syntax"."0.6.2"."ucd_util"}" deps) + ]; + + + crates.remove_dir_all."0.5.1" = deps: { features?(features_.remove_dir_all."0.5.1" deps {}) }: buildRustCrate { + crateName = "remove_dir_all"; + version = "0.5.1"; + authors = [ "Aaronepower <theaaronepower@gmail.com>" ]; + sha256 = "1chx3yvfbj46xjz4bzsvps208l46hfbcy0sm98gpiya454n4rrl7"; + dependencies = (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."remove_dir_all"."0.5.1"."winapi"}" deps) + ]) else []); + }; + features_.remove_dir_all."0.5.1" = deps: f: updateFeatures f (rec { + remove_dir_all."0.5.1".default = (f.remove_dir_all."0.5.1".default or true); + winapi = fold recursiveUpdate {} [ + { "${deps.remove_dir_all."0.5.1".winapi}"."errhandlingapi" = true; } + { "${deps.remove_dir_all."0.5.1".winapi}"."fileapi" = true; } + { "${deps.remove_dir_all."0.5.1".winapi}"."std" = true; } + { "${deps.remove_dir_all."0.5.1".winapi}"."winbase" = true; } + { "${deps.remove_dir_all."0.5.1".winapi}"."winerror" = true; } + { "${deps.remove_dir_all."0.5.1".winapi}".default = true; } + ]; + }) [ + (features_.winapi."${deps."remove_dir_all"."0.5.1"."winapi"}" deps) + ]; + + + crates.rusqlite."0.14.0" = deps: { features?(features_.rusqlite."0.14.0" deps {}) }: buildRustCrate { + crateName = "rusqlite"; + version = "0.14.0"; + authors = [ "John Gallagher <jgallagher@bignerdranch.com>" ]; + sha256 = "06j1z8yicn6jg8irxclsvgp0575gz5k24jgnbk0d807i5gvsg9jq"; + dependencies = mapFeatures features ([ + (crates."bitflags"."${deps."rusqlite"."0.14.0"."bitflags"}" deps) + (crates."libsqlite3_sys"."${deps."rusqlite"."0.14.0"."libsqlite3_sys"}" deps) + (crates."lru_cache"."${deps."rusqlite"."0.14.0"."lru_cache"}" deps) + (crates."time"."${deps."rusqlite"."0.14.0"."time"}" deps) + ]); + features = mkFeatures (features."rusqlite"."0.14.0" or {}); + }; + features_.rusqlite."0.14.0" = deps: f: updateFeatures f (rec { + bitflags."${deps.rusqlite."0.14.0".bitflags}".default = true; + libsqlite3_sys = fold recursiveUpdate {} [ + { "${deps.rusqlite."0.14.0".libsqlite3_sys}".default = true; } + { "0.9.3".buildtime_bindgen = + (f.libsqlite3_sys."0.9.3".buildtime_bindgen or false) || + (rusqlite."0.14.0"."buildtime_bindgen" or false) || + (f."rusqlite"."0.14.0"."buildtime_bindgen" or false); } + { "0.9.3".bundled = + (f.libsqlite3_sys."0.9.3".bundled or false) || + (rusqlite."0.14.0"."bundled" or false) || + (f."rusqlite"."0.14.0"."bundled" or false); } + { "0.9.3".min_sqlite_version_3_6_11 = + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_11 or false) || + (rusqlite."0.14.0"."backup" or false) || + (f."rusqlite"."0.14.0"."backup" or false); } + { "0.9.3".min_sqlite_version_3_6_23 = + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_23 or false) || + (rusqlite."0.14.0"."trace" or false) || + (f."rusqlite"."0.14.0"."trace" or false); } + { "0.9.3".min_sqlite_version_3_7_3 = + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_3 or false) || + (rusqlite."0.14.0"."functions" or false) || + (f."rusqlite"."0.14.0"."functions" or false); } + { "0.9.3".min_sqlite_version_3_7_4 = + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_4 or false) || + (rusqlite."0.14.0"."blob" or false) || + (f."rusqlite"."0.14.0"."blob" or false); } + { "0.9.3".min_sqlite_version_3_7_7 = + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_7 or false) || + (rusqlite."0.14.0"."vtab" or false) || + (f."rusqlite"."0.14.0"."vtab" or false); } + { "0.9.3".sqlcipher = + (f.libsqlite3_sys."0.9.3".sqlcipher or false) || + (rusqlite."0.14.0"."sqlcipher" or false) || + (f."rusqlite"."0.14.0"."sqlcipher" or false); } + { "0.9.3".unlock_notify = + (f.libsqlite3_sys."0.9.3".unlock_notify or false) || + (rusqlite."0.14.0"."unlock_notify" or false) || + (f."rusqlite"."0.14.0"."unlock_notify" or false); } + ]; + lru_cache."${deps.rusqlite."0.14.0".lru_cache}".default = true; + rusqlite = fold recursiveUpdate {} [ + { "0.14.0".bundled = + (f.rusqlite."0.14.0".bundled or false) || + (f.rusqlite."0.14.0".array or false) || + (rusqlite."0.14.0"."array" or false); } + { "0.14.0".csv = + (f.rusqlite."0.14.0".csv or false) || + (f.rusqlite."0.14.0".csvtab or false) || + (rusqlite."0.14.0"."csvtab" or false); } + { "0.14.0".default = (f.rusqlite."0.14.0".default or true); } + { "0.14.0".lazy_static = + (f.rusqlite."0.14.0".lazy_static or false) || + (f.rusqlite."0.14.0".vtab or false) || + (rusqlite."0.14.0"."vtab" or false); } + { "0.14.0".vtab = + (f.rusqlite."0.14.0".vtab or false) || + (f.rusqlite."0.14.0".array or false) || + (rusqlite."0.14.0"."array" or false) || + (f.rusqlite."0.14.0".csvtab or false) || + (rusqlite."0.14.0"."csvtab" or false); } + ]; + time."${deps.rusqlite."0.14.0".time}".default = true; + }) [ + (features_.bitflags."${deps."rusqlite"."0.14.0"."bitflags"}" deps) + (features_.libsqlite3_sys."${deps."rusqlite"."0.14.0"."libsqlite3_sys"}" deps) + (features_.lru_cache."${deps."rusqlite"."0.14.0"."lru_cache"}" deps) + (features_.time."${deps."rusqlite"."0.14.0"."time"}" deps) + ]; + + + crates.rustc_demangle."0.1.9" = deps: { features?(features_.rustc_demangle."0.1.9" deps {}) }: buildRustCrate { + crateName = "rustc-demangle"; + version = "0.1.9"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "00ma4r9haq0zv5krps617mym6y74056pfcivyld0kpci156vfaax"; + }; + features_.rustc_demangle."0.1.9" = deps: f: updateFeatures f (rec { + rustc_demangle."0.1.9".default = (f.rustc_demangle."0.1.9".default or true); + }) []; + + + crates.ryu."0.2.6" = deps: { features?(features_.ryu."0.2.6" deps {}) }: buildRustCrate { + crateName = "ryu"; + version = "0.2.6"; + authors = [ "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "1vdh6z4aysc9kiiqhl7vxkqz3fykcnp24kgfizshlwfsz2j0p9dr"; + build = "build.rs"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."ryu"."0.2.6" or {}); + }; + features_.ryu."0.2.6" = deps: f: updateFeatures f (rec { + ryu."0.2.6".default = (f.ryu."0.2.6".default or true); + }) []; + + + crates.scoped_threadpool."0.1.9" = deps: { features?(features_.scoped_threadpool."0.1.9" deps {}) }: buildRustCrate { + crateName = "scoped_threadpool"; + version = "0.1.9"; + authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ]; + sha256 = "1arqj2skcfr46s1lcyvnlmfr5456kg5nhn8k90xyfjnxkp5yga2v"; + features = mkFeatures (features."scoped_threadpool"."0.1.9" or {}); + }; + features_.scoped_threadpool."0.1.9" = deps: f: updateFeatures f (rec { + scoped_threadpool."0.1.9".default = (f.scoped_threadpool."0.1.9".default or true); + }) []; + + + crates.serde."1.0.80" = deps: { features?(features_.serde."1.0.80" deps {}) }: buildRustCrate { + crateName = "serde"; + version = "1.0.80"; + authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "0vyciw2qhrws4hz87pfnsjdfzzdw2sclxqxq394g3a219a2rdcxz"; + build = "build.rs"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."serde"."1.0.80" or {}); + }; + features_.serde."1.0.80" = deps: f: updateFeatures f (rec { + serde = fold recursiveUpdate {} [ + { "1.0.80".default = (f.serde."1.0.80".default or true); } + { "1.0.80".serde_derive = + (f.serde."1.0.80".serde_derive or false) || + (f.serde."1.0.80".derive or false) || + (serde."1.0.80"."derive" or false); } + { "1.0.80".std = + (f.serde."1.0.80".std or false) || + (f.serde."1.0.80".default or false) || + (serde."1.0.80"."default" or false); } + { "1.0.80".unstable = + (f.serde."1.0.80".unstable or false) || + (f.serde."1.0.80".alloc or false) || + (serde."1.0.80"."alloc" or false); } + ]; + }) []; + + + crates.serde_derive."1.0.80" = deps: { features?(features_.serde_derive."1.0.80" deps {}) }: buildRustCrate { + crateName = "serde_derive"; + version = "1.0.80"; + authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "1akvzhbnnqhd92lfj7vp43scs1vdml7x27c82l5yh0kz7xf7jaky"; + procMacro = true; + dependencies = mapFeatures features ([ + (crates."proc_macro2"."${deps."serde_derive"."1.0.80"."proc_macro2"}" deps) + (crates."quote"."${deps."serde_derive"."1.0.80"."quote"}" deps) + (crates."syn"."${deps."serde_derive"."1.0.80"."syn"}" deps) + ]); + features = mkFeatures (features."serde_derive"."1.0.80" or {}); + }; + features_.serde_derive."1.0.80" = deps: f: updateFeatures f (rec { + proc_macro2."${deps.serde_derive."1.0.80".proc_macro2}".default = true; + quote."${deps.serde_derive."1.0.80".quote}".default = true; + serde_derive."1.0.80".default = (f.serde_derive."1.0.80".default or true); + syn = fold recursiveUpdate {} [ + { "${deps.serde_derive."1.0.80".syn}"."visit" = true; } + { "${deps.serde_derive."1.0.80".syn}".default = true; } + ]; + }) [ + (features_.proc_macro2."${deps."serde_derive"."1.0.80"."proc_macro2"}" deps) + (features_.quote."${deps."serde_derive"."1.0.80"."quote"}" deps) + (features_.syn."${deps."serde_derive"."1.0.80"."syn"}" deps) + ]; + + + crates.serde_json."1.0.32" = deps: { features?(features_.serde_json."1.0.32" deps {}) }: buildRustCrate { + crateName = "serde_json"; + version = "1.0.32"; + authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "1dqkvizi02j1bs5c21kw20idf4aa5399g29ndwl6vkmmrqkr1gr0"; + dependencies = mapFeatures features ([ + (crates."itoa"."${deps."serde_json"."1.0.32"."itoa"}" deps) + (crates."ryu"."${deps."serde_json"."1.0.32"."ryu"}" deps) + (crates."serde"."${deps."serde_json"."1.0.32"."serde"}" deps) + ]); + features = mkFeatures (features."serde_json"."1.0.32" or {}); + }; + features_.serde_json."1.0.32" = deps: f: updateFeatures f (rec { + itoa."${deps.serde_json."1.0.32".itoa}".default = true; + ryu."${deps.serde_json."1.0.32".ryu}".default = true; + serde."${deps.serde_json."1.0.32".serde}".default = true; + serde_json = fold recursiveUpdate {} [ + { "1.0.32".default = (f.serde_json."1.0.32".default or true); } + { "1.0.32".indexmap = + (f.serde_json."1.0.32".indexmap or false) || + (f.serde_json."1.0.32".preserve_order or false) || + (serde_json."1.0.32"."preserve_order" or false); } + ]; + }) [ + (features_.itoa."${deps."serde_json"."1.0.32"."itoa"}" deps) + (features_.ryu."${deps."serde_json"."1.0.32"."ryu"}" deps) + (features_.serde."${deps."serde_json"."1.0.32"."serde"}" deps) + ]; + + + crates.strsim."0.7.0" = deps: { features?(features_.strsim."0.7.0" deps {}) }: buildRustCrate { + crateName = "strsim"; + version = "0.7.0"; + authors = [ "Danny Guo <dannyguo91@gmail.com>" ]; + sha256 = "0fy0k5f2705z73mb3x9459bpcvrx4ky8jpr4zikcbiwan4bnm0iv"; + }; + features_.strsim."0.7.0" = deps: f: updateFeatures f (rec { + strsim."0.7.0".default = (f.strsim."0.7.0".default or true); + }) []; + + + crates.syn."0.15.13" = deps: { features?(features_.syn."0.15.13" deps {}) }: buildRustCrate { + crateName = "syn"; + version = "0.15.13"; + authors = [ "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "1zvnppl08f2njpkl3m10h221sdl4vsm7v6vyq63dxk16nn37b1bh"; + dependencies = mapFeatures features ([ + (crates."proc_macro2"."${deps."syn"."0.15.13"."proc_macro2"}" deps) + (crates."unicode_xid"."${deps."syn"."0.15.13"."unicode_xid"}" deps) + ] + ++ (if features.syn."0.15.13".quote or false then [ (crates.quote."0.6.8" deps) ] else [])); + features = mkFeatures (features."syn"."0.15.13" or {}); + }; + features_.syn."0.15.13" = deps: f: updateFeatures f (rec { + proc_macro2 = fold recursiveUpdate {} [ + { "${deps.syn."0.15.13".proc_macro2}".default = (f.proc_macro2."${deps.syn."0.15.13".proc_macro2}".default or false); } + { "0.4.20".proc-macro = + (f.proc_macro2."0.4.20".proc-macro or false) || + (syn."0.15.13"."proc-macro" or false) || + (f."syn"."0.15.13"."proc-macro" or false); } + ]; + quote = fold recursiveUpdate {} [ + { "${deps.syn."0.15.13".quote}".default = (f.quote."${deps.syn."0.15.13".quote}".default or false); } + { "0.6.8".proc-macro = + (f.quote."0.6.8".proc-macro or false) || + (syn."0.15.13"."proc-macro" or false) || + (f."syn"."0.15.13"."proc-macro" or false); } + ]; + syn = fold recursiveUpdate {} [ + { "0.15.13".clone-impls = + (f.syn."0.15.13".clone-impls or false) || + (f.syn."0.15.13".default or false) || + (syn."0.15.13"."default" or false); } + { "0.15.13".default = (f.syn."0.15.13".default or true); } + { "0.15.13".derive = + (f.syn."0.15.13".derive or false) || + (f.syn."0.15.13".default or false) || + (syn."0.15.13"."default" or false); } + { "0.15.13".parsing = + (f.syn."0.15.13".parsing or false) || + (f.syn."0.15.13".default or false) || + (syn."0.15.13"."default" or false); } + { "0.15.13".printing = + (f.syn."0.15.13".printing or false) || + (f.syn."0.15.13".default or false) || + (syn."0.15.13"."default" or false); } + { "0.15.13".proc-macro = + (f.syn."0.15.13".proc-macro or false) || + (f.syn."0.15.13".default or false) || + (syn."0.15.13"."default" or false); } + { "0.15.13".quote = + (f.syn."0.15.13".quote or false) || + (f.syn."0.15.13".printing or false) || + (syn."0.15.13"."printing" or false); } + ]; + unicode_xid."${deps.syn."0.15.13".unicode_xid}".default = true; + }) [ + (features_.proc_macro2."${deps."syn"."0.15.13"."proc_macro2"}" deps) + (features_.quote."${deps."syn"."0.15.13"."quote"}" deps) + (features_.unicode_xid."${deps."syn"."0.15.13"."unicode_xid"}" deps) + ]; + + + crates.synstructure."0.10.0" = deps: { features?(features_.synstructure."0.10.0" deps {}) }: buildRustCrate { + crateName = "synstructure"; + version = "0.10.0"; + authors = [ "Nika Layzell <nika@thelayzells.com>" ]; + sha256 = "1alb4hsbm5qf4jy7nmdkqrh3jagqk1xj88w0pmz67f16dvgpf0qf"; + dependencies = mapFeatures features ([ + (crates."proc_macro2"."${deps."synstructure"."0.10.0"."proc_macro2"}" deps) + (crates."quote"."${deps."synstructure"."0.10.0"."quote"}" deps) + (crates."syn"."${deps."synstructure"."0.10.0"."syn"}" deps) + (crates."unicode_xid"."${deps."synstructure"."0.10.0"."unicode_xid"}" deps) + ]); + features = mkFeatures (features."synstructure"."0.10.0" or {}); + }; + features_.synstructure."0.10.0" = deps: f: updateFeatures f (rec { + proc_macro2."${deps.synstructure."0.10.0".proc_macro2}".default = true; + quote."${deps.synstructure."0.10.0".quote}".default = true; + syn = fold recursiveUpdate {} [ + { "${deps.synstructure."0.10.0".syn}"."extra-traits" = true; } + { "${deps.synstructure."0.10.0".syn}"."visit" = true; } + { "${deps.synstructure."0.10.0".syn}".default = true; } + ]; + synstructure."0.10.0".default = (f.synstructure."0.10.0".default or true); + unicode_xid."${deps.synstructure."0.10.0".unicode_xid}".default = true; + }) [ + (features_.proc_macro2."${deps."synstructure"."0.10.0"."proc_macro2"}" deps) + (features_.quote."${deps."synstructure"."0.10.0"."quote"}" deps) + (features_.syn."${deps."synstructure"."0.10.0"."syn"}" deps) + (features_.unicode_xid."${deps."synstructure"."0.10.0"."unicode_xid"}" deps) + ]; + + + crates.tempdir."0.3.7" = deps: { features?(features_.tempdir."0.3.7" deps {}) }: buildRustCrate { + crateName = "tempdir"; + version = "0.3.7"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0y53sxybyljrr7lh0x0ysrsa7p7cljmwv9v80acy3rc6n97g67vy"; + dependencies = mapFeatures features ([ + (crates."rand"."${deps."tempdir"."0.3.7"."rand"}" deps) + (crates."remove_dir_all"."${deps."tempdir"."0.3.7"."remove_dir_all"}" deps) + ]); + }; + features_.tempdir."0.3.7" = deps: f: updateFeatures f (rec { + rand."${deps.tempdir."0.3.7".rand}".default = true; + remove_dir_all."${deps.tempdir."0.3.7".remove_dir_all}".default = true; + tempdir."0.3.7".default = (f.tempdir."0.3.7".default or true); + }) [ + (features_.rand."${deps."tempdir"."0.3.7"."rand"}" deps) + (features_.remove_dir_all."${deps."tempdir"."0.3.7"."remove_dir_all"}" deps) + ]; + + + crates.termcolor."1.0.4" = deps: { features?(features_.termcolor."1.0.4" deps {}) }: buildRustCrate { + crateName = "termcolor"; + version = "1.0.4"; + authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; + sha256 = "0xydrjc0bxg08llcbcmkka29szdrfklk4vh6l6mdd67ajifqw1mv"; + dependencies = (if kernel == "windows" then mapFeatures features ([ + (crates."wincolor"."${deps."termcolor"."1.0.4"."wincolor"}" deps) + ]) else []); + }; + features_.termcolor."1.0.4" = deps: f: updateFeatures f (rec { + termcolor."1.0.4".default = (f.termcolor."1.0.4".default or true); + wincolor."${deps.termcolor."1.0.4".wincolor}".default = true; + }) [ + (features_.wincolor."${deps."termcolor"."1.0.4"."wincolor"}" deps) + ]; + + + crates.termion."1.5.1" = deps: { features?(features_.termion."1.5.1" deps {}) }: buildRustCrate { + crateName = "termion"; + version = "1.5.1"; + authors = [ "ticki <Ticki@users.noreply.github.com>" "gycos <alexandre.bury@gmail.com>" "IGI-111 <igi-111@protonmail.com>" ]; + sha256 = "02gq4vd8iws1f3gjrgrgpajsk2bk43nds5acbbb4s8dvrdvr8nf1"; + dependencies = (if !(kernel == "redox") then mapFeatures features ([ + (crates."libc"."${deps."termion"."1.5.1"."libc"}" deps) + ]) else []) + ++ (if kernel == "redox" then mapFeatures features ([ + (crates."redox_syscall"."${deps."termion"."1.5.1"."redox_syscall"}" deps) + (crates."redox_termios"."${deps."termion"."1.5.1"."redox_termios"}" deps) + ]) else []); + }; + features_.termion."1.5.1" = deps: f: updateFeatures f (rec { + libc."${deps.termion."1.5.1".libc}".default = true; + redox_syscall."${deps.termion."1.5.1".redox_syscall}".default = true; + redox_termios."${deps.termion."1.5.1".redox_termios}".default = true; + termion."1.5.1".default = (f.termion."1.5.1".default or true); + }) [ + (features_.libc."${deps."termion"."1.5.1"."libc"}" deps) + (features_.redox_syscall."${deps."termion"."1.5.1"."redox_syscall"}" deps) + (features_.redox_termios."${deps."termion"."1.5.1"."redox_termios"}" deps) + ]; + + + crates.textwrap."0.10.0" = deps: { features?(features_.textwrap."0.10.0" deps {}) }: buildRustCrate { + crateName = "textwrap"; + version = "0.10.0"; + authors = [ "Martin Geisler <martin@geisler.net>" ]; + sha256 = "1s8d5cna12smhgj0x2y1xphklyk2an1yzbadnj89p1vy5vnjpsas"; + dependencies = mapFeatures features ([ + (crates."unicode_width"."${deps."textwrap"."0.10.0"."unicode_width"}" deps) + ]); + }; + features_.textwrap."0.10.0" = deps: f: updateFeatures f (rec { + textwrap."0.10.0".default = (f.textwrap."0.10.0".default or true); + unicode_width."${deps.textwrap."0.10.0".unicode_width}".default = true; + }) [ + (features_.unicode_width."${deps."textwrap"."0.10.0"."unicode_width"}" deps) + ]; + + + crates.thread_local."0.3.6" = deps: { features?(features_.thread_local."0.3.6" deps {}) }: buildRustCrate { + crateName = "thread_local"; + version = "0.3.6"; + authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ]; + sha256 = "02rksdwjmz2pw9bmgbb4c0bgkbq5z6nvg510sq1s6y2j1gam0c7i"; + dependencies = mapFeatures features ([ + (crates."lazy_static"."${deps."thread_local"."0.3.6"."lazy_static"}" deps) + ]); + }; + features_.thread_local."0.3.6" = deps: f: updateFeatures f (rec { + lazy_static."${deps.thread_local."0.3.6".lazy_static}".default = true; + thread_local."0.3.6".default = (f.thread_local."0.3.6".default or true); + }) [ + (features_.lazy_static."${deps."thread_local"."0.3.6"."lazy_static"}" deps) + ]; + + + crates.time."0.1.40" = deps: { features?(features_.time."0.1.40" deps {}) }: buildRustCrate { + crateName = "time"; + version = "0.1.40"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0wgnbjamljz6bqxsd5axc4p2mmhkqfrryj4gf2yswjaxiw5dd01m"; + dependencies = mapFeatures features ([ + (crates."libc"."${deps."time"."0.1.40"."libc"}" deps) + ]) + ++ (if kernel == "redox" then mapFeatures features ([ + (crates."redox_syscall"."${deps."time"."0.1.40"."redox_syscall"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."time"."0.1.40"."winapi"}" deps) + ]) else []); + }; + features_.time."0.1.40" = deps: f: updateFeatures f (rec { + libc."${deps.time."0.1.40".libc}".default = true; + redox_syscall."${deps.time."0.1.40".redox_syscall}".default = true; + time."0.1.40".default = (f.time."0.1.40".default or true); + winapi = fold recursiveUpdate {} [ + { "${deps.time."0.1.40".winapi}"."minwinbase" = true; } + { "${deps.time."0.1.40".winapi}"."minwindef" = true; } + { "${deps.time."0.1.40".winapi}"."ntdef" = true; } + { "${deps.time."0.1.40".winapi}"."profileapi" = true; } + { "${deps.time."0.1.40".winapi}"."std" = true; } + { "${deps.time."0.1.40".winapi}"."sysinfoapi" = true; } + { "${deps.time."0.1.40".winapi}"."timezoneapi" = true; } + { "${deps.time."0.1.40".winapi}".default = true; } + ]; + }) [ + (features_.libc."${deps."time"."0.1.40"."libc"}" deps) + (features_.redox_syscall."${deps."time"."0.1.40"."redox_syscall"}" deps) + (features_.winapi."${deps."time"."0.1.40"."winapi"}" deps) + ]; + + + crates.toml."0.4.8" = deps: { features?(features_.toml."0.4.8" deps {}) }: buildRustCrate { + crateName = "toml"; + version = "0.4.8"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "1xm3chgsvi3qqi7vj8sb5xvnbfpkqyl4fiwh7y2cl6r4brwlmif1"; + dependencies = mapFeatures features ([ + (crates."serde"."${deps."toml"."0.4.8"."serde"}" deps) + ]); + }; + features_.toml."0.4.8" = deps: f: updateFeatures f (rec { + serde."${deps.toml."0.4.8".serde}".default = true; + toml."0.4.8".default = (f.toml."0.4.8".default or true); + }) [ + (features_.serde."${deps."toml"."0.4.8"."serde"}" deps) + ]; + + + crates.ucd_util."0.1.1" = deps: { features?(features_.ucd_util."0.1.1" deps {}) }: buildRustCrate { + crateName = "ucd-util"; + version = "0.1.1"; + authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; + sha256 = "02a8h3siipx52b832xc8m8rwasj6nx9jpiwfldw8hp6k205hgkn0"; + }; + features_.ucd_util."0.1.1" = deps: f: updateFeatures f (rec { + ucd_util."0.1.1".default = (f.ucd_util."0.1.1".default or true); + }) []; + + + crates.unicode_width."0.1.5" = deps: { features?(features_.unicode_width."0.1.5" deps {}) }: buildRustCrate { + crateName = "unicode-width"; + version = "0.1.5"; + authors = [ "kwantam <kwantam@gmail.com>" ]; + sha256 = "0886lc2aymwgy0lhavwn6s48ik3c61ykzzd3za6prgnw51j7bi4w"; + features = mkFeatures (features."unicode_width"."0.1.5" or {}); + }; + features_.unicode_width."0.1.5" = deps: f: updateFeatures f (rec { + unicode_width."0.1.5".default = (f.unicode_width."0.1.5".default or true); + }) []; + + + crates.unicode_xid."0.1.0" = deps: { features?(features_.unicode_xid."0.1.0" deps {}) }: buildRustCrate { + crateName = "unicode-xid"; + version = "0.1.0"; + authors = [ "erick.tryzelaar <erick.tryzelaar@gmail.com>" "kwantam <kwantam@gmail.com>" ]; + sha256 = "05wdmwlfzxhq3nhsxn6wx4q8dhxzzfb9szsz6wiw092m1rjj01zj"; + features = mkFeatures (features."unicode_xid"."0.1.0" or {}); + }; + features_.unicode_xid."0.1.0" = deps: f: updateFeatures f (rec { + unicode_xid."0.1.0".default = (f.unicode_xid."0.1.0".default or true); + }) []; + + + crates.utf8_ranges."1.0.1" = deps: { features?(features_.utf8_ranges."1.0.1" deps {}) }: buildRustCrate { + crateName = "utf8-ranges"; + version = "1.0.1"; + authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; + sha256 = "1s56ihd2c8ba6191078wivvv59247szaiszrh8x2rxqfsxlfrnpp"; + }; + features_.utf8_ranges."1.0.1" = deps: f: updateFeatures f (rec { + utf8_ranges."1.0.1".default = (f.utf8_ranges."1.0.1".default or true); + }) []; + + + crates.vcpkg."0.2.6" = deps: { features?(features_.vcpkg."0.2.6" deps {}) }: buildRustCrate { + crateName = "vcpkg"; + version = "0.2.6"; + authors = [ "Jim McGrath <jimmc2@gmail.com>" ]; + sha256 = "1ig6jqpzzl1z9vk4qywgpfr4hfbd8ny8frqsgm3r449wkc4n1i5x"; + }; + features_.vcpkg."0.2.6" = deps: f: updateFeatures f (rec { + vcpkg."0.2.6".default = (f.vcpkg."0.2.6".default or true); + }) []; + + + crates.vec_map."0.8.1" = deps: { features?(features_.vec_map."0.8.1" deps {}) }: buildRustCrate { + crateName = "vec_map"; + version = "0.8.1"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" "Jorge Aparicio <japaricious@gmail.com>" "Alexis Beingessner <a.beingessner@gmail.com>" "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon <aturon@mozilla.com>" "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood <csouth3@illinois.edu>" "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens <markus@m-siemens.de>" "Josh Branchaud <jbranchaud@gmail.com>" "Huon Wilson <dbau.pp@gmail.com>" "Corey Farwell <coref@rwell.org>" "Aaron Liblong <>" "Nick Cameron <nrc@ncameron.org>" "Patrick Walton <pcwalton@mimiga.net>" "Felix S Klock II <>" "Andrew Paseltiner <apaseltiner@gmail.com>" "Sean McArthur <sean.monstar@gmail.com>" "Vadim Petrochenkov <>" ]; + sha256 = "1jj2nrg8h3l53d43rwkpkikq5a5x15ms4rf1rw92hp5lrqhi8mpi"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."vec_map"."0.8.1" or {}); + }; + features_.vec_map."0.8.1" = deps: f: updateFeatures f (rec { + vec_map = fold recursiveUpdate {} [ + { "0.8.1".default = (f.vec_map."0.8.1".default or true); } + { "0.8.1".serde = + (f.vec_map."0.8.1".serde or false) || + (f.vec_map."0.8.1".eders or false) || + (vec_map."0.8.1"."eders" or false); } + ]; + }) []; + + + crates.version_check."0.1.5" = deps: { features?(features_.version_check."0.1.5" deps {}) }: buildRustCrate { + crateName = "version_check"; + version = "0.1.5"; + authors = [ "Sergio Benitez <sb@sergio.bz>" ]; + sha256 = "1yrx9xblmwbafw2firxyqbj8f771kkzfd24n3q7xgwiqyhi0y8qd"; + }; + features_.version_check."0.1.5" = deps: f: updateFeatures f (rec { + version_check."0.1.5".default = (f.version_check."0.1.5".default or true); + }) []; + + + crates.winapi."0.3.6" = deps: { features?(features_.winapi."0.3.6" deps {}) }: buildRustCrate { + crateName = "winapi"; + version = "0.3.6"; + authors = [ "Peter Atashian <retep998@gmail.com>" ]; + sha256 = "1d9jfp4cjd82sr1q4dgdlrkvm33zhhav9d7ihr0nivqbncr059m4"; + build = "build.rs"; + dependencies = (if kernel == "i686-pc-windows-gnu" then mapFeatures features ([ + (crates."winapi_i686_pc_windows_gnu"."${deps."winapi"."0.3.6"."winapi_i686_pc_windows_gnu"}" deps) + ]) else []) + ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ + (crates."winapi_x86_64_pc_windows_gnu"."${deps."winapi"."0.3.6"."winapi_x86_64_pc_windows_gnu"}" deps) + ]) else []); + features = mkFeatures (features."winapi"."0.3.6" or {}); + }; + features_.winapi."0.3.6" = deps: f: updateFeatures f (rec { + winapi."0.3.6".default = (f.winapi."0.3.6".default or true); + winapi_i686_pc_windows_gnu."${deps.winapi."0.3.6".winapi_i686_pc_windows_gnu}".default = true; + winapi_x86_64_pc_windows_gnu."${deps.winapi."0.3.6".winapi_x86_64_pc_windows_gnu}".default = true; + }) [ + (features_.winapi_i686_pc_windows_gnu."${deps."winapi"."0.3.6"."winapi_i686_pc_windows_gnu"}" deps) + (features_.winapi_x86_64_pc_windows_gnu."${deps."winapi"."0.3.6"."winapi_x86_64_pc_windows_gnu"}" deps) + ]; + + + crates.winapi_i686_pc_windows_gnu."0.4.0" = deps: { features?(features_.winapi_i686_pc_windows_gnu."0.4.0" deps {}) }: buildRustCrate { + crateName = "winapi-i686-pc-windows-gnu"; + version = "0.4.0"; + authors = [ "Peter Atashian <retep998@gmail.com>" ]; + sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp"; + build = "build.rs"; + }; + features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec { + winapi_i686_pc_windows_gnu."0.4.0".default = (f.winapi_i686_pc_windows_gnu."0.4.0".default or true); + }) []; + + + crates.winapi_util."0.1.1" = deps: { features?(features_.winapi_util."0.1.1" deps {}) }: buildRustCrate { + crateName = "winapi-util"; + version = "0.1.1"; + authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; + sha256 = "10madanla73aagbklx6y73r2g2vwq9w8a0qcghbbbpn9vfr6a95f"; + dependencies = (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."winapi_util"."0.1.1"."winapi"}" deps) + ]) else []); + }; + features_.winapi_util."0.1.1" = deps: f: updateFeatures f (rec { + winapi = fold recursiveUpdate {} [ + { "${deps.winapi_util."0.1.1".winapi}"."consoleapi" = true; } + { "${deps.winapi_util."0.1.1".winapi}"."errhandlingapi" = true; } + { "${deps.winapi_util."0.1.1".winapi}"."fileapi" = true; } + { "${deps.winapi_util."0.1.1".winapi}"."minwindef" = true; } + { "${deps.winapi_util."0.1.1".winapi}"."processenv" = true; } + { "${deps.winapi_util."0.1.1".winapi}"."std" = true; } + { "${deps.winapi_util."0.1.1".winapi}"."winbase" = true; } + { "${deps.winapi_util."0.1.1".winapi}"."wincon" = true; } + { "${deps.winapi_util."0.1.1".winapi}"."winerror" = true; } + { "${deps.winapi_util."0.1.1".winapi}".default = true; } + ]; + winapi_util."0.1.1".default = (f.winapi_util."0.1.1".default or true); + }) [ + (features_.winapi."${deps."winapi_util"."0.1.1"."winapi"}" deps) + ]; + + + crates.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: { features?(features_.winapi_x86_64_pc_windows_gnu."0.4.0" deps {}) }: buildRustCrate { + crateName = "winapi-x86_64-pc-windows-gnu"; + version = "0.4.0"; + authors = [ "Peter Atashian <retep998@gmail.com>" ]; + sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj"; + build = "build.rs"; + }; + features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec { + winapi_x86_64_pc_windows_gnu."0.4.0".default = (f.winapi_x86_64_pc_windows_gnu."0.4.0".default or true); + }) []; + + + crates.wincolor."1.0.1" = deps: { features?(features_.wincolor."1.0.1" deps {}) }: buildRustCrate { + crateName = "wincolor"; + version = "1.0.1"; + authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; + sha256 = "0gr7v4krmjba7yq16071rfacz42qbapas7mxk5nphjwb042a8gvz"; + dependencies = mapFeatures features ([ + (crates."winapi"."${deps."wincolor"."1.0.1"."winapi"}" deps) + (crates."winapi_util"."${deps."wincolor"."1.0.1"."winapi_util"}" deps) + ]); + }; + features_.wincolor."1.0.1" = deps: f: updateFeatures f (rec { + winapi = fold recursiveUpdate {} [ + { "${deps.wincolor."1.0.1".winapi}"."minwindef" = true; } + { "${deps.wincolor."1.0.1".winapi}"."wincon" = true; } + { "${deps.wincolor."1.0.1".winapi}".default = true; } + ]; + winapi_util."${deps.wincolor."1.0.1".winapi_util}".default = true; + wincolor."1.0.1".default = (f.wincolor."1.0.1".default or true); + }) [ + (features_.winapi."${deps."wincolor"."1.0.1"."winapi"}" deps) + (features_.winapi_util."${deps."wincolor"."1.0.1"."winapi_util"}" deps) + ]; + + +} diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index d93e0a5f56df..da3f0a59eb60 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -6,76 +6,97 @@ let inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; in { + cairo-rs = attrs: { + buildInputs = [ cairo ]; + }; + cargo = attrs: { buildInputs = [ openssl zlib curl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv ]; # TODO: buildRustCrate seems to use incorrect default inference crateBin = [ { name = "cargo"; path = "src/bin/cargo.rs"; } ]; }; + cargo-vendor = attrs: { buildInputs = [ openssl zlib curl ]; # TODO: this defaults to cargo_vendor; needs to be cargo-vendor to # be considered a cargo subcommand. crateBin = [ { name = "cargo-vendor"; path = "src/main.rs"; } ]; }; + curl-sys = attrs: { buildInputs = [ pkgconfig zlib curl ]; propagatedBuildInputs = [ curl zlib ]; extraLinkFlags = ["-L${zlib.out}/lib"]; }; + + dbus = attrs: { + buildInputs = [ pkgconfig dbus ]; + }; + + gobject-sys = attrs: { + buildInputs = [ dbus-glib ]; + }; + + gio-sys = attrs: { + buildInputs = [ dbus-glib ]; + }; + + gdk-pixbuf-sys = attrs: { + buildInputs = [ dbus-glib ]; + }; + + gdk-pixbuf = attrs: { + buildInputs = [ gdk_pixbuf ]; + }; + libgit2-sys = attrs: { LIBGIT2_SYS_USE_PKG_CONFIG = true; buildInputs = [ pkgconfig openssl zlib libgit2 ]; }; + libsqlite3-sys = attrs: { buildInputs = [ pkgconfig sqlite ]; }; + libssh2-sys = attrs: { buildInputs = [ pkgconfig openssl zlib libssh2 ]; }; + + libdbus-sys = attrs: { + buildInputs = [ pkgconfig dbus ]; + }; + openssl = attrs: { buildInputs = [ openssl ]; }; + openssl-sys = attrs: { buildInputs = [ pkgconfig openssl ]; }; - dbus = attrs: { - buildInputs = [ pkgconfig dbus ]; - }; - libdbus-sys = attrs: { - buildInputs = [ pkgconfig dbus ]; - }; - gobject-sys = attrs: { - buildInputs = [ dbus-glib ]; - }; - gio-sys = attrs: { - buildInputs = [ dbus-glib ]; - }; - gdk-pixbuf-sys = attrs: { - buildInputs = [ dbus-glib ]; - }; - gdk-pixbuf = attrs: { - buildInputs = [ gdk_pixbuf ]; + pq-sys = attr: { + buildInputs = [ pkgconfig postgresql ]; }; + rink = attrs: { buildInputs = [ gmp ]; crateBin = [ { name = "rink"; path = "src/bin/rink.rs"; } ]; }; - cairo-rs = attrs: { - buildInputs = [ cairo ]; + + security-framework-sys = attr: { + propagatedBuildInputs = [ Security ]; }; - xcb = attrs: { - buildInputs = [ python3 ]; + + serde_derive = attrs: { + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; }; thrussh-libsodium = attrs: { buildInputs = [ pkgconfig libsodium ]; }; - pq-sys = attr: { - buildInputs = [ pkgconfig postgresql ]; - }; - security-framework-sys = attr: { - propagatedBuildInputs = [ Security ]; + + xcb = attrs: { + buildInputs = [ python3 ]; }; } diff --git a/pkgs/build-support/setup-hooks/breakpoint-hook.sh b/pkgs/build-support/setup-hooks/breakpoint-hook.sh new file mode 100644 index 000000000000..6bef786ac3ac --- /dev/null +++ b/pkgs/build-support/setup-hooks/breakpoint-hook.sh @@ -0,0 +1,9 @@ +breakpointHook() { + local red='\033[0;31m' + local no_color='\033[0m' + + echo -e "${red}build failed in ${curPhase} with exit code ${exitCode}${no_color}" + printf "To attach install cntr and run the following command as root:\n\n" + sh -c "echo ' cntr attach -t command cntr-${out}'; while true; do sleep 99999999; done" +} +failureHooks+=(breakpointHook) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 079fccadfcb1..0be9abba71d6 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/70f02ad82349a18e1eff41eea4949be532486f7b.tar.gz"; - sha256 = "1ajqybsl8hfzbhziww57zp9a8kgypj96ngxrargk916v3xpf3x15"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/420a405e4dbccd78b2a471b632b9fe1a1e04502b.tar.gz"; + sha256 = "01vdbp1yh2s0afijz9ap4590mlpiica7l6k0mpfc0jwzymn9w86n"; } diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix index f0ad2c43a9c8..b5293c6d341e 100644 --- a/pkgs/data/misc/wireless-regdb/default.nix +++ b/pkgs/data/misc/wireless-regdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "wireless-regdb-${version}"; - version = "2018.09.07"; + version = "2018.10.24"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/wireless-regdb/${name}.tar.xz"; - sha256 = "0nnn10pk94qnrdy55pwcr7506bxdsywa88a3shgqxsd3y53q2sx3"; + sha256 = "05lixkdzy7f3wpan6svh1n9f70rs0kfw6hl6p34sl8bxqxd88ghd"; }; dontBuild = true; diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix index ce596ec628ec..1313527e20f1 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "adwaita-icon-theme-${version}"; - version = "3.28.0"; + version = "3.30.0"; src = fetchurl { url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0l114ildlb3lz3xymfxxi0wpr2x21rd3cg8slb8jyxynzwfqrbks"; + sha256 = "0jz6wiq2yw5jda56jgi1dys7hlvzk1a49xql7lccrrm3fj8p41li"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/libgxps/default.nix b/pkgs/desktops/gnome-3/core/libgxps/default.nix index c9312c228829..68193bad5833 100644 --- a/pkgs/desktops/gnome-3/core/libgxps/default.nix +++ b/pkgs/desktops/gnome-3/core/libgxps/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobjectIntrospection, cairo -, libarchive, freetype, libjpeg, libtiff, gnome3 +, libarchive, freetype, libjpeg, libtiff, gnome3, fetchpatch }: let @@ -13,6 +13,19 @@ in stdenv.mkDerivation rec { sha256 = "412b1343bd31fee41f7204c47514d34c563ae34dafa4cc710897366bd6cd0fae"; }; + patches = [ + (fetchpatch { + name = "CVE-2018-10733-1.patch"; + url = https://gitlab.gnome.org/GNOME/libgxps/commit/b458226e162fe1ffe7acb4230c114a52ada5131b.patch; + sha256 = "0pqg9iwkg69qknj7vkgn26c32fndy55byxivd4km0vjfhfyx69hd"; + }) + (fetchpatch { + name = "CVE-2018-10733-2.patch"; + url = https://gitlab.gnome.org/GNOME/libgxps/commit/133fe2a96e020d4ca65c6f64fb28a404050ebbfd.patch; + sha256 = "19n01x8zs05wf801mkz4mypvapph7h941md3hr3rj0ry6r88pkir"; + }) + ]; + nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ]; buildInputs = [ glib cairo freetype libjpeg libtiff ]; propagatedBuildInputs = [ libarchive ]; diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix index 566245c4441d..1659ebaae656 100644 --- a/pkgs/desktops/mate/python-caja/default.nix +++ b/pkgs/desktops/mate/python-caja/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "python-caja-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0bcgg3p01zik53l5ns48575yw0k88fyc044yvp9fvwy5jqqg1ykk"; + sha256 = "16y9xri92x7a40db2qakf20c80a6vqy21nwnjhwrki5rqk7nwbgx"; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix new file mode 100644 index 000000000000..c2c13649f885 --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix @@ -0,0 +1,59 @@ +{ name +, url +, sha256 +}: + +{ swingSupport ? true # not used for now +, stdenv +, fetchurl +}: + +let result = stdenv.mkDerivation rec { + inherit name; + + src = fetchurl { + inherit url sha256; + }; + + # See: https://github.com/NixOS/patchelf/issues/10 + dontStrip = 1; + + installPhase = '' + cd .. + + mv $sourceRoot $out + + rm -rf $out/Home/demo + + # Remove some broken manpages. + rm -rf $out/Home/man/ja* + + # for backward compatibility + ln -s $out/Contents/Home $out/jre + + ln -s $out/Contents/Home/* $out/ + + mkdir -p $out/nix-support + + # Set JAVA_HOME automatically. + cat <<EOF >> $out/nix-support/setup-hook + if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi + EOF + ''; + + # FIXME: use multiple outputs or return actual JRE package + passthru.jre = result; + + passthru.home = result; + + # for backward compatibility + passthru.architecture = ""; + + meta = with stdenv.lib; { + license = licenses.gpl2Classpath; + description = "AdoptOpenJDK, prebuilt OpenJDK binary"; + platforms = [ "x86_64-darwin" ]; # some inherit jre.meta.platforms + maintainers = with stdenv.lib.maintainers; [ taku0 ]; + }; + +}; in result diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix new file mode 100644 index 000000000000..cf38ca9eaebe --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix @@ -0,0 +1,119 @@ +{ name +, url +, sha256 +}: + +{ swingSupport ? true +, stdenv +, fetchurl +, file +, xorg ? null +, glib +, libxml2 +, ffmpeg_2 +, libxslt +, libGL +, freetype +, fontconfig +, gtk2 +, pango +, cairo +, alsaLib +, atk +, gdk_pixbuf +, zlib +, elfutils +}: + +assert swingSupport -> xorg != null; + +let + rSubPaths = [ + "lib/jli" + "lib/server" + "lib/compressedrefs" # OpenJ9 + "lib/j9vm" # OpenJ9 + "lib" + ]; + + libraries = [ + stdenv.cc.libc glib libxml2 ffmpeg_2 libxslt libGL + xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf + atk zlib elfutils + ] ++ (stdenv.lib.optionals swingSupport [ + xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt + xorg.libXrender + stdenv.cc.cc + ]); +in + +let result = stdenv.mkDerivation rec { + inherit name; + + src = fetchurl { + inherit url sha256; + }; + + nativeBuildInputs = [ file ]; + + # See: https://github.com/NixOS/patchelf/issues/10 + dontStrip = 1; + + installPhase = '' + cd .. + + # Set PaX markings + exes=$(file $sourceRoot/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') + for file in $exes; do + paxmark m "$file" + # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. + ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''} + done + + mv $sourceRoot $out + + rm -rf $out/demo + + # Remove some broken manpages. + rm -rf $out/man/ja* + + # for backward compatibility + ln -s $out $out/jre + + mkdir -p $out/nix-support + + # Set JAVA_HOME automatically. + cat <<EOF >> $out/nix-support/setup-hook + if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi + EOF + ''; + + postFixup = '' + rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$out/${a}") rSubPaths)}" + + # set all the dynamic linkers + find $out -type f -perm -0100 \ + -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "$rpath" {} \; + + find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; + ''; + + rpath = stdenv.lib.strings.makeLibraryPath libraries; + + # FIXME: use multiple outputs or return actual JRE package + passthru.jre = result; + + passthru.home = result; + + # for backward compatibility + passthru.architecture = ""; + + meta = with stdenv.lib; { + license = licenses.gpl2Classpath; + description = "AdoptOpenJDK, prebuilt OpenJDK binary"; + platforms = [ "x86_64-linux" ]; # some inherit jre.meta.platforms + maintainers = with stdenv.lib.maintainers; [ taku0 ]; + }; + +}; in result diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix new file mode 100644 index 000000000000..77d9d85aaa93 --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix @@ -0,0 +1,26 @@ +let + version = "11"; + buildNumber = "28"; + baseUrl = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}"; + makePackage = { packageType, vmType, sha256 }: import ./jdk-darwin-base.nix { + name = if packageType == "jdk" + then + "adoptopenjdk-${vmType}-bin-${version}" + else + "adoptopenjdk-${packageType}-${vmType}-bin-${version}"; + url = "${baseUrl}/OpenJDK${version}-${packageType}_x64_mac_${vmType}_${version}_${buildNumber}.tar.gz"; + inherit sha256; + }; +in +{ + jdk-hotspot = makePackage { + packageType = "jdk"; + vmType = "hotspot"; + sha256 = "ca0ec49548c626904061b491cae0a29b9b4b00fb34d8973dc217e10ab21fb0f3"; + }; + jre-hotspot = makePackage { + packageType = "jre"; + vmType = "hotspot"; + sha256 = "ef4dbfe5aed6ab2278fcc14db6cc73abbaab56e95f6ebb023790a7ebc6d7f30c"; + }; +} diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix new file mode 100644 index 000000000000..6e00782c3918 --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix @@ -0,0 +1,36 @@ +let + version = "11"; + buildNumber = "28"; + baseUrl = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}"; + makePackage = { packageType, vmType, sha256 }: import ./jdk-linux-base.nix { + name = if packageType == "jdk" + then + "adoptopenjdk-${vmType}-bin-${version}" + else + "adoptopenjdk-${packageType}-${vmType}-bin-${version}"; + url = "${baseUrl}/OpenJDK${version}-${packageType}_x64_linux_${vmType}_${version}_${buildNumber}.tar.gz"; + inherit sha256; + }; +in +{ + jdk-hotspot = makePackage { + packageType = "jdk"; + vmType = "hotspot"; + sha256 = "e1e18fc9ce2917473da3e0acb5a771bc651f600c0195a3cb40ef6f22f21660af"; + }; + jre-hotspot = makePackage { + packageType = "jre"; + vmType = "hotspot"; + sha256 = "346448142d46c6e51d0fadcaadbcde31251d7678922ec3eb010fcb1b6e17804c"; + }; + jdk-openj9 = makePackage { + packageType = "jdk"; + vmType = "openj9"; + sha256 = "fd77f22eb74078bcf974415abd888296284d2ceb81dbaca6ff32f59416ebc57f"; + }; + jre-openj9 = makePackage { + packageType = "jre"; + vmType = "openj9"; + sha256 = "83a7c95e6b2150a739bdd5e8a6fe0315904fd13d8867c95db67c0318304a2c42"; + }; +} diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 0648a245a4c8..51cea9810bc9 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, fetchurl, makeWrapper , gmp, openssl, readline, tzdata, libxml2, libyaml -, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which }: +, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib }: let binaryVersion = "0.26.0"; @@ -57,7 +57,7 @@ let buildInputs = [ boehmgc libatomic_ops pcre libevent - llvm + llvm zlib openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/development/compilers/dotnet/sdk/default.nix b/pkgs/development/compilers/dotnet/sdk/default.nix index eb7a1e737193..9970fd9b33d3 100644 --- a/pkgs/development/compilers/dotnet/sdk/default.nix +++ b/pkgs/development/compilers/dotnet/sdk/default.nix @@ -12,14 +12,14 @@ let rpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc libunwind libuuid icu openssl zlib curl ]; in stdenv.mkDerivation rec { - version = "2.1.402"; - netCoreVersion = "2.1.4"; + version = "2.1.403"; + netCoreVersion = "2.1.5"; name = "dotnet-sdk-${version}"; src = fetchurl { url = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/dotnet-sdk-${version}-linux-x64.tar.gz"; # use sha512 from the download page - sha512 = "dd7f15a8202ffa2a435b7289865af4483bb0f642ffcf98a1eb10464cb9c51dd1d771efbb6120f129fe9666f62707ba0b7c476cf1fd3536d3a29329f07456de48"; + sha512 = "903a8a633aea9211ba36232a2decb3b34a59bb62bc145a0e7a90ca46dd37bb6c2da02bcbe2c50c17e08cdff8e48605c0f990786faf1f06be1ea4a4d373beb8a9"; }; unpackPhase = '' diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix index 62ea39791b90..2363953e35b8 100644 --- a/pkgs/development/compilers/ghc/8.6.1.nix +++ b/pkgs/development/compilers/ghc/8.6.1.nix @@ -215,7 +215,7 @@ stdenv.mkDerivation (rec { inherit enableShared; # Our Cabal compiler name - haskellCompilerName = "ghc-8.4.3"; + haskellCompilerName = "ghc-8.6.1"; }; meta = { diff --git a/pkgs/development/compilers/mono/4.0.nix b/pkgs/development/compilers/mono/4.0.nix deleted file mode 100644 index 892ae99abaf5..000000000000 --- a/pkgs/development/compilers/mono/4.0.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ callPackage, Foundation, libobjc }: -callPackage ./generic.nix (rec { - inherit Foundation libobjc; - version = "4.0.4.1"; - sha256 = "1ydw9l89apc9p7xr5mdzy0h97g2q6v243g82mxswfc2rrqhfs4gd"; - meta = { - knownVulnerabilities = [ "CVE-2009-0689" ]; - }; -}) diff --git a/pkgs/development/compilers/mono/4.4.nix b/pkgs/development/compilers/mono/4.4.nix deleted file mode 100644 index 9a3ccd1fd861..000000000000 --- a/pkgs/development/compilers/mono/4.4.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ callPackage, Foundation, libobjc }: - -callPackage ./generic.nix (rec { - inherit Foundation libobjc; - version = "4.4.2.11"; - sha256 = "0cxnypw1j7s253wr5hy05k42ghgg2s9qibp10kndwnp5bv12q34h"; - enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65565737 -}) diff --git a/pkgs/development/compilers/mono/generic-cmake.nix b/pkgs/development/compilers/mono/generic-cmake.nix index 9665f5006ede..12f833f55255 100644 --- a/pkgs/development/compilers/mono/generic-cmake.nix +++ b/pkgs/development/compilers/mono/generic-cmake.nix @@ -86,7 +86,5 @@ stdenv.mkDerivation rec { platforms = with platforms; darwin ++ linux; maintainers = with maintainers; [ thoughtpolice obadz vrthra ]; license = licenses.free; # Combination of LGPL/X11/GPL ? - # 2018-08-21: mono 5.x is broken on aarch64 since at least 2017-07-06 - broken = stdenv.isAarch64 && (versionAtLeast version "5"); }; } diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 09677a47ab2a..d90ddcaacfb0 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation ( rec { name = "ponyc-${version}"; - version = "0.24.4"; + version = "0.25.0"; src = fetchFromGitHub { owner = "ponylang"; repo = "ponyc"; rev = version; - sha256 = "1p75h1ldi9iskqkwic5h426cwi45042p3agh9sdl6gld9s7lc9a6"; + sha256 = "0ghmjp03q7k58yzfkvnl05xc2i2gmgnzpj3hs6g7ls4ny8n3i6hv"; }; buildInputs = [ llvm makeWrapper which ]; diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 81c935fc421f..0832d14992d1 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -4,18 +4,20 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-reason-${version}"; - version = "3.3.3"; + version = "3.3.7"; src = fetchFromGitHub { owner = "facebook"; repo = "reason"; - rev = "fefe5e4db3a54a7946c2220ee037dd2f407011c9"; - sha256 = "1x0dbacgq9pa36zgzwrc0gm14wbb6v27y9bf7wcwk55a1ck0am18"; + rev = "4d20e5b535c29c5ef1283e65958b32996e449e5a"; + sha256 = "0f3pb61wg58g8f3wcnp1h4gpmnwmp7bq0cnqdfwldmh9cs0dqyfk"; }; + nativeBuildInputs = [ makeWrapper ]; + propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ]; - buildInputs = [ makeWrapper ocaml findlib dune utop menhir ]; + buildInputs = [ ocaml findlib dune utop menhir ]; buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index 55348c5795ad..e738dd7acaed 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -3,16 +3,16 @@ let # Note: the version MUST be one version prior to the version we're # building - version = "1.28.0"; + version = "1.29.2"; - # fetch hashes by running `print-hashes.sh 1.24.1` + # fetch hashes by running `print-hashes.sh 1.29.2` hashes = { - i686-unknown-linux-gnu = "de7cdb4e665e897ea9b10bf6fd545f900683296456d6a11d8510397bb330455f"; - x86_64-unknown-linux-gnu = "2a1390340db1d24a9498036884e6b2748e9b4b057fc5219694e298bdaa37b810"; - armv7-unknown-linux-gnueabihf = "346558d14050853b87049e5e1fbfae0bf0360a2f7c57433c6985b1a879c349a2"; - aarch64-unknown-linux-gnu = "9b6fbcee73070332c811c0ddff399fa31965bec62ef258656c0c90354f6231c1"; - i686-apple-darwin = "752e2c9182e057c4a54152d1e0b3949482c225d02bb69d9d9a4127dc2a65fb68"; - x86_64-apple-darwin = "5d7a70ed4701fe9410041c1eea025c95cad97e5b3d8acc46426f9ac4f9f02393"; + i686-unknown-linux-gnu = "fd67338c32348fc0cf09dd066975acc221e062fdc3b052912baef93b39a0b27e"; + x86_64-unknown-linux-gnu = "e9809825c546969a9609ff94b2793c9107d7d9bed67d557ed9969e673137e8d8"; + armv7-unknown-linux-gnueabihf = "943ee757d96be97baccb84b0c2a5da368f8f3adf082805b0f0323240e80975c0"; + aarch64-unknown-linux-gnu = "e11461015ca7106ef8ebf00859842bf4be518ee170226cb8eedaaa666946509f"; + i686-apple-darwin = "aadec39efcbc476e00722b527dcc587003ab05194efd06ba1b91c1e0f7512d3f"; + x86_64-apple-darwin = "63f54e3013406b39fcb5b84bcf5e8ce85860d0b97a1e156700e467bf5fb5d5f2"; }; platform = diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 25a71965e0b4..02ea7ebbbfbf 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,13 +1,10 @@ { stdenv, file, curl, pkgconfig, python, openssl, cmake, zlib -, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2, darwin +, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2 +, CoreFoundation, Security , version , patches ? [] , src }: -let - inherit (darwin.apple_sdk.frameworks) CoreFoundation; -in - rustPlatform.buildRustPackage rec { name = "cargo-${version}"; inherit version src patches; @@ -24,7 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cacert file curl python openssl cmake zlib makeWrapper libgit2 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ]; LIBGIT2_SYS_USE_PKG_CONFIG=1; diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 7d785093f9b3..a925127596d5 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -1,4 +1,5 @@ { stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm, fetchurl +, CoreFoundation, Security , targets ? [] , targetToolchains ? [] , targetPatches ? [] @@ -6,11 +7,11 @@ let rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); - version = "1.29.1"; - cargoVersion = "1.29.1"; + version = "1.30.0"; + cargoVersion = "1.30.0"; src = fetchurl { url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; - sha256 = "0jd3c57x3yndizns4pb68nh25si47agfmrdvf9nwwsyfcs5p5c7i"; + sha256 = "1vh8q5i273xyjvpipqisny11iz0xfgz30cgjr7068nx5rhzsh2yd"; }; in rec { rustc = callPackage ./rustc.nix { @@ -44,8 +45,7 @@ in rec { cargo = callPackage ./cargo.nix rec { version = cargoVersion; - inherit src; - inherit stdenv; + inherit src stdenv CoreFoundation Security; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo }; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index a054ed0eb557..decf14a32948 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -92,15 +92,15 @@ stdenv.mkDerivation { #[ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+ # Disable fragile tests. - rm -vr src/test/run-make/linker-output-non-utf8 || true - rm -vr src/test/run-make/issue-26092 || true + rm -vr src/test/run-make-fulldeps/linker-output-non-utf8 || true + rm -vr src/test/run-make-fulldeps/issue-26092 || true # Remove test targeted at LLVM 3.9 - https://github.com/rust-lang/rust/issues/36835 - rm -vr src/test/run-pass/issue-36023.rs || true + rm -vr src/test/ui/run-pass/issue-36023.rs || true # Disable test getting stuck on hydra - possible fix: # https://reviews.llvm.org/rL281650 - rm -vr src/test/run-pass/issue-36474.rs || true + rm -vr src/test/ui/run-pass/issue-36474.rs || true # On Hydra: `TcpListener::bind(&addr)`: Address already in use (os error 98)' sed '/^ *fn fast_rebind()/i#[ignore]' -i src/libstd/net/tcp.rs @@ -116,18 +116,18 @@ stdenv.mkDerivation { # Disable all lldb tests. # error: Can't run LLDB test because LLDB's python path is not set rm -vr src/test/debuginfo/* - rm -v src/test/run-pass/backtrace-debuginfo.rs + rm -v src/test/run-pass/backtrace-debuginfo.rs || true # error: No such file or directory - rm -v src/test/run-pass/issue-45731.rs + rm -v src/test/ui/run-pass/issues/issue-45731.rs || true # Disable tests that fail when sandboxing is enabled. substituteInPlace src/libstd/sys/unix/ext/net.rs \ --replace '#[test]' '#[test] #[ignore]' substituteInPlace src/test/run-pass/env-home-dir.rs \ --replace 'home_dir().is_some()' true - rm -v src/test/run-pass/fds-are-cloexec.rs # FIXME: pipes? - rm -v src/test/run-pass/sync-send-in-std.rs # FIXME: ??? + rm -v src/test/run-pass/fds-are-cloexec.rs || true # FIXME: pipes? + rm -v src/test/ui/run-pass/threads-sendsync/sync-send-in-std.rs || true # FIXME: ??? ''; # rustc unfortunately need cmake for compiling llvm-rt but doesn't diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 3faa4c268ac0..0e092473bd52 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -103,6 +103,7 @@ go.stdenv.mkDerivation ( '') + '' export GOPATH=$NIX_BUILD_TOP/go:$GOPATH + export GOCACHE=$TMPDIR/go-cache runHook postConfigure ''; @@ -193,9 +194,6 @@ go.stdenv.mkDerivation ( find $bin/bin -type f -exec ${removeExpr removeReferences} '{}' + || true ''; - # Disable go cache, which is not reused in nix anyway - GOCACHE = "off"; - shellHook = '' d=$(mktemp -d "--suffix=-$name") '' + toString (map (dep: '' diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2cb95a397c6b..33f498d922b0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1147,9 +1147,6 @@ self: super: { arbtt = doJailbreak super.arbtt; - # https://github.com/yesodweb/yesod/issues/1563 - yesod-core = self.yesod-core_1_6_8_1; - # https://github.com/danfran/cabal-macosx/issues/13 cabal-macosx = dontCheck super.cabal-macosx; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 8d0669ca2acb..213651405f35 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -56,8 +56,19 @@ self: super: { }; in appendPatch super.hadoop-rpc patch; - # Version 1.9.1 needs Cabal 2.4.x or later, so - # we use the one from the ghc-8.6.1 package set. - stack = markBroken super.stack; + # stack-1.9.1 needs Cabal 2.4.x, a recent version of hpack, and a non-recent + # version of yaml. Go figure. We avoid overrideScope here because using it to + # change Cabal would re-compile every single package instead of just those + # that have it as an actual library dependency. The explicit overrides are + # more verbose but friendlier for Hydra. + stack = (doJailbreak super.stack).override { + Cabal = self.Cabal_2_4_0_1; + hpack = self.hpack_0_31_0.override { Cabal = self.Cabal_2_4_0_1; }; + yaml = self.yaml_0_11_0_0; + hackage-security = self.hackage-security.override { Cabal = self.Cabal_2_4_0_1; }; + }; + hpack_0_31_0 = super.hpack_0_31_0.override { + yaml = self.yaml_0_11_0_0; + }; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index ca2c8849dc64..61f188aeddbc 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -90,7 +90,6 @@ self: super: { data-clist = doJailbreak super.data-clist; # won't cope with QuickCheck 2.12.x Diff = dontCheck super.Diff; http-api-data = doJailbreak super.http-api-data; - lucid = doJailbreak super.lucid; persistent-sqlite = dontCheck super.persistent-sqlite; psqueues = dontCheck super.psqueues; # won't cope with QuickCheck 2.12.x system-fileio = dontCheck super.system-fileio; # avoid dependency on broken "patience" @@ -109,10 +108,7 @@ self: super: { # https://github.com/skogsbaer/HTF/issues/69 HTF = markBrokenVersion "0.13.2.4" super.HTF; - # https://github.com/jgm/pandoc-types/issues/52 - pandoc-types = doJailbreak super.pandoc-types; - - # + # https://github.com/jgm/skylighting/issues/55 skylighting-core = dontCheck super.skylighting-core; # https://github.com/joelburget/easytest/issues/12 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 8b469e6c0f5e..b5f5e1f3675c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -45,7 +45,7 @@ default-package-overrides: - base-compat-batteries ==0.10.1 # Newer versions don't work in LTS-12.x - cassava-megaparsec < 2 - # LTS Haskell 12.13 + # LTS Haskell 12.14 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -78,7 +78,7 @@ default-package-overrides: - alarmclock ==0.5.0.2 - alerts ==0.1.0.0 - alex ==3.2.4 - - alg ==0.2.7.0 + - alg ==0.2.8.0 - algebra ==4.3.1 - algebraic-graphs ==0.2 - Allure ==0.8.3.0 @@ -233,7 +233,7 @@ default-package-overrides: - base64-bytestring ==1.0.0.1 - base64-bytestring-type ==1 - base64-string ==0.2 - - base-compat ==0.10.4 + - base-compat ==0.10.5 - base-compat-batteries ==0.10.1 - basement ==0.0.8 - base-orphans ==0.7 @@ -253,7 +253,7 @@ default-package-overrides: - bimap ==0.3.3 - bimap-server ==0.1.0.1 - binary-bits ==0.5 - - binary-conduit ==1.3 + - binary-conduit ==1.3.1 - binary-ext ==2.0.4 - binary-ieee754 ==0.1.0.0 - binary-list ==1.1.1.2 @@ -335,7 +335,7 @@ default-package-overrides: - Cabal ==2.2.0.1 - cabal2spec ==2.1.1 - cabal-doctest ==1.0.6 - - cabal-rpm ==0.12.5 + - cabal-rpm ==0.12.6 - cache ==0.1.1.1 - cachix ==0.1.2 - cachix-api ==0.1.0.2 @@ -404,7 +404,7 @@ default-package-overrides: - clr-marshal ==0.2.0.0 - clumpiness ==0.17.0.0 - ClustalParser ==1.2.3 - - cmark-gfm ==0.1.5 + - cmark-gfm ==0.1.6 - cmdargs ==0.10.20 - code-builder ==0.1.3 - codec ==0.2.1 @@ -461,7 +461,7 @@ default-package-overrides: - contravariant ==1.4.1 - contravariant-extras ==0.3.4 - control-bool ==0.2.1 - - control-dsl ==0.2.1.1 + - control-dsl ==0.2.1.3 - control-monad-free ==0.6.2 - control-monad-omega ==0.3.1 - convertible ==1.1.1.0 @@ -486,7 +486,7 @@ default-package-overrides: - crypto-cipher-tests ==0.0.11 - crypto-cipher-types ==0.0.9 - cryptocompare ==0.1.1 - - crypto-enigma ==0.0.2.13 + - crypto-enigma ==0.0.2.14 - cryptohash ==0.11.9 - cryptohash-cryptoapi ==0.1.4 - cryptohash-md5 ==0.11.100.1 @@ -576,7 +576,7 @@ default-package-overrides: - dhall ==1.15.1 - dhall-bash ==1.0.15 - dhall-json ==1.2.3 - - dhall-text ==1.0.12 + - dhall-text ==1.0.13 - di ==1.0.1 - diagrams ==1.4 - diagrams-builder ==0.8.0.3 @@ -659,7 +659,7 @@ default-package-overrides: - eliminators ==0.4.1 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - - email-validate ==2.3.2.7 + - email-validate ==2.3.2.8 - enclosed-exceptions ==1.0.3 - entropy ==0.4.1.3 - enummapset ==0.5.2.2 @@ -702,7 +702,7 @@ default-package-overrides: - exp-pairs ==0.1.6.0 - extensible ==0.4.9 - extensible-exceptions ==0.1.1.4 - - extra ==1.6.12 + - extra ==1.6.13 - extractable-singleton ==0.0.1 - extrapolate ==0.3.3 - facts ==0.0.1.0 @@ -784,7 +784,7 @@ default-package-overrides: - fuzzcheck ==0.1.1 - fuzzy-dates ==0.1.1.1 - fuzzyset ==0.1.0.6 - - gauge ==0.2.3 + - gauge ==0.2.4 - gc ==0.0.2 - gd ==3000.7.3 - gdax ==0.6.0.0 @@ -896,7 +896,7 @@ default-package-overrides: - hamtsolo ==1.0.3 - HandsomeSoup ==0.4.2 - handwriting ==0.1.0.3 - - hapistrano ==0.3.6.0 + - hapistrano ==0.3.6.1 - happstack-server ==7.5.1.1 - happy ==1.19.9 - hasbolt ==0.1.3.0 @@ -982,7 +982,7 @@ default-package-overrides: - hmpfr ==0.4.4 - Hoed ==0.5.1 - hoopl ==3.10.2.2 - - hOpenPGP ==2.7.3 + - hOpenPGP ==2.7.4.1 - hopenpgp-tools ==0.21.2 - hopfli ==0.2.2.1 - hostname ==1.0 @@ -1004,8 +1004,8 @@ default-package-overrides: - hsdns ==1.7.1 - hsebaysdk ==0.4.0.0 - hsemail ==2 - - hset ==2.2.0 - HSet ==0.0.1 + - hset ==2.2.0 - hsexif ==0.6.1.6 - hs-functors ==0.1.3.0 - hs-GeoIP ==0.3 @@ -1044,7 +1044,7 @@ default-package-overrides: - htaglib ==1.2.0 - HTF ==0.13.2.4 - html ==1.0.1.2 - - html-conduit ==1.3.1 + - html-conduit ==1.3.2 - html-email-validate ==0.2.0.0 - html-entities ==1.1.4.2 - html-entity-map ==0.1.0.0 @@ -1118,7 +1118,7 @@ default-package-overrides: - Imlib ==0.1.2 - immortal ==0.3 - include-file ==0.1.0.3 - - incremental-parser ==0.3.1.1 + - incremental-parser ==0.3.2 - indentation-core ==0.0.0.2 - indentation-parsec ==0.0.0.2 - indents ==0.5.0.0 @@ -1136,7 +1136,7 @@ default-package-overrides: - integration ==0.2.1 - intern ==0.9.2 - interpolate ==0.2.0 - - interpolatedstring-perl6 ==1.0.0 + - interpolatedstring-perl6 ==1.0.1 - interpolation ==0.1.0.3 - IntervalMap ==0.6.0.0 - intervals ==0.8.1 @@ -1154,7 +1154,7 @@ default-package-overrides: - io-streams-haproxy ==1.0.0.2 - ip ==1.3.0 - ip6addr ==1.0.0 - - iproute ==1.7.5 + - iproute ==1.7.6 - IPv6Addr ==1.1.1 - IPv6DB ==0.3.1 - ipython-kernel ==0.9.1.0 @@ -1228,7 +1228,7 @@ default-package-overrides: - lawful ==0.1.0.0 - lazyio ==0.1.0.4 - lca ==0.3.1 - - leancheck ==0.7.5 + - leancheck ==0.7.7 - leapseconds-announced ==2017.1.0.1 - learn-physics ==0.6.3 - lens ==4.16.1 @@ -1283,7 +1283,7 @@ default-package-overrides: - loop ==0.3.0 - lrucache ==1.2.0.0 - lrucaching ==0.3.3 - - lucid ==2.9.10 + - lucid ==2.9.11 - lucid-extras ==0.1.0.1 - lxd-client-config ==0.1.0.1 - lz4 ==0.2.3.1 @@ -1303,7 +1303,7 @@ default-package-overrides: - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 - marvin-interpolate ==1.1.2 - - massiv ==0.2.1.0 + - massiv ==0.2.2.0 - massiv-io ==0.1.4.0 - mathexpr ==0.3.0.0 - math-functions ==0.2.1.0 @@ -1351,7 +1351,7 @@ default-package-overrides: - mintty ==0.1.2 - miso ==0.21.2.0 - missing-foreign ==0.1.1 - - MissingH ==1.4.0.1 + - MissingH ==1.4.1.0 - mixed-types-num ==0.3.1.4 - mltool ==0.2.0.1 - mmap ==0.5.9 @@ -1370,7 +1370,7 @@ default-package-overrides: - monadic-arrays ==0.2.2 - monad-journal ==0.8.1 - monadlist ==0.0.2 - - monad-logger ==0.3.29 + - monad-logger ==0.3.30 - monad-logger-json ==0.1.0.0 - monad-logger-prefix ==0.1.10 - monad-logger-syslog ==0.1.4.0 @@ -1522,8 +1522,8 @@ default-package-overrides: - pagination ==0.2.1 - palette ==0.3.0.1 - pandoc ==2.2.1 - - pandoc-citeproc ==0.14.5 - - pandoc-types ==1.17.5.1 + - pandoc-citeproc ==0.14.8 + - pandoc-types ==1.17.5.2 - pango ==0.13.5.0 - papillon ==0.1.0.6 - parallel ==3.2.2.0 @@ -1754,7 +1754,7 @@ default-package-overrides: - rethinkdb-client-driver ==0.0.25 - retry ==0.7.7.0 - rev-state ==0.1.2 - - rfc5051 ==0.1.0.3 + - rfc5051 ==0.1.0.4 - rhine ==0.4.0.1 - riak ==1.1.2.5 - riak-protobuf ==0.23.0.0 @@ -1841,7 +1841,7 @@ default-package-overrides: - servant-streaming ==0.3.0.0 - servant-streaming-client ==0.3.0.0 - servant-streaming-server ==0.3.0.0 - - servant-swagger ==1.1.5 + - servant-swagger ==1.1.6 - servant-swagger-ui ==0.3.0.3.13.2 - servant-swagger-ui-core ==0.3.1 - servant-tracing ==0.1.0.2 @@ -1859,7 +1859,7 @@ default-package-overrides: - SHA ==1.6.4.4 - shake ==0.16.4 - shake-language-c ==0.12.0 - - shakespeare ==2.0.18 + - shakespeare ==2.0.19 - shell-conduit ==4.7.0 - shell-escape ==0.2.0 - shelltestrunner ==1.9 @@ -1871,6 +1871,7 @@ default-package-overrides: - siggy-chardust ==1.0.0 - signal ==0.1.0.4 - silently ==1.2.5 + - simple-cmd ==0.1.1 - simple-reflect ==0.3.3 - simple-sendfile ==0.2.27 - simplest-sqlite ==0.1.0.0 @@ -1880,11 +1881,11 @@ default-package-overrides: - singleton-nats ==0.4.2 - singletons ==2.4.1 - siphash ==1.0.3 - - size-based ==0.1.1.0 + - size-based ==0.1.2.0 - skein ==1.0.9.4 - skylighting ==0.7.4 - skylighting-core ==0.7.4 - - slack-web ==0.2.0.6 + - slack-web ==0.2.0.7 - slave-thread ==1.0.2 - smallcheck ==1.1.5 - smoothie ==0.4.2.9 @@ -2152,7 +2153,7 @@ default-package-overrides: - unicode-show ==0.1.0.3 - unicode-transforms ==0.3.4 - unification-fd ==0.10.0.1 - - union ==0.1.1.2 + - union ==0.1.2 - union-find ==0.2 - uniplate ==1.6.12 - uniprot-kb ==0.1.2.0 @@ -2332,29 +2333,29 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.8.32 - yeshql ==4.1.0.1 - - yeshql-core ==4.1.0.1 - - yeshql-hdbc ==4.1.0.1 + - yeshql-core ==4.1.0.2 + - yeshql-hdbc ==4.1.0.2 - yesod ==1.6.0 - yesod-alerts ==0.1.2.0 - - yesod-auth ==1.6.4.1 + - yesod-auth ==1.6.5 - yesod-auth-fb ==1.9.1 - yesod-auth-hashdb ==1.7 - yesod-bin ==1.6.0.3 - - yesod-core ==1.6.8 + - yesod-core ==1.6.8.1 - yesod-csp ==0.2.4.0 - yesod-eventsource ==1.6.0 - yesod-fb ==0.5.0 - - yesod-form ==1.6.2 + - yesod-form ==1.6.3 - yesod-form-bootstrap4 ==1.0.2 - yesod-gitrepo ==0.3.0 - yesod-gitrev ==0.2.0.0 - yesod-newsfeed ==1.6.1.0 - yesod-paginator ==1.1.0.1 - - yesod-persistent ==1.6.0 + - yesod-persistent ==1.6.0.1 - yesod-recaptcha2 ==0.2.4 - yesod-sitemap ==1.6.0 - - yesod-static ==1.6.0 - - yesod-test ==1.6.5 + - yesod-static ==1.6.0.1 + - yesod-test ==1.6.5.1 - yesod-text-markdown ==0.1.10 - yesod-websockets ==0.3.0.1 - yes-precure5-command ==5.5.3 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index fd19a506d15b..fe488d0447e1 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -12298,31 +12298,6 @@ self: { }: mkDerivation { pname = "MissingH"; - version = "1.4.0.1"; - sha256 = "0wcvgrmav480w7nf4bl14yi0jq2yzanysxwzwas9hpb28vyjlgr8"; - revision = "1"; - editedCabalFile = "04syc14nz11fay6fm6nlixyflrfhpg4jiyxx6mnxrl6asd3cl989"; - libraryHaskellDepends = [ - array base containers directory filepath hslogger HUnit mtl network - old-locale old-time parsec process random regex-compat time unix - ]; - testHaskellDepends = [ - array base containers directory errorcall-eq-instance filepath - hslogger HUnit mtl network old-locale old-time parsec process - QuickCheck random regex-compat testpack time unix - ]; - description = "Large utility library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "MissingH_1_4_1_0" = callPackage - ({ mkDerivation, array, base, containers, directory - , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network - , old-locale, old-time, parsec, process, QuickCheck, random - , regex-compat, testpack, time, unix - }: - mkDerivation { - pname = "MissingH"; version = "1.4.1.0"; sha256 = "1jp0vk6w9a7fzrbxfhx773105jp2s1n50klq9ak6spfl7bgx5v29"; libraryHaskellDepends = [ @@ -12336,7 +12311,6 @@ self: { ]; description = "Large utility library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MissingK" = callPackage @@ -18676,8 +18650,8 @@ self: { }: mkDerivation { pname = "Villefort"; - version = "0.1.2.14"; - sha256 = "0hwlm91dlhbl0g6axpqx3pbr89icaqmrgnnn6lhcwd7sd8rzycbg"; + version = "0.1.2.16"; + sha256 = "00ngq1i7f1sqksfl9cg1qzhp4fxv9h6mmjfljj3cahcw50h4al64"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -18687,7 +18661,7 @@ self: { transformers unix uri-encode ]; executableHaskellDepends = [ - base HDBC HDBC-sqlite3 random scotty split text time + base HDBC HDBC-sqlite3 mtl random scotty split text time ]; testHaskellDepends = [ base concurrent-extra HDBC HDBC-sqlite3 hspec mtl QuickCheck @@ -19634,8 +19608,8 @@ self: { ({ mkDerivation, base, deepseq, random }: mkDerivation { pname = "Yampa"; - version = "0.11.1"; - sha256 = "0zzhp0h9z9xz7ipiyd6ygnhb6h50dwh268zamx6qdf6zzpywsya1"; + version = "0.12"; + sha256 = "077fnazzcv7gckpklmdgk4hz6nnfnims11c1r4dwpnb0z6n31wcg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base deepseq random ]; @@ -23140,23 +23114,11 @@ self: { ({ mkDerivation, base, util }: mkDerivation { pname = "alg"; - version = "0.2.7.0"; - sha256 = "00ih68mh1494s856ygkc887m0vhrs2sfchjgqrsgw8v7lqcqjsx6"; - libraryHaskellDepends = [ base util ]; - description = "Algebraic structures"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "alg_0_2_8_0" = callPackage - ({ mkDerivation, base, util }: - mkDerivation { - pname = "alg"; version = "0.2.8.0"; sha256 = "1zw50da4wz8qdc62qlvg74k3g5n48xlzda2k7c3y9zb8xb2xbfrr"; libraryHaskellDepends = [ base util ]; description = "Algebraic structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alga" = callPackage @@ -29163,6 +29125,8 @@ self: { pname = "ascii"; version = "0.0.5.1"; sha256 = "06z63pr5g1wcsyii3pr8svz23cl9n4srspbkvby595pxfcbzkirn"; + revision = "1"; + editedCabalFile = "1v8pgvhl47c4sf226pg175wydw5a60lssz0876haqkqm5h7bjm7g"; libraryHaskellDepends = [ base blaze-builder bytestring case-insensitive hashable semigroups text @@ -29677,8 +29641,8 @@ self: { pname = "ast-monad"; version = "0.1.0.0"; sha256 = "038cvblhhlcsv9id2rcb26q4lwvals3xj45j9jy6fb69jm5mzh0i"; - revision = "3"; - editedCabalFile = "0lj9g3vhlx42hsirxcwfjksy5w6981gpyms7r5xpih7bnz91cxk7"; + revision = "4"; + editedCabalFile = "131ynmpy5y0c4maj0cp0n3sbbs4k40j7dybgcsad5kv58i63kw23"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "A library for constructing AST by using do-notation"; @@ -33032,23 +32996,11 @@ self: { ({ mkDerivation, base, unix }: mkDerivation { pname = "base-compat"; - version = "0.10.4"; - sha256 = "0ksp990gxs731mq19rzbxrbs43nazfljjc8krlx5bjqblw3kfs8d"; - libraryHaskellDepends = [ base unix ]; - description = "A compatibility layer for base"; - license = stdenv.lib.licenses.mit; - }) {}; - - "base-compat_0_10_5" = callPackage - ({ mkDerivation, base, unix }: - mkDerivation { - pname = "base-compat"; version = "0.10.5"; sha256 = "0hgvlqcr852hfp52jp99snhbj550mvxxpi8qn15d8ml9aqhyl2lr"; libraryHaskellDepends = [ base unix ]; description = "A compatibility layer for base"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "base-compat-batteries" = callPackage @@ -34234,8 +34186,8 @@ self: { }: mkDerivation { pname = "bench-show"; - version = "0.2.0"; - sha256 = "17d7dk5r697r9fls14labciwp3rwykv6n5mkhljrjszf2z2c6j65"; + version = "0.2.1"; + sha256 = "1afx5vck4b57r6kanr5g46rk5n8hf9vw4vg2sfqgdb3fhc9979g5"; libraryHaskellDepends = [ ansi-wl-pprint base Chart Chart-diagrams csv directory filepath mwc-random split statistics transformers vector @@ -34930,27 +34882,6 @@ self: { }: mkDerivation { pname = "binary-conduit"; - version = "1.3"; - sha256 = "1kfc421r8p0zxn5dkm9kzj4n9pharnl809hkjnr55dbrnr3vvya3"; - revision = "1"; - editedCabalFile = "0y08nw3y5jgrw5waa25b75iwsibnd1m9rbpqrvz5j4xq6baqw6kx"; - libraryHaskellDepends = [ - base binary bytestring conduit exceptions vector - ]; - testHaskellDepends = [ - base binary bytestring conduit hspec QuickCheck - quickcheck-assertions resourcet - ]; - description = "data serialization/deserialization conduit library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "binary-conduit_1_3_1" = callPackage - ({ mkDerivation, base, binary, bytestring, conduit, exceptions - , hspec, QuickCheck, quickcheck-assertions, resourcet, vector - }: - mkDerivation { - pname = "binary-conduit"; version = "1.3.1"; sha256 = "17yj8rn6fwzbv0z6lczrddv7mkr8906xg2pf2dlvmnwb97zw7004"; libraryHaskellDepends = [ @@ -34962,7 +34893,6 @@ self: { ]; description = "data serialization/deserialization conduit library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary-derive" = callPackage @@ -41935,17 +41865,18 @@ self: { "cabal-rpm" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath - , http-client, http-client-tls, http-conduit, process, time, unix + , http-client, http-client-tls, http-conduit, process, simple-cmd + , time, unix }: mkDerivation { pname = "cabal-rpm"; - version = "0.12.5"; - sha256 = "0xz2qjj52m8pkazy3dbkh0pqhsg3727x9blka24naibgfl1h7vaa"; + version = "0.12.6"; + sha256 = "1k602v7v87w6xcd9a5m8n5grnjbkyn79rdi9azl7djna0rs129ns"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring Cabal directory filepath http-client - http-client-tls http-conduit process time unix + http-client-tls http-conduit process simple-cmd time unix ]; description = "RPM packaging tool for Haskell Cabal-based packages"; license = stdenv.lib.licenses.gpl3; @@ -46622,8 +46553,8 @@ self: { ({ mkDerivation, base, criterion, QuickCheck, random }: mkDerivation { pname = "cl3"; - version = "1.0.0.3"; - sha256 = "16jllcyqdd6i0gq730c88ls47d2334ywr317pm7q6d6vgrjc4gjj"; + version = "1.0.0.4"; + sha256 = "18q5r2m4sr7h8z35nivq2fndmxamyw3217j11na4gq361rq1340v"; libraryHaskellDepends = [ base random ]; testHaskellDepends = [ base QuickCheck ]; benchmarkHaskellDepends = [ base criterion ]; @@ -48366,23 +48297,6 @@ self: { }: mkDerivation { pname = "cmark-gfm"; - version = "0.1.5"; - sha256 = "13b0mqks5c1q989slgsa3ixr5vvkfyic4ynzgv00kgl5qrs7hqk7"; - libraryHaskellDepends = [ base bytestring text ]; - testHaskellDepends = [ base HUnit text ]; - benchmarkHaskellDepends = [ - base blaze-html cheapskate criterion discount markdown sundown text - ]; - description = "Fast, accurate GitHub Flavored Markdown parser and renderer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cmark-gfm_0_1_6" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, cheapskate - , criterion, discount, HUnit, markdown, sundown, text - }: - mkDerivation { - pname = "cmark-gfm"; version = "0.1.6"; sha256 = "0s39djd1j0rq63g4sy0cnras14m263anr56nvijcbcy9zg41dyf8"; libraryHaskellDepends = [ base bytestring text ]; @@ -48392,7 +48306,6 @@ self: { ]; description = "Fast, accurate GitHub Flavored Markdown parser and renderer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cmark-highlight" = callPackage @@ -52952,8 +52865,8 @@ self: { ({ mkDerivation, base, deepseq, primitive }: mkDerivation { pname = "contiguous"; - version = "0.3.0.0"; - sha256 = "15v53w85f8bxnnrjsj46nfnjshf91b8sld76jcqffzj5nfjxkv28"; + version = "0.3.1.0"; + sha256 = "1x1rv1r05v725xbax2qig36h03gah7mx8r8vd1dcdcy6lm6lsc4i"; libraryHaskellDepends = [ base deepseq primitive ]; description = "Unified interface for primitive arrays"; license = stdenv.lib.licenses.bsd3; @@ -53146,24 +53059,6 @@ self: { }: mkDerivation { pname = "control-dsl"; - version = "0.2.1.1"; - sha256 = "0nfbipf26kkkjbxb9mqbjxqg99z3dfmpada28ajqjvz6n3mg4grg"; - revision = "1"; - editedCabalFile = "11rjly75f57a1818hjzy18pms51jicnzn99kx2mqzf7c7lygnsgg"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base containers doctest doctest-discover temporary - ]; - description = "An alternative to monads for control flow DSLs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "control-dsl_0_2_1_3" = callPackage - ({ mkDerivation, base, containers, doctest, doctest-discover - , temporary - }: - mkDerivation { - pname = "control-dsl"; version = "0.2.1.3"; sha256 = "0rv9wpjnr3y957vd6l8vmn87f9gi97nhk07bkgpr8083avi9biz8"; libraryHaskellDepends = [ base ]; @@ -53172,7 +53067,6 @@ self: { ]; description = "An alternative to monads for control flow DSLs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "control-event" = callPackage @@ -55487,27 +55381,12 @@ self: { }: mkDerivation { pname = "crypto-enigma"; - version = "0.0.2.13"; - sha256 = "0w82f9hbhhksqkgj3d846l3cgg210ra5133rji2k41mc74l0r0dl"; - libraryHaskellDepends = [ base containers MissingH mtl split ]; - testHaskellDepends = [ base HUnit QuickCheck ]; - description = "An Enigma machine simulator with display"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "crypto-enigma_0_0_2_14" = callPackage - ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck - , split - }: - mkDerivation { - pname = "crypto-enigma"; version = "0.0.2.14"; sha256 = "12gvgpi7hichjq9ya77hm9q1x49qc1024zmr6pb1mv57nwwx599p"; libraryHaskellDepends = [ base containers MissingH mtl split ]; testHaskellDepends = [ base HUnit QuickCheck ]; description = "An Enigma machine simulator with display"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "crypto-multihash" = callPackage @@ -59381,15 +59260,15 @@ self: { }) {}; "data-timeout" = callPackage - ({ mkDerivation, base, data-textual, parsers, tagged, text-printer - , transformers-base + ({ mkDerivation, base, data-textual, parsers, stm, tagged + , text-printer, transformers-base }: mkDerivation { pname = "data-timeout"; - version = "0.3"; - sha256 = "1b6af2x19hb1kynsv7ypc2q6b71cazcg86gf1yhq0rr0fjj478ah"; + version = "0.3.1"; + sha256 = "1pnynkk99d2bhg2l2qd9x4ksp8nc2l7zii3gk6sch1svnbg0liv6"; libraryHaskellDepends = [ - base data-textual parsers tagged text-printer transformers-base + base data-textual parsers stm tagged text-printer transformers-base ]; description = "64-bit timeouts of nanosecond precision"; license = stdenv.lib.licenses.bsd3; @@ -62196,8 +62075,8 @@ self: { }: mkDerivation { pname = "dfinity-radix-tree"; - version = "0.5.0"; - sha256 = "0c721d4vcar7h5alrigi9q63pwwvp0xqwwrvfh6pa9p2y90p820b"; + version = "0.5.2"; + sha256 = "16w7na8sh5fvwrps0wa3m80yzrdg7znx8jgw2i64glvjjs7d5c61"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -62510,21 +62389,6 @@ self: { ({ mkDerivation, base, dhall, optparse-applicative, text }: mkDerivation { pname = "dhall-text"; - version = "1.0.12"; - sha256 = "1k68s83cqlwgivliag9n2vhin385k08f8vd506dcbix5farv9dp6"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base dhall optparse-applicative text - ]; - description = "Template text using Dhall"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dhall-text_1_0_13" = callPackage - ({ mkDerivation, base, dhall, optparse-applicative, text }: - mkDerivation { - pname = "dhall-text"; version = "1.0.13"; sha256 = "09bwhc2wrwliwrvd565wr0rgdxmi0g4i9691b8nb32nybb20l1ah"; isLibrary = false; @@ -62534,7 +62398,6 @@ self: { ]; description = "Template text using Dhall"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dhall-to-cabal" = callPackage @@ -64322,6 +64185,8 @@ self: { pname = "discord-gateway"; version = "0.2.2"; sha256 = "1pc8j2pqrpmgvf31kx24gwj6n96npxdjj6mjf2w9wzh500rdrrzy"; + revision = "1"; + editedCabalFile = "0aw47024gk2hvj0zzy7h01rvv6wxhnjqqjg8prb4x1pajjalg9l5"; libraryHaskellDepends = [ aeson base discord-types hslogger transformers url websockets wuss ]; @@ -64377,6 +64242,8 @@ self: { pname = "discord-rest"; version = "0.2.2"; sha256 = "02sg05zf2m83d6hq5z51cjvw7ycarrmwx9y00c71wiw3hvb84fb3"; + revision = "1"; + editedCabalFile = "0hwiwzgh359cha0j97mwhdjmg1y2zppppbn538pn4ggfn6i7ma11"; libraryHaskellDepends = [ aeson base bytestring comonad data-default discord-types hashable hslogger http-client mtl req stm text time url @@ -64394,6 +64261,8 @@ self: { pname = "discord-types"; version = "0.2.2"; sha256 = "12smb4z6mrj9hhk7jc9r2cz6p4lcix2016ahwp9qapklrql539sc"; + revision = "1"; + editedCabalFile = "015i65pzkxrx6pring1q0fv772r54xrbrbrwa339yqjgzm7c7z7w"; libraryHaskellDepends = [ aeson base hashable text time transformers unordered-containers vector @@ -67425,6 +67294,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dunai-core" = callPackage + ({ mkDerivation, base, MonadRandom, transformers, transformers-base + }: + mkDerivation { + pname = "dunai-core"; + version = "0.5.1.0"; + sha256 = "1p8161m671dgf13q0rnpp797nymdxpi5nf6xl9mh9zj495libbzz"; + libraryHaskellDepends = [ + base MonadRandom transformers transformers-base + ]; + description = "Generalised reactive framework supporting classic, arrowized and monadic FRP. (Core library fork.)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "duplo" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base , base64-bytestring, bytestring, containers, directory @@ -69861,22 +69744,6 @@ self: { }: mkDerivation { pname = "email-validate"; - version = "2.3.2.7"; - sha256 = "1qdl0g8nbngr6kz4xrgi06rn1zf1np55ipk3wwdrg9hpfaaazcs3"; - libraryHaskellDepends = [ - attoparsec base bytestring template-haskell - ]; - testHaskellDepends = [ base bytestring doctest hspec QuickCheck ]; - description = "Email address validation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "email-validate_2_3_2_8" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec - , QuickCheck, template-haskell - }: - mkDerivation { - pname = "email-validate"; version = "2.3.2.8"; sha256 = "1lsf6x3hmic8anx9dw6dryvsdh128rprb6dxqkyjr17iqy5ww6yp"; libraryHaskellDepends = [ @@ -69885,7 +69752,6 @@ self: { testHaskellDepends = [ base bytestring doctest hspec QuickCheck ]; description = "Email address validation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "email-validate-json" = callPackage @@ -73452,8 +73318,8 @@ self: { }: mkDerivation { pname = "extensible-effects-concurrent"; - version = "0.5.0.1"; - sha256 = "00gr2x00byfc842p8b5apzc4qi8l0fx8cgrvsi73f1mshkiqs9sp"; + version = "0.6.2"; + sha256 = "11cqk78c0lfsa8mkq7ymxsral0g24p1im4r1ndqsf7rxczjmc37c"; libraryHaskellDepends = [ base containers data-default deepseq directory extensible-effects filepath lens logging-effect monad-control mtl parallel process @@ -73509,22 +73375,6 @@ self: { }: mkDerivation { pname = "extra"; - version = "1.6.12"; - sha256 = "177m9f3hdc8sy6m791q6bmns01avzb0j9wj113rm4748k0bnqngz"; - libraryHaskellDepends = [ - base clock directory filepath process time unix - ]; - testHaskellDepends = [ base directory filepath QuickCheck unix ]; - description = "Extra functions I use"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "extra_1_6_13" = callPackage - ({ mkDerivation, base, clock, directory, filepath, process - , QuickCheck, time, unix - }: - mkDerivation { - pname = "extra"; version = "1.6.13"; sha256 = "0jc5g120ff97sayff10kqn66wz8aw2wymgwgh2livzkf7vqm5q50"; libraryHaskellDepends = [ @@ -73533,7 +73383,6 @@ self: { testHaskellDepends = [ base directory filepath QuickCheck unix ]; description = "Extra functions I use"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extract-dependencies" = callPackage @@ -75299,8 +75148,8 @@ self: { }: mkDerivation { pname = "fficxx"; - version = "0.5"; - sha256 = "16r7pbfxr1xf5jxwyk2qv50yishpk0mzndl88hv9bwpz7gbj55yy"; + version = "0.5.0.1"; + sha256 = "01rvg7y9c0jczypjgrq7b6cbl79n10flsllkbgm9z5hhymwga38s"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring Cabal containers data-default directory either errors filepath hashable haskell-src-exts lens mtl @@ -77693,6 +77542,8 @@ self: { pname = "fmt"; version = "0.6"; sha256 = "14hk6ra8j1zzw7ibimj207mi1xl5pmln6kyz0y66j4bg1r8invsy"; + revision = "1"; + editedCabalFile = "0xmi4qxq12qfj4ry1ifb0za7jdlvj65v16bzdqi8r7p1xrxy5cki"; libraryHaskellDepends = [ base base64-bytestring bytestring containers formatting microlens text time time-locale-compat @@ -81101,8 +80952,8 @@ self: { }: mkDerivation { pname = "gauge"; - version = "0.2.3"; - sha256 = "0slsimv2zn9yhakxy2wdyfj6bgjd1p65wp6nr8j0ba7df64xykjs"; + version = "0.2.4"; + sha256 = "1p8accsrv0njiqgybz2plwiglg90nazibggc270j7gmqxqna0zr9"; libraryHaskellDepends = [ base basement deepseq directory process vector ]; @@ -82098,6 +81949,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "generics-sop_0_4_0_0" = callPackage + ({ mkDerivation, base, criterion, deepseq, ghc-prim, sop-core + , template-haskell + }: + mkDerivation { + pname = "generics-sop"; + version = "0.4.0.0"; + sha256 = "0blx09k173qgaghqnsvz6v2r6san1kn62k5c57wilya94l1996ra"; + libraryHaskellDepends = [ + base ghc-prim sop-core template-haskell + ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ + base criterion deepseq template-haskell + ]; + description = "Generic Programming using True Sums of Products"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "generics-sop-lens" = callPackage ({ mkDerivation, base, generics-sop, lens }: mkDerivation { @@ -82935,8 +82806,8 @@ self: { }: mkDerivation { pname = "geos"; - version = "0.1.1.2"; - sha256 = "1kggbm3hdg1x0ci3lfps1nglr5hk56ws96yfrv257zaz8kq64s1d"; + version = "0.2.1"; + sha256 = "15dhxhqswi9h8zas0x27hma7pz4c7rn40pppjraax29pi4alaiq9"; libraryHaskellDepends = [ base bytestring mtl transformers vector ]; @@ -85446,6 +85317,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gingersnap" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-types + , postgresql-simple, resource-pool, snap-core + }: + mkDerivation { + pname = "gingersnap"; + version = "0.1.1.0"; + sha256 = "0aqb9ikh21q13mnwf6vcg6chv73vphyag62zhkd4mkhbnlpr816i"; + libraryHaskellDepends = [ + aeson base bytestring http-types postgresql-simple resource-pool + snap-core + ]; + description = "snap-core + aeson + postgresql-simple = delicious"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ginsu" = callPackage ({ mkDerivation, array, async, base, binary, bytestring, containers , directory, hashable, hashtables, mtl, network, old-locale @@ -86019,8 +85906,8 @@ self: { }: mkDerivation { pname = "githash"; - version = "0.1.1.0"; - sha256 = "14532rljfzlkcbqpi69wj31cqlzid0rwwy0kzlwvxp06zh8lq2a0"; + version = "0.1.2.0"; + sha256 = "0pwh0s4gfddy0ixx92ww00v9qam2cx047ivqcm373fw5h2h1vrq8"; libraryHaskellDepends = [ base bytestring directory filepath process template-haskell ]; @@ -90683,8 +90570,8 @@ self: { ({ mkDerivation, base, containers, json, text }: mkDerivation { pname = "graphql-w-persistent"; - version = "0.1.0.3"; - sha256 = "0yinjcd74hdxfvph760cvf319hnrb5skkc174ih7fqjjllrp5din"; + version = "0.1.0.4"; + sha256 = "1ivdh8l6snb2d3g1f7fb46fd9fz6ib2i94b1596pmp38hryl8in0"; libraryHaskellDepends = [ base containers json text ]; description = "Haskell GraphQL query parser-interpreter-data processor"; license = stdenv.lib.licenses.isc; @@ -92680,56 +92567,6 @@ self: { }: mkDerivation { pname = "hOpenPGP"; - version = "2.7.3"; - sha256 = "0qxqq46p4l61chkxk7c6lhnscik3gzsgcvszp6ywspk8zp1yhbi8"; - libraryHaskellDepends = [ - aeson asn1-encoding attoparsec base base16-bytestring - base64-bytestring bifunctors binary binary-conduit bytestring bzlib - conduit conduit-extra containers crypto-cipher-types cryptonite - errors hashable incremental-parser ixset-typed lens memory - monad-loops nettle network-uri newtype openpgp-asciiarmor - prettyprinter resourcet semigroups split text time - time-locale-compat transformers unliftio-core unordered-containers - zlib - ]; - testHaskellDepends = [ - aeson asn1-encoding attoparsec base base16-bytestring bifunctors - binary binary-conduit bytestring bzlib conduit conduit-extra - containers crypto-cipher-types cryptonite errors hashable - incremental-parser ixset-typed lens memory monad-loops nettle - network network-uri newtype prettyprinter QuickCheck - quickcheck-instances resourcet semigroups split tasty tasty-hunit - tasty-quickcheck text time time-locale-compat transformers - unliftio-core unordered-containers zlib - ]; - benchmarkHaskellDepends = [ - aeson base base16-bytestring base64-bytestring bifunctors binary - binary-conduit bytestring bzlib conduit conduit-extra containers - criterion crypto-cipher-types cryptonite errors hashable - incremental-parser ixset-typed lens memory monad-loops nettle - network network-uri newtype openpgp-asciiarmor prettyprinter - resourcet semigroups split text time time-locale-compat - transformers unliftio-core unordered-containers zlib - ]; - description = "native Haskell implementation of OpenPGP (RFC4880)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hOpenPGP_2_7_4_1" = callPackage - ({ mkDerivation, aeson, asn1-encoding, attoparsec, base - , base16-bytestring, base64-bytestring, bifunctors, binary - , binary-conduit, bytestring, bzlib, conduit, conduit-extra - , containers, criterion, crypto-cipher-types, cryptonite, errors - , hashable, incremental-parser, ixset-typed, lens, memory - , monad-loops, nettle, network, network-uri, newtype - , openpgp-asciiarmor, prettyprinter, QuickCheck - , quickcheck-instances, resourcet, semigroups, split, tasty - , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat - , transformers, unliftio-core, unordered-containers, zlib - }: - mkDerivation { - pname = "hOpenPGP"; version = "2.7.4.1"; sha256 = "0fcm87rkf1c94w68ad2zkd3r2pbxzqa82kh3d2ky87rc1wqnia0s"; libraryHaskellDepends = [ @@ -95570,32 +95407,6 @@ self: { }: mkDerivation { pname = "hapistrano"; - version = "0.3.6.0"; - sha256 = "094jv3plkh515mn49hp5bylpxfn7c74n9bdk4843bm88q5hxlnk2"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base filepath formatting gitrev mtl path process time transformers - ]; - executableHaskellDepends = [ - aeson async base formatting gitrev optparse-applicative path - path-io stm yaml - ]; - testHaskellDepends = [ - base directory filepath hspec mtl path path-io process temporary - ]; - description = "A deployment library for Haskell applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hapistrano_0_3_6_1" = callPackage - ({ mkDerivation, aeson, async, base, directory, filepath - , formatting, gitrev, hspec, mtl, optparse-applicative, path - , path-io, process, stm, temporary, time, transformers, yaml - }: - mkDerivation { - pname = "hapistrano"; version = "0.3.6.1"; sha256 = "0g0i0n952zjvysjrsp4srhqgrq5fyy7kdinixsxazpccf01f229y"; isLibrary = true; @@ -95613,7 +95424,6 @@ self: { ]; description = "A deployment library for Haskell applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happindicator" = callPackage @@ -97721,8 +97531,8 @@ self: { }: mkDerivation { pname = "haskell-dap"; - version = "0.0.8.0"; - sha256 = "1zj1lkvxhn7l9pgivl7bgzs5mzg8kbzriixwpf8si2nrfx20avkf"; + version = "0.0.9.0"; + sha256 = "1flsz93wbhd61yfydbfbb3q8brhh0d0gzfsdd3xscwvcbdzgw9qr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -114589,8 +114399,8 @@ self: { }: mkDerivation { pname = "html-conduit"; - version = "1.3.1"; - sha256 = "0dg3sblihi93qn6ax1cwha0cng4zlpmic83ckdylq7s7kwa3rhbi"; + version = "1.3.2"; + sha256 = "0l5hc7bf57p5jiqh3wvnqapc27ibnlv00zm6szc0nqbvknzvvz85"; libraryHaskellDepends = [ attoparsec base bytestring conduit conduit-extra containers resourcet text transformers xml-conduit xml-types @@ -117054,17 +116864,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-json_0_9_0_0" = callPackage + "hw-json_0_9_0_1" = callPackage ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base - , bytestring, containers, criterion, directory, dlist, generic-lens - , hspec, hw-balancedparens, hw-bits, hw-mquery, hw-parser, hw-prim + , bytestring, containers, criterion, directory, dlist, hspec + , hw-balancedparens, hw-bits, hw-mquery, hw-parser, hw-prim , hw-rankselect, hw-rankselect-base, lens, mmap - , optparse-applicative, resourcet, text, vector, word8 + , optparse-applicative, text, vector, word8 }: mkDerivation { pname = "hw-json"; - version = "0.9.0.0"; - sha256 = "0465pc8k4wvvih4z5klq3ign2cznrb837ivqxg9nrzbx8szsnsc7"; + version = "0.9.0.1"; + sha256 = "00prvi3jrb02g92vq1ghyxpdpqangj482x1k3l13s385804grgqw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117073,9 +116883,9 @@ self: { hw-rankselect-base mmap text vector word8 ]; executableHaskellDepends = [ - base bytestring criterion dlist generic-lens hw-balancedparens - hw-bits hw-mquery hw-prim hw-rankselect hw-rankselect-base lens - mmap optparse-applicative resourcet vector + base bytestring criterion dlist hw-balancedparens hw-bits hw-mquery + hw-prim hw-rankselect hw-rankselect-base lens mmap + optparse-applicative vector ]; testHaskellDepends = [ attoparsec base bytestring containers hspec hw-balancedparens @@ -120495,28 +120305,6 @@ self: { }: mkDerivation { pname = "incremental-parser"; - version = "0.3.1.1"; - sha256 = "1p7m897bavh45h755ra97jk06jprls7vrnpzv1kjklgj19vbz1vz"; - revision = "1"; - editedCabalFile = "0g6haprqb1w06bazjj107frraxc6bbj8i98im16k66wlx7c9f99i"; - libraryHaskellDepends = [ base monoid-subclasses ]; - testHaskellDepends = [ - base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq monoid-subclasses text - ]; - description = "Generic parser library capable of providing partial results from partial input"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "incremental-parser_0_3_2" = callPackage - ({ mkDerivation, base, bytestring, checkers, criterion, deepseq - , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text - }: - mkDerivation { - pname = "incremental-parser"; version = "0.3.2"; sha256 = "0rzm83mjbvaxa48yjs16c1v41l0yy1nfilc549z4vjgzqixy1pw6"; libraryHaskellDepends = [ base monoid-subclasses ]; @@ -121900,22 +121688,6 @@ self: { }) {}; "interpolatedstring-perl6" = callPackage - ({ mkDerivation, base, bytestring, haskell-src-meta - , template-haskell, text - }: - mkDerivation { - pname = "interpolatedstring-perl6"; - version = "1.0.0"; - sha256 = "1lx125wzadvbicsaml9wrhxxplc4gd0i4wk3f1apb0kl5nnv5q35"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring haskell-src-meta template-haskell text - ]; - description = "QuasiQuoter for Perl6-style multi-line interpolated strings"; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "interpolatedstring-perl6_1_0_1" = callPackage ({ mkDerivation, base, bytestring, Cabal, haskell-src-meta, process , template-haskell, text }: @@ -121930,7 +121702,6 @@ self: { ]; description = "QuasiQuoter for Perl6-style multi-line interpolated strings"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "interpolatedstring-qq" = callPackage @@ -122477,8 +122248,8 @@ self: { pname = "io-streams-haproxy"; version = "1.0.0.2"; sha256 = "11nh9q158mgnvvb23s5ffg87lkhl5smk039yl43jghxmb214z0bp"; - revision = "3"; - editedCabalFile = "03pwnb66mlx1b8z2d4mn262i2s5mprfr49m0crnssd2nlvm82ifa"; + revision = "4"; + editedCabalFile = "06c51a057n5bc9xfbp2m4jz5ds4z1xvmsx5mppch6qfwbz7x5i9l"; libraryHaskellDepends = [ attoparsec base bytestring io-streams network transformers ]; @@ -122793,25 +122564,6 @@ self: { }: mkDerivation { pname = "iproute"; - version = "1.7.5"; - sha256 = "1vw1nm3s8vz1hqnjnqd3wh5rr4q3m2r4izn5ynhf93h9185qwqzd"; - libraryHaskellDepends = [ - appar base byteorder containers network - ]; - testHaskellDepends = [ - appar base byteorder containers doctest hspec network QuickCheck - safe - ]; - description = "IP Routing Table"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "iproute_1_7_6" = callPackage - ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec - , network, QuickCheck, safe - }: - mkDerivation { - pname = "iproute"; version = "1.7.6"; sha256 = "1svczhzy126w7pa5vyfg90xrvi2ym34f47nj4hhcpx13dv06g5wi"; libraryHaskellDepends = [ @@ -122823,7 +122575,6 @@ self: { ]; description = "IP Routing Table"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iptables-helpers" = callPackage @@ -126416,8 +126167,8 @@ self: { }: mkDerivation { pname = "jvm-binary"; - version = "0.1.0"; - sha256 = "0s64cwr86ipl7gpcgdgx50l7mm5h91njgir4mn2d82fzzq08x881"; + version = "0.2.0"; + sha256 = "1pq4v3xzbb9673rvr8qbvyln155v5ric712pf08vvkw1aihwgpa4"; libraryHaskellDepends = [ attoparsec base binary bytestring containers data-binary-ieee754 deepseq deriving-compat mtl template-haskell text vector @@ -129702,6 +129453,29 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "language-docker_7_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , free, Glob, hspec, HUnit, megaparsec, mtl, prettyprinter, process + , QuickCheck, split, template-haskell, text, th-lift, time + }: + mkDerivation { + pname = "language-docker"; + version = "7.0.0"; + sha256 = "0c63la3739fbcf50vy1cp245fk7x723gviyykd3dmggm1jwgm515"; + libraryHaskellDepends = [ + base bytestring containers free megaparsec mtl prettyprinter split + template-haskell text th-lift time + ]; + testHaskellDepends = [ + base bytestring containers directory filepath free Glob hspec HUnit + megaparsec mtl prettyprinter process QuickCheck split + template-haskell text th-lift time + ]; + description = "Dockerfile parser, pretty-printer and embedded DSL"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-dockerfile" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath, free , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck @@ -131389,25 +131163,12 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "leancheck"; - version = "0.7.5"; - sha256 = "01hmbcp5kn4k0mgv7y5jap54d65ljdd3sm954s5y28h4xvk6dn7g"; - libraryHaskellDepends = [ base template-haskell ]; - testHaskellDepends = [ base ]; - description = "Enumerative property-based testing"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "leancheck_0_7_7" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "leancheck"; version = "0.7.7"; sha256 = "0ymzs3w7nfagpcyh4f57f1wi1gr72k7pbkh729jrxxqgqhd84bvd"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base ]; description = "Enumerative property-based testing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "leankit-api" = callPackage @@ -133413,8 +133174,8 @@ self: { }: mkDerivation { pname = "lifted-stm"; - version = "0.1"; - sha256 = "1rjz8mkj17w9b7b10qx1ijj4x45abkgzp4khyl3gjmzb654zzym0"; + version = "0.2"; + sha256 = "115yh4rpm7z97jrc088g5jb49amr31kz5sdllpydq3h1yi1wlmbq"; libraryHaskellDepends = [ array base monad-finally stm transformers transformers-abort transformers-base transformers-compat @@ -135137,8 +134898,8 @@ self: { }: mkDerivation { pname = "llvm-extra"; - version = "0.8"; - sha256 = "0gy7zl3ln64aypkci5gc1bxy1j98zfj9wj7z07lk9n07s6ddm9k2"; + version = "0.8.0.1"; + sha256 = "0hnad3cqrvaijnczjy0krbf0szxf0573c5g37746xspwsjy42srd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137280,10 +137041,8 @@ self: { }: mkDerivation { pname = "lucid"; - version = "2.9.10"; - sha256 = "14238cnrvkbr81hpaqg1r342sryj8k0p6igkwf140s9phfpdzry0"; - revision = "1"; - editedCabalFile = "0n94x2havrvks85z8azsa4pvz33amhb444cias3kfxmkyvypn5ah"; + version = "2.9.11"; + sha256 = "13xz21hf9ywbyqwm33z8pfrjq03rzffhqswi30xsi13rrawj99cc"; libraryHaskellDepends = [ base blaze-builder bytestring containers hashable mmorph mtl text transformers unordered-containers @@ -139179,6 +138938,8 @@ self: { pname = "map-syntax"; version = "0.3"; sha256 = "0b3ddi998saw5gi5r4bjbpid03rxlifn08zv15wf0b90ambhcc4k"; + revision = "1"; + editedCabalFile = "1qfjficc7b6hbg44r3czk8iqgkjmgnp14wmzcdcz4ai93kx8dp44"; libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers deepseq hspec HUnit mtl QuickCheck transformers @@ -139657,27 +139418,6 @@ self: { }: mkDerivation { pname = "massiv"; - version = "0.2.1.0"; - sha256 = "0x5qf5hp6ncrjc28xcjd2v4w33wpyy69whmgvvp163y0q3v1n3q7"; - libraryHaskellDepends = [ - base bytestring data-default-class deepseq ghc-prim primitive - vector - ]; - testHaskellDepends = [ - base bytestring data-default deepseq hspec QuickCheck - safe-exceptions vector - ]; - description = "Massiv (Массив) is an Array Library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "massiv_0_2_2_0" = callPackage - ({ mkDerivation, base, bytestring, data-default, data-default-class - , deepseq, ghc-prim, hspec, primitive, QuickCheck, safe-exceptions - , vector - }: - mkDerivation { - pname = "massiv"; version = "0.2.2.0"; sha256 = "1mw636d070icl2wanvgrr8k0a44fhzdmzkw3047442nvl3nyghbc"; libraryHaskellDepends = [ @@ -139690,7 +139430,6 @@ self: { ]; description = "Massiv (Массив) is an Array Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "massiv-io" = callPackage @@ -140952,7 +140691,7 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "megaparsec_7_0_1" = callPackage + "megaparsec_7_0_2" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , criterion, deepseq, hspec, hspec-expectations, mtl , parser-combinators, QuickCheck, scientific, text, transformers @@ -140960,8 +140699,8 @@ self: { }: mkDerivation { pname = "megaparsec"; - version = "7.0.1"; - sha256 = "0b60gyd58n5ql7fnwmxvdz2n3h1nxmxjad52vh9b3ddzm1g3ifvb"; + version = "7.0.2"; + sha256 = "1ny54saxiz0md50mp24gz267gmqjbl8d8b1zi74hi6bcxyhzd278"; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq mtl parser-combinators scientific text transformers @@ -144237,8 +143976,8 @@ self: { }: mkDerivation { pname = "monad-logger"; - version = "0.3.29"; - sha256 = "1z516s4pa9n94zf0l45mylssg07xr1d1m6zrz900p0iv3vfd07mv"; + version = "0.3.30"; + sha256 = "102l0v75hbvkmrypiyg4ybb6rbc7nij5nxs1aihmqfdpg04rkkp7"; libraryHaskellDepends = [ base bytestring conduit conduit-extra exceptions fast-logger lifted-base monad-control monad-loops mtl resourcet stm stm-chans @@ -145666,6 +145405,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "monus" = callPackage + ({ mkDerivation, base, containers, smallcheck, tasty + , tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "monus"; + version = "0.2.0.0"; + sha256 = "1iyzq3ivw6brjf45d3023n8x7hq0ihy8gvjh8hjdsmc6pnm26gw9"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ + base containers smallcheck tasty tasty-quickcheck tasty-smallcheck + ]; + description = "a 'Monus' is a commutative monoid that allows a notion of substraction"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "monzo" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, bytestring , containers, hspec, http-client, http-client-tls, mtl, network @@ -146140,22 +145895,20 @@ self: { }) {inherit (pkgs) mpg123;}; "mpi-hs" = callPackage - ({ mkDerivation, base, c2hs, criterion, monad-loops, openmpi, tasty - , tasty-hspec, tasty-hunit, unix + ({ mkDerivation, base, bytestring, c2hs, criterion, monad-loops + , openmpi, store }: mkDerivation { pname = "mpi-hs"; - version = "0.1.0.1"; - sha256 = "19by906z7ccfai23dr61ckzcvv3ccd8l1slf21r7g07zlmjkdrvf"; + version = "0.3.0.0"; + sha256 = "1a8vlsrpvgyzq4p0qa90l4ck3v9a0pncy9bmmn6kjf6j2wa5j9qx"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base ]; + libraryHaskellDepends = [ base bytestring monad-loops store ]; librarySystemDepends = [ openmpi ]; libraryToolDepends = [ c2hs ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base monad-loops tasty tasty-hspec tasty-hunit unix - ]; + testHaskellDepends = [ base monad-loops ]; benchmarkHaskellDepends = [ base criterion ]; description = "MPI bindings for Haskell"; license = stdenv.lib.licenses.asl20; @@ -148593,8 +148346,8 @@ self: { }: mkDerivation { pname = "nakadi-client"; - version = "0.6.0.0"; - sha256 = "15hcaccm25frzar2fwyrrhai9kpja7xdcpi2ibl6gf3drp6z65jy"; + version = "0.6.1.0"; + sha256 = "0y6mvw10cbiqib309v38ldjq14xryccs8mhi41zkwpnqldmkyd1x"; libraryHaskellDepends = [ aeson aeson-casing async async-timer base bytestring conduit conduit-extra containers exceptions hashable http-client @@ -151051,8 +150804,8 @@ self: { ({ mkDerivation, base, doctest, network-uri, template-haskell }: mkDerivation { pname = "network-uri-static"; - version = "0.1.0.0"; - sha256 = "16b8jn72g76zd2gxzimnnj77l42y430y862sxzdnsclsnc7w4fn9"; + version = "0.1.1.0"; + sha256 = "1fjw3a9ypmqf7kl8s9mgwa9jlswz98igp830f1hsyc1hdh9xlrqw"; libraryHaskellDepends = [ base network-uri template-haskell ]; testHaskellDepends = [ base doctest ]; description = "A small utility to declare type-safe static URIs"; @@ -151807,6 +151560,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "nixpkgs-update" = callPackage + ({ mkDerivation, base, directory, doctest, errors, filepath, github + , mtl, neat-interpolation, optparse-applicative, regex-applicative + , shelly, text, time, unix, vector + }: + mkDerivation { + pname = "nixpkgs-update"; + version = "0.2.0"; + sha256 = "1vlvkyvvykzcss5w4snmwa9lrd50rss8d2gsv36a69w4y0k2ms5z"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory errors filepath github mtl neat-interpolation + optparse-applicative regex-applicative shelly text time unix vector + ]; + testHaskellDepends = [ + base directory doctest errors filepath github mtl + neat-interpolation optparse-applicative regex-applicative shelly + text time unix vector + ]; + description = "Tool for semi-automatic updating of nixpkgs repository"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "nkjp" = callPackage ({ mkDerivation, base, bytestring, containers, data-named, filepath , polysoup, tar, text, zlib @@ -156894,8 +156671,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.14.5"; - sha256 = "0iiai5f2n8f29p52h4fflhngbh8fj9rrgwfz4nnfhjbrdc0irmz8"; + version = "0.14.8"; + sha256 = "1zxd6n6lsfqdm5w64v2w6wnm70jj9d4n9nqw5pxnmclad1hc38zl"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -156919,41 +156696,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pandoc-citeproc_0_14_7" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , Cabal, containers, data-default, directory, filepath, hs-bibutils - , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051 - , setenv, split, syb, tagsoup, temporary, text, time - , unordered-containers, vector, xml-conduit, yaml - }: - mkDerivation { - pname = "pandoc-citeproc"; - version = "0.14.7"; - sha256 = "18r0pqv170yrsvgarj4xlpgmanydycqq9akxlnp1pkinqhs24iyd"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051 - setenv split syb tagsoup text time unordered-containers vector - xml-conduit yaml - ]; - executableHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring filepath pandoc - pandoc-types syb text yaml - ]; - testHaskellDepends = [ - aeson base bytestring containers directory filepath mtl pandoc - pandoc-types process temporary text yaml - ]; - doCheck = false; - description = "Supports using pandoc with citeproc"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pandoc-citeproc-preamble" = callPackage ({ mkDerivation, base, directory, filepath, pandoc-types, process }: @@ -157243,8 +156985,31 @@ self: { }: mkDerivation { pname = "pandoc-types"; - version = "1.17.5.1"; - sha256 = "1q6v2bynij724fv347mhqxdscwifzrx5jb9mq80608qf638fn717"; + version = "1.17.5.2"; + sha256 = "0hppl6drhl4xqav35jybji8g8cpy336mqkp0zb66kdsjya9inpqb"; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq ghc-prim QuickCheck syb + transformers + ]; + testHaskellDepends = [ + aeson base bytestring containers HUnit QuickCheck string-qq syb + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Types for representing a structured document"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "pandoc-types_1_17_5_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , transformers + }: + mkDerivation { + pname = "pandoc-types"; + version = "1.17.5.3"; + sha256 = "1yrbad67jz8mgdyhl2hvah42g31iwnbvldp16jw87v96y0cbdl72"; libraryHaskellDepends = [ aeson base bytestring containers deepseq ghc-prim QuickCheck syb transformers @@ -157256,6 +157021,7 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Types for representing a structured document"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-unlit" = callPackage @@ -158944,8 +158710,8 @@ self: { }: mkDerivation { pname = "patch-image"; - version = "0.3.2"; - sha256 = "00zjpbhw5886zc4cmflqw4721kvndyc7r3i7p5493visqr0d1hvk"; + version = "0.3.2.1"; + sha256 = "1z8m3lfdd2izb6riqzscc40kk8wc7588l24214sg0bkampss1ysg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -160825,6 +160591,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "persistent-mysql-haskell_0_5_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , io-streams, monad-logger, mysql-haskell, network, persistent + , persistent-template, resource-pool, resourcet, text, time, tls + , transformers, unliftio-core + }: + mkDerivation { + pname = "persistent-mysql-haskell"; + version = "0.5.0"; + sha256 = "047mlzrav06pm7fpz2x6v6il1gbbm8g0f5s1lvsa2kzmmbvbl4fg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers io-streams monad-logger + mysql-haskell network persistent resource-pool resourcet text time + tls transformers unliftio-core + ]; + executableHaskellDepends = [ + base monad-logger persistent persistent-template transformers + ]; + description = "A pure haskell backend for the persistent library using MySQL database server"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent-odbc" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , convertible, HDBC, HDBC-odbc, monad-control, monad-logger @@ -161650,8 +161441,8 @@ self: { }: mkDerivation { pname = "phoityne-vscode"; - version = "0.0.26.0"; - sha256 = "168qshbiawj1i7d676y2x5l2bmkhfvnf0fs2abr75v8g7hsa8imq"; + version = "0.0.27.0"; + sha256 = "1kx06kf700a849ivfnr36zs1sk7a5al71hx1h7w8b1agklf1kvzn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -163699,52 +163490,73 @@ self: { ({ mkDerivation, aeson, aeson-pretty, aeson-qq, ansi-terminal , approximate, array, async, atomic-primops, base, base-orphans , base16-bytestring, bits, bytestring, bytestring-lexing - , case-insensitive, cborg, comonad, compact, constraints - , containers, contravariant, contravariant-extras, deepseq - , distributive, dlist, double-conversion, Earley, envparse, erf - , exceptions, extra, fgl, filepath, foldl, free, gauge - , generic-aeson, half, hashable, heaps, hedgehog + , case-insensitive, cborg, comonad, compact, compactable + , constraints, containers, contravariant, contravariant-extras + , deepseq, Diff, distributive, dlist, double-conversion, Earley + , email-validate, erf, exact-pi, exceptions, extra, fast-digits + , fgl, filepath, foldl, free, generic-aeson, generic-lens, half + , hashable, heaps, ilist, insert-ordered-containers , integer-logarithms, lens, lens-aeson, list-transformer, logict , managed, megaparsec, mmorph, monad-ste, mtl, multiset, mwc-random - , network, network-info, network-uri, nf, optparse-applicative - , parallel, parser-combinators, pointed, prettyprinter - , prettyprinter-ansi-terminal, primitive, profunctors, psqueues - , reactive-banana, reflection, regex-applicative, scientific + , neat-interpolation, network, network-info, network-uri, nf + , optparse-applicative, parallel, parser-combinators, pointed + , prettyprinter, prettyprinter-ansi-terminal, primitive + , profunctors, psqueues, random-bytestring, reactive-banana + , reflection, regex-applicative, safe, say, scientific , semigroupoids, semigroups, semilattices, serialise, split, stm - , stm-chans, stm-containers, tagged, text, text-short, time - , transformers, transformers-base, transformers-compat - , typed-process, unagi-chan, unix, unliftio, unordered-containers - , utf8-string, uuid, uuid-types, vault, vector, vector-builder - , weigh, writer-cps-mtl + , stm-chans, stm-containers, stringsearch, tagged, text + , text-metrics, text-short, time, transformers, transformers-base + , transformers-compat, typed-process, unagi-chan, unique, unix + , unliftio, unordered-containers, utf8-string, uuid, uuid-types + , vault, vector, vector-builder, writer-cps-mtl }: mkDerivation { pname = "planet-mitchell"; - version = "0.0.0"; - sha256 = "1grz5vbcz169bw9w4b85w7g59hfsif99qg11x0nwm5jb9a6chkhp"; + version = "0.1.0"; + sha256 = "0i9fhv17q6i7gim7k3kklivyg5c4kmxfhlfsdljpdv5sy8hl3jh1"; libraryHaskellDepends = [ aeson aeson-pretty aeson-qq ansi-terminal approximate array async atomic-primops base base-orphans base16-bytestring bits bytestring bytestring-lexing case-insensitive cborg comonad compact - constraints containers contravariant contravariant-extras deepseq - distributive dlist double-conversion Earley envparse erf exceptions - extra fgl filepath foldl free gauge generic-aeson half hashable - heaps hedgehog integer-logarithms lens lens-aeson list-transformer - logict managed megaparsec mmorph monad-ste mtl multiset mwc-random - network network-info network-uri nf optparse-applicative parallel - parser-combinators pointed prettyprinter - prettyprinter-ansi-terminal primitive profunctors psqueues - reactive-banana reflection regex-applicative scientific - semigroupoids semigroups semilattices serialise split stm stm-chans - stm-containers tagged text text-short time transformers - transformers-base transformers-compat typed-process unagi-chan unix - unliftio unordered-containers utf8-string uuid uuid-types vault - vector vector-builder weigh writer-cps-mtl + compactable constraints containers contravariant + contravariant-extras deepseq Diff distributive dlist + double-conversion Earley email-validate erf exact-pi exceptions + extra fast-digits fgl filepath foldl free generic-aeson + generic-lens half hashable heaps ilist insert-ordered-containers + integer-logarithms lens lens-aeson list-transformer logict managed + megaparsec mmorph monad-ste mtl multiset mwc-random + neat-interpolation network network-info network-uri nf + optparse-applicative parallel parser-combinators pointed + prettyprinter prettyprinter-ansi-terminal primitive profunctors + psqueues random-bytestring reactive-banana reflection + regex-applicative safe say scientific semigroupoids semigroups + semilattices serialise split stm stm-chans stm-containers + stringsearch tagged text text-metrics text-short time transformers + transformers-base transformers-compat typed-process unagi-chan + unique unix unliftio unordered-containers utf8-string uuid + uuid-types vault vector vector-builder writer-cps-mtl ]; description = "Planet Mitchell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "planet-mitchell-test" = callPackage + ({ mkDerivation, gauge, hedgehog, hspec-expectations, tasty + , tasty-hedgehog, tasty-hunit, tasty-rerun, weigh + }: + mkDerivation { + pname = "planet-mitchell-test"; + version = "0.0.0"; + sha256 = "09nmdz34nz7gdq7x48pmimn966vrnlicg3q74a6m3r29vn9wh47d"; + libraryHaskellDepends = [ + gauge hedgehog hspec-expectations tasty tasty-hedgehog tasty-hunit + tasty-rerun weigh + ]; + description = "Planet Mitchell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "plankton" = callPackage ({ mkDerivation, adjunctions, base, protolude }: mkDerivation { @@ -168981,8 +168793,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.4.1"; - sha256 = "13adj770k3awgsdipjkwgfja6b1hkxdphf0aa4jayxm2jz9gkpbd"; + version = "5.5.0"; + sha256 = "0mcj3xsi125vcxf605h8fm4swg84b79iv01qnhv5vmp872dhmwbv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -173761,8 +173573,10 @@ self: { ({ mkDerivation, base, stm, time, time-units }: mkDerivation { pname = "rate-limit"; - version = "1.4.0"; - sha256 = "0p0bnfnn790kkpgj6v6646fbczznf28a65zsf92xyiab00jw6ilb"; + version = "1.4.1"; + sha256 = "0gm5jmi779niqsbgmkqqx6dsfw6yvfp4wlfibg9fzzmcc4i968g2"; + revision = "1"; + editedCabalFile = "01f3wf7q6117g2q5b9pp2rranxqyccmyl961r81151dpx21fiar7"; libraryHaskellDepends = [ base stm time time-units ]; description = "A basic library for rate-limiting IO actions"; license = stdenv.lib.licenses.bsd3; @@ -175077,8 +174891,8 @@ self: { }: mkDerivation { pname = "records-sop"; - version = "0.1.0.1"; - sha256 = "1832cgh1ry1slj10ff2qpxr6ibbvii7z1hvvdcwhyj55c31zrhlc"; + version = "0.1.0.2"; + sha256 = "187x3cq7h1rkmbv8qp810fcnr5y4byqwgw329v7f0s0px2vmg4h5"; libraryHaskellDepends = [ base deepseq generics-sop ghc-prim ]; testHaskellDepends = [ base deepseq generics-sop hspec should-not-typecheck @@ -179202,19 +179016,6 @@ self: { ({ mkDerivation, base, bytestring, containers }: mkDerivation { pname = "rfc5051"; - version = "0.1.0.3"; - sha256 = "0av4c3qvwbkbzrjrrg601ay9pds7wscqqp2lc2z78mv2lllap3g3"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base bytestring containers ]; - description = "Simple unicode collation as per RFC5051"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "rfc5051_0_1_0_4" = callPackage - ({ mkDerivation, base, bytestring, containers }: - mkDerivation { - pname = "rfc5051"; version = "0.1.0.4"; sha256 = "1lxkq414ni986ciml4gbvf463fn55z299knky7pq3ixb1qislpb1"; isLibrary = true; @@ -179222,7 +179023,6 @@ self: { libraryHaskellDepends = [ base bytestring containers ]; description = "Simple unicode collation as per RFC5051"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rgb-color-model" = callPackage @@ -186548,6 +186348,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-http2-client" = callPackage + ({ mkDerivation, aeson, async, base, binary, bytestring + , case-insensitive, containers, data-default-class, exceptions + , http-media, http-types, http2, http2-client, mtl, servant + , servant-client-core, text, tls, transformers + }: + mkDerivation { + pname = "servant-http2-client"; + version = "0.1.0.1"; + sha256 = "0jlbczbgbkjx4hai24csnd07r074s36g5hbpizhdxiqr3dcjk8pw"; + libraryHaskellDepends = [ + base binary bytestring case-insensitive containers exceptions + http-media http-types http2 http2-client mtl servant-client-core + text transformers + ]; + testHaskellDepends = [ + aeson async base binary bytestring case-insensitive containers + data-default-class exceptions http-media http-types http2 + http2-client mtl servant servant-client-core text tls transformers + ]; + description = "Generate HTTP2 clients from Servant API descriptions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-iCalendar" = callPackage ({ mkDerivation, base, data-default, http-media, iCalendar, servant }: @@ -187329,34 +187153,6 @@ self: { }) {}; "servant-swagger" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, bytestring, Cabal - , cabal-doctest, directory, doctest, filepath, hspec - , hspec-discover, http-media, insert-ordered-containers, lens - , QuickCheck, servant, singleton-bool, swagger2, text, time - , unordered-containers - }: - mkDerivation { - pname = "servant-swagger"; - version = "1.1.5"; - sha256 = "02m51kgwa2cp72wfq6a96zncywryrnxq778jh2cqmpzjrhml8yjg"; - revision = "5"; - editedCabalFile = "1c160wf4q0jyjg03w7hkwkbz0aprvmvzpwa5m944msik2kbvnyl5"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson base bytestring hspec http-media insert-ordered-containers - lens QuickCheck servant singleton-bool swagger2 text - unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-qq base directory doctest filepath hspec lens - QuickCheck servant swagger2 text time - ]; - testToolDepends = [ hspec-discover ]; - description = "Generate Swagger specification for your servant API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-swagger_1_1_6" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring , Cabal, cabal-doctest, directory, doctest, filepath, hspec , hspec-discover, http-media, insert-ordered-containers, lens @@ -187380,7 +187176,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Generate Swagger specification for your servant API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-swagger-ui" = callPackage @@ -188890,31 +188685,6 @@ self: { }: mkDerivation { pname = "shakespeare"; - version = "2.0.18"; - sha256 = "1ny9j1p12c134q5y7k2lg8qgf8sqa328vrb8md9ib44w3xwy6wjr"; - libraryHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim parsec process scientific template-haskell text - time transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim hspec HUnit parsec process template-haskell - text time transformers - ]; - description = "A toolkit for making compile-time interpolated templates"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "shakespeare_2_0_19" = callPackage - ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring - , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec - , process, scientific, template-haskell, text, time, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "shakespeare"; version = "2.0.19"; sha256 = "0h1nmdpizw4bvpkxlnrwq02r3wnk01z4jqid12hp30bi577yqd5l"; libraryHaskellDepends = [ @@ -188929,7 +188699,6 @@ self: { ]; description = "A toolkit for making compile-time interpolated templates"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -191383,23 +191152,6 @@ self: { }: mkDerivation { pname = "size-based"; - version = "0.1.1.0"; - sha256 = "1z6w3qdx34c6y4gbs0b9zshn5al55lxzc7mfyywm91vcwi361xki"; - revision = "1"; - editedCabalFile = "1rw9ddw1vyv9k47p0d79qbvngym005fmz00hqrg3p1rq2vlfjdv2"; - libraryHaskellDepends = [ - base dictionary-sharing template-haskell testing-type-modifiers - ]; - description = "Sized functors, for size-based enumerations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "size-based_0_1_2_0" = callPackage - ({ mkDerivation, base, dictionary-sharing, template-haskell - , testing-type-modifiers - }: - mkDerivation { - pname = "size-based"; version = "0.1.2.0"; sha256 = "06hmlic0n73ncwlkpx49xlv09bzsrr27ncnp5byhzlknak2gd7vp"; libraryHaskellDepends = [ @@ -191407,7 +191159,6 @@ self: { ]; description = "Sized functors, for size-based enumerations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sized" = callPackage @@ -191870,30 +191621,6 @@ self: { }: mkDerivation { pname = "slack-web"; - version = "0.2.0.6"; - sha256 = "1rydw71na7qninys7nqyn36mld5a5csvlsf01yzansnn2gvpdh2a"; - libraryHaskellDepends = [ - aeson base containers errors http-api-data http-client - http-client-tls megaparsec mtl servant servant-client - servant-client-core text time transformers - ]; - testHaskellDepends = [ - aeson base containers errors hspec http-api-data megaparsec text - time - ]; - description = "Bindings for the Slack web API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "slack-web_0_2_0_7" = callPackage - ({ mkDerivation, aeson, base, containers, errors, hspec - , http-api-data, http-client, http-client-tls, megaparsec, mtl - , servant, servant-client, servant-client-core, text, time - , transformers - }: - mkDerivation { - pname = "slack-web"; version = "0.2.0.7"; sha256 = "1jd8ca2d4bhq08ddqv87bnj2wqad89cqmsawvffl8mqki3hrca9x"; libraryHaskellDepends = [ @@ -194652,6 +194379,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "sop-core" = callPackage + ({ mkDerivation, base, deepseq }: + mkDerivation { + pname = "sop-core"; + version = "0.4.0.0"; + sha256 = "07ci2mh8cbjvipb576rxsj3iyhkj5c5dnsns4xkdppp2p3pv10d3"; + libraryHaskellDepends = [ base deepseq ]; + description = "True Sums of Products"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "sophia" = callPackage ({ mkDerivation, base, binary, bindings-sophia, bytestring , criterion, directory, tasty, tasty-hunit @@ -199102,6 +198840,58 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "store_0_5_0_1" = callPackage + ({ mkDerivation, array, async, base, base-orphans + , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector + , clock, containers, contravariant, criterion, cryptohash, deepseq + , directory, filepath, free, ghc-prim, hashable, hspec + , hspec-smallcheck, integer-gmp, lifted-base, monad-control + , mono-traversable, network, primitive, resourcet, safe, semigroups + , smallcheck, store-core, syb, template-haskell, text, th-lift + , th-lift-instances, th-orphans, th-reify-many, th-utilities, time + , transformers, unordered-containers, vector + , vector-binary-instances, void, weigh + }: + mkDerivation { + pname = "store"; + version = "0.5.0.1"; + sha256 = "0dpm7752p8lhlwq5nlhqxwq1c5nyi97rnj83j2im3i9wvs2qb3i3"; + libraryHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring containers contravariant cryptohash deepseq directory + filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp + lifted-base monad-control mono-traversable network primitive + resourcet safe semigroups smallcheck store-core syb + template-haskell text th-lift th-lift-instances th-orphans + th-reify-many th-utilities time transformers unordered-containers + vector void + ]; + testHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring cereal cereal-vector clock containers contravariant + criterion cryptohash deepseq directory filepath free ghc-prim + hashable hspec hspec-smallcheck integer-gmp lifted-base + monad-control mono-traversable network primitive resourcet safe + semigroups smallcheck store-core syb template-haskell text th-lift + th-lift-instances th-orphans th-reify-many th-utilities time + transformers unordered-containers vector vector-binary-instances + void weigh + ]; + benchmarkHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring containers contravariant criterion cryptohash deepseq + directory filepath free ghc-prim hashable hspec hspec-smallcheck + integer-gmp lifted-base monad-control mono-traversable network + primitive resourcet safe semigroups smallcheck store-core syb + template-haskell text th-lift th-lift-instances th-orphans + th-reify-many th-utilities time transformers unordered-containers + vector void + ]; + description = "Fast binary serialization"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "store-core" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, primitive, text , transformers @@ -207331,8 +207121,8 @@ self: { }: mkDerivation { pname = "text-format-heavy"; - version = "0.1.5.1"; - sha256 = "14hmzsxhbqr95r7sbpziv897akdw8p54fhwh56j0h9hqnpwxxwgd"; + version = "0.1.5.2"; + sha256 = "1rzzdbi16zndbsbsc83zd24ni2z1g6ndvjn3ylwagxr9xhh0iwp5"; libraryHaskellDepends = [ base bytestring containers data-default parsec text time ]; @@ -211412,6 +211202,8 @@ self: { pname = "toodles"; version = "0.1.0.9"; sha256 = "01gjxd4pclilm19iw7nkr23pmyavd7d9k0wa1c63hwhdzm1591f7"; + revision = "3"; + editedCabalFile = "08zadf5r79dpw9g0hg6lsnyvcnpprzb9d0lfs67kpyigm5ih9w8w"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -216497,22 +216289,6 @@ self: { }) {}; "union" = callPackage - ({ mkDerivation, base, criterion, deepseq, lens, profunctors - , tagged, vinyl - }: - mkDerivation { - pname = "union"; - version = "0.1.1.2"; - sha256 = "10nkcmql6ryh3vp02yxk3i1f6fbxdcsjk6s5ani89qa05448xqkw"; - revision = "5"; - editedCabalFile = "0mphzzvvr8lh1x8mb6n9nzzskx32cmr6ycihdy68qw35ybrqb0aj"; - libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ]; - benchmarkHaskellDepends = [ base criterion deepseq lens ]; - description = "Extensible type-safe unions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "union_0_1_2" = callPackage ({ mkDerivation, base, criterion, deepseq, hashable, lens , profunctors, tagged, vinyl }: @@ -216526,7 +216302,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq lens ]; description = "Extensible type-safe unions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "union-find" = callPackage @@ -229632,8 +229407,8 @@ self: { pname = "yampa-canvas"; version = "0.2.2"; sha256 = "0g1yvb6snnsbvy2f74lrlqff5zgnvfh2f6r8xdwxi61dk71qsz0n"; - revision = "6"; - editedCabalFile = "05bfjzmfvy4ir1bkky8iq4m988z4yww2k7h8s1na5i9w60c26d20"; + revision = "7"; + editedCabalFile = "1bj5ncrkwjpvjvrx0s23ksvwwsrybj7zl3sghl1d034wd9r89mxx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base blank-canvas stm time Yampa ]; @@ -229696,6 +229471,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yampa-test" = callPackage + ({ mkDerivation, base, Cabal, cabal-test-quickcheck + , normaldistribution, QuickCheck, random, Yampa + }: + mkDerivation { + pname = "yampa-test"; + version = "0.1.0.0"; + sha256 = "1d69qa8dzwsj6pawlg88vwv1r2ig2vnx11zbaq0pbl5hczfnknpd"; + libraryHaskellDepends = [ + base normaldistribution QuickCheck Yampa + ]; + testHaskellDepends = [ + base Cabal cabal-test-quickcheck QuickCheck random Yampa + ]; + description = "Testing library for Yampa"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "yampa2048" = callPackage ({ mkDerivation, base, gloss, random, Yampa }: mkDerivation { @@ -229979,24 +229772,6 @@ self: { }: mkDerivation { pname = "yeshql-core"; - version = "4.1.0.1"; - sha256 = "1v15n7h69j6v3zgvdbvy08l8in9z3yl9cbbfny4998i4p7fl2nzn"; - libraryHaskellDepends = [ - base containers convertible filepath parsec template-haskell - ]; - testHaskellDepends = [ - base containers stm tasty tasty-hunit tasty-quickcheck - ]; - description = "YesQL-style SQL database abstraction (core)"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yeshql-core_4_1_0_2" = callPackage - ({ mkDerivation, base, containers, convertible, filepath, parsec - , stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell - }: - mkDerivation { - pname = "yeshql-core"; version = "4.1.0.2"; sha256 = "1zhpccdqy8y5ynyn2ax7p9l2lvz573f559iqkip26ijq84pjmny0"; libraryHaskellDepends = [ @@ -230007,7 +229782,6 @@ self: { ]; description = "YesQL-style SQL database abstraction (core)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yeshql-hdbc" = callPackage @@ -230017,26 +229791,6 @@ self: { }: mkDerivation { pname = "yeshql-hdbc"; - version = "4.1.0.1"; - sha256 = "0a5wkjkq1lfqk5cv7wmxbx28j6r3xqj8bbkafxfjvs2s02x4qvvc"; - libraryHaskellDepends = [ - base containers convertible filepath HDBC parsec template-haskell - yeshql-core - ]; - testHaskellDepends = [ - base containers HDBC stm tasty tasty-hunit tasty-quickcheck - ]; - description = "YesQL-style SQL database abstraction (HDBC backend)"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yeshql-hdbc_4_1_0_2" = callPackage - ({ mkDerivation, base, containers, convertible, filepath, HDBC - , parsec, stm, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, yeshql-core - }: - mkDerivation { - pname = "yeshql-hdbc"; version = "4.1.0.2"; sha256 = "1p2j0fys7kdgb9882hiifnc1r4768c8jp7qy69ns1nbhd4f55b7l"; libraryHaskellDepends = [ @@ -230048,7 +229802,6 @@ self: { ]; description = "YesQL-style SQL database abstraction (HDBC backend)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yeshql-postgresql-simple" = callPackage @@ -230208,34 +229961,6 @@ self: { }: mkDerivation { pname = "yesod-auth"; - version = "1.6.4.1"; - sha256 = "1s1z39j7csp57py15w0il5bhi60y05b81abwfmccjllzzgs97m7j"; - libraryHaskellDepends = [ - aeson authenticate base base16-bytestring base64-bytestring binary - blaze-builder blaze-html blaze-markup bytestring conduit - conduit-extra containers cryptonite data-default email-validate - file-embed http-client http-client-tls http-conduit http-types - memory network-uri nonce persistent random safe shakespeare - template-haskell text time transformers unliftio unliftio-core - unordered-containers wai yesod-core yesod-form yesod-persistent - ]; - description = "Authentication for Yesod"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-auth_1_6_5" = callPackage - ({ mkDerivation, aeson, authenticate, base, base16-bytestring - , base64-bytestring, binary, blaze-builder, blaze-html - , blaze-markup, bytestring, conduit, conduit-extra, containers - , cryptonite, data-default, email-validate, file-embed, http-client - , http-client-tls, http-conduit, http-types, memory, network-uri - , nonce, persistent, random, safe, shakespeare, template-haskell - , text, time, transformers, unliftio, unliftio-core - , unordered-containers, wai, yesod-core, yesod-form - , yesod-persistent - }: - mkDerivation { - pname = "yesod-auth"; version = "1.6.5"; sha256 = "1crpqcx8zynwmas4ja5yv1jg4xvcv0hw7h11d5m8vld4fcs9dpdr"; libraryHaskellDepends = [ @@ -230249,7 +229974,6 @@ self: { ]; description = "Authentication for Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-account" = callPackage @@ -230794,42 +230518,6 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.8"; - sha256 = "010wjhf053bhivxascvlrxfmsqirhx6mf54aph3xblrkq8sx64hy"; - libraryHaskellDepends = [ - aeson auto-update base blaze-html blaze-markup byteable bytestring - case-insensitive cereal clientsession conduit conduit-extra - containers cookie deepseq fast-logger http-types monad-logger mtl - parsec path-pieces primitive random resourcet rio shakespeare - template-haskell text time transformers unix-compat unliftio - unordered-containers vector wai wai-extra wai-logger warp word8 - ]; - testHaskellDepends = [ - async base bytestring clientsession conduit conduit-extra - containers cookie hspec hspec-expectations http-types HUnit network - path-pieces random resourcet shakespeare streaming-commons - template-haskell text transformers unliftio wai wai-extra warp - ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring gauge shakespeare text - ]; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-core_1_6_8_1" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-html - , blaze-markup, byteable, bytestring, case-insensitive, cereal - , clientsession, conduit, conduit-extra, containers, cookie - , deepseq, fast-logger, gauge, hspec, hspec-expectations - , http-types, HUnit, monad-logger, mtl, network, parsec - , path-pieces, primitive, random, resourcet, rio, shakespeare - , streaming-commons, template-haskell, text, time, transformers - , unix-compat, unliftio, unordered-containers, vector, wai - , wai-extra, wai-logger, warp, word8 - }: - mkDerivation { - pname = "yesod-core"; version = "1.6.8.1"; sha256 = "0kqgpcz1jihc80haidzx6cm75ak139q41195j8l3gz1vwbf94i9j"; libraryHaskellDepends = [ @@ -230851,7 +230539,6 @@ self: { ]; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-crud" = callPackage @@ -231121,28 +230808,6 @@ self: { }: mkDerivation { pname = "yesod-form"; - version = "1.6.2"; - sha256 = "1p1x1hffvarplc82ykdk7rm6p5isqgqf78bvxzpfhncxs4kwx057"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-builder blaze-html blaze-markup - byteable bytestring containers data-default email-validate - network-uri persistent resourcet semigroups shakespeare text time - transformers wai xss-sanitize yesod-core yesod-persistent - ]; - testHaskellDepends = [ base hspec text time ]; - description = "Form handling support for Yesod Web Framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-form_1_6_3" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, byteable, bytestring, containers, data-default - , email-validate, hspec, network-uri, persistent, resourcet - , semigroups, shakespeare, text, time, transformers, wai - , xss-sanitize, yesod-core, yesod-persistent - }: - mkDerivation { - pname = "yesod-form"; version = "1.6.3"; sha256 = "15wvgrkqp57wrh8xv1ix86navy6llvagwp393w4b6azv758dims0"; libraryHaskellDepends = [ @@ -231154,7 +230819,6 @@ self: { testHaskellDepends = [ base hspec text time ]; description = "Form handling support for Yesod Web Framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-form-bootstrap4" = callPackage @@ -231526,27 +231190,6 @@ self: { }: mkDerivation { pname = "yesod-persistent"; - version = "1.6.0"; - sha256 = "1gd59xf7b6v3cald58mzwnfbdzjr49cz60rm4wc5w9pvfx12pgj2"; - libraryHaskellDepends = [ - base blaze-builder conduit persistent persistent-template - resource-pool resourcet transformers yesod-core - ]; - testHaskellDepends = [ - base blaze-builder conduit hspec persistent persistent-sqlite text - wai-extra yesod-core - ]; - description = "Some helpers for using Persistent from Yesod"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-persistent_1_6_0_1" = callPackage - ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent - , persistent-sqlite, persistent-template, resource-pool, resourcet - , text, transformers, wai-extra, yesod-core - }: - mkDerivation { - pname = "yesod-persistent"; version = "1.6.0.1"; sha256 = "0kxxm43d64lp4p7kmmpc9c0rany9nblf5dd1424m8wg3105cr2kl"; libraryHaskellDepends = [ @@ -231559,7 +231202,6 @@ self: { ]; description = "Some helpers for using Persistent from Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-platform" = callPackage @@ -231986,40 +231628,6 @@ self: { "yesod-static" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring - , blaze-builder, byteable, bytestring, conduit, containers - , cryptonite, cryptonite-conduit, css-text, data-default, directory - , exceptions, file-embed, filepath, hashable, hjsmin, hspec - , http-types, HUnit, memory, mime-types, old-time, process - , resourcet, template-haskell, text, transformers, unix-compat - , unordered-containers, wai, wai-app-static, wai-extra, yesod-core - , yesod-test - }: - mkDerivation { - pname = "yesod-static"; - version = "1.6.0"; - sha256 = "03l8jjn3pw7j38i91hakf1lgr4lf2lc610a783i7zhmr9f9ga2xx"; - libraryHaskellDepends = [ - async attoparsec base base64-bytestring blaze-builder byteable - bytestring conduit containers cryptonite cryptonite-conduit - css-text data-default directory exceptions file-embed filepath - hashable hjsmin http-types memory mime-types old-time process - resourcet template-haskell text transformers unix-compat - unordered-containers wai wai-app-static yesod-core - ]; - testHaskellDepends = [ - async base base64-bytestring byteable bytestring conduit containers - cryptonite cryptonite-conduit data-default directory exceptions - file-embed filepath hjsmin hspec http-types HUnit memory mime-types - old-time process resourcet template-haskell text transformers - unix-compat unordered-containers wai wai-app-static wai-extra - yesod-core yesod-test - ]; - description = "Static file serving subsite for Yesod Web Framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-static_1_6_0_1" = callPackage - ({ mkDerivation, async, attoparsec, base, base64-bytestring , blaze-builder, bytestring, conduit, containers, cryptonite , cryptonite-conduit, css-text, data-default, directory, file-embed , filepath, hashable, hjsmin, hspec, http-types, HUnit, memory @@ -232048,7 +231656,6 @@ self: { ]; description = "Static file serving subsite for Yesod Web Framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-static-angular" = callPackage @@ -232139,31 +231746,6 @@ self: { }: mkDerivation { pname = "yesod-test"; - version = "1.6.5"; - sha256 = "1n03h7rx9ixgvlf8isnr7b1g73fkpg8paiklr20b40x0yzvlc0my"; - libraryHaskellDepends = [ - attoparsec base blaze-builder blaze-html bytestring - case-insensitive conduit containers cookie hspec-core html-conduit - http-types HUnit network pretty-show semigroups text time - transformers wai wai-extra xml-conduit xml-types yesod-core - ]; - testHaskellDepends = [ - base bytestring containers hspec html-conduit http-types HUnit text - unliftio wai wai-extra xml-conduit yesod-core yesod-form - ]; - description = "integration testing for WAI/Yesod Applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-test_1_6_5_1" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html - , bytestring, case-insensitive, conduit, containers, cookie, hspec - , hspec-core, html-conduit, http-types, HUnit, network, pretty-show - , semigroups, text, time, transformers, unliftio, wai, wai-extra - , xml-conduit, xml-types, yesod-core, yesod-form - }: - mkDerivation { - pname = "yesod-test"; version = "1.6.5.1"; sha256 = "080m46nbjblna2b9gq8j4ngqsv0r5ww06p1v8cj3ia1qiqgjygsj"; libraryHaskellDepends = [ @@ -232178,7 +231760,6 @@ self: { ]; description = "integration testing for WAI/Yesod Applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-test-json" = callPackage @@ -233928,6 +233509,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "zip-stream_0_2_0_1" = callPackage + ({ mkDerivation, base, binary, binary-conduit, bytestring, conduit + , conduit-extra, digest, directory, exceptions, filepath, mtl + , primitive, resourcet, text, time, transformers, transformers-base + , zlib + }: + mkDerivation { + pname = "zip-stream"; + version = "0.2.0.1"; + sha256 = "11x58s5w1lr8hw86grxijd94sw5r8k376b8n4dlm8lqz5xhmri5p"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary binary-conduit bytestring conduit conduit-extra digest + exceptions mtl primitive resourcet text time transformers-base zlib + ]; + executableHaskellDepends = [ + base bytestring conduit conduit-extra directory filepath resourcet + text time transformers + ]; + description = "ZIP archive streaming using conduits"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "zipedit" = callPackage ({ mkDerivation, base, directory, mtl, process }: mkDerivation { diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 6155e158e9de..f4ebe549c502 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -245,12 +245,13 @@ rec { on hackage. This can be used as a test for the source distribution, assuming the build fails when packaging mistakes are in the cabal file. */ - buildFromSdist = pkg: lib.overrideDerivation pkg (drv: { - unpackPhase = let src = sdistTarball pkg; tarname = "${pkg.pname}-${pkg.version}"; in '' - echo "Source tarball is at ${src}/${tarname}.tar.gz" - tar xf ${src}/${tarname}.tar.gz - cd ${pkg.pname}-* - ''; + buildFromSdist = pkg: overrideCabal pkg (drv: { + src = "${sdistTarball pkg}/${pkg.pname}-${pkg.version}.tar.gz"; + + # Revising and jailbreaking the cabal file has been handled in sdistTarball + revision = null; + editedCabalFile = null; + jailbreak = false; }); /* Build the package in a strict way to uncover potential problems. diff --git a/pkgs/development/idris-modules/categories.nix b/pkgs/development/idris-modules/categories.nix index 1e234b3f6934..91ee174dadff 100644 --- a/pkgs/development/idris-modules/categories.nix +++ b/pkgs/development/idris-modules/categories.nix @@ -6,11 +6,10 @@ build-idris-package { name = "categories"; version = "2018-07-02"; - # https://github.com/danilkolikov/categories/pull/5 src = fetchFromGitHub { - owner = "infinisil"; + owner = "danilkolikov"; repo = "categories"; - rev = "9722d62297e5025431e91b271ab09c5d14867236"; + rev = "a1e0ac0f0da2e336a7d3900051892ff7ed504c35"; sha256 = "1bbmm8zif5d5wckdaddw6q3c39w6ms1cxrlrmkdn7bik88dawff2"; }; diff --git a/pkgs/development/idris-modules/derive.nix b/pkgs/development/idris-modules/derive.nix index 7b6cb64cfe37..7f3164f3160d 100644 --- a/pkgs/development/idris-modules/derive.nix +++ b/pkgs/development/idris-modules/derive.nix @@ -10,12 +10,11 @@ build-idris-package { idrisDeps = [ contrib pruviloj ]; - # https://github.com/david-christiansen/derive-all-the-instances/pull/9 src = fetchFromGitHub { - owner = "infinisil"; + owner = "david-christiansen"; repo = "derive-all-the-instances"; - rev = "61c3e12e26f599379299fcbb9c40a81bfc3e0604"; - sha256 = "0g2lb8nrwqwf3gm5fir43cxz6db84n19xiwkv8cmmqc1fgy6v0qn"; + rev = "0a9a5082d4ab6f879a2c141d1a7b645fa73fd950"; + sha256 = "06za15m1kv9mijzll5712crry4iwx3b0fjv76gy9vv1p10gy2g4m"; }; meta = { diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix index 081f1a547d69..85794b09ae0b 100644 --- a/pkgs/development/interpreters/bats/default.nix +++ b/pkgs/development/interpreters/bats/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ stdenv, fetchzip, gnugrep }: stdenv.mkDerivation rec { name = "bats-${version}"; @@ -9,7 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1kkh0j2alql3xiyhw9wsvcc3xclv52g0ivgyk8h85q9fn3qdqakz"; }; - patchPhase = "patchShebangs ./install.sh"; + patchPhase = '' + patchShebangs ./install.sh + substituteInPlace ./libexec/bats-core/bats-format-tap-stream --replace grep ${gnugrep}/bin/grep + ''; installPhase = "./install.sh $out"; diff --git a/pkgs/development/interpreters/elixir/1.7.nix b/pkgs/development/interpreters/elixir/1.7.nix index d97d416bc27d..adbbbaff890b 100644 --- a/pkgs/development/interpreters/elixir/1.7.nix +++ b/pkgs/development/interpreters/elixir/1.7.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation rec { - version = "1.7.3"; - sha256 = "0d7rj4khmvy76z12njzwzknm1j9rhjadgj9k1chjd4gnjffkb1aa"; + version = "1.7.4"; + sha256 = "0f8j4pib13kffiihagdwl3xqs3a1ak19qz3z8fpyfxn9dnjiinla"; minimumOTPVersion = "19"; } diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix index 7c6844fdec09..ea96e5ed334a 100644 --- a/pkgs/development/interpreters/spidermonkey/52.nix +++ b/pkgs/development/interpreters/spidermonkey/52.nix @@ -10,6 +10,9 @@ in stdenv.mkDerivation rec { sha256 = "1mlx34fgh1kaqamrkl5isf0npch3mm6s4lz3jsjb7hakiijhj7f0"; }; + outputs = [ "out" "dev" ]; + setOutputFlags = false; # Configure script only understands --includedir + buildInputs = [ readline icu zlib nspr ]; nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ]; @@ -32,6 +35,7 @@ in stdenv.mkDerivation rec { export CXXFLAGS="-fpermissive" export LIBXUL_DIST=$out export PYTHON="${python2.interpreter}" + configureFlagsArray+=("--includedir=$dev/include") cd js/src @@ -49,6 +53,12 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; + postInstall = '' + moveToOutput bin/js52-config "$dev" + # Nuke a static lib. + rm $out/lib/libjs_static.ajs + ''; + meta = with stdenv.lib; { description = "Mozilla's JavaScript engine written in C/C++"; homepage = https://developer.mozilla.org/en/SpiderMonkey; diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix index bca519c76283..f94e0a3ee780 100644 --- a/pkgs/development/libraries/arb/default.nix +++ b/pkgs/development/libraries/arb/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "arb"; - version = "2.14.0"; + version = "2.15.1"; src = fetchFromGitHub { owner = "fredrik-johansson"; repo = "${pname}"; rev = "${version}"; - sha256 = "1ndxg7h4xvccjgp5l9z2f8b66dsff6fhf86bn5n7f75a1ksd7554"; + sha256 = "148mn31xy4wgja2cainn2yaw1bjrppf1dxw2ngnvp7x5j7fms1am"; }; buildInputs = [mpir gmp mpfr flint]; configureFlags = [ diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index 01600f90f284..23d20f418c30 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -3,7 +3,7 @@ , enablePython ? false, pythonPackages , enablePosixThreads ? false , enableOpenMPThreads ? false}: -with stdenv.lib; +with stdenv.lib; stdenv.mkDerivation rec { name = "eccodes-${version}"; version = "2.9.0"; @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { sha256 = "1mh9zkfb5dj3j8fk3gdhz2bp6z13nik5pmynpf5l6qy3lhgyn17z"; }; + postPatch = '' + substituteInPlace cmake/FindOpenJPEG.cmake --replace openjpeg-2.1 ${openjpeg.incDir} + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ netcdf diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index c120f7c9b43f..fbe947e3afb1 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -3,29 +3,41 @@ stdenv.mkDerivation rec { version = "5.2.1"; name = "fmt-${version}"; + src = fetchFromGitHub { owner = "fmtlib"; repo = "fmt"; rev = "${version}"; sha256 = "1cd8yq8va457iir1hlf17ksx11fx2hlb8i4jml8gj1875pizm0pk"; }; + + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DFMT_TEST=TRUE" + "-DBUILD_SHARED_LIBS=${if enableShared then "TRUE" else "FALSE"}" + ]; + + enableParallelBuilding = true; + doCheck = true; # preCheckHook ensures the test binaries can find libfmt.so.5 preCheck = if enableShared then "export LD_LIBRARY_PATH=\"$PWD\"" else ""; - cmakeFlags = [ "-DFMT_TEST=yes" - "-DBUILD_SHARED_LIBS=${if enableShared then "ON" else "OFF"}" ]; + meta = with stdenv.lib; { - homepage = http://fmtlib.net/; description = "Small, safe and fast formatting library"; longDescription = '' fmt (formerly cppformat) is an open-source formatting library. It can be used as a fast and safe alternative to printf and IOStreams. ''; + homepage = http://fmtlib.net/; + downloadPage = https://github.com/fmtlib/fmt/; maintainers = [ maintainers.jdehaas ]; license = licenses.bsd2; - platforms = platforms.unix; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/gsignond/conf.patch b/pkgs/development/libraries/gsignond/conf.patch new file mode 100644 index 000000000000..0aa2034e3996 --- /dev/null +++ b/pkgs/development/libraries/gsignond/conf.patch @@ -0,0 +1,12 @@ +diff --git a/meson.build b/meson.build +index cb1e0df..d90c85c 100644 +--- a/meson.build ++++ b/meson.build +@@ -95,6 +95,6 @@ endif + configure_file( + input: 'gsignond.conf.in', + configuration: conf_data, +- install_dir: sysconf_dir, ++ install_dir: 'etc/', + output: 'gsignond.conf' + ) diff --git a/pkgs/development/libraries/gsignond/default.nix b/pkgs/development/libraries/gsignond/default.nix new file mode 100644 index 000000000000..11dcc2a2ee91 --- /dev/null +++ b/pkgs/development/libraries/gsignond/default.nix @@ -0,0 +1,69 @@ +{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, glib-networking +, sqlite, gobjectIntrospection, vala, gtk-doc, libsecret, docbook_xsl +, docbook_xml_dtd_43, docbook_xml_dtd_45, glibcLocales, makeWrapper +, symlinkJoin, gsignondPlugins, plugins }: + +let +unwrapped = stdenv.mkDerivation rec { + pname = "gsignond"; + version = "39022c86ddb5062a10fb0503ad9d81a8e532d527"; + + name = "${pname}-2018-10-04"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchFromGitLab { + owner = "accounts-sso"; + repo = pname; + rev = version; + sha256 = "1gw8vbj3j6wxqy759z97arm8lnqhmraw9s2frv3ar6crnfhlidff"; + }; + + nativeBuildInputs = [ + docbook_xml_dtd_43 + docbook_xml_dtd_45 + docbook_xsl + glibcLocales + gobjectIntrospection + gtk-doc + meson + ninja + pkgconfig + vala + ]; + + buildInputs = [ + glib + glib-networking + libsecret + ]; + + propagatedBuildInputs = [ sqlite ]; + + mesonFlags = [ + "-Dbus_type=session" + "-Dextension=desktop" + ]; + + LC_ALL = "en_US.UTF-8"; + + patches = [ + ./conf.patch + ./plugin-load-env.patch + ]; + + meta = with stdenv.lib; { + description = "D-Bus service which performs user authentication on behalf of its clients"; + homepage = https://gitlab.com/accounts-sso/gsignond; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +}; + +in if plugins == [] then unwrapped + else import ./wrapper.nix { + inherit stdenv makeWrapper symlinkJoin gsignondPlugins plugins; + gsignond = unwrapped; + } + diff --git a/pkgs/development/libraries/gsignond/plugin-load-env.patch b/pkgs/development/libraries/gsignond/plugin-load-env.patch new file mode 100644 index 000000000000..5da2b4c157e8 --- /dev/null +++ b/pkgs/development/libraries/gsignond/plugin-load-env.patch @@ -0,0 +1,35 @@ +diff --git a/src/gplugind/gsignond-plugin-loader.c b/src/gplugind/gsignond-plugin-loader.c +index 5497b32..979e1b4 100644 +--- a/src/gplugind/gsignond-plugin-loader.c ++++ b/src/gplugind/gsignond-plugin-loader.c +@@ -38,11 +38,10 @@ gsignond_load_plugin ( + gchar *plugin_filename; + GSignondPlugin *plugin; + +-# ifdef ENABLE_DEBUG + const gchar *env_val = g_getenv("SSO_GPLUGINS_DIR"); + if (env_val) + plugin_path = env_val; +-# endif ++ + plugin_filename = g_module_build_path (plugin_path, plugin_type); + plugin = gsignond_load_plugin_with_filename (plugin_type, + plugin_filename); +diff --git a/src/gplugind/main.c b/src/gplugind/main.c +index 1c6cdb6..c85c623 100644 +--- a/src/gplugind/main.c ++++ b/src/gplugind/main.c +@@ -93,11 +93,11 @@ _install_sighandlers (GMainLoop *main_loop) + static const gchar* _plugin_path(void) + { + const gchar *plugin_path = GSIGNOND_GPLUGINS_DIR; +-# ifdef ENABLE_DEBUG ++ + const gchar *env_val = g_getenv("SSO_GPLUGINS_DIR"); + if (env_val) + plugin_path = env_val; +-# endif ++ + return plugin_path; + } + diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix new file mode 100644 index 000000000000..a23c14878818 --- /dev/null +++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobjectIntrospection }: + +stdenv.mkDerivation rec { + name = "gsignond-plugin-lastfm-${version}"; + version = "2018-05-07"; + + src = fetchFromGitLab { + owner = "accounts-sso"; + repo = "gsignond-plugin-lastfm"; + rev = "0a7a5f8511282e45cfe35987b81f27f158f0648c"; + sha256 = "0ay6ir9zg9l0264x5xwd7c6j8qmwlhrifkkkjd1yrjh9sqxyfj7f"; + }; + + nativeBuildInputs = [ + gobjectIntrospection + meson + ninja + pkgconfig + vala + ]; + + buildInputs = [ + glib + gsignond + json-glib + libsoup + ]; + + PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; + + meta = with stdenv.lib; { + description = "Plugin for the Accounts-SSO gSignOn daemon handles the Last.FM credentials."; + homepage = https://gitlab.com/accounts-sso/gsignond-plugin-lastfm; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gsignond/plugins/mail.nix b/pkgs/development/libraries/gsignond/plugins/mail.nix new file mode 100644 index 000000000000..763e76c9cc94 --- /dev/null +++ b/pkgs/development/libraries/gsignond/plugins/mail.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, gobjectIntrospection }: + +stdenv.mkDerivation rec { + name = "gsignond-plugin-mail-${version}"; + version = "2018-10-04"; + + src = fetchFromGitLab { + owner = "accounts-sso"; + repo = "gsignond-plugin-mail"; + rev = "fbc6f34b246fec4ad2b37c696f8de7fdb9bde346"; + sha256 = "1wvwz7qiwvj8iixprip3qd8lplzfnwcjfrbg2vd8xfsvid2zbviw"; + }; + + nativeBuildInputs = [ + gobjectIntrospection + meson + ninja + pkgconfig + vala + ]; + + buildInputs = [ + glib + gsignond + ]; + + PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; + + meta = with stdenv.lib; { + description = "Plugin for the Accounts-SSO gSignOn daemon that handles the E-Mail credentials."; + homepage = https://gitlab.com/accounts-sso/gsignond-plugin-mail; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix new file mode 100644 index 000000000000..ee45430122c5 --- /dev/null +++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchFromGitLab, fetchpatch, pkgconfig, meson, ninja, glib, gsignond, check +, json-glib, libsoup, gnutls, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45 +, docbook_xsl, glibcLocales, gobjectIntrospection }: + +stdenv.mkDerivation rec { + name = "gsignond-plugin-oauth-${version}"; + version = "2018-10-15"; + + src = fetchFromGitLab { + owner = "accounts-sso"; + repo = "gsignond-plugin-oa"; + rev = "d471cebfd7c50567b1244277a9559f18f8d58691"; + sha256 = "00axl8wwp2arc6h4bpr4m3ik2hy8an0lbm48q2a9r94krmq56hnx"; + }; + + nativeBuildInputs = [ + check + docbook_xml_dtd_43 + docbook_xml_dtd_45 + docbook_xsl + glibcLocales + gobjectIntrospection + gtk-doc + meson + ninja + pkgconfig + ]; + + buildInputs = [ + glib + gnutls + gsignond + json-glib + libsoup + ]; + + LC_ALL = "en_US.UTF-8"; + + PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; + + meta = with stdenv.lib; { + description = "Plugin for the Accounts-SSO gSignOn daemon that handles the OAuth 1.0 and 2.0 authentication protocols."; + homepage = https://gitlab.com/accounts-sso/gsignond-plugin-oa; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix new file mode 100644 index 000000000000..25f205579066 --- /dev/null +++ b/pkgs/development/libraries/gsignond/plugins/sasl.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitLab, fetchpatch, pkgconfig, meson, ninja, glib, gsignond, gsasl, check +, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45, docbook_xsl, glibcLocales, gobjectIntrospection }: + +stdenv.mkDerivation rec { + name = "gsignond-plugin-sasl-${version}"; + version = "2018-10-15"; + + src = fetchFromGitLab { + owner = "accounts-sso"; + repo = "gsignond-plugin-sasl"; + rev = "b304c70b7dad9368b23b1205122d10de684c896a"; + sha256 = "0knzw7c2fm2kzs1gxbrm4kk67522w9cpwqj7xvn86473068k90va"; + }; + + nativeBuildInputs = [ + check + docbook_xml_dtd_43 + docbook_xml_dtd_45 + docbook_xsl + glibcLocales + gobjectIntrospection + gtk-doc + meson + ninja + pkgconfig + ]; + + buildInputs = [ + glib + gsasl + gsignond + ]; + + LC_ALL = "en_US.UTF-8"; + + PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; + + meta = with stdenv.lib; { + description = "Plugin for the Accounts-SSO gSignOn daemon that handles the SASL authentication protocol."; + homepage = https://gitlab.com/accounts-sso/gsignond-plugin-sasl; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gsignond/wrapper.nix b/pkgs/development/libraries/gsignond/wrapper.nix new file mode 100644 index 000000000000..a5df6bbeafb2 --- /dev/null +++ b/pkgs/development/libraries/gsignond/wrapper.nix @@ -0,0 +1,23 @@ +{ stdenv, makeWrapper, symlinkJoin, gsignond, gsignondPlugins, plugins }: + +symlinkJoin { + name = "gsignond-with-plugins-${gsignond.version}"; + + paths = [ gsignond ] ++ plugins; + + buildInputs = [ makeWrapper ]; + + postBuild = '' + wrapProgram $out/bin/gsignond \ + --set SSO_GPLUGINS_DIR "$out/lib/gsignond/gplugins" + + rm $out/share/dbus-1/services/com.google.code.AccountsSSO.gSingleSignOn.service + rm $out/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service + + substitute ${gsignond}/share/dbus-1/services/com.google.code.AccountsSSO.gSingleSignOn.service $out/share/dbus-1/services/com.google.code.AccountsSSO.gSingleSignOn.service \ + --replace ${gsignond} $out + + substitute ${gsignond}/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service $out/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service \ + --replace ${gsignond} $out + ''; +} diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index 769cc1c768c9..cf4069871d1d 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchFromGitHub }: +{ stdenv, cmake, ninja, fetchFromGitHub }: stdenv.mkDerivation rec { name = "gtest-${version}"; version = "1.8.1"; @@ -10,24 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0270msj6n7mggh4xqqjp54kswbl7mkcc8px1p5dqdpmw5ngh9fzk"; }; - buildInputs = [ cmake ]; - - configurePhase = '' - mkdir build - cd build - cmake ../ -DCMAKE_INSTALL_PREFIX=$out - ''; - - installPhase = '' - mkdir -p $out/lib - cp -v googlemock/gtest/libgtest.a googlemock/gtest/libgtest_main.a googlemock/libgmock.a googlemock/libgmock_main.a $out/lib - ln -s $out/lib/libgmock.a $out/lib/libgoogletest.a - mkdir -p $out/include - cp -v -r ../googlemock/include/gmock $out/include - cp -v -r ../googletest/include/gtest $out/include - mkdir -p $out/src - cp -v -r ../googlemock/src/* ../googletest/src/* $out/src - ''; + nativeBuildInputs = [ cmake ninja ]; meta = with stdenv.lib; { description = "Google's framework for writing C++ tests"; diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index 4da9db3ef047..f445f90f308f 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -1,30 +1,38 @@ -{stdenv, fetchurl -, automake, autoconf, libtool, which, gtkdoc, gettext, pkgconfig, gobjectIntrospection, libxslt -, glib, systemd, libusb1, vala_0_38 +{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gobjectIntrospection +, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44 +, glib, systemd, libusb1, vala, hwdata }: stdenv.mkDerivation rec { name = "gusb-${version}"; - version = "0.2.11"; - enableParallelBuilding = true; + version = "0.3.0"; + + outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz"; - sha256 = "1pppz17lw3khyz8by1dddxdqrv6qn4a23fpxs38c67db7x4l7ccw"; + sha256 = "1p4f6jdjw6zl986f93gzdjg2hdcn5dlz6rcckcz4rbmnk47rbryq"; }; - preConfigure = "./autogen.sh"; - - nativeBuildInputs = [ pkgconfig autoconf automake libtool which gtkdoc gettext - gobjectIntrospection libxslt vala_0_38 ]; - buildInputs = [ systemd glib ]; + nativeBuildInputs = [ + meson ninja pkgconfig gettext + gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44 + gobjectIntrospection vala + ]; + buildInputs = [ systemd glib ]; propagatedBuildInputs = [ libusb1 ]; - meta = { + mesonFlags = [ + "-Dusb_ids=${hwdata}/share/hwdata/usb.ids" + ]; + + doCheck = false; # tests try to access USB + + meta = with stdenv.lib; { description = "GLib libusb wrapper"; - homepage = https://people.freedesktop.org/~hughsient/releases/; - license = stdenv.lib.licenses.lgpl21; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + homepage = https://github.com/hughsie/libgusb; + license = licenses.lgpl21; + maintainers = [ maintainers.marcweber ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/development/libraries/jitterentropy/default.nix new file mode 100644 index 000000000000..175097ef7855 --- /dev/null +++ b/pkgs/development/libraries/jitterentropy/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub }: +stdenv.mkDerivation rec { + name = "jitterentropy-${version}"; + version = "2.1.2"; + + src = fetchFromGitHub { + owner = "smuellerDD"; + repo = "jitterentropy-library"; + rev = "v${version}"; + sha256 = "10yl1hi0hysr53wzy2i8brs0qqnxh46mz3dcjh5mk0ad03wvbfsl"; + }; + + enableParallelBuilding = true; + + preInstall = '' + mkdir -p $out/include + ''; + + installFlags = [ + "PREFIX=$(out)" + ]; + + meta = { + description = "Provides a noise source using the CPU execution timing jitter"; + homepage = https://github.com/smuellerDD/jitterentropy-library; + license = with stdenv.lib.licenses; [ gpl2 bsd3 ]; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ johnazoidberg ]; + }; +} diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index e3d5c7d6424e..516702e2afef 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libcouchbase-${version}"; - version = "2.9.5"; + version = "2.10.0"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "18l3579b47l8d6nhv0xls8pybkqdmdkw8jg4inalnx3g7ydqfn00"; + sha256 = "08bvnd0m18qs5akbblf80l54khm1523fdiiajp7fj88vrs86nbi2"; }; cmakeFlags = "-DLCB_NO_MOCK=ON"; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index e2d7d09b259c..87c6bb03d4bb 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -16,11 +16,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-${version}"; - version = "1.12.1"; + version = "1.12.2"; src = fetchurl { url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "14l6bvgq76ls63qc9c448r435q9xiig0rv8ilx6rnjvlgg64h32p"; + sha256 = "1w8wkh03j5zdgbamyj7wv2f6k76kd0w4z04abxxf5b0mnplrb6vb"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index ba267b797870..d4c324d4f23b 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-usb-ids-path=${hwdata}/data/hwdata/usb.ids" - "--with-pci-ids-path=${hwdata}/data/hwdata/pci.ids" + "--with-usb-ids-path=${hwdata}/share/hwdata/usb.ids" + "--with-pci-ids-path=${hwdata}/share/hwdata/pci.ids" "--enable-gtk-doc" ]; diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix index 8cca5333d084..2f20150ad164 100644 --- a/pkgs/development/libraries/libqmatrixclient/default.nix +++ b/pkgs/development/libraries/libqmatrixclient/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "libqmatrixclient-${version}"; - version = "0.3.0.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "QMatrixClient"; repo = "libqmatrixclient"; rev = "v${version}"; - sha256 = "03pxmr4wa818fgqddkr2fkwz6pda538x3ic9yq7c40x98zqf55w5"; + sha256 = "1llzqjagvp91kcg26q5c4qw9aaz7wna3rh6k06rc3baivrjqf3cn"; }; buildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 1ac4a7185122..154e84cfd0a2 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -46,7 +46,7 @@ in { }; libressl_2_8 = generic { - version = "2.8.1"; - sha256 = "0hnga8j7svdbwcy01mh5pxssk7rxq4g5fc5vxrzhid0x1w2zfjrk"; + version = "2.8.2"; + sha256 = "1mag4lf3lmg2fh2yzkh663l69h4vjriadwl0zixmb50jkzjk3jxq"; }; } diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/pkgs/development/libraries/libsignon-glib/default.nix new file mode 100644 index 000000000000..2c0ef60bc635 --- /dev/null +++ b/pkgs/development/libraries/libsignon-glib/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchgit, pkgconfig, meson, ninja, vala, python3, gtk-doc, docbook_xsl, docbook_xml_dtd_43, docbook_xml_dtd_412, glib, check, gobjectIntrospection }: + +stdenv.mkDerivation rec { + pname = "libsignon-glib"; + version = "3639a2e90447e4640a03a44972560afe8f61aa48"; + + name = "${pname}-2018-10-24"; + + outputs = [ "out" "dev" "devdoc" "py" ]; + + src = fetchgit { + url = "https://gitlab.com/accounts-sso/${pname}"; + rev = version; + fetchSubmodules = true; + sha256 = "1cq19zbsx4c57dc5gp3shp8lzcr1hw2ynylpn1nkvfyyrx80m60w"; + }; + + nativeBuildInputs = [ + check + docbook_xml_dtd_412 + docbook_xml_dtd_43 + docbook_xsl + gobjectIntrospection + gtk-doc + meson + ninja + pkgconfig + python3 + vala + ]; + + buildInputs = [ + glib + python3.pkgs.pygobject3 + ]; + + mesonFlags = [ + "-Dintrospection=true" + "-Dpy-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" + ]; + + postPatch = '' + chmod +x build-aux/gen-error-map.py + patchShebangs build-aux/gen-error-map.py + ''; + + meta = with stdenv.lib; { + description = '' + A library for managing single signon credentials which can be used from GLib applications + ''; + homepage = https://gitlab.com/accounts-sso/libsignon-glib; + license = licenses.lgpl21; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index ad8120d3591a..51b6cbd4ed52 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - rev = "0.6.35"; + rev = "0.7.0"; name = "libsolv-${rev}"; src = fetchFromGitHub { inherit rev; owner = "openSUSE"; repo = "libsolv"; - sha256 = "0jx1bmwwhjwfidwa0hrarwpcrf4ic068kapd4vb9m5y7xd4l55nq"; + sha256 = "02vz1yp516nh4vv0jdckll37mc373ddd363ip005xfbrbb2jr1xh"; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/libversion/default.nix b/pkgs/development/libraries/libversion/default.nix index 6e7005195bf0..6ca7b11321ba 100644 --- a/pkgs/development/libraries/libversion/default.nix +++ b/pkgs/development/libraries/libversion/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: let - version = "2.6.0"; + version = "2.7.0"; in stdenv.mkDerivation { name = "libversion-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { owner = "repology"; repo = "libversion"; rev = version; - sha256 = "0krhfycva3l4rhac5kx6x1a6fad594i9i77vy52rwn37j62bm601"; + sha256 = "0brk2mbazc7yz0h4zsvbybbaymf497dgxnc74qihnvbi4z4rlqpj"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix index 573215227369..f28ff1b0a21f 100644 --- a/pkgs/development/libraries/matio/default.nix +++ b/pkgs/development/libraries/matio/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "matio-1.5.12"; + name = "matio-1.5.13"; src = fetchurl { url = "mirror://sourceforge/matio/${name}.tar.gz"; - sha256 = "1afqjhc1wbm7g1vry3w30c7dbrxg6n4i482ybgx6l1b5wj0f75c6"; + sha256 = "1jz5760jn1cifr479znhmzksi8fp07j99jd8xdnxpjd79gsv5bgy"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix index f50b64fca3ed..8f72b333aa48 100644 --- a/pkgs/development/libraries/nanomsg/default.nix +++ b/pkgs/development/libraries/nanomsg/default.nix @@ -1,14 +1,14 @@ { stdenv, cmake, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "1.1.4"; + version = "1.1.5"; name = "nanomsg-${version}"; src = fetchFromGitHub { owner = "nanomsg"; repo = "nanomsg"; rev = version; - sha256 = "11mxbhkxkzqwdmpl79mfiiqby7zawgkalips7zr0bbdfyhq7jyrl"; + sha256 = "01ddfzjlkf2dgijrmm3j3j8irccsnbgfvjcnwslsfaxnrmrq5s64"; }; buildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix index d0f992efb2bc..87f9b5effacd 100644 --- a/pkgs/development/libraries/neon/0.29.nix +++ b/pkgs/development/libraries/neon/0.29.nix @@ -40,9 +40,10 @@ stdenv.mkDerivation rec { checkInputs = [ perl ]; doCheck = false; # fails, needs the net - meta = { + meta = with stdenv.lib; { description = "An HTTP and WebDAV client library"; homepage = http://www.webdav.org/neon/; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index 7aad5be36f70..61a40753a56f 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -40,9 +40,10 @@ stdenv.mkDerivation rec { checkInputs = [ perl ]; doCheck = false; # fails, needs the net - meta = { + meta = with stdenv.lib; { description = "An HTTP and WebDAV client library"; homepage = http://www.webdav.org/neon/; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index 7d0e934d911c..0c597fc4b335 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -43,5 +43,8 @@ in stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; homepage = https://www.unidata.ucar.edu/software/netcdf/; + license = { + url = https://www.unidata.ucar.edu/software/netcdf/docs/copyright.html; + }; }; } diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index d3a4b21b4b61..cc5a115ed71e 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, nix, cmake, pkgconfig, boost }: -let version = "5.0.0"; in +let version = "6.0.0"; in stdenv.mkDerivation { name = "nix-plugins-${version}"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { owner = "shlevy"; repo = "nix-plugins"; rev = version; - sha256 = "0231j92504vx0f4wax9hwjdni1j4z0g8bx9wbakg6rbghl4svmdv"; + sha256 = "08kxdci0sijj1hfkn3dbr7nbpb9xck0xr3xa3a0j116n4kvwb6qv"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/notify-sharp/default.nix b/pkgs/development/libraries/notify-sharp/default.nix index c7e133d94b23..3c5ae8537a41 100644 --- a/pkgs/development/libraries/notify-sharp/default.nix +++ b/pkgs/development/libraries/notify-sharp/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "D-Bus for .NET"; platforms = platforms.linux; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 9cb7d701b9da..cdbd57d785f8 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -35,9 +35,10 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = http://www.mozilla.org/projects/nspr/; description = "Netscape Portable Runtime, a platform-neutral API for system-level and libc-like functions"; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.mpl20; }; } diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 3089e6da23ae..8a3de28b7842 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.38"; + version = "3.39"; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_3_38_RTM/src/${name}.tar.gz"; - sha256 = "0qigcy3d169cf67jzv3rbai0m6dn34vp8h2z696mz4yn10y3sr1c"; + url = "mirror://mozilla/security/nss/releases/NSS_3_39_RTM/src/${name}.tar.gz"; + sha256 = "0jw6qlfl2g47hhx056nvnj6h92bk3sn46hy3ig61a911dzblvrkb"; }; buildInputs = [ perl zlib sqlite ] @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { preConfigure = "cd nss"; makeFlags = [ - "NSPR_INCLUDE_DIR=${nspr.dev}/include/nspr" + "NSPR_INCLUDE_DIR=${nspr.dev}/include" "NSPR_LIB_DIR=${nspr.out}/lib" "NSDISTMODE=copy" "BUILD_OPT=1" diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index 44c8f51e856a..25e084bfb74a 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -25,10 +25,10 @@ stdenv.mkDerivation rec { sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c ''; - meta = { + meta = with stdenv.lib; { description = "Network Connectivity Tracking library for Desktop Applications"; homepage = https://launchpad.net/ntrack; - platforms = stdenv.lib.platforms.linux; - maintainers = [ ]; + platforms = platforms.linux; + license = licenses.lgpl3Plus; }; } diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix index b67288296606..aa1886508609 100644 --- a/pkgs/development/libraries/ode/default.nix +++ b/pkgs/development/libraries/ode/default.nix @@ -9,8 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0l63ymlkgfp5cb0ggqwm386lxmc3al21nb7a07dd49f789d33ib5"; }; - meta = { + meta = with stdenv.lib; { description = "Open Dynamics Engine"; - platforms = stdenv.lib.platforms.linux; + homepage = https://sourceforge.net/projects/opende; + platforms = platforms.linux; + license = with licenses; [ bsd3 lgpl21 lgpl3 zlib ]; }; } diff --git a/pkgs/development/libraries/opal/default.nix b/pkgs/development/libraries/opal/default.nix index f86e4d120976..1658e831ddd1 100644 --- a/pkgs/development/libraries/opal/default.nix +++ b/pkgs/development/libraries/opal/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ptlib srtp libtheora speex ffmpeg x264 cyrus_sasl openldap openssl expat unixODBC ]; - propagatedBuildInputs = [ speex ]; + propagatedBuildInputs = [ speex ]; configureFlags = [ "--enable-h323" ]; @@ -21,11 +21,12 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-D__STDC_CONSTANT_MACROS=1 -std=gnu++98"; patches = [ ./disable-samples-ftbfs.diff ./libav9.patch ./libav10.patch ]; - + meta = with stdenv.lib; { description = "VoIP library"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; + license = with licenses; [ bsdOriginal mpl10 gpl2Plus lgpl21 ]; }; passthru = { diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index 6af15d90cefd..4a12217443c5 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -25,10 +25,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; homepage = http://www.opencascade.org/; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + maintainers = [ maintainers.viric ]; + platforms = platforms.linux; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix index 2724976c5ae8..e0a6c6a5705e 100644 --- a/pkgs/development/libraries/opencsg/default.nix +++ b/pkgs/development/libraries/opencsg/default.nix @@ -26,13 +26,12 @@ stdenv.mkDerivation rec { cp license.txt "$out/share/doc/opencsg" ''; - meta = { + meta = with stdenv.lib; { description = "Constructive Solid Geometry library"; homepage = http://www.opencsg.org/; - platforms = with stdenv.lib.platforms; - linux; - maintainers = with stdenv.lib.maintainers; - [raskin]; + platforms = platforms.linux; + maintainers = [ maintainers.raskin ]; + license = licenses.gpl2; }; } diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix index a073a29b507d..f954aaf72457 100644 --- a/pkgs/development/libraries/opendbx/default.nix +++ b/pkgs/development/libraries/opendbx/default.nix @@ -15,4 +15,10 @@ stdenv.mkDerivation rec { ''; buildInputs = [ readline mysql.connector-c postgresql sqlite ]; + + meta = with stdenv.lib; { + description = "Extremely lightweight but extensible database access library written in C"; + license = licenses.lgpl21; + platforms = platforms.all; + }; } diff --git a/pkgs/development/libraries/openjpeg/2.1.nix b/pkgs/development/libraries/openjpeg/2.x.nix index d18c971dc112..d18c971dc112 100644 --- a/pkgs/development/libraries/openjpeg/2.1.nix +++ b/pkgs/development/libraries/openjpeg/2.x.nix diff --git a/pkgs/development/libraries/openpam/default.nix b/pkgs/development/libraries/openpam/default.nix index 7d84392d204a..339f60649997 100644 --- a/pkgs/development/libraries/openpam/default.nix +++ b/pkgs/development/libraries/openpam/default.nix @@ -9,10 +9,11 @@ stdenv.mkDerivation rec { sha256 = "0pz8kf9mxj0k8yp8jgmhahddz58zv2b7gnyjwng75xgsx4i55xi2"; }; - meta = { + meta = with lib; { homepage = https://www.openpam.org; description = "An open source PAM library that focuses on simplicity, correctness, and cleanliness"; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ matthewbauer ]; + platforms = platforms.unix; + maintainers = with maintainers; [ matthewbauer ]; + license = licenses.bsd3; }; } diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix index 86015abb9817..973f83042737 100644 --- a/pkgs/development/libraries/openssl/chacha.nix +++ b/pkgs/development/libraries/openssl/chacha.nix @@ -76,6 +76,7 @@ stdenv.mkDerivation rec { description = "A cryptographic library that implements the SSL and TLS protocols"; platforms = [ "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.cstrahan ]; + license = licenses.openssl; priority = 10; # resolves collision with ‘man-pages’ }; } diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 87751188a03a..2ad4b8d904bf 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -51,6 +51,8 @@ let configureScript = { "x86_64-darwin" = "./Configure darwin64-x86_64-cc"; "x86_64-solaris" = "./Configure solaris64-x86_64-gcc"; + "armv6l-linux" = "./Configure linux-armv4 -march=armv6"; + "armv7l-linux" = "./Configure linux-armv4 -march=armv7-a"; }.${stdenv.hostPlatform.system} or ( if stdenv.hostPlatform == stdenv.buildPlatform then "./config" diff --git a/pkgs/development/libraries/pangoxsl/default.nix b/pkgs/development/libraries/pangoxsl/default.nix index aae6ed0f688a..b69ded648397 100644 --- a/pkgs/development/libraries/pangoxsl/default.nix +++ b/pkgs/development/libraries/pangoxsl/default.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation { pango ]; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Implements several of the inline properties defined by XSL that are not currently implemented by Pango."; + homepage = https://sourceforge.net/projects/pangopdf; + platforms = platforms.unix; + license = licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index b29388790d02..67f343d60380 100644 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { description = "GStreamer backend for Phonon"; platforms = platforms.linux; maintainers = with maintainers; [ ttuegel ]; + license = licenses.lgpl21; }; src = fetchurl { diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index 0487886a8966..773478f4dc03 100644 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { homepage = https://phonon.kde.org/; description = "GStreamer backend for Phonon"; platforms = platforms.linux; + license = with licenses; [ bsd3 lgpl2Plus ]; }; src = fetchurl { diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index acf531390226..1704703f8012 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -37,10 +37,10 @@ stdenv.mkDerivation rec { done ''; - meta = { + meta = with stdenv.lib; { homepage = http://podofo.sourceforge.net; description = "A library to work with the PDF file format"; - platforms = stdenv.lib.platforms.all; - maintainers = [ ]; + platforms = platforms.all; + license = with licenses; [ gpl2 lgpl2 ]; }; } diff --git a/pkgs/development/libraries/polkit-qt-1/qt-4.nix b/pkgs/development/libraries/polkit-qt-1/qt-4.nix index 54e10b965926..b13335561ac0 100644 --- a/pkgs/development/libraries/polkit-qt-1/qt-4.nix +++ b/pkgs/development/libraries/polkit-qt-1/qt-4.nix @@ -25,9 +25,10 @@ stdenv.mkDerivation { done ''; - meta = { + meta = with stdenv.lib; { description = "A Qt wrapper around PolKit"; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - platforms = with stdenv.lib.platforms; linux; + maintainers = [ maintainers.ttuegel ]; + platforms = platforms.linux; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix index edec0b7f0699..592a1f1470a4 100644 --- a/pkgs/development/libraries/popt/default.nix +++ b/pkgs/development/libraries/popt/default.nix @@ -15,8 +15,9 @@ stdenv.mkDerivation rec { doCheck = false; # fails - meta = { + meta = with stdenv.lib; { description = "Command line option parsing library"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/prison/default.nix b/pkgs/development/libraries/prison/default.nix index 29ff988a2266..d40b4442e38e 100644 --- a/pkgs/development/libraries/prison/default.nix +++ b/pkgs/development/libraries/prison/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Qt4 library for QR-codes"; - maintainers = [ ]; + license = stdenv.lib.licenses.mit; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/development/libraries/ptlib/default.nix b/pkgs/development/libraries/ptlib/default.nix index ae60a6f69d63..d425de243f50 100644 --- a/pkgs/development/libraries/ptlib/default.nix +++ b/pkgs/development/libraries/ptlib/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { description = "Portable Tools from OPAL VoIP"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; + license = with licenses; [ beerware bsdOriginal mpl10 ]; }; passthru = { diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix index 018a57ad0571..b5a01698e5e9 100644 --- a/pkgs/development/libraries/pupnp/default.nix +++ b/pkgs/development/libraries/pupnp/default.nix @@ -2,14 +2,15 @@ stdenv.mkDerivation rec { name = "libupnp-${version}"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "mrjimenez"; repo = "pupnp"; rev = "release-${version}"; - sha256 = "1w0kfq1pg3y2wl6gwkm1w872g0qz29w1z9wj08xxmwnk5mkpvsrl"; + sha256 = "1daml02z4rs9cxls95p2v24jvwcsp43a0gqv06s84ay5yn6r47wx"; }; + outputs = [ "dev" "out" ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix index 29202396c058..a7077c69dd8d 100644 --- a/pkgs/development/libraries/qjson/default.nix +++ b/pkgs/development/libraries/qjson/default.nix @@ -13,8 +13,10 @@ stdenv.mkDerivation rec { buildInputs = [ cmake qt4 ]; - meta = { - maintainers = [ ]; + meta = with stdenv.lib; { + description = "Lightweight data-interchange format"; + homepage = http://qjson.sourceforge.net/; + license = licenses.lgpl21; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix index d09c0d9a6ce0..0d9ae21e87e3 100644 --- a/pkgs/development/libraries/qoauth/default.nix +++ b/pkgs/development/libraries/qoauth/default.nix @@ -21,9 +21,9 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = [ "-I${qca2-qt5}/include/Qca-qt5/QtCrypto" ]; NIX_LDFLAGS = [ "-lqca-qt5" ]; - meta = { + meta = with stdenv.lib; { description = "Qt library for OAuth authentication"; inherit (qt5.qtbase.meta) platforms; - maintainers = [ ]; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix index c8b01c460803..85e45d3fad03 100644 --- a/pkgs/development/libraries/qrupdate/default.nix +++ b/pkgs/development/libraries/qrupdate/default.nix @@ -34,7 +34,10 @@ stdenv.mkDerivation { buildInputs = [ gfortran openblas ]; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Library for fast updating of qr and cholesky decompositions"; + homepage = https://sourceforge.net/projects/qrupdate/; + license = licenses.gpl3; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 0691f26b4712..95b82f8f3cff 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -84,7 +84,8 @@ stdenv.mkDerivation { passthru = {inherit mysqlSupport;}; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + license = with licenses; [ gpl2 qpl ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/qt-mobility/default.nix b/pkgs/development/libraries/qt-mobility/default.nix index 5cf49450422f..ae99035d2267 100644 --- a/pkgs/development/libraries/qt-mobility/default.nix +++ b/pkgs/development/libraries/qt-mobility/default.nix @@ -42,11 +42,12 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 libX11 bluez perl ]; - meta = { + meta = with stdenv.lib; { description = "Qt Mobility"; homepage = http://qt.nokia.com/products/qt-addons/mobility; - maintainers = with stdenv.lib.maintainers; [qknight]; - platforms = with stdenv.lib.platforms; linux; + maintainers = [ maintainers.qknight ]; + platforms = platforms.linux; + license = with licenses; [ bsd3 fdl13 gpl3 lgpl21 ]; }; } diff --git a/pkgs/development/libraries/qtscriptgenerator/default.nix b/pkgs/development/libraries/qtscriptgenerator/default.nix index 040072cb463e..88591e880dee 100644 --- a/pkgs/development/libraries/qtscriptgenerator/default.nix +++ b/pkgs/development/libraries/qtscriptgenerator/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation { description = "QtScript bindings generator"; homepage = https://code.qt.io/cgit/qt-labs/qtscriptgenerator.git/; inherit (qt4.meta) platforms; - maintainers = [ ]; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/readline/5.x.nix b/pkgs/development/libraries/readline/5.x.nix index 9e7c5c1d4e3b..84062408d45c 100644 --- a/pkgs/development/libraries/readline/5.x.nix +++ b/pkgs/development/libraries/readline/5.x.nix @@ -11,8 +11,10 @@ stdenv.mkDerivation { propagatedBuildInputs = [ncurses]; patches = stdenv.lib.optional stdenv.isDarwin ./shobj-darwin.patch; - meta = { + + meta = with stdenv.lib; { branch = "5"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.gpl2; }; } diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix new file mode 100644 index 000000000000..5294c779a32b --- /dev/null +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchFromGitHub, cmake, google-gflags, which +, lsb-release, glog, protobuf, cbc, zlib }: + +stdenv.mkDerivation rec { + name = "or-tools-${version}"; + version = "v6.9.1"; + + src = fetchFromGitHub { + owner = "google"; + repo = "or-tools"; + rev = version; + sha256 = "099j1mc7vvry0a2fiz9zvk6divivglzphv48wbw0c6nd5w8hb27c"; + }; + + # The original build system uses cmake which does things like pull + # in dependencies through git and Makefile creation time. We + # obviously don't want to do this so instead we provide the + # dependencies straight from nixpkgs and use the make build method. + configurePhase = '' + cat <<EOF > Makefile.local + UNIX_GFLAGS_DIR=${google-gflags} + UNIX_GLOG_DIR=${glog} + UNIX_PROTOBUF_DIR=${protobuf} + UNIX_CBC_DIR=${cbc} + EOF + ''; + + buildPhase = '' + make cc + ''; + + installPhase = '' + make install_cc prefix=$out + ''; + + patches = [ + # In "expected" way of compilation, the glog package is compiled + # with gflags support which then makes gflags header transitively + # included through glog. However in nixpkgs we don't compile glog + # with gflags so we have to include it ourselves. Upstream should + # always include gflags to support both ways I think. + # + # Upstream ticket: https://github.com/google/or-tools/issues/902 + ./gflags-include.patch + ]; + + nativeBuildInputs = [ + cmake lsb-release which zlib + ]; + propagatedBuildInputs = [ + google-gflags glog protobuf cbc + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/google/or-tools; + license = licenses.asl20; + description = '' + Google's software suite for combinatorial optimization. + ''; + maintainers = with maintainers; [ fuuzetsu ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/development/libraries/science/math/or-tools/gflags-include.patch b/pkgs/development/libraries/science/math/or-tools/gflags-include.patch new file mode 100644 index 000000000000..08f76180638b --- /dev/null +++ b/pkgs/development/libraries/science/math/or-tools/gflags-include.patch @@ -0,0 +1,12 @@ +diff --git a/ortools/data/jobshop_scheduling_parser.cc b/ortools/data/jobshop_scheduling_parser.cc +index cb0a360b..c2f055eb 100644 +--- a/ortools/data/jobshop_scheduling_parser.cc ++++ b/ortools/data/jobshop_scheduling_parser.cc +@@ -14,6 +14,7 @@ + #include "ortools/data/jobshop_scheduling_parser.h" + + #include <cmath> ++#include <gflags/gflags.h> + + #include "google/protobuf/wrappers.pb.h" + #include "ortools/base/filelineiter.h" diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index 03a801a32405..37ef0ce75271 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -1,26 +1,31 @@ -{ stdenv, fetchurl, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis +{ stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis , glew, libXrandr, libXrender, udev, xcbutilimage , IOKit, Foundation, AppKit, OpenAL }: let - version = "2.5.0"; + version = "2.5.1"; in stdenv.mkDerivation rec { name = "sfml-${version}"; - src = fetchurl { + + src = fetchzip { url = "https://github.com/SFML/SFML/archive/${version}.tar.gz"; - sha256 = "1x3yvhdrln5b6h4g5r4mds76gq8zsxw6icxqpwqkmxsqcq5yviab"; + sha256 = "0abr8ri2ssfy9ylpgjrr43m6rhrjy03wbj9bn509zqymifvq5pay"; }; - buildInputs = [ cmake libX11 freetype libjpeg openal flac libvorbis glew + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libX11 freetype libjpeg openal flac libvorbis glew libXrandr libXrender xcbutilimage ] ++ stdenv.lib.optional stdenv.isLinux udev ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ]; + cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes" "-DSFML_MISC_INSTALL_PREFIX=share/SFML" "-DSFML_BUILD_FRAMEWORKS=no" "-DSFML_USE_SYSTEM_DEPS=yes" ]; + meta = with stdenv.lib; { homepage = http://www.sfml-dev.org/; description = "Simple and fast multimedia library"; diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index dc3f4a118f6d..f795dfef9e4c 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -18,9 +18,10 @@ stdenv.mkDerivation rec { checkInputs = [ python ]; doCheck = false; # fails, probably missing something - meta = { + meta = with stdenv.lib; { description = "An advanced font engine"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.unix; + maintainers = [ maintainers.raskin ]; + platforms = platforms.unix; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix index 9fe88b771be7..ca2ff666b7a5 100644 --- a/pkgs/development/libraries/sofia-sip/default.nix +++ b/pkgs/development/libraries/sofia-sip/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { buildInputs = [ glib openssl ]; nativeBuildInputs = [ pkgconfig ]; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "Open-source SIP User-Agent library, compliant with the IETF RFC3261 specification"; + homepage = http://sofia-sip.sourceforge.net/; + platforms = platforms.linux; + license = licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix index b74c58a2e38c..6577ebeae28e 100644 --- a/pkgs/development/libraries/szip/default.nix +++ b/pkgs/development/libraries/szip/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation rec { name = "szip-${version}"; version = "2.1.1"; src = fetchurl { - url = "ftp://ftp.hdfgroup.org/lib-external/szip/${version}/src/szip-${version}.tar.gz"; - sha256 = "1a8415a7xifagb22aq9dmy7b2s5l0y6diany3b4qigylw6adlzc9"; + url = "https://support.hdfgroup.org/ftp/lib-external/szip/${version}/src/szip-${version}.tar.gz"; + sha256 = "04nlhkzzf1gihvrfbzc6rq4kc13p92ly39dzrb4y4jrd9y5rbvi1"; }; meta = { diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix index 8a76e886b4f6..b8e7518cd332 100644 --- a/pkgs/development/libraries/t1lib/default.nix +++ b/pkgs/development/libraries/t1lib/default.nix @@ -30,7 +30,10 @@ stdenv.mkDerivation { postInstall = stdenv.lib.optional (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ?? - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "A type 1 font rasterizer library for UNIX/X11"; + homepage = http://www.t1lib.org/; + license = with licenses; [ gpl2 lgpl2 ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/taglib-extras/default.nix b/pkgs/development/libraries/taglib-extras/default.nix index 0059243890d6..b667e6047400 100644 --- a/pkgs/development/libraries/taglib-extras/default.nix +++ b/pkgs/development/libraries/taglib-extras/default.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation rec { sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/modules/FindTaglib.cmake ''; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Additional taglib plugins"; + platforms = platforms.unix; + license = licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/taglib-sharp/default.nix b/pkgs/development/libraries/taglib-sharp/default.nix index 6da524c23390..86006806baa0 100644 --- a/pkgs/development/libraries/taglib-sharp/default.nix +++ b/pkgs/development/libraries/taglib-sharp/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "mono"; repo = "taglib-sharp"; - rev = "taglib-sharp-${version}"; sha256 = "12pk4z6ag8w7kj6vzplrlasq5lwddxrww1w1ya5ivxrfki15h5cp"; }; @@ -21,6 +20,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for reading and writing metadata in media files"; + homepage = https://github.com/mono/taglib-sharp; platforms = platforms.linux; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/taglib/1.9.nix b/pkgs/development/libraries/taglib/1.9.nix index 1caa8a376fb1..99892a41fa42 100644 --- a/pkgs/development/libraries/taglib/1.9.nix +++ b/pkgs/development/libraries/taglib/1.9.nix @@ -15,9 +15,8 @@ stdenv.mkDerivation rec { meta = { homepage = http://developer.kde.org/~wheeler/taglib.html; repositories.git = git://github.com/taglib/taglib.git; - description = "A library for reading and editing the meta-data of several popular audio formats"; inherit (cmake.meta) platforms; - maintainers = [ ]; + license = with stdenv.lib.licenses; [ lgpl21 mpl11 ]; }; } diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix index 67db6e5097d0..a2cb103a1821 100644 --- a/pkgs/development/libraries/taglib/default.nix +++ b/pkgs/development/libraries/taglib/default.nix @@ -15,6 +15,13 @@ stdenv.mkDerivation rec { url = "https://github.com/taglib/taglib/commit/eb9ded1206f18.patch"; sha256 = "1bvpxsvmlpi3by7myzss9kkpdkv405612n8ff68mw1ambj8h1m90"; }) + + (fetchpatch { + # https://github.com/taglib/taglib/pull/869 + name = "CVE-2018-11439.patch"; + url = "https://github.com/taglib/taglib/commit/272648ccfcccae30e002ccf34a22e075dd477278.patch"; + sha256 = "0p397qq4anvcm0p8xs68mxa8hg6dl07chg260lc6k2929m34xv72"; + }) ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/tclap/default.nix b/pkgs/development/libraries/tclap/default.nix index a92c7b74ebf7..293baa492c56 100644 --- a/pkgs/development/libraries/tclap/default.nix +++ b/pkgs/development/libraries/tclap/default.nix @@ -8,9 +8,10 @@ stdenv.mkDerivation rec { sha256 = "0dsqvsgzam3mypj2ladn6v1yjq9zd47p3lg21jx6kz5azkkkn0gm"; }; - meta = { + meta = with stdenv.lib; { homepage = http://tclap.sourceforge.net/; description = "Templatized C++ Command Line Parser Library"; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix index fae51aea477e..1247d9ffa843 100644 --- a/pkgs/development/libraries/telepathy/farstream/default.nix +++ b/pkgs/development/libraries/telepathy/farstream/default.nix @@ -12,7 +12,10 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ dbus-glib telepathy-glib farstream ]; nativeBuildInputs = [ pkgconfig ]; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "GObject-based C library that uses Telepathy GLib, Farstream and GStreamer to handle the media streaming part of channels of type Call"; + homepage = https://telepathy.freedesktop.org/wiki/Components/Telepathy-Farstream/; + platforms = platforms.linux; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index 9ca2481c3b01..ca6a4997abf4 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -22,8 +22,9 @@ stdenv.mkDerivation rec { passthru.python = python2; - meta = { + meta = with stdenv.lib; { homepage = https://telepathy.freedesktop.org; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = with licenses; [ bsd2 bsd3 lgpl21Plus ]; }; } diff --git a/pkgs/development/libraries/tidyp/default.nix b/pkgs/development/libraries/tidyp/default.nix index ba95da77b72c..51dabbd2beb7 100644 --- a/pkgs/development/libraries/tidyp/default.nix +++ b/pkgs/development/libraries/tidyp/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { homepage = http://tidyp.com/; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; + license = licenses.bsd3; }; } diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix index c716ae7f8dbb..03f8e20b38d0 100644 --- a/pkgs/development/libraries/uriparser/default.nix +++ b/pkgs/development/libraries/uriparser/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, cpptest, pkgconfig, doxygen, graphviz }: +{ stdenv, fetchurl, gtest, pkgconfig, doxygen, graphviz }: stdenv.mkDerivation rec { name = "uriparser-${version}"; - version = "0.8.6"; + version = "0.9.0"; # Release tarball differs from source tarball src = fetchurl { url = "https://github.com/uriparser/uriparser/releases/download/${name}/${name}.tar.bz2"; - sha256 = "0m2a5bf5b00ybagxmsa8mdj9mhc62vcm0qimy1ivfza1fbjsf287"; + sha256 = "0b2yagxzhq9ghpszci6a9xlqg0yl7vq9j5r8dwbar3nszqsfnrzc"; }; - nativeBuildInputs = [ pkgconfig cpptest doxygen graphviz ]; + nativeBuildInputs = [ pkgconfig gtest doxygen graphviz ]; doCheck = true; diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index c1f401d0badb..4aff60631834 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -71,11 +71,12 @@ in stdenv.mkDerivation rec { # screenshot output-layout multi-pointer rotation tablet touch pointer # simple mkdir -p $examples/bin - for binary in $(find ./examples -executable -type f | grep -vE '\.so'); do + cd ./examples + for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do patchelf \ --set-rpath "$examples/lib:${stdenv.lib.makeLibraryPath buildInputs}" \ "$binary" - cp "$binary" $examples/bin/ + cp "$binary" "$examples/bin/wlroots-$binary" done ''; diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix index 9c307b2d15ae..040273e28b99 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix @@ -1,60 +1,26 @@ -{ stdenv, fetchurl, fetchpatch, expat, libiconv, libjpeg, libpng, libtiff, zlib +{ stdenv, fetchzip, fetchpatch, expat, libiconv, libjpeg, libpng, libtiff, zlib # darwin only attributes -, derez, rez, setfile +, cf-private, derez, rez, setfile , AGL, Cocoa, Kernel }: -with stdenv.lib; - stdenv.mkDerivation rec { - version = "3.0.2"; + version = "3.0.4"; name = "wxmac-${version}"; - src = fetchurl { - url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2"; - sha256 = "346879dc554f3ab8d6da2704f651ecb504a22e9d31c17ef5449b129ed711585d"; + src = fetchzip { + url = "https://github.com/wxWidgets/wxWidgets/archive/v${version}.tar.gz"; + sha256 = "19mqglghjjqjgz4rbybn3qdgn2cz9xc511nq1pvvli9wx2k8syl1"; }; - patches = - [ # Use std::abs() from <cmath> instead of abs() from <math.h> to avoid problems - # with abiguous overloads for clang-3.8 and gcc6. - (fetchpatch { - name = "patch-stc-abs.diff"; - url = https://github.com/wxWidgets/wxWidgets/commit/73e9e18ea09ffffcaac50237def0d9728a213c02.patch; - sha256 = "0w5whmfzm8waw62jmippming0zffa9064m5b3aw5nixph21rlcvq"; - }) - - # Various fixes related to Yosemite. Revisit in next stable release. - # Please keep an eye on http://trac.wxwidgets.org/ticket/16329 as well - # Theoretically the above linked patch should still be needed, but it isn't. - # Try to find out why. - (fetchpatch { - name = "patch-yosemite.diff"; - url = https://raw.githubusercontent.com/Homebrew/formula-patches/bbf4995/wxmac/patch-yosemite.diff; - sha256 = "0ss66z2a79v976mvlrskyj1zmkyaz8hbwm98p29bscfvcx5845jb"; - }) - - # Remove uncenessary <QuickTime/QuickTime.h> includes - # http://trac.wxwidgets.org/changeset/f6a2d1caef5c6d412c84aa900cb0d3990b350938/git-wxWidgets - (fetchpatch { - name = "patch-quicktime-removal.diff"; - url = https://raw.githubusercontent.com/Homebrew/formula-patches/bbf4995/wxmac/patch-quicktime-removal.diff; - sha256 = "0mzvdk8r70p9s1wj7qzdsqmdrlxlf2dalh9gqs8xjkqq2666yp0y"; - }) - - # Patch for wxOSXPrintData, custom paper not applied - # http://trac.wxwidgets.org/ticket/16959 - (fetchpatch { - name = "wxPaperCustomPatch.patch"; - url = http://trac.wxwidgets.org/raw-attachment/ticket/16959/wxPaperCustomPatch.patch; - sha256 = "0xgscv86f8dhggn9n8bhlq9wlj3ydsicgy9v35sraxyma18cbjvl"; - }) - ]; - buildInputs = [ expat libiconv libjpeg libpng libtiff zlib derez rez setfile Cocoa Kernel + + # Needed for CFURLGetFSRef, etc. which have deen deprecated + # since 10.9 and are not part of swift-corelibs CoreFoundation. + cf-private ]; propagatedBuildInputs = [ AGL ]; @@ -98,7 +64,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { platforms = platforms.darwin; license = licenses.wxWindows; maintainers = [ maintainers.lnl7 ]; diff --git a/pkgs/development/libraries/xbase/default.nix b/pkgs/development/libraries/xbase/default.nix index 79f75abfd91c..3dd2cb5b874c 100644 --- a/pkgs/development/libraries/xbase/default.nix +++ b/pkgs/development/libraries/xbase/default.nix @@ -25,10 +25,10 @@ stdenv.mkDerivation { }) ]; - meta = { + meta = with stdenv.lib; { homepage = http://linux.techass.com/projects/xdb/; description = "C++ class library formerly known as XDB"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ ]; + platforms = platforms.linux; + license = licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index 69b5b95e7613..d86dac050731 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -26,9 +26,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = http://www.xine-project.org/; description = "A high-performance, portable and reusable multimedia playback engine"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = with licenses; [ gpl2 lgpl2 ]; }; } diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index b43deeceb867..4cb612523dc5 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -15,12 +15,12 @@ buildRustPackage rec { cargoSha256 = "0y2ww48vh667kkyg9pyjwcbh7fxi41bjnkhwp749crjqn2abimrk"; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/cgag/loc; description = "Count lines of code quickly"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ ]; - platforms = with stdenv.lib.platforms; linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/ocaml-modules/fmt/default.nix b/pkgs/development/ocaml-modules/fmt/default.nix index 2e7996f55d9d..2aa560e5349b 100644 --- a/pkgs/development/ocaml-modules/fmt/default.nix +++ b/pkgs/development/ocaml-modules/fmt/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner, result, uchar }: stdenv.mkDerivation { - name = "ocaml${ocaml.version}-fmt-0.8.4"; + name = "ocaml${ocaml.version}-fmt-0.8.5"; src = fetchurl { - url = http://erratique.ch/software/fmt/releases/fmt-0.8.4.tbz; - sha256 = "1qilsbisqqhmn8b1ar9lvjbgz8vf4gmqwqjnnjzgld2a3gmh8qvv"; + url = http://erratique.ch/software/fmt/releases/fmt-0.8.5.tbz; + sha256 = "1zj9azcxcn6skmb69ykgmi9z8c50yskwg03wqgh87lypgjdcz060"; }; unpackCmd = "tar xjf $src"; diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix index 2a101da74d55..ce9ddeea0c43 100644 --- a/pkgs/development/ocaml-modules/menhir/default.nix +++ b/pkgs/development/ocaml-modules/menhir/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild -, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20170712" else "20140422" +, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20181026" else "20140422" }@args: let - sha256 = - if version == "20140422" then "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d" - else if version == "20170712" then "006hq3bwj81j67f2k9cgzj5wr4hai8j36925p5n3sd2j01ljsj6a" - else throw ("menhir: unknown version " ++ version); + src = fetchurl ( + if version == "20140422" then { url = "http://cristal.inria.fr/~fpottier/menhir/menhir-20140422.tar.gz"; sha256 = "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d"; } + else if version == "20170712" then { url = "http://gallium.inria.fr/~fpottier/menhir/menhir-20170712.tar.gz"; sha256 = "006hq3bwj81j67f2k9cgzj5wr4hai8j36925p5n3sd2j01ljsj6a"; } + else if version == "20181026" then { url = "https://gitlab.inria.fr/fpottier/menhir/repository/20181026/archive.tar.gz"; sha256 = "1zhacw60996i9b88kbnfvrvjk3ps9p9n9syjk9np545jp8l0582g"; } + else throw ("menhir: unknown version " ++ version) + ); in -import ./generic.nix (args // { inherit version sha256; }) +import ./generic.nix (args // { inherit version src; }) diff --git a/pkgs/development/ocaml-modules/menhir/generic.nix b/pkgs/development/ocaml-modules/menhir/generic.nix index d52da82d6d76..bac6cd707940 100644 --- a/pkgs/development/ocaml-modules/menhir/generic.nix +++ b/pkgs/development/ocaml-modules/menhir/generic.nix @@ -1,12 +1,9 @@ -{ version, sha256, stdenv, fetchurl, ocaml, findlib, ocamlbuild }: +{ version, src, stdenv, fetchurl, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { name = "menhir-${version}"; - src = fetchurl { - url = "http://pauillac.inria.fr/~fpottier/menhir/menhir-${version}.tar.gz"; - inherit sha256; - }; + inherit src; buildInputs = [ ocaml findlib ocamlbuild ]; diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix index 8a8668df74ee..582b2dc8a2c0 100644 --- a/pkgs/development/ocaml-modules/vg/default.nix +++ b/pkgs/development/ocaml-modules/vg/default.nix @@ -11,7 +11,7 @@ let inherit (stdenv.lib) optionals versionAtLeast; pname = "vg"; - version = "0.9.0"; + version = "0.9.1"; webpage = "http://erratique.ch/software/${pname}"; in @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "1czd2fq85hy24w5pllarsq4pvbx9rda5zdikxfxdng8s9kff2h3f"; + sha256 = "07h9a464v0x066mjg3ldkaq94ah47b7rvh54z4rndrg7v6bk7kyp"; }; buildInputs = [ ocaml findlib ocamlbuild topkg ]; @@ -54,8 +54,8 @@ stdenv.mkDerivation rec { module. An API allows to implement new renderers. ''; homepage = "${webpage}"; - platforms = ocaml.meta.platforms or []; - license = licenses.bsd3; + inherit (ocaml.meta) platforms; + license = licenses.isc; maintainers = [ maintainers.jirkamarsik ]; }; } diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix index ab9839a21031..003bd5166570 100644 --- a/pkgs/development/python-modules/adal/default.nix +++ b/pkgs/development/python-modules/adal/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "adal"; - version = "1.0.2"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "4c020807b3f3cfd90f59203077dd5e1f59671833f8c3c5028ec029ed5072f9ce"; + sha256 = "1hgm62wil1avc3h0dwbks2v6l19xfsjl3azai16llsyp70y92lms"; }; propagatedBuildInputs = [ requests pyjwt dateutil ]; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index ec76d840a56b..14fca8dfe82f 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "3.3.2"; + version = "3.4.4"; src = fetchPypi { inherit pname version; - sha256 = "f20deec7a3fbaec7b5eb7ad99878427ad2ee4cc16a46732b705e8121cbb3cc12"; + sha256 = "1ykm6kdjkrg556j0zd7dx2l1rsrbh0d9g27ivr6dmaahz9pyrbsi"; }; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix index b8ee673e66bb..163e2c9b2099 100644 --- a/pkgs/development/python-modules/aniso8601/default.nix +++ b/pkgs/development/python-modules/aniso8601/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "aniso8601"; - version = "3.0.2"; + version = "4.0.1"; meta = with stdenv.lib; { description = "Parses ISO 8601 strings."; @@ -15,6 +15,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "7849749cf00ae0680ad2bdfe4419c7a662bef19c03691a19e008c8b9a5267802"; + sha256 = "15cwnadw2xdczdi13k9grrgqq67hxgys4l155dqsl2zh3glhsmp7"; }; } diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index acbd7c2ec65b..84b43fbcfa9a 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "astropy"; - version = "3.0.4"; + version = "3.0.5"; disabled = !isPy3k; # according to setup.py @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "f5d37d20632ba74bd0b12a85179c12f64a9ea037ffc916d8a2de3be4f4656c76"; + sha256 = "0xldn6mh97pnkq915bacj8my9gy2kx58rrdm44496qla5i1gzlc2"; }; propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix index ee15be954186..aabf30183d56 100644 --- a/pkgs/development/python-modules/async_timeout/default.nix +++ b/pkgs/development/python-modules/async_timeout/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "async-timeout"; - version = "3.0.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "b3c0ddc416736619bd4a95ca31de8da6920c3b9a140c64dbef2b2fa7bf521287"; + sha256 = "0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f"; }; # Circular dependency on aiohttp diff --git a/pkgs/development/python-modules/augeas/default.nix b/pkgs/development/python-modules/augeas/default.nix index def46c7fccc1..de041c0f4c80 100644 --- a/pkgs/development/python-modules/augeas/default.nix +++ b/pkgs/development/python-modules/augeas/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, buildPythonPackage, fetchFromGitHub, augeas, cffi }: buildPythonPackage rec { pname = "augeas"; - version = "1.0.2"; + version = "1.0.3"; name = pname + "-" + version; src = fetchFromGitHub { owner = "hercules-team"; repo = "python-augeas"; rev = "v${version}"; - sha256 = "1xk51m58ym3qpf0z5y98kzxb5jw7s92rca0v1yflj422977najxh"; + sha256 = "1fb904ym8g8hkd82zlibzk6wrldnfd5v5d0rkynsy1zlhcylq4f6"; }; # TODO: not very nice! diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix new file mode 100644 index 000000000000..6bbcd1703822 --- /dev/null +++ b/pkgs/development/python-modules/awkward/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, numpy +}: + +buildPythonPackage rec { + version = "0.3.0"; + pname = "awkward"; + + src = fetchPypi { + inherit pname version; + sha256 = "fc3080c66987f2a03aa9ba0809e51227eb7aa34198da4b1ee4deb95356409693"; + }; + + propagatedBuildInputs = [ numpy ]; + + meta = with stdenv.lib; { + homepage = https://github.com/scikit-hep/awkward-array; + description = "Manipulate jagged, chunky, and/or bitmasked arrays as easily as Numpy"; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/bitarray/0001-Buffer-Protocol-Py3.patch b/pkgs/development/python-modules/bitarray/0001-Buffer-Protocol-Py3.patch new file mode 100644 index 000000000000..e1019115ac74 --- /dev/null +++ b/pkgs/development/python-modules/bitarray/0001-Buffer-Protocol-Py3.patch @@ -0,0 +1,106 @@ +From c636f0cc386c9ded9f31947bbd74affccc93c21a Mon Sep 17 00:00:00 2001 +From: yoch <yoch.melka@gmail.com> +Date: Mon, 14 May 2018 21:55:00 +0300 +Subject: [PATCH] Adding buffer protocol support for Python 3 + +--- + bitarray/_bitarray.c | 12 ++++++++++-- + bitarray/test_bitarray.py | 14 +++++++------- + 2 files changed, 17 insertions(+), 9 deletions(-) + +diff --git a/bitarray/_bitarray.c b/bitarray/_bitarray.c +index d2c19cb..be6b379 100644 +--- a/bitarray/_bitarray.c ++++ b/bitarray/_bitarray.c +@@ -48,7 +48,7 @@ int PyIndex_Check(PyObject *o) + #define Py_SIZE(ob) (((PyVarObject *) (ob))->ob_size) + #endif + +-#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION == 7 ++#if PY_MAJOR_VERSION == 3 || (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION == 7) + /* (new) buffer protocol */ + #define WITH_BUFFER + #endif +@@ -2787,6 +2787,8 @@ static PyTypeObject BitarrayIter_Type = { + + /********************* Bitarray Buffer Interface ************************/ + #ifdef WITH_BUFFER ++ ++#if PY_MAJOR_VERSION == 2 + static Py_ssize_t + bitarray_buffer_getreadbuf(bitarrayobject *self, + Py_ssize_t index, const void **ptr) +@@ -2831,6 +2833,8 @@ bitarray_buffer_getcharbuf(bitarrayobject *self, + return Py_SIZE(self); + } + ++#endif ++ + static int + bitarray_getbuffer(bitarrayobject *self, Py_buffer *view, int flags) + { +@@ -2857,14 +2861,18 @@ bitarray_releasebuffer(bitarrayobject *self, Py_buffer *view) + } + + static PyBufferProcs bitarray_as_buffer = { ++#if PY_MAJOR_VERSION == 2 // old buffer protocol + (readbufferproc) bitarray_buffer_getreadbuf, + (writebufferproc) bitarray_buffer_getwritebuf, + (segcountproc) bitarray_buffer_getsegcount, + (charbufferproc) bitarray_buffer_getcharbuf, ++#endif + (getbufferproc) bitarray_getbuffer, + (releasebufferproc) bitarray_releasebuffer, + }; ++ + #endif /* WITH_BUFFER */ ++ + /************************** Bitarray Type *******************************/ + + static PyTypeObject Bitarraytype = { +@@ -2898,7 +2906,7 @@ static PyTypeObject Bitarraytype = { + 0, /* tp_as_buffer */ + #endif + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_WEAKREFS +-#ifdef WITH_BUFFER ++#if defined(WITH_BUFFER) && PY_MAJOR_VERSION == 2 + | Py_TPFLAGS_HAVE_NEWBUFFER + #endif + , /* tp_flags */ +diff --git a/bitarray/test_bitarray.py b/bitarray/test_bitarray.py +index 44de2f0..b72b554 100644 +--- a/bitarray/test_bitarray.py ++++ b/bitarray/test_bitarray.py +@@ -2113,10 +2113,10 @@ def test_read1(self): + a = bitarray('01000001' '01000010' '01000011', endian='big') + v = memoryview(a) + self.assertEqual(len(v), 3) +- self.assertEqual(v[0], 'A') +- self.assertEqual(v[:].tobytes(), 'ABC') ++ #self.assertEqual(v[0], 'A') ++ self.assertEqual(v[:].tobytes(), b'ABC') + a[13] = 1 +- self.assertEqual(v[:].tobytes(), 'AFC') ++ self.assertEqual(v[:].tobytes(), b'AFC') + + def test_read2(self): + a = bitarray([randint(0, 1) for d in range(8000)]) +@@ -2131,14 +2131,14 @@ def test_write(self): + a.setall(0) + v = memoryview(a) + self.assertFalse(v.readonly) +- v[50000] = '\xff' ++ v[50000] = 255 if is_py3k else '\xff' + self.assertEqual(a[399999:400009], bitarray('0111111110')) + a[400003] = 0 + self.assertEqual(a[399999:400009], bitarray('0111011110')) +- v[30001:30004] = 'ABC' +- self.assertEqual(a[240000:240040].tobytes(), '\x00ABC\x00') ++ v[30001:30004] = b'ABC' ++ self.assertEqual(a[240000:240040].tobytes(), b'\x00ABC\x00') + +-if sys.version_info[:2] == (2, 7): ++if sys.version_info[:2] >= (2, 7): + tests.append(BufferInterfaceTests) + + # --------------------------------------------------------------------------- diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix new file mode 100644 index 000000000000..c413303dd21d --- /dev/null +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + version = "0.8.3"; + pname = "bitarray"; + + src = fetchPypi { + inherit pname version; + sha256 = "0pl9p4j3dhlyffsqra6h28q7jph6v3hgppg786lkmnqdh45x6305"; + }; + + # Delete once https://github.com/ilanschnell/bitarray/pull/55 is merged + patches = [ ./0001-Buffer-Protocol-Py3.patch ]; + + meta = with lib; { + description = "Efficient arrays of booleans"; + homepage = https://github.com/ilanschnell/bitarray; + license = licenses.psfl; + maintainers = [ maintainers.bhipple ]; + }; +} diff --git a/pkgs/development/python-modules/bjoern/default.nix b/pkgs/development/python-modules/bjoern/default.nix index 22243edea9e3..4a4a4a86d5ec 100644 --- a/pkgs/development/python-modules/bjoern/default.nix +++ b/pkgs/development/python-modules/bjoern/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bjoern"; - version = "2.2.2"; + version = "2.2.3"; src = fetchPypi { inherit pname version; - sha256 = "1w5z9agacci4shmkg9gh46ifj2a724rrgbykdv14830f7jq3dcmi"; + sha256 = "1lbwqmqrl32jlfzhffxsb1fm7xbbjgbhjr21imk656agvpib2wx2"; }; buildInputs = [ libev ]; diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 4855a07a479b..567ea4518f88 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -33,11 +33,11 @@ buildPythonPackage rec { pname = "bokeh"; - version = "0.13.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "d0cf59774d7c74b7173b82ce36bde35b8fe9da0f960364ba3c4df0d1fbd874d6"; + sha256 = "1h1g3jw53srcvbgl1jb9p2rfi7kjz6c91hbqxfbr3s2wx1f67ahn"; }; disabled = isPyPy; @@ -48,6 +48,7 @@ buildPythonPackage rec { checkInputs = [ mock pytest pillow selenium ]; propagatedBuildInputs = [ + pillow flask jinja2 markupsafe diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index df260b3adb7d..13038c5803cc 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -15,11 +15,11 @@ let in buildPythonPackage rec { pname = "celery"; - version = "4.2.0"; + version = "4.2.1"; src = fetchPypi { inherit pname version; - sha256 = "ff727c115533edbc7b81b2b4ba1ec88d1c2fc4836e1e2f4c3c33a76ff53e5d7f"; + sha256 = "0y66rz7z8dfcgs3s0qxmdddlaq57bzbgxgfz896nbp14grkv9nkp"; }; # Skip test_RedisBackend.test_timeouts_in_url_coerced diff --git a/pkgs/development/python-modules/chameleon/default.nix b/pkgs/development/python-modules/chameleon/default.nix index 1a2811b50b67..104bdb86bf00 100644 --- a/pkgs/development/python-modules/chameleon/default.nix +++ b/pkgs/development/python-modules/chameleon/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "Chameleon"; - version = "2.25"; + version = "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0va95cml7wfjpvgj3dc9xdn8psyjh3zbk6v51b0hcqv2fzh409vb"; + sha256 = "1a83jf211mqjhgbd3abqyrn4mp4vb077ql8fydmv80xg3whrf3yb"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/colander/default.nix b/pkgs/development/python-modules/colander/default.nix index ed27464d1fe0..5cfa1862f48b 100644 --- a/pkgs/development/python-modules/colander/default.nix +++ b/pkgs/development/python-modules/colander/default.nix @@ -1,16 +1,16 @@ { lib, buildPythonPackage, fetchPypi -, translationstring, iso8601 }: +, translationstring, iso8601, enum34 }: buildPythonPackage rec { pname = "colander"; - version = "1.4"; + version = "1.5.1"; src = fetchPypi { inherit pname version; - sha256 = "e20e9acf190e5711cf96aa65a5405dac04b6e841028fc361d953a9923dbc4e72"; + sha256 = "18ah4cwwxnpm6qxi6x9ipy51dal4spd343h44s5wd01cnhgrwsyq"; }; - propagatedBuildInputs = [ translationstring iso8601 ]; + propagatedBuildInputs = [ translationstring iso8601 enum34 ]; meta = with lib; { description = "A simple schema-based serialization and deserialization library"; diff --git a/pkgs/development/python-modules/dj-email-url/default.nix b/pkgs/development/python-modules/dj-email-url/default.nix new file mode 100644 index 000000000000..c9e56017447e --- /dev/null +++ b/pkgs/development/python-modules/dj-email-url/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, python +}: + +buildPythonPackage rec { + version = "0.1.0"; + pname = "dj-email-url"; + + src = fetchPypi { + inherit pname version; + sha256 = "84f32673156f58d740a14cab09f04ca92a65b2c8881b60e31e09e67d7853e544"; + }; + + checkPhase = '' + ${python.interpreter} test_dj_email_url.py + ''; + + # tests not included with pypi release + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/migonzalvar/dj-email-url; + description = "Use an URL to configure email backend settings in your Django Application"; + license = licenses.bsd0; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/dj-search-url/default.nix b/pkgs/development/python-modules/dj-search-url/default.nix new file mode 100644 index 000000000000..b66f6b8f73a3 --- /dev/null +++ b/pkgs/development/python-modules/dj-search-url/default.nix @@ -0,0 +1,23 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, python +}: + +buildPythonPackage rec { + version = "0.1"; + pname = "dj-search-url"; + + src = fetchPypi { + inherit pname version; + sha256 = "424d1a5852500b3c118abfdd0e30b3e0016fe68e7ed27b8553a67afa20d4fb40"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/dstufft/dj-search-url; + description = "Use Search URLs in your Django Haystack Application"; + license = licenses.bsd0; + maintainers = [ maintainers.costrouc ]; + }; + +} diff --git a/pkgs/development/python-modules/django-cache-url/default.nix b/pkgs/development/python-modules/django-cache-url/default.nix new file mode 100644 index 000000000000..4cff6f2a69b0 --- /dev/null +++ b/pkgs/development/python-modules/django-cache-url/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +}: + +buildPythonPackage rec { + version = "3.0.0"; + pname = "django-cache-url"; + + src = fetchPypi { + inherit pname version; + sha256 = "235950e2d7cb16164082167c2974301e2f0fb2313d40bfacc9d24f5b09c3514b"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + pytest tests + ''; + + # tests not included with pypi release + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://github.com/ghickman/django-cache-url; + description = "Use Cache URLs in your Django application"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/django-configurations/default.nix b/pkgs/development/python-modules/django-configurations/default.nix new file mode 100644 index 000000000000..0ca6c400df28 --- /dev/null +++ b/pkgs/development/python-modules/django-configurations/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, django-discover-runner +, mock +, dj-database-url +, dj-email-url +, dj-search-url +, django-cache-url +, six +, django +}: + +buildPythonPackage rec { + version = "2.1"; + pname = "django-configurations"; + + src = fetchPypi { + inherit pname version; + sha256 = "71d9acdff33aa034f0157b0b3d23629fe0cd499bf4d0b6d699b9ca0701d952e8"; + }; + + checkInputs = [ django-discover-runner mock dj-database-url dj-email-url dj-search-url django-cache-url six ]; + + checkPhase = '' + export PYTHONPATH=.:$PYTHONPATH + export DJANGO_SETTINGS_MODULE="tests.settings.main" + export DJANGO_CONFIGURATION="Test" + ${django}/bin/django-admin.py test + ''; + + # django.core.exceptions.ImproperlyConfigured: django-configurations settings importer wasn't correctly installed + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://django-configurations.readthedocs.io/; + description = "A helper for organizing Django settings"; + license = licenses.bsd0; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/django-discover-runner/default.nix b/pkgs/development/python-modules/django-discover-runner/default.nix new file mode 100644 index 000000000000..d25d9e79947b --- /dev/null +++ b/pkgs/development/python-modules/django-discover-runner/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, django +}: + +buildPythonPackage rec { + version = "1.0"; + pname = "django-discover-runner"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ba91fe722c256bcbfdeb36fac7eac0f27e5bfda55d98c4c1cf9ab62b5b084fe"; + }; + + propagatedBuildInputs = [ django ]; + + # tests not included with release + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://github.com/jezdez/django-discover-runner; + description = "A Django test runner based on unittest2's test discovery"; + license = licenses.bsd0; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index 3548e930ab3d..30ef1a104188 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "django-extensions"; - version = "2.0.7"; + version = "2.1.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1xf84wq7ab1zfb3nmf4qgw6mjf5xafjwr3175dyrqrrn6cpvcr4a"; + sha256 = "0ns1m9sdkcbbz84wvzgxa4f8hf4a8z656jzwx4bw8np9kh96zfjy"; }; postPatch = '' diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index 1634e676952b..bdf503cd8492 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -3,7 +3,7 @@ }: buildPythonPackage rec { pname = "django-hijack"; - version = "2.1.5"; + version = "2.1.9"; name = pname + "-" + version; # the pypi packages don't include everything required for the tests @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "arteria"; repo = "django-hijack"; rev = "v${version}"; - sha256 = "1paiyxhc034336xcd9yzf3azpsapsv26j7w2baxiby71z2hhg0sj"; + sha256 = "109xi93xj37ycdsvainybhg89pcb5sawv6w80px4r6fjvaq4732c"; }; checkInputs = [ django_nose ]; diff --git a/pkgs/development/python-modules/django-picklefield/default.nix b/pkgs/development/python-modules/django-picklefield/default.nix index 7037f23b071c..694b11c6ca87 100644 --- a/pkgs/development/python-modules/django-picklefield/default.nix +++ b/pkgs/development/python-modules/django-picklefield/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "django-picklefield"; - version = "1.0.0"; + version = "1.1.0"; meta = { description = "A pickled object field for Django"; @@ -12,6 +12,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "61e3ba7f6df82d8df9e6be3a8c55ef589eb3bf926c3d25d2b7949b07eae78354"; + sha256 = "174zlsajpjflrf3jgn0wp5svnxfyrjadk4s9jb45vzjqcmffwzyf"; }; } diff --git a/pkgs/development/python-modules/django_environ/default.nix b/pkgs/development/python-modules/django_environ/default.nix index 15eafa6dd855..1e5936e6089a 100644 --- a/pkgs/development/python-modules/django_environ/default.nix +++ b/pkgs/development/python-modules/django_environ/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-environ"; - version = "0.4.0"; + version = "0.4.4"; src = fetchPypi { inherit pname version; - sha256 = "0i32vsgk1xmwpi7i6f6v5hg653y9dl0fsz5qmv94skz6hwgm5kvh"; + sha256 = "1ylw16v5z46ckn8ynbx2zjam6nvipl0xxcr6icrf6driv02q8bzf"; }; # The testsuite fails to modify the base environment diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index 18372fc113aa..d75fc90eda77 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, django }: buildPythonPackage rec { - version = "3.8.2"; + version = "3.9.0"; pname = "djangorestframework"; src = fetchPypi { inherit pname version; - sha256 = "b6714c3e4b0f8d524f193c91ecf5f5450092c2145439ac2769711f7eba89a9d9"; + sha256 = "0dk1r2qiifws4bb2pq8xk5dbsrhli0fi14iqg59v360mpfq6ay30"; }; # Test settings are missing diff --git a/pkgs/development/python-modules/elpy/default.nix b/pkgs/development/python-modules/elpy/default.nix index 79ec94a2c828..a947faec4537 100644 --- a/pkgs/development/python-modules/elpy/default.nix +++ b/pkgs/development/python-modules/elpy/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "elpy"; - version = "1.9.0"; + version = "1.25.0"; src = fetchPypi { inherit pname version; - sha256 = "419f7b05b19182bc1aedde1ae80812c1534e59a0493476aa01ea819e76ba26f0"; + sha256 = "10n20lw7n728ahnfrx03vgx9zim7jb8s1zqhw8yivksm9c1a6i12"; }; propagatedBuildInputs = [ flake8 autopep8 jedi importmagic ] diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index 2deb16924d20..c4543032c2b3 100644 --- a/pkgs/development/python-modules/evdev/default.nix +++ b/pkgs/development/python-modules/evdev/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "evdev"; - version = "1.0.0"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "be0288ef1125bf1c539bb8f3079ef4aa5fb813af28f0c5294a4e744ee554398a"; + sha256 = "0l837gm9cjdp3lybnam38ip0q3n1xy0j6vzgx11hdrr0ps8p5mid"; }; buildInputs = [ linuxHeaders ]; diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix index 3642d4e55b90..809871b50de0 100644 --- a/pkgs/development/python-modules/fido2/default.nix +++ b/pkgs/development/python-modules/fido2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "fido2"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0ddbhg4nsabi9w66l8vkr0i5r80jqihlic5yrdl3v1aqahvxph1j"; + sha256 = "12245b16czsgq4a251jqlk5qs3sldlcryfcganswzk2lbgplmn7q"; }; # The pypi package does not include tests diff --git a/pkgs/development/python-modules/flask-babel/default.nix b/pkgs/development/python-modules/flask-babel/default.nix index 1f4f914968f6..caaf0a61152b 100644 --- a/pkgs/development/python-modules/flask-babel/default.nix +++ b/pkgs/development/python-modules/flask-babel/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "Flask-Babel"; - version = "0.11.2"; + version = "0.12.2"; src = fetchPypi { inherit pname version; - sha256 = "0ff9n165vhf1nhv6807ckhpp224jw7k7sd7jz5kfh3sbpl85gmy0"; + sha256 = "11jwp8vvq1gnm31qh6ihy2h393hy18yn9yjp569g60r0wj1x2sii"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-oauthlib/default.nix b/pkgs/development/python-modules/flask-oauthlib/default.nix index 2d34ce8583e6..587057514156 100644 --- a/pkgs/development/python-modules/flask-oauthlib/default.nix +++ b/pkgs/development/python-modules/flask-oauthlib/default.nix @@ -3,13 +3,13 @@ , mock, nose}: buildPythonPackage rec { pname = "Flask-OAuthlib"; - version = "0.9.3"; + version = "0.9.5"; src = fetchFromGitHub { owner = "lepture"; repo = "flask-oauthlib"; rev = "v${version}"; - sha256 = "1vnr2kmbwl6mv2fsv92jjxzfibq2m3pnbcs6ba9k32jr1ci7wfh7"; + sha256 = "1l82niwrpm7411xvwh65bj263si90kcbrbfg5fa52mpixhxcp40f"; }; buildInputs = [ mock nose ]; diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index d2e806e43b90..ce847b81de63 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ftfy"; - version = "4.4.3"; + version = "5.3.0"; # ftfy v5 only supports python3. Since at the moment the only # packages that use ftfy are spacy and textacy which both support # python 2 and 3, they have pinned ftfy to the v4 branch. @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "152xdb56rhs1q4r0ck1n557sbphw7zq18r75a7kkd159ckdnc01w"; + sha256 = "0zybd0ypxhb83bgdbwzi120n02328v4j0ndm6bgkb6wg2gah59qb"; }; propagatedBuildInputs = [ html5lib wcwidth ]; diff --git a/pkgs/development/python-modules/fusepy/default.nix b/pkgs/development/python-modules/fusepy/default.nix index 74ab0fc01a69..80ca5099f344 100644 --- a/pkgs/development/python-modules/fusepy/default.nix +++ b/pkgs/development/python-modules/fusepy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "fusepy"; - version = "2.0.4"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0v5grm4zyf58hsplwsxfbihddw95lz9w8cy3rpzbyha287swgx8h"; + sha256 = "1gg69qfi9pjcic3g98l8ya64rw2vc1bp8gsf76my6gglq8z7izvj"; }; propagatedBuildInputs = [ pkgs.fuse ]; diff --git a/pkgs/development/python-modules/gnureadline/default.nix b/pkgs/development/python-modules/gnureadline/default.nix index 2feab78f6a83..b690faccf069 100644 --- a/pkgs/development/python-modules/gnureadline/default.nix +++ b/pkgs/development/python-modules/gnureadline/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "6.3.3"; + version = "6.3.8"; pname = "gnureadline"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "1ghck2zz4xbqa3wz73brgjhrqj55p9hc1fq6c9zb09dnyhwb0nd2"; + sha256 = "0ddhj98x2nv45iz4aadk4b9m0b1kpsn1xhcbypn5cd556knhiqjq"; }; buildInputs = [ pkgs.ncurses ]; diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix index ded728bdc0d6..899a315da653 100644 --- a/pkgs/development/python-modules/google_api_core/default.nix +++ b/pkgs/development/python-modules/google_api_core/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "1.3.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "ac85fc7f6687bb0271f2f70ca298da90f35789f9de1fe3a11e8caeb571332b77"; + sha256 = "16ximavy7zgg0427790fmyma03xnkywar9krp4lx6bcphvyiahh3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/grip/default.nix b/pkgs/development/python-modules/grip/default.nix index c11bcaa5baa5..d812d58b74ca 100644 --- a/pkgs/development/python-modules/grip/default.nix +++ b/pkgs/development/python-modules/grip/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "grip"; - version = "4.4.0"; + version = "4.5.2"; src = fetchFromGitHub { owner = "joeyespo"; repo = "grip"; rev = "v${version}"; - sha256 = "1768n3w40qg1njkzqjyl5gkva0h31k8h250821v69imj1zimymag"; + sha256 = "0hphplnyi903jx7ghfxplg1qlj2kpcav1frr2js7p45pbh5ib9rm"; }; patches = [ diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index d6c6a41ae084..6f07725520fa 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.5.2"; + version = "1.5.4"; pname = "gsd"; src = fetchPypi { inherit pname version; - sha256 = "0ce73a9bc7b79968a2b96cc2b0934e2cbe11700adbd02b4b492fea1e3d4d51f4"; + sha256 = "1p1akwirxq809apxia6b9ndalpdfgv340ssnli78h74bkqnw1376"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix index 492c4da6fcc9..cf206472cd3b 100644 --- a/pkgs/development/python-modules/i3ipc/default.nix +++ b/pkgs/development/python-modules/i3ipc/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "i3ipc"; - version = "1.4.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "acrisci"; repo = "i3ipc-python"; rev = "v${version}"; - sha256 = "15drq16ncmjrgsri6gjzp0qm8abycm92nicm78q3k7vy7rqpvfnh"; + sha256 = "06d7g4d7cnh0vp5diavy3x9wz1w5nwdrb7ipc4g1c3a2wc78862d"; }; propagatedBuildInputs = [ enum-compat ]; diff --git a/pkgs/development/python-modules/ibmquantumexperience/default.nix b/pkgs/development/python-modules/ibmquantumexperience/default.nix index 22b809c46c20..dcf39dd24f02 100644 --- a/pkgs/development/python-modules/ibmquantumexperience/default.nix +++ b/pkgs/development/python-modules/ibmquantumexperience/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "IBMQuantumExperience"; - version = "2.0.3"; + version = "2.0.4"; src = fetchPypi { inherit pname version; - sha256 = "c5dbcc140344c7bdf545ad59db87f31a90ca35107c40d6cae1489bb997a47ba9"; + sha256 = "0szn743sbm3cs80982cf4994c1xcg6iz5xkhdbpm1kfv5qn1phja"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index b83785211f88..e2e833f7c476 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "3.9.0"; + version = "4.0.3"; pname = "icalendar"; src = fetchPypi { inherit pname version; - sha256 = "93d0b94eab23d08f62962542309916a9681f16de3d5eca1c75497f30f1b07792"; + sha256 = "0mk3dk1dxkcm46jy48v27j2w2349iv4sbimqj1yb5js43mx49hh7"; }; buildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/ifaddr/default.nix b/pkgs/development/python-modules/ifaddr/default.nix new file mode 100644 index 000000000000..db0b8301f008 --- /dev/null +++ b/pkgs/development/python-modules/ifaddr/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, ipaddress +, python +, pythonOlder +}: + +buildPythonPackage rec { + version = "0.1.4"; + pname = "ifaddr"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "cf2a8fbb578da2844d999a0a453825f660ed2d3fc47dcffc5f673dd8de4f0f8b"; + }; + + # ipaddress is provided in python stdlib > 3.3 + postPatch = if pythonOlder "3.4" then "" else '' + sed -i "s/'ipaddress'//" setup.py + ''; + + propagatedBuildInputs = [ ipaddress ]; + + checkPhase = '' + ${python.interpreter} ifaddr/test_ifaddr.py + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/pydron/ifaddr; + description = "Enumerates all IP addresses on all network adapters of the system"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index 100ca5b0ff9a..0d6828bff72b 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "influxdb"; - version = "4.0.0"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0injsml6zmb3hkgc03117fdlg573kbfgjbijpd5npf0vsy0xnpvz"; + sha256 = "0fqnshmsgifvp79pd4g9a1kyfxvpa9vczv0dv8x2jr2c5m1mi99v"; }; # ImportError: No module named tests diff --git a/pkgs/development/python-modules/ipaddr/default.nix b/pkgs/development/python-modules/ipaddr/default.nix index 4325e6ea8844..6aecf5959ff8 100644 --- a/pkgs/development/python-modules/ipaddr/default.nix +++ b/pkgs/development/python-modules/ipaddr/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "ipaddr"; - version = "2.1.11"; + version = "2.2.0"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1dwq3ngsapjc93fw61rp17fvzggmab5x1drjzvd4y4q0i255nm8v"; + sha256 = "1ml8r8z3f0mnn381qs1snbffa920i9ycp6mm2am1d3aqczkdz4j0"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/memory_profiler/default.nix b/pkgs/development/python-modules/memory_profiler/default.nix index 5f40ce0f1aad..7587e5f33c95 100644 --- a/pkgs/development/python-modules/memory_profiler/default.nix +++ b/pkgs/development/python-modules/memory_profiler/default.nix @@ -1,19 +1,27 @@ { stdenv , buildPythonPackage , fetchPypi +, psutil +, python }: buildPythonPackage rec { pname = "memory_profiler"; - version = "0.41"; + version = "0.54.0"; src = fetchPypi { inherit pname version; - sha256 = "dce6e931c281662a500b142595517d095267216472c2926e5ec8edab89898d10"; + sha256 = "d64342a23f32e105f4929b408a8b89d9222c3ce8afbbb3359817555811448d1a"; }; + propagatedBuildInputs = [ psutil ]; + + checkPhase = '' + make test PYTHON=${python.interpreter} + ''; + # Tests don't import profile - doCheck = false; + # doCheck = false; meta = with stdenv.lib; { description = "A module for monitoring memory usage of a python program"; diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 2cd2e2484e67..854866f659bd 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "mypy"; - version = "0.630"; + version = "0.641"; # Tests not included in pip package. doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "1p8rnap4ngczfm2q4035mcmn5nsprbljnhksx2jxzxrb9immh137"; + sha256 = "0ma4l7px96zzb8x89dk9mkrrdzdhdqckvfsbld4fj9n25k1iw1wf"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix index 4af0c6487b3f..579fc4631f66 100644 --- a/pkgs/development/python-modules/mysql-connector/default.nix +++ b/pkgs/development/python-modules/mysql-connector/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "mysql-connector"; - version = "8.0.12"; + version = "8.0.13"; src = fetchFromGitHub { owner = "mysql"; repo = "mysql-connector-python"; rev = version; - sha256 = "1i3148dka4zfqzz4n4n5k0qaqbc585bdpmjwgx5vp6iiv7pgvrxp"; + sha256 = "1qb6m3cp6zxmr49bp6g5g5b75yszgac1h26i2hza61mrvd235688"; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/nameparser/default.nix b/pkgs/development/python-modules/nameparser/default.nix index a3e67fa7b985..b5150382b362 100644 --- a/pkgs/development/python-modules/nameparser/default.nix +++ b/pkgs/development/python-modules/nameparser/default.nix @@ -1,17 +1,21 @@ { stdenv , buildPythonPackage , fetchPypi +, glibcLocales }: buildPythonPackage rec { pname = "nameparser"; - version = "0.3.4"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1zi94m99ziwwd6kkip3w2xpnl05r2cfv9iq68inz7np81c3g8vag"; + sha256 = "c7eeeffbf16e263452b17b5f4b544d366c3364e966721f39d490e6c7c8b44b7f"; }; + LC_ALL="en_US.UTF-8"; + buildInputs = [ glibcLocales ]; + meta = with stdenv.lib; { description = "A simple Python module for parsing human names into their individual components"; homepage = https://github.com/derek73/python-nameparser; diff --git a/pkgs/development/python-modules/nose2/default.nix b/pkgs/development/python-modules/nose2/default.nix index 9d5c1675359e..e708ff2ee3e7 100644 --- a/pkgs/development/python-modules/nose2/default.nix +++ b/pkgs/development/python-modules/nose2/default.nix @@ -2,18 +2,23 @@ , buildPythonPackage , fetchPypi , six +, pythonOlder +, mock +, coverage }: buildPythonPackage rec { pname = "nose2"; - version = "0.5.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "0595rh6b6dncbj0jigsyrgrh6h8fsl6w1fr69h76mxv9nllv0rlr"; + sha256 = "9052f2b46807b63d9bdf68e0768da1f8386368889b50043fd5d0889c470258f3"; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ six coverage ] + ++ stdenv.lib.optionals (pythonOlder "3.4") [ mock ]; + # AttributeError: 'module' object has no attribute 'collector' doCheck = false; diff --git a/pkgs/development/python-modules/ntfy/default.nix b/pkgs/development/python-modules/ntfy/default.nix index 5d54b0928b6f..efbd1eec35a3 100644 --- a/pkgs/development/python-modules/ntfy/default.nix +++ b/pkgs/development/python-modules/ntfy/default.nix @@ -2,26 +2,32 @@ , buildPythonPackage , fetchFromGitHub , appdirs -, pyyaml +, ruamel_yaml , requests -, dbus-python , emoji , sleekxmpp , mock +, psutil +, python +# , dbus-python }: buildPythonPackage rec { - version = "1.2.0"; + version = "2.6.0"; pname = "ntfy"; src = fetchFromGitHub { owner = "dschep"; repo = "ntfy"; rev = "v${version}"; - sha256 = "0yjxwisxpxy3vpnqk9nw5k3db3xx6wyf6sk1px9m94s30glcq2cc"; + sha256 = "0hnwrybbk0gw0c6kw2zpx0x1rh3jb9qyrprcphzkv0jlhzdfkrp1"; }; - propagatedBuildInputs = [ appdirs pyyaml requests dbus-python emoji sleekxmpp mock ]; + propagatedBuildInputs = [ requests ruamel_yaml appdirs mock sleekxmpp emoji psutil ]; + + checkPhase = '' + HOME=$(mktemp -d) ${python.interpreter} setup.py test + ''; meta = with stdenv.lib; { description = "A utility for sending notifications, on demand and when commands finish"; diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 01c387928f59..915c48f069a6 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.9.15"; + version = "8.9.16"; src = fetchPypi { inherit pname version; - sha256 = "8e9664ce0a838c81f4fb3e4d271c76859d26bde57242d64fe1632ab636f5319f"; + sha256 = "1camfcbvbl0xljxmd4h8smcfg3ris19jjznjv5zcbrxr28fafq74"; }; meta = { diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index 8f43cbfb4a8c..f8f3d5458a08 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "praw"; - version = "5.4.0"; + version = "6.0.0"; src = fetchFromGitHub { owner = "praw-dev"; repo = "praw"; rev = "v${version}"; - sha256 = "13vbh2r952ai2m6sc79psfwaj5fc8cssdg2pqpizg2mwd0l1s6lb"; + sha256 = "0y6nyz8vf98gl1qfmnznv3dbvlbzdl6mz99vk673nyfn3hbs451i"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 8ebb88fa6a73..d588ebb12e47 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, JPype1, numpy, pandas, pytest, pytestrunner, pkgconfig, setuptools_scm, six }: +{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, numpy, pandas, pytest, pkgconfig, setuptools_scm, six }: let _arrow-cpp = arrow-cpp.override { inherit python; }; @@ -13,12 +13,13 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ]; propagatedBuildInputs = [ numpy six ] ++ lib.optionals (!isPy3k) [ futures ]; - checkInputs = [ pandas pytest pytestrunner JPype1 ]; + checkInputs = [ pandas pytest ]; PYARROW_BUILD_TYPE = "release"; PYARROW_CMAKE_OPTIONS = "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib"; preCheck = '' + rm pyarrow/tests/test_jvm.py rm pyarrow/tests/test_hdfs.py rm pyarrow/tests/test_cuda.py @@ -43,6 +44,14 @@ buildPythonPackage rec { setupPyBuildFlags = ["--with-parquet" ]; + checkPhase = '' + mv pyarrow/tests tests + rm -rf pyarrow + mkdir pyarrow + mv tests pyarrow/tests + pytest -v + ''; + meta = with lib; { description = "A cross-language development platform for in-memory data"; homepage = https://arrow.apache.org/; diff --git a/pkgs/development/python-modules/pycontracts/default.nix b/pkgs/development/python-modules/pycontracts/default.nix index 23633ce248db..cd9c054ddcaa 100644 --- a/pkgs/development/python-modules/pycontracts/default.nix +++ b/pkgs/development/python-modules/pycontracts/default.nix @@ -1,17 +1,17 @@ { stdenv, buildPythonPackage, fetchPypi -, nose, pyparsing, decorator, six }: +, nose, pyparsing, decorator, six, future }: buildPythonPackage rec { pname = "PyContracts"; - version = "1.8.3"; + version = "1.8.6"; src = fetchPypi { inherit pname version; - sha256 = "8e52c4ddbc015b56cc672b7c005c11f3df4fe407b832964099836fa3cccb8b9d"; + sha256 = "8b6ad8750bbb712b1c7b8f89772b42baeefd35b3c7085233e8027b92f277e073"; }; buildInputs = [ nose ]; - propagatedBuildInputs = [ pyparsing decorator six ]; + propagatedBuildInputs = [ pyparsing decorator six future ]; meta = with stdenv.lib; { description = "Allows to declare constraints on function parameters and return values"; diff --git a/pkgs/development/python-modules/pympler/default.nix b/pkgs/development/python-modules/pympler/default.nix index 1a3eb0475105..a331f5e11755 100644 --- a/pkgs/development/python-modules/pympler/default.nix +++ b/pkgs/development/python-modules/pympler/default.nix @@ -5,19 +5,15 @@ buildPythonPackage rec { pname = "Pympler"; - version = "0.4.3"; + version = "0.6"; src = fetchPypi { inherit pname version; - sha256 = "0mhyxqlkha98y8mi5zqcjg23r30mgdjdzs05lghbmqfdyvzjh1a3"; + sha256 = "c262ceca4dac67b8b523956833c52443420eabc3321a07185990b358b8ba13a7"; }; - # Remove test asizeof.flatsize(), broken and can be missed as - # test is only useful on python 2.5, see https://github.com/pympler/pympler/issues/22 - patchPhase = '' - substituteInPlace ./test/asizeof/test_asizeof.py --replace "n, e = test_flatsize" "#n, e = test_flatsize" - substituteInPlace ./test/asizeof/test_asizeof.py --replace "self.assert_(n," "#self.assert_(n," - substituteInPlace ./test/asizeof/test_asizeof.py --replace "self.assert_(not e" "#self.assert_(not e" + postPatch = '' + rm test/asizeof/test_asizeof.py ''; doCheck = stdenv.hostPlatform.isLinux; diff --git a/pkgs/development/python-modules/pyramid_multiauth/default.nix b/pkgs/development/python-modules/pyramid_multiauth/default.nix index 7130e8b499f3..7c01e3e093bd 100644 --- a/pkgs/development/python-modules/pyramid_multiauth/default.nix +++ b/pkgs/development/python-modules/pyramid_multiauth/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyramid_multiauth"; - version = "0.8.0"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "1lq292qakrm4ixi4vaif8dqywzj08pn6qy0wi4gw28blh39p0msk"; + sha256 = "0lprqjyg3zcji6033p1l3s4nigjigc5423wgivkfhz46vq0jmniy"; }; propagatedBuildInputs = [ pyramid ]; diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index f004ab1054dd..7d592c7b450b 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyslurm"; - version = "20180908"; + version = "18-08-3"; src = fetchFromGitHub { repo = "pyslurm"; owner = "PySlurm"; - rev = "50dc113e99d82e70e84fc2e812333733708be4ed"; - sha256 = "1j2i4rvhmk2ihhcvsjdlqlxqb5a05jg8k9bqkv3zrvdj71yn4z9k"; + rev = version; + sha256 = "1rymx106xa99wd4n44s7jw0w41spg39y1ji4fgn01yk7wjfrdrwg"; }; buildInputs = [ cython slurm ]; diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index db17d60b6280..481e4154ddb3 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -1,27 +1,26 @@ -{ stdenv, buildPythonPackage, fetchPypi -, pytest, django, setuptools_scm -, fetchpatch +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +, django +, setuptools_scm +, django-configurations +, pytest_xdist +, six }: buildPythonPackage rec { pname = "pytest-django"; - version = "3.1.2"; + version = "3.4.3"; src = fetchPypi { inherit pname version; - sha256 = "02932m2sr8x22m4az8syr8g835g4ak77varrnw71n6xakmdcr303"; + sha256 = "b379282feaf89069cb790775ab6bbbd2bd2038a68c7ef9b84a41898e0b551081"; }; buildInputs = [ pytest setuptools_scm ]; + checkInputs = [ django-configurations pytest_xdist six ]; propagatedBuildInputs = [ django ]; - patches = [ - # Unpin setuptools-scm - (fetchpatch { - url = "https://github.com/pytest-dev/pytest-django/commit/25cbc3b395dcdeb92bdc9414e296680c2b9d602e.patch"; - sha256 = "0mz3rcsv44pfzlxy3pv8mx87glmv34gy0d5aknvbzgb2a9niryws"; - }) - ]; - # Complicated. Requires Django setup. doCheck = false; diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix new file mode 100644 index 000000000000..d245d472a007 --- /dev/null +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +, pytest +, pytz +, glibcLocales +}: + +buildPythonPackage rec { + version = "0.6.3"; + pname = "python-rapidjson"; + disabled = pythonOlder "3.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0a7729c711d9be2b6c0638ce4851d398e181f2329814668aa7fda6421a5da085"; + }; + + LC_ALL="en_US.utf-8"; + buildInputs = [ glibcLocales ]; + + # buildInputs = [ ]; + checkInputs = [ pytest pytz ]; + # propagatedBuildInputs = [ ]; + + checkPhase = '' + pytest tests + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/python-rapidjson/python-rapidjson; + description = "Python wrapper around rapidjson "; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 5bb20ae8e77c..5af4383d44b3 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -1,12 +1,20 @@ -{ stdenv, fetchPypi, buildPythonPackage, certifi, future, urllib3 }: +{ stdenv +, fetchPypi +, buildPythonPackage +, certifi +, future +, urllib3 +, tornado +, pytest +}: buildPythonPackage rec { pname = "python-telegram-bot"; - version = "10.1.0"; + version = "11.1.0"; src = fetchPypi { inherit pname version; - sha256 = "ca2f8a44ddef7271477e16f4986647fa90ef4df5b55a7953e53b9c9d2672f639"; + sha256 = "cca4e32ebb8da7fdf35ab2fa2b3edd441211364819c5592fc253acdb7561ea5b"; }; prePatch = '' @@ -16,10 +24,14 @@ buildPythonPackage rec { --replace "import telegram.vendor.ptb_urllib3.urllib3.contrib.appengine as appengine" "import urllib3.contrib.appengine as appengine" \ --replace "from telegram.vendor.ptb_urllib3.urllib3.connection import HTTPConnection" "from urllib3.connection import HTTPConnection" \ --replace "from telegram.vendor.ptb_urllib3.urllib3.util.timeout import Timeout" "from urllib3.util.timeout import Timeout" + + touch LICENSE.dual ''; - propagatedBuildInputs = [ certifi future urllib3 ]; + checkInputs = [ pytest ]; + propagatedBuildInputs = [ certifi future urllib3 tornado ]; + # tests not included with release doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/requests_download/default.nix b/pkgs/development/python-modules/requests_download/default.nix index 6d1264dee67e..8062834e1803 100644 --- a/pkgs/development/python-modules/requests_download/default.nix +++ b/pkgs/development/python-modules/requests_download/default.nix @@ -6,18 +6,18 @@ buildPythonPackage rec { pname = "requests_download"; - version = "0.1.1"; + version = "0.1.2"; format = "wheel"; #src = pkgs.fetchurl { - # url = https://files.pythonhosted.org/packages/60/af/10f899f0574a81cbc511124c08d7c7dc46c20d4f956a6a3c793ad4330bb4/requests_download-0.1.1-py2.py3-none-any.whl; - # sha256 = "07832a93314bcd619aaeb08611ae245728e66672efb930bc2a300a115a47dab7"; + # url = https://files.pythonhosted.org/packages/60/af/10f899f0574a81cbc511124c08d7c7dc46c20d4f956a6a3c793ad4330bb4/requests_download-0.1.2-py2.py3-none-any.whl; + # sha256 = "1ballx1hljpdpyvqzqn79m0dc21z2smrnxk2ylb6dbpg5crrskcr"; #}; src = fetchPypi { inherit pname version format; - sha256 = "07832a93314bcd619aaeb08611ae245728e66672efb930bc2a300a115a47dab7"; + sha256 = "1ballx1hljpdpyvqzqn79m0dc21z2smrnxk2ylb6dbpg5crrskcr"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/rpmfluff/default.nix b/pkgs/development/python-modules/rpmfluff/default.nix index c6cd2521292a..a8997e279b27 100644 --- a/pkgs/development/python-modules/rpmfluff/default.nix +++ b/pkgs/development/python-modules/rpmfluff/default.nix @@ -1,15 +1,21 @@ -{ stdenv, buildPythonPackage, fetchurl }: +{ stdenv +, buildPythonPackage +, fetchurl +, glibcLocales +}: buildPythonPackage rec { pname = "rpmfluff"; - version = "0.5.3"; - name = "${pname}-${version}"; + version = "0.5.5"; src = fetchurl { - url = "https://releases.pagure.org/${pname}/${name}.tar.xz"; - sha256 = "1i45f012ngpxs83m3dpmaj3hs8z7r9sbf05vnvzgs3hpgsbhxa7r"; + url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.xz"; + sha256 = "0m92ihii8fgdyma9vn3s6fhq0px8n930c27zs554la0mm4548ss3"; }; + LC_ALL="en_US.utf-8"; + buildInputs = [ glibcLocales ]; + meta = with stdenv.lib; { description = "lightweight way of building RPMs, and sabotaging them"; homepage = https://pagure.io/rpmfluff; diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index cd4a6389a351..b64b53fb2fbb 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , buildPythonPackage , geckodriver +, urllib3 , xorg }: @@ -22,17 +23,17 @@ in buildPythonPackage rec { pname = "selenium"; - version = "3.8.1"; + version = "3.14.1"; src = fetchPypi { inherit pname version; - sha256 = "1lqm2md84g11g7lqi94xqb5lydm93vgmlznfhf27g6sy9ayjvgcs"; + sha256 = "ab192cd046164c40fabcf44b47c66c8b12495142f4a69dcc55ea6eeef096e614"; }; buildInputs = [xorg.libX11]; propagatedBuildInputs = [ - geckodriver + geckodriver urllib3 ]; patchPhase = stdenv.lib.optionalString stdenv.isLinux '' diff --git a/pkgs/development/python-modules/spark_parser/default.nix b/pkgs/development/python-modules/spark_parser/default.nix new file mode 100644 index 000000000000..badc99f5e377 --- /dev/null +++ b/pkgs/development/python-modules/spark_parser/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, nose +, click +}: + +buildPythonPackage rec { + pname = "spark_parser"; + version = "1.8.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "4c5e6064afbb3c114749016d585b0e4f9222d4ffa97a1854c9ab70b25783ef48"; + }; + + buildInputs = [ nose ]; + propagatedBuildInputs = [ click ]; + + meta = with stdenv.lib; { + description = ''An Early-Algorithm Context-free grammar Parser''; + homepage = "https://github.com/rocky/python-spark"; + license = licenses.mit; + maintainers = with maintainers; [raskin]; + }; + +} diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index f667f17f77df..a4130502e4b9 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -3,34 +3,30 @@ , fetchPypi , fetchpatch , pytest +, python-rapidjson , pretend , freezegun +, twisted , simplejson , six +, pythonAtLeast }: buildPythonPackage rec { pname = "structlog"; - version = "17.2.0"; + version = "18.2.0"; src = fetchPypi { inherit pname version; - sha256 = "6980001045abd235fa12582222627c19b89109e58b85eb77d5a5abc778df6e20"; + sha256 = "e361edb3b9aeaa85cd38a1bc9ddbb60cda8a991fc29de9db26832f6300e81eb4"; }; - patches = [ - # Fix tests for pytest 3.3 - (fetchpatch { - url = "https://github.com/hynek/structlog/commit/22f0ae50607a0cb024361599f84610ce290deb99.patch"; - sha256 = "03622i13ammkpyrdk48kimbz94gbkpcmdpy0kj2z09m1kp6q2ljv"; - }) - ]; - - checkInputs = [ pytest pretend freezegun simplejson ]; + checkInputs = [ pytest pretend freezegun simplejson twisted ] + ++ lib.optionals (pythonAtLeast "3.6") [ python-rapidjson ]; propagatedBuildInputs = [ six ]; checkPhase = '' - rm tests/test_twisted.py* + # rm tests/test_twisted.py* py.test ''; diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index ab816cde8355..215f39da30b4 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -9,22 +9,24 @@ , pyopenssl , trustme , sniffio +, jedi +, pylint }: buildPythonPackage rec { pname = "trio"; - version = "0.7.0"; + version = "0.9.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0df152qnj4xgxrxzd8619f8h77mzry7z8sp4m76fi21gnrcr297n"; + sha256 = "6d905d950dfa1db3fad6b5ef5637c221947123fd2b0e112033fecfc582318c3b"; }; - checkInputs = [ pytest pyopenssl trustme ]; + checkInputs = [ pytest pyopenssl trustme jedi pylint ]; # It appears that the build sandbox doesn't include /etc/services, and these tests try to use it. checkPhase = '' - py.test -k 'not test_getnameinfo and not test_SocketType_resolve and not test_getprotobyname' + HOME="$(mktemp -d)" py.test -k 'not test_getnameinfo and not test_SocketType_resolve and not test_getprotobyname and not test_waitpid' ''; propagatedBuildInputs = [ attrs diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index dfcce835e658..4c031c20aa1e 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -6,18 +6,19 @@ , requests_toolbelt , tqdm , pyblake2 +, readme_renderer }: buildPythonPackage rec { pname = "twine"; - version = "1.11.0"; + version = "1.12.1"; src = fetchPypi { inherit pname version; - sha256 = "09cz9v63f8mrs4znbjapjj2z3wdfryq8q364zm0wzjhbzzcs9n9g"; + sha256 = "7d89bc6acafb31d124e6e5b295ef26ac77030bf098960c2a4c4e058335827c5c"; }; - propagatedBuildInputs = [ pkginfo requests requests_toolbelt tqdm pyblake2 ]; + propagatedBuildInputs = [ pkginfo requests requests_toolbelt tqdm pyblake2 readme_renderer ]; # Requires network doCheck = false; diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index 89edc8f184ca..f0428f176034 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -3,19 +3,30 @@ , fetchPypi , spark_parser , xdis +, nose +, pytest +, hypothesis +, six }: buildPythonPackage rec { pname = "uncompyle6"; - version = "2.8.3"; + version = "3.2.3"; src = fetchPypi { inherit pname version; - sha256 = "0hx5sji6qjvnq1p0zhvyk5hgracpv2w6iar1j59qwllxv115ffi1"; + sha256 = "bd882f3c979b49d28ba7accc5ce7380ced8cab12e782e9170769ca15f0b81f8a"; }; + checkInputs = [ nose pytest hypothesis six ]; propagatedBuildInputs = [ spark_parser xdis ]; + # six import errors (yet it is supplied...) + checkPhase = '' + pytest ./pytest --ignore=pytest/test_build_const_key_map.py \ + --ignore=pytest/test_grammar.py + ''; + meta = with stdenv.lib; { description = "Python cross-version byte-code deparser"; homepage = https://github.com/rocky/python-uncompyle6/; diff --git a/pkgs/development/python-modules/uproot-methods/default.nix b/pkgs/development/python-modules/uproot-methods/default.nix new file mode 100644 index 000000000000..b3c2ce714ce4 --- /dev/null +++ b/pkgs/development/python-modules/uproot-methods/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, numpy +, awkward +}: + +buildPythonPackage rec { + version = "0.2.5"; + pname = "uproot-methods"; + + src = fetchPypi { + inherit pname version; + sha256 = "7d5563b3335af414a12caf5b350c952fdc7576abb17630382de5564a7c254ae6"; + }; + + propagatedBuildInputs = [ numpy awkward ]; + + meta = with stdenv.lib; { + homepage = https://github.com/scikit-hep/uproot-methods; + description = "Pythonic mix-ins for ROOT classes"; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index e2cc1105f093..120f728365d3 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -1,17 +1,30 @@ -{lib, fetchPypi, buildPythonPackage, numpy}: +{ lib +, fetchPypi +, buildPythonPackage +, numpy +, python-lz4 +, uproot-methods +, awkward +, cachetools +, pythonOlder +, pytestrunner +, pytest +, backports_lzma +}: buildPythonPackage rec { pname = "uproot"; - version = "2.9.11"; + version = "3.2.6"; src = fetchPypi { inherit pname version; - sha256 = "da71e9e239129ec2ae7a62f9d35aebd46456f05e000ef14f32fe2c9fa8ec92c2"; + sha256 = "af0a093f0788b8983d07b88fac3094b26c3e28358bc10cdb8d757cc07956f8d4"; }; - propagatedBuildInputs = [ - numpy - ]; + buildInputs = [ pytestrunner ]; + checkInputs = [ pytest ] + ++ lib.optionals (pythonOlder "3.3") [ backports_lzma ]; + propagatedBuildInputs = [ numpy python-lz4 cachetools uproot-methods awkward ]; meta = with lib; { homepage = https://github.com/scikit-hep/uproot; diff --git a/pkgs/development/python-modules/whichcraft/default.nix b/pkgs/development/python-modules/whichcraft/default.nix index 89be87e18491..498c1c401f81 100644 --- a/pkgs/development/python-modules/whichcraft/default.nix +++ b/pkgs/development/python-modules/whichcraft/default.nix @@ -1,14 +1,17 @@ -{ lib, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytest, glibcLocales }: buildPythonPackage rec { pname = "whichcraft"; - version = "0.4.1"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "9e0d51c9387cb7e9f28b7edb549e6a03da758f7784f991eb4397d7f7808c57fd"; + sha256 = "fecddd531f237ffc5db8b215409afb18fa30300699064cca4817521b4fc81815"; }; + LC_ALL="en_US.utf-8"; + buildInputs = [ glibcLocales ]; + checkInputs = [ pytest ]; checkPhase = '' diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index 5973414f8dc5..76e424cf0118 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -1,20 +1,25 @@ { stdenv , buildPythonPackage , fetchPypi -, nose +, pytest , six +, click }: buildPythonPackage rec { pname = "xdis"; - version = "3.2.4"; + version = "3.8.8"; src = fetchPypi { inherit pname version; - sha256 = "0g2lh70837vigcbc1i58349wp2xzrhlsg2ahc92sn8d3jwxja4dk"; + sha256 = "4d212df8a85ab55a35f6ad71b2c29818d903c3e6a95e31eb26d5f3fc66a4e015"; }; - propagatedBuildInputs = [ nose six ]; + checkInputs = [ pytest ]; + propagatedBuildInputs = [ six click ]; + + # newest release moves to pytest (tests not packaged with release) + doCheck = false; meta = with stdenv.lib; { description = "Python cross-version byte-code disassembler and marshal routines"; diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 06c5fe3a1be0..b77215a2d246 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -1,16 +1,32 @@ -{ stdenv, buildPythonPackage, fetchPypi -, netifaces, six, enum-compat }: +{ stdenv +, buildPythonPackage +, fetchPypi +, ifaddr +, typing +, isPy27 +, pythonOlder +, python +}: buildPythonPackage rec { pname = "zeroconf"; - version = "0.20.0"; + version = "0.21.3"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "6e3f1e7b5871e3d1410ac29b9fb85aafc1e2d661ed596b07a6f84559a475efcb"; + sha256 = "5b52dfdf4e665d98a17bf9aa50dea7a8c98e25f972d9c1d7660e2b978a1f5713"; }; - propagatedBuildInputs = [ netifaces six enum-compat ]; + propagatedBuildInputs = [ ifaddr ] + ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; + + # tests not included with pypi release + doCheck = false; + + checkPhase = '' + ${python.interpreter} test_zeroconf.py + ''; meta = with stdenv.lib; { description = "A pure python implementation of multicast DNS service discovery"; diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix index c8f61389ad3f..656896a8f7aa 100644 --- a/pkgs/development/ruby-modules/bundler-app/default.nix +++ b/pkgs/development/ruby-modules/bundler-app/default.nix @@ -24,6 +24,7 @@ , gemset ? null , preferLocalBuild ? false , allowSubstitutes ? false +, installManpages ? true , meta ? {} , postBuild ? "" , gemConfig ? null @@ -36,14 +37,22 @@ let // { inherit preferLocalBuild allowSubstitutes; }; # pass the defaults in runCommand basicEnv.name cmdArgs '' - mkdir -p $out/bin; - ${(lib.concatMapStrings (x: "ln -s '${basicEnv}/bin/${x}' $out/bin/${x};\n") exes)} - ${(lib.concatMapStrings (s: "makeWrapper $out/bin/$(basename ${s}) $srcdir/${s} " + - "--set BUNDLE_GEMFILE ${basicEnv.confFiles}/Gemfile "+ - "--set BUNDLE_PATH ${basicEnv}/${ruby.gemPath} "+ - "--set BUNDLE_FROZEN 1 "+ - "--set GEM_HOME ${basicEnv}/${ruby.gemPath} "+ - "--set GEM_PATH ${basicEnv}/${ruby.gemPath} "+ - "--run \"cd $srcdir\";\n") scripts)} + mkdir -p $out/bin + ${(lib.concatMapStrings (x: "ln -s '${basicEnv}/bin/${x}' $out/bin/${x};\n") exes)} + ${(lib.concatMapStrings (s: "makeWrapper $out/bin/$(basename ${s}) $srcdir/${s} " + + "--set BUNDLE_GEMFILE ${basicEnv.confFiles}/Gemfile "+ + "--set BUNDLE_PATH ${basicEnv}/${ruby.gemPath} "+ + "--set BUNDLE_FROZEN 1 "+ + "--set GEM_HOME ${basicEnv}/${ruby.gemPath} "+ + "--set GEM_PATH ${basicEnv}/${ruby.gemPath} "+ + "--run \"cd $srcdir\";\n") scripts)} + + ${lib.optionalString installManpages '' + for section in {1..9}; do + mandir="$out/share/man/man$section" + find -L ${basicEnv}/${ruby.gemPath}/gems/${basicEnv.name} \( -wholename "*/man/*.$section" -o -wholename "*/man/man$section/*.$section" \) -print -execdir mkdir -p $mandir \; -execdir cp '{}' $mandir \; + done + ''} + ${postBuild} '' diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index d00ce7fccf5c..b0abb2c54fc5 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -44,6 +44,7 @@ lib.makeOverridable ( # git checkout). # If you need to apply patches, make sure to set `dontBuild = false`; , dontBuild ? true +, dontInstallManpages ? false , propagatedBuildInputs ? [] , propagatedUserEnvPkgs ? [] , buildFlags ? [] @@ -206,6 +207,14 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { ruby ${./gem-post-build.rb} "$spec" ''} + ${lib.optionalString (!dontInstallManpages) '' + for section in {1..9}; do + mandir="$out/share/man/man$section" + find $out/lib \( -wholename "*/man/*.$section" -o -wholename "*/man/man$section/*.$section" \) \ + -execdir mkdir -p $mandir \; -execdir cp '{}' $mandir \; + done + ''} + runHook postInstall ''; diff --git a/pkgs/development/tools/database/cdb/default.nix b/pkgs/development/tools/database/cdb/default.nix new file mode 100644 index 000000000000..8def71568e79 --- /dev/null +++ b/pkgs/development/tools/database/cdb/default.nix @@ -0,0 +1,57 @@ +{ stdenv, lib, fetchurl, fetchFromGitHub, writeText }: + +let + version = "0.75"; + sha256 = "1iajg55n47hqxcpdzmyq4g4aprx7bzxcp885i850h355k5vmf68r"; + # Please don’t forget to update the docs: + # clone https://github.com/Profpatsch/cdb-docs + # and create a pull request with the result of running + # ./update <version> + # from the repository’s root folder. + docRepo = fetchFromGitHub { + owner = "Profpatsch"; + repo = "cdb-docs"; + rev = "359b6c55c9e170ebfc88f3f38face8ae2315eacb"; + sha256 = "1y0ivviy58i0pmavhvrpznc4yjigjknff298gnw9rkg5wxm0gbbq"; + }; + +in stdenv.mkDerivation { + name = "cdb-${version}"; + + src = fetchurl { + url = "https://cr.yp.to/cdb/cdb-${version}.tar.gz"; + inherit sha256; + }; + + outputs = [ "bin" "doc" "out" ]; + + postPatch = '' + # A little patch, borrowed from Archlinux AUR, borrowed from Gentoo Portage + sed -e 's/^extern int errno;$/#include <errno.h>/' -i error.h + ''; + + postInstall = '' + # don't use make setup, but move the binaries ourselves + mkdir -p $bin/bin + install -m 755 -t $bin/bin/ cdbdump cdbget cdbmake cdbmake-12 cdbmake-sv cdbstats cdbtest + + # patch paths in scripts + function cdbmake-subst { + substituteInPlace $bin/bin/$1 \ + --replace /usr/local/bin/cdbmake $bin/bin/cdbmake + } + cdbmake-subst cdbmake-12 + cdbmake-subst cdbmake-sv + + # docs + mkdir -p $doc/share/cdb + cp -r "${docRepo}/docs" $doc/share/cdb/html + ''; + + meta = { + homepage = "https://cr.yp.to/cdb"; + license = lib.licenses.publicDomain; + maintainers = [ lib.maintainers.Profpatsch ]; + platforms = [ lib.platforms.unix ]; + }; +} diff --git a/pkgs/development/tools/go-junit-report/default.nix b/pkgs/development/tools/go-junit-report/default.nix new file mode 100644 index 000000000000..5e1a69a16929 --- /dev/null +++ b/pkgs/development/tools/go-junit-report/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "go-junit-report-unstable-${version}"; + version = "2018-06-14"; + rev = "385fac0ced9acaae6dc5b39144194008ded00697"; + + goPackagePath = "github.com/jstemmer/go-junit-report"; + + src = fetchFromGitHub { + inherit rev; + owner = "jstemmer"; + repo = "go-junit-report"; + sha256 = "109zs8wpdmc2ijc2khyqija8imay88ka6v50xvrpnnwnd3ywckxi"; + }; + + meta = with stdenv.lib; { + description = "Converts go test output to an xml report, suitable for applications that expect junit xml reports (e.g. Jenkins)"; + homepage = "https://${goPackagePath}"; + maintainers = with maintainers; [ cryptix ]; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix index c11e6f15ce96..1a421cc47ed6 100644 --- a/pkgs/development/tools/jbake/default.nix +++ b/pkgs/development/tools/jbake/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "2.6.2"; + version = "2.6.3"; name = "jbake-${version}"; src = fetchzip { url = "https://dl.bintray.com/jbake/binary/${name}-bin.zip"; - sha256 = "1q96z0pvkqgb4194m52z89q56cbc0g3faflyfpy55z099f655rx9"; + sha256 = "000ax5vzirrhiykk86fmy4hibhl3pab0gkh5y35hiwhzhw5rwzk8"; }; buildInputs = [ makeWrapper jre ]; diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix new file mode 100644 index 000000000000..25bc79340001 --- /dev/null +++ b/pkgs/development/tools/kind/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +with stdenv.lib; + +buildGoPackage rec { + name = "kind-${version}"; + version = "2018-10-03-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "2ae73f8ef93609991b0e47a67825390ceec95b3f"; + + src = fetchFromGitHub { + rev = rev; + owner = "kubernetes-sigs"; + repo = "kind"; + sha256 = "0bg3y35sc1c73z4rfq11x1jz340786q91ywm165ri7vx280ffjgh"; + }; + + goPackagePath = "sigs.k8s.io/kind"; + excludedPackages = "images/base/entrypoint"; + + meta = { + description = "Kubernetes IN Docker - local clusters for testing Kubernetes"; + homepage = https://github.com/kubernetes-sigs/kind; + maintainers = with maintainers; [ offline ]; + license = stdenv.lib.licenses.asl20; + }; +} diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index ce297df13c3a..15ae07962c59 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -3,9 +3,9 @@ buildGoPackage rec { name = "kustomize-${version}"; - version = "1.0.8"; + version = "1.0.9"; # rev is the 1.0.8 commit, mainly for kustomize version command output - rev = "58492e2d83c59ed63881311f46ad6251f77dabc3"; + rev = "ec86b30d2b01a8fa62e645f024f26bfea5dcd30d"; goPackagePath = "sigs.k8s.io/kustomize"; @@ -17,7 +17,7 @@ buildGoPackage rec { ''; src = fetchFromGitHub { - sha256 = "0y6dqwhm7lczjy0zk2fnc1i43lvnjhcvihvm7qknky05z9f0v8bx"; + sha256 = "06a0iic8sp745q71bh0k2zbcdhppp85bx9c3fwwr4wl77dlybz4f"; rev = "v${version}"; repo = "kustomize"; owner = "kubernetes-sigs"; @@ -32,6 +32,6 @@ buildGoPackage rec { ''; homepage = https://github.com/kubernetes-sigs/kustomize; license = licenses.asl20; - maintainers = [ maintainers.carlosdagos maintainers.vdemeester ]; + maintainers = with maintainers; [ carlosdagos vdemeester periklis ]; }; } diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index 8c210cb93601..59f60d4046ad 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, flex, bison }: let - version = "2.2.0"; + version = "2.2.1"; in stdenv.mkDerivation { name = "minizinc-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { rev = "${version}"; owner = "MiniZinc"; repo = "libminizinc"; - sha256 = "05is1r5y06jfqwvka90dn2ffxnvbgyswaxl00aqz6455hnggnxvm"; + sha256 = "1i11lan7fqs3lg0s6jfr8sflzwn5nk1ln5j6afjrkrdb08291dr7"; }; # meta is all the information about the package.. diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index d74b480c9c5a..c15970d3f3e6 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -3,7 +3,7 @@ assert stdenv.lib.versionAtLeast ocaml.version "4.02"; let - version = "3.2.1"; + version = "3.2.2"; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://github.com/ocaml/merlin/archive/v${version}.tar.gz"; - sha256 = "1szv2b7d12ll5n6pvnhlv3a6vnlyrkpya4l9fiyyiwyvgd4xzxwf"; + sha256 = "15ssgmwdxylbwhld9p1cq8x6kadxyhll5bfyf11dddj6cldna3hb"; }; buildInputs = [ ocaml findlib dune yojson ]; diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix index 8f5948c3c112..3f42e71e7783 100644 --- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, ocaml, findlib }: let - version = "0.13.0"; + version = "0.12.0"; in stdenv.mkDerivation { name = "ocamlbuild-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { owner = "ocaml"; repo = "ocamlbuild"; rev = version; - sha256 = "13r9q8c209gkgcmbjhj9z4r5bmi90rxahdsiqm5jx8sr2pia5xbh"; + sha256 = "1shyim50ms0816fphc4mk0kldcx3pnba2i6m10q0cbm18m9d7chq"; }; createFindlibDestdir = true; diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 1d23f5426a55..7d4a58d0e394 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -2,11 +2,11 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "pipenv"; - version = "2018.10.9"; + version = "2018.10.13"; src = fetchPypi { inherit pname version; - sha256 = "0b0safavjxq6malmv44acmgds21m2sp1wqa7gs0qz621v6gcgq4j"; + sha256 = "0qwflq00rwk3pnldndb30f3avnbi4hvv6c8mm6l5xxnxy9dj71d7"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/tools/profiling/pyprof2calltree/default.nix b/pkgs/development/tools/profiling/pyprof2calltree/default.nix index b2497633a680..a2d98bcf2387 100644 --- a/pkgs/development/tools/profiling/pyprof2calltree/default.nix +++ b/pkgs/development/tools/profiling/pyprof2calltree/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "pyprof2calltree"; - version = "1.4.3"; + version = "1.4.4"; # Fetch from GitHub because the PyPi packaged version does not # include all test files. @@ -10,7 +10,7 @@ buildPythonApplication rec { owner = "pwaller"; repo = "pyprof2calltree"; rev = "v" + version; - sha256 = "0i0a895zal193cpvzbv68fch606g4ik27rvzbby3vxk61zlxfqy5"; + sha256 = "1vrip41ib7nmkwa8rjny1na1wyp7nvvgvm0h9bd21i262kbm4nqx"; }; meta = with lib; { diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index fe80d0d9dd19..970ace229e20 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { name = "rust-cbindgen-${version}"; @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1m1chwmfgj74xrmn4gb9yz5kx8c408a1hlqmpcq780kqj0k927i9"; + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + meta = with stdenv.lib; { description = "A project for generating C bindings from Rust code"; homepage = https://github.com/eqrion/cbindgen; diff --git a/pkgs/development/tools/scalafix/default.nix b/pkgs/development/tools/scalafix/default.nix new file mode 100644 index 000000000000..bd8a013fe2d0 --- /dev/null +++ b/pkgs/development/tools/scalafix/default.nix @@ -0,0 +1,43 @@ +{ stdenv, jdk, jre, coursier, makeWrapper }: + +let + baseName = "scalafix"; + version = "0.9.0"; + deps = stdenv.mkDerivation { + name = "${baseName}-deps-${version}"; + buildCommand = '' + export COURSIER_CACHE=$(pwd) + ${coursier}/bin/coursier fetch ch.epfl.scala:scalafix-cli_2.12.7:${version} > deps + mkdir -p $out/share/java + cp $(< deps) $out/share/java/ + ''; + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = "19j260prx7k010nxyvc1m9jj1ncxr73m2cym7if39360v5dc05c0"; + }; +in +stdenv.mkDerivation rec { + name = "${baseName}-${version}"; + + buildInputs = [ jdk makeWrapper deps ]; + + doCheck = true; + + phases = [ "installPhase" "checkPhase" ]; + + installPhase = '' + makeWrapper ${jre}/bin/java $out/bin/${baseName} \ + --add-flags "-cp $CLASSPATH scalafix.cli.Cli" + ''; + + checkPhase = '' + $out/bin/${baseName} --version | grep -q "${version}" + ''; + + meta = with stdenv.lib; { + description = "Refactoring and linting tool for Scala"; + homepage = https://scalacenter.github.io/scalafix/; + license = licenses.bsd3; + maintainers = [ maintainers.tomahna ]; + }; +} diff --git a/pkgs/games/steam/runtime-generated.nix b/pkgs/games/steam/runtime-generated.nix index 694274053bfe..ac24f0c15a53 100644 --- a/pkgs/games/steam/runtime-generated.nix +++ b/pkgs/games/steam/runtime-generated.nix @@ -4,1746 +4,1737 @@ { amd64 = [ rec { - name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_amd64"; - sha256 = "03yfjxzsyf14zqwxb43piyh78xxap7yxh5f4gx649qv28h7ygfrm"; - url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_amd64.deb"; + name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt5_amd64"; + sha256 = "074vbkdxaylb36ljkxz586jfcn7ghxzfivyiz703li1dw54jaq87"; + url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "dconf-gsettings-backend.deb"; }; } rec { - name = "freeglut3_2.6.0-1ubuntu3+srt4_amd64"; - sha256 = "1wi5fad0f7nqps55isvbb42njqssbhyzmd38q8413afjyhmm6icc"; - url = "mirror://steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt4_amd64.deb"; + name = "freeglut3_2.6.0-1ubuntu3+srt5_amd64"; + sha256 = "08mpxxd12c2kwlab47nfz25vpn7ag2xkmxp2zn48ymxab7qhvr5r"; + url = "mirror://steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "freeglut3.deb"; }; } rec { - name = "gcc-4.6-base_4.6.3-1ubuntu5+srt4_amd64"; - sha256 = "1za8f7wkwcww4wacydqq3fvi5p1ivgcr2n3npirqir1gr25cbxaj"; - url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+srt4_amd64.deb"; + name = "gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.1+srt1_amd64"; + sha256 = "1iknyb54mn8l1gcm9pg47hlra7y5x9awrgd431hzvig44c34vv9m"; + url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "gcc-4.6-base.deb"; }; } rec { - name = "gtk2-engines_2.20.2-1ubuntu1+srt4_amd64"; - sha256 = "03y4239swznwlgdx6yc58sj6w5irqq7432hxcmcw8608m3w0m29h"; - url = "mirror://steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt4_amd64.deb"; + name = "gtk2-engines_2.20.2-1ubuntu1+srt5_amd64"; + sha256 = "1w2aaddcrfg37fw7bl2jcbx14bp7ar8lyaq25j9pi8298wvbikly"; + url = "mirror://steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "gtk2-engines.deb"; }; } rec { - name = "gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_amd64"; - sha256 = "1iwmgzkdxjvr2q2kz5bjz64r4qjqbcf6ynz3sy5y81dl254pjnmh"; - url = "mirror://steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_amd64.deb"; + name = "gtk2-engines-murrine_0.98.2-0ubuntu1+srt5_amd64"; + sha256 = "0fqbm6502zqw64lbzywz0cllxkj9n44fxb2gg8q160vcqzyvb8jf"; + url = "mirror://steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "gtk2-engines-murrine.deb"; }; } rec { - name = "gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_amd64"; - sha256 = "0md5vjz8wnayppcxkl5x7874w2z4w7pjz96gprv24hid4azmyci8"; - url = "mirror://steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_amd64.deb"; + name = "gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt5_amd64"; + sha256 = "05d43583lj3ffskvmzcr6yb8a3jz1l8gc12mrmaix8w71bv81nr1"; + url = "mirror://steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "gtk2-engines-pixbuf.deb"; }; } rec { - name = "libacl1_2.2.51-5ubuntu1+srt6_amd64"; - sha256 = "02xwrfzspf58j9lr6b128jq1klkvd4b69lrclpqzwm9cqddg6mr5"; - url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+srt6_amd64.deb"; + name = "libacl1_2.2.51-5ubuntu1+srt7_amd64"; + sha256 = "199r529wahl2947iwnwf4qazv6jqipsjaj2dqvplacmm197rsvdc"; + url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+srt7_amd64.deb"; source = fetchurl { inherit url sha256; name = "libacl1.deb"; }; } rec { - name = "libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_amd64"; - sha256 = "08m1w5mhzl613gbjg6lvf7wcm7bs00xddaaci8f1944icl8pdibb"; - url = "mirror://steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_amd64.deb"; + name = "libappindicator1_0.4.92-0ubuntu1.1+steamrt1+srt1_amd64"; + sha256 = "19s3s3fc4vcj5cg7fh40w35vjyhi7097vv83lwjzrzhz5jlgczmp"; + url = "mirror://steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1.1+steamrt1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libappindicator1.deb"; }; } rec { - name = "libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - sha256 = "0m69ar6w3lzsggn79lyc3614p9rr2dy29vwqvl4w3gmshp6aqhs4"; - url = "mirror://steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; + name = "libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; + sha256 = "0mib9hy38mbiz40dr7x7c9c0liqswmnnykij7xpp7kbfqlvlshb8"; + url = "mirror://steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libasn1-8-heimdal.deb"; }; } rec { - name = "libasound2_1.1.0-0ubuntu1+steamos1+srt1_amd64"; - sha256 = "1bh911nx5a2abn38h9sa90ji358r6is2n7ymm10v94yibdf63rwg"; - url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt1_amd64.deb"; + name = "libasound2_1.1.0-0ubuntu1+steamos1+srt2_amd64"; + sha256 = "05d4ijlc20ss4rm2jxr5lxkgwbn0qcv5a7pj9aizl66klpbzsgay"; + url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libasound2.deb"; }; } rec { - name = "libasound2-plugins_1.1.0-0ubuntu1+srt1_amd64"; - sha256 = "1l36hxgnml9pglrihm17vkgqp3jpqslicg1mpycixzz9cpgfyxbz"; - url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt1_amd64.deb"; + name = "libasound2-plugins_1.1.0-0ubuntu1+srt2_amd64"; + sha256 = "1dsa9z7ssf39c039a60axh36wgykyapv65gmlxnvxpkhqnw4zywm"; + url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libasound2-plugins.deb"; }; } rec { - name = "libasyncns0_0.8-4+srt4_amd64"; - sha256 = "154bh8mpslr4xwf54h1xds4v2yjf8rbyvv1lc0azl9gnkan1y0an"; - url = "mirror://steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt4_amd64.deb"; + name = "libasyncns0_0.8-4+srt5_amd64"; + sha256 = "00nglm7sryy3y1pagjhv1mq6rvqiawmhf3kgwv0g7bqwgxcpia7p"; + url = "mirror://steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libasyncns0.deb"; }; } rec { - name = "libatk1.0-0_2.4.0-0ubuntu1+srt4_amd64"; - sha256 = "0kky7mfkx38lj4gafrv886z0vbf17xnpymq6qas59x8f35bzx742"; - url = "mirror://steamrt/pool/main/a/atk1.0/libatk1.0-0_2.4.0-0ubuntu1+srt4_amd64.deb"; + name = "libatk1.0-0_2.18.0-1+steamrt1+srt1_amd64"; + sha256 = "1rs9k9pcxmpwlwbxgalsqhiv7baqylaxpkhy4524a4b8dw1qx0k4"; + url = "mirror://steamrt/pool/main/a/atk1.0/libatk1.0-0_2.18.0-1+steamrt1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libatk1.0-0.deb"; }; } rec { - name = "libattr1_2.4.46-5ubuntu1+srt4_amd64"; - sha256 = "11hn8q45pddm4khq0qp1qj19c1syfawscnvrl6cv1xmahpb3nm3i"; - url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+srt4_amd64.deb"; + name = "libattr1_2.4.46-5ubuntu1+steamrt1+srt1_amd64"; + sha256 = "1d7xlyz5phsgka2psf6hwa393lgmlyjl3cd7a8dbzs9862h5f2v8"; + url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+steamrt1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libattr1.deb"; }; } rec { - name = "libavahi-client3_0.6.30-5ubuntu2+srt4_amd64"; - sha256 = "0yrgvh80i1gpcq2w64hkqnmiymgrn7r2v67wyd1iijc2zyb4x0c3"; - url = "mirror://steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2+srt4_amd64.deb"; + name = "libavahi-client3_0.6.30-5ubuntu2.2+srt1_amd64"; + sha256 = "04rkaiapl13rxlr2bwxz2q7z6i0091nm1c49kjnl1yckg64d7548"; + url = "mirror://steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2.2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libavahi-client3.deb"; }; } rec { - name = "libavahi-common3_0.6.30-5ubuntu2+srt4_amd64"; - sha256 = "1r1rqpqdqmqxn3g1iifc77jgrhfkr5275s7d5h3p1hvkmlzyvwd2"; - url = "mirror://steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2+srt4_amd64.deb"; + name = "libavahi-common3_0.6.30-5ubuntu2.2+srt1_amd64"; + sha256 = "1a2x57s3072na65gr7ys0wl5cm2f1j2m5kkhlhq4i8ms6hxssgrk"; + url = "mirror://steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2.2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libavahi-common3.deb"; }; } rec { - name = "libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64"; - sha256 = "09fwqr29dxhxkkf1gd9f9sph2jgv0qx3p7k6qxxwq3bg4lh2971n"; - url = "mirror://steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb"; + name = "libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64"; + sha256 = "0wpmnsnq5njv65iwq2g6819m2j5fda7jm8450qs3lmyc963ds0i2"; + url = "mirror://steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libavcodec53.deb"; }; } rec { - name = "libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64"; - sha256 = "0fynn6g6mc4raj144hg9r7qbiz7b2s4p7aidjpy34xkbxcn2vq45"; - url = "mirror://steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb"; + name = "libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64"; + sha256 = "1xpxmhhhgc7ap7f2ijlsgx9p58qqyvk2lgfn61dhlibq046px816"; + url = "mirror://steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libavfilter2.deb"; }; } rec { - name = "libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64"; - sha256 = "0qdfr19xfxwab9q5w4bvwgv873cs8zgm4s10hwg6741xr6qifnhg"; - url = "mirror://steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb"; + name = "libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64"; + sha256 = "0b8vx5lhsbynivm58zhxd0w6g7c7bqjvsr891wbqizbi325yja2b"; + url = "mirror://steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libavformat53.deb"; }; } rec { - name = "libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64"; - sha256 = "0pfgxnrf1jjlb7gvwklwn7m61n591yfzqfzzqb76gyr20r6v6dzw"; - url = "mirror://steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb"; + name = "libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64"; + sha256 = "1g3bdnfs0rgwnzrnwpj5hamynj1z0qs8wmxlfd0iqkah74ymgaaa"; + url = "mirror://steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libavutil51.deb"; }; } rec { - name = "libbz2-1.0_1.0.6-1+srt4_amd64"; - sha256 = "13rsp2cyayvnh2755kjbs6g6j85rdpl6cwlx22b97hid5pq5nk60"; - url = "mirror://steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt4_amd64.deb"; + name = "libbz2-1.0_1.0.6-1+srt5_amd64"; + sha256 = "046y04ynczpydlrablks51mx4jc1313k89hsi8x4sj2a355819nz"; + url = "mirror://steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libbz2-1.0.deb"; }; } rec { - name = "libcairo2_1.10.2-6.1ubuntu3+srt4_amd64"; - sha256 = "0iv16gfc1b8n4p088jbask9i8i56agip8dd5b1r22r52hg28gi9y"; - url = "mirror://steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt4_amd64.deb"; + name = "libcairo2_1.10.2-6.1ubuntu3+srt5_amd64"; + sha256 = "1j82gzl9hfxsrk2s3nxx1dpq6jlmkz5y5mkvxw9d166v0mlvxkq4"; + url = "mirror://steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcairo2.deb"; }; } rec { - name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_amd64"; - sha256 = "19gl25hjzxw375qqbckmgfr14qd48zaccnny4zbddlz8aj5w4wig"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_amd64.deb"; + name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt5_amd64"; + sha256 = "1x36zmsb7wcmgli75sfqamw5gmsv47if56f1vljjgak3jn2vlmm2"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcanberra-gtk-module.deb"; }; } rec { - name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_amd64"; - sha256 = "1kgq90l6rafqk7zfxafvzkh8msys5mlc95qr3rcv6l0f03w785dy"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_amd64.deb"; + name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt5_amd64"; + sha256 = "0g68j9w3xn0vnjgznq2avmzk8rykas0a6749ldq99yq9afccjfcp"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcanberra-gtk0.deb"; }; } rec { - name = "libcanberra0_0.28-3ubuntu3+steamrt1+srt4_amd64"; - sha256 = "01x6y4gq1ivpdywglx418gr4m56qvm05nicmavwimnafxga3c5sk"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1+srt4_amd64.deb"; + name = "libcanberra0_0.28-3ubuntu3+steamrt1+srt5_amd64"; + sha256 = "0qzyjrr5nmc72pfbalh9s22s51c5c10f0h23viyjrk77kk0ysc3f"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcanberra0.deb"; }; } rec { - name = "libcap2_2.22-1ubuntu3+srt4_amd64"; - sha256 = "1rhfhq1n45fq40p6c2aipkica2dw8w95w7bsdrxfby48gdppgzy7"; - url = "mirror://steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt4_amd64.deb"; + name = "libcap2_2.22-1ubuntu3+srt5_amd64"; + sha256 = "0bsjpbv2p7ir6w7dpjvs8y25skha72406mhgjrff9dvdvc9mwwpy"; + url = "mirror://steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcap2.deb"; }; } rec { - name = "libcg_3.0.0016-0ubuntu1+srt4_amd64"; - sha256 = "0yifiwr2hc7rvvd6snf530gma05v2qpiyl652drdc9rvcfjrj9zi"; - url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt4_amd64.deb"; + name = "libcg_3.0.0016-0ubuntu1+srt5_amd64"; + sha256 = "1d4lc4krkphvmlvmd4z60l6cg37gd62x9m700s83jxbsz0fhwmrb"; + url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcg.deb"; }; } rec { - name = "libcomerr2_1.42-1ubuntu2.2+srt1_amd64"; - sha256 = "1cll5iwdply1lz211j83n22aidsxfx2jvy09a02qa79a7g1qv6c3"; - url = "mirror://steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.2+srt1_amd64.deb"; + name = "libcomerr2_1.42-1ubuntu2.3+srt1_amd64"; + sha256 = "0ar9lzaxlmhqxpp6v2b3jz3lblkqhqwy0ywbwkdq4zs5za69kh1b"; + url = "mirror://steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.3+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcomerr2.deb"; }; } rec { - name = "libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_amd64"; - sha256 = "1xaxim0df5713hj4kq141rnf51zvyhvpv015q4q41c3nh4d9bz7w"; - url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_amd64.deb"; + name = "libcups2_1.5.3-0ubuntu8.2+steamrt1+srt4_amd64"; + sha256 = "12ihcwb2qlkms5si1sz7an61ndhxqhd2dxrx9likm07bz2c9mq9b"; + url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.2+steamrt1+srt4_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcups2.deb"; }; } rec { - name = "libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64"; - sha256 = "0vwdpkiisnbrm1j22qzjj2g5vsiv4wdja3j34j16pc30088f4c3i"; - url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64.deb"; + name = "libcurl3_7.22.0-3ubuntu4.17+srt1_amd64"; + sha256 = "1nzbxzrkqnnzhml2fyjzpaifsm3whq78bxjqnhs9ljs3jwhl59p5"; + url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.17+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcurl3.deb"; }; } rec { - name = "libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64"; - sha256 = "0rvrjcxpmnbq42aq6x31gxxglwiccm059r2q78hqiw82i86b7j28"; - url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64.deb"; + name = "libcurl3-gnutls_7.22.0-3ubuntu4.17+srt1_amd64"; + sha256 = "0mgxy0vninsv7yi3wiqjkdz8ap52y4zlkzxwyijcvbwkxp33rq68"; + url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.17+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcurl3-gnutls.deb"; }; } rec { - name = "libdbus-1-3_1.4.18-1ubuntu1.7+srt1_amd64"; - sha256 = "1nkzsi04m1icwb3b1nky15d0frnc0hpfsyrm3xx1hriv02iqwgvw"; - url = "mirror://steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.7+srt1_amd64.deb"; + name = "libdbus-1-3_1.4.18-1ubuntu1.8+srt1_amd64"; + sha256 = "1m1q2q2s6b98x1zbk31hnd80dakfqg2g8yaj662vxrdrr85j6nza"; + url = "mirror://steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.8+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libdbus-1-3.deb"; }; } rec { - name = "libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_amd64"; - sha256 = "19xnslykd4y22ff5mfs2rg4rjppmcrmrbwynzx4v2rvxckvvq77f"; - url = "mirror://steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_amd64.deb"; + name = "libdbus-glib-1-2_0.98-1ubuntu1.1+srt5_amd64"; + sha256 = "1f36vyq505hrfqmhizgplvvk17zhf1230wlrzibdwi04j275sahk"; + url = "mirror://steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libdbus-glib-1-2.deb"; }; } rec { - name = "libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_amd64"; - sha256 = "1x1szx7m6y6i0d6ahffnrdhs693rk4wi4hrhbmmn2g1sizr9qhmb"; - url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_amd64.deb"; + name = "libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt5_amd64"; + sha256 = "064wwqbjrdvwkjpyi0k6vj7rrwkwcy49mrlsgrv3q4gckiqhjhbz"; + url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libdbusmenu-glib4.deb"; }; } rec { - name = "libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_amd64"; - sha256 = "0nrydq0mjjsx1v9gk78j5xcgdaay5dhxn5rj9ydkbkw7ih4xm2m1"; - url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_amd64.deb"; + name = "libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt5_amd64"; + sha256 = "0vagal7jh6biarjf9sy219p2njb5k8ycv4v7glni8prli0c1zzxq"; + url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libdbusmenu-gtk4.deb"; }; } rec { - name = "libexif12_0.6.20-2ubuntu0.1+srt4_amd64"; - sha256 = "09pjkyjykvsmddx20ji4wgr5gnqbshj1hpm77129ini9qp61wxig"; - url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt4_amd64.deb"; + name = "libexif12_0.6.20-2ubuntu0.1+srt5_amd64"; + sha256 = "15rk2yfvsy16azpcwl8xsxigmrdhl0pkg6dvyq2pknp08c72r5r7"; + url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libexif12.deb"; }; } rec { - name = "libexpat1_2.0.1-7.2ubuntu1.2+srt1_amd64"; - sha256 = "0axky1v55yalkng9mn22ignmapv100gkcfb0xs82pllzaws32yhb"; - url = "mirror://steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.2+srt1_amd64.deb"; + name = "libexpat1_2.0.1-7.2ubuntu1.4+srt2_amd64"; + sha256 = "0pdn5f20pbmklnvsyl83x0rjafsjy8vxn4zd2nl7h0aabzng9vy2"; + url = "mirror://steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.4+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libexpat1.deb"; }; } rec { - name = "libffi6_3.0.11~rc1-5+srt4_amd64"; - sha256 = "1brqpwjbf6dd6crvs32b7q73m11anlq1s1r1m0p5cv17sc89q3q4"; - url = "mirror://steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt4_amd64.deb"; + name = "libffi6_3.0.11~rc1-5+srt5_amd64"; + sha256 = "0i428a37s9lma09psy0d7vj2amnimwgx4izmmac4dlzyy6qpfn9s"; + url = "mirror://steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libffi6.deb"; }; } rec { - name = "libflac8_1.2.1-6+srt4_amd64"; - sha256 = "1sdbbm4gdq0mw103z3nwhywvix1z21gdq6lc5xf4s12zpj1zq2gc"; - url = "mirror://steamrt/pool/main/f/flac/libflac8_1.2.1-6+srt4_amd64.deb"; + name = "libflac8_1.2.1-6+steamrt1.1ubuntu0.1+srt1_amd64"; + sha256 = "13hkikwbxsm3nf91rc1xa98apwx9y4mr9h20cd0206gm43qfyvh2"; + url = "mirror://steamrt/pool/main/f/flac/libflac8_1.2.1-6+steamrt1.1ubuntu0.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libflac8.deb"; }; } rec { - name = "libfltk1.1_1.1.10-10+srt4_amd64"; - sha256 = "0x5xxxkkj7g5wyhxl1rv846irn3r8hh744fqyn8hgmbp4mdgils0"; - url = "mirror://steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt4_amd64.deb"; + name = "libfltk1.1_1.1.10-10+srt5_amd64"; + sha256 = "0zrx2mb5rl5hcyh6p0sglark6rh7s993sg26klizkswn2w53rv8j"; + url = "mirror://steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libfltk1.1.deb"; }; } rec { - name = "libfontconfig1_2.8.0-3ubuntu9.1+srt4_amd64"; - sha256 = "0mcdd9x8dc153sk2dqixxy4rxvl9hvc7dz0msfwiywrgbilzfbl4"; - url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.1+srt4_amd64.deb"; + name = "libfontconfig1_2.8.0-3ubuntu9.2+srt2_amd64"; + sha256 = "047sq7342mqvc84qx8dayf282yh84zdj4azqp1c0h4hczc73jwv9"; + url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libfontconfig1.deb"; }; } rec { - name = "libfreetype6_2.4.8-1ubuntu2.3+srt1_amd64"; - sha256 = "08x0fg01qbycdwdgqj3xal0fi676pnkkgsk0kbvxfg3i4ln944l1"; - url = "mirror://steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.3+srt1_amd64.deb"; + name = "libfreetype6_2.4.8-1ubuntu2.6+srt1_amd64"; + sha256 = "01z4dwib9d7i7187yw1b0vji587hrj354cz6ll2iybrbg25w510w"; + url = "mirror://steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.6+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libfreetype6.deb"; }; } rec { - name = "libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64"; - sha256 = "05pg02l16fj7fdv8gkx95jy4j4cikqwmdkyq65a8qf20in3qs04m"; - url = "mirror://steamrt/pool/main/g/gcc-4.8/libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64.deb"; + name = "libgcc1_5.4.0-7.really.6+steamrt1.1+srt1_amd64"; + sha256 = "1300z3mjxxcl718mjdfppv53s42ba88gm0izbfn6wqvrj7wrz5wq"; + url = "mirror://steamrt/pool/main/g/gcc-5/libgcc1_5.4.0-7.really.6+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgcc1.deb"; }; } rec { - name = "libgconf-2-4_3.2.5-0ubuntu2+srt4_amd64"; - sha256 = "0mmgmnzyi9rlk7k6ir3f127brml366bbk7v5aq75y90z6qdp5h62"; - url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+srt4_amd64.deb"; + name = "libgconf-2-4_3.2.5-0ubuntu2+srt5_amd64"; + sha256 = "163jbgkz66crkkjdqc0axj4sjfmd6kfkglwlk3d52rf3bc7mvimb"; + url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgconf-2-4.deb"; }; } rec { - name = "libgcrypt11_1.5.0-3ubuntu0.5+srt1_amd64"; - sha256 = "0qpxrm37js3pgi8hwcfqyqgkipypb0gw6nvsbz5dd112hmnpkp37"; - url = "mirror://steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.5+srt1_amd64.deb"; + name = "libgcrypt11_1.5.0-3ubuntu0.6+srt2_amd64"; + sha256 = "0p1vywfx5l9zhibr8c20by9w646przfjfaci5c6ifi7f4v5nn9hc"; + url = "mirror://steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.6+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgcrypt11.deb"; }; } rec { - name = "libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_amd64"; - sha256 = "00kq05jzlrvd4gx8pz54k1i8sm9v8l07vih4if6wanr45ifsjqlp"; - url = "mirror://steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_amd64.deb"; + name = "libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt5_amd64"; + sha256 = "1km2w0haybwal9zkhwsrx4i9yi2zkhbbfhh2xljhfw5m5g6s4mq5"; + url = "mirror://steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgdk-pixbuf2.0-0.deb"; }; } rec { - name = "libglew1.10_1.10.0-3+srt4_amd64"; - sha256 = "0ybry9jiyp0bgfm9b0bznf5qllyf7jc6avd8rcc20ai7yf719mwc"; - url = "mirror://steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt4_amd64.deb"; + name = "libglew1.10_1.10.0-3+srt6_amd64"; + sha256 = "19w95wfzzr909jgjg8w6fqff8x00izawqicw896fqbf44zmsc2l0"; + url = "mirror://steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libglew1.10.deb"; }; } rec { - name = "libglew1.6_1.6.0-4+srt4_amd64"; - sha256 = "1y4ywi4lp5df3nasxz8p5rmybl2vbv8bbww1s8alin5waidl7qav"; - url = "mirror://steamrt/pool/main/g/glew/libglew1.6_1.6.0-4+srt4_amd64.deb"; - source = fetchurl { - inherit url sha256; - name = "libglew1.6.deb"; - }; - } - rec { - name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_amd64"; - sha256 = "1imdb4wyy7qndg8xmlrfnj0x3a6fg7dv0izn2rajp5q77ivry51v"; - url = "mirror://steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_amd64.deb"; + name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt2_amd64"; + sha256 = "1zhb0cpyl3vq5hg63j7wgw6bmwrn8xnq1ybnbigw439c0nq4f333"; + url = "mirror://steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libglib2.0-0.deb"; }; } rec { - name = "libglu1-mesa_8.0.4-0ubuntu0.7+srt4_amd64"; - sha256 = "1bgks33ck18asizisa5d7wj4wsv8hxccpshl0f2ihdvs6qgxgs76"; - url = "mirror://steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt4_amd64.deb"; + name = "libglu1-mesa_8.0.4-0ubuntu0.7+srt5_amd64"; + sha256 = "02fywg8h5jlkrh1qiqd0hpjv4v1hxggm3vjhnfn5rdj3xxmbvr2y"; + url = "mirror://steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libglu1-mesa.deb"; }; } rec { - name = "libgmp10_5.0.2+dfsg-2ubuntu1+srt4_amd64"; - sha256 = "1la9938zrqrf8v4bcn5063xxxwwankhzh69m0sy8csixfg480c1a"; - url = "mirror://steamrt/pool/main/g/gmp/libgmp10_5.0.2+dfsg-2ubuntu1+srt4_amd64.deb"; + name = "libgmp10_5.0.2+dfsg-2ubuntu1+srt5_amd64"; + sha256 = "0vmx8ybnbf4rilylk1kxhq6c1z5wbxh77garwf79jm0jx3xamzrh"; + url = "mirror://steamrt/pool/main/g/gmp/libgmp10_5.0.2+dfsg-2ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgmp10.deb"; }; } rec { - name = "libgnutls26_2.12.14-5ubuntu3.11+srt1_amd64"; - sha256 = "1zrrprip93m9r2c7zd54pz8f5jvdgb0jir6ifvqbl60d521lfbl7"; - url = "mirror://steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.11+srt1_amd64.deb"; + name = "libgnutls26_2.12.14-5ubuntu3.14+srt1_amd64"; + sha256 = "19jl1ril1h2r66ilwi45j49g2ag9b4x5090ld0gqp4hbx6f67x9g"; + url = "mirror://steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.14+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgnutls26.deb"; }; } rec { - name = "libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64"; - sha256 = "094y3af19hg7s0hklh9slhmb19h2hhbfl4fpfpqcvbagkh6gwxl1"; - url = "mirror://steamrt/pool/main/g/gcc-4.8/libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64.deb"; + name = "libgomp1_5.4.0-7.really.6+steamrt1.1+srt1_amd64"; + sha256 = "06x5j6rvv5g8brsmgpxikjb9fs6gjpd31g2iw3b313k9c6fl7z9x"; + url = "mirror://steamrt/pool/main/g/gcc-5/libgomp1_5.4.0-7.really.6+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgomp1.deb"; }; } rec { - name = "libgpg-error0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "0zw0zrl50y86y292zjcgpxiqjwyw0krnrmi28qvb0ba2ahp18f7v"; - url = "mirror://steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libgpg-error0_1.10-2ubuntu1+srt5_amd64"; + sha256 = "1pgv5svrqvsyiakqqnbb1ph6sk5yd6lgk53k2isyyz44vdjch9py"; + url = "mirror://steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgpg-error0.deb"; }; } rec { - name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64"; - sha256 = "1mmd16fh58gnyyjwg9ac1br0xia670xc0ag65bfgxwnpfnkr7nyj"; - url = "mirror://steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64.deb"; + name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64"; + sha256 = "1nv973s0h9vmnmslxyddd28p4yv8k47d685m8lxv1irc4skqxzzc"; + url = "mirror://steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgssapi-krb5-2.deb"; }; } rec { - name = "libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - sha256 = "063k09yyr9mn0lacp29cgwagpiix220p7ahs5shpyigkjk5bp174"; - url = "mirror://steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; + name = "libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; + sha256 = "02h7fqwwg7jpz8b86dbjhh067ah34x3ys9n5df1rksbzpvmqcbiy"; + url = "mirror://steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgssapi3-heimdal.deb"; }; } rec { - name = "libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_amd64"; - sha256 = "0r60n1xym2alg4jr1icgzvd8x614p7vky0zxfvn8x9qd2hzr8k5q"; - url = "mirror://steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_amd64.deb"; + name = "libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.2+srt1_amd64"; + sha256 = "186hxj0jvgbxki0v6fx499pp796kcwiz86gqfhkd94k434aaqz1f"; + url = "mirror://steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgstreamer-plugins-base0.10-0.deb"; }; } rec { - name = "libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_amd64"; - sha256 = "0xynq7jgb0x8npb6apj58ag5zccl0gh4npyrfvs0ys4hzlv2fkmm"; - url = "mirror://steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_amd64.deb"; + name = "libgstreamer0.10-0_0.10.36-1ubuntu1+srt5_amd64"; + sha256 = "1ddfd661703jgd8xai2ysh2gdvf0pkbvg46iazlg5jqr17i1b1sx"; + url = "mirror://steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgstreamer0.10-0.deb"; }; } rec { - name = "libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_amd64"; - sha256 = "0zbsr09xam3sl5qpnl34hgiir98g3rcfg2nblzwp8yr9kkrsb7zk"; - url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_amd64.deb"; + name = "libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt5_amd64"; + sha256 = "1bb7yf3ld99a9amdb6r8slw7g3xnj72za2nbpsrm6cwlw9nyxli0"; + url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgtk2.0-0.deb"; }; } rec { - name = "libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all"; - sha256 = "0xgh9nrvj1hf3wj9pqm9x3ykw95v9bsh5k2vgr3cr9135rrj0dp5"; - url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all.deb"; + name = "libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt5_all"; + sha256 = "0rw8iy16ij86abh444jk1xw78b5z81qjxm1292jin3sfhck4bd4x"; + url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt5_all.deb"; source = fetchurl { inherit url sha256; name = "libgtk2.0-common.deb"; }; } rec { - name = "libgudev-1.0-0_175-0ubuntu9.2+srt4_amd64"; - sha256 = "1bv962vi9x8m41ss6g73q91xlxhf1pd733wsywflllkxa5qyabpl"; - url = "mirror://steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.2+srt4_amd64.deb"; + name = "libgudev-1.0-0_175-0ubuntu9.10+srt1_amd64"; + sha256 = "1i8k7y464zj3vb17kwim69kh57y9hnlx40xfs0hrfvjjlj3ih30w"; + url = "mirror://steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.10+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgudev-1.0-0.deb"; }; } rec { - name = "libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - sha256 = "1s67jx924c06arhf18dpqncphlih26a7frshzd4ndwzp8xp87xyc"; - url = "mirror://steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; + name = "libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; + sha256 = "1ihzd3ihylrbrwxqx8sam6lwkhkk2c9ys7vxah2yvj43fl8piiz8"; + url = "mirror://steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libhcrypto4-heimdal.deb"; }; } rec { - name = "libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - sha256 = "0zchyajpd78rflfh4md3i0cvzd0gbkwf6l8kqcyavvib42mmdga8"; - url = "mirror://steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; + name = "libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; + sha256 = "1z4h6zdh5h9yvq4dfizy8ndskny94c86m5b4g9lpypfpzj259kpi"; + url = "mirror://steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libheimbase1-heimdal.deb"; }; } rec { - name = "libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - sha256 = "0lz83zkg4f1rjhf0sigk09s4kbksm9j2lalf7k04bci1sxs2wj2y"; - url = "mirror://steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; + name = "libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; + sha256 = "13fgm887ycb1l5w1hxvlf906wr4k834drykg36ink6g9fi1smn79"; + url = "mirror://steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libheimntlm0-heimdal.deb"; }; } rec { - name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - sha256 = "0bcn57af9g4psxfiqqfsmfv7z3a713z86760lspgl63xfxlsm4d5"; - url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; + name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; + sha256 = "0alagksf7h181r86iiddvb9sil9zwf7d8lhnikq2x1i1ncxnwbj9"; + url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libhx509-5-heimdal.deb"; }; } rec { - name = "libice6_1.0.7-2build1+srt4_amd64"; - sha256 = "0lygkw0my7diasqyw7m5a0rfcpp38pb8jq7iqks195j21sy95h0s"; - url = "mirror://steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt4_amd64.deb"; + name = "libice6_1.0.7-2build1+srt5_amd64"; + sha256 = "0v1a4dbs6by8n3yi23xqs4qqvjjdhh1qqmacc2bybjd2qi8dps8y"; + url = "mirror://steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libice6.deb"; }; } rec { - name = "libidn11_1.23-2+steamrt1+srt4_amd64"; - sha256 = "0530ygdsq840kmqm1mlqk19a7wxpvwgrbary2dpflzqvclx4gfr1"; - url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.23-2+steamrt1+srt4_amd64.deb"; + name = "libidn11_1.23-2+steamrt1+srt5_amd64"; + sha256 = "19s5pm1w8idc52hcj07fd52hw4fxl8hda9rm5gdbgginrl1naibp"; + url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.23-2+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libidn11.deb"; }; } rec { - name = "libindicator7_0.5.0-0ubuntu1+srt4_amd64"; - sha256 = "0j89i9hgdh93a6m71ji3rrhlnyanjb7dbxy460shn38v4f3ax735"; - url = "mirror://steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+srt4_amd64.deb"; + name = "libindicator7_0.5.0-0ubuntu1+steamrt1+srt1_amd64"; + sha256 = "0fcj1fmk70y8j1jcbr9dian2zrwf5m7yis4zpq8cc77838cdx0pg"; + url = "mirror://steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+steamrt1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libindicator7.deb"; }; } rec { - name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_amd64"; - sha256 = "0l7h8z8fx0pqkbdh5x3v6azz6ddxdlzchgs97h5babrknkfkiar4"; - url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_amd64.deb"; + name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt4_amd64"; + sha256 = "0qpipr1anfy4y6m1syznmarsh3ni6db9dc7a1w0n11zfhp8lpihg"; + url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt4_amd64.deb"; source = fetchurl { inherit url sha256; name = "libjack-jackd2-0.deb"; }; } rec { - name = "libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_amd64"; - sha256 = "0z2df70v2ggw2la3yr4ll926wj6pc84li1x2bxwz9ysw7xsgalg0"; - url = "mirror://steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_amd64.deb"; + name = "libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt5_amd64"; + sha256 = "10r393m5xxqjd6hpvlnfvnba081crhs88x1knhi3s6mhg2xhg35y"; + url = "mirror://steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libjpeg-turbo8.deb"; }; } rec { - name = "libjpeg62_6b1-2ubuntu1.1+srt4_amd64"; - sha256 = "0n6qsfk42nhwvg8r9win7a90zvb31ba7cp7jvbbc4bhv7ygxxm7f"; - url = "mirror://steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt4_amd64.deb"; + name = "libjpeg62_6b1-2ubuntu1.1+srt5_amd64"; + sha256 = "0wn9lgqc95gvck5k8qds9908j5ip3s3bz85a8l2bdprgg1q4rsrl"; + url = "mirror://steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libjpeg62.deb"; }; } rec { - name = "libjson0_0.9-1ubuntu1.1+srt2_amd64"; - sha256 = "10r817kzxcviqvrajmi33pdbqss1qxpkmjxda7cclamnnawbcd17"; - url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt2_amd64.deb"; + name = "libjson0_0.9-1ubuntu1.1+srt3_amd64"; + sha256 = "1pqncc63z9w3jg41xqklappyirajfrchdjp81bldrnmbpbj69xha"; + url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libjson0.deb"; }; } rec { - name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64"; - sha256 = "1xsl1nwsm6r1gjfkl7x71h8p9qkq7gi624277cj3k68b31qh3g4z"; - url = "mirror://steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64.deb"; + name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64"; + sha256 = "18xfi5c04s3z9brj1rrmvl9s67apd4d6ax7vfwwjzwh7ygnkp8h8"; + url = "mirror://steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libk5crypto3.deb"; }; } rec { - name = "libkeyutils1_1.5.2-2+srt4_amd64"; - sha256 = "0khwz7jqw9yq157r675sjii3bqk2i66dh6wn43b7vhh0wjz6nbdc"; - url = "mirror://steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt4_amd64.deb"; + name = "libkeyutils1_1.5.2-2+srt5_amd64"; + sha256 = "14mv4r05r0fzkbl3r4jaa7wwmmaprv3q5w36pyf3xqc3iynxnj2p"; + url = "mirror://steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libkeyutils1.deb"; }; } rec { - name = "libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - sha256 = "0lfhwqsxpzaapz71rldi2zhsxkdy55krcmfbli06qs4mqx9mf691"; - url = "mirror://steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; + name = "libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; + sha256 = "0xhz42f7lnsc69sfnj2w0917jwm82nbc9i56qq3s1g2sw7z6kb3q"; + url = "mirror://steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libkrb5-26-heimdal.deb"; }; } rec { - name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64"; - sha256 = "0aqwf07c818apd5md4gxwzx67xvbvv8s6fm890vibqhsrmymi621"; - url = "mirror://steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64.deb"; + name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64"; + sha256 = "1k3d1775ran10y79s7n5lmdlqlr7kscvxmj1887bnn4yxbwlgy73"; + url = "mirror://steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libkrb5-3.deb"; }; } rec { - name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64"; - sha256 = "04wacj307jcy8ykyq6w3xw9phmprmfz6cpwv1wyfarxf4gr7nyii"; - url = "mirror://steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64.deb"; + name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64"; + sha256 = "1xml3gfn253lydqaqk27209sr1x0vvrbbkmb63z5cyy4i1yfpvmr"; + url = "mirror://steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libkrb5support0.deb"; }; } rec { - name = "liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_amd64"; - sha256 = "12kva7qrghlj65khzcmj6xqszij9186ly0iwjjqjs5xl5821aic4"; - url = "mirror://steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_amd64.deb"; + name = "liblcms2-2_2.2+git20110628-2ubuntu3.1+srt5_amd64"; + sha256 = "0wj24yi2ws12lfs0pi0bq9rbr1gyk2nv30rf46bav41mpn2fj9mg"; + url = "mirror://steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "liblcms2-2.deb"; }; } rec { - name = "libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_amd64"; - sha256 = "1xnhh3s2cm4vjny964bsznnk2a6zj9n8ygkxfyrraib3wy61lidv"; - url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_amd64.deb"; + name = "libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt5_amd64"; + sha256 = "1pakk71qcjdp28v5cbfvrkbknhjhnbkk7ywr6czarmhldipsyifp"; + url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libldap-2.4-2.deb"; }; } rec { - name = "libltdl7_2.4.2-1ubuntu1+srt4_amd64"; - sha256 = "069s7km994c2z89jndwwrpspq0z7jyxr56ma057hbrilfpp4r7yd"; - url = "mirror://steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt4_amd64.deb"; + name = "libltdl7_2.4.2-1ubuntu1+srt5_amd64"; + sha256 = "0ly9p5xilsf0d214mrx96nc3gn1xm1b68dzizsimhqa3bfpckzbb"; + url = "mirror://steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libltdl7.deb"; }; } rec { - name = "libmikmod2_3.1.12-2+srt4_amd64"; - sha256 = "11flm0w3vwf66yi9mqf43ma3bc6jwg6xcz71h4a3jgqahsg3skfb"; - url = "mirror://steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-2+srt4_amd64.deb"; + name = "libmikmod2_3.1.12-2+srt5_amd64"; + sha256 = "1i6kwzy1dz0a78jm0vpa0hjqahkwnj8yab8aky2srsf07y8bz2r8"; + url = "mirror://steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libmikmod2.deb"; }; } rec { - name = "libncurses5_5.9-4+srt4_amd64"; - sha256 = "08wb0y9dizj7ngsivl2rpikjfl246q1jib6r0nqg7c6r05h8k46m"; - url = "mirror://steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt4_amd64.deb"; + name = "libncurses5_5.9-4+srt5_amd64"; + sha256 = "1b4j17npqdhj6afcw7cj37k6dr2kmbgpjyv7c0viq82165bjacfp"; + url = "mirror://steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libncurses5.deb"; }; } rec { - name = "libncursesw5_5.9-4+srt4_amd64"; - sha256 = "1gv0w7jrx9zd59zg7z38qzlcp48h7yyfj4jrbfsifl54ryn4fgwh"; - url = "mirror://steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt4_amd64.deb"; + name = "libncursesw5_5.9-4+srt5_amd64"; + sha256 = "0gavz5rh8hz6ir3x09p57balxl8zprjsglgf2craq340qpgqw4s6"; + url = "mirror://steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libncursesw5.deb"; }; } rec { - name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64"; - sha256 = "0f3h1hh4vn0ysr099lgwk8dx3462cpvmz3ig8r6d4vhxyzyh5a9z"; - url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64.deb"; + name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt1_amd64"; + sha256 = "0dw0mfwia3z6icj01558xgdjmi7g6g4nig4vrjbmlz05f9l2rck3"; + url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libnm-glib4.deb"; }; } rec { - name = "libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64"; - sha256 = "1dlfym38qs8m3g38z776vvpxg77xx2mjab7qipsc0lnppjn8gnss"; - url = "mirror://steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64.deb"; + name = "libnm-util2_0.9.4.0-0ubuntu4.2+steamrt2+srt1_amd64"; + sha256 = "1r9qw0mx38zisj6lr9bk8yv9f3yf2l80y4rvgxq6k28ccz5sahvs"; + url = "mirror://steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libnm-util2.deb"; }; } rec { - name = "libnotify4_0.7.5-1+srt4_amd64"; - sha256 = "1d61w65qxs93hpn4a8awzhjqcv7yva96n65309630axsm48cqxbd"; - url = "mirror://steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt4_amd64.deb"; + name = "libnotify4_0.7.5-1+srt5_amd64"; + sha256 = "15ny5m925wrn0m394gn88288zgdjf99m5jg9pxyfirhvjmpp8pmf"; + url = "mirror://steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libnotify4.deb"; }; } rec { - name = "libnspr4_4.10.10-0ubuntu0.12.04.1+srt1_amd64"; - sha256 = "1k08330f3fhr7c6bpm4b5qdyc2kkmz8fa5bgk1a8psxqvfdlsyap"; - url = "mirror://steamrt/pool/main/n/nspr/libnspr4_4.10.10-0ubuntu0.12.04.1+srt1_amd64.deb"; + name = "libnspr4_4.12-0ubuntu0.12.04.1+srt2_amd64"; + sha256 = "11y0nj7pc94gs3ndxph50whs1yx8lys48c44vj1207m2mkw3xdq7"; + url = "mirror://steamrt/pool/main/n/nspr/libnspr4_4.12-0ubuntu0.12.04.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libnspr4.deb"; }; } rec { - name = "libnss3_3.19.2.1-0ubuntu0.12.04.2+srt1_amd64"; - sha256 = "1bxg7wk179gwi7s4xrn1bkl2amnbqrf11qsdw384cyq9c2hwfagr"; - url = "mirror://steamrt/pool/main/n/nss/libnss3_3.19.2.1-0ubuntu0.12.04.2+srt1_amd64.deb"; + name = "libnss3_3.26.2-0ubuntu0.12.04.1+srt1_amd64"; + sha256 = "0a5mqk6fry96jgpn27fv66mzg7s7mn00jhiayh73q4ddlv52p1r6"; + url = "mirror://steamrt/pool/main/n/nss/libnss3_3.26.2-0ubuntu0.12.04.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libnss3.deb"; }; } rec { - name = "libogg0_1.2.2~dfsg-1ubuntu1+srt4_amd64"; - sha256 = "0829hivgxzmhck0l16lg16qbphkhsrnqb2px4ksrzbspmg6b5rb1"; - url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.2.2~dfsg-1ubuntu1+srt4_amd64.deb"; + name = "libogg0_1.2.2~dfsg-1ubuntu1+srt5_amd64"; + sha256 = "1r06qcfw2hmm1lxgvndzjw24nawxc2qd2qd3lh7w8qmj2zrgp3zd"; + url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.2.2~dfsg-1ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libogg0.deb"; }; } rec { - name = "libopenal1_1.13-4ubuntu3+steamrt1+srt4_amd64"; - sha256 = "08gj208gfh37lfnxz1xksbmm1g78ax812z0rk12ahl4w72jm1yjy"; - url = "mirror://steamrt/pool/main/o/openal-soft/libopenal1_1.13-4ubuntu3+steamrt1+srt4_amd64.deb"; + name = "libopenal1_1.16.0-3+srt1_amd64"; + sha256 = "02dc0xfwh1jmhm0l4wig3ybs2yy48hdarnbfjv69m9aryjpbh6gj"; + url = "mirror://steamrt/pool/main/o/openal-soft/libopenal1_1.16.0-3+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libopenal1.deb"; }; } rec { - name = "liborc-0.4-0_0.4.16-1ubuntu2+srt4_amd64"; - sha256 = "0pgiha65y3rrqm095vmwc27498drqcgadiqyh4zyq2h2zi2ki60j"; - url = "mirror://steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt4_amd64.deb"; + name = "liborc-0.4-0_0.4.16-1ubuntu2+srt5_amd64"; + sha256 = "13s7ni24igdkvmcs3d13ncll36clfmm14ggjqd23dsgyzmip5n18"; + url = "mirror://steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "liborc-0.4-0.deb"; }; } rec { - name = "libp11-kit0_0.12-2ubuntu1+srt4_amd64"; - sha256 = "1hsncmfp6h3ca5w2bhaxbr6y2ck8fpzp0zhjijgfnyaqvsjc6wwa"; - url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.12-2ubuntu1+srt4_amd64.deb"; + name = "libp11-kit0_0.12-2ubuntu1+srt5_amd64"; + sha256 = "00x01l29gh4zl0nfsyh90ixgvln6kcs2963vmmjaql4h1cgvi27g"; + url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.12-2ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libp11-kit0.deb"; }; } rec { - name = "libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_amd64"; - sha256 = "16hwn8a30ydarlw3rvpda48m0z0k5y1qw5vdg6syjaqcbwx15mll"; - url = "mirror://steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_amd64.deb"; + name = "libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt5_amd64"; + sha256 = "0dcimf6vsiv51lkavwbw980fll3vpki86i3rqm8vr37iz59798zf"; + url = "mirror://steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpango1.0-0.deb"; }; } rec { - name = "libpci3_3.1.8-2ubuntu5+srt4_amd64"; - sha256 = "041hxfsk0r7rh02h16igcr0141gmci4ljadljcxsa1yiyn41b4rr"; - url = "mirror://steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu5+srt4_amd64.deb"; + name = "libpci3_3.1.8-2ubuntu6+srt1_amd64"; + sha256 = "167a5rgzyss746s07fkal7vy89i0m5syjm2vdwfiln3ncil4s86y"; + url = "mirror://steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu6+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpci3.deb"; }; } rec { - name = "libpcre3_8.12-4+srt4_amd64"; - sha256 = "1m53qvhqbicybi43zjjblhaqxfnlvq1m61mkvdhwskcxh1y5zpic"; - url = "mirror://steamrt/pool/main/p/pcre3/libpcre3_8.12-4+srt4_amd64.deb"; + name = "libpcre3_8.12-4+steamrt1.1ubuntu0.2+srt1_amd64"; + sha256 = "0x3yzmxvlg2xyy2sm03vvr4c46r7ywbns7gqbshzgn656zqdid00"; + url = "mirror://steamrt/pool/main/p/pcre3/libpcre3_8.12-4+steamrt1.1ubuntu0.2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpcre3.deb"; }; } rec { - name = "libpcrecpp0_8.12-4+srt4_amd64"; - sha256 = "0dv8a32dsvklrnvw66rxb7xim9ylhr9w4qvns527v6fl98rvg08l"; - url = "mirror://steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+srt4_amd64.deb"; + name = "libpcrecpp0_8.12-4+steamrt1.1ubuntu0.2+srt1_amd64"; + sha256 = "1rlkj982w99x0mz008snkyqr1v13h165yj2z4jwdczpd1bsrra9h"; + url = "mirror://steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+steamrt1.1ubuntu0.2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpcrecpp0.deb"; }; } rec { - name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_amd64"; - sha256 = "0bljhrivr6dw181gisvy8dz6y9mjn0g9w3d5s2f5h8772g80mx7f"; - url = "mirror://steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_amd64.deb"; + name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.3+srt2_amd64"; + sha256 = "15sa863fia26lclp821j0c747dv8a8igz5l86n5ff1m3dmlb5hp3"; + url = "mirror://steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.3+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpixman-1-0.deb"; }; } rec { - name = "libpng12-0_1.2.46-3ubuntu4.2+srt1_amd64"; - sha256 = "00wis5q2xpdfh5z42rfl95j63lbsz5l3i5hvsyvim8r2h1r2nyn0"; - url = "mirror://steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4.2+srt1_amd64.deb"; + name = "libpng12-0_1.2.46-3ubuntu4.2+srt2_amd64"; + sha256 = "0gnjsh72c9w1229fk5fx753lpmcqzizx7dizrdh3wk1qmivhddl1"; + url = "mirror://steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpng12-0.deb"; }; } rec { - name = "libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_amd64"; - sha256 = "150gpmn1gb0ykd3cgggc9zkb070figgwrcdqx89qa2kwvkxlg6vl"; - url = "mirror://steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_amd64.deb"; + name = "libpulse0_1.1-0ubuntu15.2+steamrt1+srt5_amd64"; + sha256 = "17d3f6gwbdyn058bbd8f0hj4ywp8rmhy9wsf2pnfkh219r5b98h2"; + url = "mirror://steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpulse0.deb"; }; } rec { - name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - sha256 = "07ldw9iyy9akp5zq2h7l85q3x8ggsx2hah51d0j41lfqrysyig63"; - url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; + name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; + sha256 = "16j666k8l85icbgy9ds9hdmcm60axsp8nxjc1n11jd64d9slb792"; + url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libroken18-heimdal.deb"; }; } rec { - name = "librtmp0_2.4~20110711.gitc28f1bab-1+srt4_amd64"; - sha256 = "0lzgsydisj6z7dgjgkmr42mzv11j61r9wny1m31vgm990p5zkh7n"; - url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+srt4_amd64.deb"; + name = "librtmp0_2.4~20110711.gitc28f1bab-1+srt5_amd64"; + sha256 = "0g07a8vxxglsh7sswqznsi7lmq5ibchhkhrmfywcdinxniwcr7ha"; + url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "librtmp0.deb"; }; } rec { - name = "libsamplerate0_0.1.8-4+srt4_amd64"; - sha256 = "1g6nh8p3q8bsqw9w0ifpl86gql9lqqwxk7zn9bl62pq393h107mg"; - url = "mirror://steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt4_amd64.deb"; + name = "libsamplerate0_0.1.8-4+srt5_amd64"; + sha256 = "1xr5k6zyfw8lc5s6sbg57d7v33045hg9l6a1rh5f46v99hi8k1rr"; + url = "mirror://steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsamplerate0.deb"; }; } rec { - name = "libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_amd64"; - sha256 = "0sp76gcpw1zgqpyq7bp3gmavlncflkrxiyg738nsf9mb65xy4v94"; - url = "mirror://steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_amd64.deb"; + name = "libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt5_amd64"; + sha256 = "1i7hh43fiadg1y35dmjm03s8mcbanv8jfnnjrcccabahsk8fpdj0"; + url = "mirror://steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsasl2-2.deb"; }; } rec { - name = "libsdl-image1.2_1.2.10-3+srt4_amd64"; - sha256 = "0jhlbn5jfap15d8nr2fz2hcwlv32ax29gddd5jg08vmfga767sqi"; - url = "mirror://steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt4_amd64.deb"; + name = "libsdl-image1.2_1.2.10-3+srt5_amd64"; + sha256 = "180sia6zc48y2f3l1sywp8am0gqzc9swm711fq8b2kdd4rn3wicm"; + url = "mirror://steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl-image1.2.deb"; }; } rec { - name = "libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_amd64"; - sha256 = "0cb84d0x3fjsl3w48jmxjzc7xq9c6g73p99baxdg50vhqssr7dmw"; - url = "mirror://steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_amd64.deb"; + name = "libsdl-mixer1.2_1.2.11-7+steamrt1+srt5_amd64"; + sha256 = "0z3zxvsvlnvzsvprvy5q4y99irjkzm4ilv0znaic5x967k3zpjp0"; + url = "mirror://steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl-mixer1.2.deb"; }; } rec { - name = "libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_amd64"; - sha256 = "1dqp16qi413xpv8nmyrbgx2x3dcxsyk2giifz7pa6jyvawcx7ghv"; - url = "mirror://steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_amd64.deb"; + name = "libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt5_amd64"; + sha256 = "11ks71izg46k2pjnd5jdk03xkzz7jmxm5k3mkwq8b42grdiadd6a"; + url = "mirror://steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl-ttf2.0-0.deb"; }; } rec { - name = "libsdl1.2debian_1.2.15-5+steamrt1+srt4_amd64"; - sha256 = "1zcy3njzkahd5rq4yh7i07q3x1wyfpzl6kzynbsqkx9cnf53342k"; - url = "mirror://steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1+srt4_amd64.deb"; + name = "libsdl1.2debian_1.2.15-5+steamrt1+srt5_amd64"; + sha256 = "1i2072wzjmrz97pqxm9mfdqqvx6q6x6w8xqa5f4jxmhm9sb7x7wb"; + url = "mirror://steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl1.2debian.deb"; }; } rec { - name = "libsdl2_2.0.4+steamrt2+srt1_amd64"; - sha256 = "04v4znqksg9qj4hnz20czwx4qy4i6p9csqql4yd299wvjl9k61j5"; - url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.4+steamrt2+srt1_amd64.deb"; + name = "libsdl2_2.0.8+steamrt1+srt1_amd64"; + sha256 = "1wm48pdd9sxd581jhwi2b6a4ln16wbz72p74q8l8fypq6gmvifcc"; + url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.8+steamrt1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl2.deb"; }; } rec { - name = "libsdl2-image_2.0.1+steamrt2+srt1_amd64"; - sha256 = "01kwm3yjq275j7hnd52hfjbhj5ijfz5wxmc1vpdp88q89zbkw227"; - url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.1+steamrt2+srt1_amd64.deb"; + name = "libsdl2-image_2.0.3+steamrt1+srt1_amd64"; + sha256 = "0nngj4lvk1r780wpghm9wcg9gmv0yswp56ff53h2jhn6k3gbcqsw"; + url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.3+steamrt1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-image.deb"; }; } rec { - name = "libsdl2-mixer_2.0.1+steamrt1+srt1_amd64"; - sha256 = "0bzv3spjksn504ma7haywyi3dlb5nl35wxp83if9n58i4850j6sd"; - url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.1+steamrt1+srt1_amd64.deb"; + name = "libsdl2-mixer_2.0.2+steamrt1+srt1_amd64"; + sha256 = "0l2l0krldx0yhdqnmj6zfsx13c1zfr8hky48gbs94rlgwl02ym6w"; + url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.2+steamrt1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-mixer.deb"; }; } rec { - name = "libsdl2-net_2.0.1+srt1_amd64"; - sha256 = "16zx9cj56m939x3zrvq1ypxsd26vnc81gmkpkg5j80jl2lwz6b6v"; - url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt1_amd64.deb"; + name = "libsdl2-net_2.0.1+srt2_amd64"; + sha256 = "1850n1zv9cpbnv5n3nk5knk30pm0f4g8x2cx70kyxbprfkq7894v"; + url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-net.deb"; }; } rec { - name = "libsdl2-ttf_2.0.14+srt1_amd64"; - sha256 = "14sfnmb0zz0mhvl3jl45jqc2sci59gmzdn5kif08ai8ri2bk9sza"; - url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt1_amd64.deb"; + name = "libsdl2-ttf_2.0.14+srt2_amd64"; + sha256 = "1bwhm58zqh452szjjj3m3ny2samx19qw3x6q7f18h7164d5vvm4a"; + url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-ttf.deb"; }; } rec { - name = "libselinux1_2.1.0-4.1ubuntu1+srt4_amd64"; - sha256 = "1y2a5f9qsxgdhak7vf72jsd6drjim172qp6m897yx7xbbk8ikpnr"; - url = "mirror://steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt4_amd64.deb"; + name = "libselinux1_2.1.0-4.1ubuntu1+srt5_amd64"; + sha256 = "001wfrryd549gh1qd4v8fz3m78vpjwdx1vh34cw0dgi3kxmjxp0q"; + url = "mirror://steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libselinux1.deb"; }; } rec { - name = "libsm6_1.2.0-2build1+srt4_amd64"; - sha256 = "0fjb9grh86vz58g6cb5d89hxnppqf7w5apivqb3h6sd5axkg2z1r"; - url = "mirror://steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt4_amd64.deb"; + name = "libsm6_1.2.0-2build1+srt5_amd64"; + sha256 = "0k0hyh6b36wvcn8ss24f7lqp2pb0wdvb5zh57y7zfxglgr9vj083"; + url = "mirror://steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsm6.deb"; }; } rec { - name = "libsndfile1_1.0.25-4+srt4_amd64"; - sha256 = "0fdv7ca60s23qc5azjsg7aaznqksx5xh0bngzc6sl8bqvnnc8z1g"; - url = "mirror://steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+srt4_amd64.deb"; + name = "libsndfile1_1.0.25-4+steamrt1.1ubuntu0.1+srt1_amd64"; + sha256 = "17sds50cyvpfrm6x8hddb0ir5xsch79k8gyghkzi59dav2j4j2f4"; + url = "mirror://steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+steamrt1.1ubuntu0.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsndfile1.deb"; }; } rec { - name = "libspeex1_1.2~rc1-3ubuntu2+srt4_amd64"; - sha256 = "1as44g6g5li8q6mdxwnwfbqg9f779vyjh2bqygv5xm339viaj510"; - url = "mirror://steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt4_amd64.deb"; + name = "libspeex1_1.2~rc1-3ubuntu2+srt5_amd64"; + sha256 = "0b0lrg7arrnszc1hzya04ch3j4lbcrpxqf5hxxz2wm5k5qb9f6rv"; + url = "mirror://steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libspeex1.deb"; }; } rec { - name = "libspeexdsp1_1.2~rc1-3ubuntu2+srt4_amd64"; - sha256 = "0rsrl5z379bls6bhb0nqc92ilkd7jkg7bdmxw0xg6vw9l66w78ln"; - url = "mirror://steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt4_amd64.deb"; + name = "libspeexdsp1_1.2~rc1-3ubuntu2+srt5_amd64"; + sha256 = "1vks6i3ipggcd2b4ayhkpzj70rdwvlmgh20z7ac8hcnhfnsmvmbc"; + url = "mirror://steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libspeexdsp1.deb"; }; } rec { - name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt1_amd64"; - sha256 = "1x1byhdvr0zdfl9dj07qpndifbs9x416vxl7rpmig9g0makxvsmx"; - url = "mirror://steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt1_amd64.deb"; + name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt2_amd64"; + sha256 = "0yavzpx56kf27pfjif6s86bg9wmr9078d7p34dpvbzp0aibjifs8"; + url = "mirror://steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsqlite3-0.deb"; }; } rec { - name = "libssl1.0.0_1.0.1-4ubuntu5.33+srt1_amd64"; - sha256 = "11n8iwsc562i1glpisjs9xvlmz4a4xibq6axkhi0xnvv0pbfnxiw"; - url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.33+srt1_amd64.deb"; + name = "libssl1.0.0_1.0.1-4ubuntu5.36+steamrt1+srt2_amd64"; + sha256 = "149wrr5k7hx5lbgkyi4rh2sgr15m9k8x075gilab60mj1b6cv439"; + url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.36+steamrt1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libssl1.0.0.deb"; }; } rec { - name = "libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64"; - sha256 = "0fdmjsyl8a5n14gkwhvkr3xfcfr7q9djapsk8gj56d6r0ydg9yxc"; - url = "mirror://steamrt/pool/main/g/gcc-4.8/libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64.deb"; + name = "libstdc++6_5.4.0-7.really.6+steamrt1.1+srt1_amd64"; + sha256 = "0fnqw21m8byigf4303z7qvficral6ar3lsxrsx4ai9r8d6bmmgdn"; + url = "mirror://steamrt/pool/main/g/gcc-5/libstdc++6_5.4.0-7.really.6+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libstdc++6.deb"; }; } rec { - name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_amd64"; - sha256 = "1yn54vcd5hxx7rxzvshbfidfksl1c0pvl8xv427lkf7xni3jx0xb"; - url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_amd64.deb"; + name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.1+srt1_amd64"; + sha256 = "0km4v33pzknjq0ah7w03s8xny21qggx6pc2q1ah9dlra5dwv4nsm"; + url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libstdc++6-4.6-pic.deb"; }; } rec { - name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64"; - sha256 = "0y0k0glqnmsq69sbp3s47pw37vvf969n3chniv3jmrjkjghkp44h"; - url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb"; + name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64"; + sha256 = "1shni0sdcv1jqkfsqy5j3kkr73lifb3ip9lqz8cxx23dlvbllly9"; + url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libswscale2.deb"; }; } rec { - name = "libtasn1-3_2.10-1ubuntu1.4+srt1_amd64"; - sha256 = "0kqv3ndnw1lcz5p190bxpq6rglpcxdsz44wyr6yl7w5wpfwcbs61"; - url = "mirror://steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.4+srt1_amd64.deb"; + name = "libtasn1-3_2.10-1ubuntu1.5+srt2_amd64"; + sha256 = "1sjklhs977mrvs7qci0hc3w6x3gjrq5c6lfxjma7bjg731xwdivp"; + url = "mirror://steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.5+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtasn1-3.deb"; }; } rec { - name = "libtbb2_4.0+r233-1+srt4_amd64"; - sha256 = "1ngm0nkzk8w5s7dp01983lybd256130kdc8f4jmlyikhvyx0khgh"; - url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+srt4_amd64.deb"; + name = "libtbb2_4.0+r233-1+steamrt2+srt1_amd64"; + sha256 = "18rc6jhkpqnqvrw29zffahmjihrdrwmh4ydnx3433j6wc29m8p4v"; + url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+steamrt2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtbb2.deb"; }; } rec { - name = "libtdb1_1.2.9-4+srt4_amd64"; - sha256 = "112dq62phrd3czhi27kdk4ra9is5phxpzbn26x4bis4y3ccm0cfm"; - url = "mirror://steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt4_amd64.deb"; + name = "libtdb1_1.2.9-4+srt5_amd64"; + sha256 = "1wq2956jmq9zhd7gcpgvqq7d1rdjk954hgcx540zwgxs57brzkrw"; + url = "mirror://steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtdb1.deb"; }; } rec { - name = "libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_amd64"; - sha256 = "01zvb8msi6pkjs85y4j78a110fzlmnjp69m7z7qwr2r7rr05w6r0"; - url = "mirror://steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_amd64.deb"; + name = "libtheora0_1.1.1+dfsg.1-3ubuntu2+srt5_amd64"; + sha256 = "15b6sg3dhamlgaq28w3zlwif5aps0ybi0hc29k3vv2s48f6vqfi8"; + url = "mirror://steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtheora0.deb"; }; } rec { - name = "libtiff4_3.9.5-2ubuntu1.8+srt1_amd64"; - sha256 = "13j4pqqba0bf2fq0871s8b4wkw8zyv0q80x0n07lkjiv7bvrrkcw"; - url = "mirror://steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.8+srt1_amd64.deb"; + name = "libtiff4_3.9.5-2ubuntu1.9+srt2_amd64"; + sha256 = "038wcp777pj2y3scwkqfdnb6yjsag5dnqajrdiv7pxmvkgn3bc2l"; + url = "mirror://steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.9+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtiff4.deb"; }; } rec { - name = "libtinfo5_5.9-4+srt4_amd64"; - sha256 = "07pp7dgp33yjdk0i3s7q73qq0pd0ylfbpvr5jssjap0wsp3aqq66"; - url = "mirror://steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt4_amd64.deb"; + name = "libtinfo5_5.9-4+srt5_amd64"; + sha256 = "1w22aqm9zla5cfcvkridgzwnkhj3lyjqf61dl8ppnnbk8rhj07x4"; + url = "mirror://steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtinfo5.deb"; }; } rec { - name = "libudev0_175-0ubuntu9.2+srt4_amd64"; - sha256 = "07jvb8ghflb87f4dvgii5jv5qzz31g9s7c3k8wb9w9jp574y7079"; - url = "mirror://steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.2+srt4_amd64.deb"; + name = "libudev0_175-0ubuntu9.10+srt1_amd64"; + sha256 = "146kdj719rkgj5v2g0lzs7qqb59a2xgplkqrrafpkssqangvfmq1"; + url = "mirror://steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.10+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libudev0.deb"; }; } rec { - name = "libusb-1.0-0_1.0.19-1+srt1_amd64"; - sha256 = "19f9mhbjm6r4yxdr3fvsn0ad8j7dm07y4bzwqf0n5i715jcc0qaf"; - url = "mirror://steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt1_amd64.deb"; + name = "libusb-1.0-0_1.0.19-1+srt2_amd64"; + sha256 = "0vnsr4syd7alas356hv1radm5rb8vlh69h5ljlh24sqs923vgg28"; + url = "mirror://steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libusb-1.0-0.deb"; }; } rec { - name = "libuuid1_2.20.1-1ubuntu3+srt4_amd64"; - sha256 = "060wnsbhxl0aqyh1ymbcdma59v10b1vgi3h3xvvilzl869ivwr1p"; - url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3+srt4_amd64.deb"; + name = "libuuid1_2.20.1-1ubuntu3.1+steamrt1.1+srt1_amd64"; + sha256 = "03d2jj9l3k31wb2wrvcjpa79cp7yjsqqms58vqh9pksbnmyrddr2"; + url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3.1+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libuuid1.deb"; }; } rec { - name = "libva-glx1_1.3.1-3+steamrt4+srt1_amd64"; - sha256 = "1v6n0ryr48d8f25vy06d9vh84z2zf3kmg6k8pg89j0s3spdyb44v"; - url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.3.1-3+steamrt4+srt1_amd64.deb"; + name = "libva-glx1_1.7.0-1+steamos1+srt1_amd64"; + sha256 = "15scnb989xybb4l8gspbjvs058kjfw0r7ajqak3gxrx7vgqb3i92"; + url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.7.0-1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libva-glx1.deb"; }; } rec { - name = "libva-x11-1_1.3.1-3+steamrt4+srt1_amd64"; - sha256 = "03s9kbprf6r48y4ycfixx96ga0n8vfjn7v74sv88kl0lrs8xzjy8"; - url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.3.1-3+steamrt4+srt1_amd64.deb"; + name = "libva-x11-1_1.7.0-1+steamos1+srt1_amd64"; + sha256 = "0f1hmz4218isrwx8823sm7v08dlvyjwphvbjqsgg9qgim0f13j8a"; + url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.7.0-1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libva-x11-1.deb"; }; } rec { - name = "libva1_1.3.1-3+steamrt4+srt1_amd64"; - sha256 = "0700lprd2c636dhqs000amw0nkys77h8mb7698bg30j25yd5kqr4"; - url = "mirror://steamrt/pool/main/libv/libva/libva1_1.3.1-3+steamrt4+srt1_amd64.deb"; + name = "libva1_1.7.0-1+steamos1+srt1_amd64"; + sha256 = "0p3548fnf47vj5kxzrqqpdxvip35xyydkxj7d5iiw9f26fz06drd"; + url = "mirror://steamrt/pool/main/libv/libva/libva1_1.7.0-1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libva1.deb"; }; } rec { - name = "libvdpau1_0.4.1-3ubuntu1.2+srt1_amd64"; - sha256 = "0a519njbsdwpvc49pn08sya34z2wcd8hpl0j44plr4bd2df010g2"; - url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt1_amd64.deb"; + name = "libvdpau1_0.4.1-3ubuntu1.2+srt2_amd64"; + sha256 = "1f1h77y6mf7xs8biaz77kfimp98v9cpjrbfg0qyi4wafwn7jmnsr"; + url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvdpau1.deb"; }; } rec { - name = "libvorbis0a_1.3.2-1ubuntu3+srt4_amd64"; - sha256 = "1jdvxgvlwnjcvg6009qfklr8mf3678ydrg855smgv8a0nd7v5qiv"; - url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.2-1ubuntu3+srt4_amd64.deb"; + name = "libvorbis0a_1.3.2-1ubuntu3+srt5_amd64"; + sha256 = "0sn12vpmgk6jwa97cp6m8wx4197mdgh1ggb2r09hr3p5fyk44nmc"; + url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.2-1ubuntu3+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvorbis0a.deb"; }; } rec { - name = "libvorbisenc2_1.3.2-1ubuntu3+srt4_amd64"; - sha256 = "1ysm1ika8cymh7gmd3p2hdfsnm3jrzyn4g2r12r4m9m6q3l9knz7"; - url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.2-1ubuntu3+srt4_amd64.deb"; + name = "libvorbisenc2_1.3.2-1ubuntu3+srt5_amd64"; + sha256 = "18zd7njnczr93q7x2dz7x3n9yqwp77bjsp52qcxvy4bm7b3pr0bi"; + url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.2-1ubuntu3+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvorbisenc2.deb"; }; } rec { - name = "libvorbisfile3_1.3.2-1ubuntu3+srt4_amd64"; - sha256 = "0y4r9s5cjcjxi6hy0svzfbqlkaxklb883vcsqn1j0kp9li3jpkbx"; - url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.2-1ubuntu3+srt4_amd64.deb"; + name = "libvorbisfile3_1.3.2-1ubuntu3+srt5_amd64"; + sha256 = "12ninaw71p59lazzvyd3yq3sy4g30x9ywwfm760nbiijb9yq48m4"; + url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.2-1ubuntu3+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvorbisfile3.deb"; }; } rec { - name = "libvpx1_1.0.0-1+srt4_amd64"; - sha256 = "1275437ph91i67q6naigz4nhmw2a330q72mjv282slk7y187ana5"; - url = "mirror://steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-1+srt4_amd64.deb"; + name = "libvpx1_1.0.0-2+srt1_amd64"; + sha256 = "02r8yklax0nd9z9s0c2iv1pdnwaq7h3ys46vf0wcwfc8n1p6jj9j"; + url = "mirror://steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvpx1.deb"; }; } rec { - name = "libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_amd64"; - sha256 = "18v5vbrvg6l9m768k4cb4xwbxahqrr7zspx1b5a8fv6bw8h3d9l4"; - url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_amd64.deb"; + name = "libvulkan1_1.1.73+dfsg-1+steamosc2+srt1_amd64"; + sha256 = "1f58xi83frcxpq62yfyqjhxzg2ali4hafv8zinial4ixh5nk2a07"; + url = "mirror://steamrt/pool/main/v/vulkan/libvulkan1_1.1.73+dfsg-1+steamosc2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvulkan1.deb"; }; } rec { - name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - sha256 = "02baqaxcpw306cgr5dvz5pcir7ys08r603m8ahk22bzgxpzl6xk4"; - url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; + name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; + sha256 = "0wfs33djnx2k5clhwn6rq17pmqv7d2xyr5mihhylc4fs7q179pg0"; + url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libwind0-heimdal.deb"; }; } rec { - name = "libwrap0_7.6.q-21+srt4_amd64"; - sha256 = "12wq77h9jczq974fh3c8n4fkqa876kbizvai96jizh7c90z94kvk"; - url = "mirror://steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt4_amd64.deb"; + name = "libwrap0_7.6.q-21+srt5_amd64"; + sha256 = "1rvgmwh2m633mmz78lccs97sr489bc2qv1vvwl1gf6rd01cmgd99"; + url = "mirror://steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libwrap0.deb"; }; } rec { - name = "libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64"; - sha256 = "0qp2q9q1z9sz0pyc7l1n6xa0bc22xsml3vf2yhdls71im3ks7bi9"; - url = "mirror://steamrt/pool/main/libx/libx11/libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64.deb"; + name = "libx11-6_1.6.3-1ubuntu2.1+srt1_amd64"; + sha256 = "0lf1k902i59f3v9jgjav9gzsiq7pnrfnlzmlmyxkcfwkd8pvkign"; + url = "mirror://steamrt/pool/main/libx/libx11/libx11-6_1.6.3-1ubuntu2.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libx11-6.deb"; }; } rec { - name = "libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all"; - sha256 = "17mygha6q5480ajgv1f4wmgwr3l3zxh92yagh4qfsm6r1j2a5dma"; - url = "mirror://steamrt/pool/main/libx/libx11/libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all.deb"; + name = "libx11-data_1.6.3-1ubuntu2.1+srt1_all"; + sha256 = "1imsbk4mg6n1083gjjv6kssm5g842xlbg40vsc4dw97myxycpncw"; + url = "mirror://steamrt/pool/main/libx/libx11/libx11-data_1.6.3-1ubuntu2.1+srt1_all.deb"; source = fetchurl { inherit url sha256; name = "libx11-data.deb"; }; } rec { - name = "libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64"; - sha256 = "1vsvf6ihz8jbnsarygnfrjb1y7pg44gpk89b8sk449p0c1kmv4yz"; - url = "mirror://steamrt/pool/main/libx/libx11/libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64.deb"; + name = "libx11-xcb1_1.6.3-1ubuntu2.1+srt1_amd64"; + sha256 = "0l9zprciyrgn4aq91ddmmfhffvms8p9258vv109l62bar4mmg9sz"; + url = "mirror://steamrt/pool/main/libx/libx11/libx11-xcb1_1.6.3-1ubuntu2.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libx11-xcb1.deb"; }; } rec { - name = "libxau6_1.0.6-4+srt4_amd64"; - sha256 = "1bm0jp69kfnirvlsyj7qxf7dg5b1n53875kxr9asdpw4aqmfj3a6"; - url = "mirror://steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt4_amd64.deb"; + name = "libxau6_1.0.6-4+srt5_amd64"; + sha256 = "1l4ij8c6gmv54yfv24dw9903zjczasd6z9lvzd07c5zj4rj7gx62"; + url = "mirror://steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxau6.deb"; }; } rec { - name = "libxaw7_1.0.9-3ubuntu1+srt4_amd64"; - sha256 = "15r0f6zhjr13pca7mdxfhk0v48923q0kndp23kpxw8rz75nc15s7"; - url = "mirror://steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt4_amd64.deb"; + name = "libxaw7_1.0.9-3ubuntu1+srt5_amd64"; + sha256 = "1a15brx602gg6jq708ymngyr3rcbapmk5620wdx094vdclc665g9"; + url = "mirror://steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxaw7.deb"; }; } rec { - name = "libxcb-composite0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "072z8vwk4gmbnyf5acn6y4rjiidk7rvi1k05za1j5hlqzlydb6x9"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-composite0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-composite0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "0h0yfv4ana590x038lwbz4cxfb3smcqbd394ggir0kv9m1przp78"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-composite0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-composite0.deb"; }; } rec { - name = "libxcb-damage0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "1062g911skvvlvxr6ihxkb0inyg6xg1j4m4k5rfqs333rw4npc2i"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-damage0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-damage0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1431qrr9kg3mdbag9sfdcqy0g84w074k01r2nyr3bq0w5q8px15l"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-damage0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-damage0.deb"; }; } rec { - name = "libxcb-doc_1.10-2ubuntu1+srt4_all"; - sha256 = "0zq3xcrlr2wjp3386bf5h1z63hapmkpnw45l1fz17chdngcmj358"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-doc_1.10-2ubuntu1+srt4_all.deb"; + name = "libxcb-doc_1.11.1-1ubuntu1+steamos1+srt1_all"; + sha256 = "0aly1y78gdv9vkxqgs6ir7sdifn0bvsbflp05x7jmq0zlgpcg0nz"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-doc_1.11.1-1ubuntu1+steamos1+srt1_all.deb"; source = fetchurl { inherit url sha256; name = "libxcb-doc.deb"; }; } rec { - name = "libxcb-dpms0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "1xq6zh8val8mc7wcry0jwdx11aagm4af383c6vs2z6a8vz97c6sj"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1p2hd14zb1zvqkvgs0apc6m2dwh7kwbxv12py10nr6rzmkr75z1k"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-dpms0.deb"; }; } rec { - name = "libxcb-dri2-0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "1kipdyw3wgdywznr5qxbdl85igizc40hwjd3s5f3y5pvd8kprarz"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-dri2-0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1ixndxxr7ff48p4sp6rim5bjjvncyc2qcld13az56hjybyq90ka1"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-dri2-0.deb"; }; } rec { - name = "libxcb-dri3-0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "04bqidf71j55qp2b83bfjm26sa62gslidzhzg81knynlqi8kk00q"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-dri3-0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "0l4j5ydzfnzl5wmabwh8jv2qcdgi5blks8ys06cjri8dq4fqq3gg"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-dri3-0.deb"; }; } rec { - name = "libxcb-glx0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "03wndp2gkjw016rl6k4jhkcpbs1njg74flnb0ppk30j7nxnxqcm9"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-glx0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-glx0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1shd1g43pq5hqpmxkfp8lykpqzzdn0a0w53m20bkz133jgjwqq1i"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-glx0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-glx0.deb"; }; } rec { - name = "libxcb-present0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "18f38c275h2y9221mn7x0s8ap5fhlry6rdz34lz0rr3pn83fhpvf"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-present0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-present0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1m3xf4vkbk2iwy64y8ak51b8wrd5g8hyfbankvfaf123dyyk8z7x"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-present0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-present0.deb"; }; } rec { - name = "libxcb-randr0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "08c7fx2vc35l7s72f2z02j0wh0b728ibn3zf103jc0yri9pgfinz"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-randr0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-randr0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "047j08nl310s4m8d2gk555bhf1q0s78pq882dqqla2skhfslg645"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-randr0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-randr0.deb"; }; } rec { - name = "libxcb-record0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "1ddr52m5x9ah4j313fvq2ira96l13w8dd4qi0z38llarmrhw2p2y"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-record0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-record0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "0qfh1wnd11z8r9a7zyrvsa4banisvmi3vj5zvihppz2698ln53rv"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-record0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-record0.deb"; }; } rec { - name = "libxcb-render0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "07kyplilgxk0dj9gxk9zdf5l108d8ya9j4j1ji0frn0mk06i45kl"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-render0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-render0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1yj9hxmdjqqinkx8a1gm7nwyxpj6adxphl2f3i863m0gp679bvag"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-render0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-render0.deb"; }; } rec { - name = "libxcb-res0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "0pxpgam9xjzf0m6hrqhl0679qa10qk91ami0p7k899b5b1573j6d"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-res0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-res0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1v8ipbhabg72mc3rf378l0c8x5apndkgjqbvg5qzp4s591w251np"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-res0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-res0.deb"; }; } rec { - name = "libxcb-screensaver0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "1i09z5nszbh9ikjpviwcixayicbq0v9rdg7gygxhs54zxxjccw8y"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-screensaver0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "04cm77may727miynsqw0937cvs5kjbh85csrdr86yyayvlqygs02"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-screensaver0.deb"; }; } rec { - name = "libxcb-shape0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "02c87qhymk8ncywaw7zrs73spl1x1byklnafk2drfw76gpf2pa26"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shape0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-shape0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1z0jlvv25ya5v4rn7cmpwpdbafjmhrb9b7hp6x9nlwrhbpwjh6q2"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shape0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-shape0.deb"; }; } rec { - name = "libxcb-shm0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "0yzk3yx3c20ms7np2g956m1j3y5xf241gnvpsv37z173a4j7hlhn"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shm0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-shm0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "0sdajn0sxkvqpy69ccl3l7f7ky4yhj4z304b19wplqfy0qal2gn7"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shm0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-shm0.deb"; }; } rec { - name = "libxcb-sync1_1.10-2ubuntu1+srt4_amd64"; - sha256 = "1lkch9qhzlx8hpv6msvfa2nd7qqkx6xj86akxwgj1wbl10lbqv47"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-sync1_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-sync1_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1dvq7n1jrsj07hikqvbbbc4wmmk5i9vsvgfcg39vaywmx5fdmfw8"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-sync1_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-sync1.deb"; }; } rec { - name = "libxcb-xevie0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "0f4g04lrbyfjgcphv12zcmsvxa6krjk33kjn4lfdfq3440znvkig"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-xevie0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "07qsfdyym47shm3n6m7i9flb339xannxlch2h0i5p9ca2z1a34g2"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xevie0.deb"; }; } rec { - name = "libxcb-xf86dri0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "11c6yh1kax9d5qp17znbvll41q953x4ymx5yvhkjx23z6ra8skbb"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-xf86dri0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "06ha588as5j1njqga4xamfnw79z6y13i596syl0h34pdmsqd2jll"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xf86dri0.deb"; }; } rec { - name = "libxcb-xfixes0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "0fhprxkv94sgyghcif81dzng5jwyrb6g1y8z78g0wrppjf0k2ixc"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-xfixes0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1npk19k2qhqm89hk2jhf49acig330myvksamd3xw2gjxa99xz7lz"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xfixes0.deb"; }; } rec { - name = "libxcb-xinerama0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "0wbs15dy8zr45d1jqnky6kki6slv150hqlylglva5n0cs2ami0si"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-xinerama0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "0s117w3a3ql7d6k2bp88hzni3k9cg24qcmbqz50z8b1gqhpw9y6b"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xinerama0.deb"; }; } rec { - name = "libxcb-xkb1_1.10-2ubuntu1+srt4_amd64"; - sha256 = "1y6h2awv9h5h09xzhbfr9cd500928knx38ixc28q9v3r0xbw8i8k"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-xkb1_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "0kximpl89ks2simxnz10z836rnvaysys7c2jddhsy1z7z30gpb9h"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xkb1.deb"; }; } rec { - name = "libxcb-xprint0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "0ifmby85fzcazzlw36mliz8ylmbxdxxqbpibzlzn65dj3fmmkmhl"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-xprint0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1l2lxnwp129sa268n3xbrifq8yyfn292nz9arqp95za091zj2rri"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xprint0.deb"; }; } rec { - name = "libxcb-xtest0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "09ia0zfb63wmr7a7hlgyn5dnq2dv78apkd834150pzbz83yr00vz"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-xtest0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1pybcn6rwwg6b4l7a1sn0nxkp2lb5ar9vzwn6ggd8vwrwnppjvq4"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xtest0.deb"; }; } rec { - name = "libxcb-xv0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "0r4yhw2h3clkscpxfg9vpl3x7sh89lxrqmddfvz2mwbqxs64i44q"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xv0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-xv0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "13jyd5jkz8wmbz6n7azxdnbw48c9i5zkwysza50d1c3rlxalpq82"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xv0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xv0.deb"; }; } rec { - name = "libxcb-xvmc0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "0fjms3ram2zjg4b6njwqj37dyfw9m39syhw78w0p5q97my4vcrs2"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-xvmc0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "0l4wagp619qar8g9yji1sf4schlclyl1zvdmp3w2cp9lnnwx1p1w"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xvmc0.deb"; }; } rec { - name = "libxcb1_1.10-2ubuntu1+srt4_amd64"; - sha256 = "18d9armijpdncqv8crz969dgrana0cw6f81di0clqwhx3sgmm29v"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb1_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb1_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1a8x128bgbz9gy2wsmhijg4di99k18ybs9mwvv37hkpw6mlfaxdx"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb1_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb1.deb"; }; } rec { - name = "libxcomposite1_0.4.3-2build1+srt4_amd64"; - sha256 = "0xiqwrgsz6dfa0pd9and19gyvmpha8x2sgh5hg3j6kn04cza8523"; - url = "mirror://steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt4_amd64.deb"; + name = "libxcomposite1_0.4.3-2build1+srt5_amd64"; + sha256 = "01kkvnndzkzqx9pacrlirn435z7dky7lkm0clv7yya3xaw5fslv4"; + url = "mirror://steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcomposite1.deb"; }; } rec { - name = "libxcursor1_1.1.12-1ubuntu0.1+srt4_amd64"; - sha256 = "0zzj3j8k1ci94y3kydyia61crfw31qg4gqj10lih0m86ci5asyyw"; - url = "mirror://steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt4_amd64.deb"; + name = "libxcursor1_1.1.12-1ubuntu0.1+srt5_amd64"; + sha256 = "0n9dgdi8hb1w5dpasi2pmm5ysrckfch930yvx9grs026dgz3s2g7"; + url = "mirror://steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcursor1.deb"; }; } rec { - name = "libxdamage1_1.1.3-2build1+srt4_amd64"; - sha256 = "12bb67z98j857wixl51bjg0mgq59zid69ng5lkdjwl5a7cqjgl0f"; - url = "mirror://steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt4_amd64.deb"; + name = "libxdamage1_1.1.3-2build1+srt5_amd64"; + sha256 = "0l088wzpyn15nmy8c6nx3p97qhklxhyaxm8bhafv9sddpr407p4k"; + url = "mirror://steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxdamage1.deb"; }; } rec { - name = "libxdmcp6_1.1.0-4+srt4_amd64"; - sha256 = "1sw99jdxdafl57y67nssd0ninmiycfgmd8vbi7q3rpp545vc878p"; - url = "mirror://steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt4_amd64.deb"; + name = "libxdmcp6_1.1.0-4+srt5_amd64"; + sha256 = "1jx1i0i6vrm6h2sq99f61dix0v8j1f6nq4d2a1hqaw5f1bsra4q7"; + url = "mirror://steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxdmcp6.deb"; }; } rec { - name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_amd64"; - sha256 = "0z9jhx6jplin6fzbj4v11aq3d1wqvy2rb2p3g952kymi9372mnr3"; - url = "mirror://steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_amd64.deb"; + name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt2_amd64"; + sha256 = "0ip72ys964g5569rbgsrcv8b1afmwm1mrskgrgiqjs93bhr5i4c4"; + url = "mirror://steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxext6.deb"; }; } rec { - name = "libxfixes3_5.0-4ubuntu4.4+srt1_amd64"; - sha256 = "0531x9n6p5b9n8isjwmfnr8kmwxyjp81mxrdkmxf6v0k4j0y9sgg"; - url = "mirror://steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt1_amd64.deb"; + name = "libxfixes3_5.0-4ubuntu4.4+srt2_amd64"; + sha256 = "1x2255fch7g2skiz1x94vrm63ahcwf258w2qjkadnbqwivyf8crz"; + url = "mirror://steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxfixes3.deb"; }; } rec { - name = "libxft2_2.2.0-3ubuntu2+srt4_amd64"; - sha256 = "1bipk6d6dw57pdcybbyhvszjad68qckg4i8s9hkn3kn89d2s46bc"; - url = "mirror://steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt4_amd64.deb"; + name = "libxft2_2.2.0-3ubuntu2+srt5_amd64"; + sha256 = "0ylsvvd28qwz442scylrp9gmmp1y6lvyj1bcjd5d4g0fc9iwm37d"; + url = "mirror://steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxft2.deb"; }; } rec { - name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt1_amd64"; - sha256 = "0m9h9k5qbqjiay4003v51vbbm9i24j7g3nx6q901csndjk5aq6ss"; - url = "mirror://steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt1_amd64.deb"; + name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt2_amd64"; + sha256 = "0g3nazw6w77q91c0dsn040y79d1rmg4njg2n3cv871630zghz6rs"; + url = "mirror://steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxi6.deb"; }; } rec { - name = "libxinerama1_1.1.1-3ubuntu0.1+srt4_amd64"; - sha256 = "03dqvmdvcdraw0p483qrqv6xchr6a96vpmbbni6qcdak1gic2xkb"; - url = "mirror://steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt4_amd64.deb"; + name = "libxinerama1_1.1.1-3ubuntu0.1+srt5_amd64"; + sha256 = "1icp7syxhfgwpiabl7503ylw66m7z3sq5pn7wkxb2yriqxfj3nmp"; + url = "mirror://steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxinerama1.deb"; }; } rec { - name = "libxml2_2.7.8.dfsg-5.1ubuntu4.14+srt1_amd64"; - sha256 = "0c5acgsr7as7afjwvl6qbqbgn3wpima2k55awgga6prvhzkas60p"; - url = "mirror://steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.14+srt1_amd64.deb"; + name = "libxml2_2.7.8.dfsg-5.1ubuntu4.17+srt1_amd64"; + sha256 = "0k5wagjkf60ys0cg639758c1h0cjmziyxvp5597vavbds32sl2hm"; + url = "mirror://steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.17+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxml2.deb"; }; } rec { - name = "libxmu6_1.1.0-3+srt4_amd64"; - sha256 = "1l08mkf2kwgskhzh9s43g5vcl4v1qphn68ila8g9gfw05gq7r0j1"; - url = "mirror://steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt4_amd64.deb"; + name = "libxmu6_1.1.0-3+srt5_amd64"; + sha256 = "0pabx6pyazssqfs775k4l19frqv20225n7jmr1ncvwfikiw48gsl"; + url = "mirror://steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxmu6.deb"; }; } rec { - name = "libxpm4_3.5.9-4+srt4_amd64"; - sha256 = "1z72sbc802sanhagf0w26hkk3yw0zdahw7dk89hjcgp57qmyyb08"; - url = "mirror://steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+srt4_amd64.deb"; + name = "libxpm4_3.5.9-4+steamrt1.1ubuntu0.1+srt1_amd64"; + sha256 = "0nv7v30mh3j53h7lcvqm2ixnsbn8328vcfbd2ysx2r2fac9waw7j"; + url = "mirror://steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+steamrt1.1ubuntu0.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxpm4.deb"; }; } rec { - name = "libxrandr2_1.3.2-2ubuntu0.3+srt1_amd64"; - sha256 = "1yqfa0nllfqk9rnwj65nx8ni5xy4pn2nfasbkhzs8cfcyfd96y4x"; - url = "mirror://steamrt/pool/main/libx/libxrandr/libxrandr2_1.3.2-2ubuntu0.3+srt1_amd64.deb"; + name = "libxrandr2_1.5.0-1+srt1_amd64"; + sha256 = "1i55vzgaalxlm0mgi7c52nmpmksyffbf93isg3i2syg5nzain8v2"; + url = "mirror://steamrt/pool/main/libx/libxrandr/libxrandr2_1.5.0-1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxrandr2.deb"; }; } rec { - name = "libxrender1_0.9.6-2ubuntu0.2+srt1_amd64"; - sha256 = "06v7qfp10gfzx04znksc1mhx5a90za29hi90vinjrzccv096ak99"; - url = "mirror://steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt1_amd64.deb"; + name = "libxrender1_0.9.6-2ubuntu0.2+srt2_amd64"; + sha256 = "0zd4kd5235vn575msfgl48j4czfp4fc44y439gcclpadkhvciviz"; + url = "mirror://steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxrender1.deb"; }; } rec { - name = "libxss1_1.2.1-2+srt4_amd64"; - sha256 = "0w0idnk6i94klavy80bv83pvkg2m8qvjaa9w641995r6drm9nag7"; - url = "mirror://steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt4_amd64.deb"; + name = "libxss1_1.2.1-2+srt5_amd64"; + sha256 = "1k7248hb63ml79nqzij65rmg8x0ayi41zpl9ls6my87a6gzswyhr"; + url = "mirror://steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxss1.deb"; }; } rec { - name = "libxt6_1.1.1-2ubuntu0.1+srt4_amd64"; - sha256 = "1blcs2ngp6k5g87y10f2wgshr7m44943ks1ykpb59ss1w5j6cmx6"; - url = "mirror://steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt4_amd64.deb"; + name = "libxt6_1.1.1-2ubuntu0.1+srt5_amd64"; + sha256 = "0gd81vk2bzjc9zcdbgj57hwhs6v9dmzajrmngmaxavyzv2fgamka"; + url = "mirror://steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxt6.deb"; }; } rec { - name = "libxtst6_1.2.0-4ubuntu0.1+srt4_amd64"; - sha256 = "0mff4swa68mldsv915hirllccybbgjn3i4j23bj4bf26hasr0m6x"; - url = "mirror://steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt4_amd64.deb"; + name = "libxtst6_1.2.0-4ubuntu0.1+srt5_amd64"; + sha256 = "1l1l2073b9cd76ckn5f2d4qb4w1k48s0dlki93bfikph8ms6px8d"; + url = "mirror://steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxtst6.deb"; }; } rec { - name = "libxxf86vm1_1.1.1-2ubuntu0.1+srt4_amd64"; - sha256 = "0ahk7z05sshj649vanr2hvarwqp3aphqwbdzf3hjd5rb9cg061fm"; - url = "mirror://steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt4_amd64.deb"; + name = "libxxf86vm1_1.1.1-2ubuntu0.1+srt5_amd64"; + sha256 = "1diqhhj91knlz02b6ha940091yjris46d5swy3zi3r389w2b2crm"; + url = "mirror://steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxxf86vm1.deb"; }; } rec { - name = "nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_amd64"; - sha256 = "1sgjxdgx8fd780imrqwiwqlhwlmgrndam8km9visymcr431yjbnb"; - url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_amd64.deb"; + name = "nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt5_amd64"; + sha256 = "0cr24gybxz7h8s9rijr75dayahy1kx4i6gn5q2q6h4z29v046nc4"; + url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "nvidia-cg-toolkit.deb"; }; } rec { - name = "zenity_3.4.0-0ubuntu4+steamrt2+srt4_amd64"; - sha256 = "12csbx3bzziygw2xa0w4d0i3gh7l2h1sc93npvsmqnjxs6qmwnnz"; - url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt4_amd64.deb"; + name = "zenity_3.4.0-0ubuntu4+steamrt2+srt5_amd64"; + sha256 = "0ajisfqvlajw0m6kq3yv8j6f38dfhlavrmmfdq5yqmb70wmmkk71"; + url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "zenity.deb"; }; } rec { - name = "zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_amd64"; - sha256 = "06l2s654sg4z16g2b1whrjkz2gwqd0mjgf9w3jzvwwdbprc71gmg"; - url = "mirror://steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_amd64.deb"; + name = "zlib1g_1.2.3.4.dfsg-3ubuntu4+srt6_amd64"; + sha256 = "0962hhdg3knxnjinkv7m3h510fq8vghjyaxnsnsyijqzfawi4rfj"; + url = "mirror://steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "zlib1g.deb"; @@ -1752,1746 +1743,1737 @@ ]; i386 = [ rec { - name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_i386"; - sha256 = "0i6phg3gmiqx4in4ym5iv3l15x396d0gkrs57x5p7mw8ahb5fq7q"; - url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_i386.deb"; + name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt5_i386"; + sha256 = "1899b2x8kfallda1i0m1hph7v088q7px0rpxm8w6qwp5mwqy4rip"; + url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "dconf-gsettings-backend.deb"; }; } rec { - name = "freeglut3_2.6.0-1ubuntu3+srt4_i386"; - sha256 = "1vsm25lzylxf4mvqs5p171qrl8aspdi5rvlnpfhc35cx3vhkxg79"; - url = "mirror://steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt4_i386.deb"; + name = "freeglut3_2.6.0-1ubuntu3+srt5_i386"; + sha256 = "0jdn9nvjmhphv9iw1h589cy5q1iq0gp9q4ibm0m69lkazi2v1blb"; + url = "mirror://steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "freeglut3.deb"; }; } rec { - name = "gcc-4.6-base_4.6.3-1ubuntu5+srt4_i386"; - sha256 = "1s7wvx23xnv3i3mw6a2pk9nr9s9wzpc99cr6rzgq3jxfmph78c4r"; - url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+srt4_i386.deb"; + name = "gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.1+srt1_i386"; + sha256 = "0zsb0kn2kn64hvf33xnp94k5i9c1269qyla8p5q8vzwplcl0qrx9"; + url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "gcc-4.6-base.deb"; }; } rec { - name = "gtk2-engines_2.20.2-1ubuntu1+srt4_i386"; - sha256 = "0rlhcsx8lvnmd6hx4iqh6z49jqxb2wlzl8n74qcbkx8vzg3jyffn"; - url = "mirror://steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt4_i386.deb"; + name = "gtk2-engines_2.20.2-1ubuntu1+srt5_i386"; + sha256 = "06h5229y2md6d73imgy5wg4msv6s9vl056p97jq2hrf4di0q6a76"; + url = "mirror://steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "gtk2-engines.deb"; }; } rec { - name = "gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_i386"; - sha256 = "1jkma0v5z7i7plamg49ljk0mhg3qf92k1disdj8yjjlgjf3d0isl"; - url = "mirror://steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_i386.deb"; + name = "gtk2-engines-murrine_0.98.2-0ubuntu1+srt5_i386"; + sha256 = "1fyha082h0jr26gjnsxzj1c6rl63c9xc2kgf6cfb86dmsmbvpqqg"; + url = "mirror://steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "gtk2-engines-murrine.deb"; }; } rec { - name = "gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_i386"; - sha256 = "00p0qi47nnzlh31ajwalfh5kimsmdzjicgl5lnfg4viwb0r07vmd"; - url = "mirror://steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_i386.deb"; + name = "gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt5_i386"; + sha256 = "0ix60pix5cnzd807v8q9mqhyhhksqndd7vc6brs1daknhxn5dsi4"; + url = "mirror://steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "gtk2-engines-pixbuf.deb"; }; } rec { - name = "libacl1_2.2.51-5ubuntu1+srt6_i386"; - sha256 = "188r323k4y6jvq64qywhglllxfbcpji15zvws1qlicv4nrjh2yk2"; - url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+srt6_i386.deb"; + name = "libacl1_2.2.51-5ubuntu1+srt7_i386"; + sha256 = "0x6959ivq4v8x9yd38c7kfvds9g3h00znim03dm5rvl7xl2k0cxn"; + url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+srt7_i386.deb"; source = fetchurl { inherit url sha256; name = "libacl1.deb"; }; } rec { - name = "libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_i386"; - sha256 = "049qhih0dl0z13ag1kradvwydwz90pllwriwnyjx78726fvcsa56"; - url = "mirror://steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_i386.deb"; + name = "libappindicator1_0.4.92-0ubuntu1.1+steamrt1+srt1_i386"; + sha256 = "1bbf9k50d3df4sjn2idizk2bcpkcxkg0wz8mczgzkh634753pkld"; + url = "mirror://steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1.1+steamrt1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libappindicator1.deb"; }; } rec { - name = "libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - sha256 = "0gp2falswr4hfcrfj7avp1g216mf5sargqflwyxl6ixxy1yxp22w"; - url = "mirror://steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; + name = "libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; + sha256 = "1qgap0ha5vlpz1fnf2fppprzh4lyrvy7k9sj0whhb3f48ass8mh5"; + url = "mirror://steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libasn1-8-heimdal.deb"; }; } rec { - name = "libasound2_1.1.0-0ubuntu1+steamos1+srt1_i386"; - sha256 = "0cy9s4wpnq2yd08shvip5mzg5a5mk76zmwyq68brqblaf1yqw907"; - url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt1_i386.deb"; + name = "libasound2_1.1.0-0ubuntu1+steamos1+srt2_i386"; + sha256 = "0wa019012di6slf29ambq249fn6w9ldmyxx80k564j9s1k510ivc"; + url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libasound2.deb"; }; } rec { - name = "libasound2-plugins_1.1.0-0ubuntu1+srt1_i386"; - sha256 = "10qhsgcsabp0mrihssj7znw67kjfmw9kv2sbplpwl8bc52pxdz6z"; - url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt1_i386.deb"; + name = "libasound2-plugins_1.1.0-0ubuntu1+srt2_i386"; + sha256 = "0hrrpjp4wg13vfam863hwkhzv7ngcydx0iysmfkxjzhmpf3j4ghd"; + url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libasound2-plugins.deb"; }; } rec { - name = "libasyncns0_0.8-4+srt4_i386"; - sha256 = "1h2fs8azxz9z2wa45igxwvfaarp50pqx26jznyrv35ayxhnzsg8w"; - url = "mirror://steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt4_i386.deb"; + name = "libasyncns0_0.8-4+srt5_i386"; + sha256 = "0k8rngiq74b574fc1jqfwf77f57qcflimbs63pa2jx1jqg7gxjx2"; + url = "mirror://steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libasyncns0.deb"; }; } rec { - name = "libatk1.0-0_2.4.0-0ubuntu1+srt4_i386"; - sha256 = "08sbk32cv4r0nmhp8ydbmjy8mcnsi4y2wjm606d1hrqqnvhlk1yi"; - url = "mirror://steamrt/pool/main/a/atk1.0/libatk1.0-0_2.4.0-0ubuntu1+srt4_i386.deb"; + name = "libatk1.0-0_2.18.0-1+steamrt1+srt1_i386"; + sha256 = "0ldl3jsmf16mbf1bs94zkmaa1b1p9d9rvajlyp7iqkbqw6qkszlz"; + url = "mirror://steamrt/pool/main/a/atk1.0/libatk1.0-0_2.18.0-1+steamrt1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libatk1.0-0.deb"; }; } rec { - name = "libattr1_2.4.46-5ubuntu1+srt4_i386"; - sha256 = "06ms0pfsb85y53l83fvs2zh39dqzh7bw0jh6zsf5wi9g47y2kzhd"; - url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+srt4_i386.deb"; + name = "libattr1_2.4.46-5ubuntu1+steamrt1+srt1_i386"; + sha256 = "1iyy60mpc6radds5rh9i6m8bmfa168y7dqbnz3jvgps5zndri363"; + url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+steamrt1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libattr1.deb"; }; } rec { - name = "libavahi-client3_0.6.30-5ubuntu2+srt4_i386"; - sha256 = "0gsbwnc5s6hd412djs257fgy50ayjph5gg1jhmvgz0nf0wqqy60g"; - url = "mirror://steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2+srt4_i386.deb"; + name = "libavahi-client3_0.6.30-5ubuntu2.2+srt1_i386"; + sha256 = "1yyq436zsx8hbfhhv4l8ji85narl6ws8flhfcbqvxldaxlzv4ls7"; + url = "mirror://steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2.2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libavahi-client3.deb"; }; } rec { - name = "libavahi-common3_0.6.30-5ubuntu2+srt4_i386"; - sha256 = "0cfn660pngq7ackkcid410g8245grcs0izawwlmkhr6y19nma0jg"; - url = "mirror://steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2+srt4_i386.deb"; + name = "libavahi-common3_0.6.30-5ubuntu2.2+srt1_i386"; + sha256 = "0lhvj64i4dqy0lh73kyk32992fqkhxxr7k1cr97a03hdpaa06ycq"; + url = "mirror://steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2.2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libavahi-common3.deb"; }; } rec { - name = "libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386"; - sha256 = "0dz4d63whrhlsylvd1mqzz5v3xpwf88cgga8qr8vgf2vaz7ns0k1"; - url = "mirror://steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb"; + name = "libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386"; + sha256 = "129g8jgy4va5gszrq9pxd4p51zja9svcm0hqx8g12ryx5lfkjjc5"; + url = "mirror://steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libavcodec53.deb"; }; } rec { - name = "libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386"; - sha256 = "1rxbm4n09q4brhklaa5hwzaipv3y34a3jphrc724s29dg178bb6y"; - url = "mirror://steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb"; + name = "libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386"; + sha256 = "1vnj97sl686wlkkxbhvn5s3ck60nzrqr60y4wxg9a2hxxf7ba1gf"; + url = "mirror://steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libavfilter2.deb"; }; } rec { - name = "libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386"; - sha256 = "0f38h7h4m1g63jh9lsnq9win2k5zvg8i5khsadwb154y4iragm2f"; - url = "mirror://steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb"; + name = "libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386"; + sha256 = "12zikl29fcq5vc0k5n4l8db8q0f95h13hlqgka3cy13nf31kbk06"; + url = "mirror://steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libavformat53.deb"; }; } rec { - name = "libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386"; - sha256 = "05lh422gvhl990yvlp4a0l3mfqn4n0l41fdaq4m4r5i23izcl3s0"; - url = "mirror://steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb"; + name = "libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386"; + sha256 = "1brfvbqwga1hmmyarbwksbrj6kabnfnrk8hv9xrvd99jak3wsipl"; + url = "mirror://steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libavutil51.deb"; }; } rec { - name = "libbz2-1.0_1.0.6-1+srt4_i386"; - sha256 = "1hh77sg2pan5qlvxg82my0h1dy53rxrgnl84bggn2kiz9i61ls2m"; - url = "mirror://steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt4_i386.deb"; + name = "libbz2-1.0_1.0.6-1+srt5_i386"; + sha256 = "1nngc07hwr96n1k56bi3i2yffad8dhf1zfblqlz8pffi1yl92vjz"; + url = "mirror://steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libbz2-1.0.deb"; }; } rec { - name = "libcairo2_1.10.2-6.1ubuntu3+srt4_i386"; - sha256 = "141rbp47gkvzfqzrwg4j80m1ay2l573p4q3x2ym5nxzw3f9jb00a"; - url = "mirror://steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt4_i386.deb"; + name = "libcairo2_1.10.2-6.1ubuntu3+srt5_i386"; + sha256 = "0vnz2d66q9pkn8ry2ixbmqcyz0kpqqmimaxnrfq42g1lz8k44cs6"; + url = "mirror://steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libcairo2.deb"; }; } rec { - name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_i386"; - sha256 = "1mfv3q731b0sjl2axc5qf1drp4dfwsmg2i0c222bs3ccvk9m7bcr"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_i386.deb"; + name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt5_i386"; + sha256 = "10bw3fha2nc8lb3md5l8yj8c40rx7gm7vg9lk76359p06z3ypvvf"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libcanberra-gtk-module.deb"; }; } rec { - name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_i386"; - sha256 = "0iddn7f56g1lajd1f0s77s06qwh5nk0iv2ai2r5rcanhq693k3jp"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_i386.deb"; + name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt5_i386"; + sha256 = "1yg1hllxp2m5rv6hlgh714yhcb9l5ggg4lfwv33yaw4fnzz387km"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libcanberra-gtk0.deb"; }; } rec { - name = "libcanberra0_0.28-3ubuntu3+steamrt1+srt4_i386"; - sha256 = "0qpil9xifaq1kkmrga6v9sz4sl9dh78rp9kzm8p6c9hq2f4w5j4i"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1+srt4_i386.deb"; + name = "libcanberra0_0.28-3ubuntu3+steamrt1+srt5_i386"; + sha256 = "03b6rk9gkxx4d75cjr27w229nsc1jjp2fy8ln5gxp2bbhywgxl4a"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libcanberra0.deb"; }; } rec { - name = "libcap2_2.22-1ubuntu3+srt4_i386"; - sha256 = "0llaf4hgb4v66hwkc6ibrhpadhjxkiz3frl00f6yagm9g6z2yxvy"; - url = "mirror://steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt4_i386.deb"; + name = "libcap2_2.22-1ubuntu3+srt5_i386"; + sha256 = "1qy9ggswl8cbp0zbaryc7cd4bcq17qb4llv8v3zcj08wxr6v2ram"; + url = "mirror://steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libcap2.deb"; }; } rec { - name = "libcg_3.0.0016-0ubuntu1+srt4_i386"; - sha256 = "0ka9z2sq315xvdbqmbqg76j3wknfa88hk41jg94svnqf4fbawbrz"; - url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt4_i386.deb"; + name = "libcg_3.0.0016-0ubuntu1+srt5_i386"; + sha256 = "0gs2q5ql7wq28y2qrs9v9gs75r6ycq7c6xghf4s6g5s8q4cq205k"; + url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libcg.deb"; }; } rec { - name = "libcomerr2_1.42-1ubuntu2.2+srt1_i386"; - sha256 = "0d0zpm7qx1p4zpi5xk585hxfirn6i3v53r0br7dlaiqfy0divv5z"; - url = "mirror://steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.2+srt1_i386.deb"; + name = "libcomerr2_1.42-1ubuntu2.3+srt1_i386"; + sha256 = "12c8gxi0l0qysbiw81hbysf5hn1kgv956csvrn71yf52zwqwr388"; + url = "mirror://steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.3+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libcomerr2.deb"; }; } rec { - name = "libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_i386"; - sha256 = "1l49h8v8dgi4n2j32012zzxkyqgg7b9z7d9lxijj0cqwwjq6fzpx"; - url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_i386.deb"; + name = "libcups2_1.5.3-0ubuntu8.2+steamrt1+srt4_i386"; + sha256 = "03x40p961apv96y59dabvp50s3jryccx2yqrw9i3dbflxvja5rbz"; + url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.2+steamrt1+srt4_i386.deb"; source = fetchurl { inherit url sha256; name = "libcups2.deb"; }; } rec { - name = "libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_i386"; - sha256 = "0z5qnjgmz9c917vm6r1m3856a10brdwx3d0k4qcv9vlv1gj1ln0j"; - url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_i386.deb"; + name = "libcurl3_7.22.0-3ubuntu4.17+srt1_i386"; + sha256 = "14yb0a5cglgqvwa75kb6lbhfpmpj4xjgxz6dm27q27pcxv9xx5km"; + url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.17+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libcurl3.deb"; }; } rec { - name = "libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_i386"; - sha256 = "09bx2gxldswb63nql2b7x5mq55miaz7x5gbzscrc1kybnm0vvv75"; - url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_i386.deb"; + name = "libcurl3-gnutls_7.22.0-3ubuntu4.17+srt1_i386"; + sha256 = "027dgd9ik9zxy2ixi1272mskbax10cg0k7flljhcx5zmnwvrhxhx"; + url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.17+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libcurl3-gnutls.deb"; }; } rec { - name = "libdbus-1-3_1.4.18-1ubuntu1.7+srt1_i386"; - sha256 = "1lp548l33i3c7wavq9q0n9jhxm44mg0jlrgi89ngfm705141zw4f"; - url = "mirror://steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.7+srt1_i386.deb"; + name = "libdbus-1-3_1.4.18-1ubuntu1.8+srt1_i386"; + sha256 = "1m8aqb9hvprl0hbswha0raz6pp3gs84cmqg40fblbfqya8nibdlk"; + url = "mirror://steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.8+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libdbus-1-3.deb"; }; } rec { - name = "libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_i386"; - sha256 = "13dcsf3ipayvrzj1ksmxph31gk2zs3m0ghy5jh3aq648s5ql2jj9"; - url = "mirror://steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_i386.deb"; + name = "libdbus-glib-1-2_0.98-1ubuntu1.1+srt5_i386"; + sha256 = "0slsk7cqdrbnm35zqir21ms0vv1hv44i184x8ip1lg936vrvbxka"; + url = "mirror://steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libdbus-glib-1-2.deb"; }; } rec { - name = "libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_i386"; - sha256 = "14glmvc6923djpcn2a9kwhqm4myg1y9mp38n7gkby1wz6y63zvp5"; - url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_i386.deb"; + name = "libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt5_i386"; + sha256 = "0g4zmrwpifl4kxv311spwyia1xrd76m0aizb3jzv6q8cc4hla3ii"; + url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libdbusmenu-glib4.deb"; }; } rec { - name = "libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_i386"; - sha256 = "19ijz82wkk9z8w4yjp628hga6dsv7qr7x37kr8j8fq430gbl5y8s"; - url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_i386.deb"; + name = "libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt5_i386"; + sha256 = "0kj6pfpgybkkb5bjfr9qgczwddx5lkbwhknlcymhhi94jcfbcnbc"; + url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libdbusmenu-gtk4.deb"; }; } rec { - name = "libexif12_0.6.20-2ubuntu0.1+srt4_i386"; - sha256 = "1dh1idpqqh66l2awfim17vk94238wb073d3xj74ci8gxfp0rxkvr"; - url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt4_i386.deb"; + name = "libexif12_0.6.20-2ubuntu0.1+srt5_i386"; + sha256 = "06br49sn30hrxlq479xi3vxw3blkr558kz4d7gym3fxnwfa6im9w"; + url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libexif12.deb"; }; } rec { - name = "libexpat1_2.0.1-7.2ubuntu1.2+srt1_i386"; - sha256 = "0wv8iym5bhwlvnsljxfjwhl8z39wh5nba6li1i7nnzqj365hmdc4"; - url = "mirror://steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.2+srt1_i386.deb"; + name = "libexpat1_2.0.1-7.2ubuntu1.4+srt2_i386"; + sha256 = "0av7wcy104jz6pci7lgwpmvb528v9idx660qrrabdqhpd1m4hv8s"; + url = "mirror://steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.4+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libexpat1.deb"; }; } rec { - name = "libffi6_3.0.11~rc1-5+srt4_i386"; - sha256 = "1064kf252d1v8asi59m67bz7zg2k7fmgkqzbib872yb6qyrgj7p2"; - url = "mirror://steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt4_i386.deb"; + name = "libffi6_3.0.11~rc1-5+srt5_i386"; + sha256 = "0gvhndr5y4zl097h105fr4q60sg38mhkhlw8ha51ypzcm9f8na6d"; + url = "mirror://steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libffi6.deb"; }; } rec { - name = "libflac8_1.2.1-6+srt4_i386"; - sha256 = "17hb02f5yapkfkasamx6whxm76p1gpjrz7nq7i59zv0lfxwgjry7"; - url = "mirror://steamrt/pool/main/f/flac/libflac8_1.2.1-6+srt4_i386.deb"; + name = "libflac8_1.2.1-6+steamrt1.1ubuntu0.1+srt1_i386"; + sha256 = "1rdfykm113vps893xdkcrpphb06winv2566yb9myg9m3aybcldrx"; + url = "mirror://steamrt/pool/main/f/flac/libflac8_1.2.1-6+steamrt1.1ubuntu0.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libflac8.deb"; }; } rec { - name = "libfltk1.1_1.1.10-10+srt4_i386"; - sha256 = "1vz2b02asscpr155v516zclawfi28m4yxf1ya33848ydg067iz35"; - url = "mirror://steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt4_i386.deb"; + name = "libfltk1.1_1.1.10-10+srt5_i386"; + sha256 = "1j0bhpgsaw6rphy1wqp40wn8yr6qzrxdmwarc2amryqw7bqslmy5"; + url = "mirror://steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libfltk1.1.deb"; }; } rec { - name = "libfontconfig1_2.8.0-3ubuntu9.1+srt4_i386"; - sha256 = "1dm12wk4pj2h4y0ykyvv9fs6s0vix1iy3hkvz2fvqx8wdb8710n6"; - url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.1+srt4_i386.deb"; + name = "libfontconfig1_2.8.0-3ubuntu9.2+srt2_i386"; + sha256 = "1ls25q28jk9znmi0fhm30cqilx9bmm463zfq1jmj5apw96wk64n4"; + url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libfontconfig1.deb"; }; } rec { - name = "libfreetype6_2.4.8-1ubuntu2.3+srt1_i386"; - sha256 = "0661g4ghhynz49kkbr5kds1ms8prqmpm5rz0qv3c7cf62a2lb3x1"; - url = "mirror://steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.3+srt1_i386.deb"; + name = "libfreetype6_2.4.8-1ubuntu2.6+srt1_i386"; + sha256 = "1zahvr5h833mppcpg648jv28dywx9jiqdv58wlv1vpsk6d9599bh"; + url = "mirror://steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.6+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libfreetype6.deb"; }; } rec { - name = "libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386"; - sha256 = "19qracxc45irfmsbcn668zwdxx37avp1igj1z4c6xq8bmp6w685d"; - url = "mirror://steamrt/pool/main/g/gcc-4.8/libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386.deb"; + name = "libgcc1_5.4.0-7.really.6+steamrt1.1+srt1_i386"; + sha256 = "0bsm95m17f9lxrknl11jmaz9mqrbkd40p29z44497fw8miw736r2"; + url = "mirror://steamrt/pool/main/g/gcc-5/libgcc1_5.4.0-7.really.6+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libgcc1.deb"; }; } rec { - name = "libgconf-2-4_3.2.5-0ubuntu2+srt4_i386"; - sha256 = "1srwysvh165hwiqxyl0aac3j39zzg2v4g3alix51cbvc4s6yzhy3"; - url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+srt4_i386.deb"; + name = "libgconf-2-4_3.2.5-0ubuntu2+srt5_i386"; + sha256 = "07b1w4ww3xb5r13px85f8rv4nsc08rz8w3741zdk0vacq8scw4pb"; + url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libgconf-2-4.deb"; }; } rec { - name = "libgcrypt11_1.5.0-3ubuntu0.5+srt1_i386"; - sha256 = "1cg2kps7cfmildp9hlijxsj7bc2j71xal6bm57ldz2vjcv6k06hl"; - url = "mirror://steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.5+srt1_i386.deb"; + name = "libgcrypt11_1.5.0-3ubuntu0.6+srt2_i386"; + sha256 = "1wbaml6cjdijcaq6c9m0lcdlh350fk9a2prh6z4k7fjhsms60ppc"; + url = "mirror://steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.6+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libgcrypt11.deb"; }; } rec { - name = "libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_i386"; - sha256 = "1n5pyqw2v87xw32lj73aywhfgcmnzi2wvxxw2gqv52d56vzj254s"; - url = "mirror://steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_i386.deb"; + name = "libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt5_i386"; + sha256 = "0fis055pnc01rb5v9vdqc17w4ijdb6sksf2qjysc4q2j33gvh6d5"; + url = "mirror://steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libgdk-pixbuf2.0-0.deb"; }; } rec { - name = "libglew1.10_1.10.0-3+srt4_i386"; - sha256 = "1aswani1ymq52jyr4yhw4vi42gzw6xqk5ygh1d7zycakgrfs179b"; - url = "mirror://steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt4_i386.deb"; + name = "libglew1.10_1.10.0-3+srt6_i386"; + sha256 = "17ki8vb4nbg140fg7vdfyb092lcr3hpsjx0z1gz13bvmzxcff3lf"; + url = "mirror://steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libglew1.10.deb"; }; } rec { - name = "libglew1.6_1.6.0-4+srt4_i386"; - sha256 = "0yxnfi8arnp3cphxdviyqslw7nxnd1mx11v9i5i2xnl907iyaxpq"; - url = "mirror://steamrt/pool/main/g/glew/libglew1.6_1.6.0-4+srt4_i386.deb"; - source = fetchurl { - inherit url sha256; - name = "libglew1.6.deb"; - }; - } - rec { - name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_i386"; - sha256 = "1lmxm2gfz0mkjafpw8f98y73f0lj5m5nfdarqlpbb8dqbmpabwvk"; - url = "mirror://steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_i386.deb"; + name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt2_i386"; + sha256 = "0l0vjcff86mw1mv5kizg3pcjr8rk9bn2gjf0d22jgljisq47f607"; + url = "mirror://steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libglib2.0-0.deb"; }; } rec { - name = "libglu1-mesa_8.0.4-0ubuntu0.7+srt4_i386"; - sha256 = "11sdfs3zphb8ks2cpb646z4vza6s4zpbfgaq99drn5z9b8d109zi"; - url = "mirror://steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt4_i386.deb"; + name = "libglu1-mesa_8.0.4-0ubuntu0.7+srt5_i386"; + sha256 = "1bc2hb2cb05j4iw9lrskrqkdh8iy7wv3d1sknqn1ya847w98h9hr"; + url = "mirror://steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libglu1-mesa.deb"; }; } rec { - name = "libgmp10_5.0.2+dfsg-2ubuntu1+srt4_i386"; - sha256 = "1f6ss23vybyqkifjr9nam0y6va34m2vdpaxbwjmwi2z4wwj7pn9k"; - url = "mirror://steamrt/pool/main/g/gmp/libgmp10_5.0.2+dfsg-2ubuntu1+srt4_i386.deb"; + name = "libgmp10_5.0.2+dfsg-2ubuntu1+srt5_i386"; + sha256 = "0y6qrw7n41szpi8p2fpilx20wmqk3arw0m7kr35isy0y3icpryka"; + url = "mirror://steamrt/pool/main/g/gmp/libgmp10_5.0.2+dfsg-2ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libgmp10.deb"; }; } rec { - name = "libgnutls26_2.12.14-5ubuntu3.11+srt1_i386"; - sha256 = "0580r5n6z9s147q4bkkm75a2pwb1ganz9msbp440rwwh6xahrh56"; - url = "mirror://steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.11+srt1_i386.deb"; + name = "libgnutls26_2.12.14-5ubuntu3.14+srt1_i386"; + sha256 = "1f5dv4bk2g9ldqfjm7a2a6mx2ignzgxy42ghl9yny6x9xz39g56h"; + url = "mirror://steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.14+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libgnutls26.deb"; }; } rec { - name = "libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386"; - sha256 = "04mywbz2lmxap8nq1rvj7aggkrvrgfz4869q41f0d6dnsmnbsj5k"; - url = "mirror://steamrt/pool/main/g/gcc-4.8/libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386.deb"; + name = "libgomp1_5.4.0-7.really.6+steamrt1.1+srt1_i386"; + sha256 = "0p6gj53jdk3d4nmhkiiqvh8sk3pm2g99iqfmlc7br1gxvmpjjj3s"; + url = "mirror://steamrt/pool/main/g/gcc-5/libgomp1_5.4.0-7.really.6+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libgomp1.deb"; }; } rec { - name = "libgpg-error0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0hjfgcmrjr02xk788chyafg7j8viwmp2vrqyfjdjf79kvpy0354s"; - url = "mirror://steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libgpg-error0_1.10-2ubuntu1+srt5_i386"; + sha256 = "19wh8hdp5lcf68w2hwmj8z55j2bcp61ydf37cs796rvzsxbsbamr"; + url = "mirror://steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libgpg-error0.deb"; }; } rec { - name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386"; - sha256 = "06sqdxf38qm6cd76gdir6m9rvbg4xv70jhh36zshxxhi50lhpjcx"; - url = "mirror://steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386.deb"; + name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386"; + sha256 = "1zkvqbm3i297b6pj0japgs3jcvps8my6icsh2n1ka6nvflvdr87h"; + url = "mirror://steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libgssapi-krb5-2.deb"; }; } rec { - name = "libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - sha256 = "015jb2j56ia3zvfmjlx72yjlvfv8z8bg0ff4z5nh1d25cambqcbs"; - url = "mirror://steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; + name = "libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; + sha256 = "0q2r4fmpql34hpd061289ijl40y66wp8rlh78b2ysg8dkvycni0k"; + url = "mirror://steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libgssapi3-heimdal.deb"; }; } rec { - name = "libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_i386"; - sha256 = "14z4v2j7lc5xnzbfpf8b3b5qg0d2yg917v4ighxy2nydf2zy0mrs"; - url = "mirror://steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_i386.deb"; + name = "libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.2+srt1_i386"; + sha256 = "0nq6hvv00b3s5fmay2nm4s869y6lws8v2w9lrqlpgs08z6fh6mjp"; + url = "mirror://steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libgstreamer-plugins-base0.10-0.deb"; }; } rec { - name = "libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_i386"; - sha256 = "06lp4ajhnczb5salf6njgi1q24zv3yrkqhgvbyq45dvsax76kafj"; - url = "mirror://steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_i386.deb"; + name = "libgstreamer0.10-0_0.10.36-1ubuntu1+srt5_i386"; + sha256 = "0arypn4k1wvaiqqxc271r5w7bkdk0f4mh88l4np3ngfyzn2w6z61"; + url = "mirror://steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libgstreamer0.10-0.deb"; }; } rec { - name = "libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_i386"; - sha256 = "0qhvr5pyjj0vh2c1658gmx9r7h194py8qbcx69qfca2czp9hhacs"; - url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_i386.deb"; + name = "libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt5_i386"; + sha256 = "0swmpdf7872z0nb3rsfixspg11nvf0k7sm4xcdgvcliaqjhyv570"; + url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libgtk2.0-0.deb"; }; } rec { - name = "libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all"; - sha256 = "0xgh9nrvj1hf3wj9pqm9x3ykw95v9bsh5k2vgr3cr9135rrj0dp5"; - url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all.deb"; + name = "libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt5_all"; + sha256 = "0rw8iy16ij86abh444jk1xw78b5z81qjxm1292jin3sfhck4bd4x"; + url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt5_all.deb"; source = fetchurl { inherit url sha256; name = "libgtk2.0-common.deb"; }; } rec { - name = "libgudev-1.0-0_175-0ubuntu9.2+srt4_i386"; - sha256 = "0z8ncxaqxna0ihlp19i7b59k9vbkynak49kim821rwxsxvjqsfcd"; - url = "mirror://steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.2+srt4_i386.deb"; + name = "libgudev-1.0-0_175-0ubuntu9.10+srt1_i386"; + sha256 = "09gjla6gsx8whbvhzwvgjnm19md7bgpvb76kjfmxzm54hakcjxla"; + url = "mirror://steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.10+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libgudev-1.0-0.deb"; }; } rec { - name = "libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - sha256 = "195yrcwrw8bnai5kkvhdq7nnjv643af5dyc97qcnfnvnvs20az42"; - url = "mirror://steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; + name = "libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; + sha256 = "18v3rqaclhdmbh25p48sa6qidi3birnymdfzg2c8z5bpg1giis83"; + url = "mirror://steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libhcrypto4-heimdal.deb"; }; } rec { - name = "libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - sha256 = "0g2dml08mw4yy9llnn2149x1niy97mqbz56rphw3g3zv5nivnbp3"; - url = "mirror://steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; + name = "libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; + sha256 = "1546i5h5137ysvcgvyi6hplfx54wqya8sr233vgn838xd2bz024r"; + url = "mirror://steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libheimbase1-heimdal.deb"; }; } rec { - name = "libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - sha256 = "0dbs4gxbfdhn2sbzfny75fzxiab9k8l1vd3vm7i4zfkbkx3lbr2x"; - url = "mirror://steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; + name = "libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; + sha256 = "1yk0ap8wsi5k2wz5i9vcdw332kbhnlbf5hb8la9pckfrxy6bca82"; + url = "mirror://steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libheimntlm0-heimdal.deb"; }; } rec { - name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - sha256 = "01z9qr5r7n7vfkkb95apmkcc35va43qxsf0nzxff8x1ll82l3n7a"; - url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; + name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; + sha256 = "0y6awbyl4w56qa8vkn9dzsnb3162x4p5nr1cf7ir119nl05987cp"; + url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libhx509-5-heimdal.deb"; }; } rec { - name = "libice6_1.0.7-2build1+srt4_i386"; - sha256 = "1gmykmbbxk9590snli45dcvj00v77xn2za8v8193v020qa8hvmik"; - url = "mirror://steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt4_i386.deb"; + name = "libice6_1.0.7-2build1+srt5_i386"; + sha256 = "02nygw4q330jgrfgbp46fjpa97bmgzk7sg9ikh97k4c743lshija"; + url = "mirror://steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libice6.deb"; }; } rec { - name = "libidn11_1.23-2+steamrt1+srt4_i386"; - sha256 = "1xmv6kqn3zpnls7nyqd2bjqzc03y4w2gp0xmq6l8wwi659dkr4vz"; - url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.23-2+steamrt1+srt4_i386.deb"; + name = "libidn11_1.23-2+steamrt1+srt5_i386"; + sha256 = "1wv5rfk5a9y6w5wylvbxj8kbmav61y5w3j413kvf373xnhp79gaf"; + url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.23-2+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libidn11.deb"; }; } rec { - name = "libindicator7_0.5.0-0ubuntu1+srt4_i386"; - sha256 = "0j1v3ljb01wyy5v8a5ad8ar9wmx2hf6qd50k7cl95si60zs79bk6"; - url = "mirror://steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+srt4_i386.deb"; + name = "libindicator7_0.5.0-0ubuntu1+steamrt1+srt1_i386"; + sha256 = "1qiyw54y8yra871vzvdlj2cqhf1yvg68h9zckyyv87s753x98kkq"; + url = "mirror://steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+steamrt1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libindicator7.deb"; }; } rec { - name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_i386"; - sha256 = "06gz25p9qm0lbxaqzag2y2lhc0wx9cnkxz7zdm2yfdcx1y4vbymx"; - url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_i386.deb"; + name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt4_i386"; + sha256 = "02c4fj82svlkh9whsasclshjlvgbcabsz64ac47hvs2ccaap0gis"; + url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt4_i386.deb"; source = fetchurl { inherit url sha256; name = "libjack-jackd2-0.deb"; }; } rec { - name = "libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_i386"; - sha256 = "1m1986mn0ad5basd8hlby4d6jxpps4v0ib2g2pwqxdlil39gmar5"; - url = "mirror://steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_i386.deb"; + name = "libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt5_i386"; + sha256 = "0bcp6bxrgdbcgwrg2qgrax111w6xfwyf3rwrpf8j9mwd91hzm0c8"; + url = "mirror://steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libjpeg-turbo8.deb"; }; } rec { - name = "libjpeg62_6b1-2ubuntu1.1+srt4_i386"; - sha256 = "1fjbscq7qp895z5g5aw5l98rfj0qpr66rl5r4m0f1ilrjn83i96y"; - url = "mirror://steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt4_i386.deb"; + name = "libjpeg62_6b1-2ubuntu1.1+srt5_i386"; + sha256 = "1l3hm9p30w2kwbjyri452h9v0nprznsl9jh32l9hg4php8kjfidw"; + url = "mirror://steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libjpeg62.deb"; }; } rec { - name = "libjson0_0.9-1ubuntu1.1+srt2_i386"; - sha256 = "0nlhsclyxqa1s05hnzid6j8h0986v9viv6dysg22bc16gfdg9i1j"; - url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt2_i386.deb"; + name = "libjson0_0.9-1ubuntu1.1+srt3_i386"; + sha256 = "0jnbwf7j7fmrylav1dck17kajxdyc67gfmpn09wrrqy0zgdbg3zi"; + url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libjson0.deb"; }; } rec { - name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386"; - sha256 = "0h2iv7p0w5ydd9nqfwmm4avjhcnki7nl000gpsdnrpfjrbv4rnlb"; - url = "mirror://steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386.deb"; + name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386"; + sha256 = "0czc7vf1q84k252wsx9v9na2jn8vqym62dnb100992cpzj2956c1"; + url = "mirror://steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libk5crypto3.deb"; }; } rec { - name = "libkeyutils1_1.5.2-2+srt4_i386"; - sha256 = "1v9b3dg1s3ykj5abi4y2392m12dw2n7zrays6sv1n2dw46f2lj4k"; - url = "mirror://steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt4_i386.deb"; + name = "libkeyutils1_1.5.2-2+srt5_i386"; + sha256 = "0vmd87b8kk579fi99di79p94nkl0584bsdhgw2gw03czbainq9rx"; + url = "mirror://steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libkeyutils1.deb"; }; } rec { - name = "libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - sha256 = "0h4mnxfsf8j12g33lca2nlrcma9d8gdchxckzr916yp4snzjk0bb"; - url = "mirror://steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; + name = "libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; + sha256 = "1hjdfsvqzvssxiamjq9dddlzjjz54grzva2a7rsipbmmvnw254yd"; + url = "mirror://steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libkrb5-26-heimdal.deb"; }; } rec { - name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386"; - sha256 = "1ay1g283y3y6czm56r7wiibarwv267bg707ncaq4m7a9bxa0fmy2"; - url = "mirror://steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386.deb"; + name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386"; + sha256 = "1cr6z0jv6mchs82p6iyskdq6ppbfpyixanxwdbjdg76cpb5as3ii"; + url = "mirror://steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libkrb5-3.deb"; }; } rec { - name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386"; - sha256 = "031qjg6aajyrdj7ny9dl2v6p9syyngqfrdy277351814zcclhm1l"; - url = "mirror://steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386.deb"; + name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386"; + sha256 = "11v68jp8f24abx7i6b69jimlmv0lvpb5hnlxnj3f281zsz2smpyw"; + url = "mirror://steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libkrb5support0.deb"; }; } rec { - name = "liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_i386"; - sha256 = "03ix9r3mxvgq5i5qv7zhjmmg8bki8gvgg4n8r79az5zbp4nxmi4f"; - url = "mirror://steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_i386.deb"; + name = "liblcms2-2_2.2+git20110628-2ubuntu3.1+srt5_i386"; + sha256 = "1bpb8gfach74nibzzd2mk7mkdhlw1j27yrgckpl9pgzq8jd0ch70"; + url = "mirror://steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "liblcms2-2.deb"; }; } rec { - name = "libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_i386"; - sha256 = "0aycpf6xkr4fxr72np52jg6y384sy5b2r68kmmnzixqifykgc7jx"; - url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_i386.deb"; + name = "libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt5_i386"; + sha256 = "1147dl2h2k2xhl6xlpnamg95rkmp4nq2k01fcrv09x442hmx34xf"; + url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libldap-2.4-2.deb"; }; } rec { - name = "libltdl7_2.4.2-1ubuntu1+srt4_i386"; - sha256 = "1kjphpfqjr5zsa1z1zq4dibxwhm5861vardc3xic4izqf05vd6nj"; - url = "mirror://steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt4_i386.deb"; + name = "libltdl7_2.4.2-1ubuntu1+srt5_i386"; + sha256 = "1jv01xk4bf0sbq8jawa0zm1q0imc7nmzdwcmkhgscld02rzwwffs"; + url = "mirror://steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libltdl7.deb"; }; } rec { - name = "libmikmod2_3.1.12-2+srt4_i386"; - sha256 = "1rm18888n955wgh75srgrfhm0zgxz0n5sr030zc4lpp3bx4x2pfd"; - url = "mirror://steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-2+srt4_i386.deb"; + name = "libmikmod2_3.1.12-2+srt5_i386"; + sha256 = "12dmbmkv3gmi1cz0bs3fsbhgnhzvf8cjp0b6zj2a2dgplw1h6qdr"; + url = "mirror://steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libmikmod2.deb"; }; } rec { - name = "libncurses5_5.9-4+srt4_i386"; - sha256 = "1lc9s9rapyq6ld0xzlagqi5ah07gh59lixg0sh4xxm4sz75z6h21"; - url = "mirror://steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt4_i386.deb"; + name = "libncurses5_5.9-4+srt5_i386"; + sha256 = "1jsi7qvwy4h1z1mf9qlhp5pizbn84qgnpgi2y1qjlgym8428k0ga"; + url = "mirror://steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libncurses5.deb"; }; } rec { - name = "libncursesw5_5.9-4+srt4_i386"; - sha256 = "1j5r17ph0z43npv4nh5xgz0fdw9magas5ryr6qpi2pcqf5x9pp9r"; - url = "mirror://steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt4_i386.deb"; + name = "libncursesw5_5.9-4+srt5_i386"; + sha256 = "17hfrf97qcrw1n7p4nwwwiw3jpqpjphqwnq73pb7p8bsp53qa4h4"; + url = "mirror://steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libncursesw5.deb"; }; } rec { - name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386"; - sha256 = "1jr5nysd947lvk39ki1lx1y8csyaw10vlm9db7djrn20b1a6dsns"; - url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386.deb"; + name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt1_i386"; + sha256 = "0vsd00x0wvqw84zqlqrbmdxfmzshrvwbr2az3ynkaz8azkxj1d6d"; + url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libnm-glib4.deb"; }; } rec { - name = "libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386"; - sha256 = "01gf2wf722mc28hyfh3g45p2qq0v04nrhkhz96xd8mwa7jdx0cb9"; - url = "mirror://steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386.deb"; + name = "libnm-util2_0.9.4.0-0ubuntu4.2+steamrt2+srt1_i386"; + sha256 = "1vaqqgxzvixvh8cvdspyr7azfn8dmknvsypz628h2xvbldf0p156"; + url = "mirror://steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libnm-util2.deb"; }; } rec { - name = "libnotify4_0.7.5-1+srt4_i386"; - sha256 = "00nfvgckkdfal6qfbj4hcp5jc0rs57ksl48ciy87v46inxgp67z5"; - url = "mirror://steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt4_i386.deb"; + name = "libnotify4_0.7.5-1+srt5_i386"; + sha256 = "0420awfss4r2j8ncrvnapdj9gbh68z7qlp1vbq9wiaqraqy7zccw"; + url = "mirror://steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libnotify4.deb"; }; } rec { - name = "libnspr4_4.10.10-0ubuntu0.12.04.1+srt1_i386"; - sha256 = "00di7dw9a124ahc04m1rs8w3mdx1kpjhf696zvgxprn8qrwwp84n"; - url = "mirror://steamrt/pool/main/n/nspr/libnspr4_4.10.10-0ubuntu0.12.04.1+srt1_i386.deb"; + name = "libnspr4_4.12-0ubuntu0.12.04.1+srt2_i386"; + sha256 = "1kfs3afaqrfhajbp6dlwzcbzvl8xsg2c04c6b5l1bby1l4ynmqv2"; + url = "mirror://steamrt/pool/main/n/nspr/libnspr4_4.12-0ubuntu0.12.04.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libnspr4.deb"; }; } rec { - name = "libnss3_3.19.2.1-0ubuntu0.12.04.2+srt1_i386"; - sha256 = "1n46ln69sny735q75sn8g7sp23ahdav277bp0d0bl62k11xa3fnm"; - url = "mirror://steamrt/pool/main/n/nss/libnss3_3.19.2.1-0ubuntu0.12.04.2+srt1_i386.deb"; + name = "libnss3_3.26.2-0ubuntu0.12.04.1+srt1_i386"; + sha256 = "00m55f14ih9xyri197hnslw2mnzgl0dxwqvwiba0hnhfl3qvqi99"; + url = "mirror://steamrt/pool/main/n/nss/libnss3_3.26.2-0ubuntu0.12.04.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libnss3.deb"; }; } rec { - name = "libogg0_1.2.2~dfsg-1ubuntu1+srt4_i386"; - sha256 = "0bnsrk44pwzwjs7yw44kzbr5b10kq3jsvrskzxxr2sv12ljhxmrj"; - url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.2.2~dfsg-1ubuntu1+srt4_i386.deb"; + name = "libogg0_1.2.2~dfsg-1ubuntu1+srt5_i386"; + sha256 = "0b47v6s9x8hvhkgvgmy01rxd81i1c8icb0lpf3mldp5ss1q8fwgj"; + url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.2.2~dfsg-1ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libogg0.deb"; }; } rec { - name = "libopenal1_1.13-4ubuntu3+steamrt1+srt4_i386"; - sha256 = "18g56z1s8yyxhklqmpy6l22zcbzkvws26v6b1xgg4w3k33hbcjng"; - url = "mirror://steamrt/pool/main/o/openal-soft/libopenal1_1.13-4ubuntu3+steamrt1+srt4_i386.deb"; + name = "libopenal1_1.16.0-3+srt1_i386"; + sha256 = "1barqvh4klpdabc1v9kb2q4l8pnmdx97h00hln32zca5z4y5ff9i"; + url = "mirror://steamrt/pool/main/o/openal-soft/libopenal1_1.16.0-3+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libopenal1.deb"; }; } rec { - name = "liborc-0.4-0_0.4.16-1ubuntu2+srt4_i386"; - sha256 = "0yfqakir28jnn873xxqdickf54mnlpp25946fi1malvxadjcqjll"; - url = "mirror://steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt4_i386.deb"; + name = "liborc-0.4-0_0.4.16-1ubuntu2+srt5_i386"; + sha256 = "0n9fkxs3qkd4mwhm4cwlnljww1yalwqjcgia420ls3h7i4p7ss4v"; + url = "mirror://steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "liborc-0.4-0.deb"; }; } rec { - name = "libp11-kit0_0.12-2ubuntu1+srt4_i386"; - sha256 = "1f97dfd0z1fzk1l4zphdabxq7q02pdql03ifc265chzq4zpaghbh"; - url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.12-2ubuntu1+srt4_i386.deb"; + name = "libp11-kit0_0.12-2ubuntu1+srt5_i386"; + sha256 = "1nfcccnsn7x44wqwgkz0h9b3hzy3a0cknc51syniabsqds5w2i8p"; + url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.12-2ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libp11-kit0.deb"; }; } rec { - name = "libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_i386"; - sha256 = "0xda2k934wpfq01lrc9yw6fy6bispnfyyp5k0iszzh8awfjghrjj"; - url = "mirror://steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_i386.deb"; + name = "libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt5_i386"; + sha256 = "0w6m9ycpmlir2wvb7jj0w1p6sh84bjng9i0549bn0afq58f05biw"; + url = "mirror://steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libpango1.0-0.deb"; }; } rec { - name = "libpci3_3.1.8-2ubuntu5+srt4_i386"; - sha256 = "1zi4g80r8cgy4zawdddfkklp6q98xm3qlad1a27rfw6zlg66a028"; - url = "mirror://steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu5+srt4_i386.deb"; + name = "libpci3_3.1.8-2ubuntu6+srt1_i386"; + sha256 = "1jdakz038hxpkfh0g10acwlaaiqys7c546srdjhmhl9jxizw9ck8"; + url = "mirror://steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu6+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libpci3.deb"; }; } rec { - name = "libpcre3_8.12-4+srt4_i386"; - sha256 = "1v1jj9vwsd6k0f6l9a72pbx3idlnjs32zxd1gci2fanma7fsp4vj"; - url = "mirror://steamrt/pool/main/p/pcre3/libpcre3_8.12-4+srt4_i386.deb"; + name = "libpcre3_8.12-4+steamrt1.1ubuntu0.2+srt1_i386"; + sha256 = "12ycdj8pwxlhhqbg89h6smgvnik2pvy6bqyx9szqmpdcjzddagp5"; + url = "mirror://steamrt/pool/main/p/pcre3/libpcre3_8.12-4+steamrt1.1ubuntu0.2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libpcre3.deb"; }; } rec { - name = "libpcrecpp0_8.12-4+srt4_i386"; - sha256 = "01qklrzg9mprb45mn0bj9r5p5d3lmrz0mhiqwjxg07w533gycyr6"; - url = "mirror://steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+srt4_i386.deb"; + name = "libpcrecpp0_8.12-4+steamrt1.1ubuntu0.2+srt1_i386"; + sha256 = "0ml6bh7banikn75hzy68s2yx6y6924if4zar10lra1akl63by80l"; + url = "mirror://steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+steamrt1.1ubuntu0.2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libpcrecpp0.deb"; }; } rec { - name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_i386"; - sha256 = "004abdax9r66z0a359rik8dqc9bsx177m8z5ygjsh40yv7fjgc9g"; - url = "mirror://steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_i386.deb"; + name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.3+srt2_i386"; + sha256 = "06ch7dsjmjx2c67f932930rawn1cil6vxfnc0xcx937iwd3sq8i7"; + url = "mirror://steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.3+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libpixman-1-0.deb"; }; } rec { - name = "libpng12-0_1.2.46-3ubuntu4.2+srt1_i386"; - sha256 = "0ahap0mzqdl51ia615j09yaawi36khv9bj9z5bd0wspfyjls0a74"; - url = "mirror://steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4.2+srt1_i386.deb"; + name = "libpng12-0_1.2.46-3ubuntu4.2+srt2_i386"; + sha256 = "0vv10bzxqxnfmp1p4wl9c19kravqa7pcpcc6xar5przgwfv75fd8"; + url = "mirror://steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libpng12-0.deb"; }; } rec { - name = "libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_i386"; - sha256 = "1gwsfmr80r59y7ic21shbflf505wl0izsm1mvld3yif80vfz4hdn"; - url = "mirror://steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_i386.deb"; + name = "libpulse0_1.1-0ubuntu15.2+steamrt1+srt5_i386"; + sha256 = "0frhw8cw2ima5j40grmdk0hjf6hg6b029wr3f2g2252wzbhzx6ac"; + url = "mirror://steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libpulse0.deb"; }; } rec { - name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - sha256 = "0lfzgjyp4gxs6ns3v0xx82gpr784b7rwnhh37njq9zmhaq7mxpn6"; - url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; + name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; + sha256 = "1284xglgq9j0dqrgggs6455p0qidq5dxd7axgvi22zhzq3h5adfd"; + url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libroken18-heimdal.deb"; }; } rec { - name = "librtmp0_2.4~20110711.gitc28f1bab-1+srt4_i386"; - sha256 = "0x6dkzfc9bdcjr0sq6dl0vk0sjjm9pwp4hb2m8wjynykpinbzbxi"; - url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+srt4_i386.deb"; + name = "librtmp0_2.4~20110711.gitc28f1bab-1+srt5_i386"; + sha256 = "04wg1b9i77hv87ra7xbhqzcx6m9xdpx72b6d7pxnkrxxxc8sp35d"; + url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "librtmp0.deb"; }; } rec { - name = "libsamplerate0_0.1.8-4+srt4_i386"; - sha256 = "10dm5k8c6f8q6vgk0ab52kvikbrgiflbmkflbix42rm5l44bz8hd"; - url = "mirror://steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt4_i386.deb"; + name = "libsamplerate0_0.1.8-4+srt5_i386"; + sha256 = "070cz870znj9584a9y9npp7zzkkcb049ar2g6m3v1dzf8ijha38x"; + url = "mirror://steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libsamplerate0.deb"; }; } rec { - name = "libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_i386"; - sha256 = "19pkr848bjg2zg43z2l5npx97ydx4jgf7c5n33ckj6wbgxvzbn1s"; - url = "mirror://steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_i386.deb"; + name = "libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt5_i386"; + sha256 = "10hnrhzfxbg2ka3wlhbvg1qd15k5vdbpfxhdi3ip6yynr00zb9zs"; + url = "mirror://steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libsasl2-2.deb"; }; } rec { - name = "libsdl-image1.2_1.2.10-3+srt4_i386"; - sha256 = "1d3m36a58iwpykc442axj4bd6s4h7f9qq269qfv07i6cyfp2j87l"; - url = "mirror://steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt4_i386.deb"; + name = "libsdl-image1.2_1.2.10-3+srt5_i386"; + sha256 = "0iam5axnl4is7avn37jc95c3qxb5zacl5kl2zg5mbnm4wgcywr08"; + url = "mirror://steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl-image1.2.deb"; }; } rec { - name = "libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_i386"; - sha256 = "0wij7i9d5g9bbjq4xrvrbzqcsdpjn6dhj1pjn997lpgxsfwyl0nd"; - url = "mirror://steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_i386.deb"; + name = "libsdl-mixer1.2_1.2.11-7+steamrt1+srt5_i386"; + sha256 = "1zv4iq7743y2g0zmycq1aj48s06lcmv60f0xig5s9zj8kj5nbg36"; + url = "mirror://steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl-mixer1.2.deb"; }; } rec { - name = "libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_i386"; - sha256 = "1ih95dgbaksgj12x6p7528hywm4zqalv0zyg7k5mp3yfgdxi37xr"; - url = "mirror://steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_i386.deb"; + name = "libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt5_i386"; + sha256 = "15rbl3zbmg053ach4d25c988m3kj4gjndj5bz1v1spv46798lya8"; + url = "mirror://steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl-ttf2.0-0.deb"; }; } rec { - name = "libsdl1.2debian_1.2.15-5+steamrt1+srt4_i386"; - sha256 = "1qsmhdzs2rr13vgagma0yn39x4njx2gixw82l3zmp6b0rp8x0ff9"; - url = "mirror://steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1+srt4_i386.deb"; + name = "libsdl1.2debian_1.2.15-5+steamrt1+srt5_i386"; + sha256 = "1da6gg64n9x86ldxns4dfnixxa4sc6bci34sgy08fa3r05aqh84a"; + url = "mirror://steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl1.2debian.deb"; }; } rec { - name = "libsdl2_2.0.4+steamrt2+srt1_i386"; - sha256 = "1xxj20q6kv4n8g1d1f5pbg1qaqdaq4nigqi2sq4lzmnvzkm8nj91"; - url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.4+steamrt2+srt1_i386.deb"; + name = "libsdl2_2.0.8+steamrt1+srt1_i386"; + sha256 = "0ldraz2giwfhgxbc5m0sf4m1xvp21hx5n9cgqj1civa9plhwyrk7"; + url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.8+steamrt1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl2.deb"; }; } rec { - name = "libsdl2-image_2.0.1+steamrt2+srt1_i386"; - sha256 = "0s7gyc3d0acddzipc4pc89k5cdyjl8ik7pk1znrq0292rnmnwbk4"; - url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.1+steamrt2+srt1_i386.deb"; + name = "libsdl2-image_2.0.3+steamrt1+srt1_i386"; + sha256 = "006kbbcrzv4bdgpz2w3s0z2q28h5n37ab3995d1zlrpaxmh03i37"; + url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.3+steamrt1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-image.deb"; }; } rec { - name = "libsdl2-mixer_2.0.1+steamrt1+srt1_i386"; - sha256 = "0hqqxqnh8pyvaqhb9rhk20qnf4plrmh3w0n80sfzcn1vjrdcg8mr"; - url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.1+steamrt1+srt1_i386.deb"; + name = "libsdl2-mixer_2.0.2+steamrt1+srt1_i386"; + sha256 = "0m27snsrpcr1d7yd9kn8z0symw2fgivx8ndvjxif45w3h8qfkmv1"; + url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.2+steamrt1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-mixer.deb"; }; } rec { - name = "libsdl2-net_2.0.1+srt1_i386"; - sha256 = "14cn8v8bnllkbj88qy2chlj44m4qrdd6h1x705plwy10qma18iln"; - url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt1_i386.deb"; + name = "libsdl2-net_2.0.1+srt2_i386"; + sha256 = "0fk45d366021s31b8vlry93crm1c30fqiq2r4a4yvp9gkhlkww4a"; + url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-net.deb"; }; } rec { - name = "libsdl2-ttf_2.0.14+srt1_i386"; - sha256 = "06r8vsji64dcswd7mwy9yyacp6pkza8lsa3dwz07yqyb49md9xrv"; - url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt1_i386.deb"; + name = "libsdl2-ttf_2.0.14+srt2_i386"; + sha256 = "0v9myv9d04h5rs9x216qjg2lf6pwnngsbyylzc0fs5rlzshwdk9s"; + url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-ttf.deb"; }; } rec { - name = "libselinux1_2.1.0-4.1ubuntu1+srt4_i386"; - sha256 = "19vfb4zlpv25x5428zfm5mkwqgdc229mc3saq32pas3b2faxfan7"; - url = "mirror://steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt4_i386.deb"; + name = "libselinux1_2.1.0-4.1ubuntu1+srt5_i386"; + sha256 = "0s5x224hx0q6j49pvb3bflzyzzi4ryl60sx6sf7y6wi7kplvibvg"; + url = "mirror://steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libselinux1.deb"; }; } rec { - name = "libsm6_1.2.0-2build1+srt4_i386"; - sha256 = "0c1rca5w1m1cqi2a5g9k7zpvkvky6da9hkfg1ar5c8xw4ilw304j"; - url = "mirror://steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt4_i386.deb"; + name = "libsm6_1.2.0-2build1+srt5_i386"; + sha256 = "07vrs3rarjah3q06yfqqpb38j67s7dv2p30izhjzps7xxj2qfw6d"; + url = "mirror://steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libsm6.deb"; }; } rec { - name = "libsndfile1_1.0.25-4+srt4_i386"; - sha256 = "0pbb7yv86am1x1fd2s15s7ybyz3q1xjlxij8in9dal1bkpj6yhsj"; - url = "mirror://steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+srt4_i386.deb"; + name = "libsndfile1_1.0.25-4+steamrt1.1ubuntu0.1+srt1_i386"; + sha256 = "0y4hlf67cdlgcfsw03sjsvm2vch8gsasid58y77rzix43saay229"; + url = "mirror://steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+steamrt1.1ubuntu0.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libsndfile1.deb"; }; } rec { - name = "libspeex1_1.2~rc1-3ubuntu2+srt4_i386"; - sha256 = "1n2146dh1famhl58i1s4cdp0gyfz89w8vj5msh8hsdjjr8csa83s"; - url = "mirror://steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt4_i386.deb"; + name = "libspeex1_1.2~rc1-3ubuntu2+srt5_i386"; + sha256 = "0d662dxr5dh6dvnz49pii1mqd8k2xk0jaw07sgl7nnd01926xa9p"; + url = "mirror://steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libspeex1.deb"; }; } rec { - name = "libspeexdsp1_1.2~rc1-3ubuntu2+srt4_i386"; - sha256 = "0gk0b28d9f7zya9vbmg1kj5xm3k3339ky2n16id3w6aks7lc5y8w"; - url = "mirror://steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt4_i386.deb"; + name = "libspeexdsp1_1.2~rc1-3ubuntu2+srt5_i386"; + sha256 = "1924dczm2sxlfn9ibmp7yvn0chd3y201zhw0a6dv65fwngmzk725"; + url = "mirror://steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libspeexdsp1.deb"; }; } rec { - name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt1_i386"; - sha256 = "160pzj7hmqm5hkixj002q81gcqybkv7xn8z8746dw7h90cvlyvrh"; - url = "mirror://steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt1_i386.deb"; + name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt2_i386"; + sha256 = "05cihfj3ap1xwpnlmvl3wdbqrbbm6ic10zbja98c429xxx7y8bgv"; + url = "mirror://steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libsqlite3-0.deb"; }; } rec { - name = "libssl1.0.0_1.0.1-4ubuntu5.33+srt1_i386"; - sha256 = "142c6vwq852mra2i2jp802wfsprd5jia80xn09ms0rxxa1aa7xsk"; - url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.33+srt1_i386.deb"; + name = "libssl1.0.0_1.0.1-4ubuntu5.36+steamrt1+srt2_i386"; + sha256 = "06gc6qpm51jx0x1imf5nccc3r9x2d41xvfi0wl3p9wvrx6nsna7d"; + url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.36+steamrt1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libssl1.0.0.deb"; }; } rec { - name = "libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386"; - sha256 = "187nknssd0x7r0qsw71f3d06pvwbkqanajah4f7a01xk3hc8cxh1"; - url = "mirror://steamrt/pool/main/g/gcc-4.8/libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386.deb"; + name = "libstdc++6_5.4.0-7.really.6+steamrt1.1+srt1_i386"; + sha256 = "13kvxng82xz171y3q0i12bvy8z77cqk6s088bjil4b5fq81aaxns"; + url = "mirror://steamrt/pool/main/g/gcc-5/libstdc++6_5.4.0-7.really.6+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libstdc++6.deb"; }; } rec { - name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_i386"; - sha256 = "1j2wsczzlh5jpqyr8k6j72107kmhxa3hdiqm0s648i0fyrks54wp"; - url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_i386.deb"; + name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.1+srt1_i386"; + sha256 = "1xh0hvgw6rrg6k1fbpblxvfdaslwkjlqbgaqjkavkkvl0xmk5k4b"; + url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libstdc++6-4.6-pic.deb"; }; } rec { - name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386"; - sha256 = "0x3xbbzf643mia8cx9py8vrn9d8c5njxh7x233ylmh8lybac9z5x"; - url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb"; + name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386"; + sha256 = "1cj7zfhxrb6mvsd8np6q1s1wja2rdd85h2cs9b2pbnlffbr0b9ad"; + url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libswscale2.deb"; }; } rec { - name = "libtasn1-3_2.10-1ubuntu1.4+srt1_i386"; - sha256 = "050w4qc87h9kvniknk62jxpx2i40pl8djbmzbhj2w2lmjbzr7g83"; - url = "mirror://steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.4+srt1_i386.deb"; + name = "libtasn1-3_2.10-1ubuntu1.5+srt2_i386"; + sha256 = "12lfinrk76laq7hiddsvi0gskyfgrf7nk2kflqryxwrpf1y34bcl"; + url = "mirror://steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.5+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libtasn1-3.deb"; }; } rec { - name = "libtbb2_4.0+r233-1+srt4_i386"; - sha256 = "1ava8m0iv62cb1gi28l486nibd981lsnjbx08b7cg7dd8hjw5lnj"; - url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+srt4_i386.deb"; + name = "libtbb2_4.0+r233-1+steamrt2+srt1_i386"; + sha256 = "0ap5ar8v4ljv138p6kga1vzy96v5ilicxsk8lhp1scvcrcaqfppz"; + url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+steamrt2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libtbb2.deb"; }; } rec { - name = "libtdb1_1.2.9-4+srt4_i386"; - sha256 = "17q687bsc7v2jkcvp1y85mnzdq8kdxwlvxib0h5i6v6qvwrj01hn"; - url = "mirror://steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt4_i386.deb"; + name = "libtdb1_1.2.9-4+srt5_i386"; + sha256 = "0snf08x6fsjqxs2gzfa7sdxbznq7h347ndawmras84zi0g0bgj6q"; + url = "mirror://steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libtdb1.deb"; }; } rec { - name = "libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_i386"; - sha256 = "0viaqm59q9qbj23s5b4s4mq99imyfv799b6ph78cz2yi6l94qvqx"; - url = "mirror://steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_i386.deb"; + name = "libtheora0_1.1.1+dfsg.1-3ubuntu2+srt5_i386"; + sha256 = "1jjbd6yyyw5v5wnvsdc3s4gywm9q0mq32n2dr444qs030nkfvcrp"; + url = "mirror://steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libtheora0.deb"; }; } rec { - name = "libtiff4_3.9.5-2ubuntu1.8+srt1_i386"; - sha256 = "1zyggf4hp7xxd7jn2rahg27vxk1pxpwcvjlrmc3lnp4d2krnf0pq"; - url = "mirror://steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.8+srt1_i386.deb"; + name = "libtiff4_3.9.5-2ubuntu1.9+srt2_i386"; + sha256 = "0law24ini5ailgykff6blxqfj6zz0lfx5a2s5fzgf06s4j1n2cjv"; + url = "mirror://steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.9+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libtiff4.deb"; }; } rec { - name = "libtinfo5_5.9-4+srt4_i386"; - sha256 = "0iy5lalmyr9lv8vm7mc5zdis70ir3x82aav798s4dvwmhzw7a45a"; - url = "mirror://steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt4_i386.deb"; + name = "libtinfo5_5.9-4+srt5_i386"; + sha256 = "1476jzkd5mcipafc8cfb03z9yzkxvdxnfc0qa34xq5rbjwcximmd"; + url = "mirror://steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libtinfo5.deb"; }; } rec { - name = "libudev0_175-0ubuntu9.2+srt4_i386"; - sha256 = "1wxkfv34nqch3zi4hyshmwbg9s33q7inlz8zl396p22m1q5m5sfx"; - url = "mirror://steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.2+srt4_i386.deb"; + name = "libudev0_175-0ubuntu9.10+srt1_i386"; + sha256 = "089z7vv229w6gnnzwwagixxwn2qcl8gfim1zbagg266vlwqvcyka"; + url = "mirror://steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.10+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libudev0.deb"; }; } rec { - name = "libusb-1.0-0_1.0.19-1+srt1_i386"; - sha256 = "0mmn9l99i595l4fd446jjyh301airh17wbc4wfiigsmz4b4mylb0"; - url = "mirror://steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt1_i386.deb"; + name = "libusb-1.0-0_1.0.19-1+srt2_i386"; + sha256 = "1rjnir1gm768xhn4lqb4rdai6wabdfysnlzb47qxxzshpfphycmh"; + url = "mirror://steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libusb-1.0-0.deb"; }; } rec { - name = "libuuid1_2.20.1-1ubuntu3+srt4_i386"; - sha256 = "1hcrpngalirqbzqfn209akkizqnm4qpkhp42mcys78xx0i0p5kxr"; - url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3+srt4_i386.deb"; + name = "libuuid1_2.20.1-1ubuntu3.1+steamrt1.1+srt1_i386"; + sha256 = "1hi8gq8jws689pacx8m0pzjfhrswh8jng39m7vnx2clj7xzfsk5b"; + url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3.1+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libuuid1.deb"; }; } rec { - name = "libva-glx1_1.3.1-3+steamrt4+srt1_i386"; - sha256 = "0g7vra6wlgrvpn1cqx1xnckfxn7r2lzh8bk2gs32cdxc4qy7w22r"; - url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.3.1-3+steamrt4+srt1_i386.deb"; + name = "libva-glx1_1.7.0-1+steamos1+srt1_i386"; + sha256 = "1q1aasyqlllhj0jhkf7mfcs4n83kj7yddxlsldl77v5x2rhn6ksx"; + url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.7.0-1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libva-glx1.deb"; }; } rec { - name = "libva-x11-1_1.3.1-3+steamrt4+srt1_i386"; - sha256 = "0m5p4ciafgdvm4a29z07bcy8gx5n9vr634bwg1x2fj8z5w1y2bnx"; - url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.3.1-3+steamrt4+srt1_i386.deb"; + name = "libva-x11-1_1.7.0-1+steamos1+srt1_i386"; + sha256 = "1pk78g722w8j2zl0hij59p4v3j70am167mdd7f58d179j34v7y8p"; + url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.7.0-1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libva-x11-1.deb"; }; } rec { - name = "libva1_1.3.1-3+steamrt4+srt1_i386"; - sha256 = "1k44nikbgll3zh94p0zgnajjwkaxc0lzc1ss24frq1pzj76jgg54"; - url = "mirror://steamrt/pool/main/libv/libva/libva1_1.3.1-3+steamrt4+srt1_i386.deb"; + name = "libva1_1.7.0-1+steamos1+srt1_i386"; + sha256 = "17rlsh8sv8qymd17c8k1mlk5gb8fkjlgi2swxiaqnyzw40k52bi5"; + url = "mirror://steamrt/pool/main/libv/libva/libva1_1.7.0-1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libva1.deb"; }; } rec { - name = "libvdpau1_0.4.1-3ubuntu1.2+srt1_i386"; - sha256 = "0yya462g7ar6k54bb8aw9qw6zcnzqlzrqjni9w77pm5vbiy1r0yp"; - url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt1_i386.deb"; + name = "libvdpau1_0.4.1-3ubuntu1.2+srt2_i386"; + sha256 = "1qa6bssw4rnyjxw79pfpbhhlwzkxcxg2cx5i8lns5sxg072as5sj"; + url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libvdpau1.deb"; }; } rec { - name = "libvorbis0a_1.3.2-1ubuntu3+srt4_i386"; - sha256 = "0s2m9sa8gyqk56icsb8y65fhfnmbay56a8gy8znz690l8aq6fcvl"; - url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.2-1ubuntu3+srt4_i386.deb"; + name = "libvorbis0a_1.3.2-1ubuntu3+srt5_i386"; + sha256 = "01hkk2wxqx5fj7qsi00h4al8ddvymhziyzdpzr025bd0ibhgqayg"; + url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.2-1ubuntu3+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libvorbis0a.deb"; }; } rec { - name = "libvorbisenc2_1.3.2-1ubuntu3+srt4_i386"; - sha256 = "1848325zzklbdc03a738jvs0jpgypjd11sw80qv47i73zmc0wnfz"; - url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.2-1ubuntu3+srt4_i386.deb"; + name = "libvorbisenc2_1.3.2-1ubuntu3+srt5_i386"; + sha256 = "0v26kx6b98mj2glhmd6nsk2zqh3ra6jln1c9ksrq4abxda4qqril"; + url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.2-1ubuntu3+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libvorbisenc2.deb"; }; } rec { - name = "libvorbisfile3_1.3.2-1ubuntu3+srt4_i386"; - sha256 = "0p63wgif2h9q6pd61mfpl63qa1m12344d5nkrd6daq47hmldfibw"; - url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.2-1ubuntu3+srt4_i386.deb"; + name = "libvorbisfile3_1.3.2-1ubuntu3+srt5_i386"; + sha256 = "0l9d7z87fpa8zkfg96709hfpx6jr0zrd5pvjz193jaj5165kamkh"; + url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.2-1ubuntu3+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libvorbisfile3.deb"; }; } rec { - name = "libvpx1_1.0.0-1+srt4_i386"; - sha256 = "1dkpqaaclks24kw4wdbzfnkdbsf4yz3j8ygfl6w0y3w2sxwcxldl"; - url = "mirror://steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-1+srt4_i386.deb"; + name = "libvpx1_1.0.0-2+srt1_i386"; + sha256 = "08yngwr92m787ycpsc798kgpyw6ixks55kmqmadjp8zx43pjzaai"; + url = "mirror://steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libvpx1.deb"; }; } rec { - name = "libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_i386"; - sha256 = "1fir2kw66z14pfs6zqa5i620c9rli075dk9mj9802d723hr78ylh"; - url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_i386.deb"; + name = "libvulkan1_1.1.73+dfsg-1+steamosc2+srt1_i386"; + sha256 = "0g9f3nk2bq8knqqs6qplw39p729zxqnxyyhipnziqy8h38bilj86"; + url = "mirror://steamrt/pool/main/v/vulkan/libvulkan1_1.1.73+dfsg-1+steamosc2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libvulkan1.deb"; }; } rec { - name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - sha256 = "06vhdm7d6h7cihk97v5bf2b8mb5z1ncca1yfahcxmgykm0amq89w"; - url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; + name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; + sha256 = "1xzj4q5wk1pjflqqd85cx1788sd89fjdjgwv4qlwyn76magxi7kh"; + url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libwind0-heimdal.deb"; }; } rec { - name = "libwrap0_7.6.q-21+srt4_i386"; - sha256 = "07qszw3j351x9vwz5q6qvzanp291xn27zif1ir5khdwidr5lb58b"; - url = "mirror://steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt4_i386.deb"; + name = "libwrap0_7.6.q-21+srt5_i386"; + sha256 = "1lhp9v9cpi5dgk0wdrivr50b0g3l4fy8cjgnjai25hb65w2hj33n"; + url = "mirror://steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libwrap0.deb"; }; } rec { - name = "libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386"; - sha256 = "0wsr47fjfvjxz0ks07va0mqs8d6b8prll5512hvivj6hf6x8cngm"; - url = "mirror://steamrt/pool/main/libx/libx11/libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386.deb"; + name = "libx11-6_1.6.3-1ubuntu2.1+srt1_i386"; + sha256 = "0mvg378ja1znf6qf5228bmijrznhhzw3r7lxizk9iwhz5pm6h2pm"; + url = "mirror://steamrt/pool/main/libx/libx11/libx11-6_1.6.3-1ubuntu2.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libx11-6.deb"; }; } rec { - name = "libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all"; - sha256 = "17mygha6q5480ajgv1f4wmgwr3l3zxh92yagh4qfsm6r1j2a5dma"; - url = "mirror://steamrt/pool/main/libx/libx11/libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all.deb"; + name = "libx11-data_1.6.3-1ubuntu2.1+srt1_all"; + sha256 = "1imsbk4mg6n1083gjjv6kssm5g842xlbg40vsc4dw97myxycpncw"; + url = "mirror://steamrt/pool/main/libx/libx11/libx11-data_1.6.3-1ubuntu2.1+srt1_all.deb"; source = fetchurl { inherit url sha256; name = "libx11-data.deb"; }; } rec { - name = "libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386"; - sha256 = "11fhyqvfbs0jf71cnmld09q23abvnrzgp20zabrvi2r5vk0ai6f9"; - url = "mirror://steamrt/pool/main/libx/libx11/libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386.deb"; + name = "libx11-xcb1_1.6.3-1ubuntu2.1+srt1_i386"; + sha256 = "0vpnnsa4ayvin11c9gl5c8bbaplz1z6pm28k0fhfhla5ggq1kd46"; + url = "mirror://steamrt/pool/main/libx/libx11/libx11-xcb1_1.6.3-1ubuntu2.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libx11-xcb1.deb"; }; } rec { - name = "libxau6_1.0.6-4+srt4_i386"; - sha256 = "0pw507i7nfr1zqjf8ysjzqgml053bwlac2jxv78b2rp3l3xky4sp"; - url = "mirror://steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt4_i386.deb"; + name = "libxau6_1.0.6-4+srt5_i386"; + sha256 = "1q5qryha5ng0cjcalz5qxd38djxd5n7kb2fnz9mnp4cy2vk5jhmq"; + url = "mirror://steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxau6.deb"; }; } rec { - name = "libxaw7_1.0.9-3ubuntu1+srt4_i386"; - sha256 = "172kg32mck6v60cy7bxb3wpmhn09jay6lg0mghb65f57bkqb539v"; - url = "mirror://steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt4_i386.deb"; + name = "libxaw7_1.0.9-3ubuntu1+srt5_i386"; + sha256 = "17085yj7x9hncbgxw5jsi4inn17f6wzdx2akzv9v3l6hvhy8kmkl"; + url = "mirror://steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxaw7.deb"; }; } rec { - name = "libxcb-composite0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0m28k3pwgscxzbp4vhrncv12l0940s22qc8lrgzb0vi5ha4vb1zk"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-composite0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-composite0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "00zfy06nf78gs7ji222lcy1cwzsqfbng9119cgkw5c1z25x0q6a5"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-composite0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-composite0.deb"; }; } rec { - name = "libxcb-damage0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0z180s301vq0bpnv18hqad3n5hsipv6svjgiwacq9c4srryn22af"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-damage0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-damage0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "09y48s64kp0maldv9bwwpj8ahrssvrik8xmqzjgvxcxpblb1zfb7"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-damage0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-damage0.deb"; }; } rec { - name = "libxcb-doc_1.10-2ubuntu1+srt4_all"; - sha256 = "0zq3xcrlr2wjp3386bf5h1z63hapmkpnw45l1fz17chdngcmj358"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-doc_1.10-2ubuntu1+srt4_all.deb"; + name = "libxcb-doc_1.11.1-1ubuntu1+steamos1+srt1_all"; + sha256 = "0aly1y78gdv9vkxqgs6ir7sdifn0bvsbflp05x7jmq0zlgpcg0nz"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-doc_1.11.1-1ubuntu1+steamos1+srt1_all.deb"; source = fetchurl { inherit url sha256; name = "libxcb-doc.deb"; }; } rec { - name = "libxcb-dpms0_1.10-2ubuntu1+srt4_i386"; - sha256 = "1k66jz8ms3mwbmkfdg9xb9wn77igwrkhjrvg6lw847c2f5rrxwp7"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "085b0qhf15kaw9msmsk8jxp4rk7fym506jmiaqxh1i6wgr66ys86"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-dpms0.deb"; }; } rec { - name = "libxcb-dri2-0_1.10-2ubuntu1+srt4_i386"; - sha256 = "00r0pcda8hc7sq1nj93621p55743dys424fi3n26hdmdky9j0rks"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-dri2-0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "1nwdr550axxca7p438c3g9jb4y2zf8gxyd3756vav4jp1n57i1rq"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-dri2-0.deb"; }; } rec { - name = "libxcb-dri3-0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0lgg6b8sxd6s22vn7vwiyb9vz39v124y9w74g6krxqmfvbkfva2x"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-dri3-0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "1vjklblpkdrki48dn890920nx8gcj25sxqp24qkpxja8samvl6gr"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-dri3-0.deb"; }; } rec { - name = "libxcb-glx0_1.10-2ubuntu1+srt4_i386"; - sha256 = "142f73f4mkvad2l238kyf0xl4kwzgcpcww33ah3rx4qjz7q3ails"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-glx0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-glx0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0zwc8c896bka6wi5jri78q1pq5ppsi5dwih9rwfl5c96p6r4lbr6"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-glx0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-glx0.deb"; }; } rec { - name = "libxcb-present0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0rlnxwazwrp7kpgh6d6dbfzk5cjvlqp31qxgifd4b8fryjnan91f"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-present0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-present0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0cd4jsyj1r6b7nm8g6342f8dafghzd1dc0k61iw3qncwx949j3gy"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-present0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-present0.deb"; }; } rec { - name = "libxcb-randr0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0qg20vdidpbl6jar9w4n65jfmg907fkqrk2nwh6qj0l3xd90pm61"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-randr0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-randr0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "1vfrbkq1qqjp0278j70jcldls2g9rmkh9ifb6pnqznagqsrrhwy7"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-randr0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-randr0.deb"; }; } rec { - name = "libxcb-record0_1.10-2ubuntu1+srt4_i386"; - sha256 = "1kyjdazkvykcg76yp3gyy2pgj07nwbjld7q0ci96q1zka3a3m4sz"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-record0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-record0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0gy7l161idc59a6q8vhgq1krknwmd1cyh5ss2vhp7qznxwh9bd7j"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-record0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-record0.deb"; }; } rec { - name = "libxcb-render0_1.10-2ubuntu1+srt4_i386"; - sha256 = "1r77z60hz0bblg07szl6yir6ll697w0w1y37bd66wv9n4cdlijqd"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-render0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-render0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0gl7389h5ppfd3p30v8vmwl4kxvsqjhmhazszs7mdgalfjwkf9rf"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-render0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-render0.deb"; }; } rec { - name = "libxcb-res0_1.10-2ubuntu1+srt4_i386"; - sha256 = "1xnnyczipj30kzkyrwngkra2m3xc8jchzd88a3afgy4m6cy6qyyy"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-res0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-res0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "1ca5lk12qncrfkjakjb7yl5f5x41b3ynn3d9wk6paqrchhfn7yir"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-res0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-res0.deb"; }; } rec { - name = "libxcb-screensaver0_1.10-2ubuntu1+srt4_i386"; - sha256 = "155m47mnjbn9b5p895syyfxk9pk1sh76qj614k554rf77nwdx8rq"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-screensaver0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0sz49j0z7zl2mx7cf6kw4ljzsbik92az35yj9i0426p1zaqzx0vs"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-screensaver0.deb"; }; } rec { - name = "libxcb-shape0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0wm9mm8xyh70zdc7iz8j3y89n2c5yhd72kq68nbxqpnwrz3kyzcz"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shape0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-shape0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "1mycsk8ixdn7c8c4ma4vbrilhcdjxqz92nzv9rwxf96vr0dj4bhd"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shape0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-shape0.deb"; }; } rec { - name = "libxcb-shm0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0ifvwv0jq4crsgzfpbssa4p9r1jk7mck4wlpfq5j11aiijyw5fq6"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shm0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-shm0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "1w0d53d8hgzr5ql9is7x4dap6ny6bfp041qa6hldmg8jbw3x8wc3"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shm0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-shm0.deb"; }; } rec { - name = "libxcb-sync1_1.10-2ubuntu1+srt4_i386"; - sha256 = "0wsf356qiv9frxky8c503bb7nsksrgn9zii7h2yp7v5wsxpi20p5"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-sync1_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-sync1_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "1pd0pw5q7h28p0j6h4889dq7fpvkjwclsmg96m6sl7a3459cp6b0"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-sync1_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-sync1.deb"; }; } rec { - name = "libxcb-xevie0_1.10-2ubuntu1+srt4_i386"; - sha256 = "1qynissbyb4ihyyy61nhlm4nqsm5akyfkdfyw38id6qiyh1hnml9"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-xevie0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0nf3s5jff5psab8mv9avkflgwfj2pmbrvc3pyy743b9cwzv7q85p"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xevie0.deb"; }; } rec { - name = "libxcb-xf86dri0_1.10-2ubuntu1+srt4_i386"; - sha256 = "013mhdbavmaqvw99k52p45lzfri1fhyclg6hdzb3xgswzilq1wn4"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-xf86dri0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "149dgslf6hhngjjkhdvrsl3hjx3l2llvnwv6jgnc8hqvz7ck1i1h"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xf86dri0.deb"; }; } rec { - name = "libxcb-xfixes0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0szrbzqjks1g77x572r3dvkv791k1c8lckcgk6a7wl4pygsksd3m"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-xfixes0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "1rjynbvfxxzm5x07xxfq40qhs7b5pwassn1f7j02q3685swqmk0z"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xfixes0.deb"; }; } rec { - name = "libxcb-xinerama0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0h01rmw1h93xd1vhz06v7ckjzy89ingi6c6b2sl6sxdd7ii9fkni"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-xinerama0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0m0v4c50104c2khx9vcsf3v3xyl031xv2yladxfp168gchrczyk9"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xinerama0.deb"; }; } rec { - name = "libxcb-xkb1_1.10-2ubuntu1+srt4_i386"; - sha256 = "07yq1khdrisvgkpbvl39kq1f3kwaqxvyn6jfcib2lcg6w5cbk9n8"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-xkb1_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0d56vivs4ykanc1v3pbn9mzgcyw4ffx7c59ck1758g2vxfvi837w"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xkb1.deb"; }; } rec { - name = "libxcb-xprint0_1.10-2ubuntu1+srt4_i386"; - sha256 = "13dxk56nga9imkx07fb1s4fmgki0dnhcbb41pzr1r0ybxg6crnk9"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-xprint0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0gclf7sgd661820bqqj3aabykxp0m38y3wd9m25znqgqqg5bk6im"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xprint0.deb"; }; } rec { - name = "libxcb-xtest0_1.10-2ubuntu1+srt4_i386"; - sha256 = "11ajwd0456dr4nwhkib31zwgk7xpyzir86pvjrgpydnh6yj3dic0"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-xtest0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0swkpx39gd9n553qrc8dhdv4vvnan1byrkvy935zzimzxv8phxfm"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xtest0.deb"; }; } rec { - name = "libxcb-xv0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0xkj414c0svlndqck1ghddc424a7mpxwaw44sdjw25iwsidzqi7i"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xv0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-xv0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0mi49k0xfk34x71ap4q9wy4p7cs31z25pg0p41yr859q4y49461r"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xv0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xv0.deb"; }; } rec { - name = "libxcb-xvmc0_1.10-2ubuntu1+srt4_i386"; - sha256 = "109bkl63vbsmhflqw3ivjdas96jamq5jjh67rf4lvpgxnlscxsgw"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-xvmc0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "068y30y9ry4hlfc4dsza47z6lakfz2cy0zkdq5rn3nbs59d7f2nh"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xvmc0.deb"; }; } rec { - name = "libxcb1_1.10-2ubuntu1+srt4_i386"; - sha256 = "1n3ppygmfjy4hwgi4lq2xlm1ldlp47g67ksafbs3zd06a7lyq2rb"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb1_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb1_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0sga5mjr5bk5w0mdq0y2hxfdhpfpzv9m9anfy2zkaw60gy6n0qk6"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb1_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb1.deb"; }; } rec { - name = "libxcomposite1_0.4.3-2build1+srt4_i386"; - sha256 = "1ga6g4mdz02p4m6l3q7fa8404243qhqfrvvcwinbm9hj8fyshliz"; - url = "mirror://steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt4_i386.deb"; + name = "libxcomposite1_0.4.3-2build1+srt5_i386"; + sha256 = "1c23iswcyi5axg5hql3kkfmcvxkzjl1db9klrlsqb2c0455pjlsf"; + url = "mirror://steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcomposite1.deb"; }; } rec { - name = "libxcursor1_1.1.12-1ubuntu0.1+srt4_i386"; - sha256 = "0nalkn0hql9v13b48685jrlcx607n5bn6gk5vmhbq0zpcs2ww709"; - url = "mirror://steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt4_i386.deb"; + name = "libxcursor1_1.1.12-1ubuntu0.1+srt5_i386"; + sha256 = "18321skl4h2s3izzaaw1jk2blfq93ygk4b2f2g4mnkipn1i9rybx"; + url = "mirror://steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcursor1.deb"; }; } rec { - name = "libxdamage1_1.1.3-2build1+srt4_i386"; - sha256 = "0qysvz8hwcra2kr8sd9iyk1x73wawfnhsq5yspjphq08kg2k5gmq"; - url = "mirror://steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt4_i386.deb"; + name = "libxdamage1_1.1.3-2build1+srt5_i386"; + sha256 = "01pam4srj0d3vyrrhlsnfkznpxgil3p674i0armxqfydzh4bww8q"; + url = "mirror://steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxdamage1.deb"; }; } rec { - name = "libxdmcp6_1.1.0-4+srt4_i386"; - sha256 = "0hxixf0y2l3wc6flfg2gwlfc3fp40rg570lwkr0r6hwj1z0zwyf8"; - url = "mirror://steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt4_i386.deb"; + name = "libxdmcp6_1.1.0-4+srt5_i386"; + sha256 = "0vz6w11yld3ii0b3i68wwzx7qsgd64yj8709h32db08izc1a2wdh"; + url = "mirror://steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxdmcp6.deb"; }; } rec { - name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_i386"; - sha256 = "0s6jc1zw6n2m3bmis62pr3mkzd64migzrj5wcl9hmq5yrnc46shs"; - url = "mirror://steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_i386.deb"; + name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt2_i386"; + sha256 = "11jjds6qk9wvx446rph5n2qsr9b36jlr99ayw98zr89b3y6y8lyf"; + url = "mirror://steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxext6.deb"; }; } rec { - name = "libxfixes3_5.0-4ubuntu4.4+srt1_i386"; - sha256 = "0y5fb7nrnydlxbflhxqw065qz337m2i87sdn4730pd8y693sinyz"; - url = "mirror://steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt1_i386.deb"; + name = "libxfixes3_5.0-4ubuntu4.4+srt2_i386"; + sha256 = "19rm8s1dq7vysijlksbac04045x5j4g30s377im4ydljjh2vajh6"; + url = "mirror://steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxfixes3.deb"; }; } rec { - name = "libxft2_2.2.0-3ubuntu2+srt4_i386"; - sha256 = "087wclc31napmxc7l09gc73dgjczdkcyrld6zdcq6jq8jm1aq4vk"; - url = "mirror://steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt4_i386.deb"; + name = "libxft2_2.2.0-3ubuntu2+srt5_i386"; + sha256 = "0pcd8bvdlh41bixbdkrl0sm6libgns7ndjzyvj86s3qks7k11g97"; + url = "mirror://steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxft2.deb"; }; } rec { - name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt1_i386"; - sha256 = "0zx652d5gr6dvviwpn5v0mhd9812pcha7xs9z7il3s01d75qcysk"; - url = "mirror://steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt1_i386.deb"; + name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt2_i386"; + sha256 = "0pykpahh9j7cp91mbkqw22drl5npq3pbd712chbrmkdjdqm14x9p"; + url = "mirror://steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxi6.deb"; }; } rec { - name = "libxinerama1_1.1.1-3ubuntu0.1+srt4_i386"; - sha256 = "16dci5p6amsj1d474ih3avpjc1kc406wz6ywb9f6m44qrnm96w9m"; - url = "mirror://steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt4_i386.deb"; + name = "libxinerama1_1.1.1-3ubuntu0.1+srt5_i386"; + sha256 = "0xd0rfr6h25s3h6n8in5kby4fm88s1ykw2y8clymk79znmgby0av"; + url = "mirror://steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxinerama1.deb"; }; } rec { - name = "libxml2_2.7.8.dfsg-5.1ubuntu4.14+srt1_i386"; - sha256 = "0gld5pbh1qh93nafvw6fx319av0hpfxp54pg3w4svi1cg7hj9rk2"; - url = "mirror://steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.14+srt1_i386.deb"; + name = "libxml2_2.7.8.dfsg-5.1ubuntu4.17+srt1_i386"; + sha256 = "1ss7fpdqdgm8hmcgm1d59x5mfr4n7zps8bjg1304nn29a3cck26z"; + url = "mirror://steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.17+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxml2.deb"; }; } rec { - name = "libxmu6_1.1.0-3+srt4_i386"; - sha256 = "0vvxp9fr2rykqny2r1qz6h5vqw26zv5lkh9nyw8jvrv9gx01rma0"; - url = "mirror://steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt4_i386.deb"; + name = "libxmu6_1.1.0-3+srt5_i386"; + sha256 = "0z39zacqis2cq1gdwam1wk5xmisdhsrly7r1a8g5h8h6hbrri72w"; + url = "mirror://steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxmu6.deb"; }; } rec { - name = "libxpm4_3.5.9-4+srt4_i386"; - sha256 = "0s7pxkhfx84axldwpznv1wj9z05zm90fpp11702lm3qic6829sk1"; - url = "mirror://steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+srt4_i386.deb"; + name = "libxpm4_3.5.9-4+steamrt1.1ubuntu0.1+srt1_i386"; + sha256 = "02k70n6v245l0kqf7gjjv4bm12zmxcw8cayjv9xh8cp6svsxdzsq"; + url = "mirror://steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+steamrt1.1ubuntu0.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxpm4.deb"; }; } rec { - name = "libxrandr2_1.3.2-2ubuntu0.3+srt1_i386"; - sha256 = "08392ac5sqsdq4r4p8n88c3d2nn0078y510grdrxp9z006f89846"; - url = "mirror://steamrt/pool/main/libx/libxrandr/libxrandr2_1.3.2-2ubuntu0.3+srt1_i386.deb"; + name = "libxrandr2_1.5.0-1+srt1_i386"; + sha256 = "10nqrxs2dxs06wah8dy48v7v8vdllpg9wwhcn67i7dkgfli27ykj"; + url = "mirror://steamrt/pool/main/libx/libxrandr/libxrandr2_1.5.0-1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxrandr2.deb"; }; } rec { - name = "libxrender1_0.9.6-2ubuntu0.2+srt1_i386"; - sha256 = "08dj2kx2kr50jxcyfdj9y9gajkz1lnm6jn9z2pvqf43hzfa4pmp2"; - url = "mirror://steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt1_i386.deb"; + name = "libxrender1_0.9.6-2ubuntu0.2+srt2_i386"; + sha256 = "0i48bi4zfv90dgc190mr8wd8hymbhdldrk1q2qag0l9fmn5hkwqv"; + url = "mirror://steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxrender1.deb"; }; } rec { - name = "libxss1_1.2.1-2+srt4_i386"; - sha256 = "1zf5ifqq8s6xr3iiwhjk3g2ifrb9srwanffsdjab28jzfpsb4a9h"; - url = "mirror://steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt4_i386.deb"; + name = "libxss1_1.2.1-2+srt5_i386"; + sha256 = "015n1l1hl4vvgb53zx6gisl44p2pjj339adabqlfy1fqwjf0ff4z"; + url = "mirror://steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxss1.deb"; }; } rec { - name = "libxt6_1.1.1-2ubuntu0.1+srt4_i386"; - sha256 = "1f01dzslhcm0r89p6wzs1pv32gaqxhxs3jim4jbzrkv18d4pyyc6"; - url = "mirror://steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt4_i386.deb"; + name = "libxt6_1.1.1-2ubuntu0.1+srt5_i386"; + sha256 = "0yqb6j6rh9y65bfbqv1hrggl1719lsm6yzydbmpnilz15p3f4sa9"; + url = "mirror://steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxt6.deb"; }; } rec { - name = "libxtst6_1.2.0-4ubuntu0.1+srt4_i386"; - sha256 = "0w64xxfakharkmh0w9y6pg5446a7zypqhs3wgj6dbsa7clly8ir8"; - url = "mirror://steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt4_i386.deb"; + name = "libxtst6_1.2.0-4ubuntu0.1+srt5_i386"; + sha256 = "1h21nyc2bigm3brpzmdaafvry4wszmykbs13vagmibwhb6rls7xd"; + url = "mirror://steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxtst6.deb"; }; } rec { - name = "libxxf86vm1_1.1.1-2ubuntu0.1+srt4_i386"; - sha256 = "1xbxlzmhl8j64k2aayrmpdz9bxn7b6jirdk84qibwh96fna4gd2x"; - url = "mirror://steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt4_i386.deb"; + name = "libxxf86vm1_1.1.1-2ubuntu0.1+srt5_i386"; + sha256 = "133xi181g1pcd08px9yz7wqz93axy0cq9x5y76qp34dj7i9pscsg"; + url = "mirror://steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxxf86vm1.deb"; }; } rec { - name = "nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_i386"; - sha256 = "1m4r0mp1i44rlddjjrmmbqi1phg2ksdn5zb4bxjrf55m2zfkgkx3"; - url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_i386.deb"; + name = "nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt5_i386"; + sha256 = "0nvhk0xyi1cc12j2j97x763irk2d9l8n0p3fjyg7s3jgm4va3yjj"; + url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "nvidia-cg-toolkit.deb"; }; } rec { - name = "zenity_3.4.0-0ubuntu4+steamrt2+srt4_i386"; - sha256 = "162554nhfmpjyyf1pzc35gsbawz4f6n1bm4s8n0923g1hmafpf6g"; - url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt4_i386.deb"; + name = "zenity_3.4.0-0ubuntu4+steamrt2+srt5_i386"; + sha256 = "04j0mbdcv8891apw3lak161fbvpyl8qykvqvn6ljl3mimf3qabcd"; + url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "zenity.deb"; }; } rec { - name = "zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_i386"; - sha256 = "0gcw3qr6w418idwd69i12hjr90ixnab81d1p3wi7d0rwl1227ihv"; - url = "mirror://steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_i386.deb"; + name = "zlib1g_1.2.3.4.dfsg-3ubuntu4+srt6_i386"; + sha256 = "1qbqclnhhwfxj5ajsb05c3pg5iq5imf4pl6yisx5hw5jndgmzch7"; + url = "mirror://steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "zlib1g.deb"; diff --git a/pkgs/games/steam/update-runtime.py b/pkgs/games/steam/update-runtime.py index c225d6bf8adc..aed42cdd5668 100755 --- a/pkgs/games/steam/update-runtime.py +++ b/pkgs/games/steam/update-runtime.py @@ -1,5 +1,6 @@ -#!/usr/bin/env python2 -# +#! /usr/bin/env nix-shell +#! nix-shell -i python2 -p "with python2Packages; [python debian]" + # Script to build a Nix script to actually build a Steam runtime. # Patched version of https://github.com/ValveSoftware/steam-runtime/blob/master/build-runtime.py @@ -20,7 +21,7 @@ REPO="http://repo.steampowered.com/steamrt" DIST="scout" COMPONENT="main" -out = open("runtime-generated.nix", "w"); +out = open("runtime-generated.nix", "w") out.write("# This file is autogenerated! Do not edit it yourself, use update-runtime.py for regeneration.\n") out.write("{ fetchurl }:\n") out.write("\n") diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index 18db78d82ad5..45b2f79146c1 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { meta = { description = "An open-source, cycle-accurate Nintendo multi-system emulator"; longDescription = '' - Higan (formerly bsnes) is a multi-system game console emulator. + higan (formerly bsnes) is a multi-system game console emulator. It currently supports the following systems: - Nintendo's Famicom, Super Famicom (with subsystems: Super Game Boy, BS-X Satellaview, Sufami Turbo); diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix index 0fc86e096f3d..ca49fb7d8a45 100644 --- a/pkgs/misc/themes/arc/default.nix +++ b/pkgs/misc/themes/arc/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, sassc, autoreconfHook, pkgconfig, gtk3 -, gnome-themes-extra, gtk-engine-murrine, optipng, inkscape}: +{ stdenv, fetchFromGitHub, sassc, autoreconfHook, pkgconfig, gtk3, gnome3 +, gtk-engine-murrine, optipng, inkscape }: let pname = "arc-theme"; @@ -7,40 +7,45 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "20180715"; + version = "20181022"; src = fetchFromGitHub { owner = "NicoHood"; repo = pname; rev = version; - sha256 = "1kkfnkiih0i3pds5mgd1v9lrdrp4nh4hk42mw7sa4fpbjff4jh6j"; + sha256 = "08951dk1irfadwpr3p323a4fprmxg53rk2r2niwq3v62ryhi3663"; }; - preBuild = '' - # Shut up inkscape's warnings - export HOME="$NIX_BUILD_ROOT" - ''; + nativeBuildInputs = [ + autoreconfHook + pkgconfig + sassc + optipng + inkscape + gtk3 + gnome3.gnome-shell + ]; - nativeBuildInputs = [ autoreconfHook pkgconfig sassc optipng inkscape ]; - buildInputs = [ gtk3 ]; + propagatedUserEnvPkgs = [ + gnome3.gnome-themes-extra + gtk-engine-murrine + ]; - propagatedUserEnvPkgs = [ gnome-themes-extra gtk-engine-murrine ]; + enableParallelBuilding = true; postPatch = '' - find . -name render-assets.sh | - while read filename - do - substituteInPlace "$filename" \ - --replace "/usr/bin/inkscape" "${inkscape.out}/bin/inkscape" \ - --replace "/usr/bin/optipng" "${optipng.out}/bin/optipng" - done patchShebangs . ''; + preBuild = '' + # Shut up inkscape's warnings about creating profile directory + export HOME="$NIX_BUILD_ROOT" + ''; + configureFlags = [ "--disable-unity" ]; postInstall = '' - install -Dm644 -t $out/share/doc/${pname} AUTHORS *.md + install -Dm644 -t $out/share/doc/${pname} AUTHORS *.md ''; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/darwin/cf-private/default.nix b/pkgs/os-specific/darwin/cf-private/default.nix index 3fac20d23c78..dc1b0112a219 100644 --- a/pkgs/os-specific/darwin/cf-private/default.nix +++ b/pkgs/os-specific/darwin/cf-private/default.nix @@ -1,4 +1,4 @@ -{ CF, apple_sdk }: +{ CF, apple_sdk, osx_private_sdk }: # cf-private is a bit weird, but boils down to CF with a weird setup-hook that # makes a build link against the system CoreFoundation rather than our pure one. @@ -13,10 +13,10 @@ # because of their magic "toll-free bridging" support, the symbols for those types # live in CoreFoundation with an ObjC runtime. And because that isn't public, we have # this hack in place to let people link properly anyway. Phew! -# +# # This can be revisited if Apple ever decide to release the ObjC backend in a publicly # buildable form. -# +# # This doesn't really need to rebuild CF, but it's cheap, and adding a setup hook to # an existing package was annoying. We need a buildEnv that knows how to add those CF.overrideAttrs (orig: { @@ -38,22 +38,24 @@ CF.overrideAttrs (orig: { # this is watchman, who can almost certainly switch to the pure CF once the header # and functionality is merged in. installPhase = orig.installPhase + '' + # Copy or overwrite private headers, some of these might already + # exist in CF but the private versions have more information. basepath="Library/Frameworks/CoreFoundation.framework/Headers" - path="$basepath/CFFileDescriptor.h" + cp -Lfv --no-preserve mode ${osx_private_sdk}/include/CoreFoundationPrivateHeaders/* "$out/$basepath" # Append the include at top level or nobody will notice the header we're about to add sed -i '/CFNotificationCenter.h/a #include <CoreFoundation/CFFileDescriptor.h>' \ "$out/$basepath/CoreFoundation.h" - cp ${apple_sdk.frameworks.CoreFoundation}/$path $out/$path + cp ${apple_sdk.frameworks.CoreFoundation}/$basepath/CFFileDescriptor.h $out/$basepath/CFFileDescriptor.h '' + # This one is less likely to go away, but I'll mention it anyway. The issue is at # https://bugs.swift.org/browse/SR-8744, and the main user I know of is qtbase '' - path="$basepath/CFURLEnumerator.h" + path="$basepath/CFURLEnumerator.h" sed -i '/CFNotificationCenter.h/a #include <CoreFoundation/CFURLEnumerator.h>' \ "$out/$basepath/CoreFoundation.h" cp ${apple_sdk.frameworks.CoreFoundation}/$path $out/$path ''; -}) \ No newline at end of file +}) diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix new file mode 100644 index 000000000000..190c0ae22131 --- /dev/null +++ b/pkgs/os-specific/darwin/goku/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "goku-${version}"; + version = "0.1.11"; + + src = fetchurl { + url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku.tar.gz"; + sha256 = "49562342be114c2656726c5c697131acd286965ab3903a1a1e157cc689e20b15"; + }; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/bin + cp goku $out/bin + cp gokuw $out/bin + ''; + + meta = with stdenv.lib; { + description = "Karabiner configurator"; + homepage = https://github.com/yqrashawn/GokuRakuJoudo; + license = licenses.gpl3; + maintainers = [ maintainers.nikitavoloboev ]; + platforms = platforms.darwin; + }; +} diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix index 8faba250fb3e..14b10e6752bb 100644 --- a/pkgs/os-specific/linux/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-tools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "alsa-tools-${version}"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { url = "mirror://alsa/tools/${name}.tar.bz2"; - sha256 = "09rjb6hw1mn9y1jfdfj5djncgc2cr5wfps83k56rf6k4zg14v76n"; + sha256 = "1xjfghr9s0j6n91kgs95cc4r6qrjsgc4yj2w0nir3xpnm0l36950"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index 60e3b9750d71..c9cf12912670 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "alsa-utils-${version}"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { url = "mirror://alsa/utils/${name}.tar.bz2"; - sha256 = "0vnkyymgwj9rfdb11nvab30dnfrylmakdfildxl0y8mj836awp0m"; + sha256 = "02jlw6a22j2rr7inggfgk2hzx3w0fjhvhs0dn1afpzdp9aspzchx"; }; patchPhase = '' diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index 5943ced2f8f9..dfca87e27165 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -2,24 +2,24 @@ stdenv.mkDerivation rec { name = "hwdata-${version}"; - version = "0.314"; + version = "0.316"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - sha256 = "12k466ndg152fqld1w5v1zfdyv000yypazcwy75ywlxvlknv4y90"; + sha256 = "0k3fypykbq9943cnxlmmpk0xp9nhhf46pfdhkgm99iaa27b8s1gb"; }; preConfigure = "patchShebangs ./configure"; - configureFlags = [ "--datadir=$(prefix)/data" ]; + configureFlags = [ "--datadir=${placeholder "out"}/share" ]; doCheck = false; # this does build machine-specific checks (e.g. enumerates PCI bus) outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1w00y5kj8rd8slzydw1gw8cablxlkham4vq786kdd8zga286zabb"; + outputHash = "0g2w4jr4p1hykracp2za7jb0rcr51kks1m43pzcaf7g99x8669ww"; meta = { homepage = https://github.com/vcrhonek/hwdata; diff --git a/pkgs/os-specific/linux/libcgroup/default.nix b/pkgs/os-specific/linux/libcgroup/default.nix index a70ab13db623..1e920247a754 100644 --- a/pkgs/os-specific/linux/libcgroup/default.nix +++ b/pkgs/os-specific/linux/libcgroup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pam, yacc, flex }: +{ stdenv, fetchurl, fetchpatch, pam, yacc, flex }: stdenv.mkDerivation rec { name = "libcgroup-${version}"; @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { buildInputs = [ pam yacc flex ]; + patches = [ + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/libcgroup/files/libcgroup-0.41-remove-umask.patch?id=33e9f4c81de754bbf76b893ea1133ed023f2a0e5"; + sha256 = "1x0x29ld0cgmfwq4qy13s6d5c8sym1frfh1j2q47d8gfw6qaxka5"; + }) + ]; + postPatch = '' substituteInPlace src/tools/Makefile.in \ --replace 'chmod u+s' 'chmod +x' diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 52a5f16bc52c..c6c5f8436902 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -14,11 +14,11 @@ let ''; in stdenv.mkDerivation rec { - name = "mdadm-4.0"; + name = "mdadm-4.1"; src = fetchurl { url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.xz"; - sha256 = "1ad3mma641946wn5lsllwf0lifw9lps34fv1nnkhyfpd9krffshx"; + sha256 = "0jjgjgqijpdp7ijh8slzzjjw690kydb1jjadf0x5ilq85628hxmb"; }; # This is to avoid self-references, which causes the initrd to explode @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { description = "Programs for managing RAID arrays under Linux"; homepage = http://neil.brown.name/blog/mdadm; license = licenses.gpl2; + maintainers = with maintainers; [ ekleog ]; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/pkgs/os-specific/linux/open-isns/default.nix index c8b404c6be7f..21d32af3ba83 100644 --- a/pkgs/os-specific/linux/open-isns/default.nix +++ b/pkgs/os-specific/linux/open-isns/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "open-isns-${version}"; - version = "0.98"; + version = "0.99"; src = fetchFromGitHub { owner = "gonzoleeman"; repo = "open-isns"; rev = "v${version}"; - sha256 = "055gjwz5hxaj5jk23bf7dy9wbxk9m8cfgl1msbzjc60gr2mmcbdg"; + sha256 = "0m294aiv80rkihacw5094093pc0kd5bkbxqgs6i32jsglxy33hvf"; }; propagatedBuildInputs = [ openssl ]; diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index 657d6cc24a8d..8d53756d5101 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/bin/lsusb.py \ - --replace /usr/share/usb.ids ${hwdata}/data/hwdata/usb.ids + --replace /usr/share/usb.ids ${hwdata}/share/hwdata/usb.ids ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index 46a78e1c5bd5..b9c5951b0b29 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "atlassian-jira-${version}"; - version = "7.12.1"; + version = "7.12.3"; src = fetchurl { url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "0qk72dq53kk40m8rz7i3r45cgrka2s1682b8d3kzdmmhclnzbaym"; + sha256 = "0gna0pr8g78pahm4ci14742w40f0nwfn4hpm3iwbsiw2w6vziahv"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 44ae3b894d54..053fadc8af58 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "slurm-${version}"; - version = "18.08.1.1"; + version = "18.08.3.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${builtins.replaceStrings ["."] ["-"] name}"; - sha256 = "1yndxi11vj0di3yf6ky78zcnffk6d3676gf5y7jn7vwxxmzm4h5k"; + sha256 = "1dz5hgnlsld8b8vrbckk3mj7cqrv662wsp0s9z4x8wafygz3zx07"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index f1ee1eda95da..6ad3facc0711 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.80.3"; + version = "0.81.0"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; @@ -16,6 +16,7 @@ "alarm_control_panel.concord232" = ps: with ps; [ ]; "alarm_control_panel.demo" = ps: with ps; [ ]; "alarm_control_panel.egardia" = ps: with ps; [ ]; + "alarm_control_panel.elkm1" = ps: with ps; [ ]; "alarm_control_panel.envisalink" = ps: with ps; [ ]; "alarm_control_panel.homematicip_cloud" = ps: with ps; [ ]; "alarm_control_panel.ialarm" = ps: with ps; [ ]; @@ -54,6 +55,7 @@ "auth.mfa_setup_flow" = ps: with ps; [ ]; "automation" = ps: with ps; [ ]; "automation.event" = ps: with ps; [ ]; + "automation.geo_location" = ps: with ps; [ ]; "automation.homeassistant" = ps: with ps; [ ]; "automation.litejet" = ps: with ps; [ ]; "automation.mqtt" = ps: with ps; [ paho-mqtt ]; @@ -118,6 +120,7 @@ "binary_sensor.netatmo" = ps: with ps; [ ]; "binary_sensor.nx584" = ps: with ps; [ ]; "binary_sensor.octoprint" = ps: with ps; [ ]; + "binary_sensor.opentherm_gw" = ps: with ps; [ ]; "binary_sensor.openuv" = ps: with ps; [ ]; "binary_sensor.pilight" = ps: with ps; [ ]; "binary_sensor.ping" = ps: with ps; [ ]; @@ -128,6 +131,7 @@ "binary_sensor.random" = ps: with ps; [ ]; "binary_sensor.raspihats" = ps: with ps; [ ]; "binary_sensor.rest" = ps: with ps; [ ]; + "binary_sensor.rflink" = ps: with ps; [ ]; "binary_sensor.rfxtrx" = ps: with ps; [ ]; "binary_sensor.ring" = ps: with ps; [ ]; "binary_sensor.rpi_gpio" = ps: with ps; [ ]; @@ -209,8 +213,9 @@ "climate" = ps: with ps; [ ]; "climate.daikin" = ps: with ps; [ ]; "climate.demo" = ps: with ps; [ ]; + "climate.dyson" = ps: with ps; [ ]; "climate.ecobee" = ps: with ps; [ ]; - "climate.econet" = ps: with ps; [ ]; + "climate.elkm1" = ps: with ps; [ ]; "climate.ephember" = ps: with ps; [ ]; "climate.eq3btsmart" = ps: with ps; [ construct ]; "climate.evohome" = ps: with ps; [ ]; @@ -226,6 +231,7 @@ "climate.knx" = ps: with ps; [ ]; "climate.maxcube" = ps: with ps; [ ]; "climate.melissa" = ps: with ps; [ ]; + "climate.mill" = ps: with ps; [ ]; "climate.modbus" = ps: with ps; [ ]; "climate.mqtt" = ps: with ps; [ paho-mqtt ]; "climate.mysensors" = ps: with ps; [ ]; @@ -295,7 +301,6 @@ "cover.rflink" = ps: with ps; [ ]; "cover.rfxtrx" = ps: with ps; [ ]; "cover.rpi_gpio" = ps: with ps; [ ]; - "cover.ryobi_gdo" = ps: with ps; [ ]; "cover.scsgate" = ps: with ps; [ ]; "cover.tahoma" = ps: with ps; [ ]; "cover.tellduslive" = ps: with ps; [ ]; @@ -351,6 +356,7 @@ "device_tracker.owntracks" = ps: with ps; [ libnacl paho-mqtt ]; "device_tracker.owntracks_http" = ps: with ps; [ aiohttp-cors libnacl ]; "device_tracker.ping" = ps: with ps; [ ]; + "device_tracker.quantum_gateway" = ps: with ps; [ ]; "device_tracker.ritassist" = ps: with ps; [ ]; "device_tracker.sky_hub" = ps: with ps; [ ]; "device_tracker.snmp" = ps: with ps; [ pysnmp ]; @@ -383,6 +389,7 @@ "edp_redy" = ps: with ps; [ ]; "egardia" = ps: with ps; [ ]; "eight_sleep" = ps: with ps; [ ]; + "elkm1" = ps: with ps; [ ]; "emoncms_history" = ps: with ps; [ ]; "emulated_hue" = ps: with ps; [ aiohttp-cors ]; "emulated_hue.hue_api" = ps: with ps; [ ]; @@ -410,11 +417,12 @@ "foursquare" = ps: with ps; [ aiohttp-cors ]; "freedns" = ps: with ps; [ ]; "fritzbox" = ps: with ps; [ ]; - "frontend" = ps: with ps; [ aiohttp-cors ]; + "frontend" = ps: with ps; [ aiohttp-cors ruamel_yaml ]; "gc100" = ps: with ps; [ ]; "geo_location" = ps: with ps; [ ]; "geo_location.demo" = ps: with ps; [ ]; "geo_location.geo_json_events" = ps: with ps; [ ]; + "geo_location.nsw_rural_fire_service_feed" = ps: with ps; [ ]; "goalfeed" = ps: with ps; [ ]; "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ]; "google_assistant" = ps: with ps; [ aiohttp-cors ]; @@ -506,6 +514,7 @@ "knx" = ps: with ps; [ ]; "konnected" = ps: with ps; [ aiohttp-cors netdisco ]; "lametric" = ps: with ps; [ ]; + "lifx" = ps: with ps; [ ]; "light" = ps: with ps; [ ]; "light.abode" = ps: with ps; [ ]; "light.ads" = ps: with ps; [ ]; @@ -516,6 +525,7 @@ "light.decora" = ps: with ps; [ ]; "light.decora_wifi" = ps: with ps; [ ]; "light.demo" = ps: with ps; [ ]; + "light.elkm1" = ps: with ps; [ ]; "light.enocean" = ps: with ps; [ ]; "light.eufy" = ps: with ps; [ ]; "light.flux_led" = ps: with ps; [ ]; @@ -593,6 +603,7 @@ "lock.nello" = ps: with ps; [ ]; "lock.nuki" = ps: with ps; [ ]; "lock.sesame" = ps: with ps; [ ]; + "lock.template" = ps: with ps; [ ]; "lock.tesla" = ps: with ps; [ ]; "lock.vera" = ps: with ps; [ ]; "lock.verisure" = ps: with ps; [ ]; @@ -600,11 +611,11 @@ "lock.wink" = ps: with ps; [ ]; "lock.xiaomi_aqara" = ps: with ps; [ ]; "lock.zwave" = ps: with ps; [ ]; - "logbook" = ps: with ps; [ aiohttp-cors sqlalchemy ]; + "logbook" = ps: with ps; [ aiohttp-cors ruamel_yaml sqlalchemy ]; "logentries" = ps: with ps; [ ]; "logger" = ps: with ps; [ ]; "logi_circle" = ps: with ps; [ ]; - "lovelace" = ps: with ps; [ ]; + "lovelace" = ps: with ps; [ ruamel_yaml ]; "lutron" = ps: with ps; [ ]; "lutron_caseta" = ps: with ps; [ ]; "mailbox" = ps: with ps; [ aiohttp-cors ]; @@ -644,6 +655,7 @@ "media_player.itunes" = ps: with ps; [ ]; "media_player.kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket ]; "media_player.lg_netcast" = ps: with ps; [ ]; + "media_player.lg_soundbar" = ps: with ps; [ ]; "media_player.liveboxplaytv" = ps: with ps; [ ]; "media_player.mediaroom" = ps: with ps; [ ]; "media_player.monoprice" = ps: with ps; [ ]; @@ -727,7 +739,8 @@ "notify.group" = ps: with ps; [ ]; "notify.hangouts" = ps: with ps; [ ]; "notify.hipchat" = ps: with ps; [ ]; - "notify.html5" = ps: with ps; [ aiohttp-cors ]; + "notify.homematic" = ps: with ps; [ pyhomematic ]; + "notify.html5" = ps: with ps; [ aiohttp-cors ruamel_yaml ]; "notify.instapush" = ps: with ps; [ ]; "notify.ios" = ps: with ps; [ aiohttp-cors zeroconf ]; "notify.joaoapps_join" = ps: with ps; [ ]; @@ -764,7 +777,7 @@ "notify.twilio_sms" = ps: with ps; [ aiohttp-cors twilio ]; "notify.twitter" = ps: with ps; [ ]; "notify.webostv" = ps: with ps; [ ]; - "notify.xmpp" = ps: with ps; [ pyasn1-modules pyasn1 sleekxmpp ]; + "notify.xmpp" = ps: with ps; [ slixmpp ]; "notify.yessssms" = ps: with ps; [ ]; "nuheat" = ps: with ps; [ ]; "nuimo_controller" = ps: with ps; [ ]; @@ -772,11 +785,12 @@ "onboarding" = ps: with ps; [ aiohttp-cors ]; "onboarding.const" = ps: with ps; [ ]; "onboarding.views" = ps: with ps; [ ]; + "opentherm_gw" = ps: with ps; [ ]; "openuv" = ps: with ps; [ ]; "openuv.config_flow" = ps: with ps; [ ]; "openuv.const" = ps: with ps; [ ]; - "panel_custom" = ps: with ps; [ aiohttp-cors ]; - "panel_iframe" = ps: with ps; [ aiohttp-cors ]; + "panel_custom" = ps: with ps; [ aiohttp-cors ruamel_yaml ]; + "panel_iframe" = ps: with ps; [ aiohttp-cors ruamel_yaml ]; "persistent_notification" = ps: with ps; [ ]; "pilight" = ps: with ps; [ ]; "plant" = ps: with ps; [ ]; @@ -806,6 +820,7 @@ "rflink" = ps: with ps; [ ]; "rfxtrx" = ps: with ps; [ ]; "ring" = ps: with ps; [ ]; + "route53" = ps: with ps; [ boto3 ]; "rpi_gpio" = ps: with ps; [ ]; "rpi_pfio" = ps: with ps; [ ]; "rss_feed_template" = ps: with ps; [ aiohttp-cors ]; @@ -813,6 +828,7 @@ "satel_integra" = ps: with ps; [ ]; "scene" = ps: with ps; [ ]; "scene.deconz" = ps: with ps; [ ]; + "scene.elkm1" = ps: with ps; [ ]; "scene.homeassistant" = ps: with ps; [ ]; "scene.hunterdouglas_powerview" = ps: with ps; [ ]; "scene.knx" = ps: with ps; [ ]; @@ -889,6 +905,7 @@ "sensor.efergy" = ps: with ps; [ ]; "sensor.eight_sleep" = ps: with ps; [ ]; "sensor.eliqonline" = ps: with ps; [ ]; + "sensor.elkm1" = ps: with ps; [ ]; "sensor.emoncms" = ps: with ps; [ ]; "sensor.enocean" = ps: with ps; [ ]; "sensor.enphase_envoy" = ps: with ps; [ ]; @@ -992,6 +1009,7 @@ "sensor.openexchangerates" = ps: with ps; [ ]; "sensor.openhardwaremonitor" = ps: with ps; [ ]; "sensor.opensky" = ps: with ps; [ ]; + "sensor.opentherm_gw" = ps: with ps; [ ]; "sensor.openuv" = ps: with ps; [ ]; "sensor.openweathermap" = ps: with ps; [ pyowm ]; "sensor.otp" = ps: with ps; [ pyotp ]; @@ -1017,6 +1035,7 @@ "sensor.ring" = ps: with ps; [ ]; "sensor.ripple" = ps: with ps; [ ]; "sensor.rmvtransport" = ps: with ps; [ ]; + "sensor.rtorrent" = ps: with ps; [ ]; "sensor.sabnzbd" = ps: with ps; [ ]; "sensor.scrape" = ps: with ps; [ beautifulsoup4 ]; "sensor.season" = ps: with ps; [ ephem ]; @@ -1062,6 +1081,7 @@ "sensor.temper" = ps: with ps; [ ]; "sensor.template" = ps: with ps; [ ]; "sensor.tesla" = ps: with ps; [ ]; + "sensor.thermoworks_smoke" = ps: with ps; [ ]; "sensor.thethingsnetwork" = ps: with ps; [ ]; "sensor.thinkingcleaner" = ps: with ps; [ ]; "sensor.tibber" = ps: with ps; [ ]; @@ -1071,6 +1091,7 @@ "sensor.tradfri" = ps: with ps; [ ]; "sensor.trafikverket_weatherstation" = ps: with ps; [ ]; "sensor.transmission" = ps: with ps; [ transmissionrpc ]; + "sensor.transport_nsw" = ps: with ps; [ ]; "sensor.travisci" = ps: with ps; [ ]; "sensor.twitch" = ps: with ps; [ ]; "sensor.uber" = ps: with ps; [ ]; @@ -1116,10 +1137,16 @@ "shell_command" = ps: with ps; [ ]; "shiftr" = ps: with ps; [ paho-mqtt ]; "shopping_list" = ps: with ps; [ aiohttp-cors ]; + "simplisafe" = ps: with ps; [ ]; + "simplisafe.config_flow" = ps: with ps; [ ]; + "simplisafe.const" = ps: with ps; [ ]; "sisyphus" = ps: with ps; [ ]; "skybell" = ps: with ps; [ ]; "sleepiq" = ps: with ps; [ ]; "smappee" = ps: with ps; [ ]; + "smhi" = ps: with ps; [ ]; + "smhi.config_flow" = ps: with ps; [ ]; + "smhi.const" = ps: with ps; [ ]; "snips" = ps: with ps; [ paho-mqtt ]; "sonos" = ps: with ps; [ ]; "spaceapi" = ps: with ps; [ aiohttp-cors ]; @@ -1150,6 +1177,7 @@ "switch.doorbird" = ps: with ps; [ ]; "switch.edimax" = ps: with ps; [ ]; "switch.edp_redy" = ps: with ps; [ ]; + "switch.elkm1" = ps: with ps; [ ]; "switch.enocean" = ps: with ps; [ ]; "switch.eufy" = ps: with ps; [ ]; "switch.flux" = ps: with ps; [ ]; @@ -1190,6 +1218,7 @@ "switch.raincloud" = ps: with ps; [ ]; "switch.rainmachine" = ps: with ps; [ ]; "switch.raspihats" = ps: with ps; [ ]; + "switch.recswitch" = ps: with ps; [ ]; "switch.rest" = ps: with ps; [ ]; "switch.rflink" = ps: with ps; [ ]; "switch.rfxtrx" = ps: with ps; [ ]; @@ -1215,6 +1244,7 @@ "switch.tradfri" = ps: with ps; [ ]; "switch.transmission" = ps: with ps; [ transmissionrpc ]; "switch.tuya" = ps: with ps; [ ]; + "switch.unifi" = ps: with ps; [ ]; "switch.upcloud" = ps: with ps; [ ]; "switch.velbus" = ps: with ps; [ ]; "switch.vera" = ps: with ps; [ ]; @@ -1262,6 +1292,10 @@ "tts.yandextts" = ps: with ps; [ ]; "tuya" = ps: with ps; [ ]; "twilio" = ps: with ps; [ aiohttp-cors twilio ]; + "unifi" = ps: with ps; [ ]; + "unifi.const" = ps: with ps; [ ]; + "unifi.controller" = ps: with ps; [ ]; + "unifi.errors" = ps: with ps; [ ]; "upcloud" = ps: with ps; [ ]; "updater" = ps: with ps; [ distro ]; "upnp" = ps: with ps; [ aiohttp-cors ]; @@ -1284,6 +1318,10 @@ "volvooncall" = ps: with ps; [ ]; "vultr" = ps: with ps; [ vultr ]; "wake_on_lan" = ps: with ps; [ wakeonlan ]; + "water_heater" = ps: with ps; [ ]; + "water_heater.demo" = ps: with ps; [ ]; + "water_heater.econet" = ps: with ps; [ ]; + "water_heater.wink" = ps: with ps; [ ]; "waterfurnace" = ps: with ps; [ ]; "watson_iot" = ps: with ps; [ ]; "weather" = ps: with ps; [ ]; @@ -1296,6 +1334,7 @@ "weather.met" = ps: with ps; [ ]; "weather.metoffice" = ps: with ps; [ ]; "weather.openweathermap" = ps: with ps; [ pyowm ]; + "weather.smhi" = ps: with ps; [ ]; "weather.yweather" = ps: with ps; [ yahooweather ]; "weather.zamg" = ps: with ps; [ ]; "webhook" = ps: with ps; [ aiohttp-cors ]; @@ -1324,6 +1363,7 @@ "zone.zone" = ps: with ps; [ ]; "zoneminder" = ps: with ps; [ ]; "zwave" = ps: with ps; [ pydispatcher python_openzwave ]; + "zwave.config_flow" = ps: with ps; [ ]; "zwave.const" = ps: with ps; [ ]; "zwave.discovery_schemas" = ps: with ps; [ ]; "zwave.node_entity" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 8503b53033cf..48ad27c96199 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -22,6 +22,8 @@ let "51afec6ffa50a9da4cdef188971a802beb1ca8e8edb40fa429e5e529db3475fa") (mkOverride "astral" "1.6.1" "ab0c08f2467d35fcaeb7bad15274743d3ac1ad18b5391f64a0058a9cd192d37d") + (mkOverride "async-timeout" "3.0.1" + "0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f") (mkOverride "attrs" "18.2.0" "10cbf6e27dbce8c30807caf056c8eb50917e0eaafe86347671b57254006c3e69") (mkOverride "bcrypt" "3.1.4" @@ -77,7 +79,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.80.3"; + hassVersion = "0.81.0"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -92,7 +94,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "0fjkw8kg0vsyrkcrx9jhqrh5nzxx5wphj6zglqgai2d635m8j2dg"; + sha256 = "05cdx2pax7vx0v7arnciqrq38k2xyiv7iagxd3qs5m6gra72qlqw"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 25a63ef71a92..7bf1e6871411 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20181018.0"; + version = "20181026.0"; src = fetchPypi { inherit pname version; - sha256 = "83f52421056acda8297f174a7c4e3c540109673c2f2c25720638d171c6bc2653"; + sha256 = "fa877803ec7201a9b2129e96d6c19822cbcb28fa8ad5d422974bd3c872da1531"; }; propagatedBuildInputs = [ user-agents ]; diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 65679e4ac86e..9503fd14907c 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -13,11 +13,11 @@ assert enableWebDAV -> sqlite != null; assert enableWebDAV -> libuuid != null; stdenv.mkDerivation rec { - name = "lighttpd-1.4.50"; + name = "lighttpd-1.4.51"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz"; - sha256 = "1sr9avcnld22a5wl5s8vgrz8r86mybggm9z8zwabqz48v0986dr9"; + sha256 = "10lw9vvivpvf4aw7ajayb2yyq4lp4dq3gq9llszjbw6icnrgvy9a"; }; postPatch = '' diff --git a/pkgs/servers/mail/nullmailer/default.nix b/pkgs/servers/mail/nullmailer/default.nix index ab632372b464..4b753bdf0cdb 100644 --- a/pkgs/servers/mail/nullmailer/default.nix +++ b/pkgs/servers/mail/nullmailer/default.nix @@ -4,12 +4,12 @@ assert tls -> gnutls != null; stdenv.mkDerivation rec { - version = "2.1"; + version = "2.2"; name = "nullmailer-${version}"; src = fetchurl { url = "https://untroubled.org/nullmailer/nullmailer-${version}.tar.gz"; - sha256 = "0gykh0qc86rk0knfvp8ndqkryal3pvqdfdya94wvb6n1cc8p3ild"; + sha256 = "0md8cf90fl2yf3zh9njjy42a673v4j4ygyq95xg7fzkygdigm1lq"; }; buildInputs = stdenv.lib.optional tls gnutls; diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 60c517230b4f..d55804504442 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -1,43 +1,33 @@ { stdenv, lib, fetchurl, fetchpatch, autoconf, automake, libtool, bison -, libasr, libevent, zlib, openssl, db, pam - -# opensmtpd requires root for no reason to encrypt passwords, this patch fixes it -# see also https://github.com/OpenSMTPD/OpenSMTPD/issues/678 -, unpriviledged_smtpctl_encrypt ? true - -# Deprecated: use the subaddressing-delimiter in the config file going forward -, tag_char ? null +, libasr, libevent, zlib, libressl, db, pam }: -if (tag_char != null) -then throw "opensmtpd: the tag_char argument is deprecated as it can now be specified at runtime via the 'subaddressing-delimiter' option of the configuration file" -else stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "opensmtpd-${version}"; - version = "6.0.3p1"; + version = "6.4.0p1"; nativeBuildInputs = [ autoconf automake libtool bison ]; - buildInputs = [ libasr libevent zlib openssl db pam ]; + buildInputs = [ libasr libevent zlib libressl db pam ]; src = fetchurl { url = "https://www.opensmtpd.org/archives/${name}.tar.gz"; - sha256 = "291881862888655565e8bbe3cfb743310f5dc0edb6fd28a889a9a547ad767a81"; + sha256 = "1qxxhnlsmpfh9v4azgl0634955r085gsic1c66jdll21bd5w2mq8"; }; patches = [ ./proc_path.diff - (fetchpatch { - url = "https://github.com/OpenSMTPD/OpenSMTPD/commit/725ba4fa2ddf23bbcd1ff9ec92e86bbfaa6825c8.diff"; - sha256 = "19rla0b2r53jpdiz25fcza29c2msz6j6paivxhp9jcy1xl457dqa"; - }) + ./fix-build.diff # See https://github.com/OpenSMTPD/OpenSMTPD/pull/884 ]; - postPatch = with builtins; with lib; - optionalString unpriviledged_smtpctl_encrypt '' - substituteInPlace smtpd/smtpctl.c --replace \ - 'if (geteuid())' \ - 'if (geteuid() != 0 && !(argc > 1 && !strcmp(argv[1], "encrypt")))' - substituteInPlace mk/smtpctl/Makefile.in --replace "chmod 2555" "chmod 0555" - ''; + # See https://github.com/OpenSMTPD/OpenSMTPD/issues/885 for the `sh bootstrap` + # requirement + postPatch = '' + substituteInPlace smtpd/parse.y \ + --replace "/usr/libexec/" "$out/libexec/opensmtpd/" + substituteInPlace mk/smtpctl/Makefile.am --replace "chgrp" "true" + substituteInPlace mk/smtpctl/Makefile.am --replace "chmod 2555" "chmod 0555" + sh bootstrap + ''; configureFlags = [ "--sysconfdir=/etc" @@ -54,6 +44,9 @@ else stdenv.mkDerivation rec { "--with-table-db" ]; + # See https://github.com/OpenSMTPD/OpenSMTPD/pull/884 + makeFlags = [ "CFLAGS=-ffunction-sections" "LDFLAGS=-Wl,--gc-sections" ]; + installFlags = [ "sysconfdir=\${out}/etc" "localstatedir=\${TMPDIR}" @@ -67,6 +60,6 @@ else stdenv.mkDerivation rec { ''; license = licenses.isc; platforms = platforms.linux; - maintainers = with maintainers; [ rickynils obadz ]; + maintainers = with maintainers; [ rickynils obadz ekleog ]; }; } diff --git a/pkgs/servers/mail/opensmtpd/fix-build.diff b/pkgs/servers/mail/opensmtpd/fix-build.diff new file mode 100644 index 000000000000..1f995fd4f623 --- /dev/null +++ b/pkgs/servers/mail/opensmtpd/fix-build.diff @@ -0,0 +1,12 @@ +diff --git a/mk/smtpctl/Makefile.am b/mk/smtpctl/Makefile.am +index 5af0b713..f0fce735 100644 +--- a/mk/smtpctl/Makefile.am ++++ b/mk/smtpctl/Makefile.am +@@ -4,6 +4,7 @@ sbin_PROGRAMS= smtpctl + + smtpctl_SOURCES= $(smtpd_srcdir)/enqueue.c + smtpctl_SOURCES+= $(smtpd_srcdir)/parser.c ++smtpctl_SOURCES+= $(smtpd_srcdir)/config.c + smtpctl_SOURCES+= $(smtpd_srcdir)/log.c + smtpctl_SOURCES+= $(smtpd_srcdir)/envelope.c + smtpctl_SOURCES+= $(smtpd_srcdir)/queue_backend.c diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 02e14f3b5aca..b9dd07adde98 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -6,13 +6,13 @@ in stdenv.mkDerivation rec { name = "rspamd-${version}"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "vstakhov"; repo = "rspamd"; rev = version; - sha256 = "02q1id9kv5d6w1b1ifa2m6qrnbsja787dn0ywwi0yrsaqwk63wk7"; + sha256 = "1cgnychv8yz7a6mjg3b12nzs4gl0xqg9agl7m6faihnh7gqx4xld"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index b3a31d2d1ba1..70112732d273 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "5.3.1"; + version = "5.3.2"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,12 +9,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0k4jsqgk0wbp1xc159vrs855d42kcdc4d38v498imp6a90idniyp"; + sha256 = "1p2vapyaf11d7zri73vnq1rsgwb018pqbjzdkdgppcm5xfrrjh8y"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "133ckn5f4l6vqy65y1z3mzhzhy8xcyq65nqb34mwn2zsi7pzvssz"; + sha256 = "067rj2lrdwxda1clcg89m1cnl9sfrl2l9ia5fx2bcxq3yzhchazh"; }; postPatch = '' diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index bce69370d2bd..231124a42efb 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -1,36 +1,51 @@ -{ stdenv, fetchurl, openssl, libuuid, cmake, libwebsockets, c-ares, libuv }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, docbook_xsl, libxslt +, openssl, libuuid, libwebsockets, c-ares, libuv }: stdenv.mkDerivation rec { - pname = "mosquitto"; - version = "1.4.15"; + name = "mosquitto-${version}"; + version = "1.5.3"; - name = "${pname}-${version}"; - - src = fetchurl { - url = "http://mosquitto.org/files/source/mosquitto-${version}.tar.gz"; - sha256 = "10wsm1n4y61nz45zwk4zjhvrfd86r2cq33370m5wjkivb8j3wfvx"; + src = fetchFromGitHub { + owner = "eclipse"; + repo = "mosquitto"; + rev = "v${version}"; + sha256 = "0bknmnvssix7c1cps6mzjjnw9zxdlyfsy6ksqx4zfglcw41p8gnz"; }; - buildInputs = [ openssl libuuid libwebsockets c-ares libuv ] - ++ stdenv.lib.optional stdenv.isDarwin cmake; - - makeFlags = stdenv.lib.optionals stdenv.isLinux [ - "DESTDIR=$(out)" - "PREFIX=" + patches = [ + # https://github.com/eclipse/mosquitto/issues/983 + (fetchpatch { + url = "https://github.com/eclipse/mosquitto/commit/7f1419e4de981f5cc38aa3a9684369b1de27ba46.patch"; + sha256 = "05npr0h79mbaxzjyhdw78hi9gs1cwydf2fv67bqxm81jzj2yhx2s"; + name = "fix_threading_on_cmake.patch"; + }) ]; postPatch = '' - substituteInPlace config.mk \ - --replace "/usr/local" "" - substituteInPlace config.mk \ - --replace "WITH_WEBSOCKETS:=no" "WITH_WEBSOCKETS:=yes" + substituteInPlace man/manpage.xsl \ + --replace /usr/share/xml/docbook/stylesheet/ ${docbook_xsl}/share/xml/ + + # the manpages are not generated when using cmake + pushd man + make + popd ''; - meta = { - homepage = http://mosquitto.org/; + buildInputs = [ openssl libuuid libwebsockets c-ares libuv ]; + + nativeBuildInputs = [ cmake docbook_xsl libxslt ]; + + enableParallelBuilding = true; + + cmakeFlags = [ + "-DWITH_THREADING=ON" + ]; + + meta = with stdenv.lib; { description = "An open source MQTT v3.1/3.1.1 broker"; - platforms = stdenv.lib.platforms.unix; - # http://www.eclipse.org/legal/epl-v10.html (free software, copyleft) - license = stdenv.lib.licenses.epl10; + homepage = http://mosquitto.org/; + license = licenses.epl10; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index 9365612c14ed..0f20128678ce 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "neo4j-${version}"; - version = "3.4.8"; + version = "3.4.9"; src = fetchurl { url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz"; - sha256 = "1mdxqfy5xzc6944lg87975i9bfpqqx28xl8h70m4wn79x0qgby2v"; + sha256 = "0kg0dr42qi8cwg3i1hcgczd4psh97s54q5zd8z2wn1fqf4m2h597"; }; buildInputs = [ makeWrapper jre8 which gawk ]; diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index 723b4e4d8d3e..b5912dd9ab94 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -7,11 +7,11 @@ let self = stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.7.23"; + version = "5.7.24"; src = fetchurl { url = "mirror://mysql/MySQL-5.7/${name}.tar.gz"; - sha256 = "0rbc3xsc11lq2dm0ip6gxa16c06hi74scb97x5cw7yhbabaz4c07"; + sha256 = "11qz8cc4zyi7sxs66c5zlap6fd3vra1srwgzcxdzhz59qs90rgq5"; }; preConfigure = stdenv.lib.optional stdenv.isDarwin '' diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix index 615a199ddb53..aca5eb1f4ee7 100644 --- a/pkgs/servers/sql/postgresql/pgroonga/default.nix +++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pgroonga-${version}"; - version = "2.1.3"; + version = "2.1.6"; src = fetchurl { url = "https://packages.groonga.org/source/pgroonga/${name}.tar.gz"; - sha256 = "0qv82libl4rv6cq9klvzwx4g767mjl4jaap34sxbd3x0wvm364yd"; + sha256 = "1scybfmmlz5p4xgkhfx7pzdiqj5cd60kvbk8m4xa6k3avz0p1sw9"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 1fb8f4b1221b..474a5b65b306 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "matomo-${version}"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { # TODO: As soon as the tarballs are renamed as well on future releases, this should be enabled again # url = "https://builds.matomo.org/${name}.tar.gz"; url = "https://builds.matomo.org/piwik-${version}.tar.gz"; - sha256 = "1bkxa163s420w579ma7sbab1nm8c6ca6r6irn200j7p1r5zjklp8"; + sha256 = "0hddj1gyyriwgsh1mghihck2i7rj6gvb1i0b2ripcdfjnxcs47hz"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 58688590b84e..4772ac7f7ee2 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -2,10 +2,10 @@ stdenv, makeWrapper, lib, fetchurl, fetchpatch, automake, autoconf, libtool, intltool, mtdev, libevdev, libinput, - python, freetype, apple_sdk, tradcpp, fontconfig, mesa_drivers, + python, freetype, apple_sdk, tradcpp, fontconfig, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, mesa_noglu, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, - mcpp, epoxy, openssl, pkgconfig }: + mcpp, epoxy, openssl, pkgconfig, llvm_6 }: let inherit (stdenv) lib isDarwin; @@ -394,7 +394,7 @@ self: super: }); xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: { - buildInputs = attrs.buildInputs ++ [ mesa_drivers ]; # for libxatracker + buildInputs = attrs.buildInputs ++ [ mesa_noglu llvm_6 ]; # for libxatracker meta = attrs.meta // { platforms = ["i686-linux" "x86_64-linux"]; }; diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix index bf3d7773640e..92a6628dcdae 100644 --- a/pkgs/shells/zsh/antibody/default.nix +++ b/pkgs/shells/zsh/antibody/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "antibody-${version}"; - version = "3.7.0"; + version = "4.0.0"; rev = "v${version}"; goPackagePath = "github.com/getantibody/antibody"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "getantibody"; repo = "antibody"; - sha256 = "1c7f0b1lgl4pm3cs39kr6dgr19lfykjhamg74k5ryrizag0j68l5"; + sha256 = "0iq3dfwwh39hmk8qmhrfgkn8pcabxf67c03s7vh18n7w9aay4jfz"; }; goDeps = ./deps.nix; diff --git a/pkgs/shells/zsh/zsh-completions/default.nix b/pkgs/shells/zsh/zsh-completions/default.nix index ba65f90d909e..29a2a653265d 100644 --- a/pkgs/shells/zsh/zsh-completions/default.nix +++ b/pkgs/shells/zsh/zsh-completions/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zsh-completions-${version}"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "zsh-users"; repo = "zsh-completions"; rev = "${version}"; - sha256 = "02n1svaw74y0za856w8zjb98nzg1h6bmy4xsar71irsk1mj3m5h2"; + sha256 = "0a4fdh10rhhjcy06qiyyy0xjvg7fapvy3pgif38wrjqvrddaj6pv"; }; installPhase= '' diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index b96235341401..0c64cbefb3ed 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -1,22 +1,22 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub +{ lib, stdenv, rustPlatform, fetchFromGitLab , xlibsWrapper, xorg, libpulseaudio, pkgconfig, patchelf }: rustPlatform.buildRustPackage rec { name = "xidlehook-${version}"; - version = "0.4.9"; + version = "0.5.0"; doCheck = false; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "jD91mZM2"; repo = "xidlehook"; rev = version; - sha256 = "1l2kmymwxal9v5g3q21i985yc201dpybp85qfws2n5rzw8qpg1dw"; + sha256 = "1qrjwk91i31rww5lwgp84hc4h3b1prm60y45jm1f28g2bbv2qy19"; }; cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"]; - cargoSha256 = "1mrg59flmmqg5wwi2l8lw6p1xpgdw597fdfsmpn8b126rgzqmjl8"; + cargoSha256 = "1pdhbqnkgwp2v5zyin8z8049aq8c3kfk04v9wsbz8qla34rgi99s"; buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ]; nativeBuildInputs = [ pkgconfig patchelf ]; diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/pkgs/tools/misc/cloud-sql-proxy/default.nix index 5059b395610d..b9046bf19ca5 100644 --- a/pkgs/tools/misc/cloud-sql-proxy/default.nix +++ b/pkgs/tools/misc/cloud-sql-proxy/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "cloud-sql-proxy-${version}"; - version = "1.11"; + version = "1.13"; goPackagePath = "github.com/GoogleCloudPlatform/cloudsql-proxy"; @@ -11,7 +11,7 @@ buildGoPackage rec { src = fetchgit { rev = version; url = "https://${goPackagePath}"; - sha256 = "13g68i51f03xdh7a1qjmj8j5ljn4drd3n44fn348xfdxqclnx90l"; + sha256 = "07n2hfhqa9hinabmx79aqqwxzzkky76x3jvpd89kch14fijbh532"; }; goDeps = ./deps.nix; @@ -20,7 +20,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "An authenticating proxy for Second Generation Google Cloud SQL databases"; - homepage = https://github.com/GoogleCloudPlatform/cloudsql-proxy; + homepage = "https://${goPackagePath}"; license = licenses.asl20; maintainers = [ maintainers.nicknovitski ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/cloud-sql-proxy/deps.nix b/pkgs/tools/misc/cloud-sql-proxy/deps.nix index 7021b4b05b23..6898833b6f12 100644 --- a/pkgs/tools/misc/cloud-sql-proxy/deps.nix +++ b/pkgs/tools/misc/cloud-sql-proxy/deps.nix @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://code.googlesource.com/gocloud"; - rev = "e9284bade4f43071dac5ec56c73a03a3c9fa7772"; - sha256 = "0qm0s97bj21m04a07yni09hdh0aycgmklm5mg6flx17lrp2av9j8"; + rev = "dba8c2c195294739180b3e6865f8893eb808676e"; + sha256 = "1l6aj26sd7byjcgi2b4k452fcg949v28lff2fkw5nq2qr2fjnqxy"; }; } { @@ -23,8 +23,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "3a7846fea0afe8cc88deb31d8cfb1fa15a3615ef"; - sha256 = "1dxvliqc79bl0waczzy8ajm7jpbnn2bszwfcd71zjjxph8jz75kg"; + rev = "9b4f9f5ad5197c79fd623a3638e70d8b26cef344"; + sha256 = "06hvxy113h76f31gv1mq6vdr6xja1zv0fdig686l2b4y2b6swych"; }; } { @@ -32,8 +32,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/oauth2"; - rev = "cdc340f7c179dbbfa4afd43b7614e8fcadde4269"; - sha256 = "182is558nfvk4x1cm8sqzaym8kfcaaxaga9ggqhvzqrs8mncbj22"; + rev = "9dcd33a902f40452422c2367fefcb95b54f9f8f8"; + sha256 = "15lfa780h2ff50qvcdl7sfs9f9j13fa5kfj6fb292rk3fwxhnx4i"; }; } { @@ -41,8 +41,8 @@ fetch = { type = "git"; url = "https://code.googlesource.com/google-api-go-client"; - rev = "20530fd5d65ad2caee87891f9896d7547cb400c9"; - sha256 = "06fsnml2kfzifxp2d5anb6vxjlgpkwl82xcddf0cg0v1bnx5mnrd"; + rev = "39567f0042a03aeb2691599961ed4454e43d5063"; + sha256 = "0c5gx156v1pk0gqvl9w43l06z0rh9g2sackpl9ghds0asnyqx04d"; }; } ] diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index 3f476cfea941..a692933053df 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -25,10 +25,10 @@ in { aggregates = glPlugin rec { name = "graylog-aggregates-${version}"; pluginName = "graylog-plugin-aggregates"; - version = "2.0.0"; + version = "2.3.0"; src = fetchurl { url = "https://github.com/cvtienhoven/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "0crgb49msjkvfpksbfhq2hlkc904j184wm1wp6q0x6lzhn07hm8y"; + sha256 = "0yy455wyr01ci3nqvbhzxs6r4bb3xgac0xcmqaim1wsm1fdfi2ws"; }; meta = { homepage = https://github.com/cvtienhoven/graylog-plugin-aggregates; @@ -38,10 +38,10 @@ in { auth_sso = glPlugin rec { name = "graylog-auth-sso-${version}"; pluginName = "graylog-plugin-auth-sso"; - version = "2.3.0"; + version = "2.4.2"; src = fetchurl { url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "110ag10y0xyf3za6663vf68r5rwdi92315a37vysqvj00y7yak0l"; + sha256 = "0nwzw7ddq2psnvj8jwaxp9i080l7y2daxy198wzb62m7i1srzcp8"; }; meta = { homepage = https://github.com/Graylog2/graylog-plugin-auth-sso; @@ -51,10 +51,10 @@ in { dnsresolver = glPlugin rec { name = "graylog-dnsresolver-${version}"; pluginName = "graylog-plugin-dnsresolver"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "01s7wm6bwcpmdrl35gjp6rrqxixs2s9km2bdgzhv8pn25j5qnw28"; + sha256 = "0djlyd4w4mrrqfbrs20j1xw0fygqsb81snz437v9bf80avmcyzg1"; }; meta = { homepage = https://github.com/graylog-labs/graylog-plugin-dnsresolver; @@ -77,10 +77,10 @@ in { internal-logs = glPlugin rec { name = "graylog-internal-logs-${version}"; pluginName = "graylog-plugin-internal-logs"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "05r4m2gf1hj1b889rmpb6b5a6q2xd0qkl1rpj107yd219j2grzf4"; + sha256 = "1jyy0wkjapv3xv5q957xxv2pcnd4n1yivkvkvg6cx7kv1ip75xwc"; }; meta = { homepage = https://github.com/graylog-labs/graylog-plugin-internal-logs; @@ -103,10 +103,10 @@ in { jabber = glPlugin rec { name = "graylog-jabber-${version}"; pluginName = "graylog-plugin-jabber"; - version = "2.0.0"; + version = "2.4.0"; src = fetchurl { url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "1bqj5g9zjnw08bva7379c2ar3nhmyiilj7kjxd16qvfdn2674r5h"; + sha256 = "0zy27q8y0bv7i5nypsfxad4yiw121sbwzd194jsz2w08jhk3skl5"; }; meta = { homepage = https://github.com/graylog-labs/graylog-plugin-jabber; @@ -168,10 +168,10 @@ in { slack = glPlugin rec { name = "graylog-slack-${version}"; pluginName = "graylog-plugin-slack"; - version = "2.4.0"; + version = "3.1.0"; src = fetchurl { url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "0v8ilfhs8bnx87pjxg1i3p2vxw61rwpg4k3zhga7slavx70y986p"; + sha256 = "067p8g94b007gypwyyi8vb6qhwdanpk8ah57abik54vv14jxg94k"; }; meta = { homepage = https://github.com/graylog-labs/graylog-plugin-slack; diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix index 67f805988a3e..3de81d3bd052 100644 --- a/pkgs/tools/misc/powerline-rs/default.nix +++ b/pkgs/tools/misc/powerline-rs/default.nix @@ -1,25 +1,29 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, curl, cmake, openssl, libssh2, libgit2, libzip, Security }: +{ stdenv, lib, rustPlatform, fetchFromGitLab, pkgconfig, file, perl, curl, cmake, openssl, libssh2, libgit2, libzip, Security }: rustPlatform.buildRustPackage rec { pname = "powerline-rs"; name = "${pname}-${version}"; - version = "0.1.8"; + version = "0.1.9"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "jD91mZM2"; repo = "powerline-rs"; - rev = version; + #rev = version; - sha256 = "018i9qq98afbgv0nxs1n83zb09lqhqxpdrd95f2maic3rr5ngnj5"; + # Support for $COMPLETION_OUT: + rev = "44679385a95dd9f3ebd9b093f9ef8925610e9a23"; + + sha256 = "1mxkw6ydnqjyplbki2j9pbnlhxmkw9qqw54443a3cjmn2g08jyzp"; }; - cargoSha256 = "184s432a6damzvl0lv6jar1iml9dq60r190aqjy44lcg938981zc"; + cargoSha256 = "1sr9vbfk5bb3n0lv93y19in1clyvbj0w3p1gmp4sbw8lx84zwxhc"; nativeBuildInputs = [ pkgconfig file perl cmake curl ]; buildInputs = [ openssl libssh2 libgit2 libzip ] ++ lib.optional stdenv.isDarwin Security; + COMPLETION_OUT = "out"; postInstall = '' - install -Dm 755 "${pname}.bash" "$out/etc/bash_completion.d/${pname}" - install -Dm 755 "${pname}.fish" "$out/share/fish/vendor_completions.d/${pname}" + install -Dm 755 "${COMPLETION_OUT}/${pname}.bash" "$out/etc/bash_completion.d/${pname}" + install -Dm 755 "${COMPLETION_OUT}/${pname}.fish" "$out/share/fish/vendor_completions.d/${pname}" ''; meta = with lib; { diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index 563232dbe53d..80b66026848e 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -5,23 +5,15 @@ stdenv.mkDerivation rec { name = "snapper-${version}"; - version = "0.5.0"; + version = "0.7.2"; src = fetchFromGitHub { owner = "openSUSE"; repo = "snapper"; rev = "v${version}"; - sha256 = "14hrv23film4iihyclcvc2r2dgxl8w3as50r81xjjc85iyp6yxkm"; + sha256 = "1dm1kf4wrbcaaagxgbc8q0f5j9dq3bmp6ycl7zx8p70s4nv3xnbc"; }; - patches = [ - # Fix build with new Boost - (fetchpatch { - url = "https://github.com/openSUSE/snapper/commit/2e3812d2c1d1f54861fb79f5c2b0197de96a00a3.patch"; - sha256 = "0yrzss1v7lmcvkajmchz917yqsvlsdfz871szzw790v6pql1322s"; - }) - ]; - nativeBuildInputs = [ autoreconfHook pkgconfig docbook_xsl libxslt docbook_xml_dtd_45 diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix index 23e28c3c286a..fa208154eaa0 100644 --- a/pkgs/tools/misc/units/default.nix +++ b/pkgs/tools/misc/units/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "units-${version}"; - version = "2.17"; + version = "2.18"; src = fetchurl { url = "mirror://gnu/units/${name}.tar.gz"; - sha256 = "1n2xzpnxfn475zkd8rzs5gg58xszjbr4bdbgvk6hryzimvwwj0qz"; + sha256 = "0y26kj349i048y4z3xrk90bvciw2j6ds3rka7r7yn3183hirr5b4"; }; buildInputs = [ readline ]; diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index ab8d257d7c76..a0c44b0341c3 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -3,18 +3,18 @@ , autoreconfHook }: stdenv.mkDerivation rec { - name = "aircrack-ng-1.2"; + name = "aircrack-ng-1.4"; src = fetchurl { url = "https://download.aircrack-ng.org/${name}.tar.gz"; - sha256 = "0z7sl1ihgrnc98bpqa1mmkh51w26fnsanvj6ydwcnd8g83azwkvr"; + sha256 = "0fz1g6sd7dkfgcxrfrnqbygpx8d4ziyidm9wjb0ws9xgyy52l2cn"; }; nativeBuildInputs = [ pkgconfig makeWrapper autoreconfHook ]; buildInputs = [ libpcap openssl zlib libnl iw ethtool pciutils ]; patchPhase = '' - sed -e 's@/usr/local/bin@'${wirelesstools}@ -i src/osdep/linux.c + sed -e 's@/usr/local/bin@'${wirelesstools}@ -i src/aircrack-osdep/linux.c ''; postFixup = '' diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix index fda5d25aa17d..36bc2a9bc284 100644 --- a/pkgs/tools/networking/eternal-terminal/default.nix +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "eternal-terminal-${version}"; - version = "5.1.6"; + version = "5.1.7"; src = fetchFromGitHub { owner = "MisterTea"; repo = "EternalTCP"; rev = "refs/tags/et-v${version}"; - sha256 = "0df573c5hi3hxa0d3m02zf2iyh841540dklj9lmp6faik8cp39jz"; + sha256 = "17ndpkpyh8hwr6v7ac6029sja95nhn9c1g8r93g20rp0vz3r6lpa"; }; nativeBuildInputs = [ cmake ninja ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "Remote shell that automatically reconnects without interrupting the session"; license = licenses.asl20; homepage = https://mistertea.github.io/EternalTCP/; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.dezgeg ]; }; } diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 96bc2c56ece8..7aeae3ca9d12 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -13,39 +13,31 @@ let gssapiPatch = fetchpatch { name = "openssh-gssapi.patch"; url = "https://salsa.debian.org/ssh-team/openssh/raw/" - + "e395eed38096fcda74398424ea94de3ec44effd5" + + "d80ebbf028196b2478beebf5a290b97f35e1eed9" + "/debian/patches/gssapi.patch"; - sha256 = "0x7xysgdahb4jaq0f28g2d7yzp0d3mh59i4xnffszvjndhvbk27x"; + sha256 = "14j9cabb3gkhkjc641zbiv29mbvsmgsvis3fbj8ywsd21zc7m2wv"; }; in with stdenv.lib; stdenv.mkDerivation rec { name = "openssh-${version}"; - version = if hpnSupport then "7.7p1" else "7.7p1"; + version = if hpnSupport then "7.8p1" else "7.9p1"; src = if hpnSupport then fetchurl { - url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-7_7_P1.tar.gz"; - sha256 = "1l4k8mg3gnzxbz53cma8s6ak56waz03ijsr08p8vgpi0c2rc5ri5"; + url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-7_8_P1.tar.gz"; + sha256 = "05q5hxx7fzcgd8a5i0zk4fwvmnz4xqk04j489irnwm7cka7xdqxw"; } else fetchurl { url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz"; - sha256 = "13vbbrvj3mmfhj83qyrg5c0ipr6bzw5s65dy4k8gr7p9hkkfffyp"; + sha256 = "1b8sy6v0b8v4ggmknwcqx3y1rjcpsll0f1f8f4vyv11x4ni3njvb"; }; patches = [ - # Remove on update! - (fetchpatch { - name = "fix-tunnel-forwarding.diff"; - url = "https://github.com/openssh/openssh-portable/commit/cfb1d9bc767.diff"; - sha256 = "1mszj7f1kj6bazr7asbi1bi4238lfpilpp98f6c1dn3py4fbsdg8"; - }) - ./locale_archive.patch - ./fix-host-key-algorithms-plus.patch # See discussion in https://github.com/NixOS/nixpkgs/pull/16966 ./dont_create_privsep_path.patch diff --git a/pkgs/tools/networking/openssh/fix-host-key-algorithms-plus.patch b/pkgs/tools/networking/openssh/fix-host-key-algorithms-plus.patch deleted file mode 100644 index 02846e9bdad2..000000000000 --- a/pkgs/tools/networking/openssh/fix-host-key-algorithms-plus.patch +++ /dev/null @@ -1,52 +0,0 @@ -Specifying "HostKeyAlgorithms +ssh-dds" does not work properly because -setting any value for HostKeyAlgorithms causes the known host keys to -be ignored for the purpose of determining the priority of algorithms. -This was fixed upstream for HostKeyAlgorithms in sshd_config, but not -in ssh_config. The fix is to apply order_hostkeyalgs() if the user -specifies a HostKeyAlgorithms starting with "+". - -diff -ru -x '*~' openssh-7.2p2-orig/sshconnect2.c openssh-7.2p2/sshconnect2.c ---- openssh-7.2p2-orig/sshconnect2.c 2016-03-09 19:04:48.000000000 +0100 -+++ openssh-7.2p2/sshconnect2.c 2016-04-01 15:39:45.140945902 +0200 -@@ -100,7 +100,7 @@ - } - - static char * --order_hostkeyalgs(char *host, struct sockaddr *hostaddr, u_short port) -+order_hostkeyalgs(char *host, struct sockaddr *hostaddr, u_short port, char *algs) - { - char *oavail, *avail, *first, *last, *alg, *hostname, *ret; - size_t maxlen; -@@ -116,7 +116,7 @@ - for (i = 0; i < options.num_system_hostfiles; i++) - load_hostkeys(hostkeys, hostname, options.system_hostfiles[i]); - -- oavail = avail = xstrdup(KEX_DEFAULT_PK_ALG); -+ oavail = avail = xstrdup(algs); - maxlen = strlen(avail) + 1; - first = xmalloc(maxlen); - last = xmalloc(maxlen); -@@ -181,18 +181,21 @@ - myproposal[PROPOSAL_MAC_ALGS_CTOS] = - myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs; - if (options.hostkeyalgorithms != NULL) { -+ int append = options.hostkeyalgorithms[0] == '+'; - if (kex_assemble_names(KEX_DEFAULT_PK_ALG, - &options.hostkeyalgorithms) != 0) - fatal("%s: kex_assemble_namelist", __func__); - myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = -- compat_pkalg_proposal(options.hostkeyalgorithms); -+ compat_pkalg_proposal(append -+ ? order_hostkeyalgs(host, hostaddr, port, options.hostkeyalgorithms) -+ : options.hostkeyalgorithms); - } else { - /* Enforce default */ - options.hostkeyalgorithms = xstrdup(KEX_DEFAULT_PK_ALG); - /* Prefer algorithms that we already have keys for */ - myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = - compat_pkalg_proposal( -- order_hostkeyalgs(host, hostaddr, port)); -+ order_hostkeyalgs(host, hostaddr, port, KEX_DEFAULT_PK_ALG)); - } - - if (options.rekey_limit || options.rekey_interval) diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 850a33db58cf..c9de3f8ea574 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urlwatch-${version}"; - version = "2.14"; + version = "2.15"; src = fetchFromGitHub { owner = "thp"; repo = "urlwatch"; rev = version; - sha256 = "1m7qdh2lk5napncmfnk86dj4wqcahq8y24xnylxa4qlx2ivwkr6b"; + sha256 = "1bkd0r5arzdvinpn1n23cw1gf7byxml95hl6qvvf6mnggb1ifcwg"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index b11d149da889..f668998de7fd 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }: stdenv.mkDerivation rec { - version = "5.3.2"; + version = "5.4.0"; name = "whois-${version}"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "1sd6jl349kz3bjwm8rx9kihxyd3d35cac4swla843vwzdpczsk5f"; + sha256 = "1n90qpy079x97a27zpckc0vnaqrdjsxgy0hsz0z8gbrc1sy30sdz"; }; nativeBuildInputs = [ perl gettext pkgconfig ]; diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 33b62d1bb380..12e2deb74226 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "wireguard-tools-${version}"; - version = "0.0.20181007"; + version = "0.0.20181018"; src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "1nrhwnccs6sqq1qs7yhxqb989inrc9n2saibpqs6ga6gb0pvpac6"; + sha256 = "0vrr0f89nrpwnyia6kqvrjkxwivrnvjnbavmx2nxlrb3sz23481y"; }; sourceRoot = "source/src/tools"; diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix new file mode 100644 index 000000000000..d84a85071df7 --- /dev/null +++ b/pkgs/tools/nix/nixdoc/default.nix @@ -0,0 +1,25 @@ +{ stdenv, callPackage, fetchFromGitHub, rustPlatform, darwin }: + +rustPlatform.buildRustPackage rec { + name = "nixdoc-${version}"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "tazjin"; + repo = "nixdoc"; + rev = "v${version}"; + sha256 = "14d4dq06jdqazxvv7fq5872zy0capxyb0fdkp8qg06gxl1iw201s"; + }; + + buildInputs = stdenv.lib.optional stdenv.isDarwin [ darwin.Security ]; + + cargoSha256 = "1bfn1x1jhpyidai4cjwip5r1ibkqp26ivmqq3vjm71l00m6avb94"; + + meta = with stdenv.lib; { + description = "Generate documentation for Nix functions"; + homepage = https://github.com/tazjin/nixdoc; + license = [ licenses.gpl3 ]; + maintainers = [ maintainers.tazjin ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/package-management/apt-dater/default.nix b/pkgs/tools/package-management/apt-dater/default.nix new file mode 100644 index 000000000000..988147d7ab00 --- /dev/null +++ b/pkgs/tools/package-management/apt-dater/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub +, autoreconfHook, pkgconfig, gettext +, vim, glib, libxml2, openssl, ncurses, popt, screen +}: + +stdenv.mkDerivation rec { + name = "apt-dater-${version}"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "DE-IBH"; + repo = "apt-dater"; + rev = "v${version}"; + sha256 = "1flr6cm72cywmwp5h7pbmmpq057xsi9shkczyplxqaqrb2gns5fl"; + }; + + nativeBuildInputs = [ + pkgconfig autoreconfHook gettext + ]; + + buildInputs = [ + libxml2 ncurses vim glib popt screen + ]; + + configureFlags = [ "--disable-history" ]; + + prePatch = '' + substituteInPlace etc/Makefile.am \ + --replace 02770 0770 + ''; + + postPatch = '' + substituteInPlace configure.ac \ + --replace "/usr/bin/screen" "${screen}/bin/screen" + ''; + + doCheck = true; + + meta = with stdenv.lib; { + homepage = https://github.com/DE-IBH/apt-dater; + description = "Terminal-based remote package update manager"; + longDescription = '' + Provides an ncurses frontend for managing package updates on a large + number of remote hosts using SSH. It supports Debian-based managed hosts + as well as rug (e.g. openSUSE) and yum (e.g. CentOS) based systems. + ''; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ c0bw3b ]; + }; +} diff --git a/pkgs/tools/package-management/nix-review/default.nix b/pkgs/tools/package-management/nix-review/default.nix index da32aca28aac..f761c69e0264 100644 --- a/pkgs/tools/package-management/nix-review/default.nix +++ b/pkgs/tools/package-management/nix-review/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nix-review"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-review"; rev = version; - sha256 = "0csd7dkdv0csc63dz1h08c8xifxwv5fdz5dyk37sr6vh1ccjdapi"; + sha256 = "1391fs33jlg1pnfxpfhvry4sb4p4hy8gjpipnnxm8483f12b49km"; }; makeWrapperArgs = [ diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 975d36ddf190..030571d6a911 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -159,13 +159,13 @@ in rec { }; }; nixUnstable = (lib.lowPrio (common rec { - name = "nix-2.1${suffix}"; - suffix = "pre6377_954d1f4d"; + name = "nix-2.2${suffix}"; + suffix = "pre6520_18b4c53f"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "954d1f4d0a35063ff431b258beebadf753cb9efe"; - sha256 = "0wnljxljvcwmniydgxlsjqmbgghmljs75m6083y2nkjql7dnrm7g"; + rev = "18b4c53f71dfc626f5f5ffa0282afd1b9faad6a4"; + sha256 = "1hn7bjrf6x7024nald7nk1c9m8fyddkzhazl7pwf6ssmiv12apxh"; }; fromGit = true; })) // { perl-bindings = perl-bindings { diff --git a/pkgs/tools/security/paperkey/default.nix b/pkgs/tools/security/paperkey/default.nix index 44cee21bc497..03af1b8a101a 100644 --- a/pkgs/tools/security/paperkey/default.nix +++ b/pkgs/tools/security/paperkey/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "paperkey-${version}"; - version = "1.5"; + version = "1.6"; src = fetchurl { url = "http://www.jabberwocky.com/software/paperkey/${name}.tar.gz"; - sha256 = "1prd2jaf4zjad3xhv160hmi5n408ssljfg7iz90jxs9w111pjwy4"; + sha256 = "1xq5gni6gksjkd5avg0zpd73vsr97appksfx0gx2m38s4w9zsid2"; }; postPatch = '' diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix index d2326c7e8c38..86a5a1b7c396 100644 --- a/pkgs/tools/security/rng-tools/default.nix +++ b/pkgs/tools/security/rng-tools/default.nix @@ -1,24 +1,50 @@ -{ stdenv, fetchurl }: - +{ stdenv, fetchFromGitHub, libtool, autoconf, automake, pkgconfig +, sysfsutils + # WARNING: DO NOT USE BEACON GENERATED VALUES AS SECRET CRYPTOGRAPHIC KEYS + # https://www.nist.gov/programs-projects/nist-randomness-beacon +, curl ? null, libxml2 ? null, openssl ? null, withNistBeacon ? false + # Systems that support RDRAND but not AES-NI require libgcrypt to use RDRAND as an entropy source +, libgcrypt ? null, withGcrypt ? true + # Not sure if jitterentropy is safe to use for cryptography + # and thus a default entropy source +, jitterentropy ? null, withJitterEntropy ? false +}: +with stdenv.lib; stdenv.mkDerivation rec { - name = "rng-tools-5"; + name = "rng-tools-${version}"; + version = "6.6"; + + src = fetchFromGitHub { + owner = "nhorman"; + repo = "rng-tools"; + rev = "v${version}"; + sha256 = "0c32sxfvngdjzfmxn5ngc5yxwi8ij3yl216nhzyz9r31qi3m14v7"; + }; - src = fetchurl { - url = "mirror://sourceforge/gkernel/${name}.tar.gz"; + nativeBuildInputs = [ libtool autoconf automake pkgconfig ]; - sha256 = "13h7lc8wl9khhvkr0i3bl5j9bapf8anhqis1lcnwxg1vc2v058b0"; - }; + preConfigure = "./autogen.sh"; + + configureFlags = + optional (!withJitterEntropy) "--disable-jitterentropy" + ++ optional (!withNistBeacon) "--without-nistbeacon" + ++ optional (!withGcrypt) "--without-libgcrypt"; + + buildInputs = [ sysfsutils ] + ++ optional withJitterEntropy [ jitterentropy ] + ++ optional withGcrypt [ libgcrypt.dev ] + ++ optional withNistBeacon [ openssl.dev curl.dev libxml2.dev ]; + + enableParallelBuilding = true; # For cross-compilation makeFlags = [ "AR:=$(AR)" ]; meta = { description = "A random number generator daemon"; - - homepage = https://sourceforge.net/projects/gkernel; - - license = stdenv.lib.licenses.gpl2; - + homepage = https://github.com/nhorman/rng-tools; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ johnazoidberg ]; }; } diff --git a/pkgs/tools/security/signify/default.nix b/pkgs/tools/security/signify/default.nix new file mode 100644 index 000000000000..68db242f40af --- /dev/null +++ b/pkgs/tools/security/signify/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, libbsd, pkgconfig }: + +stdenv.mkDerivation rec { + name = "signify-${version}"; + version = "24"; + + src = fetchFromGitHub { + owner = "aperezdc"; + repo = "signify"; + rev = "v${version}"; + sha256 = "0grdlrpxcflzmzzc30r8rvsmamvbsgqyni59flzzk4w5hpjh464w"; + }; + + doCheck = true; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libbsd ]; + + preInstall = '' + export PREFIX=$out + ''; + + meta = with stdenv.lib; { + description = "OpenBSD signing tool"; + longDescription = '' + OpenBSDs signing tool, which uses the Ed25519 public key signature system + for fast signing and verification of messages using small public keys. + ''; + homepage = https://www.tedunangst.com/flak/post/signify; + license = licenses.isc; + maintainers = [ maintainers.rlupton20 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index f805670a5d5e..9492f2bb6eac 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -12,11 +12,11 @@ let in pythonPackages.buildPythonApplication rec { pname = "truffleHog"; - version = "2.0.91"; + version = "2.0.97"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0r4c9ihy6wjh5cwli7lb6cr2yfvxrh7r6cgznql1src5gzlnkymx"; + sha256 = "034kpv1p4m90286slvc6d4mlrzaf0b5jbd4qaj87hj65wbpcpg8r"; }; # Relax overly restricted version constraint diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix index e273b2c19091..460474a7bb3b 100644 --- a/pkgs/tools/security/yara/default.nix +++ b/pkgs/tools/security/yara/default.nix @@ -5,34 +5,16 @@ }: stdenv.mkDerivation rec { - version = "3.7.1"; + version = "3.8.1"; name = "yara-${version}"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara"; rev = "v${version}"; - sha256 = "05smkn4ii8irx6ccnzrhwa39pkmrjyxjmfrwh6mhdd8iz51v5cgz"; + sha256 = "1ys2y5f2cif3g42daq646jcrn2na19zkx7fds2gnavj5c1rk7463"; }; - # FIXME: this is probably not the right way to make it work - # make[2]: *** No rule to make target 'libyara/.libs/libyara.a', needed by 'yara'. Stop. - prePatch = '' - cat >staticlibrary.patch <<EOF - --- a/Makefile.am 2015-11-01 11:39:12.000000000 +0100 - +++ b/Makefile.am 2015-11-01 11:45:32.000000000 +0100 - @@ -12 +12 @@ - -yara_LDADD = libyara/.libs/libyara.a - +yara_LDADD = libyara/.libs/libyara${stdenv.hostPlatform.extensions.sharedLibrary} - @@ -15 +15 @@ - -yarac_LDADD = libyara/.libs/libyara.a - +yarac_LDADD = libyara/.libs/libyara${stdenv.hostPlatform.extensions.sharedLibrary} - EOF - ''; - patches = [ - "staticlibrary.patch" - ]; - buildInputs = [ autoconf automake libtool pcre] ++ stdenv.lib.optionals withCrypto [ openssl ] ++ stdenv.lib.optionals enableMagic [ file ] diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix index 8ffa85a5084a..8796de4e9e07 100644 --- a/pkgs/tools/system/fakeroot/default.nix +++ b/pkgs/tools/system/fakeroot/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, fetchpatch, getopt, libcap }: stdenv.mkDerivation rec { - version = "1.22"; + version = "1.23"; name = "fakeroot-${version}"; src = fetchurl { - url = "http://http.debian.net/debian/pool/main/f/fakeroot/fakeroot_${version}.orig.tar.bz2"; - sha256 = "1zn67sp066q63vx95r671v0ki878i40a2wa57pmh64k43r56m05x"; + url = "http://http.debian.net/debian/pool/main/f/fakeroot/fakeroot_${version}.orig.tar.xz"; + sha256 = "1xpl0s2yjyjwlf832b6kbkaa5921liybaar13k7n45ckd9lxd700"; }; patches = stdenv.lib.optional stdenv.isLinux ./einval.patch diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index 59ece285676c..4b2ad1f7ef96 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "hwinfo-${version}"; - version = "21.58"; + version = "21.60"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = "${version}"; - sha256 = "15gfgb711cs42nynmql2dyi8hs7f5wj3pcm75snnbz5arp8lx3j2"; + sha256 = "1agjc14m1814x897wkx484qb8llr395xlzn428f86sxgshicwfy3"; }; patchPhase = '' diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 5b8a9cd0aee5..1ce7e766a18e 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -11,11 +11,11 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "3.17.2"; + version = "3.18.1"; src = fetchurl { url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz"; - sha256 = "02y593ar1c4503ww7mhn0p5ajfl3q6769c6m311m6srwl5y1yq3k"; + sha256 = "1y1v16vvyirh0qv4wzczqp8d3llh6dl63lz3irwib1qhh7x56dyn"; }; nativeBuildInputs = [ pkgconfig which ]; diff --git a/pkgs/tools/text/icdiff/default.nix b/pkgs/tools/text/icdiff/default.nix index 949a9c89e9af..aec238cb4ccc 100644 --- a/pkgs/tools/text/icdiff/default.nix +++ b/pkgs/tools/text/icdiff/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { name = "icdiff-${version}"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "jeffkaufman"; repo = "icdiff"; rev = "release-${version}"; - sha256 = "10hv09sg7m8gzjf1v785kvim9ps81akzyx7ws6ypylyxc0l2fdcl"; + sha256 = "1micpm7kq9swfscmp4mg37fnzgzpsg7704yi33c5sd6cmgbdabxm"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix index a17c348c4cc1..3e0bee3b9b98 100644 --- a/pkgs/tools/text/miller/default.nix +++ b/pkgs/tools/text/miller/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "miller-${version}"; - version = "5.3.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "johnkerl"; repo = "miller"; rev = "${version}"; - sha256 = "0abw2n6mi4wbgwihcv3y2xccqx4sj0gdgwvdrg2jkcgraa78sw8v"; + sha256 = "0158by642frh9x6rrgqxwmk4766wb36kp0rrjg5swdbs9w3is3xg"; }; nativeBuildInputs = [ autoreconfHook flex libtool ]; diff --git a/pkgs/tools/typesetting/tikzit/default.nix b/pkgs/tools/typesetting/tikzit/default.nix new file mode 100644 index 000000000000..23d8093606be --- /dev/null +++ b/pkgs/tools/typesetting/tikzit/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, qmake, qttools, qtbase, flex, bison }: + +stdenv.mkDerivation rec { + name = "tikzit-${version}"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "tikzit"; + repo = "tikzit"; + rev = "v${version}"; + sha256 = "0fwxr9rc9vmw2jzpj084rygzyhp4xm3vm737668az600ln2scyad"; + }; + + nativeBuildInputs = [ qmake qttools flex bison ]; + buildInputs = [ qtbase ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A graphical tool for rapidly creating graphs and diagrams using PGF/TikZ"; + longDescription = '' + TikZiT is a simple GUI editor for graphs and string diagrams. + Its native file format is a subset of PGF/TikZ, which means TikZiT files + can be included directly in papers typeset using LaTeX. + ''; + homepage = https://tikzit.github.io/; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = [ maintainers.iblech maintainers.mgttlinger ]; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a0f611dd9611..444028d2db0d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -205,6 +205,7 @@ mapAliases ({ opencascade_oce = opencascade; # added 2018-04-25 opencl-icd = ocl-icd; # added 2017-01-20 openexr_ctl = ctl; # added 2018-04-25 + openjpeg_2_1 = openjpeg_2; # added 2018-10-25 openssh_with_kerberos = openssh; # added 2018-01-28 owncloudclient = owncloud-client; # added 2016-08 p11_kit = p11-kit; # added 2018-02-25 @@ -234,6 +235,7 @@ mapAliases ({ qwt6 = libsForQt5.qwt; # added 2015-12-19 rdiff_backup = rdiff-backup; # added 2014-11-23 rdmd = dtools; # added 2017-08-19 + rng_tools = rng-tools; # added 2018-10-24 robomongo = robo3t; #added 2017-09-28 rssglx = rss-glx; #added 2015-03-25 ruby_2_0_0 = throw "deprecated 2018-0213: use a newer version of ruby"; @@ -248,6 +250,7 @@ mapAliases ({ s6Networking = s6-networking; # added 2018-07-23 s6LinuxUtils = s6-linux-utils; # added 2018-07-23 s6PortableUtils = s6-portable-utils; # added 2018-07-23 + sagemath = sage; # added 2018-10-27 sam = deadpixi-sam; # added 2018-04-25 samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25 saneBackends = sane-backends; # added 2016-01-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45984c3e9678..22db74350736 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -635,6 +635,8 @@ with pkgs; stdenv = overrideCC stdenv gcc5; }; + apt-dater = callPackage ../tools/package-management/apt-dater { }; + autorevision = callPackage ../tools/misc/autorevision { }; bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { }; @@ -730,6 +732,8 @@ with pkgs; oracle-instantclient = callPackage ../development/libraries/oracle-instantclient { }; + goku = callPackage ../os-specific/darwin/goku { }; + kwakd = callPackage ../servers/kwakd { }; kwm = callPackage ../os-specific/darwin/kwm { }; @@ -977,6 +981,9 @@ with pkgs; bruteforce-luks = callPackage ../tools/security/bruteforce-luks { }; + breakpointHook = assert stdenv.isLinux; + makeSetupHook { } ../build-support/setup-hooks/breakpoint-hook.sh; + bsod = callPackage ../misc/emulators/bsod { }; btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; @@ -2546,6 +2553,8 @@ with pkgs; fdm = callPackage ../tools/networking/fdm {}; + featherpad = callPackage ../applications/editors/featherpad {}; + feedreader = callPackage ../applications/networking/feedreaders/feedreader {}; ferm = callPackage ../tools/networking/ferm { }; @@ -3459,6 +3468,8 @@ with pkgs; jira-cli = callPackage ../development/tools/jira_cli { }; + jitterentropy = callPackage ../development/libraries/jitterentropy { }; + jl = haskellPackages.callPackage ../development/tools/jl { }; jmespath = callPackage ../development/tools/jmespath { }; @@ -4510,6 +4521,10 @@ with pkgs; openssh_hpn = pkgs.appendToName "with-hpn" (openssh.override { hpnSupport = true; }); + openssh_gssapi = pkgs.appendToName "with-gssapi" (openssh.override { + withGssapiPatches = true; + }); + opensp = callPackage ../tools/text/sgml/opensp { }; opentracker = callPackage ../applications/networking/p2p/opentracker { }; @@ -4528,7 +4543,7 @@ with pkgs; opae = callPackage ../development/libraries/opae { }; - opentracing-cpp = callPackages ../development/libraries/opentracing-cpp { }; + opentracing-cpp = callPackage ../development/libraries/opentracing-cpp { }; openvswitch = callPackage ../os-specific/linux/openvswitch { }; @@ -5083,7 +5098,7 @@ with pkgs; inherit (pythonPackages) sphinx; }; - rng_tools = callPackage ../tools/security/rng-tools { }; + rng-tools = callPackage ../tools/security/rng-tools { }; rnv = callPackage ../tools/text/xml/rnv { }; @@ -5281,6 +5296,8 @@ with pkgs; signal-desktop = callPackage ../applications/networking/instant-messengers/signal-desktop { }; + signify = callPackage ../tools/security/signify { }; + # aka., pgp-tools signing-party = callPackage ../tools/security/signing-party { }; @@ -5628,6 +5645,8 @@ with pkgs; tie = callPackage ../development/tools/misc/tie { }; + tikzit = libsForQt5.callPackage ../tools/typesetting/tikzit { }; + tilix = callPackage ../applications/misc/tilix { }; tinc_pre = callPackage ../tools/networking/tinc/pre.nix { }; @@ -6412,6 +6431,23 @@ with pkgs; abcl = callPackage ../development/compilers/abcl {}; + adoptopenjdk-bin-11-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk11-linux.nix; + adoptopenjdk-bin-11-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk11-darwin.nix; + + adoptopenjdk-hotspot-bin-11 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-11-packages-linux.jdk-hotspot {} + else callPackage adoptopenjdk-bin-11-packages-darwin.jdk-hotspot {}; + adoptopenjdk-jre-hotspot-bin-11 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-11-packages-linux.jre-hotspot {} + else callPackage adoptopenjdk-bin-11-packages-darwin.jre-hotspot {}; + + # no OpenJ9 for Darwin + adoptopenjdk-openj9-bin-11 = callPackage adoptopenjdk-bin-11-packages-linux.jdk-openj9 {}; + adoptopenjdk-jre-openj9-bin-11 = callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {}; + + adoptopenjdk-bin = adoptopenjdk-hotspot-bin-11; + adoptopenjdk-jre-bin = adoptopenjdk-jre-hotspot-bin-11; + aldor = callPackage ../development/compilers/aldor { }; aliceml = callPackage ../development/compilers/aliceml { }; @@ -6454,6 +6490,8 @@ with pkgs; inherit (darwin) bootstrap_cmds; }; + cdb = callPackage ../development/tools/database/cdb { }; + chez = callPackage ../development/compilers/chez { inherit (darwin) cctools; }; @@ -6846,7 +6884,7 @@ with pkgs; cabal-install = haskell.lib.justStaticExecutables haskellPackages.cabal-install; - stack = haskell.lib.justStaticExecutables haskell.packages.ghc861.stack; + stack = haskell.lib.justStaticExecutables haskellPackages.stack; hlint = haskell.lib.justStaticExecutables haskellPackages.hlint; all-cabal-hashes = callPackage ../data/misc/hackage { }; @@ -6916,6 +6954,8 @@ with pkgs; go-repo-root = callPackage ../development/tools/go-repo-root { }; + go-junit-report = callPackage ../development/tools/go-junit-report { }; + gox = callPackage ../development/tools/gox { }; gprolog = callPackage ../development/compilers/gprolog { }; @@ -7203,16 +7243,6 @@ with pkgs; mono5 = mono58; mono4 = mono48; - mono40 = lowPrio (callPackage ../development/compilers/mono/4.0.nix { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) Foundation; - }); - - mono44 = lowPrio (callPackage ../development/compilers/mono/4.4.nix { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) Foundation; - }); - mono46 = lowPrio (callPackage ../development/compilers/mono/4.6.nix { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) Foundation; @@ -7312,15 +7342,17 @@ with pkgs; }; # For beta and nightly releases use the nixpkgs-mozilla overlay - rust = callPackage ../development/compilers/rust - (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' - }); + rust = callPackage ../development/compilers/rust ({ + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' + }); inherit (rust) cargo rustc; buildRustCrate = callPackage ../build-support/rust/build-rust-crate { }; + buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; buildRustCrateTests = recurseIntoAttrs (callPackage ../build-support/rust/build-rust-crate/test { }).tests; - + cratesIO = callPackage ../build-support/rust/crates-io.nix { }; cargo-vendor = callPackage ../build-support/rust/cargo-vendor { }; cargo-web = callPackage ../development/tools/cargo-web { @@ -7362,7 +7394,9 @@ with pkgs; rustracer = callPackage ../development/tools/rust/racer { }; rustracerd = callPackage ../development/tools/rust/racerd { }; rust-bindgen = callPackage ../development/tools/rust/bindgen { }; - rust-cbindgen = callPackage ../development/tools/rust/cbindgen { }; + rust-cbindgen = callPackage ../development/tools/rust/cbindgen { + inherit (darwin.apple_sdk.frameworks) Security; + }; rustup = callPackage ../development/tools/rust/rustup { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -7375,6 +7409,7 @@ with pkgs; scala_2_12 = callPackage ../development/compilers/scala { jre = jre8; }; scala = scala_2_12; + scalafix = callPackage ../development/tools/scalafix { }; scalafmt = callPackage ../development/tools/scalafmt { }; sdcc = callPackage ../development/compilers/sdcc { @@ -8578,6 +8613,8 @@ with pkgs; kcov = callPackage ../development/tools/analysis/kcov { }; + kind = callPackage ../development/tools/kind { }; + kube-aws = callPackage ../development/tools/kube-aws { }; kubectx = callPackage ../development/tools/kubectx { }; @@ -9822,9 +9859,7 @@ with pkgs; gnonlin = callPackage ../development/libraries/gstreamer/legacy/gnonlin {}; - gusb = callPackage ../development/libraries/gusb { - inherit (gnome2) gtkdoc; - }; + gusb = callPackage ../development/libraries/gusb { }; qt-mobility = callPackage ../development/libraries/qt-mobility {}; @@ -10570,6 +10605,8 @@ with pkgs; libsignal-protocol-c = callPackage ../development/libraries/libsignal-protocol-c { }; + libsignon-glib = callPackage ../development/libraries/libsignon-glib { }; + libsoundio = callPackage ../development/libraries/libsoundio { inherit (darwin.apple_sdk.frameworks) AudioUnit; }; @@ -11473,7 +11510,9 @@ with pkgs; }; libnghttp2 = nghttp2.lib; - nix-plugins = callPackage ../development/libraries/nix-plugins {}; + nix-plugins = callPackage ../development/libraries/nix-plugins { + nix = nixUnstable; + }; nlohmann_json = callPackage ../development/libraries/nlohmann_json { }; @@ -11583,8 +11622,8 @@ with pkgs; openh264 = callPackage ../development/libraries/openh264 { }; openjpeg_1 = callPackage ../development/libraries/openjpeg/1.x.nix { }; - openjpeg_2_1 = callPackage ../development/libraries/openjpeg/2.1.nix { }; - openjpeg = openjpeg_2_1; + openjpeg_2 = callPackage ../development/libraries/openjpeg/2.x.nix { }; + openjpeg = openjpeg_2; openpa = callPackage ../development/libraries/openpa { }; @@ -12692,6 +12731,7 @@ with pkgs; wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix { inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel; inherit (darwin.stubs) setfile rez derez; + inherit (darwin) cf-private; }; wxSVG = callPackage ../development/libraries/wxSVG { @@ -12828,6 +12868,17 @@ with pkgs; zziplib = callPackage ../development/libraries/zziplib { }; + gsignond = callPackage ../development/libraries/gsignond { + plugins = []; + }; + + gsignondPlugins = { + sasl = callPackage ../development/libraries/gsignond/plugins/sasl.nix { }; + oauth = callPackage ../development/libraries/gsignond/plugins/oauth.nix { }; + lastfm = callPackage ../development/libraries/gsignond/plugins/lastfm.nix { }; + mail = callPackages ../development/libraries/gsignond/plugins/mail.nix { }; + }; + ### DEVELOPMENT / LIBRARIES / AGDA agda = callPackage ../build-support/agda { @@ -15955,13 +16006,18 @@ with pkgs; bookworm = callPackage ../applications/office/bookworm { }; - chromium = callPackage ../applications/networking/browsers/chromium { + chromium = callPackage ../applications/networking/browsers/chromium ({ channel = "stable"; pulseSupport = config.pulseaudio or true; enablePepperFlash = config.chromium.enablePepperFlash or false; enableWideVine = config.chromium.enableWideVine or false; - gnome = gnome2; - }; + } // (if stdenv.isAarch64 then { + stdenv = gcc8Stdenv; + } else { + llvmPackages = llvmPackages_7; + stdenv = llvmPackages_7.stdenv; + }) + ); chronos = callPackage ../applications/networking/cluster/chronos { }; @@ -16008,6 +16064,8 @@ with pkgs; cni = callPackage ../applications/networking/cluster/cni {}; cni-plugins = callPackage ../applications/networking/cluster/cni/plugins.nix {}; + cntr = callPackage ../applications/virtualization/cntr { }; + communi = libsForQt5.callPackage ../applications/networking/irc/communi { }; confclerk = callPackage ../applications/misc/confclerk { }; @@ -16149,6 +16207,8 @@ with pkgs; inherit (python3Packages) buildPythonApplication requests; }; + dmrconfig = callPackage ../applications/misc/dmrconfig { }; + dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) { }; @@ -19105,6 +19165,8 @@ with pkgs; taskjuggler = callPackage ../applications/misc/taskjuggler { }; + tabula = callPackage ../applications/misc/tabula { }; + tasknc = callPackage ../applications/misc/tasknc { }; taskwarrior = callPackage ../applications/misc/taskwarrior { }; @@ -21135,7 +21197,7 @@ with pkgs; liblapackWithAtlas = liblapack; liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; - + lrs = callPackage ../development/libraries/science/math/lrs { }; m4ri = callPackage ../development/libraries/science/math/m4ri { }; @@ -21187,6 +21249,8 @@ with pkgs; nauty = callPackage ../applications/science/math/nauty {}; + or-tools = callPackage ../development/libraries/science/math/or-tools {}; + rubiks = callPackage ../development/libraries/science/math/rubiks { }; petsc = callPackage ../development/libraries/science/math/petsc { }; @@ -22084,6 +22148,8 @@ with pkgs; nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; }; + nixdoc = callPackage ../tools/nix/nixdoc {}; + nix-bundle = callPackage ../tools/package-management/nix-bundle { }; nix-delegate = haskell.lib.justStaticExecutables haskellPackages.nix-delegate; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 3bf7c31b7008..78ca0d20908d 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -31,7 +31,9 @@ in libcxxabi = pkgs.libcxxabi; }; - cf-private = callPackage ../os-specific/darwin/cf-private { inherit (darwin) CF apple_sdk; }; + cf-private = callPackage ../os-specific/darwin/cf-private { + inherit (darwin) CF apple_sdk osx_private_sdk; + }; DarwinTools = callPackage ../os-specific/darwin/DarwinTools { }; @@ -74,7 +76,7 @@ in CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { }; CF = callPackage ../os-specific/darwin/swift-corelibs/corefoundation.nix { inherit (darwin) objc4 ICU; }; - + # As the name says, this is broken, but I don't want to lose it since it's a direction we want to go in # libdispatch-broken = callPackage ../os-specific/darwin/swift-corelibs/libdispatch.nix { inherit (darwin) apple_sdk_sierra xnu; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 9f9bba933a17..62b773c51bf6 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1024,11 +1024,15 @@ let omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { }; - verasco = callPackage ../development/tools/analysis/verasco ( + verasco = callPackage ../development/tools/analysis/verasco (( if system == "x86_64-linux" then { tools = pkgs.pkgsi686Linux.stdenv.cc; } else {} - ); + ) // { + menhir = callPackage ../development/ocaml-modules/menhir { + version = "20170712"; + }; + }); google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6c5870b529c1..93aee66a567e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -204,6 +204,8 @@ in { automat = callPackage ../development/python-modules/automat { }; + awkward = callPackage ../development/python-modules/awkward { }; + aws-sam-translator = callPackage ../development/python-modules/aws-sam-translator { }; aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { }; @@ -250,6 +252,8 @@ in { bayespy = callPackage ../development/python-modules/bayespy { }; + bitarray = callPackage ../development/python-modules/bitarray { }; + bitcoinlib = callPackage ../development/python-modules/bitcoinlib { }; bitcoin-price-api = callPackage ../development/python-modules/bitcoin-price-api { }; @@ -594,6 +598,8 @@ in { python-prctl = callPackage ../development/python-modules/python-prctl { }; + python-rapidjson = callPackage ../development/python-modules/python-rapidjson { }; + python-sql = callPackage ../development/python-modules/python-sql { }; python-stdnum = callPackage ../development/python-modules/python-stdnum { }; @@ -2041,12 +2047,18 @@ in { django_colorful = callPackage ../development/python-modules/django_colorful { }; + django-cache-url = callPackage ../development/python-modules/django-cache-url { }; + + django-configurations = callPackage ../development/python-modules/django-configurations { }; + django_compressor = callPackage ../development/python-modules/django_compressor { }; django_compat = callPackage ../development/python-modules/django-compat { }; django_contrib_comments = callPackage ../development/python-modules/django_contrib_comments { }; + django-discover-runner = callPackage ../development/python-modules/django-discover-runner { }; + django_environ = callPackage ../development/python-modules/django_environ { }; django_evolution = callPackage ../development/python-modules/django_evolution { }; @@ -2120,6 +2132,10 @@ in { dj-database-url = callPackage ../development/python-modules/dj-database-url { }; + dj-email-url = callPackage ../development/python-modules/dj-email-url { }; + + dj-search-url = callPackage ../development/python-modules/dj-search-url { }; + djmail = callPackage ../development/python-modules/djmail { }; pillowfight = callPackage ../development/python-modules/pillowfight { }; @@ -2462,6 +2478,8 @@ in { icalendar = callPackage ../development/python-modules/icalendar { }; + ifaddr = callPackage ../development/python-modules/ifaddr { }; + imageio = callPackage ../development/python-modules/imageio { }; imgaug = callPackage ../development/python-modules/imgaug { }; @@ -6829,24 +6847,7 @@ in { subprocess32 = callPackage ../development/python-modules/subprocess32 { }; - spark_parser = buildPythonPackage (rec { - name = "${pname}-${version}"; - pname = "spark_parser"; - version = "1.4.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/s/${pname}/${name}.tar.gz"; - sha256 = "1r7d07kw4asgajvhq1gzln4g1qi2r13jw0s8c7d5z3g4kp8y0br8"; - }; - buildInputs = with self; [nose]; - propagatedBuildInputs = []; - meta = { - description = ''An Early-Algorithm Context-free grammar Parser''; - homepage = "https://github.com/rocky/python-spark"; - license = licenses.mit; - maintainers = with maintainers; [raskin]; - platforms = platforms.all; - }; - }); + spark_parser = callPackage ../development/python-modules/spark_parser { }; sphinx = callPackage ../development/python-modules/sphinx { }; @@ -7948,6 +7949,8 @@ in { uproot = callPackage ../development/python-modules/uproot {}; + uproot-methods = callPackage ../development/python-modules/uproot-methods { }; + uptime = buildPythonPackage rec { name = "uptime-${version}"; version = "3.0.1"; |