diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-03 16:24:30 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-03 16:35:36 -0400 |
| commit | cf06e42d1cad2732ca23264dee19bbc0d7172b3b (patch) | |
| tree | 624d0854c8f07c4d3ba2eb28590076b0486684a3 /pkgs | |
| parent | cbe21ac614285160a18fe21b8a804f3a2f80c51b (diff) | |
| parent | b45ef79b74d267891a11c1775a473c610ecebe78 (diff) | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs')
194 files changed, 1817 insertions, 1485 deletions
diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index 4c9540607eb..31369bd1e63 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -1,9 +1,8 @@ { stdenv, fetchurl -, pkgconfig, cmake -, docbook_xml_dtd_45, docbook_xsl, libxslt -, python, ffmpeg, mp4v2, flac, libogg, libvorbis -, phonon, automoc4, chromaprint, id3lib, taglib -, qt, zlib, readline +, pkgconfig, cmake, python, ffmpeg, phonon, automoc4 +, chromaprint, docbook_xml_dtd_45, docbook_xsl, libxslt +, id3lib, taglib, mp4v2, flac, libogg, libvorbis +, zlib, readline , qtbase, qttools, qtmultimedia, qtquickcontrols , makeWrapper }: @@ -18,9 +17,10 @@ stdenv.mkDerivation rec { }; buildInputs = with stdenv.lib; - [ pkgconfig cmake python ffmpeg docbook_xml_dtd_45 docbook_xsl libxslt - phonon automoc4 chromaprint id3lib taglib mp4v2 flac libogg libvorbis - qt zlib readline makeWrapper ]; + [ pkgconfig cmake python ffmpeg phonon automoc4 + chromaprint docbook_xml_dtd_45 docbook_xsl libxslt + id3lib taglib mp4v2 flac libogg libvorbis zlib readline + qtbase qttools qtmultimedia qtquickcontrols makeWrapper ]; cmakeFlags = [ "-DWITH_APPS=Qt;CLI" ]; NIX_LDFLAGS = "-lm -lpthread"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapProgram $out/bin/kid3-qt --prefix QT_PLUGIN_PATH : $out/lib/qt4/plugins + wrapProgram $out/bin/kid3-qt --prefix QT_PLUGIN_PATH : $out/lib/qt5/plugins ''; enableParallelBuilding = true; @@ -73,4 +73,3 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } -# TODO: Qt5 support - not so urgent! diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 32481873669..1a4f2bdd1b5 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -2,8 +2,6 @@ , glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng, GConf , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome2 }: -assert stdenv.system == "x86_64-linux"; - let # Please update the stable branch! # Latest version number can be found at: diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index aedfb1fec3d..98172ce1905 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -3,8 +3,6 @@ , androidsdk, jdk, cmake, libxml2, zlib, python3, ncurses }: -assert stdenv.isLinux; - with stdenv.lib; let @@ -239,12 +237,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2018.1.1"; /* updated by script */ + version = "2018.1.2"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "170xgm3dzakvlwxx5kpy4zilq140kzcaxx9g3dm1w0i83g4l5j48"; /* updated by script */ + sha256 = "158ydbr0bbzm1nqi4xhrcp6bwk7kmiw78v959h7bxg3y7z55hbwa"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -252,25 +250,25 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2017.3.7"; /* updated by script */ + version = "2018.1.2"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "1pmkv1yd8xwqa4kdffg0vvk3whmnvrs9js7vnq4ilm39zzksqmpa"; /* updated by script */ + sha256 = "12rihb1ppl4i1i0j3yj4ih4qx3xf30kfx022pbvng1rjy0bpikp7"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; - update-channel = "datagrip_2017_3"; + update-channel = "datagrip_2018_1"; }; goland = buildGoland rec { name = "goland-${version}"; - version = "2018.1.1"; /* updated by script */ + version = "2018.1.2"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "11bkbh661fpypr1v89xba4nmf02l4map9jdlj2ky6d77l9295ip3"; /* updated by script */ + sha256 = "1qhhxarvw6mzavyzackzkbq52yfr5437gljxdvlbr6rpi99hgfzb"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "goland_release"; @@ -304,25 +302,25 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2017.3.6"; /* updated by script */ + version = "2018.1.2"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "00g86fggh8wfm02k9wwn33yqmbfr2b1x3vnvyn9gdpycdk46lqgw"; /* updated by script */ + sha256 = "13si8g7n1qvjm5ivbrazsbqlvwwlg65nia78k74nkaqp704z92cs"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; - update-channel = "PS2017.3"; + update-channel = "PS2018.1"; }; pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2018.1.1"; /* updated by script */ + version = "2018.1.2"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1s26jczag12p3v3r6fdk02mmg55npzn0mzkmgcvh40fr7q7mq2pr"; /* updated by script */ + sha256 = "1phxzsz2qnyk0b0kkccsgjkxx4ak7rbm68k1lpgr59rwyxqnazy3"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm_Release"; @@ -330,12 +328,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2018.1.1"; /* updated by script */ + version = "2018.1.2"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0k7529xhhnvjz7ycs5ab4qc4cr35g1v2qxlswy1aqcgzh2zg4c85"; /* updated by script */ + sha256 = "08cfmrrmxs67dc61cvjc0ynzng0hnr2i78fv3m888k4x63cy6mv5"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm_Release"; @@ -356,15 +354,15 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2017.3.4"; /* updated by script */ + version = "2018.1.1"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "094m45jhrh4n64q5lrgfyvrimqjll6kcl2cx3cbsa3pp7x16abqn"; /* updated by script */ + sha256 = "1nh2m10ikwl85n66aspkmgxmbk98amhlgj2xl2sasjfwn5pn1wmf"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; - update-channel = "rm2017.3"; + update-channel = "rm2018.1"; }; webstorm = buildWebStorm rec { diff --git a/pkgs/applications/editors/sublime/2/default.nix b/pkgs/applications/editors/sublime/2/default.nix index 9cf5bd97d0a..78c2d9aaa0c 100644 --- a/pkgs/applications/editors/sublime/2/default.nix +++ b/pkgs/applications/editors/sublime/2/default.nix @@ -2,11 +2,10 @@ let libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo]; in -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { name = "sublimetext-2.0.2"; - src = + src = if stdenv.system == "i686-linux" then fetchurl { name = "sublimetext-2.0.2.tar.bz2"; @@ -55,5 +54,6 @@ stdenv.mkDerivation rec { meta = { description = "Sophisticated text editor for code, markup and prose"; license = stdenv.lib.licenses.unfree; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix index 7185a82a960..628993dbf5b 100644 --- a/pkgs/applications/editors/sublime/3/common.nix +++ b/pkgs/applications/editors/sublime/3/common.nix @@ -4,7 +4,6 @@ pkexecPath ? "/run/wrappers/bin/pkexec", libredirect, gksuSupport ? false, gksu, unzip, zip, bash}: -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; assert gksuSupport -> gksu != null; let @@ -114,6 +113,6 @@ in stdenv.mkDerivation (rec { homepage = https://www.sublimetext.com/; maintainers = with maintainers; [ wmertens demin-dmitriy zimbatm ]; license = licenses.unfree; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; }; }) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 410c74ac6cf..65a3238ef57 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.7-27"; - sha256 = "04v7m1s2a89xi57fpxbq30hzxqg3fawr3lms6wfmaq4j2ax0qw6k"; + version = "7.0.7-29"; + sha256 = "0jfpfydz50zxs776knz6w2f5g0l4nhivp9g1fz4cf5clgjcpa3z6"; patches = []; }; in diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix index 9ab43ff9433..b604099096f 100644 --- a/pkgs/applications/graphics/draftsight/default.nix +++ b/pkgs/applications/graphics/draftsight/default.nix @@ -4,8 +4,6 @@ libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE, libXrender, libXcomposite }: -assert stdenv.system == "x86_64-linux"; - let version = "2017-SP2"; in stdenv.mkDerivation { name = "draftsight-${version}"; @@ -71,6 +69,6 @@ stdenv.mkDerivation { homepage = https://www.3ds.com/products-services/draftsight-cad-software/; license = stdenv.lib.licenses.unfree; maintainers = with maintainers; [ hodapp ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix new file mode 100644 index 00000000000..2ac335759ce --- /dev/null +++ b/pkgs/applications/misc/cointop/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildGoPackage, fetchgit }: + +buildGoPackage rec { + name = "cointop-unstable-${version}"; + version = "2018-05-03"; + rev = "08acd96082682347d458cd4f861e2debd3255745"; + + goPackagePath = "github.com/miguelmota/cointop"; + + src = fetchgit { + inherit rev; + url = "https://github.com/miguelmota/cointop"; + sha256 = "14savz48wzrfpm12fgnnndpl3mpzx7wsch4jrnm3rmrfdabdx7mi"; + }; + + goDeps = ./deps.nix; + + meta = { + description = "The fastest and most interactive terminal based UI application for tracking cryptocurrencies"; + longDescription = '' + cointop is a fast and lightweight interactive terminal based UI application + for tracking and monitoring cryptocurrency coin stats in real-time. + + The interface is inspired by htop and shortcut keys are inspired by vim. + ''; + homepage = https://cointop.sh; + platforms = stdenv.lib.platforms.linux; # cannot test others + maintainers = [ ]; + }; +} diff --git a/pkgs/applications/misc/cointop/deps.nix b/pkgs/applications/misc/cointop/deps.nix new file mode 100644 index 00000000000..3ba1d12a804 --- /dev/null +++ b/pkgs/applications/misc/cointop/deps.nix @@ -0,0 +1,3 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ +] diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index 7852e6eb790..45c44880462 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -5,11 +5,11 @@ python3Packages.buildPythonApplication rec { name = "electrum-ltc-${version}"; - version = "3.1.2.1"; + version = "3.1.3.1"; src = fetchurl { url = "https://electrum-ltc.org/download/Electrum-LTC-${version}.tar.gz"; - sha256 = "0sdql4k8g3py941rzdskm3k4hkwam4hzvg4qlvs0b5pw139mri86"; + sha256 = "0kxcx1xf6h9z8x0k483d6ykpnmfr30n6z3r6lgqxvbl42pq75li7"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index ebc13766ccc..638765840cb 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, patchelf, makeWrapper, xorg, gcc, gcc-unwrapped }: -assert stdenv.isLinux; - stdenv.mkDerivation rec { name = "IPMIView-${version}"; version = "2.13.0"; diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock index f231df3d8e7..a0b1916fb18 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -13,17 +13,17 @@ GEM em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) - eventmachine (1.2.5) + eventmachine (1.2.6) ffi (1.9.23) forwardable-extended (2.6.0) gemoji (3.0.0) - html-pipeline (2.7.1) + html-pipeline (2.7.2) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.8.0) + jekyll (3.8.1) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -38,8 +38,7 @@ GEM safe_yaml (~> 1.0) jekyll-avatar (0.6.0) jekyll (~> 3.0) - jekyll-mentions (1.3.0) - activesupport (~> 4.0) + jekyll-mentions (1.4.0) html-pipeline (~> 2.3) jekyll (~> 3.0) jekyll-sass-converter (1.5.2) @@ -50,8 +49,7 @@ GEM jekyll (~> 3.3) jekyll-watch (2.0.0) listen (~> 3.0) - jemoji (0.9.0) - activesupport (~> 4.0, >= 4.2.9) + jemoji (0.10.0) gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (~> 3.0) diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix index 7c6ac55c201..c93f93f457d 100644 --- a/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -45,10 +45,10 @@ eventmachine = { source = { remotes = ["https://rubygems.org"]; - sha256 = "075hdw0fgzldgss3xaqm2dk545736khcvv1fmzbf1sgdlkyh1v8z"; + sha256 = "08477hl609rmmngwfy8dmsqz5zvsg8xrsrrk6xi70jf48majwli0"; type = "gem"; }; - version = "1.2.5"; + version = "1.2.6"; }; ffi = { source = { @@ -78,10 +78,10 @@ dependencies = ["activesupport" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hkx70z9ijgnncmrna9qdh9ajn9m7v146k91j257lrzyq2f6jdjd"; + sha256 = "1fdnxi9lh88vjndk4g94pwa45awbzklqc9b38nhqqb3sxg6my6zp"; type = "gem"; }; - version = "2.7.1"; + version = "2.7.2"; }; "http_parser.rb" = { source = { @@ -104,10 +104,10 @@ dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fdb3qfbpjhlz5vlx4aw7kg9iy4bvaa5k1v82fxapyjghs2zg8as"; + sha256 = "01s1r5pjfdvk5r1pz3j4smz42jsfv5vvp4q7fg0mrzxn9xk2nvi6"; type = "gem"; }; - version = "3.8.0"; + version = "3.8.1"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -119,13 +119,13 @@ version = "0.6.0"; }; jekyll-mentions = { - dependencies = ["activesupport" "html-pipeline" "jekyll"]; + dependencies = ["html-pipeline" "jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "11rfn2w9d50szbwbn3pajswjgcg85714d4d052mq2p803zg1i3mn"; + sha256 = "042z02j0chv679s8imciiy44fgxh9028q8n95w48i0xrfrhyzzfb"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.0"; }; jekyll-sass-converter = { dependencies = ["sass"]; @@ -164,13 +164,13 @@ version = "2.0.0"; }; jemoji = { - dependencies = ["activesupport" "gemoji" "html-pipeline" "jekyll"]; + dependencies = ["gemoji" "html-pipeline" "jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0acmi7mgr844dmzgfi9flcqkkb0jh5l21h579cidxwf1409w588b"; + sha256 = "0r6ja4bw2c50hb585cmqscbmm27982kkskyh7gk6j0mr70jqlz25"; type = "gem"; }; - version = "0.9.0"; + version = "0.10.0"; }; kramdown = { source = { diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index 45bd34187ca..bbcdad669da 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -20,7 +20,7 @@ GEM em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) - eventmachine (1.2.5) + eventmachine (1.2.6) execjs (2.7.0) faraday (0.15.0) multipart-post (>= 1.2, < 3) @@ -28,13 +28,13 @@ GEM ffi (1.9.23) forwardable-extended (2.6.0) gemoji (3.0.0) - html-pipeline (2.7.1) + html-pipeline (2.7.2) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.8.0) + jekyll (3.8.1) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -56,8 +56,7 @@ GEM jekyll (~> 3.3) jekyll-gist (1.5.0) octokit (~> 4.2) - jekyll-mentions (1.3.0) - activesupport (~> 4.0) + jekyll-mentions (1.4.0) html-pipeline (~> 2.3) jekyll (~> 3.0) jekyll-paginate (1.1.0) @@ -71,8 +70,7 @@ GEM jekyll (~> 3.3) jekyll-watch (2.0.0) listen (~> 3.0) - jemoji (0.9.0) - activesupport (~> 4.0, >= 4.2.9) + jemoji (0.10.0) gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (~> 3.0) diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix index b45ea5b9d07..8473cee0be5 100644 --- a/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/pkgs/applications/misc/jekyll/full/gemset.nix @@ -79,10 +79,10 @@ eventmachine = { source = { remotes = ["https://rubygems.org"]; - sha256 = "075hdw0fgzldgss3xaqm2dk545736khcvv1fmzbf1sgdlkyh1v8z"; + sha256 = "08477hl609rmmngwfy8dmsqz5zvsg8xrsrrk6xi70jf48majwli0"; type = "gem"; }; - version = "1.2.5"; + version = "1.2.6"; }; execjs = { source = { @@ -137,10 +137,10 @@ dependencies = ["activesupport" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hkx70z9ijgnncmrna9qdh9ajn9m7v146k91j257lrzyq2f6jdjd"; + sha256 = "1fdnxi9lh88vjndk4g94pwa45awbzklqc9b38nhqqb3sxg6my6zp"; type = "gem"; }; - version = "2.7.1"; + version = "2.7.2"; }; "http_parser.rb" = { source = { @@ -163,10 +163,10 @@ dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fdb3qfbpjhlz5vlx4aw7kg9iy4bvaa5k1v82fxapyjghs2zg8as"; + sha256 = "01s1r5pjfdvk5r1pz3j4smz42jsfv5vvp4q7fg0mrzxn9xk2nvi6"; type = "gem"; }; - version = "3.8.0"; + version = "3.8.1"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -205,13 +205,13 @@ version = "1.5.0"; }; jekyll-mentions = { - dependencies = ["activesupport" "html-pipeline" "jekyll"]; + dependencies = ["html-pipeline" "jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "11rfn2w9d50szbwbn3pajswjgcg85714d4d052mq2p803zg1i3mn"; + sha256 = "042z02j0chv679s8imciiy44fgxh9028q8n95w48i0xrfrhyzzfb"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.0"; }; jekyll-paginate = { source = { @@ -267,13 +267,13 @@ version = "2.0.0"; }; jemoji = { - dependencies = ["activesupport" "gemoji" "html-pipeline" "jekyll"]; + dependencies = ["gemoji" "html-pipeline" "jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0acmi7mgr844dmzgfi9flcqkkb0jh5l21h579cidxwf1409w588b"; + sha256 = "0r6ja4bw2c50hb585cmqscbmm27982kkskyh7gk6j0mr70jqlz25"; type = "gem"; }; - version = "0.9.0"; + version = "0.10.0"; }; kramdown = { source = { diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix index 8a752bbaf86..a9ec2760e8a 100644 --- a/pkgs/applications/misc/makeself/default.nix +++ b/pkgs/applications/misc/makeself/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2.3.1"; + version = "2.4.0"; name = "makeself-${version}"; src = fetchFromGitHub { owner = "megastep"; repo = "makeself"; rev = "release-${version}"; - sha256 = "01r7vb9vyb99s3g5cw0c04s1ahcingynk3ki17wknlk2asjrbc4p"; + sha256 = "1lw3gx1zpzp2wmzrw5v7k31vfsrdzadqha9ni309fp07g8inrr9n"; }; patchPhase = '' diff --git a/pkgs/applications/misc/minergate/default.nix b/pkgs/applications/misc/minergate/default.nix index acf0731f0ae..d11e889e932 100644 --- a/pkgs/applications/misc/minergate/default.nix +++ b/pkgs/applications/misc/minergate/default.nix @@ -1,12 +1,10 @@ { fetchurl, stdenv, dpkg, makeWrapper, fontconfig, freetype, openssl, xorg, xkeyboard_config }: -assert stdenv.system == "x86_64-linux"; - stdenv.mkDerivation rec { version = "8.1"; name = "minergate-${version}"; src = fetchurl { - url = "https://minergate.com/download/ubuntu"; + url = "https://minergate.com/download/ubuntu"; sha256 = "1dbbbb8e0735cde239fca9e82c096dcc882f6cecda20bba7c14720a614c16e13"; }; @@ -15,12 +13,12 @@ stdenv.mkDerivation rec { phases = [ "installPhase" ]; installPhase = '' - dpkg-deb -x $src $out + dpkg-deb -x $src $out pgm=$out/opt/minergate/minergate interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2 patchelf --set-interpreter "$interpreter" $pgm - + wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ fontconfig freetype openssl stdenv.cc.cc xorg.libX11 xorg.libxcb ]} --prefix "QT_XKB_CONFIG_ROOT" ":" "${xkeyboard_config}/share/X11/xkb" rm $out/usr/bin/minergate @@ -35,5 +33,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ bfortz ]; platforms = [ "x86_64-linux" ]; }; -} - +} diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 000a916b737..fbc7da07021 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -14,77 +14,19 @@ let in stdenv.mkDerivation rec { - version = "1.12.0"; + version = "1.13.0"; name = "mupdf-${version}"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${name}-source.tar.gz"; - sha256 = "0mc7a92zri27lk17wdr2iffarbfi4lvrmxhc53sz84hm5yl56qsw"; + sha256 = "02faww5bnjw76k6igrjzwf0lnw4xd9ckc8d6ilc3c4gfrdi6j707"; }; patches = [ - # Compatibility with new openjpeg - (fetchpatch { - name = "mupdf-1.12-openjpeg-version.patch"; - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/0001-mupdf-openjpeg.patch?h=packages/mupdf&id=a910cd33a2b311712f83710dc042fbe80c104306"; - sha256 = "05i9v2ia586jyjqdb7g68ss4vkfwgp6cwhagc8zzggsba83azyqk"; - }) - (fetchpatch { - name = "CVE-2018-6544.1.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;h=b03def134988da8c800adac1a38a41a1f09a1d89;hp=26527eef77b3e51c2258c8e40845bfbc015e405d"; - sha256 = "1rlmjibl73ls8xfpsz69axa3lw5l47vb0a1dsjqziszsld4lpj5i"; - }) - (fetchpatch { - name = "CVE-2018-6544.2.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=26527eef77b3e51c2258c8e40845bfbc015e405d;hp=ab98356f959c7a6e94b1ec10f78dd2c33ed3f3e7"; - sha256 = "1brcc029s5zmd6ya0d9qk3mh9qwx5g6vhsf1j8h879092sya5627"; - }) - (fetchpatch { - # Bugs 698804/698810/698811, 698819: Keep PDF object numbers below limit. - name = "CVE-2017-17858.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=55c3f68d638ac1263a386e0aaa004bb6e8bde731"; - sha256 = "1bf683d59i5009cv1hhmwmrp2rsb75cbf98qd44dk39cpvq8ydwv"; - }) - (fetchpatch { - # Bug 698825: Do not drop borrowed colorspaces. - name = "CVE-2018-1000051.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=321ba1de287016b0036bf4a56ce774ad11763384"; - sha256 = "0jbcc9j565q5y305pi888qzlp83zww6nhkqbsmkk91gim958zikm"; - }) - (fetchpatch { - # Bug 698908 preprecondition: Add portable pseudo-random number generator based on the lrand48 family. - name = "CVE-2018-6187.0.1.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=2d5b4683e912d6e6e1f1e2ca5aa0297beb3e6807"; - sha256 = "028bxinbjs5gg9myjr3vs366qxg9l2iyba2j3pxkxsh1851hj728"; - }) - (fetchpatch { - # Bug 698908 precondition: Fix "being able to search for redacted text" bug. - name = "CVE-2018-6187.0.2.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=25593f4f9df0c4a9b9adaa84aaa33fe2a89087f6"; - sha256 = "195y69c3f8yqxcsa0bxrmxbdc3fx1dzvz8v66i56064mjj0mx04s"; - }) - (fetchpatch { - # Bug 698908: Resize object use and renumbering lists after repair. - name = "CVE-2018-6187.1.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=3e30fbb7bf5efd88df431e366492356e7eb969ec"; - sha256 = "0wzbqj750h06q1wa6vxbpv5a5q9pfg0cxjdv88yggkrjb3vrkd9j"; - }) - (fetchpatch { - # Bug 698908: Plug PDF object leaks when decimating pages in pdfposter. - name = "CVE-2018-6187.2.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=a71e7c85a9f2313cde20d4479cd727a5f5518ed2"; - sha256 = "1pcjkq8lg6l2m0186rl79lilg79crgdvz9hrmm3w60gy2gxkgksc"; - }) - (fetchpatch { - # Bug 698916: Indirect object numbers must be in range. - name = "CVE-2018-6192.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=5e411a99604ff6be5db9e273ee84737204113299"; - sha256 = "134zc07fp0p1mwqa8xrkq3drg4crajzf1hjf4mdwmcy1jfj2pfhj"; - }) ] # Use shared libraries to decrease size - ++ stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.12-shared_libs-1.patch + ++ stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.13-shared_libs-1.patch ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch ; diff --git a/pkgs/applications/misc/mupdf/mupdf-1.12-shared_libs-1.patch b/pkgs/applications/misc/mupdf/mupdf-1.13-shared_libs-1.patch index b39f005ed74..e29f1f52077 100644 --- a/pkgs/applications/misc/mupdf/mupdf-1.12-shared_libs-1.patch +++ b/pkgs/applications/misc/mupdf/mupdf-1.13-shared_libs-1.patch @@ -9,22 +9,24 @@ LIBS += $(XLIBS) -lm LIBS += $(FREETYPE_LIBS) -@@ -312,9 +312,9 @@ +@@ -312,10 +312,10 @@ # --- Library --- -MUPDF_LIB = $(OUT)/libmupdf.a -THIRD_LIB = $(OUT)/libmupdfthird.a -THREAD_LIB = $(OUT)/libmuthreads.a +-PKCS7_LIB = $(OUT)/libmupkcs7.a +MUPDF_LIB = $(OUT)/libmupdf.so +THIRD_LIB = $(OUT)/libmupdfthird.so +THREAD_LIB = $(OUT)/libmuthreads.so ++PKCS7_LIB = $(OUT)/libmupkcs7.so MUPDF_OBJ := \ $(FITZ_OBJ) \ -@@ -343,11 +343,14 @@ - - THREAD_OBJ := $(THREAD_OBJ) +@@ -343,13 +343,17 @@ + $(ZLIB_OBJ) \ + $(LCMS2_OBJ) -$(MUPDF_LIB) : $(MUPDF_OBJ) +$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) $(THREAD_LIB) @@ -33,9 +35,11 @@ + $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdfthird.so -Wl,--no-undefined $(THREAD_LIB) : $(THREAD_OBJ) + $(LINK_CMD) -shared -Wl,-soname -Wl,libmuthreads.so -Wl,--no-undefined -lpthread + $(PKCS7_LIB) : $(PKCS7_OBJ) ++ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupkcs7.so -INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) -+INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) ++INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) $(PKCS7_LIB) # --- Tools and Apps --- diff --git a/pkgs/applications/misc/open-pdf-presenter/default.nix b/pkgs/applications/misc/open-pdf-presenter/default.nix deleted file mode 100644 index 0f40a236c58..00000000000 --- a/pkgs/applications/misc/open-pdf-presenter/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, qt4, pythonPackages }: - -stdenv.mkDerivation rec { - name = "open-pdf-presenter-git-2014-09-23"; - - src = fetchFromGitHub { - owner = "olabini"; - repo = "open-pdf-presenter"; - rev = "f14930871b60b6ba50298c27377605e0a5fdf124"; - sha256 = "1lfqb60zmjmsvzpbz29m8yxlzs2fscingyk8jvisng1y921726rr"; - }; - - buildInputs = [ cmake qt4 pythonPackages.poppler-qt4 ]; - - meta = { - homepage = https://github.com/olabini/open-pdf-presenter; - description = "A program for presenting PDFs on multi-monitor settings (typically a laptop connected to a overhead projector)"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 9fb15aab2d4..2ad6321d519 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -21,8 +21,6 @@ , curl }: -assert stdenv.isLinux; - let version = "4.2.12"; diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index b8fa38268c3..09558ff4c47 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -1,26 +1,47 @@ -{ stdenv, fetchurl, python27Packages, wmctrl }: +{ stdenv, fetchurl, python27Packages, python36Packages, wmctrl }: -python27Packages.buildPythonPackage rec { - name = "plover-${version}"; - version = "3.1.0"; +{ + stable = with python27Packages; buildPythonPackage rec { + name = "plover-${version}"; + version = "3.1.1"; - meta = with stdenv.lib; { - description = "OpenSteno Plover stenography software"; - maintainers = with maintainers; [ twey kovirobi ]; - license = licenses.gpl2; - }; + meta = with stdenv.lib; { + description = "OpenSteno Plover stenography software"; + maintainers = with maintainers; [ twey kovirobi ]; + license = licenses.gpl2; + }; + + src = fetchurl { + url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; + sha256 = "1hdg5491phx6svrxxsxp8v6n4b25y7y4wxw7x3bxlbyhaskgj53r"; + }; - src = fetchurl { - url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; - sha256 = "1zdlgyjp93sfvk6by7rsh9hj4ijzplglrxpcpkcir6c3nq2bixl4"; + buildInputs = [ pytest mock ]; + propagatedBuildInputs = [ + six setuptools pyserial appdirs hidapi wxPython xlib wmctrl + ]; }; - # This is a fix for https://github.com/pypa/pip/issues/3624 causing regression https://github.com/pypa/pip/issues/3781 - postPatch = '' - substituteInPlace setup.py --replace " in sys_platform" " == sys_platform" - ''; + dev = with python36Packages; buildPythonPackage rec { + name = "plover-${version}"; + version = "4.0.0.dev6"; + + meta = with stdenv.lib; { + description = "OpenSteno Plover stenography software"; + maintainers = with maintainers; [ twey kovirobi ]; + license = licenses.gpl2; + }; - buildInputs = with python27Packages; [ pytest mock ]; - propagatedBuildInputs = with python27Packages; [ six setuptools pyserial appdirs hidapi - wxPython xlib wmctrl ]; + src = fetchurl { + url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; + sha256 = "067rkpqnjjxwyv9cwh9i925ndba6fvj6q0r56lizy0l26b4jc8rp"; + }; + + # I'm not sure why we don't find PyQt5 here but there's a similar + # sed on many of the platforms Plover builds for + postPatch = "sed -i /PyQt5/d setup.cfg"; + + buildInputs = [ pytest mock ]; + propagatedBuildInputs = [ Babel pyqt5 xlib pyserial appdirs ]; + }; } diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix index 8928ee18064..be365cb94e4 100644 --- a/pkgs/applications/misc/robo3t/default.nix +++ b/pkgs/applications/misc/robo3t/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig, +{ stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig, libGL, freetype, xkeyboard_config, makeDesktopItem, makeWrapper }: stdenv.mkDerivation rec { @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { dbus fontconfig freetype + libGL ]; installPhase = '' diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 6403f5441f3..923084a5738 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -154,11 +154,6 @@ let (githubPatch "ba4141e451f4e0b1b19410b1b503bd32e150df06" "1cjxw1f9fin6z12b0mcxnxf2mdjb0n3chwz7mgvmp9yij8qhqnxj") (githubPatch "b34ed1e6524479d61ee944ebf6ca7389ea47e563" "1s13zw93nsyr259dzck6gbhg4x46qg5sg14djf4bvrrc6hlkiczw") (githubPatch "4f2b52281ce1649ea8347489443965ad33262ecc" "1g59izkicn9cpcphamdgrijs306h5b9i7i4pmy134asn1ifiax5z") - (fetchpatch { - ## see https://groups.google.com/a/chromium.org/forum/#!msg/chromium-packagers/So-ojMYOQdI/K66hndtdCAAJ - url = "https://bazaar.launchpad.net/~chromium-team/chromium-browser/bionic-stable/download/head:/addmissingblinktools-20180416203514-02f50sz15c2mn6ei-1/add-missing-blink-tools.patch"; - sha256 = "0dc4cmd05qjqyihrd4qb34kz0jlapjgah8bzgnvxf9m4791w062z"; - }) ] ++ optional enableWideVine ./patches/widevine.patch ++ optionals (stdenv.isAarch64 && versionRange "65" "67") [ ./patches/skia_buildfix.patch diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index d55cc12c165..7be5d259115 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 = "1mlfavs0m0lf60s42krqxqiyx73hdfd4r1mkjwv31p2gchsa7ibp"; - sha256bin64 = "067gpmiwnpdaqarkz740plg0ixpp7642xf4qqkq32w9v8flx3y57"; - version = "66.0.3359.117"; + sha256 = "136gx9qqbzfzaf19k0gxb8n4ypd4ycyr83i9v68nqdvy2k26vf4n"; + sha256bin64 = "0w628afj5k4xygizlznwxkljgc1prxqc3lanaz6gdmyrl7gk1s7n"; + version = "67.0.3396.18"; }; dev = { - sha256 = "0058g5dm5nfm7wdpd9y4fn0dmi8bq013l0ky5fsn4j7msm55rrg5"; - sha256bin64 = "1ag8kg3jjv6jsxdjq33h4ksqhhhfaz5aqw9jaaqhfma908c5mc9y"; - version = "67.0.3396.10"; + sha256 = "1yspf0n385ail9qxsmax58mfk5yi473ygsraqs83q30pfgxc5z2f"; + sha256bin64 = "1gi1xpnjwkg7sxv94ksv6fiymw13rxdq2hyvza8b9famvfcaz07j"; + version = "68.0.3409.2"; }; stable = { - sha256 = "1mlfavs0m0lf60s42krqxqiyx73hdfd4r1mkjwv31p2gchsa7ibp"; - sha256bin64 = "1ycfq6pqk7a9kyqf2112agcxav360rxbqqdc1yil0qkmz51i9zdg"; - version = "66.0.3359.117"; + sha256 = "1ck4wbi28702p1lfs4sz894ysbgm7fj79wrqj8srsy65z2ssaxdy"; + sha256bin64 = "1vgrgay3h0961vj96ql2p0pb16gzfr48r4hk25rxdqbflnz7njz0"; + version = "66.0.3359.139"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 5b01daeef51..97ce7d06c41 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -48,8 +48,6 @@ , gnupg }: -assert stdenv.isLinux; - let inherit (generated) version sources; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index d56ceff8184..7ab61ec2fe5 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -7,7 +7,7 @@ , trezor-bridge, bluejeans, djview4, adobe-reader , google_talk_plugin, fribid, gnome3/*.gnome-shell*/ , esteidfirefoxplugin -, browserpass, chrome-gnome-shell +, browserpass, chrome-gnome-shell, uget-integrator , libudev , kerberos }: @@ -62,6 +62,7 @@ let ([ ] ++ lib.optional (cfg.enableBrowserpass or false) browserpass ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell + ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator ++ extraNativeMessagingHosts ); libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ]) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix index db871c0c9a5..fb6e85ccdbb 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, dpkg, zlib }: -assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; - stdenv.mkDerivation { name = "TREZOR-bridge-1.0.5"; @@ -42,6 +40,7 @@ stdenv.mkDerivation { # Download URL, .deb content & hash (yikes) changed, not version. # New archive doesn't contain any Mozilla plugin at all. broken = true; - }; + platforms = platforms.linux; + }; -}
\ No newline at end of file +} diff --git a/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix index 9764e029d27..304df0947ac 100644 --- a/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix +++ b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix @@ -12,7 +12,7 @@ buildGoPackage rec { name = "terraform-provider-ibm-${version}"; - version = "0.8.0"; + version = "0.9.1"; goPackagePath = "github.com/terraform-providers/terraform-provider-ibm"; subPackages = [ "./" ]; @@ -20,7 +20,7 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "IBM-Cloud"; repo = "terraform-provider-ibm"; - sha256 = "1jc1g2jadh02z4lfqnvgqk5cqrzk8pnn3cj3cwsm3ksa8pccf6w4"; + sha256 = "1j8v7r5lsvrg1afdbwxi8vq665qr47a9pddqgmpkirh99pzixgr6"; rev = "v${version}"; }; diff --git a/pkgs/applications/networking/cluster/terraform/providers/update-all b/pkgs/applications/networking/cluster/terraform/providers/update-all index 16eb6004e3e..24695066fa2 100755 --- a/pkgs/applications/networking/cluster/terraform/providers/update-all +++ b/pkgs/applications/networking/cluster/terraform/providers/update-all @@ -58,7 +58,7 @@ cd "$(dirname "$0")" if [[ -z "${GITHUB_AUTH:-}" ]]; then cat <<'HELP' -Missing the GITHUB_AUTH env. Thi is required to work around the 60 request +Missing the GITHUB_AUTH env. This is required to work around the 60 request per hour rate-limit. Go to https://github.com/settings/tokens and create a new token with the diff --git a/pkgs/applications/networking/ike/default.nix b/pkgs/applications/networking/ike/default.nix index a5c21e28c3d..7953f35507d 100644 --- a/pkgs/applications/networking/ike/default.nix +++ b/pkgs/applications/networking/ike/default.nix @@ -1,8 +1,6 @@ { stdenv, fetchurl, cmake, openssl, libedit, flex, bison, qt4, makeWrapper , gcc, nettools, iproute, linuxHeaders }: -assert stdenv.isLinux; - # NOTE: use $out/etc/iked.conf as sample configuration and also set: dhcp_file "/etc/iked.dhcp"; # launch with "iked -f /etc/iked.conf" diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 76d68880263..6801edb9767 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "discord"; - version = "0.0.4"; + version = "0.0.5"; name = "${pname}-${version}"; src = fetchurl { url = "https://cdn.discordapp.com/apps/linux/${version}/${pname}-${version}.tar.gz"; - sha256 = "1alw9rkv1vv0s1w33hd9ab1cgj7iqd7ad9kvn1d55gyki28f8qlb"; + sha256 = "067gb72qsxrzfma04njkbqbmsvwnnyhw4k9igg5769jkxay68i1g"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 3fd8b932283..a1c81f3f002 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -17,11 +17,11 @@ with lib; buildPythonApplication rec { name = "gajim-${version}"; majorVersion = "1.0"; - version = "${majorVersion}.1"; + version = "${majorVersion}.2"; src = fetchurl { url = "https://gajim.org/downloads/${majorVersion}/gajim-${version}.tar.bz2"; - sha256 = "16ynws10vhx6rhjjjmzw6iyb3hc19823xhx4gsb14hrc7l8vzd1c"; + sha256 = "0wyyy3wrk7ka5xrsbafnajzf7iacg8vg3hi16pl4c5p104hdhjdw"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 1d03c2f47c8..681a8119ac0 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -3,8 +3,6 @@ , alsaLib, dbus_libs, gtk2, libpulseaudio, openssl, xorg }: -assert stdenv.isLinux; - stdenv.mkDerivation rec { name = "jitsi-${version}"; version = "2.10.5550"; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index d524be287cd..479b89bcecb 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -40,13 +40,13 @@ in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.7.1"; + version = "1.9.0"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "02zx8ynbvvs260mrvqbsg0fi561da4ni3i9f4bjh53vqn92vhvvq"; + sha256 = "18i9chyarpcw369rqyldckkln1lxy5g9qy9f5gy5gsz9y5qngxqa"; } else throw "Signal for Desktop is not currently supported on ${stdenv.system}"; @@ -81,7 +81,7 @@ in description = "Signal Private Messenger for the Desktop."; homepage = https://signal.org/; license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.ixmatus ]; + maintainers = with lib.maintainers; [ ixmatus primeos ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/stride/default.nix b/pkgs/applications/networking/instant-messengers/stride/default.nix index 0bcf3493d29..9df816dd890 100644 --- a/pkgs/applications/networking/instant-messengers/stride/default.nix +++ b/pkgs/applications/networking/instant-messengers/stride/default.nix @@ -33,12 +33,12 @@ let ] + ":${stdenv.cc.cc.lib}/lib64"; in stdenv.mkDerivation rec { - version = "1.8.18"; + version = "1.17.82"; name = "stride-${version}"; src = fetchurl { url = "https://packages.atlassian.com/stride-apt-client/pool/stride_${version}_amd64.deb"; - sha256 = "0hpj3i3xbvckxm7fphqqb3scb31w2cg4riwp593y0gnbivpc0hym"; + sha256 = "0lx61gdhw0kv4f9fwbfg69yq52dsp4db7c4li25d6wn11qanzqhy"; }; dontBuild = true; diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index 3c164820019..781912f665d 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -3,8 +3,6 @@ libpulseaudio, libxml2, libxslt, libGLU_combined, nspr, nss, openssl, systemd, wayland, xorg, zlib, ... }: -assert stdenv.system == "x86_64-linux"; - stdenv.mkDerivation rec { name = "viber-${version}"; version = "7.0.0.1035"; @@ -99,7 +97,7 @@ stdenv.mkDerivation rec { homepage = http://www.viber.com; description = "An instant messaging and Voice over IP (VoIP) app"; license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with stdenv.lib.maintainers; [ jagajaga ]; }; diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix index cf3725c35e3..e718dc6562f 100644 --- a/pkgs/applications/networking/insync/default.nix +++ b/pkgs/applications/networking/insync/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "insync-${version}"; - version = "1.3.22.36179"; + version = "1.4.5.37069"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "http://s.insynchq.com/builds/insync-portable_${version}_amd64.tar.bz2"; - sha256 = "0jmycpbmfvvpilcycyg6zgpjz6449bs17d2w4jx7m1rvzmpkk140"; + sha256 = "0mkqgpq4isngkj20c0ygmxf4cj975d446svhwvl3cqdrjkjm1ybd"; } else throw "${name} is not supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 7c685b9df6b..739842bbec3 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -24,8 +24,6 @@ let buildCore = monolithic || daemon; in -assert stdenv.isLinux; - assert monolithic -> !client && !daemon; assert client || daemon -> !monolithic; assert !buildClient -> !withKDE; # KDE is used by the client only diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 9dbc99cac7d..759cf74ba9d 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -43,8 +43,6 @@ , gnupg }: -assert stdenv.isLinux; - # imports `version` and `sources` with (import ./release_sources.nix); diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index cf825b72496..d8fc1d840d2 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -10,11 +10,11 @@ let inherit (stdenv.lib) optional optionals optionalString; in stdenv.mkDerivation rec { name = "transmission-" + optionalString enableGTK3 "gtk-" + version; - version = "2.93"; + version = "2.94"; src = fetchurl { - url = "https://github.com/transmission/transmission-releases/raw/master/transmission-2.93.tar.xz"; - sha256 = "8815920e0a4499bcdadbbe89a4115092dab42ce5199f71ff9a926cfd12b9b90b"; + url = "https://github.com/transmission/transmission-releases/raw/master/transmission-2.94.tar.xz"; + sha256 = "0zbbj7rlm6m7vb64x68a64cwmijhsrwx9l63hbwqs7zr9742qi1m"; }; nativeBuildInputs = [ pkgconfig ] diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 531a1d5d0a1..e1a2cf8d171 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,14 +3,14 @@ let common = { stname, target, patches ? [], postInstall ? "" }: stdenv.mkDerivation rec { - version = "0.14.46"; + version = "0.14.47"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "0lv8n5id40iy2gfccy8g45fjzlnbnvi7nlvj25pri22dq2bd5svm"; + sha256 = "1md835c13f3c9bknnm6pxn0r8k8g2wg56zfav96bpnpk4aqx41bh"; }; inherit patches; diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix index f8742253c51..436558283e0 100644 --- a/pkgs/applications/office/libreoffice/default-primary-src.nix +++ b/pkgs/applications/office/libreoffice/default-primary-src.nix @@ -3,8 +3,8 @@ rec { major = "6"; minor = "0"; - patch = "2"; - tweak = "1"; + patch = "3"; + tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "0qga01lhh09jf2gx3czk66i5c854gzzjxgkrmj5d7m4ci2zaxfsd"; + sha256 = "16w5f8jbicby9jgsrpaj7g9c0wzymcmk1qk1fqdxaykrgpss5f0j"; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 89af45814bf..c8897c87bd3 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -42,14 +42,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "1fx9xkf1ppap77b8zdr8qawbikgp607z5w9b7jk3rilcqs7xbkwl"; + sha256 = "1cx537akvil4ci4lc9gnz83xmhxyjjrpv9xcibkif6vhdck539la"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "0zphmhl4a8pd5l7ma4bzhrwgbv037j8p5m1ilvb1blgbqv53v38a"; + sha256 = "00a7iqknww28z0ifcjrx529p2nxqsa4gjavk75rwykvcfyn9x686"; }; }; @@ -184,7 +184,7 @@ in stdenv.mkDerivation rec { done cp -r sysui/desktop/icons "$out/share" - sed -re 's@Icon=libreofficedev[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop + sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop ''; configureFlags = [ diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index 28c06b65869..251aa44a2c5 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -532,11 +532,11 @@ md5name = "967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2-xmlsec1-1.2.25.tar.gz"; } { - name = "libxml2-2.9.7.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxml2-2.9.7.tar.gz"; - sha256 = "f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c"; + name = "libxml2-2.9.8.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxml2-2.9.8.tar.gz"; + sha256 = "0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732"; md5 = ""; - md5name = "f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c-libxml2-2.9.7.tar.gz"; + md5name = "0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732-libxml2-2.9.8.tar.gz"; } { name = "libxslt-1.1.32.tar.gz"; @@ -651,11 +651,11 @@ md5name = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f-openssl-1.0.2m.tar.gz"; } { - name = "liborcus-0.13.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/liborcus-0.13.1.tar.gz"; - sha256 = "d7041ef455bb78db66b4ba7876af1b3d0fa377b9444e3ef72ceaccd2e8400937"; + name = "liborcus-0.13.3.tar.gz"; + url = "http://dev-www.libreoffice.org/src/liborcus-0.13.3.tar.gz"; + sha256 = "62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9"; md5 = ""; - md5name = "d7041ef455bb78db66b4ba7876af1b3d0fa377b9444e3ef72ceaccd2e8400937-liborcus-0.13.1.tar.gz"; + md5name = "62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9-liborcus-0.13.3.tar.gz"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index b4139d54af5..52baed720c5 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -183,7 +183,7 @@ in stdenv.mkDerivation rec { done cp -r sysui/desktop/icons "$out/share" - sed -re 's@Icon=libreofficedev[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop + sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop ''; configureFlags = [ diff --git a/pkgs/applications/office/libreoffice/wrapper.sh b/pkgs/applications/office/libreoffice/wrapper.sh index 52cd91e8030..cff8f200e2b 100644 --- a/pkgs/applications/office/libreoffice/wrapper.sh +++ b/pkgs/applications/office/libreoffice/wrapper.sh @@ -1,13 +1,13 @@ #!@bash@/bin/bash export JAVA_HOME="${JAVA_HOME:-@jdk@}" -export SAL_USE_VCLPLUGIN="${SAL_USE_VCLPLUGIN:-gen}" +#export SAL_USE_VCLPLUGIN="${SAL_USE_VCLPLUGIN:-gen}" if uname | grep Linux > /dev/null && ! ( test -n "$DBUS_SESSION_BUS_ADDRESS" ); then dbus_tmp_dir="/run/user/$(id -u)/libreoffice-dbus" mkdir "$dbus_tmp_dir" dbus_socket_dir="$(mktemp -d -p "$dbus_tmp_dir")" - "@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "@dbus@"/share/dbus-1/session.conf --address "unix:path=$dbus_socket_dir/session" >&2 & + "@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "@dbus@"/share/dbus-1/session.conf --address "unix:path=$dbus_socket_dir/session" &> /dev/null & export DBUS_SESSION_BUS_ADDRESS="unix:path=$dbus_socket_dir/session" fi diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index a0a82520152..15a57ba9de4 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -34,8 +34,6 @@ , writeScript }: -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; - let arch32 = "i686-linux"; arch64 = "x86_64-linux"; @@ -140,7 +138,7 @@ stdenv.mkDerivation { homepage = http://www.mendeley.com; description = "A reference manager and academic social network"; license = licenses.unfree; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/applications/science/biology/paml/default.nix index bfadf9e704a..fe25a04c420 100644 --- a/pkgs/applications/science/biology/paml/default.nix +++ b/pkgs/applications/science/biology/paml/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "4.9g"; + version = "4.9h"; name = "paml-${version}"; src = fetchurl { url = "http://abacus.gene.ucl.ac.uk/software/paml${version}.tgz"; - sha256 = "1kxkl47azkrsmdxiymnc76c2ccc514vlfnjvvm7lwch5l43j029h"; + sha256 = "1czdfb3naadq0d3y42isrbyja33c3p28k8dv9mxlx2h19b7zcfv2"; }; preBuild = '' diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index 8229af9649f..22eb5d07f1c 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, gtk2, gdk_pixbuf, atk, pango, glib, cairo, freetype , fontconfig, libxml2, gnome2 }: -assert stdenv.isLinux; let libPath = stdenv.lib.makeLibraryPath diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 73659a32f4b..2bd8697c8ec 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -82,7 +82,7 @@ rec { git-radar = callPackage ./git-radar { }; git-recent = callPackage ./git-recent { - utillinux = if stdenv.isLinux then utillinuxMinimal else null; + utillinux = if stdenv.isLinux then utillinuxMinimal else utillinux; }; git-remote-hg = callPackage ./git-remote-hg { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix index 0272d441460..82bcbf74a9e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix @@ -1,15 +1,9 @@ {stdenv, git, less, fetchFromGitHub, makeWrapper # utillinuxMinimal is included because we need the column command -, utillinux ? null +, utillinux }: -assert stdenv.isLinux -> utillinux != null; - -let - binpath = stdenv.lib.makeBinPath - ([ git less ] - ++ stdenv.lib.optional (utillinux != null) utillinux); -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "git-recent-${version}"; version = "1.0.4"; @@ -28,7 +22,7 @@ in stdenv.mkDerivation rec { mkdir -p $out/bin cp git-recent $out/bin wrapProgram $out/bin/git-recent \ - --prefix PATH : "${binpath}" + --prefix PATH : "${stdenv.lib.makeBinPath [ git less utillinux ]}" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix index bb519ef3dab..b03ca2328b3 100644 --- a/pkgs/applications/video/webtorrent_desktop/default.nix +++ b/pkgs/applications/video/webtorrent_desktop/default.nix @@ -39,13 +39,13 @@ ]); in stdenv.mkDerivation rec { name = "webtorrent-desktop-${version}"; - version = "0.19.0"; + version = "0.20.0"; src = if stdenv.system == "x86_64-linux" then fetchurl { - url = "https://github.com/webtorrent/webtorrent-desktop/releases/download/v0.19.0/webtorrent-desktop_${version}-1_amd64.deb"; - sha256 = "0v4fgvf8qgxjwg5kz30pcxl71pi9rri0l3cy20pid07rdd6r4sgd"; + url = "https://github.com/webtorrent/webtorrent-desktop/releases/download/v0.20.0/webtorrent-desktop_${version}-1_amd64.deb"; + sha256 = "1kkrnbimiip5pn2nwpln35bbdda9gc3cgrjwphq4fqasbjf2781k"; } else throw "Webtorrent is not currently supported on ${stdenv.system}"; diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix index 40eadad68d0..6743c849189 100644 --- a/pkgs/applications/virtualization/remotebox/default.nix +++ b/pkgs/applications/virtualization/remotebox/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "remotebox-${version}"; - version = "2.4"; + version = "2.5"; src = fetchurl { url = "http://remotebox.knobgoblin.org.uk/downloads/RemoteBox-${version}.tar.bz2"; - sha256 = "14zcpzpdb5gxkxvckcdwq3mfv8b18zirbdskzddhqxjddkzayckz"; + sha256 = "0dajc9fg57gj915h5dxavbia4wx10frn4xc61pv0l8r5zp7xvqal"; }; buildInputs = with perlPackages; [ perl Glib Gtk2 Pango SOAPLite ]; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 29cb7c192b5..ca0520f32a8 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -21,10 +21,10 @@ let buildType = "release"; # Manually sha256sum the extensionPack file, must be hex! # Do not forget to update the hash in ./guest-additions/default.nix! - extpack = "355ea5fe047f751534720c65398b44290d53f389e0f5f66818f3f36746631d26"; - extpackRev = "121009"; - main = "ee2759d47b0b4ac81b8b671c9485c87fb2db12c097b3e7e69b94c1291a8084e8"; - version = "5.2.8"; + extpack = "5eef217dbe0a8e8caf383ea8db83344517af0f9093041b5345c8468a427b327b"; + extpackRev = "122406"; + main = "1k14ngz1gcz02qwbpzfp4kgxv8s24js8pwd5nyyqs6jpxx6557pd"; + version = "5.2.10"; # See https://github.com/NixOS/nixpkgs/issues/672 for details extensionPack = requireFile rec { diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 96e8404b3ef..b15eed09fde 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "04q8d2dxhkkqbghqidcwv6mx57fqpp92smh7gnaxb7vqqskb9dl0"; + sha256 = "78a4f18eb0968c7d14dbfe9decf96759c3f85d28f7e3e7ae339266f4a0b22bd1"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix index c3280cbda94..dab90a1ed78 100644 --- a/pkgs/applications/virtualization/xen/4.10.nix +++ b/pkgs/applications/virtualization/xen/4.10.nix @@ -29,6 +29,12 @@ let xsa = import ./xsa-patches.nix { inherit fetchpatch; }; + qemuMemfdBuildFix = fetchpatch { + name = "xen-4.8-memfd-build-fix.patch"; + url = https://github.com/qemu/qemu/commit/75e5b70e6b5dcc4f2219992d7cffa462aa406af0.patch; + sha256 = "0gaz93kb33qc0jx6iphvny0yrd17i8zhcl3a9ky5ylc2idz0wiwa"; + }; + qemuDeps = [ udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir alsaLib glib python2 @@ -53,6 +59,9 @@ callPackage (import ./generic.nix (rec { rev = "b79708a8ed1b3d18bee67baeaf33b3fa529493e2"; sha256 = "1yxxad6nvlfmrbgyc8ix19qmrsn1rx4zpyiqnfi4x4kg94acwa5w"; }; + patches = [ + qemuMemfdBuildFix + ]; buildInputs = qemuDeps; postPatch = '' # needed in build but /usr/bin/env is not available in sandbox diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 75e279afdc3..584beb3d89b 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -32,7 +32,28 @@ rec { inherit pkgs buildImage pullImage shadowSetup buildImageWithNixDb; }; - pullImage = callPackage ./pull.nix {}; + pullImage = + let + fixName = name: builtins.replaceStrings ["/" ":"] ["-" "-"] name; + in { + imageName, + # To find the digest of an image, you can use skopeo: + # skopeo inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest' + # sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b + imageDigest, + sha256, + # This used to set a tag to the pulled image + finalImageTag ? "latest", + name ? (fixName "docker-image-${imageName}-${finalImageTag}.tar") }: + runCommand name { + impureEnvVars=pkgs.stdenv.lib.fetchers.proxyImpureEnvVars; + outputHashMode="flat"; + outputHashAlgo="sha256"; + outputHash=sha256; + } + '' + ${pkgs.skopeo}/bin/skopeo copy docker://${imageName}@${imageDigest} docker-archive://$out:${imageName}:${finalImageTag} + ''; # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash. # And we cannot untar it, because then we cannot preserve permissions ecc. @@ -560,7 +581,7 @@ rec { chmod -R a-w image echo "Cooking the image..." - tar -C image --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --xform s:'./':: -c . | pigz -nT > $out + tar -C image --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --xform s:'^./':: -c . | pigz -nT > $out echo "Finished." ''; diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 315440349b6..eb5b9fe36e4 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -85,9 +85,9 @@ rec { # 4. example of pulling an image. could be used as a base for other images nixFromDockerHub = pullImage { imageName = "nixos/nix"; - imageTag = "1.11"; - # this hash will need change if the tag is updated at docker hub - sha256 = "0nncn9pn5miygan51w34c2p9qssi96jgsaqv44dxxdprc8pg0g83"; + imageDigest = "sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b"; + sha256 = "0mqjy3zq2v6rrhizgb9nvhczl87lcfphq9601wcprdika2jz7qh8"; + finalImageTag = "1.11"; }; # 5. example of multiple contents, emacs and vi happily coexisting diff --git a/pkgs/build-support/docker/pull.nix b/pkgs/build-support/docker/pull.nix deleted file mode 100644 index 5611c778586..00000000000 --- a/pkgs/build-support/docker/pull.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, lib, docker, vmTools, utillinux, curl, kmod, dhcp, cacert, e2fsprogs }: -let - nameReplace = name: builtins.replaceStrings ["/" ":"] ["-" "-"] name; -in -# For simplicity we only support sha256. -{ imageName, imageTag ? "latest", imageId ? "${imageName}:${imageTag}" -, sha256, name ? (nameReplace "docker-image-${imageName}-${imageTag}.tar") }: -let - pullImage = vmTools.runInLinuxVM ( - stdenv.mkDerivation { - inherit name imageId; - - certs = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - - builder = ./pull.sh; - - nativeBuildInputs = [ curl utillinux docker kmod dhcp cacert e2fsprogs ]; - - outputHashAlgo = "sha256"; - outputHash = sha256; - - impureEnvVars = lib.fetchers.proxyImpureEnvVars; - - preVM = vmTools.createEmptyImage { - size = 2048; - fullName = "${name}-disk"; - }; - - QEMU_OPTS = "-netdev user,id=net0 -device virtio-net-pci,netdev=net0"; - }); -in - pullImage diff --git a/pkgs/build-support/docker/pull.sh b/pkgs/build-support/docker/pull.sh deleted file mode 100644 index 0b1e9f310ee..00000000000 --- a/pkgs/build-support/docker/pull.sh +++ /dev/null @@ -1,36 +0,0 @@ -source $stdenv/setup - -mkdir -p /var/lib/docker -mkfs.ext4 /dev/vda -mount -t ext4 /dev/vda /var/lib/docker - -modprobe virtio_net -dhclient eth0 - -mkdir -p /etc/ssl/certs/ -cp "$certs" "/etc/ssl/certs/" - -# from https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount -mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup -cd /sys/fs/cgroup -for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do - mkdir -p $sys - if ! mountpoint -q $sys; then - if ! mount -n -t cgroup -o $sys cgroup $sys; then - rmdir $sys || true - fi - fi -done - -# run docker daemon -dockerd -H tcp://127.0.0.1:5555 -H unix:///var/run/docker.sock & - -until docker ps 2>/dev/null; do - printf '.' - sleep 1 -done - -rm -r $out - -docker pull ${imageId} -docker save ${imageId} > $out diff --git a/pkgs/build-support/fetchs3/default.nix b/pkgs/build-support/fetchs3/default.nix index e6b7a3418c0..14dac9997d9 100644 --- a/pkgs/build-support/fetchs3/default.nix +++ b/pkgs/build-support/fetchs3/default.nix @@ -1,6 +1,7 @@ { stdenvNoCC, runCommand, awscli }: { s3url +, name ? builtins.baseNameOf s3url , sha256 , region ? "us-east-1" , credentials ? null # Default to looking at local EC2 metadata service @@ -10,16 +11,23 @@ }: let - credentialAttrs = stdenvNoCC.lib.optionalAttrs (credentials != null) { - AWS_ACCESS_KEY_ID = credentials.access_key_id; - AWS_SECRET_ACCESS_KEY = credentials.secret_access_key; - AWS_SESSION_TOKEN = credentials.session_token ? null; + mkCredentials = { access_key_id, secret_access_key, session_token ? null }: { + AWS_ACCESS_KEY_ID = access_key_id; + AWS_SECRET_ACCESS_KEY = secret_access_key; + AWS_SESSION_TOKEN = session_token; }; -in runCommand "foo" ({ + + credentialAttrs = stdenvNoCC.lib.optionalAttrs (credentials != null) (mkCredentials credentials); +in runCommand name ({ nativeBuildInputs = [ awscli ]; + outputHashAlgo = "sha256"; outputHash = sha256; outputHashMode = if recursiveHash then "recursive" else "flat"; + + preferLocalBuild = true; + + AWS_DEFAULT_REGION = region; } // credentialAttrs) (if postFetch != null then '' downloadedFile="$(mktemp)" aws s3 cp ${s3url} $downloadedFile diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index ec58dfd7749..d050a15cb79 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "man-pages-${version}"; - version = "4.15"; + version = "4.16"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz"; - sha256 = "01n1rq1kvambax85xamriawbga94mh63s5mgjmjljjgf50m7yw6f"; + sha256 = "1d2d6llazg3inwjiz22cn46mbm5ydpbyh9qb55z4j3nm4w6wrzs7"; }; makeFlags = [ "MANDIR=$(out)/share/man" ]; diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index ad2485dc4b8..657eb80c539 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -26,13 +26,13 @@ in let pname = if set != null then "iosevka-${set}" else "iosevka"; in let - version = "1.14.1"; + version = "1.14.2"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "be5invis"; repo ="Iosevka"; rev = "v${version}"; - sha256 = "0m6kj1zfv9w6lyykhsfqdx2a951k8qa76licqikz5spm13n22z43"; + sha256 = "18vh5rjffqgiliyfia40lh7cygz6fv3rwgq28fxl26i9sc95qsqd"; }; in diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 38f8030cc27..e758c56f023 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/9cd032898a8fd11b69827ff02d2f295cac0907d9.tar.gz"; - sha256 = "1xxg3dcp5jgin978sa9510ji10p2j47x7b2n0xz00wrs9yjn5zvg"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/462dbb7e8a2ca65807ae21d1cc5f5c5454a9a327.tar.gz"; + sha256 = "09rq2r9ydvmhk9182xl0yz4dbr84ncj8a7fc2qzln784zrd12aph"; } diff --git a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix index 4b1daa3af90..ab68acda277 100644 --- a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix +++ b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, GConf, libsoup, libtasn1, nettle, gmp }: -assert stdenv.isLinux; - stdenv.mkDerivation rec { name = "libgweather-2.30.3"; src = fetchurl { diff --git a/pkgs/development/compilers/ghc/8.4.1.nix b/pkgs/development/compilers/ghc/8.4.1.nix deleted file mode 100644 index 8f398458fd5..00000000000 --- a/pkgs/development/compilers/ghc/8.4.1.nix +++ /dev/null @@ -1,206 +0,0 @@ -{ stdenv, targetPackages -, buildPlatform, hostPlatform, targetPlatform - -# build-tools -, bootPkgs, alex, happy -, autoconf, automake, coreutils, fetchgit, fetchpatch, perl, python3 -, runCommand - -, libffi, libiconv ? null, ncurses - -, useLLVM ? !targetPlatform.isx86 -, # LLVM is conceptually a run-time-only depedendency, but for - # non-x86, we need LLVM to bootstrap later stages, so it becomes a - # build-time dependency too. - buildLlvmPackages, llvmPackages - -, # If enabled, GHC will be built with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? false, gmp ? null, m4 - -, # If enabled, use -fPIC when compiling static libs. - enableRelocatedStaticLibs ? targetPlatform != hostPlatform - -, # Whether to build dynamic libs for the standard library (on the target - # platform). Static libs are always built. - enableShared ? true - -, version ? "8.4.1" -, # Whether to backport https://phabricator.haskell.org/D4388 for - # deterministic profiling symbol names, at the cost of a slightly - # non-standard GHC API - deterministicProfiling ? false -}: - -assert !enableIntegerSimple -> gmp != null; - -let - inherit (bootPkgs) ghc; - - # TODO(@Ericson2314) Make unconditional - targetPrefix = stdenv.lib.optionalString - (targetPlatform != hostPlatform) - "${targetPlatform.config}-"; - - buildMK = '' - DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} - '' + stdenv.lib.optionalString enableIntegerSimple '' - INTEGER_LIBRARY = integer-simple - '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - BuildFlavour = perf-cross - Stage1Only = YES - HADDOCK_DOCS = NO - BUILD_SPHINX_HTML = NO - BUILD_SPHINX_PDF = NO - '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' - GhcLibHcOpts += -fPIC - GhcRtsHcOpts += -fPIC - ''; - - # Splicer will pull out correct variations - libDeps = platform: [ ncurses ] - ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc") libiconv; - - toolsForTarget = - if hostPlatform == buildPlatform then - [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm - else assert targetPlatform == hostPlatform; # build != host == target - [ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; - - targetCC = builtins.head toolsForTarget; - -in -stdenv.mkDerivation rec { - inherit version; - inherit (src) rev; - name = "${targetPrefix}ghc-${version}"; - - src = fetchgit { - url = "git://git.haskell.org/ghc.git"; - rev = "0a3e2f324dbd525d626ebd3d97e8ffa1cf2f0ffb"; - sha256 = "1m51khnmf8gw203d8kh6y4ivh0acb2wiqqnb950yfbg2a2k7bcfi"; - }; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - patches = [ - (import ./abi-depends-determinism.nix { inherit fetchpatch runCommand; }) - ] ++ stdenv.lib.optional deterministicProfiling - (fetchpatch { # https://phabricator.haskell.org/D4388 for more determinism - url = "https://github.com/shlevy/ghc/commit/8b2dbd869d1a64de3e99fa8b1c9bb1140eee7099.patch"; - sha256 = "0hxpiwhbg64rsyjdr4psh6dwyp58b96mad3adccvfr0x8hc6ba2m"; - }); - - postPatch = "patchShebangs ."; - - # GHC is a bit confused on its cross terminology. - preConfigure = '' - for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do - export "''${env#TARGET_}=''${!env}" - done - # GHC is a bit confused on its cross terminology, as these would normally be - # the *host* tools. - export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" - export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" - # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" - export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" - export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" - export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" - export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" - export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" - export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" - - echo -n "${buildMK}" > mk/build.mk - echo ${version} >VERSION - echo ${src.rev} >GIT_COMMIT_ID - ./boot - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - ''; - - # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] - ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; - # `--with` flags for libraries needed for RTS linker - configureFlags = [ - "--datadir=$doc/share/doc/ghc" - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [ - "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [ - "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" - ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ - "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [ - "CFLAGS=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [ - # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - "--disable-large-address-space" - ]; - - # Hack to make sure we never to the relaxation `$PATH` and hooks support for - # compatability. This will be replaced with something clearer in a future - # masss-rebuild. - crossConfig = true; - - nativeBuildInputs = [ ghc perl autoconf automake m4 happy alex python3 ]; - - # For building runtime libs - depsBuildTarget = toolsForTarget; - - buildInputs = libDeps hostPlatform; - - propagatedBuildInputs = [ targetPackages.stdenv.cc ] - ++ stdenv.lib.optional useLLVM llvmPackages.llvm; - - depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; - - checkTarget = "test"; - - # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't - # treat that as a unary `{x,y,z,..}` repetition. - postInstall = '' - paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"} - - # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc - - # Patch scripts to include "readelf" and "cat" in $PATH. - for i in "$out/bin/"*; do - test ! -h $i || continue - egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i - done - ''; - - passthru = { - inherit bootPkgs targetPrefix; - - inherit llvmPackages; - - # Our Cabal compiler name - haskellCompilerName = "ghc-8.4.1"; - }; - - meta = { - homepage = http://haskell.org/ghc; - description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; - inherit (ghc.meta) license platforms; - }; - -} diff --git a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix index 642c17dc6d3..b93a13abc9c 100644 --- a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix @@ -25,7 +25,6 @@ , setJavaClassPath }: -assert stdenv.system == "x86_64-linux"; assert swingSupport -> xorg != null; let diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 29a192fcff2..261a2fb6432 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.4.6"; + version = "1.4.7"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "0y46zgg3lamaqqhxbqmbwzvdakzvc9j07d0ci8f57pfl549v04a4"; + sha256 = "1wmxly94pn8527092hyzg5mq58mg7qlc46nm31f268wb2dm67rvm"; }; patchPhase = '' diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 4c79fb15c5c..d94ce75e3f5 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -1,7 +1,9 @@ -{ stdenv, fetchzip, fetchurl, boost, cmake, z3 }: +{ stdenv, fetchzip, fetchFromGitHub, boost, cmake, z3 }: let - version = "0.4.20"; + version = "0.4.23"; + rev = "124ca40dc525a987a88176c6e5170978e82fa290"; + sha256 = "07l8rfqh95yrdmbxc4pfb77s06k5v65dk3rgdqscqmwchkndrmm0"; jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz; jsoncpp = fetchzip { url = jsoncppURL; @@ -12,33 +14,45 @@ in stdenv.mkDerivation { name = "solc-${version}"; - # Cannot use `fetchFromGitHub' because of submodules - src = fetchurl { - url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz"; - sha256 = "0jyqnykj537ksfsf2m6ww9vganmpa6yd5fmlfpa5qm1076kq7zd6"; + src = fetchFromGitHub { + owner = "ethereum"; + repo = "solidity"; + inherit rev sha256; }; - patchPhase = '' + patches = [ + ./patches/boost-shared-libs.patch + ./patches/shared-libs-install.patch + ]; + + postPatch = '' + touch prerelease.txt + echo >commit_hash.txt "${rev}" substituteInPlace cmake/jsoncpp.cmake \ - --replace '${jsoncppURL}' ${jsoncpp} + --replace "${jsoncppURL}" ${jsoncpp} substituteInPlace cmake/EthCompilerSettings.cmake \ - --replace 'add_compile_options(-Werror)' "" + --replace "add_compile_options(-Werror)" "" ''; cmakeFlags = [ "-DBoost_USE_STATIC_LIBS=OFF" + "-DBUILD_SHARED_LIBS=ON" + "-DINSTALL_LLLC=ON" + "-DTESTS=OFF" ]; nativeBuildInputs = [ cmake ]; buildInputs = [ boost z3 ]; - meta = { + outputs = [ "out" "dev" ]; + + meta = with stdenv.lib; { description = "Compiler for Ethereum smart contract language Solidity"; longDescription = "This package also includes `lllc', the LLL compiler."; homepage = https://github.com/ethereum/solidity; - license = stdenv.lib.licenses.gpl3; - platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = [ stdenv.lib.maintainers.dbrock ]; + license = licenses.gpl3; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ dbrock akru ]; inherit version; }; } diff --git a/pkgs/development/compilers/solc/patches/boost-shared-libs.patch b/pkgs/development/compilers/solc/patches/boost-shared-libs.patch new file mode 100644 index 00000000000..499fc46c6ca --- /dev/null +++ b/pkgs/development/compilers/solc/patches/boost-shared-libs.patch @@ -0,0 +1,24 @@ +diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt +index 97b01c83..0bdec4b4 100644 +--- a/libsolidity/CMakeLists.txt ++++ b/libsolidity/CMakeLists.txt +@@ -28,7 +28,7 @@ else() + endif() + + add_library(solidity ${sources} ${headers}) +-target_link_libraries(solidity PUBLIC evmasm devcore) ++target_link_libraries(solidity PUBLIC evmasm devcore ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}) + + if (${Z3_FOUND}) + target_link_libraries(solidity PUBLIC ${Z3_LIBRARY}) +diff --git a/lllc/CMakeLists.txt b/lllc/CMakeLists.txt +index 5c480093..d6538ee2 100644 +--- a/lllc/CMakeLists.txt ++++ b/lllc/CMakeLists.txt +@@ -1,5 +1,5 @@ + add_executable(lllc main.cpp) +-target_link_libraries(lllc PRIVATE lll) ++target_link_libraries(lllc PRIVATE lll ${Boost_SYSTEM_LIBRARY}) + + if (INSTALL_LLLC) + include(GNUInstallDirs) diff --git a/pkgs/development/compilers/solc/patches/shared-libs-install.patch b/pkgs/development/compilers/solc/patches/shared-libs-install.patch new file mode 100644 index 00000000000..732797e5ae7 --- /dev/null +++ b/pkgs/development/compilers/solc/patches/shared-libs-install.patch @@ -0,0 +1,64 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4ac56b43..dacf3853 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -48,6 +48,19 @@ add_subdirectory(libevmasm) + add_subdirectory(libsolidity) + add_subdirectory(libsolc) + ++install(DIRECTORY libdevcore/ ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libdevcore ++ FILES_MATCHING PATTERN "*.h") ++install(DIRECTORY libevmasm/ ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libevmasm ++ FILES_MATCHING PATTERN "*.h") ++install(DIRECTORY libsolidity/ ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libsolidity ++ FILES_MATCHING PATTERN "*.h") ++install(DIRECTORY liblll/ ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/liblll ++ FILES_MATCHING PATTERN "*.h") ++ + if (NOT EMSCRIPTEN) + add_subdirectory(solc) + add_subdirectory(liblll) +diff --git a/libdevcore/CMakeLists.txt b/libdevcore/CMakeLists.txt +index fa7e3f48..1f9f52b4 100644 +--- a/libdevcore/CMakeLists.txt ++++ b/libdevcore/CMakeLists.txt +@@ -6,3 +6,4 @@ target_link_libraries(devcore PRIVATE jsoncpp ${Boost_FILESYSTEM_LIBRARIES} ${Bo + target_include_directories(devcore PUBLIC "${CMAKE_SOURCE_DIR}") + target_include_directories(devcore SYSTEM PUBLIC ${Boost_INCLUDE_DIRS}) + add_dependencies(devcore solidity_BuildInfo.h) ++install(TARGETS devcore LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +diff --git a/libevmasm/CMakeLists.txt b/libevmasm/CMakeLists.txt +index 86192c1b..e7f15e93 100644 +--- a/libevmasm/CMakeLists.txt ++++ b/libevmasm/CMakeLists.txt +@@ -3,3 +3,4 @@ file(GLOB headers "*.h") + + add_library(evmasm ${sources} ${headers}) + target_link_libraries(evmasm PUBLIC jsoncpp devcore) ++install(TARGETS evmasm LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +diff --git a/liblll/CMakeLists.txt b/liblll/CMakeLists.txt +index 4cdc073a..b61f03c7 100644 +--- a/liblll/CMakeLists.txt ++++ b/liblll/CMakeLists.txt +@@ -3,3 +3,4 @@ file(GLOB headers "*.h") + + add_library(lll ${sources} ${headers}) + target_link_libraries(lll PUBLIC evmasm devcore) ++install(TARGETS lll LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt +index 97b01c83..e876177e 100644 +--- a/libsolidity/CMakeLists.txt ++++ b/libsolidity/CMakeLists.txt +@@ -28,7 +28,8 @@ else() + endif() + + add_library(solidity ${sources} ${headers}) + target_link_libraries(solidity PUBLIC evmasm devcore ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}) ++install(TARGETS solidity LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + if (${Z3_FOUND}) + target_link_libraries(solidity PUBLIC ${Z3_LIBRARY}) diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index c56ea8cc649..5289540e944 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -1,25 +1,27 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, boost, bison, flex, openjdk, doxygen, perl, graphviz }: +{ stdenv, fetchFromGitHub, autoconf, automake, boost, bison, flex, openjdk, doxygen, perl, graphviz, libtool, lsb-release, ncurses, zlib, sqlite }: stdenv.mkDerivation rec { - version = "1.0.0"; + version = "1.2.0"; name = "souffle-${version}"; src = fetchFromGitHub { owner = "souffle-lang"; repo = "souffle"; rev = version; - sha256 = "13j14227dgxcm25z9iizcav563wg2ak9338pb03aqqz8yqxbmz4n"; + sha256 = "1g8yvm40h102mab8lacpl1cwgqsw1js0s1yn4l84l9fjdvlh2ygd"; }; buildInputs = [ autoconf automake boost bison flex openjdk + # Used for 1.2.0 + libtool lsb-release ncurses zlib sqlite # Used for docs doxygen perl graphviz ]; patchPhase = '' substituteInPlace configure.ac \ - --replace "m4_esyscmd([git describe --tags --abbrev=0 | tr -d '\n'])" "${version}" + --replace "m4_esyscmd([git describe --tags --abbrev=0 --always | tr -d '\n'])" "${version}" ''; # Without this, we get an obscure error about not being able to find a library version @@ -29,17 +31,11 @@ stdenv.mkDerivation rec { preConfigure = "./bootstrap"; - # in 1.0.0: parser.hh:40:0: error: unterminated #ifndef - enableParallelBuilding = false; - - # See https://github.com/souffle-lang/souffle/issues/176 - hardeningDisable = [ "fortify" ]; - meta = with stdenv.lib; { description = "A translator of declarative Datalog programs into the C++ language"; homepage = "http://souffle-lang.github.io/"; platforms = platforms.unix; - maintainers = with maintainers; [ copumpkin ]; + maintainers = with maintainers; [ copumpkin wchresta ]; license = licenses.upl; }; } 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 cf103628312..4ed59fb6662 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -108,31 +108,6 @@ self: super: { ## On Hackage: ## Upstreamed, awaiting a Hackage release - haskell-gi = overrideCabal super.haskell-gi (drv: { - ## Setup: Encountered missing dependencies: - ## haskell-gi-base ==0.20.* - src = pkgs.fetchFromGitHub { - owner = "haskell-gi"; - repo = "haskell-gi"; - rev = "30d2e6415c5b57760f8754cd3003eb07483d60e6"; - sha256 = "1l3qm97gcjih695hhj80rbpnd72prnc81lg5y373yj8jk9f6ypbr"; - }; - }); - - ## Upstreamed, awaiting a Hackage release - haskell-gi-base = overrideCabal super.haskell-gi-base (drv: { - ## Setup: Encountered missing dependencies: - ## haskell-gi-base ==0.21.* - src = pkgs.fetchFromGitHub { - owner = "haskell-gi"; - repo = "haskell-gi"; - rev = "30d2e6415c5b57760f8754cd3003eb07483d60e6"; - sha256 = "1l3qm97gcjih695hhj80rbpnd72prnc81lg5y373yj8jk9f6ypbr"; - }; - prePatch = "cd base; "; - }); - - ## Upstreamed, awaiting a Hackage release http-api-data = overrideCabal super.http-api-data (drv: { ## • No instance for (Semigroup Form) ## arising from the 'deriving' clause of a data type declaration @@ -177,34 +152,7 @@ self: super: { prePatch = "cd lambdacube-ir.haskell; "; }); - ## Upstreamed, awaiting a Hackage release - simple-reflect = overrideCabal super.simple-reflect (drv: { - ## • No instance for (Semigroup Expr) - ## arising from the superclasses of an instance declaration - ## • In the instance declaration for ‘Monoid Expr’ - src = pkgs.fetchFromGitHub { - owner = "twanvl"; - repo = "simple-reflect"; - rev = "c357e55da9a712dc5dbbfe6e36394e4ada2db310"; - sha256 = "15q41b00l8y51xzhbj5zhddyh3gi7gvml033w8mm2fih458jf6yq"; - }; - }); - singletons = super.singletons_2_4_1; - - ## Upstreamed, awaiting a Hackage release - tar = overrideCabal super.tar (drv: { - ## • No instance for (Semigroup (Entries e)) - ## arising from the superclasses of an instance declaration - ## • In the instance declaration for ‘Monoid (Entries e)’ - src = pkgs.fetchFromGitHub { - owner = "haskell"; - repo = "tar"; - rev = "abf2ccb8f7da0514343a0b2624cabebe081bdfa8"; - sha256 = "0s33lgrr574i1r7zc1jqahnwx3dv47ny30mbx5zfpdzjw0jdl5ny"; - }; - }); - th-desugar = super.th-desugar_1_8; ## Upstreamed, awaiting a Hackage release @@ -245,54 +193,6 @@ self: super: { libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ data-or ]); }); - ## Unmerged. PR: https://github.com/dhall-lang/dhall-haskell/pull/321 - dhall = overrideCabal super.dhall (drv: { - ## • No instance for (Semigroup (Parser Builder)) - ## arising from a use of ‘<>’ - ## There are instances for similar types: - src = pkgs.fetchFromGitHub { - owner = "deepfire"; - repo = "dhall-haskell"; - rev = "38f3d8c861e137da6d8ac8eab88aec1c359efcac"; - sha256 = "1pya7lhdjsygk622k1g3whj0a7jqwyym26ikxbn1anxypnb0n2wy"; - }; - ## Setup: Encountered missing dependencies: - ## prettyprinter >=1.2.0.1 && <1.3 - jailbreak = true; - ## Setup: Encountered missing dependencies: - ## insert-ordered-containers -any, - ## lens-family-core -any, - ## prettyprinter-ansi-terminal -any, - ## repline -any - libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ insert-ordered-containers lens-family-core prettyprinter prettyprinter-ansi-terminal repline ]); - }); - - ## Unmerged. PR: https://github.com/gtk2hs/gtk2hs/pull/233 - gtk2hs-buildtools = overrideCabal super.gtk2hs-buildtools (drv: { - ## Setup: Encountered missing dependencies: - ## Cabal >=1.24.0.0 && <2.1 - src = pkgs.fetchFromGitHub { - owner = "deepfire"; - repo = "gtk2hs"; - rev = "08c68d5afc22dd5761ec2c92ebf49c6d252e545b"; - sha256 = "06prn5wqq8x225n9wlbyk60f50jyjj8fm2hf181dyqjpf8wq75xa"; - }; - prePatch = "cd tools; "; - }); - - ## Unmerged. PR: https://github.com/gregorycollins/hashtables/pull/46 - hashtables = overrideCabal super.hashtables (drv: { - ## • No instance for (Semigroup Slot) - ## arising from the superclasses of an instance declaration - ## • In the instance declaration for ‘Monoid Slot’ - src = pkgs.fetchFromGitHub { - owner = "deepfire"; - repo = "hashtables"; - rev = "b9eb4b10a50bd6250330422afecc065339a32412"; - sha256 = "0l4nplpvnzzf397zyh7j2k6yiqb46k6bdy00m4zzvhlfp7p1xkaw"; - }; - }); - ## Unmerged. PR: https://github.com/hanshoglund/monadplus/pull/3 monadplus = overrideCabal super.monadplus (drv: { ## • No instance for (Semigroup (Partial a b)) @@ -346,20 +246,6 @@ self: super: { }; }); - ## Unmerged. PR: https://github.com/ivan-m/wl-pprint-text/pull/17 - wl-pprint-text = overrideCabal super.wl-pprint-text (drv: { - ## Ambiguous occurrence ‘<>’ - ## It could refer to either ‘PP.<>’, - ## imported from ‘Prelude.Compat’ at Text/PrettyPrint/Leijen/Text/Monadic.hs:73:1-36 - src = pkgs.fetchFromGitHub { - owner = "deepfire"; - repo = "wl-pprint-text"; - rev = "615b83d1e5be52d1448aa1ab2517b431a617027b"; - sha256 = "1p67v9s878br0r152h4n37smqhkg78v8zxhf4qm6d035s4rzj76i"; - }; - }); - - ## Non-code, configuration-only change adjunctions = overrideCabal super.adjunctions (drv: { @@ -556,12 +442,16 @@ self: super: { # Older versions don't compile. brick = self.brick_0_36_3; + dhall = self.dhall_1_13_0; + dhall_1_13_0 = doJailbreak super.dhall_1_13_0; # support ansi-terminal 0.8.x HaTeX = self.HaTeX_3_19_0_0; hpack = self.hpack_0_28_2; hspec-smallcheck = self.hspec-smallcheck_0_5_2; matrix = self.matrix_0_3_6_1; pandoc = self.pandoc_2_2; pandoc-types = self.pandoc-types_1_17_4_2; + wl-pprint-text = self.wl-pprint-text_1_1_1_1; + base-compat = self.base-compat_0_10_1; # https://github.com/xmonad/xmonad/issues/155 xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f3ea3b8954f..e9d076343f8 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -7353,6 +7353,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "HCodecs_0_5_1" = callPackage + ({ mkDerivation, array, base, bytestring, QuickCheck, random + , semigroups + }: + mkDerivation { + pname = "HCodecs"; + version = "0.5.1"; + sha256 = "0hrib81nw4g7qgka3brypb8k1mg7l37m8gywc7bc44mcg5mn2957"; + libraryHaskellDepends = [ + array base bytestring QuickCheck random semigroups + ]; + testHaskellDepends = [ + array base bytestring QuickCheck random semigroups + ]; + homepage = "http://www-db.informatik.uni-tuebingen.de/team/giorgidze"; + description = "A library to read, write and manipulate MIDI, WAVE, and SoundFont2 files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HDBC" = callPackage ({ mkDerivation, base, bytestring, containers, convertible, mtl , old-time, text, time, utf8-string @@ -9540,8 +9560,8 @@ self: { }: mkDerivation { pname = "Hastodon"; - version = "0.4.0"; - sha256 = "00zq3kzzazqlgbh45xc6py3m23x448af34d4y3z903by79fid79f"; + version = "0.4.1"; + sha256 = "08skn3qvqfzll1hhzayqm46kwdl45kbckgwvzjm4bqa5w5jvh708"; libraryHaskellDepends = [ aeson attoparsec base bytestring conduit exceptions http-client http-conduit http-types mime-types MissingH resourcet text @@ -10446,6 +10466,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "IPv6Addr_1_0_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network + , network-info, random, test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "IPv6Addr"; + version = "1.0.3"; + sha256 = "17bk63qi9krfghplrmck4v1hv54kwdppl50hfm7349dqfhdbf129"; + libraryHaskellDepends = [ + aeson attoparsec base iproute network network-info random text + ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit text + ]; + homepage = "https://github.com/MichelBoucey/IPv6Addr"; + description = "Library to deal with IPv6 address text representations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "IPv6DB" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger , hedis, hspec, http-client, http-types, IPv6Addr, mtl @@ -15358,8 +15398,8 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "QuickCheck-safe"; - version = "0.1.0.3"; - sha256 = "0fwnywnmdws04f1y7qw0l8hawa2hn99x62g1mpjwcdx8dm4yal7f"; + version = "0.1.0.4"; + sha256 = "0ixizi0cshqqczm86rnibas8zygf8i29l3i0jivvb81zi89rscl7"; libraryHaskellDepends = [ base QuickCheck ]; description = "Safe reimplementation of QuickCheck's core"; license = stdenv.lib.licenses.mit; @@ -16619,7 +16659,7 @@ self: { description = "A .NET Bridge for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) glib; mono = null;}; + }) {inherit (pkgs) glib; inherit (pkgs) mono;}; "Saturnin" = callPackage ({ mkDerivation, base, bytestring, data-default, directory, either @@ -21089,17 +21129,17 @@ self: { ({ mkDerivation, aeson, aeson-casing, base, base64-bytestring , bytestring, containers, exceptions, filepath, http-client , http-client-tls, http-types, katip, lens, lens-aeson, mtl, random - , safe-exceptions, stm, tasty, tasty-hunit, text, th-format + , safe-exceptions, say, stm, tasty, tasty-hunit, text, th-format , transformers, unliftio, unliftio-core, uuid }: mkDerivation { pname = "access-token-provider"; - version = "0.1.0.0"; - sha256 = "03832v0aab3imqim8f6g1r0jj2pfrrca45qnvpkw7ry7krbq5z7q"; + version = "0.1.1.0"; + sha256 = "18j07sb100zb407n7dpyppi5mc20g57y73k3sscmvlgq6yqdxwk4"; libraryHaskellDepends = [ aeson aeson-casing base base64-bytestring bytestring containers exceptions filepath http-client http-client-tls http-types katip - lens lens-aeson mtl random safe-exceptions stm text th-format + lens lens-aeson mtl random safe-exceptions say stm text th-format transformers unliftio unliftio-core ]; testHaskellDepends = [ @@ -23772,12 +23812,12 @@ self: { }) {}; "alg" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, util }: mkDerivation { pname = "alg"; - version = "0.2.1.0"; - sha256 = "13glk774rdd6fwi427djkc1q4xqmdf44smhp5lgv24vfwd5fffcq"; - libraryHaskellDepends = [ base ]; + version = "0.2.2.0"; + sha256 = "1hhmzlq831618j36yq8kjh4sagmhg3w1ghr53lip06avis2c0gl7"; + libraryHaskellDepends = [ base util ]; description = "Algebraic structures"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -28464,10 +28504,8 @@ self: { }: mkDerivation { pname = "arbtt"; - version = "0.10.0.1"; - sha256 = "0pav5q0xh90vjrj77l7vk38l38xyhqas4750il5wkpqf4f5li877"; - revision = "1"; - editedCabalFile = "1mmrv81c9gwa2gqlp0agipg5sdxm88fhiza84y2sv8vg7zf88x82"; + version = "0.10.0.2"; + sha256 = "13jmv7bxiy0v2y2w6qwsb9mh5m97sxrlb5w1kaqzag8d0cnz7w6c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -32529,6 +32567,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "backprop_0_2_0_0" = callPackage + ({ mkDerivation, base, bifunctors, containers, criterion, deepseq + , directory, hmatrix, lens, microlens, mnist-idx, mwc-random + , primitive, reflection, time, transformers, type-combinators + , vector + }: + mkDerivation { + pname = "backprop"; + version = "0.2.0.0"; + sha256 = "1h2cb3birbcgm0fyqr4i2d85dkwrpbqkd67a6imh3z9nsc7zy66y"; + libraryHaskellDepends = [ + base containers deepseq microlens primitive reflection transformers + type-combinators vector + ]; + benchmarkHaskellDepends = [ + base bifunctors criterion deepseq directory hmatrix lens mnist-idx + mwc-random time transformers vector + ]; + homepage = "https://github.com/mstksg/backprop#readme"; + description = "Heterogeneous automatic differentation (backpropagation)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "backtracking-exceptions" = callPackage ({ mkDerivation, base, either, free, kan-extensions, mtl , semigroupoids, semigroups, transformers @@ -33709,7 +33771,7 @@ self: { , codec-rpm, cond, conduit, conduit-combinators, conduit-extra , containers, content-store, cpio-conduit, cryptonite, directory , esqueleto, exceptions, filepath, gi-gio, gi-glib, gi-ostree - , gitrev, hspec, http-conduit, HUnit, listsafe, memory + , gitrev, hspec, http-conduit, HUnit, lifted-base, listsafe, memory , monad-control, monad-logger, monad-loops, mtl, network-uri , ostree, parsec, parsec-numbers, persistent, persistent-sqlite , persistent-template, process, regex-pcre, resourcet, split, tar @@ -33718,8 +33780,8 @@ self: { }: mkDerivation { pname = "bdcs"; - version = "0.4.0"; - sha256 = "008rd17zfg63w9szp4jrbd9z9sg4zjf4j4a5gm3skhn2nq7qaw9i"; + version = "0.5.0"; + sha256 = "1anb8nz25a0cvfn6ksn01y6sbjg3cn9pd8lwg8hpjza11hm33kcg"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -33728,10 +33790,10 @@ self: { aeson base bytestring codec-rpm cond conduit conduit-combinators conduit-extra containers content-store cpio-conduit cryptonite directory esqueleto exceptions filepath gi-gio gi-glib gi-ostree - gitrev http-conduit listsafe memory monad-control monad-logger mtl - network-uri parsec parsec-numbers persistent persistent-sqlite - persistent-template process regex-pcre resourcet split tar - tar-conduit temporary text time unix unordered-containers + gitrev http-conduit lifted-base listsafe memory monad-control + monad-logger mtl network-uri parsec parsec-numbers persistent + persistent-sqlite persistent-template process regex-pcre resourcet + split tar tar-conduit temporary text time unix unordered-containers xml-conduit ]; libraryPkgconfigDepends = [ ostree ]; @@ -33862,6 +33924,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "beam-migrate_0_3_2_0" = callPackage + ({ mkDerivation, aeson, base, beam-core, bytestring, containers + , deepseq, dependent-map, dependent-sum, free, ghc-prim, hashable + , haskell-src-exts, mtl, parallel, pqueue, pretty, scientific, text + , time, unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "beam-migrate"; + version = "0.3.2.0"; + sha256 = "1a6m27cpa2xlwmwfi1374p3a23i2hm8fjfsl6bdn0zpnawgi5rhf"; + libraryHaskellDepends = [ + aeson base beam-core bytestring containers deepseq dependent-map + dependent-sum free ghc-prim hashable haskell-src-exts mtl parallel + pqueue pretty scientific text time unordered-containers uuid-types + vector + ]; + homepage = "https://travis.athougies.net/projects/beam.html"; + description = "SQL DDL support and migrations support library for Beam"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "beam-postgres" = callPackage ({ mkDerivation, aeson, base, beam-core, beam-migrate, bytestring , case-insensitive, conduit, free, hashable, haskell-src-exts @@ -37989,8 +38073,8 @@ self: { }: mkDerivation { pname = "bloodhound-amazonka-auth"; - version = "0.1.2.0"; - sha256 = "1r9fj8zh9swdmy0f96112kpm1s50wlyf194w2km4rpq2hblcjlrm"; + version = "0.1.2.1"; + sha256 = "06h3yw5fy6y1vr0zd059p3whm2mlfqwi9vjz80rwq7w6lv0p85a8"; libraryHaskellDepends = [ amazonka-core amazonka-elasticsearch base bloodhound exceptions http-client http-types time transformers uri-bytestring @@ -39392,33 +39476,31 @@ self: { license = stdenv.lib.licenses.agpl3; }) {}; - "brittany_0_10_0_0" = callPackage + "brittany_0_11_0_0" = callPackage ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs , containers, czipwith, data-tree-print, deepseq, directory, extra , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths, hspec , monad-memo, mtl, multistate, neat-interpolation, parsec, pretty - , safe, semigroups, strict, syb, text, transformers, uniplate - , unsafe, yaml + , random, safe, semigroups, strict, syb, text, transformers + , uniplate, unsafe, yaml }: mkDerivation { pname = "brittany"; - version = "0.10.0.0"; - sha256 = "1fm6l4ial8kp4mafwkp7w79nklc46c07i12p1in3dqxz9r5817r1"; - revision = "1"; - editedCabalFile = "1mq1hgakxwzk4k4d8gwfbngprcprjagnvkvq389z1m1vda3w80i8"; + version = "0.11.0.0"; + sha256 = "1fgcim4q5y7csk8c038rm97w6b8bgynmi6h1dwyr2hsmzw9hxa26"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base butcher bytestring cmdargs containers czipwith data-tree-print deepseq directory extra filepath ghc ghc-boot-th ghc-exactprint ghc-paths monad-memo mtl multistate - neat-interpolation pretty safe semigroups strict syb text + neat-interpolation pretty random safe semigroups strict syb text transformers uniplate unsafe yaml ]; executableHaskellDepends = [ aeson base butcher bytestring cmdargs containers czipwith data-tree-print deepseq directory extra filepath ghc ghc-boot-th - ghc-exactprint ghc-paths hspec monad-memo mtl multistate + ghc-exactprint ghc-paths monad-memo mtl multistate neat-interpolation pretty safe semigroups strict syb text transformers uniplate unsafe yaml ]; @@ -40655,8 +40737,8 @@ self: { ({ mkDerivation, base, bytestring, terminal-progress-bar, time }: mkDerivation { pname = "bytestring-progress"; - version = "1.0.9"; - sha256 = "1gqcr15956zzldsc3rvds3ybd43907bv69cw3i7a1c0nfz60zg70"; + version = "1.2"; + sha256 = "195vsqpmaycxi0k7kk1hasrklnblr3psllc288vkh77pbnfm3vqi"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring terminal-progress-bar time @@ -41909,6 +41991,8 @@ self: { pname = "cabal-test-quickcheck"; version = "0.1.8.1"; sha256 = "0r5fd670a5ch0lzw7wsxp6k06wzi64wvjbiy8zyfl7brmjnbh8gn"; + revision = "1"; + editedCabalFile = "1rq6l86sndcv8nb5nl9rki2kmblrarj9cbra0i6kixa5n1wbcmv6"; libraryHaskellDepends = [ base Cabal QuickCheck ]; homepage = "https://github.com/zmthy/cabal-test-quickcheck"; description = "QuickCheck for Cabal"; @@ -44207,8 +44291,8 @@ self: { }: mkDerivation { pname = "cdeps"; - version = "0.1.0.1"; - sha256 = "16pzba0zc346d3azw4wd90apz7ldx68d5vd3q13dd3s9f3gqy4wv"; + version = "0.1.0.2"; + sha256 = "1yd1ahf2ri31lwcs0mvhn6wgpglgk3vsf5698qw6asm8rl1gcaz9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45697,14 +45781,17 @@ self: { }) {}; "chronologique" = callPackage - ({ mkDerivation, base, hourglass, hspec, QuickCheck, time, vector + ({ mkDerivation, aeson, base, bytestring, hourglass, hspec + , QuickCheck, text, time, vector }: mkDerivation { pname = "chronologique"; - version = "0.3.0.1"; - sha256 = "1l3964zp7c4pj3izdcknnvsbn3avyvfychlxs9rl9hr251qbcf14"; - libraryHaskellDepends = [ base hourglass time vector ]; - testHaskellDepends = [ base hourglass hspec QuickCheck vector ]; + version = "0.3.1.1"; + sha256 = "05ly96mdm4nxmn7yz04wq9kgzlq8biaaaxs1mvsc3f8wgcpbqf65"; + libraryHaskellDepends = [ aeson base hourglass text time vector ]; + testHaskellDepends = [ + aeson base bytestring hourglass hspec QuickCheck vector + ]; homepage = "https://github.com/afcowie/chronologique/"; description = "Time to manipulate time"; license = stdenv.lib.licenses.bsd3; @@ -47736,7 +47823,7 @@ self: { homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-host"; description = "Hosting the Common Language Runtime"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) glib; mono = null;}; + }) {inherit (pkgs) glib; inherit (pkgs) mono;}; "clr-inline" = callPackage ({ mkDerivation, base, bytestring, Cabal, case-insensitive @@ -50189,12 +50276,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "composition-prelude_1_4_0_3" = callPackage + "composition-prelude_1_4_0_5" = callPackage ({ mkDerivation, base, cpphs }: mkDerivation { pname = "composition-prelude"; - version = "1.4.0.3"; - sha256 = "0vzd71yqnbx5pk4yvan1sbjdgg3b7k476jiyr36pjyi1ysdm13qj"; + version = "1.4.0.5"; + sha256 = "0bcz7lx4v25dz9d11qy8im6fk1gviqqhgcr1bwxg4yqyzbfl8bas"; libraryHaskellDepends = [ base ]; libraryToolDepends = [ cpphs ]; homepage = "https://github.com/vmchale/composition-prelude#readme"; @@ -53780,6 +53867,29 @@ self: { license = "unknown"; }) {}; + "cql_4_0_0" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, Decimal + , iproute, network, QuickCheck, tasty, tasty-quickcheck + , template-haskell, text, time, transformers, uuid, vector + }: + mkDerivation { + pname = "cql"; + version = "4.0.0"; + sha256 = "09sm9wxjfmiv62brrj6hcfsjz3s8xwc4ihrwxdq8fqsv9cf82fj7"; + libraryHaskellDepends = [ + base bytestring cereal containers Decimal iproute network + template-haskell text time transformers uuid vector + ]; + testHaskellDepends = [ + base bytestring cereal Decimal iproute network QuickCheck tasty + tasty-quickcheck text time uuid + ]; + homepage = "https://gitlab.com/twittner/cql/"; + description = "Cassandra CQL binary protocol"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cql-io" = callPackage ({ mkDerivation, async, auto-update, base, bytestring, containers , cql, cryptohash, data-default-class, exceptions, hashable @@ -53791,6 +53901,8 @@ self: { pname = "cql-io"; version = "0.16.0"; sha256 = "012043s6cfkybj764hlrc7i9ql6afl79s2vnjbn9vz99p7wszrc2"; + revision = "1"; + editedCabalFile = "07vrizkarip8ap5hp6ngp7yf8xfdmm3r6zbaxafk48raxyfkl8xd"; libraryHaskellDepends = [ async auto-update base bytestring containers cql cryptohash data-default-class exceptions hashable HsOpenSSL iproute lens @@ -53802,6 +53914,35 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "cql-io_1_0_0" = callPackage + ({ mkDerivation, async, auto-update, base, bytestring, containers + , cql, cryptohash, data-default-class, Decimal, exceptions + , hashable, HsOpenSSL, iproute, lens, monad-control, mtl + , mwc-random, network, raw-strings-qq, retry, semigroups, stm + , tasty, tasty-hunit, text, time, tinylog, transformers + , transformers-base, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "cql-io"; + version = "1.0.0"; + sha256 = "0wij5h44rk4lnnvh3i6s04bk7dhvxvv9l9y2qicm44736zrphlmx"; + libraryHaskellDepends = [ + async auto-update base bytestring containers cql cryptohash + data-default-class exceptions hashable HsOpenSSL iproute lens + monad-control mtl mwc-random network retry semigroups stm text time + tinylog transformers transformers-base unordered-containers uuid + vector + ]; + testHaskellDepends = [ + base containers cql Decimal iproute mtl raw-strings-qq tasty + tasty-hunit text time tinylog uuid + ]; + homepage = "https://gitlab.com/twittner/cql-io/"; + description = "Cassandra CQL client"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cqrs" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -59010,6 +59151,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "datafix" = callPackage + ({ mkDerivation, base, Cabal, cabal-toolkit, containers, criterion + , deepseq, directory, doctest, filepath, ghc, ghc-paths, Glob + , lattices, pomaps, primitive, QuickCheck, tasty, tasty-hunit + , tasty-smallcheck, text, transformers, turtle, vector + }: + mkDerivation { + pname = "datafix"; + version = "0.0.0.1"; + sha256 = "0pdpqwdbc8hmwwq460yisbj4072x3jyh7gcrf1flm2545acgahvq"; + setupHaskellDepends = [ base Cabal cabal-toolkit ]; + libraryHaskellDepends = [ + base containers lattices pomaps primitive transformers vector + ]; + testHaskellDepends = [ + base Cabal cabal-toolkit containers directory doctest filepath ghc + ghc-paths Glob lattices primitive QuickCheck tasty tasty-hunit + tasty-smallcheck text transformers turtle + ]; + benchmarkHaskellDepends = [ + base Cabal cabal-toolkit containers criterion deepseq directory + filepath ghc ghc-paths lattices primitive text transformers turtle + ]; + homepage = "https://github.com/sgraf812/datafix"; + description = "Fixing data-flow problems"; + license = stdenv.lib.licenses.isc; + }) {}; + "dataflow" = callPackage ({ mkDerivation, aeson, base, blaze-html, bytestring, containers , filepath, gitrev, hastache, hspec, HUnit, markdown, MissingH, mtl @@ -60490,8 +60659,8 @@ self: { ({ mkDerivation, base, foldl }: mkDerivation { pname = "deferred-folds"; - version = "0.2.1"; - sha256 = "0i8wzih07532zw276h271lzdk3lkinjsjyhn8lks04yqkgq4b2x8"; + version = "0.2.3"; + sha256 = "0v3nr8svnsqgj4rmbki4f38fndq03gxghkwb9q6qjd9w2m2hx3y1"; libraryHaskellDepends = [ base foldl ]; homepage = "https://github.com/metrix-ai/deferred-folds"; description = "Abstractions over deferred folds"; @@ -71675,6 +71844,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "exhaustive_1_1_6" = callPackage + ({ mkDerivation, base, generics-sop, template-haskell, transformers + }: + mkDerivation { + pname = "exhaustive"; + version = "1.1.6"; + sha256 = "00gdgr9xqzy14sqx31j4afljvfc4ar2jrzmwpp3z6ybfq1saw7vk"; + libraryHaskellDepends = [ + base generics-sop template-haskell transformers + ]; + homepage = "http://github.com/ocharles/exhaustive"; + description = "Compile time checks that a computation considers producing data through all possible constructors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "exherbo-cabal" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, Cabal , containers, data-default, deepseq, directory, doctest, filepath @@ -72308,15 +72493,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "extensible-effects_2_6_0_1" = callPackage + "extensible-effects_2_6_1_1" = callPackage ({ mkDerivation, base, criterion, HUnit, monad-control, mtl , QuickCheck, silently, test-framework, test-framework-hunit , test-framework-quickcheck2, test-framework-th, transformers-base }: mkDerivation { pname = "extensible-effects"; - version = "2.6.0.1"; - sha256 = "1c39hn8iskn71s3hd3af3q1xym9mzdvrjswcnyqrkibws47k2lmx"; + version = "2.6.1.1"; + sha256 = "0rx1m6pw2prgfr0wsgnqf1hqsrwq43clpahk79z972bdmh9v3352"; libraryHaskellDepends = [ base monad-control transformers-base ]; testHaskellDepends = [ base HUnit monad-control QuickCheck silently test-framework @@ -81108,12 +81293,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "genvalidity_0_5_0_0" = callPackage + "genvalidity_0_5_0_2" = callPackage ({ mkDerivation, base, hspec, QuickCheck, validity }: mkDerivation { pname = "genvalidity"; - version = "0.5.0.0"; - sha256 = "0s640ql6i9lr8s8m39fvjv7iz1pbcnjnvb8xsdbygb49cwk3khcz"; + version = "0.5.0.2"; + sha256 = "1l1lv8k8gl7i5zd54636ihbwddgq49088lgb2gragm05cki823c1"; libraryHaskellDepends = [ base QuickCheck validity ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/NorfairKing/validity#readme"; @@ -81230,6 +81415,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-containers_0_4_0_0" = callPackage + ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec + , hspec, QuickCheck, validity, validity-containers + }: + mkDerivation { + pname = "genvalidity-containers"; + version = "0.4.0.0"; + sha256 = "0q7dzmp8ik3v8ckv8i9cnc687306i4i80mx7sbh956hw5kr6bqnb"; + libraryHaskellDepends = [ + base containers genvalidity QuickCheck validity validity-containers + ]; + testHaskellDepends = [ + base containers genvalidity genvalidity-hspec hspec + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for containers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-hspec" = callPackage ({ mkDerivation, base, doctest, genvalidity, genvalidity-property , hspec, hspec-core, QuickCheck, validity @@ -81251,14 +81456,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-hspec_0_6_0_0" = callPackage + "genvalidity-hspec_0_6_0_1" = callPackage ({ mkDerivation, base, doctest, genvalidity, genvalidity-property , hspec, hspec-core, QuickCheck, validity }: mkDerivation { pname = "genvalidity-hspec"; - version = "0.6.0.0"; - sha256 = "0pa4wx08yipr59nsdf5prh6j5pcixnxxfd9i4vm1rb4v89nws6al"; + version = "0.6.0.1"; + sha256 = "18srjw0c8li10nbnxwbnhrggkl9nhdfjy02jpxd6hpij345y3j47"; libraryHaskellDepends = [ base genvalidity genvalidity-property hspec hspec-core QuickCheck validity @@ -81606,14 +81811,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-time_0_2_0_0" = callPackage + "genvalidity-time_0_2_0_1" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, time, validity-time }: mkDerivation { pname = "genvalidity-time"; - version = "0.2.0.0"; - sha256 = "04kfqs4mc9p5flr3vvb6qj3nb4agpl3hww62g7np6sl5s36cbycb"; + version = "0.2.0.1"; + sha256 = "0kd2rxmz197yzfhxya4pbvl77iv7knl0zc1v56089ls4vk4by2gg"; libraryHaskellDepends = [ base genvalidity QuickCheck time validity-time ]; @@ -97235,6 +97440,38 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "haskell-lsp_0_2_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, data-default + , directory, filepath, hashable, haskell-lsp-types, hslogger, hspec + , lens, mtl, network-uri, parsec, sorted-list, stm, text, time + , transformers, unordered-containers, vector, yi-rope + }: + mkDerivation { + pname = "haskell-lsp"; + version = "0.2.1.0"; + sha256 = "09wv2ic66lc03pndpx4xsmmv3zxwram5i82483j340avm2rp06c0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hashable haskell-lsp-types hslogger lens mtl network-uri parsec + sorted-list stm text time unordered-containers yi-rope + ]; + executableHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hslogger lens mtl network-uri parsec stm text time transformers + unordered-containers vector yi-rope + ]; + testHaskellDepends = [ + aeson base containers directory filepath hashable hspec lens + network-uri sorted-list text yi-rope + ]; + homepage = "https://github.com/alanz/haskell-lsp"; + description = "Haskell library for the Microsoft Language Server Protocol"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-lsp-client" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , haskell-lsp, lens, process, text, unix @@ -97256,6 +97493,23 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "haskell-lsp-types" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, filepath + , hashable, lens, network-uri, text, unordered-containers + }: + mkDerivation { + pname = "haskell-lsp-types"; + version = "0.2.1.0"; + sha256 = "0byslqf8qw7rc1kva3inm8bsm9z12h19y3b3yzgwz1hlkshjl2d0"; + libraryHaskellDepends = [ + aeson base bytestring data-default filepath hashable lens + network-uri text unordered-containers + ]; + homepage = "https://github.com/alanz/haskell-lsp"; + description = "Haskell library for the Microsoft Language Server Protocol, data types"; + license = stdenv.lib.licenses.mit; + }) {}; + "haskell-menu" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -97414,8 +97668,8 @@ self: { }: mkDerivation { pname = "haskell-packages"; - version = "0.6.1"; - sha256 = "16lsk6djhy34k9clmaqsqrd4277dk7nva77djs91h0nl68zz3hhs"; + version = "0.6.2"; + sha256 = "114xkqg5fzyq1n5p8cz768z84j0xgcyzxh375p9a574j6nl6d387"; libraryHaskellDepends = [ base binary bytestring Cabal containers deepseq directory filepath haskell-src-exts hse-cpp mtl optparse-applicative tagged @@ -97746,6 +98000,25 @@ self: { pname = "haskell-src-exts-util"; version = "0.2.2"; sha256 = "14rhwcrdz3kfb69c64qn8kybl7wnpajrjlfz5p95ca4bva4mwclg"; + revision = "1"; + editedCabalFile = "14mrpj2xmpdhib9l5qacslkm4n0rh5yjwy6n5dhp7152m69hgfdl"; + libraryHaskellDepends = [ + base containers data-default haskell-src-exts semigroups + transformers uniplate + ]; + homepage = "https://github.com/pepeiborra/haskell-src-exts-util"; + description = "Helper functions for working with haskell-src-exts trees"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "haskell-src-exts-util_0_2_3" = callPackage + ({ mkDerivation, base, containers, data-default, haskell-src-exts + , semigroups, transformers, uniplate + }: + mkDerivation { + pname = "haskell-src-exts-util"; + version = "0.2.3"; + sha256 = "1803718paq89f8pdck4mb88hv2k1ah9lxzq0lgjgwi9n88ryycz8"; libraryHaskellDepends = [ base containers data-default haskell-src-exts semigroups transformers uniplate @@ -97753,6 +98026,7 @@ self: { homepage = "https://github.com/pepeiborra/haskell-src-exts-util"; description = "Helper functions for working with haskell-src-exts trees"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-src-meta" = callPackage @@ -105340,8 +105614,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.9"; - sha256 = "10lsh1rayzg7gri6b2mn01ncjziga5dzw0s5a91068brrrf4rymm"; + version = "1.9.1"; + sha256 = "13arzk1l2hxmi8baa68kvl2sha0na34h0dl6isbfpvgnp7w1c0b3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105380,21 +105654,22 @@ self: { }) {}; "hledger-api" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, Decimal - , docopt, either, hledger, hledger-lib, microlens + ({ mkDerivation, aeson, base, bytestring, containers, data-default + , Decimal, docopt, either, hledger, hledger-lib, microlens , microlens-platform, safe, servant-server, servant-swagger , swagger2, text, transformers, wai, wai-extra, warp }: mkDerivation { pname = "hledger-api"; - version = "1.9"; - sha256 = "00bqsz8hkmx78r9d692kihbpmldkpnsdmpljs3ivi14jfay4avim"; + version = "1.9.1"; + sha256 = "1krg8pxqcndrs6z196lb7z5nanyp9vxk5ziqpapj0f11ifxcijj8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson base bytestring containers Decimal docopt either hledger - hledger-lib microlens microlens-platform safe servant-server - servant-swagger swagger2 text transformers wai wai-extra warp + aeson base bytestring containers data-default Decimal docopt either + hledger hledger-lib microlens microlens-platform safe + servant-server servant-swagger swagger2 text transformers wai + wai-extra warp ]; homepage = "http://hledger.org"; description = "Web API server for the hledger accounting tool"; @@ -105445,8 +105720,8 @@ self: { }: mkDerivation { pname = "hledger-iadd"; - version = "1.3.4"; - sha256 = "1dii629ynrb04q4hmli6zxpz1ylkw0rm1vf8jrrcm81drvdxw6qm"; + version = "1.3.5"; + sha256 = "0mp8jhvf48173ixypqfm9vmsb2bsykfygxrxxfjpry6m5xqfh09c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105474,11 +105749,10 @@ self: { }: mkDerivation { pname = "hledger-interest"; - version = "1.5.1"; - sha256 = "19hdz6lj0kxy59vzkyqlwk20l8k08w618nz02xcfflwd9r7ka0ha"; + version = "1.5.2"; + sha256 = "10ck23d69wxylxbp8cj7ic8slklm9l88xbb4p29nvm5lgjiqidbq"; isLibrary = false; isExecutable = true; - enableSeparateDataOutput = true; executableHaskellDepends = [ base Cabal Decimal hledger-lib mtl text time ]; @@ -105511,28 +105785,28 @@ self: { , blaze-markup, bytestring, cmdargs, containers, csv, data-default , Decimal, deepseq, directory, doctest, easytest, extra, filepath , Glob, hashtables, HUnit, megaparsec, mtl, mtl-compat, old-time - , parsec, pretty-show, regex-tdfa, safe, split, test-framework - , test-framework-hunit, text, time, transformers, uglymemo - , utf8-string + , parsec, pretty-show, regex-tdfa, safe, split, tabular + , test-framework, test-framework-hunit, text, time, transformers + , uglymemo, utf8-string }: mkDerivation { pname = "hledger-lib"; - version = "1.9"; - sha256 = "0bm4vdzjxyxjmq000wng6hkx9kinbzw5hx7m0i1vjj500gcp0zq1"; + version = "1.9.1"; + sha256 = "0yxgx4bpqn8vchrfp07d1fqmsscj8w5g63nqd2n49r29d6i5q5az"; libraryHaskellDepends = [ ansi-terminal array base base-compat blaze-markup bytestring cmdargs containers csv data-default Decimal deepseq directory extra filepath hashtables HUnit megaparsec mtl mtl-compat old-time parsec - pretty-show regex-tdfa safe split text time transformers uglymemo - utf8-string + pretty-show regex-tdfa safe split tabular text time transformers + uglymemo utf8-string ]; testHaskellDepends = [ ansi-terminal array base base-compat blaze-markup bytestring cmdargs containers csv data-default Decimal deepseq directory doctest easytest extra filepath Glob hashtables HUnit megaparsec mtl mtl-compat old-time parsec pretty-show regex-tdfa safe split - test-framework test-framework-hunit text time transformers uglymemo - utf8-string + tabular test-framework test-framework-hunit text time transformers + uglymemo utf8-string ]; homepage = "http://hledger.org"; description = "Core data types, parsers and functionality for the hledger accounting tools"; @@ -105548,8 +105822,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.9"; - sha256 = "0z5w69vxl8f1gdc8753ndnm4mcm5xw3abjfqidyrn3gsi800pxzd"; + version = "1.9.1"; + sha256 = "18ar9lja583rg06q9dbnrpify6hj99444fjw2z54lr54587151v0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -105594,8 +105868,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.9.1"; - sha256 = "0fkanj21ivrf5la7zxij1jws955hc0y98n2lg4qkbyw5fz54i9dj"; + version = "1.9.2"; + sha256 = "0b533vs5vrk4wpwgf23l7rvijq4qpi6w5nql2hsjwl3xk2ihfpv3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105728,8 +106002,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "2.1.3"; - sha256 = "08i7b894vm0p8ipilvhx0pp04r6zgrf44w0mnlmsydq971y59g3a"; + version = "2.1.4"; + sha256 = "01qgnljgsd331zx9df2diijnfvy78p1j6ysqqq317v66yxpz6vlh"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -106741,8 +107015,8 @@ self: { }: mkDerivation { pname = "hoauth2"; - version = "1.7.1"; - sha256 = "05l2ngns8p3jvx20iv8w4yrzn1agfxafgaynfwv0340czchl7s5s"; + version = "1.7.2"; + sha256 = "0klkgr11p8m03ksrad59pqs0czp6hrgmzxynng4zirbmz643plvf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107054,10 +107328,10 @@ self: { ({ mkDerivation, base, either, mtl }: mkDerivation { pname = "hoist-error"; - version = "0.1.0.2"; - sha256 = "1485adrlm52jm5afcwa7qnfy4b1679nqjhhlsjp264wqmm0h9l0z"; - revision = "3"; - editedCabalFile = "1f2znb9x4f4m8h3d66pdyi7fqjr6v120mjqswj40dy7p2wmd6dm6"; + version = "0.2.0.0"; + sha256 = "1hb479bwn3z1qdsrnz85wfdd9skmmxydxd6xkcrwbcfwy5vap64h"; + revision = "1"; + editedCabalFile = "1nai9ds3r15x78rnj5gvy3mbps2jkq9ndqg56l8g7rxizfzidwfb"; libraryHaskellDepends = [ base either mtl ]; description = "Some convenience facilities for hoisting errors into a monad"; license = stdenv.lib.licenses.mit; @@ -108910,8 +109184,8 @@ self: { }: mkDerivation { pname = "hprotoc"; - version = "2.4.8"; - sha256 = "1h3zjl1z80h7n1k1sk4a2qwsnq17c48f1lmzrdhrs9h5bnm9mjhk"; + version = "2.4.9"; + sha256 = "1bfar7biksa9ha6vzrh4z2lz048mf1zz261ih6mbl9q6kvyr27w4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112186,6 +112460,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hspec-golden-aeson_0_6_0_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory + , filepath, hspec, hspec-core, QuickCheck, quickcheck-arbitrary-adt + , random, silently, transformers + }: + mkDerivation { + pname = "hspec-golden-aeson"; + version = "0.6.0.0"; + sha256 = "0918b4y0lkz66hyhydqkd0yxna37vqqqc0pgjg4vn1h860xj0rv0"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring directory filepath hspec + QuickCheck quickcheck-arbitrary-adt random transformers + ]; + testHaskellDepends = [ + aeson base directory hspec hspec-core QuickCheck + quickcheck-arbitrary-adt silently transformers + ]; + homepage = "https://github.com/plow-technologies/hspec-golden-aeson#readme"; + description = "Use tests to monitor changes in Aeson serialization"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-hashable" = callPackage ({ mkDerivation, base, hashable, hspec, hspec-core, QuickCheck , silently @@ -116105,8 +116402,8 @@ self: { }: mkDerivation { pname = "hw-kafka-client"; - version = "2.4.4"; - sha256 = "1zw35ikrp0r07rvnm3fah3p9xj8h8bw2h4nwv94ih1ff2ab2glhf"; + version = "2.5.0"; + sha256 = "0cr3s26ivb46d14mglnr9phhnsj85h8n3b8p6lmcjk1xs4jidick"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116129,8 +116426,8 @@ self: { }: mkDerivation { pname = "hw-kafka-conduit"; - version = "2.4.0"; - sha256 = "0xzsdslkc069wccqihd50zxvm9jx6p5izwf4v44dizn42lfymm75"; + version = "2.5.0"; + sha256 = "0n495336vhikd0r5j6i8ydrxv3xwwckbg2ympaf3flcsjv4bwc08"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116272,16 +116569,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-rankselect_0_11_0_0" = callPackage + "hw-rankselect_0_12_0_0" = callPackage ({ mkDerivation, base, bytestring, conduit, criterion, deepseq , directory, hedgehog, hspec, hw-balancedparens, hw-bits - , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, mmap - , QuickCheck, resourcet, vector + , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, lens + , mmap, mtl, optparse-applicative, QuickCheck, resourcet, vector }: mkDerivation { pname = "hw-rankselect"; - version = "0.11.0.0"; - sha256 = "0sywcqzrrxmlwgg4glj8fm8fn4n1a33f20lmj9bvchzh20gg340c"; + version = "0.12.0.0"; + sha256 = "1yp9fmxk55ikhrrpkff4r1sgqadg4b0yfz2w1xardxb3n09n4xpa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116289,7 +116586,8 @@ self: { vector ]; executableHaskellDepends = [ - base directory hw-bits hw-prim hw-rankselect-base mmap vector + base directory hw-bits hw-prim hw-rankselect-base lens mmap mtl + optparse-applicative vector ]; testHaskellDepends = [ base directory hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog @@ -120204,6 +120502,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "inline-c_0_6_0_6" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers + , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq + , regex-posix, template-haskell, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "inline-c"; + version = "0.6.0.6"; + sha256 = "0ggfnnds3lshiasf2kkyxc3nd5y9b3jr6xraxmwgpikmf21yac4i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base bytestring containers hashable mtl parsec + parsers template-haskell transformers unordered-containers vector + ]; + testHaskellDepends = [ + ansi-wl-pprint base containers hashable hspec parsers QuickCheck + raw-strings-qq regex-posix template-haskell transformers + unordered-containers vector + ]; + description = "Write Haskell source files including C code inline. No FFI required."; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inline-c-cpp_0_1_0_0" = callPackage ({ mkDerivation, base, inline-c, template-haskell }: mkDerivation { @@ -121366,6 +121690,8 @@ self: { pname = "io-streams"; version = "1.5.0.1"; sha256 = "12rcdg2d70644bvn838fxcjkssqj8pssnx5y657si5rijcbkgjsx"; + revision = "1"; + editedCabalFile = "1d7rpwi10rqcry58d4hc651xvk9xzni6n6k22wm9532l14i3x21c"; configureFlags = [ "-fNoInteractiveTests" ]; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder network primitive @@ -121389,8 +121715,8 @@ self: { pname = "io-streams-haproxy"; version = "1.0.0.2"; sha256 = "11nh9q158mgnvvb23s5ffg87lkhl5smk039yl43jghxmb214z0bp"; - revision = "1"; - editedCabalFile = "0mm20k4d6xcjjghwkgbfap9n35nixzvk3y0n52f88cq0rfrn1y0r"; + revision = "2"; + editedCabalFile = "0jrasbn4s6ac0691bf88fbflpha2vn24bd45gk0s3znvl395dxgr"; libraryHaskellDepends = [ attoparsec base bytestring io-streams network transformers ]; @@ -125180,8 +125506,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.3.2"; - sha256 = "098vli26hrgkjxw3y1sfc7fi3wj72ka1dqy1k49z22rigisffbwj"; + version = "0.3.5"; + sha256 = "1ibx0pr0ddnzx5jbgkjzidkmja65gan7ji7s42v2iwn05fm125ki"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -132103,6 +132429,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {systemd = null;}; + "libsystemd-journal_1_4_3" = callPackage + ({ mkDerivation, base, bytestring, hashable, hsyslog, pipes + , pipes-safe, semigroups, systemd, text, transformers, uniplate + , unix-bytestring, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "libsystemd-journal"; + version = "1.4.3"; + sha256 = "1n79f0fzgrqyr9lw1qy8fzxsh74ai899pydpzpl6pfh2gfp7qvaq"; + libraryHaskellDepends = [ + base bytestring hashable hsyslog pipes pipes-safe semigroups text + transformers uniplate unix-bytestring unordered-containers uuid + vector + ]; + libraryPkgconfigDepends = [ systemd ]; + homepage = "http://github.com/ocharles/libsystemd-journal"; + description = "Haskell bindings to libsystemd-journal"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {systemd = null;}; + "libtagc" = callPackage ({ mkDerivation, base, bytestring, glib, taglib }: mkDerivation { @@ -135207,6 +135554,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "logging-effect_1_2_6" = callPackage + ({ mkDerivation, async, base, bytestring, criterion, exceptions + , fast-logger, free, lifted-async, monad-control, monad-logger, mtl + , semigroups, stm, stm-delay, text, time, transformers + , transformers-base, wl-pprint-text + }: + mkDerivation { + pname = "logging-effect"; + version = "1.2.6"; + sha256 = "091ii2cq5wns9mc3mckwjcjgav9s2jj8nnamwqd2vf24w932ilv7"; + libraryHaskellDepends = [ + async base exceptions free monad-control mtl semigroups stm + stm-delay text time transformers transformers-base wl-pprint-text + ]; + benchmarkHaskellDepends = [ + base bytestring criterion fast-logger lifted-async monad-logger + text time wl-pprint-text + ]; + homepage = "https://github.com/ocharles/logging-effect"; + description = "A mtl-style monad transformer for general purpose & compositional logging"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "logging-effect-extra" = callPackage ({ mkDerivation, base, logging-effect, logging-effect-extra-file , logging-effect-extra-handler, wl-pprint-text @@ -139965,6 +140336,8 @@ self: { pname = "megaparsec"; version = "6.5.0"; sha256 = "12iggy7qpf8x93jm64zf0g215xwy779bqyfyjk2bhmxqqr1yzgdy"; + revision = "1"; + editedCabalFile = "1gfqxpzjr64jzj366ibxm5l55qba5jw7wnpc89b0mf8f752h5w1l"; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq mtl parser-combinators scientific text transformers @@ -142316,8 +142689,8 @@ self: { pname = "mmark"; version = "0.0.5.6"; sha256 = "0d0jxxj0b1jy9mym6389dmm6biiw8kzdh06zj2j0gsjczn2n60zw"; - revision = "1"; - editedCabalFile = "02b0ycywjhzx1ll36l38mwp2gy677hgsqpq2mwyi277ykbrwnsdk"; + revision = "2"; + editedCabalFile = "0hzz7l9npv364yzw6i6q6699nn1raj1p2cmwmlqp43rz8s3ryawn"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers data-default-class deepseq @@ -149285,6 +149658,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-carbon_1_0_12" = callPackage + ({ mkDerivation, base, bytestring, network, text, time, vector }: + mkDerivation { + pname = "network-carbon"; + version = "1.0.12"; + sha256 = "0fb1ymk1rnsppvil46pyaxlzc09l6716jbrr0h7rb5nxv0bvk5pd"; + libraryHaskellDepends = [ + base bytestring network text time vector + ]; + homepage = "http://github.com/ocharles/network-carbon"; + description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-conduit" = callPackage ({ mkDerivation, base, conduit }: mkDerivation { @@ -152740,8 +153128,8 @@ self: { }: mkDerivation { pname = "odbc"; - version = "0.0.4"; - sha256 = "1fh8yqdycna3if5dd55qc6hic70nwy71vjy2yflzvpjpqkdd8qz6"; + version = "0.0.5"; + sha256 = "06b52hd9bxidp62y2h856ac90pypcv72q533i7lywf4gjj1q0grn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156012,8 +156400,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.1.0"; - sha256 = "11lvsr30f0x2vsqnwr4s3j9v3n4zxx5a83qc95j5c1xijlrzcc3k"; + version = "0.3.2.0"; + sha256 = "0pydgdpm8fqj4dbv5swbyxkh1bkmqzj3gcas9r04vvzh6mmr22ia"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -159569,6 +159957,8 @@ self: { pname = "persistent"; version = "2.8.2"; sha256 = "1h0yijbf1yiwl50klyafy4ln99j8bib4kgbzviw7fc4y4mwv4sv9"; + revision = "1"; + editedCabalFile = "18a6dfpjakcmyl9qnflgi63rss09zj3xg0py6bliary4y2cqw4fz"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html blaze-markup bytestring conduit containers fast-logger haskell-src-meta @@ -162583,6 +162973,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "planb-token-introspection" = callPackage + ({ mkDerivation, aeson, aeson-casing, base, bytestring, containers + , exceptions, http-client, http-client-tls, http-types, lens, mtl + , random, safe-exceptions, tasty, tasty-hunit, text, th-format + , transformers, unliftio-core + }: + mkDerivation { + pname = "planb-token-introspection"; + version = "0.1.1.0"; + sha256 = "0b54sr1zvrczjxlx9xrb5zcy1kmybv396cigqvm652k9q16zifc5"; + libraryHaskellDepends = [ + aeson aeson-casing base bytestring containers http-client + http-client-tls http-types mtl safe-exceptions text transformers + ]; + testHaskellDepends = [ + aeson base bytestring containers exceptions http-client http-types + lens mtl random safe-exceptions tasty tasty-hunit text th-format + unliftio-core + ]; + homepage = "https://github.com/mtesseract/planb-token-introspection#readme"; + description = "Token Introspection for PlanB"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "plankton" = callPackage ({ mkDerivation, adjunctions, base, protolude }: mkDerivation { @@ -162872,15 +163286,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "plot-light_0_3_3" = callPackage + "plot-light_0_3_3_2" = callPackage ({ mkDerivation, base, blaze-svg, colour, containers , data-default-class, hspec, mtl, QuickCheck, scientific, text , time }: mkDerivation { pname = "plot-light"; - version = "0.3.3"; - sha256 = "1ymfrrn28l6dbvw6m6j0cqxjb027ynhcc7b7y6i7bq4gq6rd60dz"; + version = "0.3.3.2"; + sha256 = "0im5rw52aim1zspisdar87gyn1ar4dkk52ipcq0s41pcycbwib12"; libraryHaskellDepends = [ base blaze-svg colour containers data-default-class mtl scientific text time @@ -168128,6 +168542,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "protocol-buffers_2_4_9" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , directory, filepath, mtl, parsec, syb, utf8-string + }: + mkDerivation { + pname = "protocol-buffers"; + version = "2.4.9"; + sha256 = "0d6j5k8mfxnixx9n6v7vwncy49cx9sxkhjgh1g7sbs1q15rxkn6m"; + libraryHaskellDepends = [ + array base binary bytestring containers directory filepath mtl + parsec syb utf8-string + ]; + homepage = "https://github.com/k-bx/protocol-buffers"; + description = "Parse Google Protocol Buffer specifications"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protocol-buffers-descriptor" = callPackage ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { @@ -168143,6 +168575,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "protocol-buffers-descriptor_2_4_9" = callPackage + ({ mkDerivation, base, bytestring, containers, protocol-buffers }: + mkDerivation { + pname = "protocol-buffers-descriptor"; + version = "2.4.9"; + sha256 = "0641cwi7lb53w4mi1icbgz0yghz4lwdf16y9pi0f188hp31f3b2j"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers protocol-buffers + ]; + homepage = "https://github.com/k-bx/protocol-buffers"; + description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protocol-buffers-descriptor-fork" = callPackage ({ mkDerivation, base, bytestring, containers , protocol-buffers-fork @@ -189138,6 +189586,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "singleton-nats_0_4_1" = callPackage + ({ mkDerivation, base, singletons }: + mkDerivation { + pname = "singleton-nats"; + version = "0.4.1"; + sha256 = "1fb87qgh35z31rwzrpclf7d071krffr5vvqr1nwvpgikggfjhlss"; + libraryHaskellDepends = [ base singletons ]; + homepage = "https://github.com/AndrasKovacs/singleton-nats"; + description = "Unary natural numbers relying on the singletons infrastructure"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "singleton-typelits" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -190754,6 +191215,8 @@ self: { pname = "snap-core"; version = "1.0.3.2"; sha256 = "136q7l4hd5yn5hb507q1ziqx124ma1lkzh5dx0n150p8dx3rhhsc"; + revision = "1"; + editedCabalFile = "08ll71h3rv9bppr7xrflg4y627vnmxgfhby1kli9cj0a7ryspam1"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder case-insensitive containers directory filepath hashable HUnit io-streams lifted-base @@ -191005,6 +191468,8 @@ self: { pname = "snap-server"; version = "1.1.0.0"; sha256 = "0vvw9n8xs272qdlrf3dxhnva41zh3awi7pf022rrjj75lj8a77i4"; + revision = "1"; + editedCabalFile = "1lyx51zr1cmjyvsfplxpzv87agvvv83v3ww8m01fdh7x31np1chc"; configureFlags = [ "-fopenssl" ]; isLibrary = true; isExecutable = true; @@ -193095,8 +193560,8 @@ self: { }: mkDerivation { pname = "sparrow"; - version = "0.0.1.4"; - sha256 = "0awj1gbrcdq4xp9dgj7q3jbfivjb4pjhkhd3acfgdqk08142fzj7"; + version = "0.0.1.6"; + sha256 = "10kj0ir2i72q20jbp39n5v700pivbapkyvarql9hg5sci9s73g4s"; libraryHaskellDepends = [ aeson aeson-attoparsec async attoparsec attoparsec-uri base bytestring deepseq exceptions extractable-singleton hashable @@ -195013,8 +195478,8 @@ self: { }: mkDerivation { pname = "stack-network"; - version = "0.1.0.0"; - sha256 = "0l2r6r89lj1197ybsfgjxikhpgravw12zjpaz62gcsvdhdcflsak"; + version = "0.1.0.1"; + sha256 = "1skq3sqr5krn6gh5h684vn2w2h8zvqkdcc7yhbyri2fswahy9g1x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -197336,6 +197801,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "streaming-base64" = callPackage + ({ mkDerivation, base, safe-exceptions, streaming + , streaming-bytestring, tasty, tasty-hunit, transformers + }: + mkDerivation { + pname = "streaming-base64"; + version = "0.1.0.0"; + sha256 = "0w6xj80z1z21pgxadwc48w15a08g94i4g7qkgv5gvq46kpl44bq6"; + libraryHaskellDepends = [ + base safe-exceptions streaming streaming-bytestring transformers + ]; + testHaskellDepends = [ + base streaming-bytestring tasty tasty-hunit + ]; + description = "Streaming conversion from/to base64"; + license = stdenv.lib.licenses.cc0; + }) {}; + "streaming-benchmarks" = callPackage ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, conduit , csv, deepseq, directory, gauge, list-t, list-transformer, logict @@ -198735,8 +199218,8 @@ self: { }: mkDerivation { pname = "stylish-haskell"; - version = "0.9.1.1"; - sha256 = "0qvaxivxvgaz4zpgc6275j9psdipj2p7y3msv9py11z1y6r5izss"; + version = "0.9.2.0"; + sha256 = "16r2nm1y0s5ybrq2pzsq00nfq7k0i70nyg7ynmhx76lld82i17yv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -202825,6 +203308,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tasty-rerun_1_1_11" = callPackage + ({ mkDerivation, base, containers, mtl, optparse-applicative + , reducers, split, stm, tagged, tasty, transformers + }: + mkDerivation { + pname = "tasty-rerun"; + version = "1.1.11"; + sha256 = "0nk2qfdhdl71xcr0rwixmwwsyr74dy4hjwalhs4p4am2bhpfva5s"; + libraryHaskellDepends = [ + base containers mtl optparse-applicative reducers split stm tagged + tasty transformers + ]; + homepage = "http://github.com/ocharles/tasty-rerun"; + description = "Run tests by filtering the test tree depending on the result of previous test runs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-silver" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , deepseq, directory, filepath, mtl, optparse-applicative, process @@ -205664,6 +206165,8 @@ self: { pname = "text-show-instances"; version = "3.6.4"; sha256 = "1a2aacy6l58b49868hhvqws4900rq9dpb8zwkb5cz45gsb7zpgjf"; + revision = "1"; + editedCabalFile = "0fb704bm4n99vv7cblzsg9l8i6gy2ybppp2xagh4mcrwn5g776l8"; libraryHaskellDepends = [ base base-compat-batteries bifunctors binary bytestring containers directory ghc-boot-th haskeline hoopl hpc old-locale old-time @@ -209469,17 +209972,21 @@ self: { }) {}; "tpdb" = callPackage - ({ mkDerivation, base, bytestring, containers, filepath, hashable - , HaXml, hxt, mtl, parsec, pretty, text, time, wl-pprint-text + ({ mkDerivation, base, bytestring, containers, data-default + , filepath, hashable, HaXml, hxt, mtl, parsec, pretty + , prettyprinter, text, time, xml-conduit, xml-hamlet }: mkDerivation { pname = "tpdb"; - version = "1.3.3"; - sha256 = "1xks4dcn51m3001ss231lmk8ylfpvba9d2v123vgwmjpibnkr9gs"; + version = "1.5.2"; + sha256 = "08cckg0n6pbj067advjppgybbwbl256igk4lirwmiav6hf1m723k"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base bytestring containers filepath hashable HaXml hxt mtl parsec - text time wl-pprint-text + base bytestring containers data-default filepath hashable HaXml hxt + mtl parsec prettyprinter text time xml-conduit xml-hamlet ]; + executableHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring HaXml pretty ]; homepage = "https://github.com/jwaldmann/haskell-tpdb"; description = "Data Type for Rewriting Systems"; @@ -211526,8 +212033,8 @@ self: { }: mkDerivation { pname = "twee"; - version = "2.1.4"; - sha256 = "0anln0il67j8xhz1m73r8b02560mc8yd1rzmc03p4f7vmgxqaphv"; + version = "2.1.5"; + sha256 = "1v94hf1fd7n01drd6hx37zrplpzlskfmd3l8lmkb5kzy618x0cnb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -211544,8 +212051,8 @@ self: { }: mkDerivation { pname = "twee-lib"; - version = "2.1.4"; - sha256 = "0fapi6g8f6fp90hvff1g606wzi7jaacf1mnq1h801yzzi4sj3yms"; + version = "2.1.5"; + sha256 = "09q2dxab3s9d32ayr9a08q6lbkszrxi0hw00sar3jx31p9q3pkc2"; libraryHaskellDepends = [ base containers dlist ghc-prim pretty primitive transformers vector ]; @@ -212646,6 +213153,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "type-of-html_1_4_0_0" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, criterion, deepseq + , double-conversion, ghc, ghc-paths, ghc-prim, hspec, QuickCheck + , random, temporary, text, weigh + }: + mkDerivation { + pname = "type-of-html"; + version = "1.4.0.0"; + sha256 = "09dr97illgfn11javij6nmqp3cvgdf7air7kavxcdlr25nx6wkd7"; + libraryHaskellDepends = [ + base bytestring double-conversion ghc-prim text + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring criterion deepseq ghc ghc-paths random + temporary text weigh + ]; + homepage = "https://github.com/knupfer/type-of-html"; + description = "High performance type driven html generation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "type-of-html-static" = callPackage + ({ mkDerivation, base, template-haskell, type-of-html }: + mkDerivation { + pname = "type-of-html-static"; + version = "0.1.0.2"; + sha256 = "00329zkxlbsjlwnw2pz2w6ahiam5c1k9j9fv2608wjfmxr8xkcr9"; + libraryHaskellDepends = [ base template-haskell type-of-html ]; + testHaskellDepends = [ base type-of-html ]; + homepage = "https://github.com/knupfer/type-of-html-static"; + description = "Optimize static parts of type-of-html"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "type-operators" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -213129,8 +213672,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.6.1.1"; - sha256 = "0dmdwlfn73anw4ap74aqnldp42383c2mi12r9y7sf1j1gyy872ac"; + version = "0.6.2.1"; + sha256 = "0qa9vp1fg495b2ddzbdpivlzp0maap7jxqn2xd4z2rrxbrjdlhl2"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -214737,6 +215280,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "universum_1_2_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, doctest + , gauge, ghc-prim, Glob, hashable, hedgehog, microlens + , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog + , text, transformers, type-operators, unordered-containers + , utf8-string, vector + }: + mkDerivation { + pname = "universum"; + version = "1.2.0"; + sha256 = "0645gvj1p33d0fnlk09i74l11sv11bidyv44hyb2m0dls22hr89p"; + libraryHaskellDepends = [ + base bytestring containers deepseq ghc-prim hashable microlens + microlens-mtl mtl safe-exceptions stm text transformers + type-operators unordered-containers utf8-string vector + ]; + testHaskellDepends = [ + base bytestring doctest Glob hedgehog tasty tasty-hedgehog text + utf8-string + ]; + benchmarkHaskellDepends = [ + base containers gauge unordered-containers + ]; + homepage = "https://github.com/serokell/universum"; + description = "Custom prelude used in Serokell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unix_2_7_2_2" = callPackage ({ mkDerivation, base, bytestring, time }: mkDerivation { @@ -216135,8 +216707,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "util"; - version = "0.1.6.0"; - sha256 = "0qym7if90kp51f0mf8yxsw3csfpdp2mnp7aah3vc6wdh58gljva5"; + version = "0.1.7.0"; + sha256 = "1g5pgwkw1kqfskk131v2vaqcvyxqgslff62qamjz4dzray9fa9cp"; libraryHaskellDepends = [ base ]; description = "Utilities"; license = stdenv.lib.licenses.bsd3; @@ -217037,6 +217609,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-unordered-containers_0_2_0_0" = callPackage + ({ mkDerivation, base, hashable, unordered-containers, validity }: + mkDerivation { + pname = "validity-unordered-containers"; + version = "0.2.0.0"; + sha256 = "08jw6acvi016lxkw6rzxfxfcx56nwfi6ka52flkq2ks8038y3syy"; + libraryHaskellDepends = [ + base hashable unordered-containers validity + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for unordered-containers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-uuid" = callPackage ({ mkDerivation, base, uuid, validity }: mkDerivation { @@ -217049,6 +217636,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-uuid_0_1_0_0" = callPackage + ({ mkDerivation, base, uuid, validity }: + mkDerivation { + pname = "validity-uuid"; + version = "0.1.0.0"; + sha256 = "129h7cjgixq6l29n3y66zcx5ynfnxz3prqkgf2028f6w4mhd0154"; + libraryHaskellDepends = [ base uuid validity ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for uuid"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-vector" = callPackage ({ mkDerivation, base, hashable, validity, vector }: mkDerivation { @@ -217061,6 +217661,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-vector_0_2_0_0" = callPackage + ({ mkDerivation, base, hashable, validity, vector }: + mkDerivation { + pname = "validity-vector"; + version = "0.2.0.0"; + sha256 = "0kyyrcwxial9csyx40vrl0frz5yrmzqhjpy1cz8afsc7r4ph12yi"; + libraryHaskellDepends = [ base hashable validity vector ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for vector"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "value-supply" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -221612,17 +222225,17 @@ self: { ({ mkDerivation, aeson, async, base, basement, bytestring, cereal , cryptonite, data-default, exceptions, generics-sop, hspec , hspec-contrib, hspec-discover, hspec-expectations, http-client - , http-client-tls, machines, memory, mtl, parsec, split, stm - , tagged, template-haskell, text, time, transformers + , machines, memory, mtl, parsec, split, stm, tagged + , template-haskell, text, time, transformers }: mkDerivation { pname = "web3"; - version = "0.7.0.0"; - sha256 = "0mlrscl6f6l2jcsgw4x97p2qcd26d73wy8m13gbnhrh04d4kmd9h"; + version = "0.7.1.0"; + sha256 = "0ckxnnp5aqcd13p5gnk1nx7ysws6x7nmfklxqllilpzdh5ibyj59"; libraryHaskellDepends = [ aeson async base basement bytestring cereal cryptonite data-default - exceptions generics-sop http-client http-client-tls machines memory - mtl parsec tagged template-haskell text transformers + exceptions generics-sop http-client machines memory mtl parsec + tagged template-haskell text transformers ]; testHaskellDepends = [ async base bytestring data-default generics-sop hspec hspec-contrib @@ -222258,8 +222871,8 @@ self: { }: mkDerivation { pname = "weeder"; - version = "1.0.3"; - sha256 = "14hmxg7p2mq3lh7ydmjk22xr95hd37q3c95d3k6rqi2jxhjs1gvp"; + version = "1.0.4"; + sha256 = "0xcqhc09v81ynpfxyqb2nyjypcxw84b7ac7cwmkfwf1i71ixf28q"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -229475,6 +230088,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-test_1_6_4" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, bytestring, case-insensitive, conduit, containers + , cookie, hspec, hspec-core, html-conduit, http-types, HUnit + , network, persistent, 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.4"; + sha256 = "0nxrscg4rxdwvivpxfsc735zr8w72w5vrlgaw1mq6ikn4cwidyng"; + libraryHaskellDepends = [ + attoparsec base blaze-builder blaze-html blaze-markup bytestring + case-insensitive conduit containers cookie hspec-core html-conduit + http-types HUnit network persistent 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 + ]; + homepage = "http://www.yesodweb.com"; + description = "integration testing for WAI/Yesod Applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-test-json" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, hspec , http-types, HUnit, text, transformers, wai, wai-test @@ -229500,8 +230141,8 @@ self: { }: mkDerivation { pname = "yesod-text-markdown"; - version = "0.1.8"; - sha256 = "1k48wjnn4vvlh9cvh8p3yanjmr772vqz4jbz9nxk0vv9ab9dns81"; + version = "0.1.10"; + sha256 = "1p3xcghlazxdqwgs4d1gsbmpjpmhmx8dcxjhha5hxww4ilyqpviw"; libraryHaskellDepends = [ aeson base markdown persistent shakespeare text yesod-core yesod-form yesod-persistent @@ -230836,8 +231477,8 @@ self: { }: mkDerivation { pname = "zeromq4-patterns"; - version = "0.3.0.0"; - sha256 = "0y5rk13rzmyfxrxbkn38klzxgnbmqi2xg69m5l2gb2gqrza8szy7"; + version = "0.3.1.0"; + sha256 = "1n9yndiw0z2asslkx2nlx56w3qhb55p7ih03j52889m2f8maiwvl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 0ab102a5ec4..18aeef04a77 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -15,13 +15,13 @@ let else throw "Unsupported system!"; in stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "1.4.33"; + version = "1.4.40"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "0fl4m3vsycd35gkrrlqsjlv0myh12bgb0jg3pm548l19qwrc0pm7"; + sha256 = "16n5p29pf062mfsn7q8q8hw0ppxb02a0kkakd0vjrybqflpgf42j"; }; # FIXME: might be nice to put different APIs in different outputs diff --git a/pkgs/development/libraries/botan/2.0.nix b/pkgs/development/libraries/botan/2.0.nix index dec08d17177..890f3789761 100644 --- a/pkgs/development/libraries/botan/2.0.nix +++ b/pkgs/development/libraries/botan/2.0.nix @@ -1,9 +1,9 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - baseVersion = "2.3"; + baseVersion = "2.6"; revision = "0"; - sha256 = "0z6lwv28hxnfkhd4s03cb4cdm1621bsswc2h88z4qslqwpz71y9r"; + sha256 = "1iawmymmnp5j2mcjj70slivn6bgg8gbpppldc1rjqw5sbdan3wn1"; postPatch = '' sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt ''; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index d2dc9a8c637..403f0e8aa99 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -9,7 +9,6 @@ with stdenv.lib; -assert stdenv.isFreeBSD || stdenv.isDarwin || stdenv.cc.isGNU || hostPlatform.isCygwin; assert stdenv.isLinux -> utillinuxMinimal != null; # TODO: diff --git a/pkgs/development/libraries/godot_headers/default.nix b/pkgs/development/libraries/godot_headers/default.nix deleted file mode 100644 index 940882b1742..00000000000 --- a/pkgs/development/libraries/godot_headers/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { - name = "godot_headers"; - version = "2018-02-09"; - src = fetchFromGitHub { - owner = "GodotNativeTools"; - repo = "godot_headers"; - rev = "51bca3bf5d917341f3e15076c5a9191f8a5118ae"; - sha256 = "0z562pqm8y8wldmfiya72cvwwpvcfznpl0wypagw50v0f41ilywh"; - }; - buildPhase = "true"; - installPhase = '' - mkdir $out - cp -r . $out/include - ''; - meta = { - homepage = "https://github.com/GodotNativeTools/godot_headers/"; - description = "Headers for the Godot API supplied by the GDNative module"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.twey ]; - }; -} diff --git a/pkgs/development/libraries/libbson/default.nix b/pkgs/development/libraries/libbson/default.nix index 6b370f46e70..6244c3a351e 100644 --- a/pkgs/development/libraries/libbson/default.nix +++ b/pkgs/development/libraries/libbson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libbson-${version}"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "mongodb"; repo = "libbson"; rev = version; - sha256 = "01lyikbpqky1ib8g4vhwpb5rjwyzm6g1z24z8m73lk4vcdl65190"; + sha256 = "16rmzxhhmbvhp4q6qac5j9c74z2pcg5raag5w16mynzikdd2l05b"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libe-book/default.nix b/pkgs/development/libraries/libe-book/default.nix index 3c900f86917..6c52f2c0b1a 100644 --- a/pkgs/development/libraries/libe-book/default.nix +++ b/pkgs/development/libraries/libe-book/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchurl, gperf, pkgconfig, librevenge, libxml2, boost, icu -, cppunit, zlib +, cppunit, zlib, liblangtag }: let s = # Generated upstream information rec { baseName="libe-book"; - version="0.1.2"; + version="0.1.3"; name="${baseName}-${version}"; - hash="1v48pd32r2pfysr3a3igc4ivcf6vvb26jq4pdkcnq75p70alp2bz"; - url="mirror://sourceforge/project/libebook/libe-book-0.1.2/libe-book-0.1.2.tar.xz"; - sha256="1v48pd32r2pfysr3a3igc4ivcf6vvb26jq4pdkcnq75p70alp2bz"; + hash="1yg1vws1wggzhjw672bpgh2x541g5i9wryf67g51m0r79zrqz3by"; + url="https://kent.dl.sourceforge.net/project/libebook/libe-book-0.1.3/libe-book-0.1.3.tar.xz"; + sha256="1yg1vws1wggzhjw672bpgh2x541g5i9wryf67g51m0r79zrqz3by"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gperf librevenge libxml2 boost icu cppunit zlib + gperf librevenge libxml2 boost icu cppunit zlib liblangtag ]; # Boost 1.59 compatability fix diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix new file mode 100644 index 00000000000..6d9085e1741 --- /dev/null +++ b/pkgs/development/libraries/liblangtag/default.nix @@ -0,0 +1,52 @@ +{stdenv, fetchurl, fetchFromBitbucket, autoreconfHook, gtkdoc, gettext +, pkgconfig, glib, libxml2, gobjectIntrospection, gnome-common, unzip +}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "liblangtag"; + version = "0.6.1"; + + src = fetchFromBitbucket { + owner = "tagoh"; + repo = "${pname}"; + rev = "${version}"; + sha256 = "19dk2qsg7f3ig9xz8d73jvikmf5kvrwi008wrz2psxinbdml442g"; + }; + + core_zip = fetchurl { + # please update if an update is available + url = "http://www.unicode.org/Public/cldr/33/core.zip"; + sha256 = "1faq1p5dmxpkczz6cjfsry7piksgym19cq2kf4jj2v885h490d7s"; + }; + + language_subtag_registry = fetchurl { + url = "http://www.iana.org/assignments/language-subtag-registry"; + sha256 = "1qfkvllyqcy40vmnvjn5w9fxw7g6ww46cb306vkgcfghnjjfhv3b"; + }; + + postPatch = '' + gtkdocize + cp "${core_zip}" data/core.zip + touch data/stamp-core-zip + cp "${language_subtag_registry}" data/language-subtag-registry + ''; + + configureFlags = [ + ''--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias'' + ]; + + buildInputs = [ gettext glib libxml2 gobjectIntrospection gnome-common + unzip ]; + nativeBuildInputs = [ autoreconfHook gtkdoc gettext pkgconfig ]; + + meta = { + inherit version; + description = "An interface library to access tags for identifying languages"; + license = stdenv.lib.licenses.mpl20; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + # There are links to a homepage that are broken by a BitBucket change + homepage = "https://bitbucket.org/tagoh/liblangtag/overview"; + }; +} diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index 3afe0e905e7..8168ff0edae 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libsass-${version}"; - version = "3.5.3"; + version = "3.5.4"; src = fetchurl { url = "https://github.com/sass/libsass/archive/${version}.tar.gz"; - sha256 = "1lfdq2ahskf9yd0m71jlx3r4n6a0dhg4wxpnwbrvj2a23k7db7zi"; + sha256 = "0w47hvzmbdpbjx8j83wn8dwcvglpab8abkszf9xfzrpqvb6wnqaz"; }; patchPhase = '' diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 00ec2298617..335400b80ef 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -1,6 +1,39 @@ -args@{ callPackage, ... }: +{ stdenv, fetchurl, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip, ... }: -callPackage (import ./generic.nix { - version = "1.1.6"; - sha256 = "1xlh0sqypjbx0imw3bkbjwgwb4bm6zl7c0y01p0xsw8ncfmwjll7"; -}) args +stdenv.mkDerivation rec { + name = "libtorrent-rasterbar-${version}"; + version = "1.1.7"; + + src = + let formattedVersion = lib.replaceChars ["."] ["_"] version; + in fetchurl { + url = "https://github.com/arvidn/libtorrent/archive/libtorrent-${formattedVersion}.tar.gz"; + sha256 = "0vbw7wcw8x9787rq5fwaibpvvspm3237l8ahbf20gjpzxhn4yfwc"; + }; + + nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; + buildInputs = [ boost openssl zlib python libiconv geoip ]; + + preConfigure = "./autotool.sh"; + + configureFlags = [ + "--enable-python-binding" + "--with-libgeoip=system" + "--with-libiconv=yes" + "--with-boost=${boost.dev}" + "--with-boost-libdir=${boost.out}/lib" + "--with-libiconv=yes" + ]; + + enableParallelBuilding = true; + + doCheck = false; # fails to link + + meta = with stdenv.lib; { + homepage = http://www.rasterbar.com/products/libtorrent/; + description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; + license = licenses.bsd3; + maintainers = [ maintainers.phreedom ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix deleted file mode 100644 index c112ab65a20..00000000000 --- a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix +++ /dev/null @@ -1,45 +0,0 @@ -# Version specific options -{ version, sha256, patches ? [] }: - -{ stdenv, fetchurl, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip, ... }: - -let formattedVersion = lib.replaceChars ["."] ["_"] version; - -in - -stdenv.mkDerivation rec { - name = "libtorrent-rasterbar-${version}"; - - src = fetchurl { - url = "https://github.com/arvidn/libtorrent/archive/libtorrent-${formattedVersion}.tar.gz"; - inherit sha256; - }; - - inherit patches; - - nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; - buildInputs = [ boost openssl zlib python libiconv geoip ]; - - preConfigure = "./autotool.sh"; - - configureFlags = [ - "--enable-python-binding" - "--with-libgeoip=system" - "--with-libiconv=yes" - "--with-boost=${boost.dev}" - "--with-boost-libdir=${boost.out}/lib" - "--with-libiconv=yes" - ]; - - enableParallelBuilding = true; - - doCheck = false; # fails to link - - meta = with stdenv.lib; { - homepage = http://www.rasterbar.com/products/libtorrent/; - description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; - license = licenses.bsd3; - maintainers = [ maintainers.phreedom ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index fc2068ca02c..4265f1ee98a 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { name = "opendht-${version}"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = "${version}"; - sha256 = "14pdih09h3bmgimmj9sa917x7kld49m91gvh0lcncink8rmbxvf1"; + sha256 = "1702abnsaf473c56pz18xjgvc2pjhba8dyfryir5dg34zw1c94sc"; }; buildInputs = [ diff --git a/pkgs/development/libraries/poppler/qt4.nix b/pkgs/development/libraries/poppler/qt4.nix deleted file mode 100644 index c82a543413e..00000000000 --- a/pkgs/development/libraries/poppler/qt4.nix +++ /dev/null @@ -1,44 +0,0 @@ -# TODO: get rid of this (https://github.com/NixOS/nixpkgs/issues/32883) -{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintlOrEmpty -, zlib, curl, cairo, freetype, fontconfig, lcms2, libjpeg, openjpeg -, poppler_data, qt4 -}: - -let - # Last version supporting QT4 - version = "0.61.1"; -in -stdenv.mkDerivation rec { - name = "poppler-qt4-${version}"; - - src = fetchurl { - url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "1afdrxxkaivvviazxkg5blsf2x24sjkfj92ib0d3q5pm8dihjrhj"; - }; - - outputs = [ "out" "dev" ]; - - buildInputs = [ libiconv poppler_data ] ++ libintlOrEmpty; - - propagatedBuildInputs = [ zlib freetype fontconfig libjpeg openjpeg cairo lcms2 curl qt4 ]; - - nativeBuildInputs = [ cmake ninja pkgconfig ]; - - cmakeFlags = [ - "-DENABLE_XPDF_HEADERS=on" - "-DENABLE_UTILS=off" - ]; - - meta = with lib; { - homepage = https://poppler.freedesktop.org/; - description = "A PDF rendering library"; - - longDescription = '' - Poppler is a PDF rendering library based on the xpdf-3.0 code base. - ''; - - license = licenses.gpl2; - platforms = platforms.all; - maintainers = with maintainers; [ ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index 281dbe0a5ed..bc3b4441305 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -10,13 +10,13 @@ let xcodePatch = in stdenv.mkDerivation rec { pname = "qscintilla"; - version = "2.10.3"; + version = "2.9.4"; name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${version}"; src = fetchurl { url = "mirror://sourceforge/pyqt/QScintilla2/QScintilla-${version}/QScintilla_gpl-${version}.zip"; - sha256 = "0rsx0b0iz5yf3x594kzhi0c2wpbmknv9b0a3rmx5w37bvmpd6qav"; + sha256 = "04678skipydx68zf52vznsfmll2v9aahr66g50lcqbr6xsmgr1yi"; }; buildInputs = [ (if withQt5 then qtbase else qt4) ] @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ++ (if withQt5 then [ qmake ] else [ qmake4Hook ]); - patches = [] ++ lib.optional withQt5 [ xcodePatch ]; + patches = lib.optional (stdenv.isDarwin && withQt5) [ xcodePatch ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index fb43af36243..0f727a9be47 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "umockdev-${version}"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "martinpitt"; repo = "umockdev"; rev = version; - sha256 ="1dvhs9nkznlnagzjny61fh574g42c47b9s5hxsqdgqb51njawdg1"; + sha256 ="1z101yw7clxz39im3y435s3rj1gna3kp0fkj9wd62vxqvk68lhik"; }; buildInputs = [ glib systemd libgudev ]; diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index e7a2dee541d..5f8e2442726 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -45,7 +45,7 @@ passthru = { fancyName = "MariaDB"; - driver = "lib/libmyodbc3-3.51.12.so"; + driver = "lib/libmaodbc.so"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index cc6e7211b1d..b9b18dc7910 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { cp -d loader/libvulkan.so* $out/lib cp demos/vulkaninfo $out/bin mkdir -p $out/lib $out/share/vulkan/explicit_layer.d - cp -d layers/*.so $out/lib/ - cp -d layers/*.json $out/share/vulkan/explicit_layer.d/ + cp -L layers/*.so $out/lib/ + cp -L layers/*.json $out/share/vulkan/explicit_layer.d/ sed -i "s:\\./lib:$out/lib/lib:g" "$out/share/vulkan/"*/*.json mkdir -p $dev/include cp -rv ../include $dev/ diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index 81ec5732b9a..2fe4005532d 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -3,8 +3,6 @@ , platformTools }: -assert stdenv.isLinux; - stdenv.mkDerivation rec { name = "android-ndk-r10e"; diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix index 271a18e4ee0..3b5da19da9e 100644 --- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix +++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix @@ -3,8 +3,6 @@ , platformTools }: -assert stdenv.isLinux; - stdenv.mkDerivation rec { name = "android-ndk-r8e"; diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix index be4fc0f7f54..601b0b319bc 100644 --- a/pkgs/development/mobile/flashtool/default.nix +++ b/pkgs/development/mobile/flashtool/default.nix @@ -1,7 +1,5 @@ { stdenv, requireFile, p7zip, jre, libusb1, platformTools, gtk2, glib, libXtst }: -assert stdenv.system == "i686-linux"; - # TODO: # # The FlashTool and FlashToolConsole scripts are messy and should probably we @@ -57,7 +55,7 @@ stdenv.mkDerivation rec { homepage = http://www.flashtool.net/; description = "S1 flashing software for Sony phones from X10 to Xperia Z Ultra"; license = stdenv.lib.licenses.unfreeRedistributableFirmware; - platforms = stdenv.lib.platforms.linux; + platforms = [ "i686-linux" ]; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }; diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index ce5bb315581..2029eabba02 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -17,9 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ entrypoints ] ++ stdenv.lib.optional stdenv.isLinux secretstorage; - # all tests with flake8 are broken right now - # https://github.com/tholo/pytest-flake8/issues/45 - doCheck = false; + doCheck = !stdenv.isDarwin; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index b6f94536e2f..cb763552262 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "nbxmpp"; - version = "0.6.4"; + version = "0.6.5"; name = "${pname}-${version}"; # Tests aren't included in PyPI tarball. @@ -10,7 +10,7 @@ buildPythonPackage rec { name = "${name}.tar.bz2"; url = "https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.bz2?" + "ref=${name}"; - sha256 = "0mikgksf01w82wnnm0phmzkijk2c93g24fzd59s71n3zy7f7dx3l"; + sha256 = "0b7jw07s4mnp20gcg8raw4bhw2h1hxf75cbn4f2ynj69fbpfr38h"; }; propagatedBuildInputs = [ pyopenssl ]; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 50cb8ceba91..331366e379d 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -6,7 +6,7 @@ let pname = "PyQt"; - version = "5.10"; + version = "5.10.1"; inherit (pythonPackages) buildPythonPackage python dbus-python sip; @@ -25,7 +25,7 @@ in buildPythonPackage { src = fetchurl { url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt5_gpl-${version}.tar.gz"; - sha256 = "0l2zy6b7bfjxmg4bb8yikg6i8iy2xdwmvk7knfmrzfpqbmkycbrl"; + sha256 = "1vz9c4v0k8azk2b08swwybrshzw32x8djjpq13mf9v15x1qyjclr"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index 74ff0be3833..1bc08d63418 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 = "20170302"; + version = "20180427"; src = fetchFromGitHub { repo = "pyslurm"; owner = "PySlurm"; - rev = "f5a756f199da404ec73cb7fcd7f04ec4d21ea3ff"; - sha256 = "1xn321nc8i8zmngh537j6lnng1rhdp460qx4skvh9daz5h9nxznx"; + rev = "3900e1afac9ffd13c80c57d8c39933d42eb7bad7"; + sha256 = "1a183ig4sdbc70rx2yyaslyq61wkbsf8cbim1jj0kzrp65nf0vls"; }; buildInputs = [ cython slurm ]; diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix index b170f480e96..c2d205f2833 100644 --- a/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pytest-flake8"; - version = "1.0.0"; + version = "1.0.1"; # although pytest is a runtime dependency, do not add it as # propagatedBuildInputs in order to allow packages depend on another version @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "01driw4sc6nfi3m3ii7d074pxi3h1h4mbiyad9crg5i1l5jxx5ir"; + sha256 = "0s5fdivrmhjf6ybr6m2qb1h8hndv2jh2ir29qv36lhy9b7sc9kg5"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/rocket-errbot/default.nix b/pkgs/development/python-modules/rocket-errbot/default.nix index 2d2b3af0694..fac0780982d 100644 --- a/pkgs/development/python-modules/rocket-errbot/default.nix +++ b/pkgs/development/python-modules/rocket-errbot/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { # remove with 1.2.6 patches = [ (fetchpatch { url = "https://github.com/errbotio/rocket/pull/1.patch"; - sha256 = "0v9zjp4ls32vkpr4b6kjflz4ny2fwj6hwshbnjmhdzc4hnmnzf7x"; + sha256 = "1s668yv5b86b78vbqwhcl44k2l16c9bhk3199yy9hayf0vkxnwif"; }) ]; meta = { diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index 65211ca088b..91caf0348a4 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "apktool-${version}"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { urls = [ "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar" "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar" ]; - sha256 = "01sjrc3fwkpkr8b4w1i9amyiix02b29n0w2zcrw5sdj91n8vm3b4"; + sha256 = "1wjpn1wxg8fid2mch5ili35xqvasa3pk8h1xaiygw5idpxh3cm0f"; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index 98adaf1c1aa..ae540104df3 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -76,6 +76,9 @@ let ./skip_test_linux_distro.patch ]; + # TimeoutErrors on slow machines -> aarch64 + doCheck = !stdenv.isAarch64; + postPatch = '' substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)" ''; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 6cce9803c91..c834e6aacde 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: let - version = "10.6.0"; + version = "10.7.1"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "0icn4xgnlrmxvhbw1lrdkg3x0cr9vhbi1vc51ahd708f9hd64ik6"; + sha256 = "0vvi9czvl9ina3hrfd5qb557wyyspndagbzrjzmv0bbjspxgb4c5"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "0wgkvgcmby89w1vy06v7milj62656zflw2wi2g30645g72gz0as9"; + sha256 = "1vb85asz5y9x7zzambvdfcy05nyr4kryx5zsfz7nbna7hidi2s86"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "113vkx3dnv3fvnracszlhf56fb5jr41fr3s0bs025hv8b9sp04zz"; + sha256 = "0v4c2631yzizhbiym3qzl8p4vjy5a081ry66qpl21ma9ib2cm9r5"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index df9addcad3c..2c1b942169f 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -12,11 +12,11 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "liquibase"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/${pname}-parent-${version}/${name}-bin.tar.gz"; - sha256 = "0nrszf80s5v485li7xy8jkl1wsgjq6inr33m7p85splxhdgszjlb"; + sha256 = "0my5rh553yfb8lz1lv5gmgvqbc5pl4xjii4z5wwbbpniyxwy64q4"; }; buildInputs = [ jre makeWrapper ]; diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix index da8f90cd940..470ba291825 100644 --- a/pkgs/development/tools/gllvm/default.nix +++ b/pkgs/development/tools/gllvm/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "gllvm-${version}"; - version = "2018-04-28"; # ~= 1.0.2, but no release tags yet + version = "1.2.0"; goPackagePath = "github.com/SRI-CSL/gllvm"; src = fetchFromGitHub { owner = "SRI-CSL"; repo = "gllvm"; - rev = "7755cdabb9bd2c5115059c13dce986e4e38f624e"; - sha256 = "0a7mzmshyl4m216cxnar0pzjq98n2678x0czqfxgfdga55xp5frl"; + rev = "v${version}"; + sha256 = "0779828kzw9ihdnw5r3h2fzzd8ml8cskyf5hmaqqksinjb7bm3is"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index 89cc7eb1bfe..88ea499d28c 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -34,27 +34,29 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; buildPhase = '' - scons platform=x11 prefix=$out -j $NIX_BUILD_CORES \ + scons target=release_debug platform=x11 prefix=$out -j $NIX_BUILD_CORES \ ${lib.concatStringsSep " " (lib.mapAttrsToList (k: v: "${k}=${builtins.toJSON v}") options)} ''; + outputs = [ "out" "dev" "man" ]; + installPhase = '' - mkdir -p $out/bin - cp bin/godot.x11.tools.* $out/bin/godot + mkdir -p "$out/bin" + cp bin/godot.* $out/bin/godot - mkdir -p "$out/share/applications" - cp misc/dist/linux/godot.desktop "$out/share/applications/" - substituteInPlace "$out/share/applications/godot.desktop" \ - --replace "Exec=godot" \ - "Exec=$out/bin/godot" + mkdir "$dev" + cp -r modules/gdnative/include $dev + + mkdir -p "$man/share/man/man6" + cp misc/dist/linux/godot.6 "$man/share/man/man6/" - mkdir -p "$out/share/icons/hicolor/scalable/apps/" + mkdir -p "$out"/share/{applications,icons/hicolor/scalable/apps} + cp misc/dist/linux/godot.desktop "$out/share/applications/" cp icon.svg "$out/share/icons/hicolor/scalable/apps/godot.svg" cp icon.png "$out/share/icons/godot.png" - - mkdir -p "$out/share/man/man6" - cp misc/dist/linux/godot.6 "$out/share/man/man6/" + substituteInPlace "$out/share/applications/godot.desktop" \ + --replace "Exec=godot" "Exec=$out/bin/godot" ''; meta = { diff --git a/pkgs/development/tools/iaca/2.1.nix b/pkgs/development/tools/iaca/2.1.nix index c434fd5a7de..e71e296212c 100644 --- a/pkgs/development/tools/iaca/2.1.nix +++ b/pkgs/development/tools/iaca/2.1.nix @@ -1,5 +1,4 @@ { stdenv, makeWrapper, requireFile, patchelf, gcc, unzip }: -assert stdenv.system == "x86_64-linux"; with stdenv.lib; # v2.1: last version with NHM/WSM arch support diff --git a/pkgs/development/tools/iaca/3.0.nix b/pkgs/development/tools/iaca/3.0.nix index 025dfc56721..af738bc71a9 100644 --- a/pkgs/development/tools/iaca/3.0.nix +++ b/pkgs/development/tools/iaca/3.0.nix @@ -1,5 +1,4 @@ { stdenv, requireFile, patchelf, unzip }: -assert stdenv.system == "x86_64-linux"; with stdenv.lib; stdenv.mkDerivation { diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index 2eeefb23e04..2a707e35b91 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gtk2, gawk }: stdenv.mkDerivation rec { - version = "1.4"; + version = "1.4.1"; name = "visualvm-${version}"; src = fetchzip { url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; - sha256 = "0qpkal3yc8c8di4dmdglq54a4m7hciqximn5n6hwx2zqnfwx909z"; + sha256 = "10ciyggf8mcy3c53shpl03fxqwsa2ilgw3xdgqhb1ah151k18p78"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/development/tools/misc/cquery/default.nix b/pkgs/development/tools/misc/cquery/default.nix index 09220b2dc65..bf979767126 100644 --- a/pkgs/development/tools/misc/cquery/default.nix +++ b/pkgs/development/tools/misc/cquery/default.nix @@ -5,8 +5,8 @@ let src = fetchFromGitHub { owner = "cquery-project"; repo = "cquery"; - rev = "e45a9ebbb6d8bfaf8bf1a3135b6faa910afea37e"; - sha256 = "049gkqbamq4r2nz9yjcwq369zrmwrikzbhfza2x2vndqzaavq5yg"; + rev = "34b357bc5e873d52d2aa41287c6e138244cea109"; + sha256 = "0i34v30cl73485bzpbis539x0iq9whpv0403ca5a9h6vqwnvdn7c"; fetchSubmodules = true; }; @@ -15,7 +15,7 @@ let in stdenv.mkDerivation rec { name = "cquery-${version}"; - version = "2018-03-25"; + version = "2018-05-01"; inherit src; @@ -46,7 +46,6 @@ stdenv.mkDerivation rec { doInstallCheck = true; installCheckPhase = '' pushd ${src} - $out/bin/cquery --ci --clang-sanity-check && \ $out/bin/cquery --ci --test-unit ''; @@ -56,6 +55,5 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.tobim ]; - priority = 3; }; } diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix index 66fbed514dc..15eac37a53a 100644 --- a/pkgs/development/tools/misc/ltrace/default.nix +++ b/pkgs/development/tools/misc/ltrace/default.nix @@ -10,10 +10,14 @@ stdenv.mkDerivation rec { buildInputs = [ elfutils libunwind ]; - preConfigure = - '' - configureFlags="--disable-werror" - makeFlagsArray=(INSTALL="install -c") + prePatch = let + debian = fetchurl { + url = mirror://debian/pool/main/l/ltrace/ltrace_0.7.3-6.debian.tar.xz; + sha256 = "0xc4pfd8qw53crvdxr29iwl8na53zmknca082kziwpvlzsick4kp"; + }; + in '' + tar xf '${debian}' + patches="$patches $(cat debian/patches/series | sed 's|^|debian/patches/|')" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index de2d6c5b7bf..a8183aa4ba0 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -21,8 +21,6 @@ let in -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; - stdenv.mkDerivation rec { pname = "saleae-logic"; version = "1.2.10"; @@ -93,7 +91,7 @@ stdenv.mkDerivation rec { description = "Software for Saleae logic analyzers"; homepage = http://www.saleae.com/; license = licenses.unfree; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix index 8b6b655b6a5..51a83760be3 100644 --- a/pkgs/development/tools/phantomjs/default.nix +++ b/pkgs/development/tools/phantomjs/default.nix @@ -3,7 +3,6 @@ let platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; in -assert lib.elem stdenv.system platforms; stdenv.mkDerivation rec { name = "phantomjs-1.9.8"; diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix index b3049736b71..041aee7a1c5 100644 --- a/pkgs/development/tools/slimerjs/default.nix +++ b/pkgs/development/tools/slimerjs/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="slimerjs"; - version="0.10.3"; + version="1.0.0"; name="${baseName}-${version}"; owner = "laurentj"; repo = "${baseName}"; - sha256="16v6a1kcq8il4snbrgsq5xmxs35alzf4qlmscr2yli95xq5fnl5y"; + sha256="1w4sfrv520isbs7r1rlzl5y3idrpad7znw9fc92yz40jlwz7sxs4"; rev = "${version}"; }; buildInputs = [ diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix index f7628cf181c..d1b1c84a313 100644 --- a/pkgs/development/tools/sqsh/default.nix +++ b/pkgs/development/tools/sqsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, freetds, readline }: +{ stdenv, fetchurl, autoreconfHook, freetds, readline, libiconv }: let mainVersion = "2.5"; @@ -17,11 +17,13 @@ in stdenv.mkDerivation rec { substituteInPlace src/cmd_connect.c \ --replace CS_TDS_80 CS_TDS_73 + '' + stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace configure --replace "libct.so" "libct.dylib" ''; enableParallelBuilding = true; - buildInputs = [ freetds readline ]; + buildInputs = [ freetds readline libiconv ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 9a4aaaad3ce..4e5596fee66 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -1,12 +1,9 @@ -{ stdenv, lib, makeWrapper, fetchurl, dpkg, - - alsaLib, atk, cairo, cups, dbus_daemon, expat, fontconfig, freetype, gdk_pixbuf, glib, gnome2, gtk2-x11, - nspr, nss, - - libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, - libXrender, libXtst, libxcb, - - libudev0-shim, glibc, curl, openssl +{ stdenv, lib, makeWrapper, fetchurl, dpkg +, alsaLib, atk, cairo, cups, dbus_daemon, expat, fontconfig, freetype +, gdk_pixbuf, glib, gnome2, gtk2-x11, nspr, nss +, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext +, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, nghttp2 +, libudev0-shim, glibc, curl, openssl }: let @@ -15,14 +12,14 @@ let gtk2-x11 nspr nss stdenv.cc.cc.lib libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst libxcb ]; - runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl openssl ]; + runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl openssl nghttp2 ]; in stdenv.mkDerivation rec { name = "insomnia-${version}"; - version = "5.16.0"; + version = "5.16.1"; src = fetchurl { url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb"; - sha256 = "1cpw63ibxaa08vms7fbxr5ap2yh4vcl8q3rjfn0ag1zkimz8cg2p"; + sha256 = "0r1l7pfcnif8vw9jnxbh5p9sih6wvgjpx8rpfmnvw21pr8cm0zyp"; }; nativeBuildInputs = [ makeWrapper dpkg ]; diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix index fd575975fed..9766e58c15a 100644 --- a/pkgs/games/adom/default.nix +++ b/pkgs/games/adom/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, patchelf, zlib, libmad, libpng12, libcaca, libGLU_combined, alsaLib, libpulseaudio , xorg }: -assert stdenv.system == "x86_64-linux"; let inherit (xorg) libXext libX11; @@ -58,5 +57,3 @@ stdenv.mkDerivation rec { platforms = ["x86_64-linux"]; }; } - - diff --git a/pkgs/games/sdlmame/default.nix b/pkgs/games/sdlmame/default.nix index 947e52e1f13..fa498b8e041 100644 --- a/pkgs/games/sdlmame/default.nix +++ b/pkgs/games/sdlmame/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, alsaLib, qt48, SDL, fontconfig, freetype, SDL_ttf, xorg }: -assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; - stdenv.mkDerivation rec { version = "0.151.u0-1"; name = "sdlmame-${version}"; @@ -39,6 +37,6 @@ stdenv.mkDerivation rec { description = "A port of the popular Multiple Arcade Machine Emulator using SDL with OpenGL support"; license = "MAME"; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index 30e2bcfdf52..ce8d38ca5d1 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "sgt-puzzles-r${version}"; - version = "20180409.d95f476"; + version = "20180429.31384ca"; src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - sha256 = "1psml0abh3i577dns440h52568ggdny2wk1hhr30815nxibbribx"; + sha256 = "0r97kyy0rxgzw78lby2kwi8fg1yimw8a3biy5psgd983d0nwcf9l"; }; nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig perl wrapGAppsHook ]; diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix index 1c145f6d71c..65dc77fbf16 100644 --- a/pkgs/games/terraria-server/default.nix +++ b/pkgs/games/terraria-server/default.nix @@ -1,5 +1,4 @@ { stdenv, lib, file, fetchurl, unzip }: -assert stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { name = "terraria-server-${version}"; @@ -31,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = http://terraria.org; description = "Dedicated server for Terraria, a 2D action-adventure sandbox"; - platforms = platforms.linux; + platforms = ["x86_64-linux"]; license = licenses.unfree; }; } diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index e5bb211eb22..e0f9bae2e39 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, patchelf, glibc, libX11, libGLU_combined }: with stdenv.lib; -assert stdenv.isi686; stdenv.mkDerivation { name = "tibia-10.90"; diff --git a/pkgs/games/ue4demos/default.nix b/pkgs/games/ue4demos/default.nix index 4bac1cd1bb3..0bdb759048a 100644 --- a/pkgs/games/ue4demos/default.nix +++ b/pkgs/games/ue4demos/default.nix @@ -1,8 +1,5 @@ { stdenv, fetchurl, unzip, patchelf, xorg, openal }: -assert stdenv.isLinux; -assert stdenv.isx86_64; - let buildDemo = { name, src }: stdenv.mkDerivation rec { @@ -47,7 +44,7 @@ let meta = { description = "Unreal Engine 4 Linux demos"; homepage = https://wiki.unrealengine.com/Linux_Demos; - platforms = stdenv.lib.platforms.linux; + platforms = [ "x86_64-linux" ]; license = stdenv.lib.licenses.unfree; }; }; @@ -189,4 +186,3 @@ in { }; }; } - diff --git a/pkgs/games/wesnoth/dev.nix b/pkgs/games/wesnoth/dev.nix index c9cd7119d8f..81ffd6b135f 100644 --- a/pkgs/games/wesnoth/dev.nix +++ b/pkgs/games/wesnoth/dev.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.13.13"; + version = "1.14.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "1jn3gvw0x8ndwvdm4bqpki1p1cxg2ij02s6w0frhfi4kz706al0c"; + sha256 = "09niq53y17faizhmd98anx3dha7hvacvj9a0a64lg8wn915cm0bw"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/misc/drivers/gutenprint/bin.nix b/pkgs/misc/drivers/gutenprint/bin.nix index ac3e96e2658..021852f3505 100644 --- a/pkgs/misc/drivers/gutenprint/bin.nix +++ b/pkgs/misc/drivers/gutenprint/bin.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, rpm, cpio, zlib }: -assert stdenv.system == "x86_64-linux"; - /* usage: (sorry, its still impure but works!) impure directory: @@ -23,7 +21,7 @@ sed -n 's/^ServerBin //p' $(sed -n 's/respawn.*-c \(.*''\) -F.*''/\1/p' /etc/eve then. I've tried that. TODO tidy this all up. Find source instead of binary. Fix paths ... Find out how to check ink levels etc - + */ stdenv.mkDerivation { @@ -56,13 +54,13 @@ stdenv.mkDerivation { patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $libPath $p done - + mkdir $out/lib ln -s $out/cups/lib $out/lib/cups ''; meta = { description = "Some additional CUPS drivers including Canon drivers"; - platforms = stdenv.lib.platforms.linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix index 673e4c3ed08..2e28fd297ec 100644 --- a/pkgs/misc/emulators/pcsx2/default.nix +++ b/pkgs/misc/emulators/pcsx2/default.nix @@ -2,8 +2,6 @@ , makeWrapper, perl, pkgconfig, portaudio, SDL2, soundtouch, stdenv , wxGTK30, zlib }: -assert stdenv.isi686; - stdenv.mkDerivation rec { name = "pcsx2-${version}"; version = "1.4.0"; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index db58c398526..0b71797eeec 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -6,7 +6,6 @@ buildScript ? null, configureFlags ? "" }: -assert stdenv.isLinux; assert stdenv.cc.cc.isGNU or false; with import ./util.nix { inherit lib; }; @@ -83,7 +82,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { # Add capability to ignore known failing tests # and enable doCheck doCheck = false; - + postInstall = let links = prefix: pkg: "ln -s ${pkg} $out/${prefix}/${pkg.name}"; in '' @@ -100,7 +99,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { fi done ''; - + enableParallelBuilding = true; # https://bugs.winehq.org/show_bug.cgi?id=43530 diff --git a/pkgs/misc/foldingathome/default.nix b/pkgs/misc/foldingathome/default.nix index aaa932c0a1c..1aae47e603b 100644 --- a/pkgs/misc/foldingathome/default.nix +++ b/pkgs/misc/foldingathome/default.nix @@ -1,7 +1,5 @@ {stdenv, fetchurl}: -assert stdenv.system == "i686-linux"; - stdenv.mkDerivation { name = "folding-at-home-6.02"; @@ -22,7 +20,7 @@ stdenv.mkDerivation { # be considered a gcroot. installPhase = '' BINFILES="fah6 mpiexec"; - for a in $BINFILES; do + for a in $BINFILES; do patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $a done mkdir -p $out/bin @@ -33,5 +31,6 @@ stdenv.mkDerivation { homepage = http://folding.stanford.edu/; description = "Folding@home distributed computing client"; license = stdenv.lib.licenses.unfree; + platforms = [ "i686-linux" ]; }; } diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 0134d5fae48..163a1a98676 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -21,7 +21,9 @@ in # TL;DR # Add your plugin to ./vim-plugin-names # Regenerate via `nix-shell -I nixpkgs=/path/to/your/local/fork -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix +'w result' +qall"` -# Copy the generated expression(s) into this file. +# Note: pluginnames2nix will fetch any plugins in the file; to speed up the process, +# update ./vim-plugin-names to contain only plugins which need generation +# Copy the generated expression(s) into this file from the ./result file. # If plugin is complicated then make changes to ./vim2nix/additional-nix-code # This attrs contains two sections: diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 188d9709ee0..b4fb99504ef 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -1,5 +1,5 @@ { stdenv, hostPlatform, fetchcvs, lib, groff, mandoc, zlib, coreutils -, yacc, flex, libressl, bash, more }: +, yacc, flex, libressl, bash, less, writeText }: let fetchNetBSD = path: version: sha256: fetchcvs { @@ -30,13 +30,16 @@ let NOGCCERROR = "yes"; LEX = "flex"; MKUNPRIVED = "yes"; - INSTPRIV = '' ''${INSTPRIV.unpriv}''; HOST_SH = "${bash}/bin/sh"; OBJCOPY = if stdenv.isDarwin then "true" else "objcopy"; - PRESERVE = "-p"; MACHINE_ARCH = hostPlatform.parsed.cpu.name; MACHINE_CPU = hostPlatform.parsed.cpu.name; + INSTALL_FILE = "install -U -c"; + INSTALL_DIR = "xinstall -U -d"; + INSTALL_LINK = "install -U -l h"; + INSTALL_SYMLINK = "install -U -l s"; + # libs will be provided by cc-wrapper LIBCRT0 = ""; LIBCRTI = ""; @@ -106,17 +109,6 @@ let fi ''; - # Need to create directories for xinstall to work. Unused ones - # will be removed in the postInstall. - preInstall = '' - mkdir -p $out$BINDIR $out$LIBDIR $out$INFODIR \ - $out$DOCDIR $out$LOCALEDIR $out$INCSDIR - for i in 1 2 3 4 5 6 7 8 9; do - mkdir -p $out$MANDIR/man$i $out$MANDIR/html$i \ - $out$DOCDIR/reference/ref$i - done - ''; - preFixup = '' # Remove lingering /usr references if [ -d $out/usr ]; then @@ -125,10 +117,6 @@ let find . -type f -exec mv \{} $out/\{} \; fi - if [ -f $out/METALOG ]; then - rm $out/METALOG - fi - find $out -type d -empty -delete ''; @@ -155,11 +143,11 @@ let ${make.postPatch} ''; buildPhase = '' - runHook prePatch + runHook preBuild sh ./buildmake.sh - runHook postPatch + runHook postBuild ''; installPhase = '' runHook preInstall @@ -229,7 +217,14 @@ let ] ++ libutil.extraPaths ++ libc.extraPaths; }; - install = netBSDDerivation { + # HACK to ensure parent directories exist. This emulates GNU + # install’s -D option. No alternative seems to exist in BSD install. + install = let binstall = writeText "binstall" '' + #!/usr/bin/env sh + for last in $@; do true; done + mkdir -p $(dirname $last) + xinstall "$@" + ''; in netBSDDerivation { path = "usr.bin/xinstall"; version = "7.1.2"; sha256 = "0nzhyh714m19h61m45gzc5dszkbafp5iaphbp5mza6w020fzf2y8"; @@ -240,13 +235,12 @@ let runHook preInstall install -D install.1 $out/share/man/man1/install.1 - install -D xinstall $out/bin/install - ln -s $out/bin/install $out/bin/xinstall - ln -s $out/bin/install $out/bin/binstall + install -D xinstall $out/bin/xinstall + install -D -m 0550 ${binstall} $out/bin/binstall + ln -s $out/bin/binstall $out/bin/install runHook postInstall ''; - # INSTALL_FILE = "install -D"; }; fts = netBSDDerivation { @@ -332,6 +326,8 @@ let substituteInPlace $NETBSDSRCDIR/share/mk/bsd.prog.mk \ --replace '-Wl,-dynamic-linker=''${_SHLINKER}' "" \ --replace '-Wl,-rpath,''${SHLIBDIR}' "" + substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ + --replace '_INSTRANLIB=''${empty(PRESERVE):?-a "''${RANLIB} -t":}' '_INSTRANLIB=' '' + lib.optionalString stdenv.isDarwin '' substituteInPlace $NETBSDSRCDIR/share/mk/bsd.sys.mk \ --replace '-Wl,--fatal-warnings' "" \ @@ -344,10 +340,6 @@ let --replace '-Wl,-Map=''${_LIB}.so.''${SHLIB_SOVERSION}.map' "" \ --replace '-Wl,-rpath,''${SHLIBDIR}' "" ''; - preInstall = '' - mkdir -p $out$BINDIR $out$DOCDIR/reference/ref1/make \ - $out$MANDIR/man1 $out$MANDIR/html1 $out/share/mk - ''; postInstall = '' (cd $NETBSDSRCDIR/share/mk && make FILESDIR=/share/mk install) ''; @@ -402,7 +394,6 @@ in rec { version = "7.1.2"; sha256 = "0nickhsjwgnr2h9nvwflvgfz93kqms5hzdnpyq02crpj35w98bh4"; makeFlags = [ "BINDIR=/share" ]; - preInstall = "mkdir -p $out/share/dict"; }; games = netBSDDerivation { @@ -410,20 +401,20 @@ in rec { sha256 = "04wjsang8f8kxsifiayklbxaaxmm3vx9rfr91hfbxj4hk8gkqzy1"; version = "7.1.2"; makeFlags = [ "BINDIR=/bin" - "SCRIPTSDIR=/bin" - "FILESDIR=/share/games" ]; + "SCRIPTSDIR=/bin" ]; postPatch = '' sed -i '1i #include <time.h>' adventure/save.c for f in $(find . -name pathnames.h); do substituteInPlace $f \ - --replace /usr/share/games/fortune $out/share/games \ --replace /usr/share/games $out/share/games \ --replace /usr/games $out/bin \ --replace /usr/libexec $out/libexec \ - --replace /usr/bin/more ${more}/bin/more \ + --replace /usr/bin/more ${less}/bin/less \ --replace /usr/share/dict ${dict}/share/dict done + substituteInPlace boggle/boggle/bog.h \ + --replace /usr/share/games $out/share/games substituteInPlace ching/ching/ching.sh \ --replace /usr/share $out/share \ --replace /usr/libexec $out/libexec @@ -457,11 +448,15 @@ in rec { # HACK strfile needs to be installed first & in the path. The # Makefile should do this for us but haven't gotten it to work preBuild = '' - mkdir -p $out/bin $out/share/man/man8 $out/share/man/html8 (cd fortune/strfile && make && make BINDIR=/bin install) export PATH=$out/bin:$PATH ''; + postInstall = '' + substituteInPlace $out/usr/share/games/quiz.db/index \ + --replace /usr $out + ''; + NIX_CFLAGS_COMPILE = [ "-D__noinline=" "-D__scanflike(a,b)=" @@ -475,14 +470,6 @@ in rec { "-D__c99inline=__inline" ]; - preInstall = '' - mkdir -p $out/var/games/hackdir \ - $out/share/games \ - $out$DOCDIR/reference/ref6/rogue \ - $out$MANDIR/man6 $out$MANDIR/html6 - touch $out/var/games/hackdir/perm - ''; - buildInputs = [ compat libcurses libterminfo libressl ]; extraPaths = [ dict.src who.src ]; }; @@ -543,7 +530,6 @@ in rec { substituteInPlace term.c --replace /usr/share $out/share ''; postInstall = '' - mkdir -p $out/share/misc (cd $NETBSDSRCDIR/share/terminfo && make && make BINDIR=/share install) ''; extraPaths = [ @@ -593,4 +579,11 @@ in rec { ]; }; + misc = netBSDDerivation { + path = "share/misc"; + version = "7.1.2"; + sha256 = "1vyn30js14nnadlls55mg7g1gz8h14l75rbrrh8lgn49qg289665"; + makeFlags = [ "BINDIR=/share" ]; + }; + } diff --git a/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix b/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix index 5b9f30b62c3..f336b14ee37 100644 --- a/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix +++ b/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix @@ -13,7 +13,7 @@ let minSdkVersion = "9.0"; iosPlatformArch = { parsed, ... }: { - "arm" = "armv7"; + "armv7a" = "armv7"; "aarch64" = "arm64"; "x86_64" = "x86_64"; }.${parsed.cpu.name}; diff --git a/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix b/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix index 3844912f6ba..fa3d4284e59 100644 --- a/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix +++ b/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix @@ -1,7 +1,5 @@ { stdenv, writeScript }: -assert stdenv.isDarwin; - stdenv.mkDerivation rec { name = "darwin-native-x11-and-opengl"; diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index e2340939fce..b8498c096d3 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "alsa-utils-${version}"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { urls = [ "ftp://ftp.alsa-project.org/pub/utils/${name}.tar.bz2" "http://alsa.cybermirror.org/utils/${name}.tar.bz2" ]; - sha256 = "1s727md6mb408y2cfwzjkx23abxhampyrjdkgpyygdhxx62x42rj"; + sha256 = "0vnkyymgwj9rfdb11nvab30dnfrylmakdfildxl0y8mj836awp0m"; }; patchPhase = '' diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix index ab1a93b3a70..275600d4278 100644 --- a/pkgs/os-specific/linux/blcr/default.nix +++ b/pkgs/os-specific/linux/blcr/default.nix @@ -2,7 +2,6 @@ # BLCR version 0.8.6 should works with linux kernel up to version 3.17.x -assert stdenv.isLinux; assert builtins.compareVersions "3.18" kernel.version == 1; stdenv.mkDerivation { diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index d4595d73d94..bbf01e5027c 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -2,8 +2,6 @@ pythonPackages, readline, udev, libical, systemd, enableWiimote ? false, enableMidi ? false }: -assert stdenv.isLinux; - stdenv.mkDerivation rec { name = "bluez-5.49"; diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix index 65be409a75e..e36aaa5e38d 100644 --- a/pkgs/os-specific/linux/cpufrequtils/default.nix +++ b/pkgs/os-specific/linux/cpufrequtils/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, libtool, gettext }: -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; - stdenv.mkDerivation rec { name = "cpufrequtils-008"; diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix index 971eef6a8b5..8d18d598020 100644 --- a/pkgs/os-specific/linux/drbd/default.nix +++ b/pkgs/os-specific/linux/drbd/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, flex, systemd, perl }: -assert stdenv.isLinux; - stdenv.mkDerivation rec { name = "drbd-8.4.4"; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 177a5c878f6..f798a3a85e5 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,13 +3,13 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.38"; + version = "4.14.39"; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "00ibrl633d4cqnn4i0z7kj1ddj1243dh7ap783bwlicw9hkddwzg"; + sha256 = "1gdpq4w6srz2fpyi8bqpgz0p5wm3mrk7ir967c6f2285mdvcb7r6"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix index 46bdcff66a1..acafd0bd89f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.16.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.16.6"; + version = "4.16.7"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0jwa2r3gpn4ahy38730b7g4xzavfqwxxwgyfhpn5ssvzsc4934gs"; + sha256 = "0f81mxc5b3zf5m29bwc3afv07k60661zl18098cjjqv6qpvbwynq"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index ccc8b4ba2dc..725f3385a80 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.130"; + version = "4.4.131"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1rad8fa25hzifpxqxsc7wzhcssbbv32rc03nvljygvlxcn8dz6xj"; + sha256 = "02f7sx20l0ljkgffac0yqav1kk7x1gl6026icslcsnn46pfpl4k5"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index cc4609676d4..b09a58c6eb7 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.97"; + version = "4.9.98"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "08vg8lm03s04cpyicq1jj342c25x3039nnxvcvwr80j18w4biwf4"; + sha256 = "1vqh33wdiqf3j4xfakxndhb8x6yr5ppwv9asx7kldjfvb8sr1k8j"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix index 4d5cd07cd95..a1c93e56590 100644 --- a/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix +++ b/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.14.38"; + version = "4.14.39"; revision = "a"; - sha256 = "0cad9fp1h96blbgqlgxyv8wc0jg88mildc1ayljz0zpa5dxdfzh4"; + sha256 = "19nx537a8kbbyp5d67anrqfw8i8hliw3yb1gyrf70isl3fqifjaa"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix index a931d81cf26..9d4b729060a 100644 --- a/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix +++ b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.16.6"; + version = "4.16.7"; revision = "a"; - sha256 = "0lkycpb837svrvyy04a8n2ix1rrzfl87ah5293mgf9jgy4kmaa2l"; + sha256 = "1kdy3sqrn161hm5avhk3nd75p07a21ja0rzar3ybibh1bl2mc6zq"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index f00d6272902..8248a628f0a 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -1,5 +1,4 @@ -{ stdenv, buildPackages, fetchurl, attr, perl, pam ? null }: -assert pam != null -> stdenv.isLinux; +{ stdenv, buildPackages, fetchurl, attr, perl, pam }: stdenv.mkDerivation rec { name = "libcap-${version}"; @@ -10,8 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0qjiqc5pknaal57453nxcbz3mn1r4hkyywam41wfcglq3v2qlg39"; }; - outputs = [ "out" "dev" "lib" "man" "doc" ] - ++ stdenv.lib.optional (pam != null) "pam"; + outputs = [ "out" "dev" "lib" "man" "doc" "pam" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ]; @@ -22,7 +20,7 @@ stdenv.mkDerivation rec { makeFlags = [ "lib=lib" - (stdenv.lib.optional (pam != null) "PAM_CAP=yes") + "PAM_CAP=yes" "BUILD_CC=$(CC_FOR_BUILD)" "CC:=$(CC)" ]; diff --git a/pkgs/os-specific/linux/lsscsi/default.nix b/pkgs/os-specific/linux/lsscsi/default.nix index 833c032ccd2..084a7e7c9a3 100644 --- a/pkgs/os-specific/linux/lsscsi/default.nix +++ b/pkgs/os-specific/linux/lsscsi/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl }: -assert stdenv.isLinux; - stdenv.mkDerivation { name = "lsscsi-0.28"; diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 7a59c2ea757..b6fdae75bac 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -3,8 +3,6 @@ , buildPlatform, hostPlatform }: -assert stdenv.isLinux; - let sendmail-script = writeScript "sendmail-script" '' #!/bin/sh diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index e2abbd7335e..72095bc8cda 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -5,9 +5,6 @@ with stdenv.lib; # The Magewell Pro Capture drivers are not supported for kernels older than 3.2 assert versionAtLeast kernel.version "3.2.0"; -# this package currently only supports x86 and x86_64, as I have no ARM device to test on -assert (stdenv.system == "x86_64-linux") || (stdenv.system == "i686-linux"); - let bits = if stdenv.is64bit then "64" diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix index cc6ac64d58a..68acbb83531 100644 --- a/pkgs/os-specific/linux/phc-intel/default.nix +++ b/pkgs/os-specific/linux/phc-intel/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, kernel, which }: -assert stdenv.isLinux; # Don't bother with older versions, though some might even work: assert stdenv.lib.versionAtLeast kernel.version "4.10"; diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix index edc7220d658..358fa700382 100644 --- a/pkgs/os-specific/linux/psmisc/default.nix +++ b/pkgs/os-specific/linux/psmisc/default.nix @@ -1,7 +1,5 @@ {stdenv, fetchurl, ncurses}: -assert stdenv.isLinux; - stdenv.mkDerivation rec { name = "psmisc-23.1"; diff --git a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix index f69269347e3..d02a531f67f 100644 --- a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix +++ b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix @@ -1,7 +1,5 @@ { stdenv, systemd, cryptsetup }: -assert stdenv.isLinux; - stdenv.lib.overrideDerivation systemd (p: { version = p.version; name = "systemd-cryptsetup-generator"; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index ad8f5fb08e0..1c5dd6dadf1 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -13,8 +13,6 @@ , withSelinux ? false, libselinux }: -assert stdenv.isLinux; - let pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]); diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index 180aabc94cc..ed3567ffdad 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -1,7 +1,6 @@ {stdenv, fetchzip, linuxHeaders, libiconvReal, cross ? null, gccCross ? null, extraConfig ? ""}: -assert stdenv.isLinux; assert cross != null -> gccCross != null; let diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index d62038c7b0b..1e9101b68af 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -3,8 +3,6 @@ , useSystemd ? true, systemd, gobjectIntrospection }: -assert stdenv.isLinux; - stdenv.mkDerivation rec { name = "upower-0.99.7"; diff --git a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix index e1bafa93ea6..527471bad32 100644 --- a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix +++ b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix @@ -11,8 +11,6 @@ , libpciaccess }: -assert stdenv.isLinux; - stdenv.mkDerivation { name = "xf86-input-multitouch-20110312"; diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 95326b4c1c6..b1745dd5371 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -1,99 +1,131 @@ { stdenv, fetchurl, fetchFromGitHub -, which, findutils, m4, gawk, python, openjdk, mono58, libressl_2_6 +, which, findutils, m4, gawk +, python, openjdk, mono58, libressl_2_6 +, boost16x }: let - version = "5.1.7"; - branch = "release-5.1"; - rev = "9ad8d02386d4a6a5efecf898df80f2747695c627"; - sha256 = "1rc472ih24f9s5g3xmnlp3v62w206ny0pvvw02bzpix2sdrpbp06"; + makeFdb = + { version + , branch + , rev, sha256 - # hysterical raisins dictate a version of boost this old. however, - # we luckily do not need to build anything, we just need the header - # files. - boost152 = stdenv.mkDerivation rec { - name = "boost-headers-1.52.0"; + # fdb 6.0+ support boost 1.6x+, so default to it + , boost ? boost16x + }: stdenv.mkDerivation rec { + name = "foundationdb-${version}"; + inherit version; - src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2"; - sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2"; - }; + src = fetchFromGitHub { + owner = "apple"; + repo = "foundationdb"; + inherit rev sha256; + }; - buildPhase = ":"; - configurePhase = ":"; - installPhase = '' - mkdir -p $out/include/ - cp -R boost $out/include/ - ''; - }; + nativeBuildInputs = [ gawk which m4 findutils mono58 ]; + buildInputs = [ python openjdk libressl_2_6 boost ]; -in stdenv.mkDerivation rec { - name = "foundationdb-${version}"; - inherit version; + patches = + [ ./fix-scm-version.patch + ./ldflags.patch + ]; - src = fetchFromGitHub { - owner = "apple"; - repo = "foundationdb"; - inherit rev sha256; - }; + postPatch = '' + substituteInPlace ./build/scver.mk \ + --subst-var-by NIXOS_FDB_VERSION_ID "${rev}" \ + --subst-var-by NIXOS_FDB_SCBRANCH "${branch}" - nativeBuildInputs = [ gawk which m4 findutils boost152 mono58 ]; - buildInputs = [ python openjdk libressl_2_6 ]; + substituteInPlace ./Makefile \ + --replace 'shell which ccache' 'shell true' \ + --replace -Werror "" - patches = - [ ./fix-scm-version.patch - ./ldflags.patch - ]; + substituteInPlace ./Makefile \ + --replace libstdc++_pic libstdc++ - postPatch = '' - substituteInPlace ./build/scver.mk \ - --subst-var-by NIXOS_FDB_VERSION_ID "${rev}" \ - --subst-var-by NIXOS_FDB_SCBRANCH "${branch}" + substituteInPlace ./build/link-validate.sh \ + --replace 'exit 1' '#exit 1' - substituteInPlace ./Makefile \ - --replace 'shell which ccache' 'shell true' \ - --replace -Werror "" + patchShebangs . + ''; - substituteInPlace ./Makefile \ - --replace libstdc++_pic libstdc++ + enableParallelBuilding = true; + makeFlags = [ "all" "fdb_c" "fdb_java" "KVRELEASE=1" ]; - substituteInPlace ./build/link-validate.sh \ - --replace 'exit 1' '#exit 1' + configurePhase = ":"; + installPhase = '' + mkdir -vp $out/{bin,libexec/plugins} $lib/{lib,share/java} $dev/include/foundationdb - patchShebangs . - ''; + cp -v ./lib/libfdb_c.so $lib/lib + cp -v ./lib/libfdb_java.so $lib/lib - enableParallelBuilding = true; - makeFlags = [ "all" "fdb_c" "KVRELEASE=1" ]; + cp -v ./lib/libFDBLibTLS.so $out/libexec/plugins/FDBLibTLS.so - configurePhase = ":"; - installPhase = '' - mkdir -vp $out/{bin,libexec/plugins} $lib/lib $dev/include/foundationdb + cp -v ./bindings/c/foundationdb/fdb_c.h $dev/include/foundationdb + cp -v ./bindings/c/foundationdb/fdb_c_options.g.h $dev/include/foundationdb - cp -v ./lib/libfdb_c.so $lib/lib - cp -v ./lib/libFDBLibTLS.so $out/libexec/plugins/FDBLibTLS.so + cp -v ./bindings/java/foundationdb-client.jar $lib/share/java - cp -v ./bindings/c/foundationdb/fdb_c.h $dev/include/foundationdb - cp -v ./bindings/c/foundationdb/fdb_c_options.g.h $dev/include/foundationdb + for x in fdbbackup fdbcli fdbserver fdbmonitor; do + cp -v "./bin/$x" $out/bin; + done - for x in fdbbackup fdbcli fdbserver fdbmonitor; do - cp -v "./bin/$x" $out/bin; - done + ln -sfv $out/bin/fdbbackup $out/bin/dr_agent + ln -sfv $out/bin/fdbbackup $out/bin/fdbrestore + ln -sfv $out/bin/fdbbackup $out/bin/fdbdr - ln -sfv $out/bin/fdbbackup $out/bin/dr_agent - ln -sfv $out/bin/fdbbackup $out/bin/fdbrestore - ln -sfv $out/bin/fdbbackup $out/bin/fdbdr + ln -sfv $out/bin/fdbbackup $out/libexec/backup_agent + ''; - ln -sfv $out/bin/fdbbackup $out/libexec/backup_agent - ''; + outputs = [ "out" "lib" "dev" ]; - outputs = [ "out" "lib" "dev" ]; + meta = with stdenv.lib; { + description = "Open source, distributed, transactional key-value store"; + homepage = https://www.foundationdb.org; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ thoughtpolice ]; + }; + }; - meta = with stdenv.lib; { - description = "Open source, distributed, transactional key-value store"; - homepage = https://www.foundationdb.org; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ thoughtpolice ]; + # hysterical raisins dictate a version of boost this old. however, + # we luckily do not need to build anything, we just need the header + # files. + boost152 = stdenv.mkDerivation rec { + name = "boost-headers-1.52.0"; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2"; + sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2"; + }; + + configurePhase = ":"; + buildPhase = ":"; + installPhase = "mkdir -p $out/include && cp -R boost $out/include/"; }; + +in with builtins; { + + foundationdb51 = makeFdb { + version = "5.1.7"; + branch = "release-5.1"; + rev = "9ad8d02386d4a6a5efecf898df80f2747695c627"; + sha256 = "1rc472ih24f9s5g3xmnlp3v62w206ny0pvvw02bzpix2sdrpbp06"; + boost = boost152; + }; + + foundationdb52 = makeFdb rec { + version = "5.2.0pre1488_${substring 0 8 rev}"; + branch = "master"; + rev = "18f345487ed8d90a5c170d813349fa625cf05b4e"; + sha256 = "0mz30fxj6q99cvjzg39s5zm992i6h2l2cb70lc58bdhsz92dz3vc"; + boost = boost152; + }; + + foundationdb60 = makeFdb rec { + version = "6.0.0pre1636_${substring 0 8 rev}"; + branch = "master"; + rev = "1265a7b6d5e632dd562b3012e70f0727979806bd"; + sha256 = "0z1i5bkbszsbn8cc48rlhr29m54n2s0gq3dln0n7f97gf58mi5yf"; + }; + } diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index c2f06cd6a8e..3e95b41fb7e 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.68.0"; + version = "0.68.1"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; @@ -299,7 +299,6 @@ "sensor.dsmr" = ps: with ps; [ ]; "sensor.dweet" = ps: with ps; [ ]; "sensor.eddystone_temperature" = ps: with ps; [ construct ]; - "sensor.eliqonline" = ps: with ps; [ ]; "sensor.envirophat" = ps: with ps; [ ]; "sensor.etherscan" = ps: with ps; [ ]; "sensor.fastdotcom" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 0751ffb3c9e..a8091c70dfd 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -58,7 +58,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.68.0"; + hassVersion = "0.68.1"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -73,7 +73,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "037gc2sghg5n0li087vvjcf6657rd31wv0m5r23b2cdfds8lxk4w"; + sha256 = "103py7hfdanr8zk3cl93rm7ngjz0n95kwjbphq7iy8l8hqpzs1m8"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 2bfe0329595..71cb6fc72ab 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.13.9"; - sha256 = "0hpsyxpxj89p5vrzv9p1hp7xjbnj5c1w6fdy626ycvsiay4a3bjz"; + version = "1.13.12"; + sha256 = "1pl5ii1w2ycxprxk8zdnxlpdd1dia6hyrns7mnqkm3fv5ihgb4pv"; }) diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix index 7bd74c3a332..1b61cb87c9a 100644 --- a/pkgs/servers/http/nginx/stable.nix +++ b/pkgs/servers/http/nginx/stable.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "1.12.2"; - sha256 = "05h4rwja7170z0l979yjghy9i9ichllwhicylzpmmyyml6fkfprh"; + version = "1.14.0"; + sha256 = "1d9c0avfpbwvzyg53b59ks8shpnrxnbnshcd7ziizflsyv5vw5ax"; }) diff --git a/pkgs/servers/monitoring/facette/default.nix b/pkgs/servers/monitoring/facette/default.nix new file mode 100644 index 00000000000..3858720bed5 --- /dev/null +++ b/pkgs/servers/monitoring/facette/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub +, go, pkgconfig, nodejs, nodePackages, pandoc, rrdtool }: + +stdenv.mkDerivation rec { + name = "facette-${version}"; + version = "0.4.0"; + src = fetchFromGitHub { + owner = "facette"; + repo = "facette"; + rev = "${version}"; + sha256 = "1m7krq439qlf7b4l4bfjw0xfvjgj67w59mh8rf7c398rky04p257"; + }; + nativeBuildInputs = [ go pkgconfig nodejs nodePackages.npm pandoc ]; + buildInputs = [ rrdtool ]; + preBuild = '' + export HOME="$NIX_BUILD_ROOT" # npm needs a writable home + ''; + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "Time series data visualization software"; + longDescription = '' + Facette is a web application to display time series data from various + sources — such as collectd, Graphite, InfluxDB or KairosDB — on graphs. + ''; + homepage = https://facette.io/; + license = licenses.bsd3; + maintainers = with maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix new file mode 100644 index 00000000000..13e17d0b019 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "surfboard_exporter-${version}"; + version = "2.0.0"; + + goPackagePath = "github.com/ipstatic/surfboard_exporter"; + + src = fetchFromGitHub { + rev = version; + owner = "ipstatic"; + repo = "surfboard_exporter"; + sha256 = "11qms26648nwlwslnaflinxcr5rnp55s908rm1qpnbz0jnxf5ipw"; + }; + + meta = with stdenv.lib; { + description = "Arris Surfboard signal metrics exporter"; + homepage = https://github.com/ipstatic/surfboard_exporter; + license = licenses.mit; + maintainers = with maintainers; [ disassembler ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index b028fcdf37d..f3d5d121c38 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="apache-jena"; - version = "3.5.0"; + version = "3.7.0"; name="${baseName}-${version}"; url="http://archive.apache.org/dist/jena/binaries/apache-jena-${version}.tar.gz"; - sha256 = "08hfn359l9s4lckba9xgghkn32r12gqzjjr5s5hn3fzkbsig7njy"; + sha256 = "12w125hlhcib23cckk77cx7p9rzs57dbmmn90f7v8107d437j4mq"; }; buildInputs = [ makeWrapper diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index d460284ef04..b1003687a04 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -3,14 +3,14 @@ let in stdenv.mkDerivation rec { - version = "3.3.7"; + version = "3.3.8"; name = "arangodb-${version}"; src = fetchFromGitHub { repo = "arangodb"; owner = "arangodb"; rev = "v${version}"; - sha256 = "1464nl2ampfkcd2kh1hmc18hh8ya73mjmxizm6wgl5yvkh56a82x"; + sha256 = "07qz5fv4w00hs31hmx099vlzlv0x5i10b5i4h8r0bkprih8k3vg3"; }; buildInputs = [ diff --git a/pkgs/servers/sql/oracle-xe/default.nix b/pkgs/servers/sql/oracle-xe/default.nix index 9068ca70cc6..a50d623acbc 100644 --- a/pkgs/servers/sql/oracle-xe/default.nix +++ b/pkgs/servers/sql/oracle-xe/default.nix @@ -1,7 +1,5 @@ { stdenv, makeWrapper, requireFile, patchelf, rpmextract, libaio }: -assert stdenv.system == "x86_64-linux"; - with stdenv.lib; stdenv.mkDerivation rec { @@ -79,5 +77,6 @@ stdenv.mkDerivation rec { description = "Oracle Database Express Edition"; homepage = http://www.oracle.com/technetwork/products/express-edition/; license = licenses.unfree; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix index c90684e0fe0..c382061f1ef 100644 --- a/pkgs/servers/zookeeper/default.nix +++ b/pkgs/servers/zookeeper/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "zookeeper-${version}"; - version = "3.4.11"; + version = "3.4.12"; src = fetchurl { url = "mirror://apache/zookeeper/${name}/${name}.tar.gz"; - sha256 = "110fs5manyaq6rxbzwzs9x3aqw8d5l4177y9qaj3xhgpr2hniggn"; + sha256 = "1fcljn2741jw1jvjrk5a0xr8rk69wjwrq522wrc5nmjhj0qzk1n6"; }; buildInputs = [ makeWrapper jre ]; diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix index 8e15476451a..3c4c3fabfd1 100644 --- a/pkgs/shells/zsh/nix-zsh-completions/default.nix +++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: let - version = "0.3.9"; + version = "0.4.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "spwhitt"; repo = "nix-zsh-completions"; rev = "${version}"; - sha256 = "1ysc9g72yj63ygm915a316f1hcklmgswyrwsq5abwwj48001y01n"; + sha256 = "0m8b9xgbz2nvk1q7m0gqy83gbqa49n062gymhk9x93zhbdh8vwky"; }; installPhase = '' diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index 4077c4fb9ec..3bef6659735 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -6,6 +6,17 @@ extraInputs ? [] }: +let + # Use tornado-4.x until https://github.com/saltstack/salt/issues/45790 is resolved + tornado = python2Packages.tornado.overridePythonAttrs (oldAttrs: rec { + version = "4.5.3"; + name = "${oldAttrs.pname}-${version}"; + src = oldAttrs.src.override { + inherit version; + sha256 = "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d"; + }; + }); +in python2Packages.buildPythonApplication rec { pname = "salt"; version = "2017.7.4"; diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index dc5a010ec74..ff6a7af03ef 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "abcMIDI-${version}"; - version = "2018.04.18"; + version = "2018.04.24"; src = fetchzip { url = "http://ifdo.ca/~seymour/runabc/${name}.zip"; - sha256 = "0kbval5ckan8vvrlpyz1mkb1ifvr149gxpb7ljbcm890p8hpaxff"; + sha256 = "02n5xnagj1z44b23zmaxdkmn8nisrb34r8hb5xs7cr1wq7m4fmlh"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase diff --git a/pkgs/tools/audio/aucdtect/default.nix b/pkgs/tools/audio/aucdtect/default.nix index 244f7b40673..825e1a0cc07 100644 --- a/pkgs/tools/audio/aucdtect/default.nix +++ b/pkgs/tools/audio/aucdtect/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, lib, rpmextract }: -assert stdenv.isLinux; - with lib; stdenv.mkDerivation rec { diff --git a/pkgs/tools/filesystems/hfsprogs/default.nix b/pkgs/tools/filesystems/hfsprogs/default.nix new file mode 100644 index 00000000000..25ec31ea698 --- /dev/null +++ b/pkgs/tools/filesystems/hfsprogs/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, openssl, libbsd }: + +let version = "332.25"; + package_name = "hfsprogs"; in +stdenv.mkDerivation rec { + name = "${package_name}-${version}"; + srcs = [ + (fetchurl { + url = "http://ftp.de.debian.org/debian/pool/main/h/hfsprogs/${package_name}_${version}-11.debian.tar.gz"; + sha256 = "62d9b8599c66ebffbc57ce5d776e20b41341130d9b27341d63bda08460ebde7c"; + }) + (fetchurl { + url = "https://opensource.apple.com/tarballs/diskdev_cmds/diskdev_cmds-${version}.tar.gz"; + sha256 = "74c9aeca899ed7f4bf155c65fc45bf0f250c0f6d57360ea953b1d536d9aa45e6"; + }) + ]; + + sourceRoot = "diskdev_cmds-" + version; + patches = [ "../debian/patches/*.patch" ]; + + buildInputs = [ openssl libbsd ]; + makefile = "Makefile.lnx"; + + # Inspired by PKGBUILD of https://www.archlinux.org/packages/community/x86_64/hfsprogs/ + installPhase = '' + # Create required package directories + install -m 755 -d "$out/bin" + install -m 755 -d "$out/share/${package_name}" + install -m 755 -d "$out/share/man/man8/" + # Copy executables + install -m 755 "newfs_hfs.tproj/newfs_hfs" "$out/bin/mkfs.hfsplus" + install -m 755 "fsck_hfs.tproj/fsck_hfs" "$out/bin/fsck.hfsplus" + # Copy shared data + install -m 644 "newfs_hfs.tproj/hfsbootdata.img" "$out/share/${package_name}/hfsbootdata" + # Copy man pages + install -m 644 "newfs_hfs.tproj/newfs_hfs.8" "$out/share/man/man8/mkfs.hfsplus.8" + install -m 644 "fsck_hfs.tproj/fsck_hfs.8" "$out/share/man/man8/fsck.hfsplus.8" + ''; + + meta = { + description = "HFS/HFS+ user space utils"; + license = stdenv.lib.licenses.apsl20; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/pkgs/tools/filesystems/smbnetfs/default.nix index 7ff42c4d1f9..9c279f99b00 100644 --- a/pkgs/tools/filesystems/smbnetfs/default.nix +++ b/pkgs/tools/filesystems/smbnetfs/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, fuse, samba, pkgconfig, glib }: +{ stdenv, fetchurl, fuse, samba, pkgconfig, glib, autoconf, attr, libsecret }: stdenv.mkDerivation rec { name = "smbnetfs-${version}"; - version = "0.6.0"; + version = "0.6.1"; src = fetchurl { url = "mirror://sourceforge/project/smbnetfs/smbnetfs/SMBNetFS-${version}/${name}.tar.bz2"; - sha256 = "16sikr81ipn8v1a1zrqgnsy2as3zcaxbzkr0bm5vxy012bq0plkd"; + sha256 = "02iqjnm6pdwc1q38z56akiwdbp0xisr6qwrmxs1lrk5mq7j8x2w4"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fuse samba glib ]; + nativeBuildInputs = [ pkgconfig autoconf ]; + buildInputs = [ fuse samba glib attr libsecret ]; meta = with stdenv.lib; { description = "A FUSE FS for mounting Samba shares"; diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index 77302f3d4a2..2f7e80dd912 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, writeText, zlib, rpmextract, patchelf, which }: -assert stdenv.isLinux; - let p = if stdenv.is64bit then { arch = "x86_64"; @@ -13,7 +11,7 @@ let gcclib = "${stdenv.cc.cc.lib}/lib"; sha256 = "09h71i3k9d24ki81jdwhnav63fqbc44glbx228s9g3cr4ap41jcx"; }; -in +in stdenv.mkDerivation rec { name = "yandex-disk-${version}"; @@ -64,4 +62,3 @@ stdenv.mkDerivation rec { ''; }; } - diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix index 5341c9840be..b91c7d2378b 100644 --- a/pkgs/tools/misc/megacli/default.nix +++ b/pkgs/tools/misc/megacli/default.nix @@ -1,7 +1,5 @@ { stdenv, rpmextract, ncurses5, patchelf, makeWrapper, requireFile, unzip }: -assert stdenv.system == "x86_64-linux"; - stdenv.mkDerivation rec { name = "megacli-8.07.07"; @@ -31,5 +29,6 @@ stdenv.mkDerivation rec { meta = { description = "CLI program for LSI MegaRAID cards, which also works with some Dell PERC RAID cards"; license = stdenv.lib.licenses.unfree; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/tools/misc/pk2cmd/default.nix b/pkgs/tools/misc/pk2cmd/default.nix index 2f69517e4bd..4312aecaacd 100644 --- a/pkgs/tools/misc/pk2cmd/default.nix +++ b/pkgs/tools/misc/pk2cmd/default.nix @@ -1,7 +1,5 @@ {stdenv, fetchurl, libusb, makeWrapper}: -assert stdenv.isLinux; - stdenv.mkDerivation { name = "pk2cmd-1.20"; src = fetchurl { diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index 77308ecf2ed..7be2e3fc61d 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -1,7 +1,5 @@ -{ stdenv, fetchFromGitHub, fetchpatch, coreutils -, python3, python3Packages, substituteAll }: - -assert stdenv.isLinux; +{ stdenv, fetchFromGitHub, fetchpatch, python3, python3Packages +, lib, makeWrapper, coreutils }: python3Packages.buildPythonApplication rec { name = "trash-cli-${version}"; @@ -16,12 +14,6 @@ python3Packages.buildPythonApplication rec { }; patches = [ - (substituteAll { - src = ./nix-paths.patch; - df = "${coreutils}/bin/df"; - libc = "${stdenv.cc.libc.out}/lib/libc.so.6"; - }) - # Fix build on Python 3.6. (fetchpatch { url = "https://github.com/andreafrancia/trash-cli/commit/a21b80d1e69783bb09376c3f60dd2f2a10578805.patch"; @@ -30,10 +22,19 @@ python3Packages.buildPythonApplication rec { ]; buildInputs = with python3Packages; [ nose mock ]; + nativeBuildInputs = [ makeWrapper ]; + + preFixup = '' + for bin in $out/bin/*; do + wrapProgram $bin \ + --prefix PATH : ${lib.makeBinPath [ coreutils ]} \ + --prefix DYLD_LIBRARY_PATH : ${lib.makeSearchPath "lib" (lib.optional (stdenv.hostPlatform.libc == "glibc") (lib.getDev stdenv.cc.libc))} + done + ''; checkPhase = "nosetests"; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/andreafrancia/trash-cli; description = "Command line tool for the desktop trash can"; maintainers = [ maintainers.rycee ]; diff --git a/pkgs/tools/misc/trash-cli/nix-paths.patch b/pkgs/tools/misc/trash-cli/nix-paths.patch deleted file mode 100644 index d7b485eec15..00000000000 --- a/pkgs/tools/misc/trash-cli/nix-paths.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/trashcli/list_mount_points.py 2014-12-23 10:10:43.808470486 +0100 -+++ a/trashcli/list_mount_points.py 2014-12-23 10:19:04.954796457 +0100 -@@ -12,7 +12,7 @@ def mount_points_from_getmnt(): - - def mount_points_from_df(): - import subprocess -- df_output = subprocess.Popen(["df", "-P"], stdout=subprocess.PIPE).stdout -+ df_output = subprocess.Popen(["@df@", "-P"], stdout=subprocess.PIPE).stdout - return list(_mount_points_from_df_output(df_output)) - - def _mount_points_from_df_output(df_output): -@@ -46,13 +46,7 @@ def _mounted_filesystems_from_getmnt() : - ("mnt_freq", c_int), # Dump frequency (in days). - ("mnt_passno", c_int)] # Pass number for `fsck'. - -- if sys.platform == "cygwin": -- libc_name = "cygwin1.dll" -- else: -- libc_name = find_library("c") -- -- if libc_name == None : -- libc_name="/lib/libc.so.6" # fix for my Gentoo 4.0 -+ libc_name = "@libc@" - - libc = cdll.LoadLibrary(libc_name) - libc.getmntent.restype = POINTER(mntent_struct) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 55c785b06da..d2e490373da 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -16,11 +16,11 @@ with stdenv.lib; buildPythonApplication rec { pname = "youtube-dl"; - version = "2018.04.25"; + version = "2018.05.01"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "17zxgwfcy7c6gdyxdgh02f5zi52gvmy0zpccfj6zjkhw5iqj1vbw"; + sha256 = "1mpyqdyjip5a6nn8lj1kaaab4pj75js6i8qzgap8bmn0k46awb1n"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index 3dfd136ad06..6fef6a9e7fa 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, fetchgit, go }: -assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isAarch32); - let # Code with BSD license diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/tools/networking/logmein-hamachi/default.nix index bbee6546b2f..0b585d10316 100644 --- a/pkgs/tools/networking/logmein-hamachi/default.nix +++ b/pkgs/tools/networking/logmein-hamachi/default.nix @@ -2,8 +2,6 @@ with stdenv.lib; -assert stdenv.isLinux; - let arch = if stdenv.system == "x86_64-linux" then "x64" diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 99e12084ccb..3a1bba4ce8c 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, iptables, libuuid, pkgconfig }: -assert stdenv.isLinux; - stdenv.mkDerivation rec { name = "miniupnpd-2.0.20180422"; diff --git a/pkgs/tools/networking/ssmtp/default.nix b/pkgs/tools/networking/ssmtp/default.nix index ceac5a58800..031f32b5362 100644 --- a/pkgs/tools/networking/ssmtp/default.nix +++ b/pkgs/tools/networking/ssmtp/default.nix @@ -4,7 +4,7 @@ assert tlsSupport -> openssl != null; stdenv.mkDerivation { name = "ssmtp-2.64"; - + src = fetchurl { url = mirror://debian/pool/main/s/ssmtp/ssmtp_2.64.orig.tar.bz2; sha256 = "0dps8s87ag4g3jr6dk88hs9zl46h3790marc5c2qw7l71k4pvhr2"; @@ -28,7 +28,7 @@ stdenv.mkDerivation { installFlags = "etcdir=$(out)/etc"; installTargets = [ "install" "install-sendmail" ]; - + buildInputs = stdenv.lib.optional tlsSupport openssl; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/uget-integrator/default.nix b/pkgs/tools/networking/uget-integrator/default.nix new file mode 100644 index 00000000000..cc93da7f253 --- /dev/null +++ b/pkgs/tools/networking/uget-integrator/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, uget, python3Packages }: + +stdenv.mkDerivation rec { + name = "uget-integrator-${version}"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "ugetdm"; + repo = "uget-integrator"; + rev = "v${version}"; + sha256 = "0bfqwbpprxp5sy49p2hqcjdfj7zamnp2hhcnnyccffkn7pghx8pp"; + }; + + nativeBuildInputs = [ python3Packages.wrapPython ]; + + buildInputs = [ uget python3Packages.python ]; + + installPhase = '' + for f in conf/com.ugetdm.{chrome,firefox}.json; do + substituteInPlace $f --replace "/usr" "$out" + done + + install -D -t $out/bin bin/uget-integrator + install -D -t $out/etc/opt/chrome/native-messaging-hosts conf/com.ugetdm.chrome.json + install -D -t $out/etc/chromium/native-messaging-hosts conf/com.ugetdm.chrome.json + install -D -t $out/etc/opera/native-messaging-hosts conf/com.ugetdm.chrome.json + install -D -t $out/lib/mozilla/native-messaging-hosts conf/com.ugetdm.firefox.json + + wrapPythonPrograms + ''; + + meta = with stdenv.lib; { + description = "Native messaging host to integrate uGet Download Manager with web browsers"; + homepage = https://github.com/ugetdm/uget-integrator; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index 38104b8b213..f27f9af59c6 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -3,15 +3,15 @@ , gtk2, pango, atk, cairo, gdk_pixbuf, jasper, xkeyboardconfig , makeWrapper , makeDesktopItem, python, pythonPackages, lib , libredirect, lsof}: -assert system == "i686-linux" || system == "x86_64-linux"; + let - all_data = (with builtins; fromJSON (readFile ./data.json)); + all_data = builtins.fromJSON (builtins.readFile ./data.json); system_map = { i686-linux = "i386"; x86_64-linux = "amd64"; }; - data = (with builtins; getAttr (getAttr system system_map) all_data); + data = all_data.${system_map.${system} or (throw "Unsupported platform")}; baseUrl = http://repo.sinew.in; @@ -54,7 +54,7 @@ let description = "a well known password manager"; homepage = https://www.enpass.io/; license = lib.licenses.unfree; - platforms = lib.platforms.linux; + platforms = [ "x86_64-linux" "i686-linux"]; }; buildInputs = [makeWrapper dpkg]; @@ -70,8 +70,8 @@ let cp $out/bin/EnpassHelper/EnpassNMHost{,.untampered} sed \ - -i s@/opt/Enpass/bin/runenpass.sh@$out/bin/Enpass@ \ - $out/share/applications/enpass.desktop + -i s@/opt/Enpass/bin/runenpass.sh@$out/bin/Enpass@ \ + $out/share/applications/enpass.desktop for i in $out/bin/{Enpass,EnpassHelper/{EnpassHelper,EnpassNMHost}}; do patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $i diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index bcafefb72c9..0a760807afb 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - name = "sudo-1.8.22"; + name = "sudo-1.8.23"; src = fetchurl { urls = [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" ]; - sha256 = "00pxp74xkwdcmrjwy55j0k8p684jk1zx3nzdc11v30q8q8kwnmkj"; + sha256 = "0yg62wq8rcrbr7qvh3wgfg2g4bwanbi50cr2lf2cfyy8dydx4qyq"; }; prePatch = '' diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index b28fa7cfd47..70640563aa3 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -2,16 +2,16 @@ pythonPackages.buildPythonApplication rec { pname = "vulnix"; - version = "1.6.1"; + version = "1.6.3"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0j6v6phq3naqnpvzxxnynsyv9y7bhig1gzvg594qpknqgyzj16bf"; + sha256 = "0ia71l0210dgcxf63bg07csx40nmpdghr4mszz91qrri7lsa5qqi"; }; - buildInputs = - [ ronn ] ++ - (with pythonPackages; [ freezegun pytest pytestcov ]); + buildInputs = [ ronn ]; + + checkInputs = with pythonPackages; [ freezegun pytest pytestcov pytest-flake8 ]; propagatedBuildInputs = [ nix @@ -27,11 +27,6 @@ pythonPackages.buildPythonApplication rec { outputs = [ "out" "doc" ]; - # pytest-flake8 is currently broken - # re-enable after it has been fixed - # https://github.com/NixOS/nixpkgs/issues/39206 - patches = [ ./disable-flake8.patch ]; - postBuild = '' make -C doc ''; diff --git a/pkgs/tools/security/vulnix/disable-flake8.patch b/pkgs/tools/security/vulnix/disable-flake8.patch deleted file mode 100644 index cd165d05ccc..00000000000 --- a/pkgs/tools/security/vulnix/disable-flake8.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/setup.cfg b/setup.cfg -index a9e37ce..41b9886 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -1,5 +1,5 @@ - [tool:pytest] --addopts = --flake8 --tb=native --cov=src --cov-report=html --junitxml=report.xml -m 'not jenkinsonly' src/vulnix -+addopts = --tb=native --cov=src --cov-report=html --junitxml=report.xml -m 'not jenkinsonly' src/vulnix - markers = slow: This is a non-unit test and thus is not run by default. Use ``-m slow`` to run these, or ``-m 1`` to run all tests. - - [aliases] -diff --git a/setup.py b/setup.py -index a9315e5..d14ad59 100644 ---- a/setup.py -+++ b/setup.py -@@ -35,7 +35,6 @@ setup( - 'freezegun>0.3', - 'pytest>=3.2', - 'pytest-cov>=2.5', -- 'pytest-flake8', - 'pytest-runner>=2.11,<3dev', - 'pytest-timeout>=1.2', - 'setuptools_scm>=1.15', diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix index ee82af1a470..1ea574dbe8e 100644 --- a/pkgs/tools/system/dd_rescue/default.nix +++ b/pkgs/tools/system/dd_rescue/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoconf }: stdenv.mkDerivation rec { - version = "1.99.7"; + version = "1.99.8"; name = "dd_rescue-${version}"; src = fetchurl { - sha256 = "0d318i1i5d7hbj06wmb3xag14x542cv7fpkh5zjf5ccm64nyzir4"; + sha256 = "1gbxm8gr9sx5g1q9dycs21hkxikcy97q09lp1lvs59pnd9qpdnwh"; url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.bz2"; }; diff --git a/pkgs/tools/system/di/default.nix b/pkgs/tools/system/di/default.nix index 54c9bbb1406..b9fcb502124 100644 --- a/pkgs/tools/system/di/default.nix +++ b/pkgs/tools/system/di/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "di-${version}"; - version = "4.45"; + version = "4.46"; src = fetchurl { url = "http://gentoo.com/di/${name}.tar.gz"; - sha256 = "18z56rprhpm6y0s7pqs19yf7ilq7n50020qzxdm9yra77ivdr09z"; + sha256 = "0cskiqywiqkw44zdg4q78bjns6jjp1dz5lzdxrhpnpldc6075irw"; }; makeFlags = [ "INSTALL_DIR=$(out)" ]; diff --git a/pkgs/tools/system/storebrowse/default.nix b/pkgs/tools/system/storebrowse/default.nix index 179b4cb1a4c..e56919acc5d 100644 --- a/pkgs/tools/system/storebrowse/default.nix +++ b/pkgs/tools/system/storebrowse/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, fetchhg, go, sqlite}: -assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isAarch32); - stdenv.mkDerivation rec { name = "storebrowse-20130318212204"; diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/tools/typesetting/pdfgrep/default.nix index 0c288ca02cc..3509eb569b1 100644 --- a/pkgs/tools/typesetting/pdfgrep/default.nix +++ b/pkgs/tools/typesetting/pdfgrep/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pdfgrep-${version}"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { url = "https://pdfgrep.org/download/${name}.tar.gz"; - sha256 = "07llkrkcfjwd3ybai9ad10ybhr0biffcplmy7lw4fb87nd2dfw03"; + sha256 = "13al23c2wlpsha6c1z1h6gh5lxzphsnzpd7b78qj16rq2r46phf9"; }; postPatch = '' diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl index 2cb723a7b71..a210a65f431 100755 --- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl +++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl @@ -242,11 +242,21 @@ sub terminateContainer { while ( kill 0, $leader ) { Time::HiRes::sleep(0.1) } } +sub startContainer { + system("systemctl", "start", "container\@$containerName") == 0 + or die "$0: failed to start container\n"; +} + sub stopContainer { system("systemctl", "stop", "container\@$containerName") == 0 or die "$0: failed to stop container\n"; } +sub restartContainer { + stopContainer; + startContainer; +} + # Run a command in the container. sub runInContainer { my @args = @_; @@ -285,9 +295,12 @@ if ($action eq "destroy") { unlink($confFile) or die; } +elsif ($action eq "restart") { + restartContainer; +} + elsif ($action eq "start") { - system("systemctl", "start", "container\@$containerName") == 0 - or die "$0: failed to start container\n"; + startContainer; } elsif ($action eq "stop") { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 024ba944ad4..35cf1cd7925 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2417,6 +2417,13 @@ with pkgs; fuseiso = callPackage ../tools/filesystems/fuseiso { }; + fdbPackages = callPackage ../servers/foundationdb { stdenv = overrideCC stdenv gcc49; }; + + inherit (fdbPackages) + foundationdb51 + foundationdb52 + foundationdb60; + foundationdb = callPackage ../servers/foundationdb { stdenv = overrideCC stdenv gcc49; }; fuse-7z-ng = callPackage ../tools/filesystems/fuse-7z-ng { }; @@ -2612,7 +2619,6 @@ with pkgs; gocryptfs = callPackage ../tools/filesystems/gocrypfs { }; godot = callPackage ../development/tools/godot {}; - godot_headers = callPackage ../development/libraries/godot_headers {}; goklp = callPackage ../tools/networking/goklp {}; @@ -2905,6 +2911,8 @@ with pkgs; hiera-eyaml = callPackage ../tools/system/hiera-eyaml { }; + hfsprogs = callPackage ../tools/filesystems/hfsprogs { }; + highlight = callPackage ../tools/text/highlight ({ lua = lua5; } // lib.optionalAttrs stdenv.isDarwin { @@ -3459,6 +3467,11 @@ with pkgs; libite = callPackage ../development/libraries/libite { }; + liblangtag = callPackage ../development/libraries/liblangtag { + inherit (gnome2) gtkdoc; + inherit (gnome3) gnome-common; + }; + liblouis = callPackage ../development/libraries/liblouis { }; liboauth = callPackage ../development/libraries/liboauth { }; @@ -4124,8 +4137,6 @@ with pkgs; update-resolv-conf = callPackage ../tools/networking/openvpn/update-resolv-conf.nix { }; - open-pdf-presenter = callPackage ../applications/misc/open-pdf-presenter { }; - openvswitch = callPackage ../os-specific/linux/openvswitch { }; optipng = callPackage ../tools/graphics/optipng { @@ -5304,6 +5315,8 @@ with pkgs; uget = callPackage ../tools/networking/uget { }; + uget-integrator = callPackage ../tools/networking/uget-integrator { }; + uif2iso = callPackage ../tools/cd-dvd/uif2iso { }; umlet = callPackage ../tools/misc/umlet { }; @@ -8605,6 +8618,8 @@ with pkgs; CoinMP = callPackage ../development/libraries/CoinMP { }; + cointop = callPackage ../applications/misc/cointop { }; + commoncpp2 = callPackage ../development/libraries/commoncpp2 { }; confuse = callPackage ../development/libraries/confuse { }; @@ -10962,8 +10977,6 @@ with pkgs; suffix = "min"; }; - poppler_qt4 = callPackage ../development/libraries/poppler/qt4.nix { }; - poppler_utils = poppler.override { suffix = "utils"; utils = true; }; popt = callPackage ../development/libraries/popt { }; @@ -12310,6 +12323,8 @@ with pkgs; exim = callPackage ../servers/mail/exim { }; + facette = callPackage ../servers/monitoring/facette { }; + fcgiwrap = callPackage ../servers/fcgiwrap { }; felix = callPackage ../servers/felix { }; @@ -12674,6 +12689,7 @@ with pkgs; prometheus-rabbitmq-exporter = callPackage ../servers/monitoring/prometheus/rabbitmq-exporter.nix { }; prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-bridge.nix { }; + prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { }; prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { }; prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { }; @@ -16348,9 +16364,7 @@ with pkgs; khard = callPackage ../applications/misc/khard { }; - kid3 = callPackage ../applications/audio/kid3 { - qt = qt4; - }; + kid3 = libsForQt5.callPackage ../applications/audio/kid3 { }; kile = libsForQt5.callPackage ../applications/editors/kile { }; @@ -17212,7 +17226,7 @@ with pkgs; gtksharp = gtk-sharp-2_0; }; - plover = callPackage ../applications/misc/plover { }; + plover = recurseIntoAttrs (callPackage ../applications/misc/plover { }); plugin-torture = callPackage ../applications/audio/plugin-torture { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 48980e48f1d..937c930ac75 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -64,12 +64,6 @@ in rec { buildLlvmPackages = buildPackages.llvmPackages_39; llvmPackages = pkgs.llvmPackages_39; }; - ghc841 = callPackage ../development/compilers/ghc/8.4.1.nix rec { - bootPkgs = packages.ghc821Binary; - inherit (bootPkgs) alex happy; - buildLlvmPackages = buildPackages.llvmPackages_5; - llvmPackages = pkgs.llvmPackages_5; - }; ghc842 = callPackage ../development/compilers/ghc/8.4.2.nix rec { bootPkgs = packages.ghc821Binary; inherit (bootPkgs) alex happy; @@ -135,11 +129,6 @@ in rec { ghc = bh.compiler.ghc822; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; }; - ghc841 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc841; - ghc = bh.compiler.ghc841; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { }; - }; ghc842 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc842; ghc = bh.compiler.ghc842; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 97424a10160..41debeefc89 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -267,14 +267,14 @@ let }; luafilesystem = buildLuaPackage rec { - version = "1.6.3"; + version = "1.7.0"; name = "filesystem-${version}"; src = fetchFromGitHub { owner = "keplerproject"; repo = "luafilesystem"; rev = "v${stdenv.lib.replaceChars ["."] ["_"] version}"; - sha256 = "1hxcnqj53540ysyw8fzax7f09pl98b8f55s712gsglcdxp2g2pri"; + sha256 = "0fibrasshlgpa71m9wkpjxwmylnxpcf06rpqbaa0qwvqh94nhwby"; }; preConfigure = '' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6963b3d1096..d789b6814b6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3884,36 +3884,6 @@ in { pomegranate = callPackage ../development/python-modules/pomegranate { }; - poppler-qt4 = buildPythonPackage rec { - name = "poppler-qt4-${version}"; - version = "0.18.1"; - disabled = isPy3k || isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-poppler-qt4/" + - "python-poppler-qt4-${version}.tar.gz"; - sha256 = "00e3f89f4e23a844844d082918a89c2cbb1e8231ecb011b81d592e7e3c33a74c"; - }; - - propagatedBuildInputs = [ self.pyqt4 pkgs.pkgconfig pkgs.poppler_qt4 ]; - - preBuild = "${python}/bin/${python.executable} setup.py build_ext" + - " --include-dirs=${pkgs.poppler_qt4.dev}/include/poppler/"; - - NIX_CFLAGS_COMPILE = "-I${pkgs.poppler_qt4.dev}/include/poppler/"; - - meta = { - description = "A Python binding to Poppler-Qt4"; - longDescription = '' - A Python binding to Poppler-Qt4 that aims for completeness - and for being actively maintained. - ''; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ sepi ]; - platforms = platforms.all; - }; - }; - poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 { inherit (pkgs.qt5) qtbase; inherit (pkgs.libsForQt5) poppler; @@ -6126,11 +6096,11 @@ in { github3_py = buildPythonPackage rec { name = "github3.py-${version}"; - version = "1.0.2"; + version = "1.1.0"; src = pkgs.fetchurl { url = "mirror://pypi/g/github3.py/${name}.tar.gz"; - sha256 = "1g91a8q9w0dalf4y4v0g72zi7vfrxwpx639an28vvys20y5zlvwp"; + sha256 = "1cxaqdqmz9w2afc0cw2jyv783fp0grydbik0frzj79azzkhyg4gf"; }; buildInputs = with self; [ unittest2 pytest mock betamax betamax-matchers dateutil ]; |