From b11264a282657ec42b77b95f7339aa5dcc6c46fd Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 1 Jan 2017 22:04:45 +0800 Subject: [PATCH 01/84] rubber: 1.3 -> 1.4 --- pkgs/tools/typesetting/rubber/default.nix | 35 ++++++++++++++--------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/typesetting/rubber/default.nix b/pkgs/tools/typesetting/rubber/default.nix index a9403020e41..bbcda05dc80 100644 --- a/pkgs/tools/typesetting/rubber/default.nix +++ b/pkgs/tools/typesetting/rubber/default.nix @@ -1,23 +1,30 @@ { fetchurl, stdenv, python2Packages, texinfo }: -stdenv.mkDerivation rec { - name = "rubber-1.3"; +python2Packages.buildPythonApplication rec { + name = "rubber-${version}"; + version = "1.4"; src = fetchurl { - url = "https://launchpad.net/rubber/trunk/1.3/+download/rubber-1.3.tar.gz"; - sha256 = "09715apfd6a0haz1mqsxgm8sj4rwzi38gcz2kz020zxk5rh0dksh"; + url = "https://launchpad.net/rubber/trunk/${version}/+download/${name}.tar.gz"; + sha256 = "1d7hq19vpb3l31grldbxg8lx1qdd18f5f3gqw96q0lhf58agcjl2"; }; - buildInputs = [ python2Packages.python texinfo ]; - nativeBuildInputs = [ python2Packages.wrapPython ]; + propagatedBuildInputs = [ texinfo ]; - patchPhase = '' - substituteInPlace configure --replace which "type -P" + # I couldn't figure out how to pass the proper parameter to disable pdf generation, so we + # use sed to change the default + preBuild = '' + sed -i -r 's/pdf\s+= True/pdf = False/g' setup.py ''; - postInstall = "wrapPythonPrograms"; + # the check scripts forces python2. If we need to use python3 at some point, we should use + # the correct python + checkPhase = '' + sed -i 's|python=python2|python=${python2Packages.python.interpreter}|' tests/run.sh + cd tests && ${stdenv.shell} run.sh + ''; - meta = { + meta = with stdenv.lib; { description = "Wrapper for LaTeX and friends"; longDescription = '' Rubber is a program whose purpose is to handle all tasks related @@ -28,9 +35,9 @@ stdenv.mkDerivation rec { produce PostScript documents is also included, as well as usage of pdfLaTeX to produce PDF documents. ''; - license = stdenv.lib.licenses.gpl2Plus; - homepage = http://www.pps.jussieu.fr/~beffara/soft/rubber/; - maintainers = [ stdenv.lib.maintainers.ttuegel ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl2Plus; + homepage = https://launchpad.net/rubber; + maintainers = with maintainers; [ ttuegel peterhoeg ]; + platforms = platforms.unix; }; } From 9452abe684ae03a1074ef0cfaa056755a6fce416 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 3 Jan 2017 13:33:42 +0800 Subject: [PATCH 02/84] qscintilla: support qt5 --- .../libraries/qscintilla/default.nix | 19 ++++++++++++------- pkgs/top-level/all-packages.nix | 6 +++++- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index d5f4389169b..b73e9ac79c9 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -1,18 +1,23 @@ -{ stdenv, fetchurl, qt4, qmake4Hook }: +{ stdenv, fetchurl +, qt4 ? null, qmake4Hook ? null +, withQt5 ? false, qtbase ? null, qmakeHook ? null +}: stdenv.mkDerivation rec { pname = "qscintilla"; version = "2.9"; - name = "${pname}-${version}"; + name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${version}"; src = fetchurl { url = "mirror://sourceforge/pyqt/QScintilla2/QScintilla-${version}/QScintilla-gpl-${version}.tar.gz"; sha256 = "d7c32e32582f93779de861006d87467b38b9ebc06e3d0b32e981cb24369fa417"; }; - buildInputs = [ qt4 ]; - nativeBuildInputs = [ qmake4Hook ]; + buildInputs = if withQt5 then [ qtbase ] else [ qt4 ]; + nativeBuildInputs = if withQt5 then [ qmakeHook ] else [ qmake4Hook ]; + + enableParallelBuilding = true; preConfigure = '' cd Qt4Qt5 @@ -23,7 +28,7 @@ stdenv.mkDerivation rec { qscintilla.pro ''; - meta = { + meta = with stdenv.lib; { description = "A Qt port of the Scintilla text editing library"; longDescription = '' QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor @@ -40,7 +45,7 @@ stdenv.mkDerivation rec { background colours and multiple fonts. ''; homepage = http://www.riverbankcomputing.com/software/qscintilla/intro; - license = stdenv.lib.licenses.gpl2; # and gpl3 and commercial - platforms = stdenv.lib.platforms.unix; + license = with licenses; [ gpl2 gpl3 ]; # and commercial + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63cce742d7b..9e66071095b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9125,6 +9125,10 @@ in qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; + qscintilla = callPackage ../development/libraries/qscintilla { + withQt5 = true; + }; + qtkeychain = callPackage ../development/libraries/qtkeychain { withQt5 = true; }; @@ -14516,7 +14520,7 @@ in qscreenshot = callPackage ../applications/graphics/qscreenshot { qt = qt4; }; - + qsyncthingtray = qt5.callPackage ../applications/misc/qsyncthingtray { }; qsynth = callPackage ../applications/audio/qsynth { }; From 22dbb82129bf83c406777059e7586b79cba98254 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 3 Jan 2017 13:43:16 +0800 Subject: [PATCH 03/84] qscintilla: 2.9 -> 2.9.4 --- pkgs/development/libraries/qscintilla/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index b73e9ac79c9..928ff5f788b 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, unzip , qt4 ? null, qmake4Hook ? null , withQt5 ? false, qtbase ? null, qmakeHook ? null }: stdenv.mkDerivation rec { pname = "qscintilla"; - version = "2.9"; + 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}.tar.gz"; - sha256 = "d7c32e32582f93779de861006d87467b38b9ebc06e3d0b32e981cb24369fa417"; + url = "mirror://sourceforge/pyqt/QScintilla2/QScintilla-${version}/QScintilla_gpl-${version}.zip"; + sha256 = "04678skipydx68zf52vznsfmll2v9aahr66g50lcqbr6xsmgr1yi"; }; buildInputs = if withQt5 then [ qtbase ] else [ qt4 ]; - nativeBuildInputs = if withQt5 then [ qmakeHook ] else [ qmake4Hook ]; + nativeBuildInputs = [ unzip ] ++ (if withQt5 then [ qmakeHook ] else [ qmake4Hook ]); enableParallelBuilding = true; @@ -47,5 +47,6 @@ stdenv.mkDerivation rec { homepage = http://www.riverbankcomputing.com/software/qscintilla/intro; license = with licenses; [ gpl2 gpl3 ]; # and commercial platforms = platforms.unix; + maintainers = with maintainers; [ peterhoeg ]; }; } From 2f23d603232834dbe6d15bd8e897477d62ded25e Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 4 Jan 2017 04:59:06 +0000 Subject: [PATCH 04/84] sherpa: fix sqlite dependency --- pkgs/applications/science/physics/sherpa/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix index d863964ad90..c674c0cbb2f 100644 --- a/pkgs/applications/science/physics/sherpa/default.nix +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + configureFlags = "--with-sqlite3=${sqlite.dev}"; + meta = { description = "Simulation of High-Energy Reactions of PArticles in lepton-lepton, lepton-photon, photon-photon, lepton-hadron and hadron-hadron collisions"; license = stdenv.lib.licenses.gpl2; From 6afd5fbbb7abe40033d9f89ae5f912d45b6e3e85 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Wed, 4 Jan 2017 03:28:14 -0500 Subject: [PATCH 05/84] insync: init at 1.3.13.36129 --- .../networking/insync/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/networking/insync/default.nix diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix new file mode 100644 index 00000000000..a0b727a97f8 --- /dev/null +++ b/pkgs/applications/networking/insync/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, makeWrapper }: + +stdenv.mkDerivation rec { + name = "insync-${version}"; + version = "1.3.13.36129"; + src = fetchurl { + url = "http://s.insynchq.com/builds/insync-portable_${version}_amd64.tar.bz2"; + sha256 = "18d8ww529nvhwcl5k31qmkzb83k9753ics0dw64w202r8vwbm3cd"; + }; + + buildInputs = [ makeWrapper ]; + + postPatch = '' + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" client/insync-portable + ''; + + installPhase = '' + mkdir -p $out/bin + cp -a client $out/client + makeWrapper $out/client/insync-portable $out/bin/insync --set LC_TIME C + ''; + + meta = { + platforms = ["x86_64-linux"]; + license = stdenv.lib.licenses.unfree; + maintainers = [ stdenv.lib.maintainers.benley ]; + homepage = https://www.insynchq.com; + description = "Google Drive sync and backup with multiple account support"; + longDescription = '' + Insync is a commercial application that syncs your Drive files to your + computer. It has more advanced features than Google's official client + such as multiple account support, Google Doc conversion, symlink support, + and built in sharing. + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c247b5dddf..ae53b9a2844 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14892,6 +14892,8 @@ in dropbox-cli = callPackage ../applications/networking/dropbox-cli { }; + insync = callPackage ../applications/networking/insync { }; + lightdm = qt5.callPackage ../applications/display-managers/lightdm { qt4 = null; withQt5 = false; From 9ba56e0dbf091b9d4ea95adfde5e02114988486b Mon Sep 17 00:00:00 2001 From: schneefux Date: Tue, 27 Dec 2016 16:18:27 +0100 Subject: [PATCH 06/84] hugo: 0.17 -> 0.18.1 --- pkgs/applications/misc/hugo/default.nix | 4 ++-- pkgs/applications/misc/hugo/deps.nix | 13 +++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index cc4f0d2e773..05a4db7a250 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "hugo-${version}"; - version = "0.17"; + version = "0.18.1"; goPackagePath = "github.com/spf13/hugo"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "spf13"; repo = "hugo"; rev = "v${version}"; - sha256 = "1h5d7m019r4zhk7xlcdbn4z3w6x7jq2lcdgq7w377688rk58wbgp"; + sha256 = "1nmabcrq96b339in2yr2zwcd41nadr4bha3rlpyaxlzbyyhz2f81"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index 70781708f6e..0a95b083c0b 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -229,8 +229,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/fsync"; - rev = "eefee59ad7de621617d4ff085cf768aab4b919b1"; - sha256 = "0d56xdczawikyczc12i661qc79dbv4q8ihlj4p20zsjkyxxym59p"; + rev = "cb2da332d00cbc04e4f3f677520dc3e7cc11874b"; + sha256 = "03ib2xj80cbz77hx2baanyi50qr40akrybg49fzdvdm3lv9x100z"; }; } { @@ -341,4 +341,13 @@ sha256 = "0jwn2g4jfdb3wvpqisd8h055099pwx6c5i3bb4zxk5l9vybg1c5f"; }; } + { + goPackagePath = "github.com/bep/gitmap"; + fetch = { + type = "git"; + url = "https://github.com/bep/gitmap"; + rev = "a1a71abe12823e27ae7507189fe2e914ba9626ac"; + sha256 = "0qfhb72y6wbypaqv6dkl42syifnhps3qcy1karpd6ziw4pxak18g"; + }; + } ] From df7b4f4f6f12ff090f48108838353531aff92507 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Thu, 5 Jan 2017 21:19:07 -0500 Subject: [PATCH 07/84] httpd module: don't create documentRoot directory if it doesn't exist It hides bugs and do you ever actually want to serve up an empty directory? It was pretty confusing to me when it tried to write into a read-only store path because I accidentally pointed it to the wrong store path. --- .../modules/services/web-servers/apache-httpd/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 84c608ca2ab..dc0ca501a48 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -709,13 +709,6 @@ in ''} mkdir -m 0700 -p ${mainCfg.logDir} - ${optionalString (mainCfg.documentRoot != null) - '' - # Create the document root directory if does not exists yet - mkdir -p ${mainCfg.documentRoot} - '' - } - # Get rid of old semaphores. These tend to accumulate across # server restarts, eventually preventing it from restarting # successfully. From 7f99fd086b70dec7419d3402e076656850e9e68e Mon Sep 17 00:00:00 2001 From: 3noch Date: Thu, 5 Jan 2017 16:33:11 -0500 Subject: [PATCH 08/84] nginx: add 'cache_purge' module for purging FastCGI cache --- pkgs/servers/http/nginx/modules.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index e5c53aec726..d19c147ce93 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -136,4 +136,14 @@ sha256 = "0h98a8kiw2qkqfavysm1v16kf4cs4h39j583wapif4p0qx3bbm89"; }; }; + + # For an example usage, see https://easyengine.io/wordpress-nginx/tutorials/single-site/fastcgi-cache-with-purging/ + fastcgi-cache-purge = { + src = fetchFromGitHub { + owner = "FRiCKLE"; + repo = "ngx_cache_purge"; + rev = "2.3"; + sha256 = "0ib2jrbjwrhvmihhnzkp4w87fxssbbmmmj6lfdwpm6ni8p9g60dw"; + }; + }; } From f935115ce0787166db3915ff96427478d61b61b5 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Fri, 6 Jan 2017 22:29:25 +0200 Subject: [PATCH 09/84] qtpass: 1.1.4 -> 1.1.6 --- pkgs/applications/misc/qtpass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index eee2dffb0e1..4cdb6591465 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "qtpass-${version}"; - version = "1.1.4"; + version = "1.1.6"; src = fetchFromGitHub { owner = "IJHack"; repo = "QtPass"; rev = "v${version}"; - sha256 = "0jxb15jn6vv54wb2z52wv9b2mq38xff8akyzwj5xx2332bc9xra2"; + sha256 = "0jq5a1cvqvsjwld0nldl6kmcz9g59hiccmbg98xwji04n8174y7j"; }; buildInputs = [ git gnupg pass qtbase qtsvg qttools ]; From 3674be1e987265bfec626b41bd66d6686b46e9f6 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 30 Dec 2016 10:00:30 +0800 Subject: [PATCH 10/84] peruse: 1.1 -> 1.2 1.2 also ships Peruse Creator --- pkgs/tools/misc/peruse/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix index b6727f4e63b..61e9fae906b 100644 --- a/pkgs/tools/misc/peruse/default.nix +++ b/pkgs/tools/misc/peruse/default.nix @@ -1,12 +1,12 @@ { kdeDerivation, kdeWrapper, fetchFromGitHub, fetchurl, lib, ecm, kdoctools, - baloo, kconfig, kfilemetadata, kinit, kirigami, plasma-framework + baloo, kconfig, kfilemetadata, kinit, kirigami, knewstuff, plasma-framework }: let pname = "peruse"; - version = "1.1"; + version = "1.2"; unarr = fetchFromGitHub { owner = "zeniko"; repo = "unarr"; @@ -18,15 +18,17 @@ let src = fetchurl { url = "mirror://kde/stable/${pname}/${name}.tar.xz"; - sha256 = "1akk9hg12y6iis0rb5kdkznm3xk7hk04r9ccqyz8lr6y073n5f9j"; + sha256 = "1ik2627xynkichsq9x28rkczqn3l3p06q6vw5jdafdh3hisccmjq"; }; nativeBuildInputs = [ ecm kdoctools ]; - propagatedBuildInputs = [ baloo kconfig kfilemetadata kinit kirigami plasma-framework ]; + propagatedBuildInputs = [ baloo kconfig kfilemetadata kinit kirigami knewstuff plasma-framework ]; + + pathsToLink = [ "/etc/xdg/peruse.knsrc"]; preConfigure = '' - rmdir src/qtquick/karchive-rar/external/unarr + rm -rf src/qtquick/karchive-rar/external/unarr ln -s ${unarr} src/qtquick/karchive-rar/external/unarr ''; @@ -39,5 +41,5 @@ let in kdeWrapper { inherit unwrapped; - targets = [ "bin/peruse" ]; + targets = [ "bin/peruse" "bin/perusecreator" ]; } From 0f71012fe6448f4e31e464659cc266fa8f980891 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 7 Jan 2017 01:36:51 -0500 Subject: [PATCH 11/84] sherpa: add useful dependencies --- .../science/physics/sherpa/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix index c674c0cbb2f..e815ddfc1c2 100644 --- a/pkgs/applications/science/physics/sherpa/default.nix +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, sqlite }: +{ stdenv, fetchurl, gfortran, hepmc, fastjet, lhapdf, rivet, sqlite }: stdenv.mkDerivation rec { name = "sherpa-${version}"; @@ -9,11 +9,19 @@ stdenv.mkDerivation rec { sha256 = "13vkz6w8kqyv8sgy3mxnlps5ykml5rnlj50vjj0pp9rgbl5y8ali"; }; - buildInputs = [ gfortran sqlite ]; + buildInputs = [ gfortran sqlite lhapdf rivet ]; enableParallelBuilding = true; - configureFlags = "--with-sqlite3=${sqlite.dev}"; + configureFlags = [ + "--with-sqlite3=${sqlite.dev}" + "--enable-hepmc2=${hepmc}" + "--enable-fastjet=${fastjet}" + "--enable-lhapdf=${lhapdf}" + "--enable-rivet=${rivet}" + ]; + + CXXFLAGS = "-std=c++11"; # needed for rivet on OSX meta = { description = "Simulation of High-Energy Reactions of PArticles in lepton-lepton, lepton-photon, photon-photon, lepton-hadron and hadron-hadron collisions"; From 44a78fb0da4d9fb4c0c8f7bd4bcf8649a751693e Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 7 Jan 2017 03:00:04 -0500 Subject: [PATCH 12/84] rivet: fix runtime on darwin --- .../libraries/physics/rivet/darwin.patch | 33 +++++++++++++++++++ .../libraries/physics/rivet/default.nix | 4 +++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/libraries/physics/rivet/darwin.patch diff --git a/pkgs/development/libraries/physics/rivet/darwin.patch b/pkgs/development/libraries/physics/rivet/darwin.patch new file mode 100644 index 00000000000..2d397f1da6c --- /dev/null +++ b/pkgs/development/libraries/physics/rivet/darwin.patch @@ -0,0 +1,33 @@ +diff --git a/include/Rivet/Tools/osdir.hh b/include/Rivet/Tools/osdir.hh +index 05f06ca..59af7de 100644 +--- a/include/Rivet/Tools/osdir.hh ++++ b/include/Rivet/Tools/osdir.hh +@@ -21,7 +21,7 @@ + + /// @cond OSDIR + +-#if defined(unix) || defined(__unix) || defined(__unix__) ++#if defined(unix) || defined(__unix) || defined(__unix__) || defined(__APPLE__) + #define OSLINK_OSDIR_POSIX + #elif defined(_WIN32) + #define OSLINK_OSDIR_WINDOWS +@@ -32,18 +32,7 @@ + #include + + #if defined(OSLINK_OSDIR_NOTSUPPORTED) +- +-namespace oslink +-{ +- class directory +- { +- public: +- directory(const std::string&) { } +- operator void*() const { return (void*)0; } +- std::string next() { return ""; } +- }; +-} +- ++#error Platform misdetected or oslink is not implemented + #elif defined(OSLINK_OSDIR_POSIX) + + #include diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index 91b5881d1a8..a82c14fee77 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { pythonPath = []; # python wrapper support + patches = [ + ./darwin.patch # configure relies on impure sw_vers to -Dunix + ]; + latex = texlive.combine { inherit (texlive) scheme-basic collection-pstricks From e138d3afdfbbc49fe0c21e0534806b11b700c598 Mon Sep 17 00:00:00 2001 From: Valentin Shirokov Date: Sat, 7 Jan 2017 20:19:32 +0800 Subject: [PATCH 13/84] Added option networking.wireless.networks.*.priority It is literal 'priority' option of wpa_supplicant.conf --- .../services/networking/wpa_supplicant.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 5657b91c1e7..c91ba91fcb4 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -12,11 +12,13 @@ let psk = if networkConfig.psk != null then ''"${networkConfig.psk}"'' else networkConfig.pskRaw; + priority = networkConfig.priority; in '' network={ ssid="${ssid}" ${optionalString (psk != null) ''psk=${psk}''} ${optionalString (psk == null) ''key_mgmt=NONE''} + ${optionalString (priority != null) ''priority=${toString priority}''} } '') cfg.networks)} '' else "/etc/wpa_supplicant.conf"; @@ -68,6 +70,19 @@ in { Mutually exclusive with psk. ''; }; + priority = mkOption { + type = types.nullOr types.int; + default = null; + description = '' + By default, all networks will get same priority group (0). If some of the + networks are more desirable, this field can be used to change the order in + which wpa_supplicant goes through the networks when selecting a BSS. The + priority groups will be iterated in decreasing priority (i.e., the larger the + priority value, the sooner the network is matched against the scan results). + Within each priority group, networks will be selected based on security + policy, signal strength, etc. + ''; + }; }; }); description = '' From 427de8539021697fa11775436a2593b9406655f8 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 4 Jan 2017 16:37:31 +0800 Subject: [PATCH 14/84] loki: init at 0.1.7 --- pkgs/development/libraries/loki/default.nix | 26 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/loki/default.nix diff --git a/pkgs/development/libraries/loki/default.nix b/pkgs/development/libraries/loki/default.nix new file mode 100644 index 00000000000..2ff927048ad --- /dev/null +++ b/pkgs/development/libraries/loki/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "loki-${version}"; + version = "0.1.7"; + + src = fetchurl { + url = "mirror://sourceforge/loki-lib/Loki/Loki%20${version}/loki-${version}.tar.gz"; + sha256 = "1xhwna961fl4298ac5cc629x5030zlw31vx4h8zws290amw5860g"; + }; + + buildPhase = '' + substituteInPlace Makefile.common --replace /usr $out + make build-shared + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A C++ library of designs, containing flexible implementations of common design patterns and idioms"; + homepage = http://loki-lib.sourceforge.net; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 52e4194fab1..ffd24741282 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2669,6 +2669,8 @@ in logstalgia = callPackage ../tools/graphics/logstalgia {}; + loki = callPackage ../development/libraries/loki { }; + longview = callPackage ../servers/monitoring/longview { }; lout = callPackage ../tools/typesetting/lout { }; From 9c2a222092eeaea15a0d601831381378c1902de3 Mon Sep 17 00:00:00 2001 From: tkatchev Date: Fri, 6 Jan 2017 23:37:12 +0300 Subject: [PATCH 15/84] gtest, gmock: fix broken package by updating to 1.8.0. --- pkgs/development/libraries/gmock/default.nix | 35 ------------------- pkgs/development/libraries/gtest/default.nix | 29 ++++++++------- pkgs/development/libraries/gtest/source.nix | 22 ------------ .../libraries/protobuf/generic-v3.nix | 5 ++- .../libraries/protobuf/generic.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 6 files changed, 23 insertions(+), 72 deletions(-) delete mode 100644 pkgs/development/libraries/gmock/default.nix delete mode 100644 pkgs/development/libraries/gtest/source.nix diff --git a/pkgs/development/libraries/gmock/default.nix b/pkgs/development/libraries/gmock/default.nix deleted file mode 100644 index 139cfab6e0c..00000000000 --- a/pkgs/development/libraries/gmock/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, cmake, fetchzip }: - -stdenv.mkDerivation rec { - name = "gmock-${version}"; - version = "1.7.0"; - - src = fetchzip { - url = "https://googlemock.googlecode.com/files/gmock-${version}.zip"; - sha256 = "04n9p6pf3mrqsabrsncv32d3fqvd86zmcdq3gyni7liszgfk0paz"; - }; - - buildInputs = [ cmake ]; - - buildPhase = '' - # avoid building gtest - make gmock gmock_main - ''; - - installPhase = '' - mkdir -p $out/lib - cp -v libgmock.a libgmock_main.a $out/lib - cp -v -r ../include $out - cp -v -r ../src $out - ''; - - meta = { - description = "Google mock: Google's framework for writing C++ mock classes"; - homepage = https://code.google.com/p/googlemock/; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.auntie ]; - platforms = stdenv.lib.platforms.unix; - }; - - passthru = { source = src; }; -} diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index e516e4a475a..84b1fa9757c 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -1,11 +1,14 @@ -{ stdenv, cmake, callPackage }: -let - source = callPackage ./source.nix { }; -in +{ stdenv, cmake, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "gtest-${source.version}"; + name = "gtest-${version}"; + version = "1.8.0"; - src = source; + src = fetchFromGitHub { + owner = "google"; + repo = "googletest"; + rev = "release-${version}"; + sha256 = "0bjlljmbf8glnd9qjabx73w6pd7ibv43yiyngqvmvgxsabzr8399"; + }; buildInputs = [ cmake ]; @@ -17,9 +20,13 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/lib - cp -v libgtest.a libgtest_main.a $out/lib - cp -v -r ../include $out - cp -v -r ../src $out + cp -v googlemock/gtest/libgtest.a googlemock/gtest/libgtest_main.a googlemock/libgmock.a googlemock/libgmock_main.a $out/lib + ln -s $out/lib/libgmock.a $out/lib/libgoogletest.a + mkdir -p $out/include + cp -v -r ../googlemock/include/gmock $out/include + cp -v -r ../googletest/include/gtest $out/include + mkdir -p $out/src + cp -v -r ../googlemock/src/* ../googletest/src/* $out/src ''; meta = with stdenv.lib; { @@ -27,8 +34,6 @@ stdenv.mkDerivation rec { homepage = https://code.google.com/p/googletest/; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ zoomulator ]; + maintainers = with maintainers; [ zoomulator ivan-tkatchev ]; }; - - passthru = { inherit source; }; } diff --git a/pkgs/development/libraries/gtest/source.nix b/pkgs/development/libraries/gtest/source.nix deleted file mode 100644 index d8787efdcf2..00000000000 --- a/pkgs/development/libraries/gtest/source.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ fetchurl, stdenv, unzip, ... }: - -stdenv.mkDerivation rec { - name = "gtest-src-${version}"; - version = "1.7.0"; - - src = fetchurl { - url = "https://googletest.googlecode.com/files/gtest-${version}.zip"; - sha256 = "03fnw3bizw9bcx7l5qy1vz7185g33d5pxqcb6aqxwlrzv26s2z14"; - }; - - buildInputs = [ unzip ]; - - buildCommand = '' - unpackPhase - cd gtest-${version} - mkdir $out - cp -r * $out - ''; - - passthru = { inherit version; }; -} diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index 5a3738564d7..f74aea9dbd5 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -18,8 +18,11 @@ stdenv.mkDerivation rec { postPatch = '' rm -rf gmock - cp -r ${gmock.source} gmock + cp -r ${gmock.src}/googlemock gmock + cp -r ${gmock.src}/googletest googletest chmod -R a+w gmock + chmod -R a+w googletest + ln -s ../googletest gmock/gtest '' + stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace src/google/protobuf/testing/googletest.cc \ --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index 47f66c83ff5..498263458b5 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { postPatch = '' rm -rf gtest - cp -r ${gtest.source} gtest + cp -r ${gtest.src}/googletest gtest chmod -R a+w gtest '' + stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace src/google/protobuf/testing/googletest.cc \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d9842aaede3..f789cfe26cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2055,7 +2055,7 @@ in gt5 = callPackage ../tools/system/gt5 { }; gtest = callPackage ../development/libraries/gtest {}; - gmock = callPackage ../development/libraries/gmock {}; + gmock = gtest; gbenchmark = callPackage ../development/libraries/gbenchmark {}; gtkdatabox = callPackage ../development/libraries/gtkdatabox {}; From e8c9a4b3baaeb2cf0da9eeda8a32e14d61712729 Mon Sep 17 00:00:00 2001 From: mingchuan Date: Sun, 8 Jan 2017 13:39:16 +0800 Subject: [PATCH 16/84] crystal: 0.20.3 -> 0.20.4 --- pkgs/development/compilers/crystal/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 39a06a4b1dc..7162f85e05d 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm_39, makeWrapper }: stdenv.mkDerivation rec { - version = "0.20.3"; + version = "0.20.4"; name = "crystal-${version}-1"; arch = { @@ -14,15 +14,15 @@ stdenv.mkDerivation rec { url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-1-${arch}.tar.gz"; sha256 = { - "x86_64-linux" = "c656dc8092a6161262f527df441aaab4ea9dd9a836a013f7155c6378b26b8cd7"; - "i686-linux" = "85edfa1dda5e712341869bab87f6de0f7c6860e2a04dec2f00e8dc6aa1418611"; - "x86_64-darwin" = "0088972c5cad9543f262976ae6c8ee1dbcbefdee3a8bedae851998bfa7098637"; + "x86_64-linux" = "cdc11c30235f8bd3b89e1fc13b56838f99d585715fb66563d6599026f5393e37"; + "i686-linux" = "93e7df2bea3220728987a49a2f93d1c615e2ccae63843e0259a5d891c53a0b80"; + "x86_64-darwin" = "3fd291a4a5c9eccdea933a9df25446c90d80660a17e89f83503fcb5b6deba03e"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); }; src = fetchurl { url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz"; - sha256 = "5372ba2a35d885345207047a51b9389f9190fd12389847e7f7298618bcf59ad6"; + sha256 = "fd099f278b71bbb5cad1927c93933d1feba554fbf8f6f4ab9165f535765f5e31"; }; # crystal on Darwin needs libiconv to build From 64e4b7ac423d4e660d350fd1e9423eb009c14e9d Mon Sep 17 00:00:00 2001 From: Josef Kemetmueller Date: Thu, 15 Dec 2016 20:44:02 +0100 Subject: [PATCH 17/84] grib-api: 1.14.4 -> 1.19.0 - Remove downloading of testdata during buildPhase to - fix hydra build - remove impurity - reduce traffic - Bump version - Add myself as a maintainer --- lib/maintainers.nix | 1 + .../libraries/grib-api/default.nix | 46 +++++++++++++++---- 2 files changed, 38 insertions(+), 9 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 664c50dd579..b20d4e21196 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -231,6 +231,7 @@ KibaFox = "Kiba Fox "; kierdavis = "Kier Davis "; kkallio = "Karn Kallio "; + knedlsepp = "Josef Kemetmüller "; koral = "Koral "; kovirobi = "Kovacsics Robert "; kragniz = "Louis Taylor "; diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix index ee505b54e7e..ca2fb728262 100644 --- a/pkgs/development/libraries/grib-api/default.nix +++ b/pkgs/development/libraries/grib-api/default.nix @@ -1,32 +1,60 @@ -{ fetchurl, stdenv, curl, - netcdf, jasper, openjpeg }: +{ fetchurl, stdenv, + cmake, netcdf, gfortran, jasper, libpng, + enablePython ? false, pythonPackages }: stdenv.mkDerivation rec{ name = "grib-api-${version}"; - version = "1.14.4"; + version = "1.19.0"; src = fetchurl { - url = https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-1.14.4-Source.tar.gz; - sha256 = "1w8z9y79wakhwv1r4rb4dwlh9pbyw367klcm6laxz91hhvfrpfq8"; + url = "https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-${version}-Source.tar.gz"; + sha256 = "07cj9mw5bb249lxx1m9nmfdqb8b2a8cm7s6x62cdwca3sp16dv6a"; }; - buildInputs = [ netcdf + preConfigure = '' + # Fix "no member named 'inmem_' in 'jas_image_t'" + substituteInPlace "src/grib_jasper_encoding.c" --replace "image.inmem_ = 1;" "" + ''; + + buildInputs = [ cmake + netcdf + gfortran jasper - openjpeg - curl # Used for downloading during make test + libpng + ] ++ stdenv.lib.optionals enablePython [ + pythonPackages.python ]; + + cmakeFlags = [ "-DENABLE_PYTHON=${if enablePython then "ON" else "OFF"}" + "-DENABLE_PNG=ON" + "-DENABLE_FORTRAN=ON" + ]; + + enableParallelBuilding = true; + doCheck = true; + # Only do tests that don't require downloading 120MB of testdata + # We fix the darwin checkPhase, which searches for libgrib_api.dylib + # in /nix/store by setting DYLD_LIBRARY_PATH + checkPhase = stdenv.lib.optionalString (stdenv.isDarwin) '' + substituteInPlace "tests/include.sh" --replace "set -ea" "set -ea; export DYLD_LIBRARY_PATH=$(pwd)/lib" + '' + '' + ctest -R "t_definitions|t_calendar|t_unit_tests" -VV + ''; + + meta = with stdenv.lib; { homepage = "https://software.ecmwf.int/wiki/display/GRIB/Home"; license = licenses.asl20; + platforms = with platforms; linux ++ darwin; description = "ECMWF Library for the GRIB file format"; longDescription = '' The ECMWF GRIB API is an application program interface accessible from C, FORTRAN and Python programs developed for encoding and decoding WMO FM-92 GRIB edition 1 and edition 2 messages. ''; - + maintainers = with maintainers; [ knedlsepp ]; }; } From 8940c68c09df3c96aea3c66603488b4c667f67f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 8 Jan 2017 14:38:35 +0100 Subject: [PATCH 18/84] hydra: 2016-04-15 -> 2016-12-09 Fixes #19396 #21424 --- pkgs/development/tools/misc/hydra/default.nix | 20 ++++++++----------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index e3d2c4950bc..dbd53c65050 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -3,7 +3,7 @@ , gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt , guile, perl, postgresql92, aws-sdk-cpp, nukeReferences, git, boehmgc , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar -, rpm, dpkg, cdrkit, fetchpatch }: +, rpm, dpkg, cdrkit, fetchpatch, pixz }: with stdenv; @@ -61,21 +61,17 @@ let }; in releaseTools.nixBuild rec { name = "hydra-${version}"; - version = "2016-04-15"; + version = "2016-12-09"; + + inherit stdenv; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "177bf25d648092826a75369191503a3f2bb763a4"; - sha256 = "0ngipzm2i2vz5ygfd70hh82d027snpl85r8ncn1rxlkak0g8fxsl"; + rev = "de55303197d997c4fc5503b52b1321ae9528583d"; + sha256 = "0nimqsbpjxfwha6d5gp6a7jh50i83z1llmx30da4bscsic8z1xly"; }; - patches = [(fetchpatch { - name = "cmath.diff"; - url = https://github.com/vcunat/hydra/commit/3c6fca1ba299.diff; # https://github.com/NixOS/hydra/pull/337 - sha256 = "02m9q304ay45s7xfkm2y7lppakrkx3hrq39mm6348isnbqmbarc0"; - })]; - buildInputs = [ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig sqlite libpqxx gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt @@ -96,7 +92,7 @@ in releaseTools.nixBuild rec { ]; hydraPath = lib.makeBinPath ( - [ libxslt sqlite subversion openssh nixUnstable coreutils findutils + [ sqlite subversion openssh nixUnstable coreutils findutils pixz gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial darcs gnused bazaar ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] ); @@ -108,7 +104,7 @@ in releaseTools.nixBuild rec { configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ]; preHook = '' - PATH=$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$PATH + PATH=$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$(pwd)/src/hydra-evaluator:$PATH PERL5LIB=$(pwd)/src/lib:$PERL5LIB; ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e62fff9f127..5152734365c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7592,7 +7592,7 @@ in hwloc = callPackage ../development/libraries/hwloc {}; - hydra = callPackage ../development/tools/misc/hydra {}; + hydra = callPackage ../development/tools/misc/hydra { stdenv = overrideCC stdenv gcc6; }; hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { }; From 547b203b9a28968bba9e9902dbff4600779ed75b Mon Sep 17 00:00:00 2001 From: Sebastian Hagen Date: Sun, 8 Jan 2017 13:32:09 +0000 Subject: [PATCH 19/84] ed: Add fedoraproject mirror. The existing URL has gone dark; this commit adds one from fedoraproject.org that still works. We put the new mirror first since ed is in the bootstrap path, and 16.09 bootstrap doesn't try later URLs. --- pkgs/applications/editors/ed/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index 650a551cb60..680b7f8a030 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -2,6 +2,7 @@ stdenv.mkDerivation rec { name = "ed-1.13"; + file_md5 = "fb8ffc8d8072e13dd5799131e889bfa5"; # for fedora mirror src = fetchurl { # gnu only provides *.lz tarball, which is unfriendly for stdenv bootstrapping @@ -9,7 +10,10 @@ stdenv.mkDerivation rec { # When updating, please make sure the sources pulled match those upstream by # Unpacking both tarballs and running `find . -type f -exec sha256sum \{\} \; | sha256sum` # in the resulting directory - url = "http://fossies.org/linux/privat/${name}.tar.bz2"; + urls = [ + "http://pkgs.fedoraproject.org/repo/extras/ed/${name}.tar.bz2/${file_md5}/${name}.tar.bz2" + "http://fossies.org/linux/privat/${name}.tar.bz2" + ]; sha256 = "1iym2fsamxr886l3sz8lqzgf00bip5cr0aly8jp04f89kf5mvl0j"; }; From 50ec3fe1ac93d6059f67396fc7954c17084a1b20 Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 5 Jan 2017 23:18:49 +0000 Subject: [PATCH 20/84] test-driver: support punctuation in sendChars --- nixos/lib/test-driver/Machine.pm | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index 274b16164db..14c39e859bc 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -611,11 +611,37 @@ sub copyFileFromHost { } +my %charToKey = ( + '!' => "shift-0x02", + '@' => "shift-0x03", + '#' => "shift-0x04", + '$' => "shift-0x05", + '%' => "shift-0x06", + '^' => "shift-0x07", + '&' => "shift-0x08", + '*' => "shift-0x09", + '(' => "shift-0x0A", + ')' => "shift-0x0B", + '-' => "0x0C", '_' => "shift-0x0C", + '=' => "0x0D", '+' => "shift-0x0D", + '[' => "0x1A", '{' => "shift-0x1A", + ']' => "0x1B", '}' => "shift-0x1B", + ';' => "0x27", ':' => "shift-0x27", + '\'' => "0x28", '"' => "shift-0x28", + '`' => "0x29", '~' => "shift-0x29", + '\\' => "0x2B", '|' => "shift-0x2B", + ',' => "0x33", '<' => "shift-0x33", + '.' => "0x34", '>' => "shift-0x34", + '/' => "0x35", '?' => "shift-0x35", + ' ' => "spc", + "\n" => "ret", +); + + sub sendKeys { my ($self, @keys) = @_; foreach my $key (@keys) { - $key = "spc" if $key eq " "; - $key = "ret" if $key eq "\n"; + $key = $charToKey{$key} if exists $charToKey{$key}; $self->sendMonitorCommand("sendkey $key"); } } From a66480d52b7cefe53b884f33b7f8132e5e8b68a1 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Sun, 8 Jan 2017 16:28:49 +0100 Subject: [PATCH 21/84] sonarr: 2.0.0.4427 -> 2.0.0.4472 --- pkgs/servers/sonarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index a742249e794..6f553f70712 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sonarr-${version}"; - version = "2.0.0.4427"; + version = "2.0.0.4472"; src = fetchurl { url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "066jhvz57hxrcgn902z25a21sj87wiqz224fjzpk1lpxrylv4ac2"; + sha256 = "0sz03z057pyai151lxsdsgxlv6kvrnd1xxw7i1ss7b79l6xgmpw8"; }; buildInputs = [ From 2a2e8e906b7ceac2c5c76ab85b9b565665e81053 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sun, 8 Jan 2017 10:25:28 +0100 Subject: [PATCH 22/84] rustRegistry: 2016-12-28 -> 2017-01-08 --- pkgs/top-level/rust-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 14ef3cfef43..ea827651b2f 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,9 +7,9 @@ { runCommand, fetchFromGitHub, git }: let - version = "2016-12-28"; - rev = "3399254d4a021d07736944b339a8794eddcda517"; - sha256 = "1vbixbgzv21anqayz8ya0x1qlzndb7fpdf9dyh4yyscl1kaibvg9"; + version = "2017-01-08"; + rev = "5ca2f329d51b9466d9bda79172e0135edaf15f30"; + sha256 = "19h3zyx83va00ssagqsk9h0c83ir9wqhn192xvk5k44m9648jvsh"; src = fetchFromGitHub { inherit rev; From 7435fefd26f27b14e6b3c6820a51cb7c499bd8d6 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sun, 8 Jan 2017 10:31:34 +0100 Subject: [PATCH 23/84] rustc: Disable fragile tcp tests on Darwin This is an alternative implementation of https://github.com/NixOS/nixpkgs/pull/21741/files --- pkgs/development/compilers/rust/default.nix | 2 +- .../darwin-disable-fragile-tcp-tests.patch | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/rust/patches/darwin-disable-fragile-tcp-tests.patch diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 4d9668da2e3..7b8d5a3d1ef 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -4,7 +4,6 @@ let rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); in - rec { rustc = callPackage ./rustc.nix { shortVersion = "1.14"; @@ -16,6 +15,7 @@ rec { patches = [ ./patches/disable-lockfile-check-stable.patch + ./patches/darwin-disable-fragile-tcp-tests.patch ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; inherit targets; diff --git a/pkgs/development/compilers/rust/patches/darwin-disable-fragile-tcp-tests.patch b/pkgs/development/compilers/rust/patches/darwin-disable-fragile-tcp-tests.patch new file mode 100644 index 00000000000..5c51886b4d8 --- /dev/null +++ b/pkgs/development/compilers/rust/patches/darwin-disable-fragile-tcp-tests.patch @@ -0,0 +1,36 @@ +From 0becb0b7cff0176279fc9f94c91299d788a43941 Mon Sep 17 00:00:00 2001 +From: Moritz Ulrich +Date: Sun, 8 Jan 2017 10:28:17 +0100 +Subject: [PATCH] Disable libstd::net::tcp::{ttl, timeouts} on Darwin + +--- + src/libstd/net/tcp.rs | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs +index 0e7c5b0671..189c31b958 100644 +--- a/src/libstd/net/tcp.rs ++++ b/src/libstd/net/tcp.rs +@@ -1022,7 +1022,10 @@ mod tests { + + // FIXME: re-enabled bitrig/openbsd tests once their socket timeout code + // no longer has rounding errors. +- #[cfg_attr(any(target_os = "bitrig", target_os = "netbsd", target_os = "openbsd"), ignore)] ++ #[cfg_attr(any(target_os = "bitrig", ++ target_os = "netbsd", ++ target_os = "openbsd", ++ target_os = "macos"), ignore)] + #[test] + fn timeouts() { + let addr = next_test_ip4(); +@@ -1101,6 +1104,7 @@ mod tests { + assert_eq!(false, t!(stream.nodelay())); + } + ++ #[cfg_attr(target_os = "macos", ignore)] + #[test] + fn ttl() { + let ttl = 100; +-- +2.11.0 + From d042abef267435a5b387198070dc9ff80a62efec Mon Sep 17 00:00:00 2001 From: Sebastian Hagen Date: Sun, 8 Jan 2017 17:09:57 +0000 Subject: [PATCH 24/84] zlib: Fix zlib.net URL. (#21753) Look for primary source file below http://zlib.net/fossils/ as opposed to http://zlib.net/ . zlib-1.2.8.tar.gz is still available at the former location, and will likely remain there. In addition, it's important that the first URL work since zlib is in the bootstrap path, and 16.09 (at least) bootstrap doesn't try to fetch from later ones. --- pkgs/development/libraries/zlib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 21a7e81ce3e..dd73974b140 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = - [ "http://www.zlib.net/${name}.tar.gz" # old versions vanish from here + [ "http://www.zlib.net/fossils/${name}.tar.gz" # stable archive path "mirror://sourceforge/libpng/zlib/${version}/${name}.tar.gz" ]; sha256 = "039agw5rqvqny92cpkrfn243x2gd4xn13hs3xi6isk55d2vqqr9n"; From 5c55d54db9f43aa075add5e7b9e6b757bf51891a Mon Sep 17 00:00:00 2001 From: FaustXVI Date: Sun, 8 Jan 2017 18:30:11 +0100 Subject: [PATCH 25/84] discord: 0.0.11 -> 0.0.13 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 8387d2f7c38..67dc65edbc3 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.11"; + version = "0.0.13"; name = "${pname}-${version}"; src = fetchurl { url = "https://cdn-canary.discordapp.com/apps/linux/${version}/${pname}-canary-${version}.tar.gz"; - sha256 = "1lk53vm14vr5pb8xxcx6hinpc2mkdns2xxv0bfzxvlmhfr6d6y18"; + sha256 = "1pwb8y80z1bmfln5wd1vrhras0xygd1j15sib0g9vaig4mc55cs6"; }; libPath = stdenv.lib.makeLibraryPath [ From efe05f9d4297baf10ce2aa8923e1bb432c7c4a4a Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sun, 8 Jan 2017 20:14:00 +0100 Subject: [PATCH 26/84] notmuch: 0.23.2 -> 0.23.4. --- pkgs/applications/networking/mailreaders/notmuch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 83eace00b0a..c1a32341ffe 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -10,7 +10,7 @@ }: stdenv.mkDerivation rec { - version = "0.23.2"; + version = "0.23.4"; name = "notmuch-${version}"; passthru = { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "1g4p5hsrqqbqk6s2w756als60wppvjgpyq104smy3w9vshl7bzgd"; + sha256 = "0fs5crf8v3jghc8jnm61cv7wxhclcg88hi5894d8fma9kkixcv8h"; }; buildInputs = [ From 9729a8d0155508a524834462b0a21f35385d0c20 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 7 Jan 2017 12:34:58 +0100 Subject: [PATCH 27/84] haskell-esqueleto: keep version 2.4.x around so that we can still build git-annex --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 97d6bc5695e..d07a9be0c4e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2015,6 +2015,7 @@ extra-packages: - containers < 0.5 # required to build alex with GHC 6.12.3 - control-monad-free < 0.6 # newer versions don't compile with anything but GHC 7.8.x - deepseq == 1.3.0.1 # required to build Cabal with GHC 6.12.3 + - esqueleto < 2.5 # needed for git-annex: https://github.com/bitemyapp/esqueleto/issues/8 - generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x - gloss < 1.9.3 # new versions don't compile with GHC 7.8.x - haddock < 2.17 # required on GHC 7.10.x From 667c4e49252ad9aeb38f62af0e8143bc128af920 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Jan 2017 11:34:44 +0100 Subject: [PATCH 28/84] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.0.4-7-g48fad11 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/47c259fc33912fcb83f7881456bff6ef31965463. --- .../haskell-modules/hackage-packages.nix | 996 +++++++++++++----- 1 file changed, 754 insertions(+), 242 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1922fb3efc3..453ce86a060 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -10122,6 +10122,8 @@ self: { pname = "JuicyPixels"; version = "3.2.8"; sha256 = "038c6547d543442a93b2028be4b84c225bb7a6fa913e1fc57325c58d043d5644"; + revision = "1"; + editedCabalFile = "5211841fbb8a9a7fe19ce715a749149ab03c28344531bc3163f8580b611a2e3e"; libraryHaskellDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib @@ -17204,16 +17206,17 @@ self: { }) {}; "Unique" = callPackage - ({ mkDerivation, base, containers, extra, hashable - , unordered-containers + ({ mkDerivation, base, containers, extra, hashable, hspec + , QuickCheck, unordered-containers }: mkDerivation { pname = "Unique"; - version = "0.4.5"; - sha256 = "207488edc9915f826c7ef72386fccbad265a32394364fa9bcba73209e150e58b"; + version = "0.4.6"; + sha256 = "4fd37ceafe74b95af73f01ccc64a5c1e3282e6b74ab2dd193507aac289ae2480"; libraryHaskellDepends = [ base containers extra hashable unordered-containers ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; description = "It provides the functionality like unix \"uniq\" utility"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -17778,24 +17781,26 @@ self: { }) {advapi32 = null; gdi32 = null; shell32 = null; shfolder = null; user32 = null; winmm = null;}; - "Win32_2_4_0_0" = callPackage - ({ mkDerivation, advapi32, base, bytestring, gdi32, shell32 - , shfolder, shlwapi, user32, winmm + "Win32_2_5_0_0" = callPackage + ({ mkDerivation, advapi32, base, bytestring, filepath, gdi32, imm32 + , msimg32, ntdll, shell32, shfolder, shlwapi, user32, winmm }: mkDerivation { pname = "Win32"; - version = "2.4.0.0"; - sha256 = "e99e020ddd510f3b7012e15346284288a4535c88b369fafa91584e0d9a86cecb"; - libraryHaskellDepends = [ base bytestring ]; + version = "2.5.0.0"; + sha256 = "45d7fd5f251ba418d649100cfea9d924b7ef42a8c35df5bb373fd6dd687d2694"; + libraryHaskellDepends = [ base bytestring filepath ]; librarySystemDepends = [ - advapi32 gdi32 shell32 shfolder shlwapi user32 winmm + advapi32 gdi32 imm32 msimg32 ntdll shell32 shfolder shlwapi user32 + winmm ]; homepage = "https://github.com/haskell/win32"; description = "A binding to part of the Win32 library"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.none; - }) {advapi32 = null; gdi32 = null; shell32 = null; - shfolder = null; shlwapi = null; user32 = null; winmm = null;}; + }) {advapi32 = null; gdi32 = null; imm32 = null; msimg32 = null; + ntdll = null; shell32 = null; shfolder = null; shlwapi = null; + user32 = null; winmm = null;}; "Win32-console" = callPackage ({ mkDerivation, base, Win32 }: @@ -20720,8 +20725,8 @@ self: { pname = "aeson-utils"; version = "0.3.0.2"; sha256 = "71814b1be8849f945395eb81217a2ad464f2943134c50c09afd8a3126add4b1f"; - revision = "3"; - editedCabalFile = "38b41ff11ca87f3f1d64c141382f6fbb11f28447056f7e11b93516c4c09520f0"; + revision = "4"; + editedCabalFile = "48548049168c1e48d31414994dcea638dec56dba620c1752b41d4fa975b7020e"; libraryHaskellDepends = [ aeson attoparsec base bytestring scientific text ]; @@ -25174,6 +25179,28 @@ self: { license = "GPL"; }) {}; + "analyze" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, cassava + , exceptions, foldl, free, hashable, lucid, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck, text, unordered-containers, vector + }: + mkDerivation { + pname = "analyze"; + version = "0.1.0.0"; + sha256 = "af261961e6229173ff4e54c46b7bed8ba4b5ced5ad18888bc7c804fc316b4445"; + libraryHaskellDepends = [ + aeson base binary bytestring cassava exceptions foldl free hashable + lucid text unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring exceptions foldl QuickCheck tasty tasty-hunit + tasty-quickcheck text unordered-containers vector + ]; + homepage = "https://github.com/ejconlon/analyze#readme"; + description = "making data science easy and safe with data frames"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "analyze-client" = callPackage ({ mkDerivation, base, bytestring, http-conduit , MonadCatchIO-transformers, mtl, snap, snap-core, time @@ -28898,8 +28925,8 @@ self: { pname = "avers"; version = "0.0.17.1"; sha256 = "1b45d8aa036b3c2ec7ea180327ff3cdce28dc1e1ef319c062be79f0ffa7626f5"; - revision = "4"; - editedCabalFile = "00eb4a4386d3ed82d29c7f33c3c813074d33e25ce0c60872ca0a0cb78c3bd76c"; + revision = "5"; + editedCabalFile = "319f1526093b829e5cbb6fe1591f77f3f5be25da83df7790e37741272e711b24"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock containers cryptonite filepath inflections memory MonadRandom mtl network network-uri @@ -28925,6 +28952,8 @@ self: { pname = "avers-api"; version = "0.0.17.0"; sha256 = "affeffe0ac3c3eb15823fdb4c61654783ef8aff076bfb20b55c3df34be088182"; + revision = "1"; + editedCabalFile = "6ce2a1a63ecf6fcc5cd1d25ce3ee5b2756ebea0a78b7cc3a94fe73b3097668e3"; libraryHaskellDepends = [ aeson avers base bytestring cookie http-api-data servant text time vector @@ -32955,32 +32984,32 @@ self: { }) {}; "biohazard" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring - , bytestring-mmap, containers, deepseq, directory, exceptions - , filepath, hashable, hmatrix, iteratee, ListLike - , nonlinear-optimization, primitive, random, scientific, stm - , strict, template-haskell, text, transformers, unix - , unordered-containers, Vec, vector, vector-algorithms - , vector-th-unbox, zlib + ({ mkDerivation, aeson, aeson-pretty, async, attoparsec, base + , base-prelude, binary, bytestring, bytestring-mmap, containers + , directory, exceptions, filepath, hashable, hybrid-vectors + , iteratee, ListLike, nonlinear-optimization, primitive, process + , random, scientific, shake, stm, template-haskell, text + , transformers, unix, unordered-containers, vector + , vector-algorithms, vector-binary-instances, vector-th-unbox, zlib }: mkDerivation { pname = "biohazard"; - version = "0.6.6.1"; - sha256 = "ad458331686a5a0ac2ace70d63ddccd3cbd76aba2da6c4a38b8b70540789e28f"; + version = "0.6.9"; + sha256 = "b69e935377daf170cea90cfb5d7cc765527d5b606d1dacf30b93cccfb2228628"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async attoparsec base binary bytestring bytestring-mmap - containers deepseq directory exceptions filepath iteratee ListLike - nonlinear-optimization primitive random scientific stm - template-haskell text transformers unix unordered-containers Vec - vector vector-algorithms vector-th-unbox zlib + aeson aeson-pretty async attoparsec base base-prelude binary + bytestring bytestring-mmap containers directory exceptions filepath + hashable hybrid-vectors iteratee ListLike nonlinear-optimization + primitive random scientific stm template-haskell text transformers + unix unordered-containers vector vector-algorithms + vector-binary-instances vector-th-unbox zlib ]; executableHaskellDepends = [ - aeson async base binary bytestring containers directory filepath - hashable hmatrix iteratee nonlinear-optimization primitive random - strict text transformers unix unordered-containers Vec vector - vector-algorithms vector-th-unbox + aeson aeson-pretty async base binary bytestring containers + directory filepath process random shake stm text transformers unix + unordered-containers vector vector-algorithms vector-th-unbox ]; homepage = "http://github.com/udo-stenzel/biohazard"; description = "bioinformatics support library"; @@ -33862,8 +33891,8 @@ self: { pname = "blank-canvas"; version = "0.6"; sha256 = "2a0e5c4fc50b1ce43e56b1a11056186c21d565e225da36f90c58f8c0a70f48b3"; - revision = "8"; - editedCabalFile = "b39980789d8a226fb984088b3ab9e63c96bd81f2ee7806bf124d420c4479fedc"; + revision = "9"; + editedCabalFile = "14307379cfd353cceede81149b2cae2f357d27ee23816203fd1757804e6b5b48"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring bytestring colour containers data-default-class http-types kansas-comet mime-types @@ -34670,8 +34699,8 @@ self: { pname = "bogocopy"; version = "0.1.0.2"; sha256 = "4b2d4e376b8908805a09404fac4a7b73efd3f4549a515eb8e180fe46221de834"; - revision = "1"; - editedCabalFile = "9b68ad2f64094297c4631e652ab247e8d83c64b64b7f40528232b8c474a4dee4"; + revision = "2"; + editedCabalFile = "bf8d78b2879369efdce0953e4613ca0dd1712c4e051adc5e5f66feda39757a5a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -34679,7 +34708,7 @@ self: { transformers unix ]; homepage = "https://github.com/phlummox/bogocopy"; - description = "Simple project template from stack"; + description = "Copy a directory tree, making zero-size sparse copies of big files"; license = stdenv.lib.licenses.bsd2; }) {}; @@ -35373,16 +35402,16 @@ self: { "brick" = callPackage ({ mkDerivation, base, containers, contravariant, data-default - , deepseq, microlens, microlens-mtl, microlens-th, template-haskell - , text, text-zipper, transformers, vector, vty + , deepseq, dlist, microlens, microlens-mtl, microlens-th, stm + , template-haskell, text, text-zipper, transformers, vector, vty }: mkDerivation { pname = "brick"; - version = "0.15.2"; - sha256 = "7407473d133588df46c43480a2b41a50a04a7f0e63a996c6422a07592b8ca85e"; + version = "0.16"; + sha256 = "ebc1dea2d4891e7a66d3b3ee965b6ed16c9ad74ab5143836fa7e1c81dc0c19ff"; libraryHaskellDepends = [ - base containers contravariant data-default deepseq microlens - microlens-mtl microlens-th template-haskell text text-zipper + base containers contravariant data-default deepseq dlist microlens + microlens-mtl microlens-th stm template-haskell text text-zipper transformers vector vty ]; homepage = "https://github.com/jtdaugherty/brick/"; @@ -39052,8 +39081,8 @@ self: { pname = "cassava-megaparsec"; version = "0.1.0"; sha256 = "8d77229766aec5e9e31e145138be981cca791699a3d66010619604827c590702"; - revision = "3"; - editedCabalFile = "1be19f40219b8f6a9e91dc3bfe8905a3ccc920f56dbf82c14f74d05c4c7378c9"; + revision = "4"; + editedCabalFile = "ce616d726f30d6015744bc8087cadb575f16c1e51d20b507dcd75dbeca25119e"; libraryHaskellDepends = [ base bytestring cassava containers megaparsec unordered-containers vector @@ -39308,6 +39337,8 @@ self: { pname = "cayley-client"; version = "0.3.1"; sha256 = "c2d8eeeebf3814a10abfadb032132c8f1deff393909312d17755a9547463ebf7"; + revision = "1"; + editedCabalFile = "2f59497bc4c4e60596223f1f64ccb621a5f7906c06fac51780875c9c8923bdde"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring exceptions http-client http-conduit lens lens-aeson mtl text transformers @@ -40037,6 +40068,19 @@ self: { license = "LGPL"; }) {}; + "charsetdetect-ae_1_1_0_2" = callPackage + ({ mkDerivation, base, bytestring }: + mkDerivation { + pname = "charsetdetect-ae"; + version = "1.1.0.2"; + sha256 = "1393fae432a88fbc5fda643cf545a91469a341218e72464960bde48b27ba0fbe"; + libraryHaskellDepends = [ base bytestring ]; + homepage = "http://github.com/aelve/charsetdetect-ae"; + description = "Character set detection using Mozilla's Universal Character Set Detector"; + license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "chart-histogram" = callPackage ({ mkDerivation, base, Chart }: mkDerivation { @@ -42148,8 +42192,8 @@ self: { }: mkDerivation { pname = "clit"; - version = "0.2.0.1"; - sha256 = "64e698fb189b3ab06c52d43aa0a5da99104b46e8024687d13664610d795fe504"; + version = "0.2.0.2"; + sha256 = "f8c363812b610c79d0fe7275404fca65e073c4bcd11c53afafcffd485c4e47db"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -43296,6 +43340,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "colorless" = callPackage + ({ mkDerivation, base, megaparsec, pregame }: + mkDerivation { + pname = "colorless"; + version = "0.0.0"; + sha256 = "1ae808ffc4522981fd50833e5384173b72dae3c6b9e609f9dbfa791b625ee22c"; + libraryHaskellDepends = [ base megaparsec pregame ]; + homepage = "http://github.com/jxv/colorless#readme"; + description = "Yet another IDL for RPC"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "colors" = callPackage ({ mkDerivation, base, lens, linear, profunctors }: mkDerivation { @@ -43766,6 +43822,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "compactmap_0_1_4_2" = callPackage + ({ mkDerivation, base, containers, hspec, QuickCheck, vector }: + mkDerivation { + pname = "compactmap"; + version = "0.1.4.2"; + sha256 = "36fd80c2f29446bba183c3b7182de9d869a1718c456ae3463ea66b332e6cf6ec"; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + description = "A read-only memory-efficient key-value store"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "compare-type" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -44110,26 +44179,26 @@ self: { "computational-algebra" = callPackage ({ mkDerivation, algebra, algebraic-prelude, arithmoi, base , constraints, containers, control-monad-loop, convertible, deepseq - , dlist, entropy, equational-reasoning, hashable, heaps, hmatrix - , hspec, HUnit, hybrid-vectors, lens, matrix, monad-loops - , MonadRandom, mono-traversable, monomorphic, mtl, parallel, primes - , process, QuickCheck, quickcheck-instances, reflection, semigroups - , singletons, sized, smallcheck, tagged, template-haskell - , test-framework, test-framework-hunit, text, type-natural, unamb - , unordered-containers, vector + , dlist, entropy, equational-reasoning, ghc-typelits-knownnat + , hashable, heaps, hmatrix, hspec, HUnit, hybrid-vectors, lens + , matrix, monad-loops, MonadRandom, mono-traversable, monomorphic + , mtl, parallel, primes, process, QuickCheck, quickcheck-instances + , reflection, semigroups, singletons, sized, smallcheck, tagged + , template-haskell, test-framework, test-framework-hunit, text + , type-natural, unamb, unordered-containers, vector }: mkDerivation { pname = "computational-algebra"; - version = "0.4.0.0"; - sha256 = "cb9fd9a9115a911f43837fedfdc96f91c07a3240eccbd64b111b73844562e9f6"; + version = "0.5.0.0"; + sha256 = "fce631557cfcef120382e91744279f5e7a61c0afaae95cf2159195f7e57fda49"; libraryHaskellDepends = [ algebra algebraic-prelude arithmoi base constraints containers control-monad-loop convertible deepseq dlist entropy - equational-reasoning hashable heaps hmatrix hybrid-vectors lens - matrix monad-loops MonadRandom mono-traversable monomorphic mtl - parallel primes reflection semigroups singletons sized tagged - template-haskell text type-natural unamb unordered-containers - vector + equational-reasoning ghc-typelits-knownnat hashable heaps hmatrix + hybrid-vectors lens matrix monad-loops MonadRandom mono-traversable + monomorphic mtl parallel primes reflection semigroups singletons + sized tagged template-haskell text type-natural unamb + unordered-containers vector ]; testHaskellDepends = [ algebra base constraints containers convertible deepseq @@ -49350,8 +49419,8 @@ self: { }: mkDerivation { pname = "damnpacket"; - version = "1.0.2"; - sha256 = "b00c792670558fc2849f932232361fe4b59c7ce62009e5efbab71a162438ea05"; + version = "1.1.0"; + sha256 = "68284ed9c5cd54c5697f8202bcb8001d22497a5b225489729a660c4ba8a3bd1f"; libraryHaskellDepends = [ attoparsec base bytestring fail html-entities template-haskell text th-lift-instances @@ -51912,6 +51981,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dcpu16" = callPackage + ({ mkDerivation, base, bytestring, containers, filepath + , optparse-applicative, parsec, sdl2, spool, vector + }: + mkDerivation { + pname = "dcpu16"; + version = "0.1.0.0"; + sha256 = "d3838fcd4838a668319791c4996a2af7e11f6a0496485c61389f40e376f335bc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers parsec sdl2 spool vector + ]; + executableHaskellDepends = [ base filepath optparse-applicative ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/githubuser/dcpu16#readme"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ddate" = callPackage ({ mkDerivation, base, dates, time }: mkDerivation { @@ -55471,6 +55560,20 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "distance" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "distance"; + version = "0.1.0.0"; + sha256 = "007cfb1c56ff8e8f905dad7c1630630162ffb8520925f028cf82e93ba7cd4a58"; + revision = "1"; + editedCabalFile = "b8629453e8a81834e23eb577c6b304891ff60f36b956d03e59da854ba8adda47"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/agrafix/distance#readme"; + description = "Useful distance datatype and functions"; + license = stdenv.lib.licenses.mit; + }) {}; + "distributed-closure" = callPackage ({ mkDerivation, base, binary, bytestring, constraints, hspec , QuickCheck, syb, template-haskell @@ -56711,17 +56814,17 @@ self: { }) {}; "dom-parser" = callPackage - ({ mkDerivation, base, containers, data-default, hspec, lens, mtl - , open-union, semigroups, shakespeare, text, transformers, type-fun - , xml-conduit, xml-lens + ({ mkDerivation, base, case-insensitive, containers, data-default + , hspec, lens, mtl, open-union, scientific, semigroups, shakespeare + , text, transformers, type-fun, xml-conduit, xml-lens }: mkDerivation { pname = "dom-parser"; - version = "1.0.0"; - sha256 = "6d48ca6cd564919af8574cc91c97f050f50747f358e159797895fd0517dc9583"; + version = "2.0.0"; + sha256 = "9de203857330d7d3b27e18e458a7548dc4e449bff3b7b95de2d40a1556cccf38"; libraryHaskellDepends = [ - base containers lens mtl open-union semigroups text transformers - type-fun xml-conduit xml-lens + base case-insensitive containers lens mtl open-union scientific + semigroups text transformers type-fun xml-conduit xml-lens ]; testHaskellDepends = [ base data-default hspec lens semigroups shakespeare text @@ -58437,8 +58540,8 @@ self: { ({ mkDerivation, base, process }: mkDerivation { pname = "echo"; - version = "0.1"; - sha256 = "a7211a9da1fa10dc7d95e89d2c68dadf063b3826d81e42eb085df91c46353e4d"; + version = "0.1.1"; + sha256 = "e1fc1756f255e47db28c6c0520c43fe45ac0c1093009f378683273ebe02851c6"; libraryHaskellDepends = [ base process ]; homepage = "https://github.com/RyanGlScott/echo"; description = "A cross-platform, cross-console way to handle echoing terminal input"; @@ -60249,6 +60352,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "entangle" = callPackage + ({ mkDerivation, base, containers, matrix, mtl, quipper-core }: + mkDerivation { + pname = "entangle"; + version = "0.1.1"; + sha256 = "2836f6645c71d68ad1fcc30b0f3186bc9cf85f0703f3c89da58564cd05eedabc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers matrix mtl quipper-core + ]; + executableHaskellDepends = [ base matrix quipper-core ]; + description = "An application (and library) to convert quipper circuits into Qpmc models"; + license = stdenv.lib.licenses.mit; + }) {}; + "entropy" = callPackage ({ mkDerivation, base, bytestring, unix }: mkDerivation { @@ -61114,7 +61233,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "esqueleto" = callPackage + "esqueleto_2_4_3" = callPackage ({ mkDerivation, base, blaze-html, bytestring, conduit, containers , hspec, HUnit, monad-control, monad-logger, persistent , persistent-sqlite, persistent-template, QuickCheck, resourcet @@ -61141,6 +61260,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "esqueleto" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, conduit, containers + , hspec, HUnit, monad-control, monad-logger, persistent + , persistent-sqlite, persistent-template, QuickCheck, resourcet + , tagged, text, transformers, unordered-containers + }: + mkDerivation { + pname = "esqueleto"; + version = "2.5.0"; + sha256 = "2cba54c813bb506024889b29ceb75079e31e4172dc79cfa1e48c84337e064fa2"; + libraryHaskellDepends = [ + base blaze-html bytestring conduit monad-logger persistent + resourcet tagged text transformers unordered-containers + ]; + testHaskellDepends = [ + base conduit containers hspec HUnit monad-control monad-logger + persistent persistent-sqlite persistent-template QuickCheck + resourcet text transformers + ]; + homepage = "https://github.com/bitemyapp/esqueleto"; + description = "Type-safe EDSL for SQL queries on persistent backends"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ess" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -63233,8 +63377,8 @@ self: { pname = "fay"; version = "0.23.1.16"; sha256 = "c46ef8cb7980bcf62ef7ccc9897e9c4246e6bec8cafc06d49ebe1d5bcd618a64"; - revision = "2"; - editedCabalFile = "c164132b3489ae1511bda64e9fb8fde6d05fdc4a1fcc0ff327efd9ce3b1d81ce"; + revision = "3"; + editedCabalFile = "636e2fbbe689dde982c327a7fc33871804ec66e47105d6cbffd6ce09716c241f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -65085,20 +65229,20 @@ self: { }) {}; "fixfile" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers + ({ mkDerivation, array, base, bytestring, cereal, containers , directory, exceptions, filepath, hashable, hashtables, lens, mtl , QuickCheck, tasty, tasty-quickcheck, temporary, vector }: mkDerivation { pname = "fixfile"; - version = "0.6.0.0"; - sha256 = "37183ade31510ba1c3801adf5df112f7ef6291b478934d0c51839510e536888c"; + version = "0.7.0.0"; + sha256 = "b49027c747a7112256aec9b9ac33f4617c3ec0cfdd5943d7c81c6c9885f10b70"; libraryHaskellDepends = [ - array base binary bytestring containers directory filepath hashable + array base bytestring cereal containers directory filepath hashable hashtables lens mtl temporary vector ]; testHaskellDepends = [ - base binary bytestring directory exceptions lens mtl QuickCheck + base bytestring cereal directory exceptions lens mtl QuickCheck tasty tasty-quickcheck temporary ]; homepage = "https://github.com/revnull/fixfile"; @@ -65226,6 +65370,8 @@ self: { pname = "flac"; version = "0.1.1"; sha256 = "58b7287cb39bdfc39cf7aab95b87d81111234fed502a8d1743ecfbcef001873e"; + revision = "1"; + editedCabalFile = "482d7352bb284c86021b513c37837746fe8a293146c3cf0d91b91dbc4a34ae34"; libraryHaskellDepends = [ base bytestring containers data-default-class directory exceptions filepath mtl text transformers vector wave @@ -66039,15 +66185,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "foldl_1_2_2" = callPackage + "foldl_1_2_3" = callPackage ({ mkDerivation, base, bytestring, comonad, containers , contravariant, mwc-random, primitive, profunctors, text , transformers, vector }: mkDerivation { pname = "foldl"; - version = "1.2.2"; - sha256 = "c869deb0dc7d41d496539968968ff6045022d1286dfb2c1d53f61dc974f455eb"; + version = "1.2.3"; + sha256 = "fb081168f7736a04dc68db348d2e0bc58d535da5ed74c4394a022dbaa46d3f25"; libraryHaskellDepends = [ base bytestring comonad containers contravariant mwc-random primitive profunctors text transformers vector @@ -66086,8 +66232,8 @@ self: { }: mkDerivation { pname = "foldl-statistics"; - version = "0.1.4.1"; - sha256 = "7abd5ed3ee0295de589484b0973f2531ae1956bf4ec1f237956c046bca106b28"; + version = "0.1.4.2"; + sha256 = "1cfa6d6d36ff40529319a6f790bf130b6b4d650f1b8db5ee739cf4b44d5c8be0"; libraryHaskellDepends = [ base foldl math-functions profunctors semigroups ]; @@ -68995,8 +69141,8 @@ self: { pname = "generic-aeson"; version = "0.2.0.8"; sha256 = "de29fa648b9eb6c9e678b0715a530efaf70aac8f1ad8becc22d7ef1411ded5cb"; - revision = "2"; - editedCabalFile = "1796cd85bd71d6f83a9dfd2f56cbb90c0059591e4e3bbf6e38864435f726c971"; + revision = "3"; + editedCabalFile = "ed9572e401789a0bff470b31f6cb127e77a43a831ba07b5eb5705a3b770d2263"; libraryHaskellDepends = [ aeson attoparsec base generic-deriving mtl tagged text unordered-containers vector @@ -71990,7 +72136,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "gipeda_0_3_3_0" = callPackage + "gipeda_0_3_3_1" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava , concurrent-output, containers, directory, extra, file-embed , filepath, gitlib, gitlib-libgit2, scientific, shake, split @@ -71998,8 +72144,8 @@ self: { }: mkDerivation { pname = "gipeda"; - version = "0.3.3.0"; - sha256 = "9b3f111ed3b980a5b9a721948df16c6a05b28f3a805657d0cfa271e356169744"; + version = "0.3.3.1"; + sha256 = "be7aafd3390c5d498c39482ff862a302c3bf2d7cecdba4940141297728bbb143"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -76927,8 +77073,8 @@ self: { }: mkDerivation { pname = "gopher-proxy"; - version = "0.1.0.2"; - sha256 = "6f06b79fb6edf8df020e104feba3db960fc9e6ca4198d860de1702d752053fdd"; + version = "0.1.1.1"; + sha256 = "8d85cc17d211d6c7600ff8b1da3bd0b5fbbe0bcd2ffd6629719a94674b4acf4d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -80598,6 +80744,8 @@ self: { pname = "haddock-api"; version = "2.17.3"; sha256 = "8d35a256c2ee07083c1e1a8b08e536069ffdad27598bed69d88847fb51234dc7"; + revision = "1"; + editedCabalFile = "5d33603e8e6befb2c2ed2dd8c5029b78e1377a387b165671105cadb9cb7df4f8"; libraryHaskellDepends = [ array base bytestring Cabal containers deepseq directory filepath ghc ghc-boot ghc-paths haddock-library transformers xhtml @@ -81096,8 +81244,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.9.2.0"; - sha256 = "20f1e5be71290445626ccf716e6b312bf3f5ebf780ce9481d574a83681ef2e3f"; + version = "4.9.3.0"; + sha256 = "f15c6cd2118501fa6be44e3cb3d9f37a22fced0fd1ebd64236277e2daf622e7a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81124,7 +81272,6 @@ self: { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) utillinux;}; "hakyll-R" = callPackage @@ -84664,8 +84811,8 @@ self: { }: mkDerivation { pname = "haskell-tools-ast"; - version = "0.4.1.0"; - sha256 = "00aed2236a37a582ff761b0a83946e3bdfa9027098c18d75ad7e34577a775ac5"; + version = "0.4.1.1"; + sha256 = "857c0f5b57d129aa49fd8b5375703638c4cd1e5cd4c85d5160d7ad13d308f88e"; libraryHaskellDepends = [ base ghc mtl references template-haskell uniplate ]; @@ -84736,8 +84883,8 @@ self: { }: mkDerivation { pname = "haskell-tools-backend-ghc"; - version = "0.4.1.0"; - sha256 = "5607c50d38a26db49abd936fee9aac96bf332496bc7cbb9fe20e10bf929e63f6"; + version = "0.4.1.1"; + sha256 = "d01fe6e236fb57e7d79b35ada30e8aa0ff56f626444f25bd907bb8e785de3006"; libraryHaskellDepends = [ base bytestring containers ghc haskell-tools-ast mtl references safe split template-haskell transformers uniplate @@ -84756,8 +84903,8 @@ self: { }: mkDerivation { pname = "haskell-tools-cli"; - version = "0.4.1.0"; - sha256 = "43ec482527444bd15382c93a866d50cdde39ecd53968eabc041dcbbc3a55872a"; + version = "0.4.1.1"; + sha256 = "7c843bcd923987679d17359b2881173af72b5beea8b66db241058c69d2a1530f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84783,8 +84930,8 @@ self: { }: mkDerivation { pname = "haskell-tools-daemon"; - version = "0.4.1.0"; - sha256 = "b028a4c3e9a0701e563d1c12b45fe7bfdad1705232f4170cc23632967437de2c"; + version = "0.4.1.1"; + sha256 = "c1334b480b4c7ed5fb918ad887ee50a4eaa610b8c626ae00154eecdf2bb11dc1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84810,8 +84957,8 @@ self: { }: mkDerivation { pname = "haskell-tools-debug"; - version = "0.4.1.0"; - sha256 = "aae428cb78d3923eecdc2a183ed397578b3dc38c29af77bba44dadaf50dd66ef"; + version = "0.4.1.1"; + sha256 = "092da28a3924ec7855f910123cc6d3adaf02c8aea28c09d370ca40e4b66df02c"; libraryHaskellDepends = [ base ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc haskell-tools-prettyprint haskell-tools-refactor references @@ -84831,8 +84978,8 @@ self: { }: mkDerivation { pname = "haskell-tools-demo"; - version = "0.4.1.0"; - sha256 = "9a65654bd6d95a6a5ea2ec2ed46a64d2d6aebd74fad864deeda0980b2a50f0e6"; + version = "0.4.1.1"; + sha256 = "97e23bce841240eb60f9d959922e5e262dd2d5351954ac1b183aa96910fe0b2b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84858,8 +85005,8 @@ self: { }: mkDerivation { pname = "haskell-tools-prettyprint"; - version = "0.4.1.0"; - sha256 = "9ca7aecc1e36ea004e2017cf5a7afcc9b6ad4300a9efdffcc68275498bb254a7"; + version = "0.4.1.1"; + sha256 = "2d0b5df63f5709359ad5bbc7c67475bf511cc732f1ad682c71506b196519eae8"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast mtl references split uniplate ]; @@ -84879,8 +85026,8 @@ self: { }: mkDerivation { pname = "haskell-tools-refactor"; - version = "0.4.1.0"; - sha256 = "743e02a1485686df0e6fe6fef2fee473b099cda89323a7b5e35bb9bf17481366"; + version = "0.4.1.1"; + sha256 = "a6f1cf8f908f10424919ded1077abe4f15c423548830c4c1a0c117f8a8d8e894"; libraryHaskellDepends = [ base Cabal containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc @@ -84907,8 +85054,8 @@ self: { }: mkDerivation { pname = "haskell-tools-rewrite"; - version = "0.4.1.0"; - sha256 = "bfa733c82af102a594c7c8ce3d044465f02874a685e0b39e8cc48d3659758282"; + version = "0.4.1.1"; + sha256 = "17b2523cbf0b13fc83a28e3b2a55dc7a9118c26ee87c180ec3db46f6571668c8"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl references @@ -90108,8 +90255,8 @@ self: { }: mkDerivation { pname = "hindent"; - version = "5.2.1"; - sha256 = "0c3118ccf087bea9dfaa9cbcb76bd6ed35919acd2fa511c741e97277b6b01c53"; + version = "5.2.2"; + sha256 = "1fc9a92a501552b17219a13fd691e380cc2e2bbf4d768788f13b47639ff4237d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90877,6 +91024,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hjsonpointer_1_1_0_0" = callPackage + ({ mkDerivation, aeson, base, hashable, hspec, http-types + , QuickCheck, semigroups, text, unordered-containers, vector + }: + mkDerivation { + pname = "hjsonpointer"; + version = "1.1.0.0"; + sha256 = "af2ea643f97d8ed1aca85651b8b65dbabc4967753f0024255baa36d410177dfa"; + libraryHaskellDepends = [ + aeson base hashable QuickCheck semigroups text unordered-containers + vector + ]; + testHaskellDepends = [ + aeson base hspec http-types QuickCheck text unordered-containers + vector + ]; + homepage = "https://github.com/seagreen/hjsonpointer"; + description = "JSON Pointer library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hjsonschema" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , directory, file-embed, filepath, hjsonpointer, http-client @@ -90904,26 +91073,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hjsonschema_1_2_0_2" = callPackage + "hjsonschema_1_3_0_0" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers - , directory, file-embed, filepath, hjsonpointer, hspec, http-client - , http-types, pcre-heavy, profunctors, QuickCheck, scientific - , semigroups, text, unordered-containers, vector, wai-app-static - , warp + , directory, file-embed, filepath, hashable, hjsonpointer, hspec + , http-client, http-types, pcre-heavy, profunctors, protolude + , QuickCheck, scientific, semigroups, text, unordered-containers + , vector, wai-app-static, warp }: mkDerivation { pname = "hjsonschema"; - version = "1.2.0.2"; - sha256 = "dc6aa03f842609ed43910510a3d5bf58bab38e94d3117ec9f669ef50ce33dd00"; + version = "1.3.0.0"; + sha256 = "ad54c4ee176376ef2fb7a92b5d6f35e70900fbc032000438fc37d3bdd7df819b"; libraryHaskellDepends = [ - aeson base bytestring containers file-embed filepath hjsonpointer - http-client http-types pcre-heavy profunctors QuickCheck scientific - semigroups text unordered-containers vector + aeson base bytestring containers file-embed filepath hashable + hjsonpointer http-client http-types pcre-heavy profunctors + protolude QuickCheck scientific semigroups text + unordered-containers vector ]; testHaskellDepends = [ aeson async base bytestring directory filepath hjsonpointer hspec - profunctors QuickCheck semigroups text unordered-containers vector - wai-app-static warp + profunctors protolude QuickCheck semigroups text + unordered-containers vector wai-app-static warp ]; homepage = "https://github.com/seagreen/hjsonschema"; description = "JSON Schema library"; @@ -91118,7 +91288,7 @@ self: { mkDerivation { pname = "hledger-diff"; version = "0.2.0.7"; - sha256 = "1x7ngm0h9hsbf4p8vx1h4z1w9hlqkqfa39v2dvmlxrcx6rs8dzsl"; + sha256 = "54ff8674369de54eeb6e62a7a11c9e98c2c4c32730f48d2e714bc304417df6f4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base hledger-lib text time ]; @@ -93880,6 +94050,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hpc-coveralls_1_0_7" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, Cabal, cmdargs + , containers, curl, directory, directory-tree, hpc, HUnit, process + , pureMD5, regex-posix, retry, safe, split, transformers + }: + mkDerivation { + pname = "hpc-coveralls"; + version = "1.0.7"; + sha256 = "1e3ca630dd142ffa474268e8e7cc95c4d15ad7521affaec0ac28e3cd53452584"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring Cabal cmdargs containers curl directory + directory-tree hpc process pureMD5 retry safe split transformers + ]; + executableHaskellDepends = [ + aeson async base bytestring Cabal cmdargs containers curl directory + directory-tree hpc process pureMD5 regex-posix retry safe split + transformers + ]; + testHaskellDepends = [ base HUnit ]; + homepage = "https://github.com/guillaume-nargeot/hpc-coveralls"; + description = "Coveralls.io support for Haskell."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hpc-strobe" = callPackage ({ mkDerivation, base, filepath, hpc }: mkDerivation { @@ -101298,6 +101495,8 @@ self: { pname = "hybrid-vectors"; version = "0.2.1"; sha256 = "2edcd8fcfedc76a944ac690bfc257f2974100df6484c6c20883d27773836cca2"; + revision = "1"; + editedCabalFile = "f07302db04c6d19bf5ab00c084e0ec4fb72955b7bd258e77b4881a21a263e3c4"; libraryHaskellDepends = [ base deepseq primitive vector ]; homepage = "http://github.com/ekmett/hybrid-vectors"; description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors"; @@ -106695,8 +106894,10 @@ self: { ({ mkDerivation, base, Cabal }: mkDerivation { pname = "jailbreak-cabal"; - version = "1.3.2"; - sha256 = "1x2h54sx4ycik34q8f9g698xc2b7fai18918cd08qx7w7ny8nai1"; + version = "1.3.1"; + sha256 = "610d8dbd04281eee3d5da05c9eef45bfd1a1ddca20dfe54f283e15ddf6d5c235"; + revision = "1"; + editedCabalFile = "ad923093f40ae8a7b7faa64a4e65a8545057987e5efe8baafec455fbcc85a52c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base Cabal ]; @@ -106706,6 +106907,22 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "jailbreak-cabal_1_3_2" = callPackage + ({ mkDerivation, base, Cabal }: + mkDerivation { + pname = "jailbreak-cabal"; + version = "1.3.2"; + sha256 = "212a8bbc3dfc748c4063282414a2726709d651322f3984c9989179d2352950f4"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base Cabal ]; + homepage = "https://github.com/peti/jailbreak-cabal#readme"; + description = "Strip version restrictions from build dependencies in Cabal files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "jalaali" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -107542,10 +107759,10 @@ self: { }: mkDerivation { pname = "json-api"; - version = "0.1.1.1"; - sha256 = "d5af631049fe2096c29f79b956f3c3b419b11f097278f131beee31a5369e2516"; + version = "0.1.1.2"; + sha256 = "b5bab272ea259c5868d65ab1dbb2967c557219c95fe8aef7d6cd7cd6e8075d24"; libraryHaskellDepends = [ - aeson base containers data-default lens-aeson text + aeson base containers data-default lens lens-aeson text unordered-containers url ]; testHaskellDepends = [ @@ -108014,8 +108231,8 @@ self: { pname = "json-schema"; version = "0.7.4.1"; sha256 = "560d6a17d6eab734f43d329e51967e3ed62f8df2a6fea4a92d06359fe77d7c96"; - revision = "5"; - editedCabalFile = "ec1615227a46ff11cc6dca76df0564ace2a8ff8069e9c84cea0064cd908d0eb3"; + revision = "6"; + editedCabalFile = "b6211ab8989ce7d576cac285b7d17f2e50ee79139545e2e84b2dd319904360b2"; libraryHaskellDepends = [ aeson base containers generic-aeson generic-deriving mtl scientific text time unordered-containers vector @@ -109774,8 +109991,8 @@ self: { }: mkDerivation { pname = "kicad-data"; - version = "0.3.0.0"; - sha256 = "6270a5f62dad9920ca169c1c8867f6ba0d2d36e64299cada90d526b4c73d3ee7"; + version = "0.4.0"; + sha256 = "a55a3cc07dd96b4de4a2a9bbe8f1fc9e1a73da6bd999fe145a31f2e4f2731e25"; libraryHaskellDepends = [ base ieee754 lens-family parsec parsec-numbers pretty-compact ]; @@ -112604,6 +112821,24 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "ldapply" = callPackage + ({ mkDerivation, base, bytestring, docopt, interpolatedstring-perl6 + , LDAP, ldif, unordered-containers + }: + mkDerivation { + pname = "ldapply"; + version = "0.1.0"; + sha256 = "5c99e6f200c58aeb897a3a8f2e283ad2caba73c6f7eba919102912715891d04b"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring docopt interpolatedstring-perl6 LDAP ldif + unordered-containers + ]; + description = "LDIF idempotent apply tool"; + license = stdenv.lib.licenses.mit; + }) {}; + "ldif" = callPackage ({ mkDerivation, base, bytestring, cmdargs, containers, directory , filepath, HUnit, parsec, rosezipper @@ -113056,8 +113291,8 @@ self: { pname = "lens"; version = "4.15.1"; sha256 = "5cfaa64cb1b9787193c2247a1ed1c248104ba5fadb91cec6432e648e41b1bea6"; - revision = "3"; - editedCabalFile = "d23792e0e14306446fe13c8de692b46cbf0aedd22ea22248d70c9dc71646716f"; + revision = "4"; + editedCabalFile = "e055de1a2d30bf9122947afbc5e342b06a0f4a512fece45f5b9132f7beb11539"; libraryHaskellDepends = [ array base base-orphans bifunctors bytestring comonad containers contravariant distributive exceptions filepath free ghc-prim @@ -113108,8 +113343,8 @@ self: { pname = "lens-aeson"; version = "1.0.0.5"; sha256 = "65faad5b75852209b4c6df43ae1f7460c2b94bf3bbc10b5cd529f43c743a5d9f"; - revision = "3"; - editedCabalFile = "d511d27175ba60166923027642b159100332d57db118fb7055cf512fbd0bd7d1"; + revision = "4"; + editedCabalFile = "6fde3d7feb42ad58f74e89202ec01d0397bd1c8bf00b2042edaa293479d70385"; libraryHaskellDepends = [ aeson attoparsec base bytestring lens scientific text unordered-containers vector @@ -114775,6 +115010,8 @@ self: { pname = "linear"; version = "1.20.5"; sha256 = "61d8b7242f1e7c27925df7ffe1aa8b1fd732e61598f3af48b9999d8fb464cc0d"; + revision = "1"; + editedCabalFile = "59fb06c2c7326ffedc00c3b54a89fecf6bf664e9bea0845f5cd933249c0113d5"; libraryHaskellDepends = [ adjunctions base base-orphans binary bytes cereal containers deepseq distributive ghc-prim hashable lens reflection @@ -116633,8 +116870,8 @@ self: { pname = "log-domain"; version = "0.10.3.1"; sha256 = "36f427506218358b20a2066d5fb38406816fabac18ca26c807a416a795643815"; - revision = "1"; - editedCabalFile = "ff544f4bf06996c1775f8c59c0cbf949a60ef50c6ec9404c851bc885612e2498"; + revision = "2"; + editedCabalFile = "d5c0d4af0c551eb4b014ce825c1ff6a92fa947225992a89ec9f4b67ece705c6f"; libraryHaskellDepends = [ base binary bytes cereal comonad deepseq distributive hashable hashable-extras safecopy semigroupoids semigroups vector @@ -117471,6 +117708,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lrucaching_0_3_1" = callPackage + ({ mkDerivation, base, base-compat, containers, deepseq, hashable + , hspec, psqueues, QuickCheck, transformers, vector + }: + mkDerivation { + pname = "lrucaching"; + version = "0.3.1"; + sha256 = "2f287ea60d721f58474dc105dec953f98ce9a41dd1897647ef68a48605b132d6"; + libraryHaskellDepends = [ + base base-compat deepseq hashable psqueues vector + ]; + testHaskellDepends = [ + base containers deepseq hashable hspec QuickCheck transformers + ]; + homepage = "https://github.com/cocreature/lrucaching#readme"; + description = "LRU cache"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ls-usb" = callPackage ({ mkDerivation, ansi-wl-pprint, base, base-unicode-symbols , cmdtheline, text, usb, usb-id-database, vector @@ -118419,6 +118676,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "madlang" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, hspec, hspec-megaparsec + , lens, megaparsec, mtl, mwc-random, optparse-generic, text + }: + mkDerivation { + pname = "madlang"; + version = "0.1.0.1"; + sha256 = "b0df75127de969328701adb376673409c82b37c1f3c92b2b0d84b5de2be80ae6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base lens megaparsec mtl mwc-random optparse-generic + text + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base hspec hspec-megaparsec megaparsec mtl text + ]; + homepage = "https://github.com/vmchale/madlang#readme"; + description = "Randomized templating language DSL"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mage" = callPackage ({ mkDerivation, array, base, containers, mtl, ncurses, random }: mkDerivation { @@ -119607,29 +119887,29 @@ self: { "marvin" = callPackage ({ mkDerivation, aeson, async, base, bytestring, configurator - , directory, filepath, hashable, hslogger, lens, mono-traversable - , mtl, mustache, network-uri, optparse-applicative - , optparse-generic, pcre-light, random, template-haskell, text - , text-format, unordered-containers, vector, websockets, wreq, wuss + , directory, filepath, hashable, lens, lifted-async, lifted-base + , marvin-interpolate, monad-logger, mono-traversable, mtl, mustache + , network-uri, optparse-applicative, random, stm, text, text-icu + , unordered-containers, vector, websockets, wreq, wuss }: mkDerivation { pname = "marvin"; - version = "0.0.4"; - sha256 = "76c0af008fd2b2c691abe29541b392fe47f59f8a004b837bb8e398f916df1bae"; + version = "0.0.5"; + sha256 = "bb2de5f531e8f670476af97795f4e13dd06335fedf212e196787e635c97a217d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async base bytestring configurator hashable hslogger lens - mono-traversable mtl network-uri optparse-generic pcre-light random - template-haskell text text-format unordered-containers vector - websockets wreq wuss + aeson async base bytestring configurator hashable lens lifted-async + lifted-base marvin-interpolate monad-logger mono-traversable mtl + network-uri optparse-applicative random stm text text-icu + unordered-containers vector websockets wreq wuss ]; executableHaskellDepends = [ aeson base bytestring configurator directory filepath mono-traversable mustache optparse-applicative text ]; - homepage = "https://github.com/JustusAdam/marvin#readme"; - description = "A modular bot for slack"; + homepage = "https://marvin.readthedocs.io"; + description = "A modular chat bot"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -119640,8 +119920,8 @@ self: { }: mkDerivation { pname = "marvin-interpolate"; - version = "0.3.0"; - sha256 = "053a9fa6ada9b29a18d8e6d7da51b9ee4bc440cd53c6882eb6dc05f425022d85"; + version = "0.4.0"; + sha256 = "cc7a97fe7e9d43065d59d21827e40e127b9adaf250715cd7dbfe0e8480bfa766"; libraryHaskellDepends = [ base haskell-src-meta mtl parsec template-haskell text ]; @@ -121277,15 +121557,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "microlens-aeson_2_1_1_2" = callPackage + "microlens-aeson_2_2_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, microlens , scientific, tasty, tasty-hunit, text, unordered-containers , vector }: mkDerivation { pname = "microlens-aeson"; - version = "2.1.1.2"; - sha256 = "f1295f2b6b4db3118b445551ae585650e9ddb2d40bd50194514e478710840f79"; + version = "2.2.0"; + sha256 = "c25b8fefcd321f348c5948a0f65d30ecad4070e3f1f7720bacb022b57c6386d4"; libraryHaskellDepends = [ aeson attoparsec base bytestring microlens scientific text unordered-containers vector @@ -122592,8 +122872,8 @@ self: { ({ mkDerivation, base, doctest, Glob }: mkDerivation { pname = "modular-arithmetic"; - version = "1.2.1.1"; - sha256 = "5b1592ef852596e8c4e1ac5e8f213ee0272a8e0bf6c3d431a86bbeaff35cb700"; + version = "1.2.1.2"; + sha256 = "921f31f72589c07be9e64fcc68e90a41651817404ee796f56d0f299287b9a176"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob ]; homepage = "https://github.com/TikhonJelvis/modular-arithmetic"; @@ -124245,14 +124525,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "monoid-subclasses_0_4_3" = callPackage + "monoid-subclasses_0_4_3_1" = callPackage ({ mkDerivation, base, bytestring, containers, primes, QuickCheck , quickcheck-instances, tasty, tasty-quickcheck, text, vector }: mkDerivation { pname = "monoid-subclasses"; - version = "0.4.3"; - sha256 = "568fd54e1fe35557129bc8cd1a751343dfde61a63fab0baadc38683101aed0cd"; + version = "0.4.3.1"; + sha256 = "a170d07916b694601a7da2924656e5f8a5ad27afa0e548f4683b154e122783cd"; libraryHaskellDepends = [ base bytestring containers primes text vector ]; @@ -126911,6 +127191,8 @@ self: { pname = "nanovg"; version = "0.5.2.0"; sha256 = "22e31d227770e55123aadb2750c35895f4d635327c7be1ef1ea2655d86180f5d"; + revision = "1"; + editedCabalFile = "ab822c8c3baab11820f06e9c34ba59c97789625020fabf476338cc17b2e74853"; libraryHaskellDepends = [ base bytestring containers text vector ]; librarySystemDepends = [ freeglut GLEW mesa ]; libraryToolDepends = [ c2hs ]; @@ -132914,12 +133196,16 @@ self: { }) {}; "overload" = callPackage - ({ mkDerivation, base, simple-effects, template-haskell }: + ({ mkDerivation, base, containers, simple-effects, template-haskell + , th-expand-syns + }: mkDerivation { pname = "overload"; - version = "0.1.0.0"; - sha256 = "ed48aa71ec612bb280529f26e94f0babe5ca346be3bf0a2cbd34a22d25308322"; - libraryHaskellDepends = [ base simple-effects template-haskell ]; + version = "0.1.0.1"; + sha256 = "6583c3c90021bc42bf93d8a287fd81970270f05f423b961a35ac06e11f35af6e"; + libraryHaskellDepends = [ + base containers simple-effects template-haskell th-expand-syns + ]; homepage = "https://gitlab.com/LukaHorvat/overload"; description = "Finite overloading"; license = stdenv.lib.licenses.mit; @@ -134338,6 +134624,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "parsec-numeric" = callPackage + ({ mkDerivation, base, bytestring, parsec, tasty, tasty-hunit + , tasty-quickcheck, tasty-th, text + }: + mkDerivation { + pname = "parsec-numeric"; + version = "0.1.0.0"; + sha256 = "7bdd9ae4aa63695e3072c73d99b85ef1572ffe9f5a07621edaa9515393a6e52f"; + libraryHaskellDepends = [ base parsec ]; + testHaskellDepends = [ + base bytestring parsec tasty tasty-hunit tasty-quickcheck tasty-th + text + ]; + homepage = "https://github.com/AndrewRademacher/parsec-numeric"; + description = "Parsec combinators for parsing Haskell numeric types"; + license = "unknown"; + }) {}; + "parsec-parsers" = callPackage ({ mkDerivation, base, directory, doctest, filepath, parsec , parsers @@ -134955,14 +135259,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "path-io_1_2_1" = callPackage + "path-io_1_2_2" = callPackage ({ mkDerivation, base, containers, directory, exceptions, filepath , hspec, path, temporary, time, transformers, unix-compat }: mkDerivation { pname = "path-io"; - version = "1.2.1"; - sha256 = "41582c65c6ceb05522bbacb0fc242f542d1e42e61bc5c9858b9153e8c334339f"; + version = "1.2.2"; + sha256 = "72255f9d014285c87dd4c537f445a5448b2b64e81c4ee4759464b4b0e401fe46"; libraryHaskellDepends = [ base containers directory exceptions filepath path temporary time transformers unix-compat @@ -135395,20 +135699,20 @@ self: { "pdf-slave" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring - , containers, exceptions, haskintex, HaTeX, optparse-applicative - , pdf-slave-template, shelly, system-filepath, text, transformers - , unordered-containers, yaml + , containers, directory, exceptions, haskintex, HaTeX + , optparse-applicative, pdf-slave-template, shelly, system-filepath + , text, transformers, unordered-containers, yaml }: mkDerivation { pname = "pdf-slave"; - version = "1.2.3.0"; - sha256 = "46700a44e9f6ee7fbfecfd23201211a9c99d3a74c9fa9d8a467980b7390a5ae4"; + version = "1.3.0.0"; + sha256 = "0020adc44e21938637c5fe7f69bf7ff714b5773654a74ff2c0ff544bf934f5b9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base base64-bytestring bytestring containers exceptions - haskintex HaTeX pdf-slave-template shelly system-filepath - unordered-containers yaml + aeson base base64-bytestring bytestring containers directory + exceptions haskintex HaTeX pdf-slave-template shelly + system-filepath unordered-containers yaml ]; executableHaskellDepends = [ aeson base bytestring optparse-applicative pdf-slave-template @@ -137349,7 +137653,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pinboard_0_9_12_1" = callPackage + "pinboard_0_9_12_2" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec , http-client, http-client-tls, http-types, monad-logger, mtl , network, profunctors, QuickCheck, random, safe-exceptions @@ -137358,8 +137662,8 @@ self: { }: mkDerivation { pname = "pinboard"; - version = "0.9.12.1"; - sha256 = "dd6303ec05b38e9b2af196d4efee5ee174fef62c960c2ad15943faef9d96d237"; + version = "0.9.12.2"; + sha256 = "f9c5dbf3206d0c0075704feb4582c58a5eb3ef4704ca7a2000c5c8d49dbeeec9"; libraryHaskellDepends = [ aeson base bytestring containers http-client http-client-tls http-types monad-logger mtl network profunctors random @@ -138201,6 +138505,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-random_1_0_0_3" = callPackage + ({ mkDerivation, base, mwc-random, pipes, vector }: + mkDerivation { + pname = "pipes-random"; + version = "1.0.0.3"; + sha256 = "729c3359e4f76048b0a9c656e4739c369619b8abce546a741f8d55e2a7b31193"; + libraryHaskellDepends = [ base mwc-random pipes vector ]; + description = "Producers for handling randomness"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-rt" = callPackage ({ mkDerivation, base, mwc-random, pipes, time }: mkDerivation { @@ -139748,8 +140064,8 @@ self: { }: mkDerivation { pname = "pontarius-xmpp"; - version = "0.5.3"; - sha256 = "70b34c6cc581183752e04c967bd6b383b0d4a813badd412ece35bcc5bff991fd"; + version = "0.5.4"; + sha256 = "cea2e6207811d718e8a9c3ef7abb71ec4aba6ee77e9f749d9902b62a4b48b13a"; libraryHaskellDepends = [ attoparsec base base64-bytestring binary bytestring conduit containers crypto-api crypto-random cryptohash cryptohash-cryptoapi @@ -144328,8 +144644,8 @@ self: { }: mkDerivation { pname = "qr-imager"; - version = "0.2.1.1"; - sha256 = "e7abcdff646835141b8ea2c53ef414467ddc07afef20d2cce48aadc0096001f4"; + version = "0.2.1.2"; + sha256 = "0830675a25f49cdb3322304feb90e0779536fdbcea805e5ddca2328ae5a07c39"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144821,8 +145137,8 @@ self: { pname = "quickcheck-instances"; version = "0.3.12"; sha256 = "ddd5b988da50eff7f56737bff516fba52309f7461297698f04f1e8aaee9f9bf3"; - revision = "1"; - editedCabalFile = "ef9ca080de8bb79d892628abe3ccbd92a61f77fffa633942ee3e4da0d8819657"; + revision = "2"; + editedCabalFile = "4321c16dfe0d3c08bba1425d1058261b4b8b553ea5c5c01bd982c9d9e23b39ec"; libraryHaskellDepends = [ array base bytestring containers hashable old-time QuickCheck scientific text time unordered-containers vector @@ -145185,6 +145501,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "quipper-core" = callPackage + ({ mkDerivation, base, containers, mtl, primes, random + , template-haskell + }: + mkDerivation { + pname = "quipper-core"; + version = "0.8.0.1"; + sha256 = "17d0361ed260f16cce989175164d3b81ba0af1c5970bf91a4aebcca21ef0e163"; + libraryHaskellDepends = [ + base containers mtl primes random template-haskell + ]; + homepage = "http://www.mathstat.dal.ca/~selinger/quipper/"; + description = "An embedded, scalable functional programming language for quantum computing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "quipper-rendering" = callPackage + ({ mkDerivation, base, containers, directory, easyrender, mtl + , primes, process, quipper-core, random, template-haskell, unix + }: + mkDerivation { + pname = "quipper-rendering"; + version = "0.8"; + sha256 = "c73ecbaad5d95e78f4b86fb39d764512ac2d025876bed86564fe3bb3a890107c"; + libraryHaskellDepends = [ + base containers directory easyrender mtl primes process + quipper-core random template-haskell unix + ]; + homepage = "http://www.mathstat.dal.ca/~selinger/quipper/"; + description = "An embedded, scalable functional programming language for quantum computing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "quiver" = callPackage ({ mkDerivation, base, mmorph, transformers }: mkDerivation { @@ -145533,16 +145882,17 @@ self: { "raft" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, bytestring - , containers, data-default, ghc-prim, mtl, parallel, scientific - , split, text, time, tostring, zlib + , cereal, containers, data-default, ghc-prim, mtl, parallel + , scientific, split, stm, text, time, tostring, zlib }: mkDerivation { pname = "raft"; - version = "0.3.7.2"; - sha256 = "40c46755aa43abd764d59610b7b8a7af75b5e5efe7c509c34ede6a157ee2a0e9"; + version = "0.3.11.0"; + sha256 = "e8aff884bcc2cdc6d8200f834a9d9f8b2d38646895af4e03589c6ae6e07e8465"; libraryHaskellDepends = [ - aeson attoparsec base binary bytestring containers data-default - ghc-prim mtl parallel scientific split text time tostring zlib + aeson attoparsec base binary bytestring cereal containers + data-default ghc-prim mtl parallel scientific split stm text time + tostring zlib ]; homepage = "https://bitbucket.org/functionally/raft"; description = "Miscellaneous Haskell utilities for data structures and data manipulation"; @@ -146497,8 +146847,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "2.1.3"; - sha256 = "a349c7c6f45ab64c0ff85b877f99a7ec4d5a8946c0d2224b033b6014b518bea1"; + version = "2.1.4"; + sha256 = "e5513105bba4917caa18a41499b38a0d98114761207170674a9c559fb85ff0dc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147935,8 +148285,8 @@ self: { }: mkDerivation { pname = "references"; - version = "0.3.2.0"; - sha256 = "67a5434a1b6b6021e4ac3c9c8c42521cf5bf922d07d26e925821e3fd4e5121fd"; + version = "0.3.2.1"; + sha256 = "184020e17d1f3e86bb9e350f9c4076a838f580c23d943801245ded92edd27624"; libraryHaskellDepends = [ array base containers directory either filepath instance-control mtl template-haskell text transformers uniplate @@ -147944,6 +148294,7 @@ self: { testHaskellDepends = [ array base containers directory either filepath HUnit instance-control lens mtl template-haskell text transformers + uniplate ]; homepage = "https://github.com/lazac/references"; description = "Selectors for reading and updating data"; @@ -148326,6 +148677,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "refty" = callPackage + ({ mkDerivation, aeson, base, containers, text }: + mkDerivation { + pname = "refty"; + version = "0.1.0.1"; + sha256 = "621883d618e539b9938327e2faf09d36628a81db9ab051c7a4c07b644b7f5d28"; + libraryHaskellDepends = [ aeson base containers text ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/oreshinya/refty"; + description = "Formatted JSON generator for API server inspired by normalizr"; + license = stdenv.lib.licenses.mit; + }) {}; + "regex-applicative" = callPackage ({ mkDerivation, base, containers, smallcheck, tasty, tasty-hunit , tasty-smallcheck, transformers @@ -149969,22 +150333,20 @@ self: { }) {}; "req" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring - , case-insensitive, connection, data-default-class, hspec - , hspec-core, http-api-data, http-client, http-client-tls + ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder + , bytestring, case-insensitive, connection, data-default-class + , hspec, hspec-core, http-api-data, http-client, http-client-tls , http-types, mtl, QuickCheck, text, time, transformers , unordered-containers }: mkDerivation { pname = "req"; - version = "0.1.0"; - sha256 = "c93bae94d0b640f0d459a3da79c6021f7d8403099e9f08c35a2cddf64eea2269"; - revision = "2"; - editedCabalFile = "c4d0fc2e312c85a8dc3e7aefb49341ad57662ac1dac6625304f9aa3cf2016160"; + version = "0.2.0"; + sha256 = "e64e56622f1ec06df83e2c8516effa49058b4d7196c28127ab98190cc320ebbc"; libraryHaskellDepends = [ - aeson base blaze-builder bytestring case-insensitive connection - data-default-class http-api-data http-client http-client-tls - http-types mtl text time transformers + aeson authenticate-oauth base blaze-builder bytestring + case-insensitive connection data-default-class http-api-data + http-client http-client-tls http-types mtl text time transformers ]; testHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive @@ -150005,6 +150367,8 @@ self: { pname = "req-conduit"; version = "0.1.0"; sha256 = "689a8592555b39859ab0d2e50b111217112d51077553dc7103d84afc865ca447"; + revision = "1"; + editedCabalFile = "2f7008556081fcfb641b008c499f0c12958f7ccdfbc62b8aa2c1459c7efb3e81"; libraryHaskellDepends = [ base bytestring conduit http-client req resourcet transformers ]; @@ -150383,8 +150747,8 @@ self: { pname = "rest-core"; version = "0.39"; sha256 = "d760d0547fc1a99cd949dde08b7945fb93af24f4e55d45ecf410c352d5005404"; - revision = "3"; - editedCabalFile = "3b6cf8a675a2bf1f3e22fcf1a39e1658ce112e21b918ad28ace73cdf5dc70aa2"; + revision = "4"; + editedCabalFile = "261e22e228e0d1f042f24a0a9e784a7ed3ea44342006cb79cb7e4021f0e46b9a"; libraryHaskellDepends = [ aeson aeson-utils base base-compat bytestring case-insensitive errors fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat @@ -150464,8 +150828,8 @@ self: { pname = "rest-gen"; version = "0.20.0.0"; sha256 = "81a9486136f91773371858f9d3e248b80458e7d55aab11f17cc158c3ce68d542"; - revision = "3"; - editedCabalFile = "b1de24d30b40005298357ecadb54055f9842d8c1e3673feeb453a067a9f9a812"; + revision = "4"; + editedCabalFile = "df0abba48ce1b506060711b616a027680314c92960bdefca0f548eecc058e062"; libraryHaskellDepends = [ aeson base base-compat blaze-html Cabal code-builder directory fclabels filepath hashable haskell-src-exts HStringTemplate hxt @@ -150525,8 +150889,8 @@ self: { pname = "rest-stringmap"; version = "0.2.0.6"; sha256 = "66e5a32f04cfcf9826296b3c053c22caa745fd890ccc6ea9199c34529507524a"; - revision = "4"; - editedCabalFile = "5ba1b7bef91969bc4d1319ab72e78b4063e1bbc9620787e7306b95b1390f9897"; + revision = "5"; + editedCabalFile = "40fd386dc256a7a2b53e188b69b202f6623a5baa93c04ac2fe5c5389adb250f1"; libraryHaskellDepends = [ aeson base containers hashable hxt json-schema tostring unordered-containers @@ -150544,8 +150908,8 @@ self: { pname = "rest-types"; version = "1.14.1.1"; sha256 = "b7e08e65bbae20bd891f0905c9c785184182172094673ab13e66499e4fe3969a"; - revision = "1"; - editedCabalFile = "8e9eca95758568488ae115f3a807ef05d309e193ecac3e740569eb43de37fc22"; + revision = "2"; + editedCabalFile = "6f8ff48a58cd55fc871ee536eccd895b0f29a18fd52429791bff578ff8497a20"; libraryHaskellDepends = [ aeson base base-compat case-insensitive generic-aeson generic-xmlpickler hxt json-schema rest-stringmap text uuid @@ -155973,8 +156337,8 @@ self: { }: mkDerivation { pname = "serokell-util"; - version = "0.1.3.0"; - sha256 = "ddf321ba0126fde5757f186c5080f3a7ffb7539582040aab263165f83cafcc78"; + version = "0.1.3.1"; + sha256 = "5765de74022ed024a407a3869892294d50e3027f7cf79ef9b63fca0b61c8b306"; libraryHaskellDepends = [ acid-state aeson aeson-extra base base16-bytestring base64-bytestring binary binary-orphans bytestring cereal @@ -158217,8 +158581,8 @@ self: { ({ mkDerivation, base, basic-prelude, directory, shake }: mkDerivation { pname = "shakers"; - version = "0.0.7"; - sha256 = "f7859e7adbccb740c176fc186ca332f576be65265b87641d5ac30d2d34adfbdb"; + version = "0.0.8"; + sha256 = "13495dad7f64f7f6fd79d86c138ceb517659e28fd138169d1df957892036ab51"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base basic-prelude directory shake ]; @@ -158620,8 +158984,8 @@ self: { }: mkDerivation { pname = "shellmate"; - version = "0.3.4"; - sha256 = "b2db36ff28c21d78bdac8142e35b4ab002d70193f55f7e603c8c3d0eb49c0ce8"; + version = "0.3.4.1"; + sha256 = "a66fb8d53eac5736dd7d69c7835af60ca2afff389c65e0972ab199b0983a6430"; libraryHaskellDepends = [ base bytestring directory filepath process temporary transformers unix @@ -159038,8 +159402,8 @@ self: { }: mkDerivation { pname = "sibe"; - version = "0.2.0.3"; - sha256 = "324abe72b361aaef1286bbe8e76dda18e431010db60aa1ea018f95e045fe91ea"; + version = "0.2.0.4"; + sha256 = "104038b009602b8cd3a9a9211d2c67cf585c7c5e3d69a2a16df0348fa5958ddc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161219,8 +161583,33 @@ self: { ]; description = "A type-safe interface to communicate with an SMT solver"; license = stdenv.lib.licenses.gpl3; - broken = true; - }) {smtlib2-quickcheck = null;}; + }) {}; + + "smtlib2-quickcheck" = callPackage + ({ mkDerivation, base, containers, dependent-map, dependent-sum + , mtl, QuickCheck, smtlib2 + }: + mkDerivation { + pname = "smtlib2-quickcheck"; + version = "1.0"; + sha256 = "267f701b359e81d0a053e7c04a294d98ecc8d795dfe540c812b0832df278ac4c"; + libraryHaskellDepends = [ + base containers dependent-map dependent-sum mtl QuickCheck smtlib2 + ]; + description = "Helper functions to create SMTLib expressions in QuickCheck"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "smtlib2-timing" = callPackage + ({ mkDerivation, base, dependent-sum, mtl, smtlib2, time }: + mkDerivation { + pname = "smtlib2-timing"; + version = "1.0"; + sha256 = "253ace562bd79b48a51d7b5272d70b27abf0e7ae1a3468b9e477901bdd430289"; + libraryHaskellDepends = [ base dependent-sum mtl smtlib2 time ]; + description = "Get timing informations for SMT queries"; + license = stdenv.lib.licenses.gpl3; + }) {}; "smtp-mail" = callPackage ({ mkDerivation, array, base, base16-bytestring, base64-bytestring @@ -164982,8 +165371,8 @@ self: { pname = "stache"; version = "0.1.8"; sha256 = "a8617924e087b02c3afb3308a8a1102828e352dba7545648703e5d0c2c3c35b2"; - revision = "1"; - editedCabalFile = "642777f5664ae40b2e5308ca771a505226b0015414203658432e002c846e5ad7"; + revision = "2"; + editedCabalFile = "293e587834fd528a8f1869027b1de5f3ea492597350688a86db36c18453757d9"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory exceptions filepath megaparsec mtl template-haskell text unordered-containers @@ -165008,8 +165397,8 @@ self: { pname = "stache"; version = "0.2.0"; sha256 = "0952d6849a297d3ef020feaeb128be4af7d25ab97fa948eb0339a7f75d0a1831"; - revision = "1"; - editedCabalFile = "5b22600a5b101c5c86d688d05773c7506e9cc373637ef7a2a1abe43a28db0703"; + revision = "2"; + editedCabalFile = "4899a9a2a56b3e2524b0166f8875f7f823419c64ec1f2a74f2ff7b6010472d01"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory exceptions filepath megaparsec mtl template-haskell text unordered-containers @@ -173562,6 +173951,40 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "text-show-instances_3_5" = callPackage + ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring + , containers, directory, generic-deriving, ghc-boot-th, ghc-prim + , haskeline, hoopl, hpc, hspec, old-locale, old-time, pretty + , QuickCheck, quickcheck-instances, random, semigroups, tagged + , template-haskell, terminfo, text, text-show, th-orphans, time + , transformers, transformers-compat, unix, unordered-containers + , vector, xhtml + }: + mkDerivation { + pname = "text-show-instances"; + version = "3.5"; + sha256 = "0c7dbf6e6742460be0d08777ab3759434c12c5b65f273be35afbe0c945690342"; + libraryHaskellDepends = [ + base base-compat bifunctors binary bytestring containers directory + ghc-boot-th haskeline hoopl hpc old-locale old-time pretty random + semigroups tagged template-haskell terminfo text text-show time + transformers transformers-compat unix unordered-containers vector + xhtml + ]; + testHaskellDepends = [ + base base-compat bifunctors binary bytestring containers directory + generic-deriving ghc-boot-th ghc-prim haskeline hoopl hpc hspec + old-locale old-time pretty QuickCheck quickcheck-instances random + semigroups tagged template-haskell terminfo text text-show + th-orphans time transformers transformers-compat unix + unordered-containers vector xhtml + ]; + homepage = "https://github.com/RyanGlScott/text-show-instances"; + description = "Additional instances for text-show"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-stream-decode" = callPackage ({ mkDerivation, base, bytestring, deepseq, hspec, text }: mkDerivation { @@ -175241,13 +175664,13 @@ self: { }) {}; "time-patterns" = callPackage - ({ mkDerivation, base, intervals, lens, thyme, vector-space }: + ({ mkDerivation, base, intervals, time }: mkDerivation { pname = "time-patterns"; - version = "0.1.3.2"; - sha256 = "3c2beb5b4f69213699cdc9e2f88872d1d406eb04c93ad3678e09b6746aa40a61"; - libraryHaskellDepends = [ base intervals lens thyme vector-space ]; - homepage = "https://bitbucket.org/jfmueller/time-patterns"; + version = "0.1.4.1"; + sha256 = "5114525b97e376303540feea7b7d780d6c13d558d130a8d95d8577db5e004f41"; + libraryHaskellDepends = [ base intervals time ]; + homepage = "https://github.com/j-mueller/time-patterns"; description = "Patterns for recurring events"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -176191,6 +176614,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "toboggan" = callPackage + ({ mkDerivation, base, clit, directory, madlang, optparse-generic + , text + }: + mkDerivation { + pname = "toboggan"; + version = "0.1.0.0"; + sha256 = "72281351961f1d55149379c273b72e4e4d7a5134c432351044a17317152f3a67"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base clit directory madlang optparse-generic text + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/vmchale/toboggan#readme"; + description = "Twitter bot generator"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "todos" = callPackage ({ mkDerivation, ansi-terminal, base, base-unicode-symbols , containers, data-hash, dates, directory, dyre, filepath, Glob @@ -177724,7 +178166,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tttool_1_6_1_4" = callPackage + "tttool_1_7_0_1" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , directory, executable-path, filepath, hashable, haskeline, HPDF , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec @@ -177733,8 +178175,8 @@ self: { }: mkDerivation { pname = "tttool"; - version = "1.6.1.4"; - sha256 = "66f14d6abe28e2d2a1a61cbef0fe8ace0c376b2e2a8b918b17d422634faee8ee"; + version = "1.7.0.1"; + sha256 = "b41fc9b2899a625a0a364dd8fc4ef8f7c070ec7cbcbf5ef2acfc256cfb434fe6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -183020,6 +183462,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector_0_12_0_0" = callPackage + ({ mkDerivation, base, deepseq, ghc-prim, HUnit, primitive + , QuickCheck, random, template-haskell, test-framework + , test-framework-hunit, test-framework-quickcheck2, transformers + }: + mkDerivation { + pname = "vector"; + version = "0.12.0.0"; + sha256 = "27bf375d0efbff61acaeb75a2047afcbdac930191069a59da4a474b9bf80ec95"; + libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; + testHaskellDepends = [ + base HUnit QuickCheck random template-haskell test-framework + test-framework-hunit test-framework-quickcheck2 transformers + ]; + homepage = "https://github.com/haskell/vector"; + description = "Efficient Arrays"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-algorithms" = callPackage ({ mkDerivation, base, bytestring, containers, primitive , QuickCheck, vector @@ -183062,6 +183524,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-binary-instances_0_2_3_4" = callPackage + ({ mkDerivation, base, binary, tasty, tasty-quickcheck, vector }: + mkDerivation { + pname = "vector-binary-instances"; + version = "0.2.3.4"; + sha256 = "f3cef04ff645bbf25198c2c0c33d0c13e44bfe63602e1e694c2be9abf0e57d00"; + libraryHaskellDepends = [ base binary vector ]; + testHaskellDepends = [ base binary tasty tasty-quickcheck vector ]; + homepage = "https://github.com/bos/vector-binary-instances"; + description = "Instances of Data.Binary and Data.Serialize for vector"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-buffer" = callPackage ({ mkDerivation, base, deepseq, vector }: mkDerivation { @@ -183218,6 +183694,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-instances_3_4" = callPackage + ({ mkDerivation, base, comonad, hashable, keys, pointed + , semigroupoids, semigroups, vector + }: + mkDerivation { + pname = "vector-instances"; + version = "3.4"; + sha256 = "1b0246ef0cf8372d61d5c7840d857f49299af2304b5107510377255ed4dd5381"; + libraryHaskellDepends = [ + base comonad hashable keys pointed semigroupoids semigroups vector + ]; + homepage = "http://github.com/ekmett/vector-instances"; + description = "Orphan Instances for 'Data.Vector'"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-instances-collections" = callPackage ({ mkDerivation, base, collections-api, template-haskell, vector }: mkDerivation { @@ -186245,6 +186738,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "web-push" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring + , cryptonite, exceptions, http-client, http-types, jose, memory + , random, text, time, transformers, unordered-containers + }: + mkDerivation { + pname = "web-push"; + version = "0.1.0.0"; + sha256 = "5772499993225207a60755f08e9e8774c17e6b06c7f933ba83789549d8beb871"; + libraryHaskellDepends = [ + aeson base base64-bytestring binary bytestring cryptonite + exceptions http-client http-types jose memory random text time + transformers unordered-containers + ]; + homepage = "https://github.com/sarthakbagaria/web-push#readme"; + description = "Helper functions to send messages using Web Push protocol"; + license = stdenv.lib.licenses.mit; + }) {}; + "web-routes" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, exceptions , ghc-prim, hspec, http-types, HUnit, mtl, parsec, QuickCheck From dd0d71727a0b2a818b0b2b30d528b6b23024ba16 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 7 Jan 2017 12:52:27 +0100 Subject: [PATCH 29/84] git-annex: fix build --- pkgs/development/haskell-modules/configuration-common.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ff53f1ce2ca..8f207a000df 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -58,6 +58,8 @@ self: super: { rev = drv.version; }; })).overrideScope (self: super: { + # https://github.com/bitemyapp/esqueleto/issues/8 + esqueleto = self.esqueleto_2_4_3; # https://github.com/yesodweb/yesod/issues/1324 yesod-persistent = self.yesod-persistent_1_4_1_1; # https://github.com/prowdsponsor/esqueleto/issues/137 From 6d58ab2edf8843e03f10af03a16e8137afe49df5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 7 Jan 2017 12:09:24 +0100 Subject: [PATCH 30/84] jailbreak-cabal: ghc-HEAD needs version 1.3.2 due to API changes in Cabal https://github.com/peti/jailbreak-cabal/issues/12 --- pkgs/development/haskell-modules/configuration-ghc-head.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index f093c0e427e..c6fcf0bff07 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -35,7 +35,7 @@ self: super: { xhtml = null; # jailbreak-cabal can use the native Cabal library. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; }; + jailbreak-cabal = super.jailbreak-cabal_1_3_2.override { Cabal = null; }; # haddock: No input file(s). nats = dontHaddock super.nats; From 936bc23b414e562da9fd8ce5e3e360929d25262c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 8 Jan 2017 22:16:00 +0100 Subject: [PATCH 31/84] ed: avoid the useless rebuild due to #21752 --- pkgs/applications/editors/ed/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index 680b7f8a030..9cb644cc931 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation rec { name = "ed-1.13"; - file_md5 = "fb8ffc8d8072e13dd5799131e889bfa5"; # for fedora mirror src = fetchurl { # gnu only provides *.lz tarball, which is unfriendly for stdenv bootstrapping @@ -10,10 +9,12 @@ stdenv.mkDerivation rec { # When updating, please make sure the sources pulled match those upstream by # Unpacking both tarballs and running `find . -type f -exec sha256sum \{\} \; | sha256sum` # in the resulting directory - urls = [ - "http://pkgs.fedoraproject.org/repo/extras/ed/${name}.tar.bz2/${file_md5}/${name}.tar.bz2" - "http://fossies.org/linux/privat/${name}.tar.bz2" - ]; + urls = let file_md5 = "fb8ffc8d8072e13dd5799131e889bfa5"; # for fedora mirror + in [ + ("http://pkgs.fedoraproject.org/repo/extras/ed" + + "/${name}.tar.bz2/${file_md5}/${name}.tar.bz2") + "http://fossies.org/linux/privat/${name}.tar.bz2" + ]; sha256 = "1iym2fsamxr886l3sz8lqzgf00bip5cr0aly8jp04f89kf5mvl0j"; }; From 157b2168527d3fd43578c615de1f3171b9b7ec08 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 8 Jan 2017 15:44:26 -0600 Subject: [PATCH 32/84] elfutils: 0.165 -> 0.168 --- .../tools/misc/elfutils/default.nix | 6 +- .../tools/misc/elfutils/glibc-2.21.patch | 164 ------------------ 2 files changed, 2 insertions(+), 168 deletions(-) delete mode 100644 pkgs/development/tools/misc/elfutils/glibc-2.21.patch diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 6386d3176a9..c1180c0393a 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -3,15 +3,13 @@ # TODO: Look at the hardcoded paths to kernel, modules etc. stdenv.mkDerivation rec { name = "elfutils-${version}"; - version = "0.165"; + version = "0.168"; src = fetchurl { url = "http://fedorahosted.org/releases/e/l/elfutils/${version}/${name}.tar.bz2"; - sha256 = "0wp91hlh9n0ismikljf63558rzdwim8w1s271grsbaic35vr5z57"; + sha256 = "0xn2fbgda1i703csfs35frvm7l068ybmay4ssrykqdx17f4hg3dq"; }; - patches = [ ./glibc-2.21.patch ]; - hardeningDisable = [ "format" ]; # We need bzip2 in NativeInputs because otherwise we can't unpack the src, diff --git a/pkgs/development/tools/misc/elfutils/glibc-2.21.patch b/pkgs/development/tools/misc/elfutils/glibc-2.21.patch deleted file mode 100644 index f67632741e5..00000000000 --- a/pkgs/development/tools/misc/elfutils/glibc-2.21.patch +++ /dev/null @@ -1,164 +0,0 @@ -From b9d70fb9fb0bd0bf84eb2302cba1691aea74c42e Mon Sep 17 00:00:00 2001 -From: Mark Wielaard -Date: Wed, 13 Jan 2016 17:16:48 +0100 -Subject: [PATCH] libelf: Add ELF compression types and defines to libelf.h for - older glibc. - -Older glibc elf.h might not define the new ELF compression defines and -types. If not just define them in libelf.h directly to make the libelf -headers work on older glibc systems. - -Also include a testcase to check the libelf headers build against the -system elf.h. - -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=810885 - -Signed-off-by: Mark Wielaard ---- - libelf/ChangeLog | 5 +++++ - libelf/libelf.h | 28 ++++++++++++++++++++++++++++ - tests/ChangeLog | 8 ++++++++ - tests/Makefile.am | 9 +++++++-- - tests/system-elf-libelf-test.c | 35 +++++++++++++++++++++++++++++++++++ - 5 files changed, 83 insertions(+), 2 deletions(-) - create mode 100644 tests/system-elf-libelf-test.c - -diff --git a/libelf/ChangeLog b/libelf/ChangeLog -index 3a1fe91..aabf6f6 100644 ---- a/libelf/ChangeLog -+++ b/libelf/ChangeLog -@@ -1,3 +1,8 @@ -+2016-01-13 Mark Wielaard -+ -+ * libelf.h: Check SHF_COMPRESSED is defined. If not define it and the -+ associated ELF compression types/defines. -+ - 2015-11-26 Mark Wielaard - - * elf_compress.c (__libelf_decompress_elf): New function, extracted -diff --git a/libelf/libelf.h b/libelf/libelf.h -index 364e776..c0d6389 100644 ---- a/libelf/libelf.h -+++ b/libelf/libelf.h -@@ -35,6 +35,34 @@ - /* Get the ELF types. */ - #include - -+#ifndef SHF_COMPRESSED -+ /* Older glibc elf.h might not yet define the ELF compression types. */ -+ #define SHF_COMPRESSED (1 << 11) /* Section with compressed data. */ -+ -+ /* Section compression header. Used when SHF_COMPRESSED is set. */ -+ -+ typedef struct -+ { -+ Elf32_Word ch_type; /* Compression format. */ -+ Elf32_Word ch_size; /* Uncompressed data size. */ -+ Elf32_Word ch_addralign; /* Uncompressed data alignment. */ -+ } Elf32_Chdr; -+ -+ typedef struct -+ { -+ Elf64_Word ch_type; /* Compression format. */ -+ Elf64_Word ch_reserved; -+ Elf64_Xword ch_size; /* Uncompressed data size. */ -+ Elf64_Xword ch_addralign; /* Uncompressed data alignment. */ -+ } Elf64_Chdr; -+ -+ /* Legal values for ch_type (compression algorithm). */ -+ #define ELFCOMPRESS_ZLIB 1 /* ZLIB/DEFLATE algorithm. */ -+ #define ELFCOMPRESS_LOOS 0x60000000 /* Start of OS-specific. */ -+ #define ELFCOMPRESS_HIOS 0x6fffffff /* End of OS-specific. */ -+ #define ELFCOMPRESS_LOPROC 0x70000000 /* Start of processor-specific. */ -+ #define ELFCOMPRESS_HIPROC 0x7fffffff /* End of processor-specific. */ -+#endif - - /* Known translation types. */ - typedef enum -diff --git a/tests/ChangeLog b/tests/ChangeLog -index 366aea9..234ae56 100644 ---- a/tests/ChangeLog -+++ b/tests/ChangeLog -@@ -1,3 +1,11 @@ -+2016-01-13 Mark Wielaard -+ -+ * system-elf-libelf-test.c: New test. -+ * Makefile.am (TESTS): Add system-elf-libelf-test, if !STANDALONE. -+ (check_PROGRAMS): Likewise. -+ (system_elf_libelf_test_CPPFLAGS): New variable. -+ (system_elf_libelf_test_LDADD): Likewise. -+ - 2016-01-08 Mark Wielaard - - * elfputzdata.c (main): Fix parentheses in strncmp test. -diff --git a/tests/Makefile.am b/tests/Makefile.am -index d09a6d7..7b9e108 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -136,8 +136,8 @@ export ELFUTILS_DISABLE_DEMANGLE = 1 - endif - - if !STANDALONE --check_PROGRAMS += msg_tst md5-sha1-test --TESTS += msg_tst md5-sha1-test -+check_PROGRAMS += msg_tst md5-sha1-test system-elf-libelf-test -+TESTS += msg_tst md5-sha1-test system-elf-libelf-test - endif - - if LZMA -@@ -473,6 +473,11 @@ elfgetzdata_LDADD = $(libelf) - elfputzdata_LDADD = $(libelf) - zstrptr_LDADD = $(libelf) - -+# We want to test the libelf header against the system elf.h header. -+# Don't include any -I CPPFLAGS. -+system_elf_libelf_test_CPPFLAGS = -+system_elf_libelf_test_LDADD = $(libelf) -+ - if GCOV - check: check-am coverage - .PHONY: coverage -diff --git a/tests/system-elf-libelf-test.c b/tests/system-elf-libelf-test.c -new file mode 100644 -index 0000000..7dfe498 ---- /dev/null -+++ b/tests/system-elf-libelf-test.c -@@ -0,0 +1,35 @@ -+/* Explicit test compiling with system elf.h header plus libelf header. -+ -+ Copyright (C) 2016 Red Hat, Inc. -+ This file is part of elfutils. -+ -+ This file is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 3 of the License, or -+ (at your option) any later version. -+ -+ elfutils is distributed in the hope that it will be useful, but -+ WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program. If not, see . */ -+ -+#include -+#include -+#include "../libelf/libelf.h" -+ -+int -+main (void) -+{ -+ /* Trivial test, this is really a compile test anyway. */ -+ if (elf_version (EV_CURRENT) == EV_NONE) -+ return -1; -+ -+ /* This will obviously fail. It is just to check that Elf32_Chdr and -+ elf32_getchdr are available (both at compile time and runtime). */ -+ Elf32_Chdr *chdr = elf32_getchdr (NULL); -+ -+ return chdr == NULL ? 0 : -1; -+} --- -1.8.3.1 - From 2afcf342815e7437e88ce9f0591a3449a1e8c71d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 8 Jan 2017 16:30:05 -0600 Subject: [PATCH 33/84] elfutils: Update website and URL to new sourceware location. --- pkgs/development/tools/misc/elfutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index c1180c0393a..6e80f0907bc 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.168"; src = fetchurl { - url = "http://fedorahosted.org/releases/e/l/elfutils/${version}/${name}.tar.bz2"; + url = "https://sourceware.org/elfutils/ftp/${version}/${name}.tar.bz2"; sha256 = "0xn2fbgda1i703csfs35frvm7l068ybmay4ssrykqdx17f4hg3dq"; }; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = https://fedorahosted.org/elfutils/; + homepage = https://sourceware.org/elfutils/; description = "A set of utilities to handle ELF objects"; platforms = lib.platforms.linux; license = lib.licenses.gpl3; From 188fcc1eb5b9b49fccfbf6f529424f5db6258efd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 8 Jan 2017 17:52:55 +0100 Subject: [PATCH 34/84] ferm: 2.3 -> 2.3.1 --- pkgs/tools/networking/ferm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/ferm/default.nix b/pkgs/tools/networking/ferm/default.nix index f4cf387ecc5..45460589382 100644 --- a/pkgs/tools/networking/ferm/default.nix +++ b/pkgs/tools/networking/ferm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, perl, ebtables, ipset, iptables }: stdenv.mkDerivation rec { - version = "2.3"; + version = "2.3.1"; name = "ferm-${version}"; src = fetchurl { - url = "http://ferm.foo-projects.org/download/${version}/ferm-${version}.tar.gz"; - sha256 = "0jx63fhjw5y1ahgdbn4hgd7sq6clxl80dr8a2hkryibfbwz3vs4x"; + url = "http://ferm.foo-projects.org/download/2.3/ferm-${version}.tar.gz"; + sha256 = "1scdnd2jk4787jyr6fxav2598g0x7hjic5b8bj77j8s0hki48m4a"; }; buildInputs = [ perl ipset ebtables iptables makeWrapper ]; From adbcb37db58150771e144bd82a99d5a2d047b7e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 8 Jan 2017 18:51:55 +0100 Subject: [PATCH 35/84] android-udev-rules: 20161014 -> 20170106 --- pkgs/os-specific/linux/android-udev-rules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index a779b53d3a5..1ef637fb8c4 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "android-udev-rules-${version}"; - version = "20161014"; + version = "20170106"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "0xc7wslxf7xsvfbd83wsw4nikmpq1zfd607y2p2r3j1vkw1yak08"; + sha256 = "0icdvs7aivzw7xbvi31q10554g447pifjzswqiiyipi664bpcwv7"; }; installPhase = '' From 90ea0c000cfa3fa76274592291c61aeddce49698 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 8 Jan 2017 23:17:37 +0100 Subject: [PATCH 36/84] octave: 4.0.3 -> 4.2.0 --- pkgs/development/interpreters/octave/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 226f819ded9..904ad97648e 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { - version = "4.0.3"; + version = "4.2.0"; name = "octave-${version}"; src = fetchurl { - url = "mirror://gnu/octave/${name}.tar.xz"; - sha256 = "11day29k4yfvxh4101x5yf26ld992x5n6qvmhjjk6mzsd26fqayw"; + url = "mirror://gnu/octave/${name}.tar.gz"; + sha256 = "0rsmg5i3b5yfvkvrl9mqvn3f2n1a6vqg45phpja1qlzkh8vsffs4"; }; buildInputs = [ gfortran readline ncurses perl flex texinfo qhull From 510ac5221a26e3905aec453c00a45f89b4d112e6 Mon Sep 17 00:00:00 2001 From: FaustXVI Date: Sun, 8 Jan 2017 23:54:07 +0100 Subject: [PATCH 37/84] slack: 2.2.1 -> 2.3.4 --- .../networking/instant-messengers/slack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 9f2fee47d8d..240aebe9175 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -4,7 +4,7 @@ let - version = "2.2.1"; + version = "2.3.4"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -43,7 +43,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "1x08bmkanllv3lpi2s722xs7qia8igf6zxzkc3g7vs5jms3mdrad"; + sha256 = "01kr7maj8f4yinyri7rs4pmzab9cvp48xfqw3ilirx4mvh8mr1fd"; } else throw "Slack is not supported on ${stdenv.system}"; From b8a508364ce7ed9d22ccd47be3eb72cba44dab37 Mon Sep 17 00:00:00 2001 From: Alexey Shmalko Date: Mon, 9 Jan 2017 02:39:20 +0200 Subject: [PATCH 38/84] rescuetime: 2.9.10.1255 -> 2.9.11.1285 --- pkgs/applications/misc/rescuetime/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index 974c593d37c..03d058783b2 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -5,18 +5,18 @@ let if stdenv.system == "i686-linux" then fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb"; - sha256 = "1wi9ikwmc9jfilj8adad3rcb7rmmxkpkfcp2gkfxvdyw6n0mzcnf"; + sha256 = "0nkbi05pr5kznj4vjqhsrxcqdmjdf2zsbirslxgm4jbh87skl6fm"; } else fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb"; - sha256 = "074yivz7rz1ac1962dix0aahpyqvsrkizh32kk5hyw5az0vqpcjs"; + sha256 = "161f71kvcrilv9qxldwn8xsqs2g9c2f2g9wb5brbfc0lqbbc8n89"; }; in stdenv.mkDerivation { # https://www.rescuetime.com/updates/linux_release_notes.html - name = "rescuetime-2.9.10.1255"; + name = "rescuetime-2.9.11.1285"; inherit src; buildInputs = [ dpkg makeWrapper ]; unpackPhase = '' From 2190a84812f33fbda2dc01edc6de1fb359a14dde Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 4 Jan 2017 16:37:45 +0800 Subject: [PATCH 39/84] tora: init at 3.1 --- pkgs/development/tools/tora/default.nix | 67 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 69 insertions(+) create mode 100644 pkgs/development/tools/tora/default.nix diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix new file mode 100644 index 00000000000..9f8f2df358a --- /dev/null +++ b/pkgs/development/tools/tora/default.nix @@ -0,0 +1,67 @@ +{ stdenv, lib, fetchFromGitHub, cmake, ecm, makeQtWrapper +, boost, doxygen, openssl, mysql, postgresql, graphviz, loki, qscintilla, qtbase }: + +let + qscintillaLib = (qscintilla.override { withQt5 = true; }); + +in stdenv.mkDerivation rec { + name = "tora-${version}"; + version = "3.1"; + + src = fetchFromGitHub { + owner = "tora-tool"; + repo = "tora"; + rev = "v${version}"; + sha256 = "0wninl10bcgiljf6wnhn2rv8kmzryw78x5qvbw8s2zfjlnxjsbn7"; + }; + + enableParallelBuilding = true; + + buildInputs = [ + cmake ecm makeQtWrapper + boost doxygen graphviz loki mysql openssl postgresql qscintillaLib qtbase + ]; + + preConfigure = '' + sed -i \ + 's|defaultGvHome = "/usr/bin"|defaultGvHome = "${lib.getBin graphviz}/bin"|' \ + src/widgets/toglobalsetting.cpp + + sed -i \ + 's|/usr/bin/dot|${lib.getBin graphviz}/bin/dot|' \ + extlibs/libermodel/dotgraph.cpp + ''; + + cmakeFlags = [ + "-DWANT_INTERNAL_LOKI=0" + "-DWANT_INTERNAL_QSCINTILLA=0" + # cmake/modules/FindQScintilla.cmake looks in qtbase and for the wrong library name + "-DQSCINTILLA_INCLUDE_DIR=${qscintillaLib}/include" + "-DQSCINTILLA_LIBRARY=${qscintillaLib}/lib/libqscintilla2.so" + "-DENABLE_DB2=0" + "-DENABLE_ORACLE=0" + "-DENABLE_TERADATA=0" + "-DQT5_BUILD=1" + "-Wno-dev" + ]; + + # these libraries are only searched for at runtime so we need to force-link them + NIX_LDFLAGS = [ + "-lgvc" + "-lmysqlclient" + "-lecpg" + "-lssl" + ]; + + postFixup = '' + wrapQtProgram $out/bin/tora \ + --prefix PATH : ${lib.getBin graphviz}/bin + ''; + + meta = with stdenv.lib; { + description = "Tora SQL tool"; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.linux; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ffd24741282..87dd399a980 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17932,6 +17932,8 @@ in zoom-us = qt55.callPackage ../applications/networking/instant-messengers/zoom-us {}; + tora = qt5.callPackage ../development/tools/tora {}; + xulrunner = firefox-unwrapped; nitrokey-app = callPackage ../tools/security/nitrokey-app { }; From bbc3082ebd38245bede3505d248a75272e02b7bb Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 8 Jan 2017 21:16:52 -0500 Subject: [PATCH 40/84] mcgrid: pkgconfig is the only way to locate mcgrid --- pkgs/development/libraries/physics/mcgrid/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/physics/mcgrid/default.nix b/pkgs/development/libraries/physics/mcgrid/default.nix index 033bf2f214f..aabe132e73b 100644 --- a/pkgs/development/libraries/physics/mcgrid/default.nix +++ b/pkgs/development/libraries/physics/mcgrid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fastnlo, rivet, sherpa }: +{ stdenv, fetchurl, fastnlo, rivet, pkgconfig, sherpa }: stdenv.mkDerivation rec { name = "mcgrid-${version}"; @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ fastnlo rivet ]; + propagatedNativeBuildInputs = [ pkgconfig ]; preConfigure = '' substituteInPlace mcgrid.pc.in \ From 1603526000c2f5db86e018041677cfa80b4885a1 Mon Sep 17 00:00:00 2001 From: Joris Guyonvarch Date: Mon, 9 Jan 2017 06:07:25 +0100 Subject: [PATCH 41/84] xrectsel: init at 0.3.2 (#21153) --- pkgs/tools/X11/ffcast/default.nix | 20 +++++++++----------- pkgs/tools/X11/xrectsel/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 39 insertions(+), 11 deletions(-) create mode 100644 pkgs/tools/X11/xrectsel/default.nix diff --git a/pkgs/tools/X11/ffcast/default.nix b/pkgs/tools/X11/ffcast/default.nix index 936805ed17c..1e1e3f888c9 100644 --- a/pkgs/tools/X11/ffcast/default.nix +++ b/pkgs/tools/X11/ffcast/default.nix @@ -1,22 +1,20 @@ -{ stdenv, fetchgit, autoconf, automake, perl, libX11 }: +{ stdenv, fetchFromGitHub, autoreconfHook, perl, libX11 }: stdenv.mkDerivation rec { name = "ffcast-${version}"; version = "2.5.0"; - rev = "7c3bf681e7ca9b242e55dbf0c07856ed994d94e9"; - src = fetchgit { - url = https://github.com/lolilolicon/FFcast; - sha256 = "1s1y6rqjq126jvdzc75wz20szisbz8h8fkphlwxcxzl9xll17akj"; + src = fetchFromGitHub { + owner = "lolilolicon"; + repo = "FFcast"; + rev = "${version}"; + sha256 = "047y32bixhc8ksr98vwpgd0k1xxgsv2vs0n3kc2xdac4krc9454h"; }; - buildInputs = [ autoconf automake perl libX11 ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ perl libX11 ]; - preConfigure = '' - ./bootstrap - ''; - - configureFlags = [ "--enable-xrectsel" ]; + configureFlags = [ "--disable-xrectsel" ]; postBuild = '' make DESTDIR="$out" install diff --git a/pkgs/tools/X11/xrectsel/default.nix b/pkgs/tools/X11/xrectsel/default.nix new file mode 100644 index 00000000000..f38ecab9f11 --- /dev/null +++ b/pkgs/tools/X11/xrectsel/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, libX11 }: + +stdenv.mkDerivation rec { + name = "xrectsel-${version}"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "lolilolicon"; + repo = "xrectsel"; + rev = "${version}"; + sha256 = "0prl4ky3xzch6xcb673mcixk998d40ngim5dqc5374b1ls2r6n7l"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ libX11 ]; + + postBuild = '' + make DESTDIR="$out" install + ''; + + meta = with stdenv.lib; { + description = "Print the geometry of a rectangular screen region"; + homepage = https://github.com/lolilolicon/xrectsel; + license = licenses.gpl3; + maintainers = [ maintainers.guyonvarch ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e49e4260f5f..e261d1bcfb5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15707,6 +15707,8 @@ in #TODO: 'pil' is not available for python3, yet xpraGtk3 = callPackage ../tools/X11/xpra/gtk3.nix { inherit (texFunctions) fontsConf; inherit (python3Packages) buildPythonApplication python cython pygobject3 pycairo; }; + xrectsel = callPackage ../tools/X11/xrectsel { }; + xrestop = callPackage ../tools/X11/xrestop { }; xsd = callPackage ../development/libraries/xsd { }; From a4fca568976b29447ad637dfb261ef57499b0764 Mon Sep 17 00:00:00 2001 From: Svein Ove Aas Date: Sun, 25 Dec 2016 23:32:23 +0100 Subject: [PATCH 42/84] ddclient: Write /etc/ddclient.conf when requested Fixes #20101 From PR #21417 --- nixos/modules/services/networking/ddclient.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index 5050ecbd749..d1900deceaf 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -120,7 +120,7 @@ in }; environment.etc."ddclient.conf" = { - enable = config.services.ddclient.configFile == /etc/ddclient.conf; + enable = config.services.ddclient.configFile == "/etc/ddclient.conf"; uid = config.ids.uids.ddclient; mode = "0600"; text = '' From 1753d8c87875de2f5ff0c83a3ead3ecd0c4a51f0 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 9 Jan 2017 06:29:40 +0100 Subject: [PATCH 43/84] irssi: 0.8.21 -> 1.0.0 --- .../networking/irc/irssi/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 0d2dcd3b45a..88e2ede631b 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,20 +1,23 @@ { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }: stdenv.mkDerivation rec { - - version = "0.8.21"; + version = "1.0.0"; name = "irssi-${version}"; src = fetchurl { - urls = [ "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz" ]; - sha256 = "0fxacadhdzl3n0231mqjv2gcmj1fj85azhbbsk0fq7xmf1da7ha2"; + url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz"; + sha256 = "11x47ahkvzzx3xkvqak34235ghnpln65v13k77xx32c85nvb63kr"; }; - buildInputs = [ pkgconfig ncurses glib openssl perl libintlOrEmpty ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses glib openssl perl libintlOrEmpty ]; - NIX_LDFLAGS = ncurses.ldflags; - - configureFlags = "--with-proxy --with-ncurses --enable-ssl --with-perl=yes"; + configureFlags = [ + "--with-proxy" + "--with-bot" + "--with-perl=yes" + "--enable-true-color" + ]; meta = { homepage = http://irssi.org; From a878365b77e2bad4f11731072c3d2b79d1b40b04 Mon Sep 17 00:00:00 2001 From: teh Date: Mon, 9 Jan 2017 05:39:10 +0000 Subject: [PATCH 44/84] nixos docs: update for Nginx + ACME (#21320) Closes #20698. --- nixos/modules/security/acme.xml | 62 +++++++++++---------------------- 1 file changed, 20 insertions(+), 42 deletions(-) diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml index 6fddb27e6a3..823806f4641 100644 --- a/nixos/modules/security/acme.xml +++ b/nixos/modules/security/acme.xml @@ -67,52 +67,30 @@ options for the security.acme module.
Using ACME certificates in Nginx -In practice ACME is mostly used for retrieval and renewal of - certificates that will be used in a webserver like Nginx. A configuration for - Nginx that uses the certificates from ACME for - foo.example.com will look similar to: +NixOS supports fetching ACME certificates for you by setting +enableACME = true; in a virtualHost config. We +first create self-signed placeholder certificates in place of the +real ACME certs. The placeholder certs are overwritten when the ACME +certs arrive. For foo.example.com the config would +look like. -security.acme.certs."foo.example.com" = { - webroot = config.security.acme.directory + "/acme-challenge"; - email = "foo@example.com"; - user = "nginx"; - group = "nginx"; - postRun = "systemctl restart nginx.service"; -}; -services.nginx.httpConfig = '' - server { - server_name foo.example.com; - listen 80; - listen [::]:80; - - location /.well-known/acme-challenge { - root /var/www/challenges; - } - - location / { - return 301 https://$host$request_uri; - } - } - - server { - server_name foo.example.com; - listen 443 ssl; - ssl_certificate ${config.security.acme.directory}/foo.example.com/fullchain.pem; - ssl_certificate_key ${config.security.acme.directory}/foo.example.com/key.pem; - root /var/www/foo.example.com/; - } -''; +services.nginx = { + enable = true; + virtualHosts = { + "foo.example.com" = { + forceSSL = true; + enableACME = true; + locations."/" = { + root = "/var/www"; + }; + }; + }; +} -Now Nginx will try to use the certificates that will be retrieved by ACME. - ACME needs Nginx (or any other webserver) to function and Nginx needs - the certificates to actually start. For this reason the ACME module - automatically generates self-signed certificates that will be used by Nginx to - start. After that Nginx is used by ACME to retrieve the actual ACME - certificates. security.acme.preliminarySelfsigned can be - used to control whether to generate the self-signed certificates. - +At the moment you still have to restart Nginx after the ACME +certs arrive.
From 071481ca7dbfbca2c567e6f0b7d202bfcd42837e Mon Sep 17 00:00:00 2001 From: pngwjpgh Date: Mon, 9 Jan 2017 06:41:06 +0100 Subject: [PATCH 45/84] debianutils: init at 4.8.1 (#21739) --- lib/licenses.nix | 6 ++++++ pkgs/tools/misc/debianutils/default.nix | 28 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 36 insertions(+) create mode 100644 pkgs/tools/misc/debianutils/default.nix diff --git a/lib/licenses.nix b/lib/licenses.nix index b62f4f0a5bb..e5784ce2202 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -449,6 +449,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Sleepycat License"; }; + smail = { + shortName = "smail"; + fullName = "SMAIL General Public License"; + url = http://metadata.ftp-master.debian.org/changelogs/main/d/debianutils/debianutils_4.8.1_copyright; + }; + tcltk = spdx { spdxId = "TCL"; fullName = "TCL/TK License"; diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/tools/misc/debianutils/default.nix new file mode 100644 index 00000000000..e2253982788 --- /dev/null +++ b/pkgs/tools/misc/debianutils/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl }: + +let + checksums = { + "4.8.1" = "09phylg8ih1crgxjadkdb8idbpj9ap62a7cbh8qdx2gyvh5mqf9c"; + }; +in stdenv.mkDerivation rec { + version = "4.8.1"; + name = "debianutils-${version}"; + + src = fetchurl { + url = "mirror://debian/pool/main/d/debianutils/debianutils_${version}.tar.xz"; + sha256 = checksums."${version}"; + }; + + meta = { + description = "Miscellaneous utilities specific to Debian"; + longDescription = '' + This package provides a number of small utilities which are used primarily by the installation scripts of Debian packages, although you may use them directly. + + The specific utilities included are: add-shell installkernel ischroot remove-shell run-parts savelog tempfile which + ''; + downloadPage = https://packages.debian.org/sid/debianutils; + license = with stdenv.lib.licenses; [ gpl2Plus publicDomain smail ]; + maintainers = []; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e261d1bcfb5..8a81bdffac0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1369,6 +1369,8 @@ in dcfldd = callPackage ../tools/system/dcfldd { }; + debianutils = callPackage ../tools/misc/debianutils { }; + debian-devscripts = callPackage ../tools/misc/debian-devscripts { inherit (perlPackages) CryptSSLeay LWP TimeDate DBFile FileDesktopEntry; }; From 5324a5dac75de0e78087a8ca84a44fc1111032c3 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 9 Jan 2017 06:42:15 +0100 Subject: [PATCH 46/84] clipster: 2016-09-12 -> 2016-12-08 (#21761) --- pkgs/tools/misc/clipster/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix index 27df38c566b..711e601234d 100644 --- a/pkgs/tools/misc/clipster/default.nix +++ b/pkgs/tools/misc/clipster/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "clipster-unstable-${version}"; - version = "2016-09-12"; + version = "2016-12-08"; src = fetchFromGitHub { owner = "mrichar1"; repo = "clipster"; - rev = "6526a849a0af4c392f4e8e5b18aacdda9c1a8e80"; - sha256 = "0illdajp5z50h7lvglv0p72cpv4c592xmpamrg8kkjpg693bp873"; + rev = "7a3511d89dbbb4157118eec15f1e9e6fd0ad1a6b"; + sha256 = "005akgk1wn3z5vxfjii202zzwz85zydimfgm69ml68imj5vbhkg1"; }; pythonEnv = python.withPackages(ps: with ps; [ dbus-python pygtk pygobject3 ]); From 2bbbea7e8b88b44ade68134bbc01c3424a2239eb Mon Sep 17 00:00:00 2001 From: edanaher Date: Mon, 9 Jan 2017 00:47:59 -0500 Subject: [PATCH 47/84] pidgin-osd: 0.1.0 -> 0.2.0 (#21655) --- .../pidgin-plugins/pidgin-osd/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix index 9c0f64d6574..ff065e7e2ce 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix @@ -1,22 +1,22 @@ -{ stdenv, fetchurl, pidgin, xosd +{ stdenv, fetchFromGitHub, pidgin, xosd , autoreconfHook } : stdenv.mkDerivation rec { - name = "pidgin-osd-0.1.0"; - src = fetchurl { - url = https://github.com/mbroemme/pidgin-osd/archive/pidgin-osd-0.1.0.tar.gz; - sha256 = "11hqfifhxa9gijbnp9kq85k37hvr36spdd79cj9bkkvw4kyrdp3j"; + name = "pidgin-osd-0.2.0"; + src = fetchFromGitHub { + owner = "edanaher"; + repo = "pidgin-osd"; + rev = name; + sha256 = "07wa9anz99hnv6kffpcph3fbq8mjbyq17ij977ggwgw37zb9fzb5"; }; - makeFlags = "PIDGIN_LIBDIR=$(out)"; - # autoreconf is run such that it *really* wants all the files, and there's no # default ChangeLog. So make it happy. preAutoreconf = "touch ChangeLog"; postInstall = '' mkdir -p $out/lib/pidgin - ln -s $out/pidgin $out/lib/pidgin + mv $out/lib/pidgin-osd.{la,so} $out/lib/pidgin ''; nativeBuildInputs = [ autoreconfHook ]; From 0970931e749cd368a2109be34bb38eef046db648 Mon Sep 17 00:00:00 2001 From: andjscott Date: Mon, 9 Jan 2017 06:26:06 +0000 Subject: [PATCH 48/84] mmex: v1.2.7 -> v1.3.1 (#21755) --- pkgs/applications/office/mmex/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index 9e02377eaa5..2981a0f7f89 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -2,7 +2,7 @@ let - version = "1.2.7"; + version = "1.3.1"; in stdenv.mkDerivation { name = "money-manager-ex-${version}"; @@ -10,14 +10,9 @@ in src = fetchgit { url = "https://github.com/moneymanagerex/moneymanagerex.git"; rev = "refs/tags/v${version}"; - sha256 = "0d6jcsj3m3b9mj68vfwr7dn67dws11p0pdys3spyyiv1464vmywi"; + sha256 = "1cmwmvlzg7r85qq23lbbmq2y91vhf9f5pblpja5ph98bsd218pc0"; }; - preConfigure = '' - export CFLAGS="-I`pwd`/include" - export CXXFLAGS="$CFLAGS" - ''; - buildInputs = [ sqlite wxGTK30 gettext ]; meta = { From f7173a9187ceb907a63b5e9a458c746ec055a3b3 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 9 Jan 2017 02:24:27 -0500 Subject: [PATCH 49/84] fastnlo: fix yoda interface --- pkgs/development/libraries/physics/fastnlo/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/pkgs/development/libraries/physics/fastnlo/default.nix index 70368133706..307bf1b27db 100644 --- a/pkgs/development/libraries/physics/fastnlo/default.nix +++ b/pkgs/development/libraries/physics/fastnlo/default.nix @@ -11,6 +11,12 @@ stdenv.mkDerivation rec { buildInputs = [ boost lhapdf root yoda ]; + CXXFLAGS="-std=c++11"; # for yoda + + configureFlags = [ + "--with-yoda=${yoda}" + ]; + enableParallelBuilding = true; meta = { From 14a35a55c792ae4d773fe18a2c69b2789bf763f3 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Mon, 9 Jan 2017 09:57:39 +0100 Subject: [PATCH 50/84] remmina: fix missing gsettings schemas --- pkgs/applications/networking/remote/remmina/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index fe097af9c75..ec31beb0080 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -4,14 +4,14 @@ , pcre, webkitgtk, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon , libsecret, spice_protocol, spice_gtk, epoxy, at_spi2_core -, openssl +, openssl, gsettings_desktop_schemas # The themes here are soft dependencies; only icons are missing without them. , hicolor_icon_theme, adwaita-icon-theme }: let version = "1.2.0-rcgit.15"; - + desktopItem = makeDesktopItem { name = "remmina"; desktopName = "Remmina"; @@ -48,7 +48,7 @@ stdenv.mkDerivation { sha256 = "07lj6a7x9cqcff18pwfkx8c8iml015zp6sq29dfcxpfg4ai578h0"; }; - buildInputs = [ cmake pkgconfig wrapGAppsHook + buildInputs = [ cmake pkgconfig wrapGAppsHook gsettings_desktop_schemas glib gtk3 gettext libxkbfile libgnome_keyring libX11 freerdp_git libssh libgcrypt gnutls pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a81bdffac0..8a235806622 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3579,7 +3579,10 @@ in remind = callPackage ../tools/misc/remind { }; - remmina = callPackage ../applications/networking/remote/remmina { adwaita-icon-theme = gnome3.adwaita-icon-theme; }; + remmina = callPackage ../applications/networking/remote/remmina { + adwaita-icon-theme = gnome3.adwaita-icon-theme; + gsettings_desktop_schemas = gnome3.gsettings_desktop_schemas; + }; renameutils = callPackage ../tools/misc/renameutils { }; From 67573c942e7b516d8d09ccf4f9eab51ae1c9b495 Mon Sep 17 00:00:00 2001 From: taku0 Date: Mon, 9 Jan 2017 18:02:10 +0900 Subject: [PATCH 51/84] inkscape: 0.91 -> 0.92 --- .../graphics/inkscape/default.nix | 47 +++---------------- .../inkscape/deprecated-scopedptr.patch | 16 ------- 2 files changed, 7 insertions(+), 56 deletions(-) delete mode 100644 pkgs/applications/graphics/inkscape/deprecated-scopedptr.patch diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 06b2fa63c7f..2f72d00bd15 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -2,45 +2,24 @@ , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool , gsl, python2, poppler, imagemagick, libwpg, librevenge -, libvisio, libcdr, libexif, unzip, automake114x, autoconf -, boxMakerPlugin ? false # boxmaker plugin +, libvisio, libcdr, libexif, automake114x, cmake }: let python2Env = python2.withPackages(ps: with ps; [ numpy lxml ]); - -boxmaker = fetchurl { - # http://www.inkscapeforum.com/viewtopic.php?f=11&t=10403 - url = "http://www.keppel.demon.co.uk/111000/files/BoxMaker0.91.zip"; - sha256 = "5c5697f43dc3a95468f61f479cb50b7e2b93379a1729abf19e4040ac9f43a1a8"; -}; - -stdcxx-patch = fetchpatch { - url = http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/diff/14542?context=3; - sha256 = "15h831lsh61ichgdygkdkbdm1dlb9mhprldq27hkx2472lcnyx6y"; -}; - in stdenv.mkDerivation rec { - name = "inkscape-0.91"; + name = "inkscape-0.92.0"; src = fetchurl { - url = "https://inkscape.global.ssl.fastly.net/media/resources/file/" - + "${name}.tar.bz2"; - sha256 = "06ql3x732x2rlnanv0a8aharsnj91j5kplksg574090rks51z42d"; + url = "https://inkscape.org/gallery/item/10552/${name}.tar.bz2"; + sha256 = "0mmssxnxsvb3bpm7ck5pqvwyacrz1nkyacs571jx8j04l1cw3d5q"; }; - patches = [ ./deprecated-scopedptr.patch ]; - postPatch = '' - patch -i ${stdcxx-patch} -p 0 patchShebangs share/extensions - '' - # Clang gets misdetected, so hardcode the right answer - + stdenv.lib.optionalString stdenv.cc.isClang '' - substituteInPlace src/ui/tool/node.h \ - --replace "#if __cplusplus >= 201103L" "#if true" + patchShebangs fix-roff-punct ''; # Python is used at run-time to execute scripts, e.g., those from @@ -51,24 +30,12 @@ stdenv.mkDerivation rec { pkgconfig perl perlXMLParser libXft libpng zlib popt boehmgc libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext makeWrapper intltool gsl poppler imagemagick libwpg librevenge - libvisio libcdr libexif automake114x autoconf - ] ++ stdenv.lib.optional boxMakerPlugin unzip; + libvisio libcdr libexif automake114x cmake + ]; enableParallelBuilding = true; - doCheck = true; postInstall = '' - ${if boxMakerPlugin then " - mkdir -p $out/share/inkscape/extensions/ - # boxmaker packaged version 0.91 in a directory called 0.85 ?!?? - unzip ${boxmaker}; - cp boxmake-upd-0.85/* $out/share/inkscape/extensions/ - rm -Rf boxmake-upd-0.85 - " - else - "" - } - # Make sure PyXML modules can be found at run-time. rm "$out/share/icons/hicolor/icon-theme.cache" ''; diff --git a/pkgs/applications/graphics/inkscape/deprecated-scopedptr.patch b/pkgs/applications/graphics/inkscape/deprecated-scopedptr.patch deleted file mode 100644 index 94ae901394f..00000000000 --- a/pkgs/applications/graphics/inkscape/deprecated-scopedptr.patch +++ /dev/null @@ -1,16 +0,0 @@ -glibmm deprecated ScopedPtr ---- -diff -u src/ui/clipboard.cpp src/ui/clipboard.cpp ---- a/src/ui/clipboard.cpp 2015-01-28 04:32:28.162676000 +0100 -+++ b/src/ui/clipboard.cpp 2016-04-03 09:13:12.360980533 +0200 -@@ -1402,7 +1402,7 @@ - - Glib::ustring target; - if (atom_name) { -- target = Glib::ScopedPtr(atom_name).get(); //This frees the gchar*. -+ target = Glib::make_unique_ptr_gfree(atom_name).get(); //This frees the gchar*. - } - - listTargets.push_back(target); - -Diff finished. Sun Apr 3 09:13:51 2016 From 712e62c2608908cfda471cb8fe409ac65c4844e4 Mon Sep 17 00:00:00 2001 From: Sebastian Hagen Date: Mon, 9 Jan 2017 09:32:23 +0000 Subject: [PATCH 52/84] nixos/stage2: Check for each special mount individually and mount missing ones. (#21370) --- nixos/modules/system/boot/stage-2-init.sh | 28 +++++++++++++---------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index f827e530f87..7a54bb03e29 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -34,20 +34,24 @@ if [ -z "$container" ]; then fi -# Likewise, stage 1 mounts /proc, /dev and /sys, so if we don't have a +# Likewise, stage 1 mounts /proc, /dev, /sys and /run, so if we don't have a # stage 1, we need to do that here. -if [ ! -e /proc/1 ]; then - specialMount() { - local device="$1" - local mountPoint="$2" - local options="$3" - local fsType="$4" +# We check for each mountpoint separately to avoid esoteric failure modes +# if only a subset was mounted by whatever called us. +specialMount() { + local device="$1" + local mountPoint="$2" + local options="$3" + local fsType="$4" - mkdir -m 0755 -p "$mountPoint" - mount -n -t "$fsType" -o "$options" "$device" "$mountPoint" - } - source @earlyMountScript@ -fi + if mountpoint -q "$mountpoint"; then + return 0 + fi + + mkdir -m 0755 -p "$mountPoint" + mount -n -t "$fsType" -o "$options" "$device" "$mountPoint" +} +source @earlyMountScript@ echo "booting system configuration $systemConfig" > /dev/kmsg From 5bc7ceecef4a4ace0f8308d3094c718b2f096355 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 9 Jan 2017 10:18:16 +0000 Subject: [PATCH 53/84] xfce.mousepad: use keyfile instead of gconf (#21747) --- pkgs/desktops/xfce/applications/mousepad.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/xfce/applications/mousepad.nix b/pkgs/desktops/xfce/applications/mousepad.nix index 26f01e253c0..475b48343a5 100644 --- a/pkgs/desktops/xfce/applications/mousepad.nix +++ b/pkgs/desktops/xfce/applications/mousepad.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { dconf ]; + configureFlags = [ "--enable-keyfile-settings" ]; + preFixup = '' wrapProgram "$out/bin/mousepad" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:${gtksourceview}/share" \ From 5b4906ab496dfe05428f7c5067c5397a3a9b4233 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 9 Jan 2017 13:06:04 +0100 Subject: [PATCH 54/84] nim: 0.15.2 -> 0.16.0 --- pkgs/development/compilers/nim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index c3eaf705986..eed702f8512 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nim-${version}"; - version = "0.15.2"; + version = "0.16.0"; src = fetchurl { url = "http://nim-lang.org/download/${name}.tar.xz"; - sha256 = "12pyzjx7x4hclzrf3zf6r1qjlp60bzsaqrz0rax2rak2c8qz4pch"; + sha256 = "0rsibhkc5n548bn9yyb9ycrdgaph5kq84sfxc9gabjs7pqirh6cy"; }; buildInputs = [ makeWrapper ]; From 87e1c492989f1d1a48e74935cd3c2637e67364ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 9 Jan 2017 13:39:37 +0100 Subject: [PATCH 55/84] android-udev-rules: 20170106 -> 20170109 --- pkgs/os-specific/linux/android-udev-rules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index 1ef637fb8c4..926675f0163 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "android-udev-rules-${version}"; - version = "20170106"; + version = "20170109"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "0icdvs7aivzw7xbvi31q10554g447pifjzswqiiyipi664bpcwv7"; + sha256 = "1fxr6iyb70swmmp46xvx8iz9h6xj7x6q9yfdsl958zd63j8sjzjr"; }; installPhase = '' From f1b8c3b1190fdf213b8944e8963d1623b432b9ac Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 9 Jan 2017 20:47:33 +0800 Subject: [PATCH 56/84] pulseaudio nixos module: use the units provided by upstream (#21633) I have left in 2 NixOS custom config directives, so the configuration should be the same with the only change in behaviour being that the service is not eagerly loaded but in fact only socket activated, which it should be. --- nixos/modules/config/pulseaudio.nix | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 06ce5200420..742167fbf69 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -212,6 +212,7 @@ in { # Allow PulseAudio to get realtime priority using rtkit. security.rtkit.enable = true; + systemd.packages = [ cfg.package ]; }) (mkIf hasZeroconf { @@ -227,31 +228,14 @@ in { target = "pulse/default.pa"; source = myConfigFile; }; - systemd.user = { services.pulseaudio = { - description = "PulseAudio Server"; - # NixOS doesn't support "Also" so we bring it in manually - wantedBy = [ "default.target" ]; serviceConfig = { - Type = "notify"; - ExecStart = binaryNoDaemon; - Restart = "on-failure"; RestartSec = "500ms"; }; environment = { DISPLAY = ":${toString config.services.xserver.display}"; }; restartIfChanged = true; }; - - sockets.pulseaudio = { - description = "PulseAudio Socket"; - wantedBy = [ "sockets.target" ]; - socketConfig = { - Priority = 6; - Backlog = 5; - ListenStream = "%t/pulse/native"; - }; - }; }; }) From 39e8eaf8b6f985fcae5931bda39679d657fea1ed Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 26 Jul 2016 14:43:45 +0000 Subject: [PATCH 57/84] prometheus module: add nginxExporter --- nixos/modules/module-list.nix | 1 + .../monitoring/prometheus/nginx-exporter.nix | 58 +++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/nginx-exporter.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2171809e51b..df482fbfcaf 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -308,6 +308,7 @@ ./services/monitoring/munin.nix ./services/monitoring/nagios.nix ./services/monitoring/prometheus/default.nix + ./services/monitoring/prometheus/nginx-exporter.nix ./services/monitoring/prometheus/node-exporter.nix ./services/monitoring/prometheus/alertmanager.nix ./services/monitoring/riemann.nix diff --git a/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix b/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix new file mode 100644 index 00000000000..923b6db7410 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix @@ -0,0 +1,58 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.prometheus.nginxExporter; +in { + options = { + services.prometheus.nginxExporter = { + enable = mkEnableOption "prometheus nginx exporter"; + + port = mkOption { + type = types.int; + default = 9113; + description = '' + Port to listen on. + ''; + }; + + listenAddress = mkOption { + type = types.string; + default = "0.0.0.0"; + description = '' + Address to listen on. + ''; + }; + + scrapeUri = mkOption { + type = types.string; + default = "http://localhost/nginx_status"; + description = '' + Address to access the nginx status page. + Can be enabled with services.nginx.statusPage = true. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = [ cfg.port ]; + + systemd.services.prometheus-nginx-exporter = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "nginx.service" ]; + script = '' + ${pkgs.prometheus-nginx-exporter.bin}/bin/nginx_exporter \ + -telemetry.address ${cfg.listenAddress}:${toString cfg.port} \ + -nginx.scrape_uri ${cfg.scrapeUri} + ''; + serviceConfig = { + User = "nobody"; + Restart = "always"; + PrivateTmp = true; + WorkingDirectory = /tmp; + }; + }; + }; +} From 363fa27448aa78d5dee429eaab44dbd50e024ee3 Mon Sep 17 00:00:00 2001 From: Corbin Date: Sat, 26 Nov 2016 19:56:25 -0800 Subject: [PATCH 58/84] promeutheus.nginxExporter: add improvements - use ExecStart and ExecReload - add extraFlags --- .../monitoring/prometheus/nginx-exporter.nix | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix b/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix index 923b6db7410..8aa0184e53a 100644 --- a/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix +++ b/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix @@ -33,6 +33,14 @@ in { Can be enabled with services.nginx.statusPage = true. ''; }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra commandline options when launching the nginx exporter. + ''; + }; }; }; @@ -40,18 +48,22 @@ in { networking.firewall.allowedTCPPorts = [ cfg.port ]; systemd.services.prometheus-nginx-exporter = { - wantedBy = [ "multi-user.target" ]; after = [ "network.target" "nginx.service" ]; - script = '' - ${pkgs.prometheus-nginx-exporter.bin}/bin/nginx_exporter \ - -telemetry.address ${cfg.listenAddress}:${toString cfg.port} \ - -nginx.scrape_uri ${cfg.scrapeUri} - ''; + description = "Prometheus exporter for nginx metrics"; + unitConfig.Documentation = "https://github.com/discordianfish/nginx_exporter"; + wantedBy = [ "multi-user.target" ]; serviceConfig = { User = "nobody"; Restart = "always"; PrivateTmp = true; WorkingDirectory = /tmp; + ExecStart = '' + ${pkgs.prometheus-nginx-exporter}/bin/nginx_exporter \ + -nginx.scrape_uri '${cfg.scrapeUri}' \ + -telemetry.address ${cfg.listenAddress}:${toString cfg.port} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; }; From 51b247bff8012d123dd78c8fa7f2fc965a733c93 Mon Sep 17 00:00:00 2001 From: Corbin Date: Sun, 27 Nov 2016 00:10:48 -0800 Subject: [PATCH 59/84] prometheus-varnish-exporter: init at 20161127. Yeah, I know, it's a git snapshot. Sorry. --- .../prometheus/varnish-exporter.nix | 26 ++++++++ .../prometheus/varnish-exporter_deps.nix | 66 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 93 insertions(+) create mode 100644 pkgs/servers/monitoring/prometheus/varnish-exporter.nix create mode 100644 pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix new file mode 100644 index 00000000000..456e6904296 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -0,0 +1,26 @@ +# This file was generated by go2nix. +{ stdenv, buildGoPackage, fetchFromGitHub, lib }: + +buildGoPackage rec { + name = "prometheus_varnish_exporter-${version}"; + version = "1.2"; + rev = "0f0e3e2"; + + goPackagePath = "github.com/jonnenauha/prometheus_varnish_exporter"; + + src = fetchFromGitHub { + inherit rev; + owner = "jonnenauha"; + repo = "prometheus_varnish_exporter"; + sha256 = "15vw3jqzm2nad81j14spib5v7q2jpibclzrnkd688003vkizlwyn"; + }; + + goDeps = ./varnish-exporter_deps.nix; + + meta = { + homepage = "https://github.com/jonnenauha/prometheus_varnish_exporter"; + description = "Varnish exporter for Prometheus"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ MostAwesomeDude ]; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix new file mode 100644 index 00000000000..09a09be36e3 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix @@ -0,0 +1,66 @@ +# This file was generated by go2nix. +[ + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; + sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "8ee79997227bf9b34611aee7946ae64735e6fd93"; + sha256 = "0qm1lpdhf97k2hxgivq2cpjgawhlmmz39y230kgxijhm96xijxb8"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "575f371f7862609249a1be4c9145f429fe065e32"; + sha256 = "0hyvszjv5m6i40k2fn21c3bjr8jhlfdqavk1r6g2v5dybyj47vps"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "0d5de9d6d8629cb8bee6d4674da4127cd8b615a3"; + sha256 = "1zlvvgw67p66fz9nswkydq15j4a5z5kkiskl0jxps8i27ya1baq0"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "abf152e5f3e97f2fafac028d2cc06c1feb87ffa5"; + sha256 = "0cp8lznv1b4zhi3wnbjkfxwzhkqd3wbmiy6mwgjanip8l9l3ykws"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b040369896f..616a1f13466 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10530,6 +10530,7 @@ in prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway.nix { }; prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; prometheus-statsd-bridge = callPackage ../servers/monitoring/prometheus/statsd-bridge.nix { }; + prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { }; psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { }; From 1b839a586bef5d9dbb30b85388c2977b86df4fe5 Mon Sep 17 00:00:00 2001 From: Corbin Date: Sun, 27 Nov 2016 00:15:19 -0800 Subject: [PATCH 60/84] prometheus module: add varnishExporter --- nixos/modules/module-list.nix | 4 +- .../prometheus/varnish-exporter.nix | 51 +++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/services/monitoring/prometheus/varnish-exporter.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index df482fbfcaf..db8c5219925 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -308,9 +308,11 @@ ./services/monitoring/munin.nix ./services/monitoring/nagios.nix ./services/monitoring/prometheus/default.nix + ./services/monitoring/prometheus/alertmanager.nix ./services/monitoring/prometheus/nginx-exporter.nix ./services/monitoring/prometheus/node-exporter.nix - ./services/monitoring/prometheus/alertmanager.nix + ./services/monitoring/prometheus/snmp-exporter.nix + ./services/monitoring/prometheus/varnish-exporter.nix ./services/monitoring/riemann.nix ./services/monitoring/riemann-dash.nix ./services/monitoring/riemann-tools.nix diff --git a/nixos/modules/services/monitoring/prometheus/varnish-exporter.nix b/nixos/modules/services/monitoring/prometheus/varnish-exporter.nix new file mode 100644 index 00000000000..0f608760e91 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/varnish-exporter.nix @@ -0,0 +1,51 @@ +{ config, pkgs, lib, ... }: + +# Shamelessly cribbed from nginx-exporter.nix. ~ C. +with lib; + +let + cfg = config.services.prometheus.varnishExporter; +in { + options = { + services.prometheus.varnishExporter = { + enable = mkEnableOption "prometheus Varnish exporter"; + + port = mkOption { + type = types.int; + default = 9131; + description = '' + Port to listen on. + ''; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra commandline options when launching the Varnish exporter. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.prometheus-varnish-exporter = { + description = "Prometheus exporter for Varnish metrics"; + unitConfig.Documentation = "https://github.com/jonnenauha/prometheus_varnish_exporter"; + wantedBy = [ "multi-user.target" ]; + path = [ pkgs.varnish ]; + script = '' + exec ${pkgs.prometheus-varnish-exporter}/bin/prometheus_varnish_exporter \ + -web.listen-address :${toString cfg.port} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + serviceConfig = { + User = "nobody"; + Restart = "always"; + PrivateTmp = true; + WorkingDirectory = /tmp; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + }; + }; + }; +} From 1e5de5fc3c8a9e560c7d63d7752cb4d96f26093b Mon Sep 17 00:00:00 2001 From: Corbin Date: Sun, 27 Nov 2016 11:26:33 -0800 Subject: [PATCH 61/84] prometheus-json-exporter: init at 20160913 --- .../monitoring/prometheus/json-exporter.nix | 25 ++++ .../prometheus/json-exporter_deps.nix | 111 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 137 insertions(+) create mode 100644 pkgs/servers/monitoring/prometheus/json-exporter.nix create mode 100644 pkgs/servers/monitoring/prometheus/json-exporter_deps.nix diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/servers/monitoring/prometheus/json-exporter.nix new file mode 100644 index 00000000000..465a85259f4 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/json-exporter.nix @@ -0,0 +1,25 @@ +# This file was generated by go2nix. +{ stdenv, buildGoPackage, fetchFromGitHub, lib }: + +buildGoPackage rec { + name = "prometheus-json-exporter-${version}"; + version = "unstable-2016-09-13"; + rev = "d45e5ebdb08cb734ad7a8683966032af1d91a76c"; + + goPackagePath = "github.com/kawamuray/prometheus-json-exporter"; + + src = fetchFromGitHub { + inherit rev; + owner = "kawamuray"; + repo = "prometheus-json-exporter"; + sha256 = "0v3as7gakdqpsir97byknsrqxxxkq66hp23j4cscs45hsdb24pi9"; + }; + + goDeps = ./json-exporter_deps.nix; + + meta = { + description = "A prometheus exporter which scrapes remote JSON by JSONPath"; + homepage = "https://github.com/kawamuray/prometheus-json-exporter"; + license = lib.licenses.asl20; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/json-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/json-exporter_deps.nix new file mode 100644 index 00000000000..9416125bc0c --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/json-exporter_deps.nix @@ -0,0 +1,111 @@ +# This file was generated by go2nix. +[ + { + goPackagePath = "github.com/Sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/Sirupsen/logrus"; + rev = "a437dfd2463eaedbec3dfe443e477d3b0a810b3f"; + sha256 = "1904s2bbc7p88anzjp6fyj3jrbm5p6wbb8j4490674dq10kkcfbj"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; + sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "8ee79997227bf9b34611aee7946ae64735e6fd93"; + sha256 = "0qm1lpdhf97k2hxgivq2cpjgawhlmmz39y230kgxijhm96xijxb8"; + }; + } + { + goPackagePath = "github.com/kawamuray/jsonpath"; + fetch = { + type = "git"; + url = "https://github.com/kawamuray/jsonpath"; + rev = "5c448ebf973557834ef870e788b0b2d95ac68d12"; + sha256 = "1i1id1i85rf09rldp03h0ibyi6zg0fz9p9l5qj7i8dfs6h6y8f0a"; + }; + } + { + goPackagePath = "github.com/kawamuray/prometheus-exporter-harness"; + fetch = { + type = "git"; + url = "https://github.com/kawamuray/prometheus-exporter-harness"; + rev = "97eeea7b8b0619ea2a065d75c0f0f5909327afa6"; + sha256 = "12al8irf8jb6p2xmm4wbh0wjqsyrdywynr4w122wxxnsx2n56xyv"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "575f371f7862609249a1be4c9145f429fe065e32"; + sha256 = "0hyvszjv5m6i40k2fn21c3bjr8jhlfdqavk1r6g2v5dybyj47vps"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "0d5de9d6d8629cb8bee6d4674da4127cd8b615a3"; + sha256 = "1zlvvgw67p66fz9nswkydq15j4a5z5kkiskl0jxps8i27ya1baq0"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "abf152e5f3e97f2fafac028d2cc06c1feb87ffa5"; + sha256 = "0cp8lznv1b4zhi3wnbjkfxwzhkqd3wbmiy6mwgjanip8l9l3ykws"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "0bdeddeeb0f650497d603c4ad7b20cfe685682f6"; + sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "a5b47d31c556af34a302ce5d659e6fea44d90de0"; + sha256 = "0v6l48fshdjrqzyq1kwn22gy7vy434xdr1i0lm3prsf6jbln9fam"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 616a1f13466..46ab2193ac4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10523,6 +10523,7 @@ in prometheus-cli = callPackage ../servers/monitoring/prometheus/cli.nix { }; prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { }; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; + prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { }; prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { }; prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { }; prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { }; From bd45d5fe8d2efbd81648122f890b9ee1e454f699 Mon Sep 17 00:00:00 2001 From: Corbin Date: Sun, 25 Dec 2016 21:36:16 -0800 Subject: [PATCH 62/84] prometheus module: add jsonExporter --- nixos/modules/module-list.nix | 1 + .../monitoring/prometheus/json-exporter.nix | 64 +++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/json-exporter.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index db8c5219925..dcba8a2a21d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -309,6 +309,7 @@ ./services/monitoring/nagios.nix ./services/monitoring/prometheus/default.nix ./services/monitoring/prometheus/alertmanager.nix + ./services/monitoring/prometheus/json-exporter.nix ./services/monitoring/prometheus/nginx-exporter.nix ./services/monitoring/prometheus/node-exporter.nix ./services/monitoring/prometheus/snmp-exporter.nix diff --git a/nixos/modules/services/monitoring/prometheus/json-exporter.nix b/nixos/modules/services/monitoring/prometheus/json-exporter.nix new file mode 100644 index 00000000000..ff3a137a0cf --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/json-exporter.nix @@ -0,0 +1,64 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.prometheus.jsonExporter; +in { + options = { + services.prometheus.jsonExporter = { + enable = mkEnableOption "prometheus JSON exporter"; + + url = mkOption { + type = types.str; + description = '' + URL to scrape JSON from. + ''; + }; + + configFile = mkOption { + type = types.path; + description = '' + Path to configuration file. + ''; + }; + + port = mkOption { + type = types.int; + default = 7979; + description = '' + Port to listen on. + ''; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra commandline options when launching the JSON exporter. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.prometheus-json-exporter = { + description = "Prometheus exporter for JSON over HTTP"; + unitConfig.Documentation = "https://github.com/kawamuray/prometheus-json-exporter"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = "nobody"; + Restart = "always"; + PrivateTmp = true; + WorkingDirectory = /tmp; + ExecStart = '' + ${pkgs.prometheus-json-exporter}/bin/prometheus-json-exporter \ + --port ${toString cfg.port} \ + ${cfg.url} ${cfg.configFile} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + }; + }; + }; +} From 618b249fc5b8b86423cc52da5a263bfeb5030e40 Mon Sep 17 00:00:00 2001 From: Corbin Date: Sun, 8 Jan 2017 19:25:17 -0800 Subject: [PATCH 63/84] prometheus module: add blackboxExporter --- nixos/modules/module-list.nix | 1 + .../prometheus/blackbox-exporter.nix | 57 +++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index dcba8a2a21d..576244e7601 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -309,6 +309,7 @@ ./services/monitoring/nagios.nix ./services/monitoring/prometheus/default.nix ./services/monitoring/prometheus/alertmanager.nix + ./services/monitoring/prometheus/blackbox-exporter.nix ./services/monitoring/prometheus/json-exporter.nix ./services/monitoring/prometheus/nginx-exporter.nix ./services/monitoring/prometheus/node-exporter.nix diff --git a/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix b/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix new file mode 100644 index 00000000000..a1ecd6ef58c --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix @@ -0,0 +1,57 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.prometheus.blackboxExporter; +in { + options = { + services.prometheus.blackboxExporter = { + enable = mkEnableOption "prometheus blackbox exporter"; + + configFile = mkOption { + type = types.path; + description = '' + Path to configuration file. + ''; + }; + + port = mkOption { + type = types.int; + default = 9115; + description = '' + Port to listen on. + ''; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra commandline options when launching the blackbox exporter. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.prometheus-blackbox-exporter = { + description = "Prometheus exporter for blackbox probes"; + unitConfig.Documentation = "https://github.com/prometheus/blackbox_exporter"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = "nobody"; + Restart = "always"; + PrivateTmp = true; + WorkingDirectory = /tmp; + ExecStart = '' + ${pkgs.prometheus-blackbox-exporter}/bin/blackbox_exporter \ + -web.listen-address :${toString cfg.port} \ + -config.file ${cfg.configFile} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + }; + }; + }; +} From 575afe3fa7b65e92afa4beab026af52d2d35e83b Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 9 Jan 2017 15:29:35 +0100 Subject: [PATCH 64/84] prometheus exporter modules: unify firewall handling --- .../monitoring/prometheus/blackbox-exporter.nix | 10 ++++++++++ .../services/monitoring/prometheus/json-exporter.nix | 10 ++++++++++ .../services/monitoring/prometheus/nginx-exporter.nix | 10 +++++++++- .../services/monitoring/prometheus/node-exporter.nix | 10 ++++++++++ .../monitoring/prometheus/varnish-exporter.nix | 10 ++++++++++ 5 files changed, 49 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix b/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix index a1ecd6ef58c..7a343299c31 100644 --- a/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix +++ b/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix @@ -31,10 +31,20 @@ in { Extra commandline options when launching the blackbox exporter. ''; }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open port in firewall for incoming connections. + ''; + }; }; }; config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port; + systemd.services.prometheus-blackbox-exporter = { description = "Prometheus exporter for blackbox probes"; unitConfig.Documentation = "https://github.com/prometheus/blackbox_exporter"; diff --git a/nixos/modules/services/monitoring/prometheus/json-exporter.nix b/nixos/modules/services/monitoring/prometheus/json-exporter.nix index ff3a137a0cf..6bc56df9834 100644 --- a/nixos/modules/services/monitoring/prometheus/json-exporter.nix +++ b/nixos/modules/services/monitoring/prometheus/json-exporter.nix @@ -38,10 +38,20 @@ in { Extra commandline options when launching the JSON exporter. ''; }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open port in firewall for incoming connections. + ''; + }; }; }; config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port; + systemd.services.prometheus-json-exporter = { description = "Prometheus exporter for JSON over HTTP"; unitConfig.Documentation = "https://github.com/kawamuray/prometheus-json-exporter"; diff --git a/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix b/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix index 8aa0184e53a..1ccafee3b18 100644 --- a/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix +++ b/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix @@ -41,11 +41,19 @@ in { Extra commandline options when launching the nginx exporter. ''; }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open port in firewall for incoming connections. + ''; + }; }; }; config = mkIf cfg.enable { - networking.firewall.allowedTCPPorts = [ cfg.port ]; + networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port; systemd.services.prometheus-nginx-exporter = { after = [ "network.target" "nginx.service" ]; diff --git a/nixos/modules/services/monitoring/prometheus/node-exporter.nix b/nixos/modules/services/monitoring/prometheus/node-exporter.nix index 52dc14effc4..0cf0b85afb5 100644 --- a/nixos/modules/services/monitoring/prometheus/node-exporter.nix +++ b/nixos/modules/services/monitoring/prometheus/node-exporter.nix @@ -44,10 +44,20 @@ in { Extra commandline options when launching the node exporter. ''; }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open port in firewall for incoming connections. + ''; + }; }; }; config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port; + systemd.services.prometheus-node-exporter = { description = "Prometheus exporter for machine metrics"; unitConfig.Documentation = "https://github.com/prometheus/node_exporter"; diff --git a/nixos/modules/services/monitoring/prometheus/varnish-exporter.nix b/nixos/modules/services/monitoring/prometheus/varnish-exporter.nix index 0f608760e91..143ebb62aea 100644 --- a/nixos/modules/services/monitoring/prometheus/varnish-exporter.nix +++ b/nixos/modules/services/monitoring/prometheus/varnish-exporter.nix @@ -25,10 +25,20 @@ in { Extra commandline options when launching the Varnish exporter. ''; }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open port in firewall for incoming connections. + ''; + }; }; }; config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port; + systemd.services.prometheus-varnish-exporter = { description = "Prometheus exporter for Varnish metrics"; unitConfig.Documentation = "https://github.com/jonnenauha/prometheus_varnish_exporter"; From d423567a9506f6ccfc09b137e6184280b92e37b6 Mon Sep 17 00:00:00 2001 From: oida Date: Wed, 5 Oct 2016 16:37:31 +0200 Subject: [PATCH 65/84] prometheus-snmp-exporter: added nixos module --- .../monitoring/prometheus/snmp-exporter.nix | 127 ++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/snmp-exporter.nix diff --git a/nixos/modules/services/monitoring/prometheus/snmp-exporter.nix b/nixos/modules/services/monitoring/prometheus/snmp-exporter.nix new file mode 100644 index 00000000000..fe33f8c1f04 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/snmp-exporter.nix @@ -0,0 +1,127 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.prometheus.snmpExporter; + mkConfigFile = pkgs.writeText "snmp.yml" (if cfg.configurationPath == null then builtins.toJSON cfg.configuration else builtins.readFile cfg.configurationPath); +in { + options = { + services.prometheus.snmpExporter = { + enable = mkEnableOption "Prometheus snmp exporter"; + + user = mkOption { + type = types.str; + default = "nobody"; + description = '' + User name under which snmp exporter shall be run. + ''; + }; + + group = mkOption { + type = types.str; + default = "nogroup"; + description = '' + Group under which snmp exporter shall be run. + ''; + }; + + port = mkOption { + type = types.int; + default = 9116; + description = '' + Port to listen on. + ''; + }; + + listenAddress = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Address to listen on for web interface and telemetry. + ''; + }; + + configurationPath = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to a snmp exporter configuration file. Mutually exclusive with 'configuration' option. + ''; + example = "./snmp.yml"; + }; + + configuration = mkOption { + type = types.nullOr types.attrs; + default = {}; + description = '' + Snmp exporter configuration as nix attribute set. Mutually exclusive with 'configurationPath' option. + ''; + example = '' + { + "default" = { + "version" = 2; + "auth" = { + "community" = "public"; + }; + }; + }; + ''; + }; + + logFormat = mkOption { + type = types.str; + default = "logger:stderr"; + description = '' + Set the log target and format. + ''; + }; + + logLevel = mkOption { + type = types.enum ["debug" "info" "warn" "error" "fatal"]; + default = "info"; + description = '' + Only log messages with the given severity or above. + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open port in firewall for incoming connections. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port; + + assertions = singleton + { + assertion = (cfg.configurationPath == null) != (cfg.configuration == null); + message = "Please ensure you have either 'configuration' or 'configurationPath' set!"; + }; + + systemd.services.prometheus-snmp-exporter = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + script = '' + ${pkgs.prometheus-snmp-exporter.bin}/bin/snmp_exporter \ + -config.file ${mkConfigFile} \ + -log.format ${cfg.logFormat} \ + -log.level ${cfg.logLevel} \ + -web.listen-address ${optionalString (cfg.listenAddress != null) cfg.listenAddress}:${toString cfg.port} + ''; + + serviceConfig = { + User = cfg.user; + Group = cfg.group; + Restart = "always"; + PrivateTmp = true; + WorkingDirectory = "/tmp"; + }; + }; + }; +} From 464c79ea9f929d1237dbc2df878eedad91767a72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 9 Jan 2017 18:19:25 +0100 Subject: [PATCH 66/84] turtle_1_3_0: fix build --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8f207a000df..3c48be53141 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1142,4 +1142,8 @@ self: super: { # https://github.com/krisajenkins/elm-export/pull/22 elm-export = doJailbreak super.elm-export; + + turtle_1_3_0 = super.turtle_1_3_0.overrideScope (self: super: { + optparse-applicative = self.optparse-applicative_0_13_0_0; + }); } From 88908145ead927ecc8ae811f7d31bdef30b5dc0b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 9 Jan 2017 10:59:37 +0100 Subject: [PATCH 67/84] nixos installer: don't log refused packets to console Fixes #19764. --- nixos/modules/installer/cd-dvd/iso-image.nix | 2 -- .../installer/cd-dvd/sd-image-armv7l-multiplatform.nix | 1 - nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix | 1 - nixos/modules/installer/netboot/netboot.nix | 2 -- nixos/modules/profiles/installation-device.nix | 6 ++++++ 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index fea1c884953..93dba0d882b 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -232,8 +232,6 @@ in system.boot.loader.kernelFile = "bzImage"; environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi pkgs.syslinux ]; - boot.consoleLogLevel = mkDefault 7; - # In stage 1 of the boot, mount the CD as the root FS by label so # that we don't need to know its device. We pass the label of the # root filesystem on the kernel command line, rather than in diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix index 80fb4707228..456ef7c9f54 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -27,7 +27,6 @@ in boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelParams = ["console=ttyS0,115200n8" "console=ttymxc0,115200n8" "console=ttyAMA0,115200n8" "console=ttyO0,115200n8" "console=tty0"]; - boot.consoleLogLevel = 7; # FIXME: this probably should be in installation-device.nix users.extraUsers.root.initialHashedPassword = ""; diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix index dc196468139..e7163f10a3c 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix @@ -26,7 +26,6 @@ in boot.loader.generic-extlinux-compatible.enable = true; boot.kernelPackages = pkgs.linuxPackages_rpi; - boot.consoleLogLevel = 7; # FIXME: this probably should be in installation-device.nix users.extraUsers.root.initialHashedPassword = ""; diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix index 5908ff6cb94..0f6046339b3 100644 --- a/nixos/modules/installer/netboot/netboot.nix +++ b/nixos/modules/installer/netboot/netboot.nix @@ -30,8 +30,6 @@ with lib; system.boot.loader.kernelFile = "bzImage"; environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi pkgs.syslinux ]; - boot.consoleLogLevel = mkDefault 7; - fileSystems."/" = { fsType = "tmpfs"; options = [ "mode=0755" ]; diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index 93736ba256b..7949e600f86 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -70,5 +70,11 @@ with lib; # the initrd builder. system.extraDependencies = [ pkgs.stdenv pkgs.busybox pkgs.perlPackages.ArchiveCpio ]; + # Show all debug messages from the kernel but don't log refused packets + # because we have the firewall enabled. This makes installs from the + # console less cumbersome if the machine has a public IP. + boot.consoleLogLevel = mkDefault 7; + networking.firewall.logRefusedConnections = mkDefault false; + }; } From de36c3b560f6c131c892f6de5c8e78c4920f4947 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 9 Jan 2017 19:51:09 +0100 Subject: [PATCH 68/84] xlockmore: 5.49 -> 5.50 --- pkgs/misc/screensavers/xlockmore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index eb0209e3502..ceb0d0a6c44 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { - name = "xlockmore-5.49"; + name = "xlockmore-5.50"; src = fetchurl { url = "http://sillycycle.com/xlock/${name}.tar.xz"; - sha256 = "0n2pxm1qxg39h3qkqhbck312cmq7gbpj7hpv210y40kx9fj6biq3"; + sha256 = "0a9sargn36b5lxil777p35z8m5jr744h9xmc021057aq8kgp4pv3"; curlOpts = "--user-agent 'Mozilla/5.0'"; }; From c82baee8aca9c7ca71392da195c1d90f9dea42f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 9 Jan 2017 20:23:27 +0100 Subject: [PATCH 69/84] sssd: fixup build after bind output changes #21685 --- pkgs/os-specific/linux/sssd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index d50848af3dc..312ac0c281a 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgs, lib, glibc, augeas, bind, c-ares, +{ stdenv, fetchurl, pkgs, lib, glibc, augeas, dnsutils, c-ares, cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, libnfsidmap, doxygen, python, python3, pam, popt, talloc, tdb, tevent, pkgconfig, ldb, openldap, pcre, kerberos, cifs_utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2, @@ -45,7 +45,7 @@ stdenv.mkDerivation { ''; enableParallelBuilding = true; - buildInputs = [ augeas bind c-ares cyrus_sasl ding-libs libnl libunistring nss + buildInputs = [ augeas dnsutils c-ares cyrus_sasl ding-libs libnl libunistring nss samba libnfsidmap doxygen python python3 popt talloc tdb tevent pkgconfig ldb pam openldap pcre kerberos cifs_utils glib keyutils dbus fakeroot libxslt libxml2 From fc56c8c5cd61f04fea41c309f41eff88f4cc9ac3 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 9 Jan 2017 20:01:02 +0100 Subject: [PATCH 70/84] global: 6.5.5 -> 6.5.6 --- pkgs/development/tools/misc/global/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index d609b3b664c..664b83b7e7c 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "global-${version}"; - version = "6.5.5"; + version = "6.5.6"; src = fetchurl { url = "mirror://gnu/global/${name}.tar.gz"; - sha256 = "0yyg91qw8399lnxfai4bxkh9yq71qdwp9kvadgzp05cdqni44nxw"; + sha256 = "018m536k5y6lks1a6gqn3bsp7r8zk017znqj9kva1nm8d7x9lbqj"; }; nativeBuildInputs = [ libtool makeWrapper ]; From 15fe70d1a34bc3701b74a8488e22a82e61f7cb4b Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 9 Jan 2017 20:02:28 +0100 Subject: [PATCH 71/84] entr: 3.5 -> 3.6 --- pkgs/tools/misc/entr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index 0cc30fe45e3..8ba92990b53 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "entr-${version}"; - version = "3.5"; + version = "3.6"; src = fetchurl { url = "http://entrproject.org/code/${name}.tar.gz"; - sha256 = "05k4jyjna0pr2dalwc1l1dhrcyk6pw7hbss7jl4ykwfadcs5br73"; + sha256 = "1sy81np6kgmq04kfn2ckf4fp7jcf5d1963shgmapx3al3kc4c9x4"; }; postPatch = '' From b35af136ef48cc9c091fea6c50f7f89c9a990ed9 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 9 Jan 2017 20:16:10 +0100 Subject: [PATCH 72/84] disorderfs: 0.4.2 -> 0.5.1 --- pkgs/tools/filesystems/disorderfs/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/disorderfs/default.nix b/pkgs/tools/filesystems/disorderfs/default.nix index d36187aef29..ce44d7d6d4e 100644 --- a/pkgs/tools/filesystems/disorderfs/default.nix +++ b/pkgs/tools/filesystems/disorderfs/default.nix @@ -2,13 +2,15 @@ stdenv.mkDerivation rec { name = "disorderfs-${version}"; - version = "0.4.2"; + version = "0.5.1"; src = fetchurl { url = "http://http.debian.net/debian/pool/main/d/disorderfs/disorderfs_${version}.orig.tar.gz"; - sha256 = "1qr52lzynd5b5ancrn0g1ah95w7iikxgqsmixlacn2vlh8n9jym5"; + sha256 = "0nnxk0qqww16ra52mi5giw50zpssvan62nkig5dcxvgcvv51akik"; }; + sourceRoot = "."; + nativeBuildInputs = [ pkgconfig asciidoc ]; buildInputs = [ fuse attr ]; From 7a8656407df674e9d840a74e0136aaba3b0e6eb1 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 9 Jan 2017 20:48:09 +0100 Subject: [PATCH 73/84] pdf2djvu: 0.9.4 -> 0.9.5 and fix build that broke due to multiple outputs of djvulibre --- pkgs/tools/typesetting/pdf2djvu/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix index 5f344628e37..2318a146f62 100644 --- a/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -1,15 +1,21 @@ { stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }: stdenv.mkDerivation rec { - version = "0.9.4"; + version = "0.9.5"; name = "pdf2djvu-${version}"; src = fetchurl { - url = "https://bitbucket.org/jwilk/pdf2djvu/downloads/${name}.tar.xz"; - sha256 = "1a1gwr6yzbiximbpgg4rc69dq8g3jmxwcbcwqk0fhfbgzj1j4w65"; + url = "https://github.com/jwilk/pdf2djvu/releases/download/${version}/${name}.tar.xz"; + sha256 = "0fr8b44rsqll2m6qnh9id1lfc980k7rj3aq975mwba4y57rwnlnc"; }; - buildInputs = [ pkgconfig djvulibre poppler fontconfig libjpeg ]; + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ djvulibre poppler fontconfig libjpeg ]; + + preConfigure = '' + sed -i 's#\$djvulibre_bin_path#${djvulibre.bin}/bin#g' configure + ''; meta = with stdenv.lib; { description = "Creates djvu files from PDF files"; From 755c2929dd5742681c1db710c28168fa1755d63d Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 9 Jan 2017 20:54:48 +0100 Subject: [PATCH 74/84] pdfpc: 4.0.4 -> 4.0.5 --- pkgs/applications/misc/pdfpc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 848b39eeb07..2f023412faf 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -4,17 +4,17 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "pdfpc"; - version = "4.0.4"; + version = "4.0.5"; src = fetchFromGitHub { repo = "pdfpc"; owner = "pdfpc"; rev = "v${version}"; - sha256 = "07wpf3gkgiq7dpgsrv7whk0pzm18cni4s53hd7zz40319jmlaf4q"; + sha256 = "13spngkp0lq2qlw4mxsngx4ckr201axzn5ppjax0bhlckirvzr2s"; }; - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ gstreamer gst-plugins-base vala gtk3 libgee poppler + nativeBuildInputs = [ cmake pkgconfig vala ]; + buildInputs = [ gstreamer gst-plugins-base gtk3 libgee poppler libpthreadstubs makeWrapper librsvg ]; postInstall = '' From ab0bb24973269a51aa0a58a1de4199d8b2eb04d8 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 9 Jan 2017 20:58:16 +0100 Subject: [PATCH 75/84] Revert "cairo: Add ApplicationServices as propagatedBuildInput" This reverts commit 0f67005c4a2651ab0d9a48468a4873cff3551b8b. --- pkgs/development/libraries/cairo/default.nix | 4 +--- pkgs/development/libraries/librsvg/default.nix | 7 +++++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 5b40f27674d..7df72bc0560 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { ] ++ libintlOrEmpty ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreGraphics CoreText + ApplicationServices Carbon ]); @@ -56,9 +57,6 @@ stdenv.mkDerivation rec { ++ optionals xcbSupport [ libxcb xcbutil ] ++ optional gobjectSupport glib ++ optional glSupport mesa_noglu - ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - ApplicationServices - ]) ; # TODO: maybe liblzo but what would it be for here? configureFlags = if stdenv.isDarwin then [ diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 409307fb52b..ebd0f79cd47 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf -, bzip2, libcroco, libintlOrEmpty +, bzip2, libcroco, libintlOrEmpty, darwin , withGTK ? false, gtk3 ? null , gobjectIntrospection ? null, enableIntrospection ? false }: @@ -22,7 +22,10 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ] + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ApplicationServices + ]); configureFlags = [ "--enable-introspection=auto" ] ++ stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; From 4720ea4f35114059c6956627be8c9c714f30c8d6 Mon Sep 17 00:00:00 2001 From: Stefan Goetz Date: Mon, 9 Jan 2017 21:02:03 +0100 Subject: [PATCH 76/84] youtube-dl: 2017.01.02 -> 2017.01.08 (#21768) --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 2bca4b165fe..8e1519ec189 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -15,11 +15,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2017.01.02"; + version = "2017.01.08"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "140de01ea879cdc50bc34240802d5c10231baf448d7a664e6efeb9d5efb74d5b"; + sha256 = "ac2942d001003575858ff044dd1c1c264ab08527efa1af7036f773ea82b25fd6"; }; buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; From a724f66b988c0ad4fb62e2ab586a03c723d76b1d Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 9 Jan 2017 21:28:32 +0100 Subject: [PATCH 77/84] lirc: 0.9.3 -> 0.9.4 --- pkgs/development/libraries/lirc/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index a2e5d153060..960c8cc2494 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, xlibsWrapper, python3, libxslt }: stdenv.mkDerivation rec { - name = "lirc-0.9.3"; + name = "lirc-0.9.4"; src = fetchurl { url = "mirror://sourceforge/lirc/${name}.tar.bz2"; @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { preBuild = "patchShebangs ."; - buildInputs = [ alsaLib help2man pkgconfig xlibsWrapper python3 libxslt ]; + nativeBuildInputs = [ pkgconfig help2man ]; + + buildInputs = [ alsaLib xlibsWrapper python3 libxslt ]; configureFlags = [ "--with-driver=devinput" From 1738be8cd24e3554487cb1b97d934a2bf2829a12 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 9 Jan 2017 21:32:30 +0100 Subject: [PATCH 78/84] axel: 2.11 -> 2.12 --- pkgs/tools/networking/axel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index af5d8309507..8c23e11017c 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "axel-${version}"; - version = "2.11"; + version = "2.12"; src = fetchurl { url = "mirror://debian/pool/main/a/axel/axel_${version}.orig.tar.gz"; - sha256 = "05askz9pi8kvjyn66rszjfg9arwdzl72jwd38q9h9n5s37vqslky"; + sha256 = "12sa5whd5mjn1idd83hbhm0rmsh5bvhhgvv03fk5cgxynwkbprr8"; }; nativeBuildInputs = [ autoreconfHook ]; From 655db9b266c5b520f48f6288d2d01900568210c8 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 9 Jan 2017 21:36:36 +0100 Subject: [PATCH 79/84] ceptre: 2016-01-01 -> 2016-11-27 --- pkgs/development/interpreters/ceptre/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/ceptre/default.nix b/pkgs/development/interpreters/ceptre/default.nix index 1f25a2031f2..29d63f1d004 100644 --- a/pkgs/development/interpreters/ceptre/default.nix +++ b/pkgs/development/interpreters/ceptre/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, mlton }: stdenv.mkDerivation rec { - name = "ceptre-2016-01-01"; + name = "ceptre-2016-11-27"; src = fetchgit { url = https://github.com/chrisamaphone/interactive-lp; - rev = "b3d21489d4994f03d2982de273eea90bc7fba5d0"; - sha256 = "1qpyasr3jg4i2x547yq1dzksvjagvnrmkdd00s108wvw9npc2jj1"; + rev = "e436fda2ccd44e9c9d226feced9d204311deacf5"; + sha256 = "174pxfnw3qyn2w8qxmx45fa68iddf106mkfi0kcmyqxzsc9jprh8"; }; nativeBuildInputs = [ mlton ]; From 18c0b54981947b62bafaa4ab0921bc137ea1d4a0 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 9 Jan 2017 22:08:30 +0100 Subject: [PATCH 80/84] linuxConsoleTools: 1.4.9 -> 1.6.0 --- pkgs/os-specific/linux/consoletools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/consoletools/default.nix b/pkgs/os-specific/linux/consoletools/default.nix index b9f1ee90fe9..1064f628c10 100644 --- a/pkgs/os-specific/linux/consoletools/default.nix +++ b/pkgs/os-specific/linux/consoletools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "linuxconsoletools-${version}"; - version = "1.4.9"; + version = "1.6.0"; src = fetchurl { url = "mirror://sourceforge/linuxconsole/${name}.tar.bz2"; - sha256 = "0rwv2fxn12bblp096m9jy1lhngz26lv6g6zs4cgfg4frikwn977s"; + sha256 = "0il1m8pgw8f6b8qid035ixamv0w5fgh9pinx5vw4ayxn03nyzlnf"; }; buildInputs = [ SDL ]; From 5d2723945e35d4cb5128aa4c4256c788a732c5a6 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Mon, 9 Jan 2017 21:07:39 +0100 Subject: [PATCH 81/84] perl-mod_perl2: use cpan mirror Also add license field. --- pkgs/top-level/perl-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b8c5e637870..d9d4234bb1f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8443,7 +8443,7 @@ let self = _self // overrides; _self = with self; { mod_perl2 = buildPerlPackage { name = "mod_perl-2.0.9"; src = fetchurl { - url = http://apache.mirror.iphh.net/perl/mod_perl-2.0.9.tar.gz; + url = mirror://cpan/authors/id/S/SH/SHAY/mod_perl-2.0.9.tar.gz; sha256 = "0azmir4hbb825mfmcxwa1frhnhhf82rl8xf6mmgwkhbinxmg4q02"; }; makeMakerFlags = "MP_AP_DESTDIR=$out"; @@ -8451,6 +8451,7 @@ let self = _self // overrides; _self = with self; { doCheck = false; # would try to start Apache HTTP server meta = { description = "Embed a Perl interpreter in the Apache HTTP server"; + license = stdenv.lib.licenses.asl20; }; }; Mojolicious = buildPerlPackage rec { From 5bf06ac7109f58fe7d66149b3fb0b8fc79e4236c Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Mon, 9 Jan 2017 22:58:31 +0100 Subject: [PATCH 82/84] eclipse-plugin-checkstyle: 7.2.0 -> 7.3.0 --- pkgs/applications/editors/eclipse/plugins.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 1ad97a0f764..68859a7ac41 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -171,12 +171,12 @@ rec { checkstyle = buildEclipseUpdateSite rec { name = "checkstyle-${version}"; - version = "7.2.0.201611082205"; + version = "7.3.0.201612142232"; src = fetchzip { stripRoot = false; - url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/7.2.0/net.sf.eclipsecs-updatesite_${version}.zip"; - sha256 = "1zngyrh5ckgli0xxm52vm6mzbbvrjslwqcymggfqjhzplpcgwqk1"; + url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/7.3.0/net.sf.eclipsecs-updatesite_${version}.zip"; + sha256 = "1mbiszwnakfmjx5mnh9h2rrp9jzizkmz89p8z4spq2m9kwy1lkqj"; }; meta = with stdenv.lib; { From b0106b66fd1d898b4322d1851c3dbe090d74ae2a Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Mon, 9 Jan 2017 22:58:57 +0100 Subject: [PATCH 83/84] perl-Net-HTTP: 6.09 -> 6.12 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d9d4234bb1f..112665811c6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9556,17 +9556,17 @@ let self = _self // overrides; _self = with self; { }; }; - NetHTTP = buildPerlPackage { - name = "Net-HTTP-6.09"; + NetHTTP = buildPerlPackage rec { + name = "Net-HTTP-6.12"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Net-HTTP-6.09.tar.gz; - sha256 = "52762b939d84806908ba544581c5708375f7938c3c0e496c128ca3fbc425e58d"; + url = "mirror://cpan/authors/id/O/OA/OALDERS/${name}.tar.gz"; + sha256 = "8565aff76b3d09084642f3a83c654fb4ced8220e8e19d35c78b661519b4c1be6"; }; propagatedBuildInputs = [ URI ]; meta = { + homepage = https://github.com/libwww-perl/Net-HTTP; description = "Low-level HTTP connection (client)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; From 41b69a09b68af24c9d554c6eb6cdad491baf962c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 10 Jan 2017 01:28:11 +0300 Subject: [PATCH 84/84] spidermonkey_{31,38}: fix sed problem with build --- pkgs/development/interpreters/spidermonkey/31.nix | 5 +++-- pkgs/development/interpreters/spidermonkey/38.nix | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/spidermonkey/31.nix b/pkgs/development/interpreters/spidermonkey/31.nix index 585ebc120d8..ae3e742e2ef 100644 --- a/pkgs/development/interpreters/spidermonkey/31.nix +++ b/pkgs/development/interpreters/spidermonkey/31.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl, python2, zip, libffi, nspr, icu, readline }: +{ stdenv, fetchurl, pkgconfig, gnused_422, perl, python2, zip, libffi, nspr, icu, readline }: stdenv.mkDerivation rec { version = "31.5.0"; @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "1q8icql5hh1g3gzg5fp4rl9rfagyhm9gilfn3dgi7qn4i1mrfqsd"; }; - buildInputs = [ pkgconfig perl python2 zip libffi readline nspr icu ]; + buildInputs = [ libffi readline nspr icu ]; + nativeBuildInputs = [ pkgconfig perl python2 zip gnused_422 ]; postUnpack = "sourceRoot=\${sourceRoot}/js/src"; diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix index 89c02f26200..b4823817d4b 100644 --- a/pkgs/development/interpreters/spidermonkey/38.nix +++ b/pkgs/development/interpreters/spidermonkey/38.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl, python2, zip, libffi, readline, icu, zlib, nspr }: +{ stdenv, fetchurl, pkgconfig, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, nspr }: stdenv.mkDerivation rec { version = "38.2.1.rc0"; @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0p4bmbpgkfsj54xschcny0a118jdrdgg0q29rwxigg3lh5slr681"; }; - buildInputs = [ pkgconfig perl python2 zip libffi readline icu zlib nspr ]; + buildInputs = [ libffi readline icu zlib nspr ]; + nativeBuildInputs = [ pkgconfig perl python2 zip gnused_422 ]; postUnpack = "sourceRoot=\${sourceRoot}/js/src";