From 71da96faf474e4e1eca8501028181ad6545a176d Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 22 May 2015 10:39:45 +0200 Subject: [PATCH 001/126] add QmidiNet: a MIDI network gateway application --- pkgs/applications/audio/QmidiNet/default.nix | 21 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/audio/QmidiNet/default.nix diff --git a/pkgs/applications/audio/QmidiNet/default.nix b/pkgs/applications/audio/QmidiNet/default.nix new file mode 100644 index 00000000000..4ab871c22a0 --- /dev/null +++ b/pkgs/applications/audio/QmidiNet/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, qt4, alsaLib, jack2 }: + +stdenv.mkDerivation rec { + version = "0.2.1"; + name = "qmidinet-${version}"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/qmidinet/${name}.tar.gz"; + sha256 = "1a1pj4w74wj1gcfv4a0vzcglmr5sw0xp0y56w8rk3ig4k11xi8sa"; + }; + + buildInputs = [ qt4 alsaLib jack2 ]; + + meta = with stdenv.lib; { + description = "A MIDI network gateway application that sends and receives MIDI data (ALSA Sequencer and/or JACK MIDI) over the network"; + homepage = http://qmidinet.sourceforge.net/; + license = licenses.gpl2Plus; + maintainers = [ maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c662b413caa..b48feb1b3b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11126,8 +11126,6 @@ let quvi_scripts = callPackage ../applications/video/quvi/scripts.nix { }; - qjackctl = callPackage ../applications/audio/qjackctl { }; - gkrellm = callPackage ../applications/misc/gkrellm { }; gmu = callPackage ../applications/audio/gmu { }; @@ -11977,6 +11975,10 @@ let qemu-nix = qemu.override { type = "nix"; }; + qjackctl = callPackage ../applications/audio/qjackctl { }; + + QmidiNet = callPackage ../applications/audio/QmidiNet { }; + qmmp = callPackage ../applications/audio/qmmp { }; qrcode = callPackage ../tools/graphics/qrcode {}; From 2c125cf37ad8ed4d971325bf127745a2768a9872 Mon Sep 17 00:00:00 2001 From: Allen Nelson Date: Thu, 28 May 2015 11:56:29 -0500 Subject: [PATCH 002/126] removed default dependency of liblapack on ATLAS. was causing an unnecessary double-build of atlas --- .../science/math/liblapack/3.5.0.nix | 49 ------------------- .../science/math/liblapack/default.nix | 39 ++++++++++++--- pkgs/top-level/all-packages.nix | 5 +- 3 files changed, 36 insertions(+), 57 deletions(-) delete mode 100644 pkgs/development/libraries/science/math/liblapack/3.5.0.nix diff --git a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix deleted file mode 100644 index 0b4badf26e7..00000000000 --- a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, fetchurl, gfortran, atlas, cmake, python, shared ? false }: -let - atlasMaybeShared = atlas.override { inherit shared; }; - usedLibExtension = if shared then ".so" else ".a"; -in -stdenv.mkDerivation rec { - version = "3.5.0"; - name = "liblapack-${version}"; - src = fetchurl { - url = "http://www.netlib.org/lapack/lapack-${version}.tgz"; - sha256 = "0lk3f97i9imqascnlf6wr5mjpyxqcdj73pgj97dj2mgvyg9z1n4s"; - }; - - propagatedBuildInputs = [ atlasMaybeShared ]; - buildInputs = [ gfortran cmake ]; - nativeBuildInputs = [ python ]; - - cmakeFlags = [ - "-DUSE_OPTIMIZED_BLAS=ON" - "-DBLAS_ATLAS_f77blas_LIBRARY=${atlasMaybeShared}/lib/libf77blas${usedLibExtension}" - "-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}" - "-DCMAKE_Fortran_FLAGS=-fPIC" - ] - ++ (stdenv.lib.optional shared "-DBUILD_SHARED_LIBS=ON") - ; - - doCheck = ! shared; - - checkPhase = " - sed -i 's,^#!.*,#!${python}/bin/python,' lapack_testing.py - ctest - "; - - enableParallelBuilding = true; - - passthru = { - blas = atlas; - }; - - meta = { - inherit version; - description = "Linear Algebra PACKage"; - homepage = "http://www.netlib.org/lapack/"; - license = "revised-BSD"; - - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.simons ]; - }; -} diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index 25667e11264..18aceeba177 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -1,15 +1,38 @@ -{ stdenv, fetchurl, gfortran, atlas, cmake, python, shared ? false }: +{ + stdenv, + fetchurl, + gfortran, + cmake, + python, + atlas ? null, + shared ? false, + version ? "3.4.1" +}: let - atlasMaybeShared = atlas.override { inherit shared; }; + atlasMaybeShared = if atlas != null then atlas.override { inherit shared; } + else null; usedLibExtension = if shared then ".so" else ".a"; - version = "3.4.1"; - inherit (stdenv.lib) optional; + inherit (stdenv.lib) optional optionals concatStringsSep; + inherit (builtins) hasAttr attrNames; + # Hashes of the versions of liblapack we know about. + versions2sha = { + "3.4.1" = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f"; + "3.5.0" = "0lk3f97i9imqascnlf6wr5mjpyxqcdj73pgj97dj2mgvyg9z1n4s"; + }; in + +if !(builtins.hasAttr version versions2sha) +then throw '' + Unknown liblapack version ${version}. + Available versions: ${concatStringsSep ", " (attrNames versions2sha)} +'' +else + stdenv.mkDerivation rec { name = "liblapack-${version}"; src = fetchurl { url = "http://www.netlib.org/lapack/lapack-${version}.tgz"; - sha256 = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f"; + sha256 = versions2sha."${version}"; }; propagatedBuildInputs = [ atlasMaybeShared ]; @@ -18,10 +41,12 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_OPTIMIZED_BLAS=ON" - "-DBLAS_ATLAS_f77blas_LIBRARY=${atlasMaybeShared}/lib/libf77blas${usedLibExtension}" - "-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}" "-DCMAKE_Fortran_FLAGS=-fPIC" ] + ++ (optionals (atlas != null) [ + "-DBLAS_ATLAS_f77blas_LIBRARY=${atlasMaybeShared}/lib/libf77blas${usedLibExtension}" + "-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}" + ]) ++ (optional shared "-DBUILD_SHARED_LIBS=ON") # If we're on darwin, CMake will automatically detect impure paths. This switch # prevents that. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 368ec616654..bb3b696e23a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13836,7 +13836,10 @@ let jags = callPackage ../applications/science/math/jags { }; liblapack = callPackage ../development/libraries/science/math/liblapack { }; - liblapack_3_5_0 = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix { }; + + liblapackWithAtlas = liblapack.override { inherit atlas; }; + + liblapack_3_5_0 = liblapack.override { version = "3.5.0"; }; liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; From e001340cf659eb7f3c97d172710c21b3df35003c Mon Sep 17 00:00:00 2001 From: Allen Nelson Date: Thu, 28 May 2015 21:46:09 -0500 Subject: [PATCH 003/126] returned to two-file structure for liblapack --- .../science/math/liblapack/3.5.0.nix | 66 +++++++++++++++++++ .../science/math/liblapack/default.nix | 18 +---- pkgs/top-level/all-packages.nix | 6 +- 3 files changed, 73 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/libraries/science/math/liblapack/3.5.0.nix diff --git a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix new file mode 100644 index 00000000000..510b18a5548 --- /dev/null +++ b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix @@ -0,0 +1,66 @@ +{ + stdenv, + fetchurl, + gfortran, + cmake, + python, + atlas ? null, + shared ? false +}: +let + atlasMaybeShared = if atlas != null then atlas.override { inherit shared; } + else null; + usedLibExtension = if shared then ".so" else ".a"; + inherit (stdenv.lib) optional optionals concatStringsSep; + inherit (builtins) hasAttr attrNames; + version = "3.5.0"; +in + +stdenv.mkDerivation rec { + name = "liblapack-${version}"; + src = fetchurl { + url = "http://www.netlib.org/lapack/lapack-${version}.tgz"; + sha256 = "0lk3f97i9imqascnlf6wr5mjpyxqcdj73pgj97dj2mgvyg9z1n4s"; + }; + + propagatedBuildInputs = [ atlasMaybeShared ]; + buildInputs = [ gfortran cmake ]; + nativeBuildInputs = [ python ]; + + cmakeFlags = [ + "-DUSE_OPTIMIZED_BLAS=ON" + "-DCMAKE_Fortran_FLAGS=-fPIC" + ] + ++ (optionals (atlas != null) [ + "-DBLAS_ATLAS_f77blas_LIBRARY=${atlasMaybeShared}/lib/libf77blas${usedLibExtension}" + "-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}" + ]) + ++ (optional shared "-DBUILD_SHARED_LIBS=ON") + # If we're on darwin, CMake will automatically detect impure paths. This switch + # prevents that. + ++ (optional stdenv.isDarwin "-DCMAKE_OSX_SYSROOT:PATH=''") + ; + + doCheck = ! shared; + + checkPhase = " + sed -i 's,^#!.*,#!${python}/bin/python,' lapack_testing.py + ctest + "; + + enableParallelBuilding = true; + + passthru = { + blas = atlas; + }; + + meta = { + inherit version; + description = "Linear Algebra PACKage"; + homepage = "http://www.netlib.org/lapack/"; + license = "revised-BSD"; + + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index 18aceeba177..0487af4e9f4 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -5,8 +5,7 @@ cmake, python, atlas ? null, - shared ? false, - version ? "3.4.1" + shared ? false }: let atlasMaybeShared = if atlas != null then atlas.override { inherit shared; } @@ -14,25 +13,14 @@ let usedLibExtension = if shared then ".so" else ".a"; inherit (stdenv.lib) optional optionals concatStringsSep; inherit (builtins) hasAttr attrNames; - # Hashes of the versions of liblapack we know about. - versions2sha = { - "3.4.1" = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f"; - "3.5.0" = "0lk3f97i9imqascnlf6wr5mjpyxqcdj73pgj97dj2mgvyg9z1n4s"; - }; + version = "3.4.1"; in -if !(builtins.hasAttr version versions2sha) -then throw '' - Unknown liblapack version ${version}. - Available versions: ${concatStringsSep ", " (attrNames versions2sha)} -'' -else - stdenv.mkDerivation rec { name = "liblapack-${version}"; src = fetchurl { url = "http://www.netlib.org/lapack/lapack-${version}.tgz"; - sha256 = versions2sha."${version}"; + sha256 = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f"; }; propagatedBuildInputs = [ atlasMaybeShared ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb3b696e23a..1da4a9803e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13835,11 +13835,13 @@ let jags = callPackage ../applications/science/math/jags { }; - liblapack = callPackage ../development/libraries/science/math/liblapack { }; + liblapack = callPackage ../development/libraries/science/math/liblapack { + atlas = null; + }; liblapackWithAtlas = liblapack.override { inherit atlas; }; - liblapack_3_5_0 = liblapack.override { version = "3.5.0"; }; + liblapack_3_5_0 = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix { }; liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; From 3d00848ace5ae948f049aa8aa0651a3de22f7040 Mon Sep 17 00:00:00 2001 From: Allen Nelson Date: Thu, 28 May 2015 12:30:29 -0700 Subject: [PATCH 004/126] using atlasWithLapack dependency. running test suites for numpy and scipy. --- pkgs/top-level/python-packages.nix | 64 ++++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 12 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b33448fa944..33a76d8f264 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7802,6 +7802,49 @@ let }; }; + # Special check phase for numpy and scipy, following the same set of steps: + # First "install" the package, then import what was installed, and call the + # .test() function, which will run the test suite. + numpyScipyCheckPhase = python: pkgName: '' + runHook preCheck + + _python=${python}/bin/${python.executable} + + # We will "install" into a temp directory, so that we can run the numpy + # tests (see below). + install_dir="$TMPDIR/test_install" + install_lib="$install_dir/lib/${python.libPrefix}/site-packages" + mkdir -p $install_dir + $_python setup.py install \ + --install-lib=$install_lib \ + --old-and-unmanageable \ + --prefix=$install_dir > /dev/null + + # Create a directory in which to run tests (you get an error if you try to + # import the package when you're in the current directory). + mkdir $TMPDIR/run_tests + pushd $TMPDIR/run_tests > /dev/null + # Temporarily add the directory we installed in to the python path + # (not permanently, or this pythonpath will wind up getting exported), + # and run the test suite. + PYTHONPATH="$install_lib:$PYTHONPATH" $_python -c \ + 'import ${pkgName}; ${pkgName}.test("fast", verbose=10)' + popd > /dev/null + + runHook postCheck + ''; + + # Special prebuild step for numpy and scipy. Creates a site.cfg telling + # the setup script where to find depended-on math libraries. + numpyScipyPrebuild = '' + echo "Creating site.cfg file..." + cat << EOF > site.cfg + [atlas] + include_dirs = ${pkgs.atlasWithLapack}/include + library_dirs = ${pkgs.atlasWithLapack}/lib + EOF + ''; + numpy = buildPythonPackage ( rec { name = "numpy-1.9.2"; @@ -7817,17 +7860,14 @@ let sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py ''; - preBuild = '' - export BLAS=${pkgs.openblas} LAPACK=${pkgs.openblas} - ''; + preBuild = self.numpyScipyPrebuild; setupPyBuildFlags = ["--fcompiler='gnu95'"]; - # error: invalid command 'test' - doCheck = false; + buildInputs = [ pkgs.gfortran self.nose ]; + propagatedBuildInputs = [ pkgs.atlas ]; - buildInputs = with self; [ pkgs.gfortran ]; - propagatedBuildInputs = with self; [ pkgs.openblas ]; + checkPhase = self.numpyScipyCheckPhase python "numpy"; meta = { description = "Scientific tools for Python"; @@ -11187,19 +11227,19 @@ let sha256 = "16i5iksaas3m0hgbxrxpgsyri4a9ncbwbiazlhx5d6lynz1wn4m2"; }; - buildInputs = [ pkgs.gfortran ]; - propagatedBuildInputs = with self; [ numpy ]; + buildInputs = [ pkgs.gfortran self.nose ]; + propagatedBuildInputs = [ self.numpy ]; # TODO: add ATLAS=${pkgs.atlas} preConfigure = '' - export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack} sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py ''; + preBuild = self.numpyScipyPrebuild; + setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; - # error: invalid command 'test' - doCheck = false; + checkPhase = self.numpyScipyCheckPhase python "scipy"; meta = { description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering. "; From c5d132c2eab7be4c2c16cd6120c1f9d63fa8afd1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 29 May 2015 11:25:26 +0200 Subject: [PATCH 005/126] Add "haskellPackages" binaries to the unstable channel. --- pkgs/top-level/release.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index b2f1fb15262..8d26d08a2c9 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -214,6 +214,7 @@ let }; haskell.compiler = packagePlatforms pkgs.haskell-ng.compiler; + haskellPackages = packagePlatforms pkgs.haskellPackages; strategoPackages = { sdf = linux; From c04784dfd61cab73f23f51509a1b989415a8a3de Mon Sep 17 00:00:00 2001 From: _1126 Date: Fri, 29 May 2015 16:41:13 +0200 Subject: [PATCH 006/126] rofi-pass: initial commit. --- pkgs/applications/misc/rofi/pass.nix | 30 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/misc/rofi/pass.nix diff --git a/pkgs/applications/misc/rofi/pass.nix b/pkgs/applications/misc/rofi/pass.nix new file mode 100644 index 00000000000..791cd995adb --- /dev/null +++ b/pkgs/applications/misc/rofi/pass.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchgit, wmctrl, xprop, xdotool}: + +stdenv.mkDerivation rec { + name = "rofi-${version}"; + version = "2015-05-29"; + + src = fetchgit { + url = "https://github.com/carnager/rofi-pass"; + rev = "92c26557ec4b0508c563d596291571bbef402899"; + sha256 = "17k9jmmckqaw75i0qsay2gc8mrjrs6jjfwfxaggspj912sflmjng"; + }; + + buildInputs = [ wmctrl xprop xdotool ]; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin + cp -a $src/rofi-pass $out/bin/rofi-pass + + mkdir -p $out/share/doc/rofi-pass/ + cp -a $src/config.example $out/share/doc/rofi-pass/config.example + ''; + + meta = { + description = "Rofi script to work with password-store"; + homepage = https://github.com/carnager/rofi-pass; + maintainers = [stdenv.lib.maintainers._1126]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b43fb9c7896..f58cdf7b08e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12067,6 +12067,8 @@ let automake = automake114x; }; + rofi-pass = callPackage ../applications/misc/rofi/pass.nix { }; + rstudio = callPackage ../applications/editors/rstudio { }; rsync = callPackage ../applications/networking/sync/rsync { From 6c238d1d5f4da8b20ecaeb0cec32cbbbec5be5e5 Mon Sep 17 00:00:00 2001 From: Allen Nelson Date: Fri, 29 May 2015 11:03:18 -0500 Subject: [PATCH 007/126] moving non-packages into a separate file --- pkgs/top-level/python-packages.nix | 68 +++++-------------- .../python-support/numpy-scipy-support.nix | 53 +++++++++++++++ 2 files changed, 69 insertions(+), 52 deletions(-) create mode 100644 pkgs/top-level/python-support/numpy-scipy-support.nix diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 33a76d8f264..38636840b9b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7802,50 +7802,13 @@ let }; }; - # Special check phase for numpy and scipy, following the same set of steps: - # First "install" the package, then import what was installed, and call the - # .test() function, which will run the test suite. - numpyScipyCheckPhase = python: pkgName: '' - runHook preCheck - - _python=${python}/bin/${python.executable} - - # We will "install" into a temp directory, so that we can run the numpy - # tests (see below). - install_dir="$TMPDIR/test_install" - install_lib="$install_dir/lib/${python.libPrefix}/site-packages" - mkdir -p $install_dir - $_python setup.py install \ - --install-lib=$install_lib \ - --old-and-unmanageable \ - --prefix=$install_dir > /dev/null - - # Create a directory in which to run tests (you get an error if you try to - # import the package when you're in the current directory). - mkdir $TMPDIR/run_tests - pushd $TMPDIR/run_tests > /dev/null - # Temporarily add the directory we installed in to the python path - # (not permanently, or this pythonpath will wind up getting exported), - # and run the test suite. - PYTHONPATH="$install_lib:$PYTHONPATH" $_python -c \ - 'import ${pkgName}; ${pkgName}.test("fast", verbose=10)' - popd > /dev/null - - runHook postCheck - ''; - - # Special prebuild step for numpy and scipy. Creates a site.cfg telling - # the setup script where to find depended-on math libraries. - numpyScipyPrebuild = '' - echo "Creating site.cfg file..." - cat << EOF > site.cfg - [atlas] - include_dirs = ${pkgs.atlasWithLapack}/include - library_dirs = ${pkgs.atlasWithLapack}/lib - EOF - ''; - - numpy = buildPythonPackage ( rec { + numpy = let + support = import ./python-support/numpy-scipy-support.nix { + inherit python; + atlas = atlasWithLapack; + pkgName = "numpy"; + }; + in buildPythonPackage ( rec { name = "numpy-1.9.2"; src = pkgs.fetchurl { @@ -7860,15 +7823,13 @@ let sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py ''; - preBuild = self.numpyScipyPrebuild; + inherit (support) preBuild checkPhase; setupPyBuildFlags = ["--fcompiler='gnu95'"]; buildInputs = [ pkgs.gfortran self.nose ]; propagatedBuildInputs = [ pkgs.atlas ]; - checkPhase = self.numpyScipyCheckPhase python "numpy"; - meta = { description = "Scientific tools for Python"; homepage = "http://numpy.scipy.org/"; @@ -11219,7 +11180,13 @@ let }; - scipy = buildPythonPackage rec { + scipy = let + support = import ./python-support/numpy-scipy-support.nix { + inherit python; + atlas = atlasWithLapack; + pkgName = "numpy"; + }; + in buildPythonPackage rec { name = "scipy-0.15.1"; src = pkgs.fetchurl { @@ -11230,17 +11197,14 @@ let buildInputs = [ pkgs.gfortran self.nose ]; propagatedBuildInputs = [ self.numpy ]; - # TODO: add ATLAS=${pkgs.atlas} preConfigure = '' sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py ''; - preBuild = self.numpyScipyPrebuild; + inherit (support) preBuild checkPhase; setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; - checkPhase = self.numpyScipyCheckPhase python "scipy"; - meta = { description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering. "; homepage = http://www.scipy.org/; diff --git a/pkgs/top-level/python-support/numpy-scipy-support.nix b/pkgs/top-level/python-support/numpy-scipy-support.nix new file mode 100644 index 00000000000..d991a98925a --- /dev/null +++ b/pkgs/top-level/python-support/numpy-scipy-support.nix @@ -0,0 +1,53 @@ +{ + # Python package expression + python, + # Name of package (e.g. numpy or scipy) + pkgName, + # Atlas math library + atlas +}: + +{ + + # First "install" the package, then import what was installed, and call the + # .test() function, which will run the test suite. + checkPhase = '' + runHook preCheck + + _python=${python}/bin/${python.executable} + + # We will "install" into a temp directory, so that we can run the numpy + # tests (see below). + install_dir="$TMPDIR/test_install" + install_lib="$install_dir/lib/${python.libPrefix}/site-packages" + mkdir -p $install_dir + $_python setup.py install \ + --install-lib=$install_lib \ + --old-and-unmanageable \ + --prefix=$install_dir > /dev/null + + # Create a directory in which to run tests (you get an error if you try to + # import the package when you're in the current directory). + mkdir $TMPDIR/run_tests + pushd $TMPDIR/run_tests > /dev/null + # Temporarily add the directory we installed in to the python path + # (not permanently, or this pythonpath will wind up getting exported), + # and run the test suite. + PYTHONPATH="$install_lib:$PYTHONPATH" $_python -c \ + 'import ${pkgName}; ${pkgName}.test("fast", verbose=10)' + popd > /dev/null + + runHook postCheck + ''; + + # Creates a site.cfg telling the setup script where to find depended-on + # math libraries. + preBuild = '' + echo "Creating site.cfg file..." + cat << EOF > site.cfg + [atlas] + include_dirs = ${atlas}/include + library_dirs = ${atlas}/lib + EOF + ''; +} From 18bb7a40478c883c539d7e268cf93fe0902899db Mon Sep 17 00:00:00 2001 From: Allen Nelson Date: Fri, 29 May 2015 11:02:21 -0700 Subject: [PATCH 008/126] fix undefined variable --- pkgs/top-level/python-packages.nix | 4 ++-- pkgs/top-level/python-support/numpy-scipy-support.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 38636840b9b..bf5ee48579f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7805,7 +7805,7 @@ let numpy = let support = import ./python-support/numpy-scipy-support.nix { inherit python; - atlas = atlasWithLapack; + atlas = pkgs.atlasWithLapack; pkgName = "numpy"; }; in buildPythonPackage ( rec { @@ -11183,7 +11183,7 @@ let scipy = let support = import ./python-support/numpy-scipy-support.nix { inherit python; - atlas = atlasWithLapack; + atlas = pkgs.atlasWithLapack; pkgName = "numpy"; }; in buildPythonPackage rec { diff --git a/pkgs/top-level/python-support/numpy-scipy-support.nix b/pkgs/top-level/python-support/numpy-scipy-support.nix index d991a98925a..6cca704dcda 100644 --- a/pkgs/top-level/python-support/numpy-scipy-support.nix +++ b/pkgs/top-level/python-support/numpy-scipy-support.nix @@ -16,7 +16,7 @@ _python=${python}/bin/${python.executable} - # We will "install" into a temp directory, so that we can run the numpy + # We will "install" into a temp directory, so that we can run the # tests (see below). install_dir="$TMPDIR/test_install" install_lib="$install_dir/lib/${python.libPrefix}/site-packages" From 8a965946cb9f9c8288da985050853aa715a9ca97 Mon Sep 17 00:00:00 2001 From: Allen Nelson Date: Fri, 29 May 2015 15:16:12 -0500 Subject: [PATCH 009/126] switched to atlas as a dependency for liblapack by default --- pkgs/top-level/all-packages.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1da4a9803e5..cc689f6177d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13819,7 +13819,7 @@ let # great feature, but it's of limited use with pre-built binaries # coming from a central build farm. tolerateCpuTimingInaccuracy = true; - liblapack = liblapack_3_5_0; + liblapack = liblapack_3_5_0WithoutAtlas; withLapack = false; }; @@ -13835,13 +13835,17 @@ let jags = callPackage ../applications/science/math/jags { }; - liblapack = callPackage ../development/libraries/science/math/liblapack { - atlas = null; - }; - liblapackWithAtlas = liblapack.override { inherit atlas; }; - - liblapack_3_5_0 = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix { }; + # We have essentially 4 permutations of liblapack: version 3.4.1 or 3.5.0, + # and with or without atlas as a dependency. The default `liblapack` is 3.4.1 + # with atlas. Atlas, when built with liblapack as a dependency, uses 3.5.0 + # without atlas. Etc. + liblapackWithAtlas = callPackage ../development/libraries/science/math/liblapack {}; + liblapackWithoutAtlas = liblapackWithAtlas.override { atlas = null; }; + liblapack_3_5_0WithAtlas = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix {}; + liblapack_3_5_0WithoutAtlas = liblapack_3_5_0WithAtlas.override { atlas = null; }; + liblapack = liblapackWithAtlas; + liblapack_3_5_0 = liblapack_3_5_0WithAtlas; liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; From 5483697ab1d6dae2bc730946f368ee69b754e39f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 29 May 2015 15:29:53 -0700 Subject: [PATCH 010/126] nss: 3.19 -> 3.19.1 --- pkgs/development/libraries/nss/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 1b889c472f3..037ab3c03c0 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.19"; + version = "3.19.1"; src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_19_RTM/src/${name}.tar.gz"; - sha256 = "989ebdf79374f24181f060d332445b1a4baf3df39d08514c4349ba8573cefa9b"; + url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_19_1_RTM/src/${name}.tar.gz"; + sha256 = "b7be709551ec13206d8e3e8c065b894fa981c11573115e9478fa051029c52fff"; }; buildInputs = [ nspr perl zlib sqlite ]; From 1a2f179c32cb59b152acc2e71c37c4a2a8a038d1 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Fri, 29 May 2015 17:57:47 -0700 Subject: [PATCH 011/126] goPackages.logrus: update to 0.8.2 --- pkgs/top-level/go-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index a205cb7f8fb..63df1012afd 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1592,7 +1592,7 @@ let }; logrus = buildGoPackage rec { - rev = "v0.7.3"; + rev = "v0.8.2"; name = "logrus-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/Sirupsen/logrus"; @@ -1602,7 +1602,7 @@ let inherit rev; owner = "Sirupsen"; repo = "logrus"; - sha256 = "1sxksbarllmqb8wz5b2wbwr6q2i32vqasf7bpz4djywy3ig7jwk8"; + sha256 = "0isihf185bw54yc72mbkf3cgfh7xj0x8ky04fs52xpj6vrmd72bv"; }; propagatedBuildInputs = [ airbrake-go bugsnag-go raven-go ]; From 3588cd8c4ebe3d648d5b949e06d78a724543e828 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 29 May 2015 20:36:46 -0700 Subject: [PATCH 012/126] nixos/pulseaudio: Use libpulseaudio --- nixos/modules/config/pulseaudio.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index c41e4ea604d..04f274e99e1 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -12,7 +12,7 @@ let # Forces 32bit pulseaudio and alsaPlugins to be built/supported for apps # using 32bit alsa on 64bit linux. - enable32BitAlsaPlugins = stdenv.isx86_64 && (pkgs_i686.alsaLib != null && pkgs_i686.pulseaudio != null); + enable32BitAlsaPlugins = stdenv.isx86_64 && (pkgs_i686.alsaLib != null && pkgs_i686.libpulseaudio != null); ids = config.ids; From 81f705e98c45ca4a3dfb7e5fe16e9b45ced74f0d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 29 May 2015 15:52:41 -0700 Subject: [PATCH 013/126] ceph: Add development version --- pkgs/tools/filesystems/ceph/dev.nix | 14 +++++++++++++- pkgs/tools/filesystems/ceph/generic.nix | 13 ++++++++++--- 2 files changed, 23 insertions(+), 4 deletions(-) mode change 120000 => 100644 pkgs/tools/filesystems/ceph/dev.nix diff --git a/pkgs/tools/filesystems/ceph/dev.nix b/pkgs/tools/filesystems/ceph/dev.nix deleted file mode 120000 index 31d5e95359c..00000000000 --- a/pkgs/tools/filesystems/ceph/dev.nix +++ /dev/null @@ -1 +0,0 @@ -0.94.nix \ No newline at end of file diff --git a/pkgs/tools/filesystems/ceph/dev.nix b/pkgs/tools/filesystems/ceph/dev.nix new file mode 100644 index 00000000000..aec5d35b51a --- /dev/null +++ b/pkgs/tools/filesystems/ceph/dev.nix @@ -0,0 +1,13 @@ +{ callPackage, fetchgit, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "9.0.0"; + + src = fetchgit { + url = "https://github.com/ceph/ceph.git"; + rev = "refs/tags/v${version}"; + sha256 = "07x5riqxh2mjcvlblv900vclgh8glnb464s6ssdcgkp31fk1gybg"; + }; + + patches = [ ./fix-pgrefdebugging.patch ]; +}) diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 9dbc85a3243..43cbb75de6f 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -63,13 +63,13 @@ let hasRadosgw = optFcgi != null && optExpat != null && optCurl != null && optLibedit != null; hasXio = (stdenv.isLinux || stdenv.isFreeBSD) && - versionAtLeast version "0.95" && + versionAtLeast version "9.0.0" && optAccelio != null && optLibibverbs != null && optLibrdmacm != null; - hasRocksdb = versionAtLeast version "0.95" && optRocksdb != null; + hasRocksdb = versionAtLeast version "9.0.0" && optRocksdb != null; # TODO: Reenable when kinetic support is fixed - #hasKinetic = versionAtLeast version "0.95" && optKinetic-cpp-client != null; + #hasKinetic = versionAtLeast version "9.0.0" && optKinetic-cpp-client != null; hasKinetic = false; # Malloc implementation (can be jemalloc, tcmalloc or null) @@ -124,6 +124,9 @@ stdenv.mkDerivation { # Fix seagate kinetic linking sed -i 's,libcrypto.a,-lcrypto,g' src/os/Makefile.am + '' + optionalString (versionAtLeast version "9.0.0") '' + # Fix gmock + patchShebangs src/gmock ''; preConfigure = '' @@ -186,6 +189,10 @@ stdenv.mkDerivation { (mkWith false "valgrind" null) ]; + preBuild = optionalString (versionAtLeast version "9.0.0") '' + (cd src/gmock; make -j $NIX_BUILD_CORES) + ''; + installFlags = [ "sysconfdir=\${out}/etc" ]; outputs = [ "out" "lib" ]; From 2154348ba0285b243a143114d87751ef744cfdc2 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 29 May 2015 15:56:28 -0700 Subject: [PATCH 014/126] ceph: Update git --- pkgs/tools/filesystems/ceph/generic.nix | 72 +++++++++++++------------ pkgs/tools/filesystems/ceph/git.nix | 6 +-- 2 files changed, 40 insertions(+), 38 deletions(-) diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 43cbb75de6f..056440d4afe 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -98,7 +98,8 @@ stdenv.mkDerivation { ./0001-Makefile-env-Don-t-force-sbin.patch ]; - nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ]; + nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ] + ++ optionals (versionAtLeast version "10.0.0") [ pythonPackages.setuptools ]; buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [ boost python libxml2 optYasm optLibatomic_ops optLibs3 malloc pythonPackages.flask zlib ] ++ optional (versionAtLeast version "9.0.0") [ @@ -151,42 +152,43 @@ stdenv.mkDerivation { "--libdir=\${lib}/lib" "--includedir=\${lib}/include" - (mkWith true "rbd" null) - (mkWith true "cephfs" null) - (mkWith hasRadosgw "radosgw" null) - (mkWith true "radosstriper" null) - (mkWith hasServer "mon" null) - (mkWith hasServer "osd" null) - (mkWith hasServer "mds" null) - (mkEnable true "client" null) - (mkEnable hasServer "server" null) - (mkWith (cryptoStr == "cryptopp") "cryptopp" null) - (mkWith (cryptoStr == "nss") "nss" null) - (mkEnable false "root-make-check" null) - (mkWith false "profiler" null) - (mkWith false "debug" null) - (mkEnable false "coverage" null) - (mkWith (optFuse != null) "fuse" null) - (mkWith (malloc == optJemalloc) "jemalloc" null) - (mkWith (malloc == optGperftools) "tcmalloc" null) - (mkEnable false "pgrefdebugging" null) - (mkEnable false "cephfs-java" null) - (mkEnable hasXio "xio" null) - (mkWith (optLibatomic_ops != null) "libatomic-ops" null) - (mkWith true "ocf" null) - (mkWith hasKinetic "kinetic" null) - (mkWith hasRocksdb "librocksdb" null) - (mkWith false "librocksdb-static" null) - (mkWith (optLibs3 != null) "system-libs3" null) - (mkWith true "rest-bench" null) + (mkWith true "rbd" null) + (mkWith true "cephfs" null) + (mkWith hasRadosgw "radosgw" null) + (mkWith true "radosstriper" null) + (mkWith hasServer "mon" null) + (mkWith hasServer "osd" null) + (mkWith hasServer "mds" null) + (mkEnable true "client" null) + (mkEnable hasServer "server" null) + (mkWith (cryptoStr == "cryptopp") "cryptopp" null) + (mkWith (cryptoStr == "nss") "nss" null) + (mkEnable false "root-make-check" null) + (mkWith false "profiler" null) + (mkWith false "debug" null) + (mkEnable false "coverage" null) + (mkWith (optFuse != null) "fuse" null) + (mkWith (malloc == optJemalloc) "jemalloc" null) + (mkWith (malloc == optGperftools) "tcmalloc" null) + (mkEnable false "pgrefdebugging" null) + (mkEnable false "cephfs-java" null) + (mkEnable hasXio "xio" null) + (mkWith (optLibatomic_ops != null) "libatomic-ops" null) + (mkWith true "ocf" null) + (mkWith hasKinetic "kinetic" null) + (mkWith hasRocksdb "librocksdb" null) + (mkWith false "librocksdb-static" null) + (mkWith (optLibs3 != null) "system-libs3" null) + (mkWith true "rest-bench" null) ] ++ optional stdenv.isLinux [ - (mkWith (optLibaio != null) "libaio" null) - (mkWith (optLibxfs != null) "libxfs" null) - (mkWith (optZfs != null) "libzfs" null) + (mkWith (optLibaio != null) "libaio" null) + (mkWith (optLibxfs != null) "libxfs" null) + (mkWith (optZfs != null) "libzfs" null) ] ++ optional (versionAtLeast version "10.0.0") [ - (mkWith true "man-pages" null) - (mkWith false "tcmalloc-minimal" null) - (mkWith false "valgrind" null) + (mkWith true "man-pages" null) + (mkWith false "tcmalloc-minimal" null) + (mkWith false "valgrind" null) + (mkWith true "systemd-libexec-dir" "\${TMPDIR}") ]; preBuild = optionalString (versionAtLeast version "9.0.0") '' diff --git a/pkgs/tools/filesystems/ceph/git.nix b/pkgs/tools/filesystems/ceph/git.nix index 8aa4bbd34bb..c964548b65e 100644 --- a/pkgs/tools/filesystems/ceph/git.nix +++ b/pkgs/tools/filesystems/ceph/git.nix @@ -1,11 +1,11 @@ { callPackage, fetchgit, git, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-04-22"; + version = "2015-05-29"; src = fetchgit { url = "git://github.com/ceph/ceph.git"; - rev = "89262abc53e324f3ef4d504473a4f1d6eb337c20"; - sha256 = "0d6hlk1nwgx9cdhvppggz6sbjc1jl8j26l9739qspw1sviac5lcb"; + rev = "64096b870960d021ab5001b6a5cf3a999a9abeb7"; + sha256 = "18lcn4misyvgjh7r0vkal480x23yr8pcjwzl4k4hbrpqmm97znp9"; }; }) From da4177c36ebe975f482bee9b4c4f3d2a7a81e045 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 29 May 2015 20:50:40 -0700 Subject: [PATCH 015/126] libpulse: Use glib --- pkgs/servers/pulseaudio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 784b5a2ce94..3930c45a097 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -30,7 +30,7 @@ let optCoreaudio = if libOnly then null else shouldUsePkg coreaudio; optAlsaLib = if libOnly then null else shouldUsePkg alsaLib; optEsound = if libOnly then null else shouldUsePkg esound; - optGlib = if libOnly then null else shouldUsePkg glib; + optGlib = shouldUsePkg glib; optGtk3 = if libOnly || !hasXlibs then null else shouldUsePkg gtk3; optGconf = if libOnly then null else shouldUsePkg gconf; optAvahi = if libOnly then null else shouldUsePkg avahi; From 292abec58e5c194c7f54566f19c1a39d65eeda8c Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 28 May 2015 00:24:06 +0200 Subject: [PATCH 016/126] mod-distortion init at git-2015-05-18 --- .../audio/mod-distortion/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/audio/mod-distortion/default.nix diff --git a/pkgs/applications/audio/mod-distortion/default.nix b/pkgs/applications/audio/mod-distortion/default.nix new file mode 100644 index 00000000000..7b17f21b613 --- /dev/null +++ b/pkgs/applications/audio/mod-distortion/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, lv2 }: + +stdenv.mkDerivation rec { + name = "mod-distortion-${version}"; + version = "git-2015-05-18"; + + src = fetchFromGitHub { + owner = "portalmod"; + repo = "mod-distortion"; + rev = "0cdf186abc2a9275890b57057faf5c3f6d86d84a"; + sha256 = "1wmxgpcdcy9m7j78yq85824if0wz49wv7mw13bj3sw2s87dcmw19"; + }; + + buildInputs = [ lv2 ]; + + installFlags = [ "LV2_PATH=$out/lib/lv2" ]; + + meta = with stdenv.lib; { + homepage = https://github.com/portalmod/mod-distortion; + description = "Analog distortion emulation lv2 plugins"; + license = licenses.gpl3; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c675ec1523..ea6c9a75e78 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11749,6 +11749,8 @@ let moc = callPackage ../applications/audio/moc { }; + mod-distortion = callPackage ../applications/audio/mod-distortion { }; + monero = callPackage ../applications/misc/monero { }; monkeysAudio = callPackage ../applications/audio/monkeys-audio { }; From 12bfdb5ead03c9e889e303c3360e01f00546d416 Mon Sep 17 00:00:00 2001 From: _1126 Date: Sat, 30 May 2015 10:44:47 +0200 Subject: [PATCH 017/126] rofi-pass: add rofi to deps, adjust description --- pkgs/applications/misc/rofi/pass.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/rofi/pass.nix b/pkgs/applications/misc/rofi/pass.nix index 791cd995adb..e20c511be91 100644 --- a/pkgs/applications/misc/rofi/pass.nix +++ b/pkgs/applications/misc/rofi/pass.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, wmctrl, xprop, xdotool}: +{ stdenv, fetchgit, rofi, wmctrl, xprop, xdotool}: stdenv.mkDerivation rec { name = "rofi-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "17k9jmmckqaw75i0qsay2gc8mrjrs6jjfwfxaggspj912sflmjng"; }; - buildInputs = [ wmctrl xprop xdotool ]; + buildInputs = [ rofi wmctrl xprop xdotool ]; dontBuild = true; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Rofi script to work with password-store"; + description = "A script to make rofi work with password-store"; homepage = https://github.com/carnager/rofi-pass; maintainers = [stdenv.lib.maintainers._1126]; }; From 2ee1ab955a2a95ca18657b311832662b851ec8bf Mon Sep 17 00:00:00 2001 From: Siarhei Zirukin Date: Fri, 29 May 2015 21:48:46 +0200 Subject: [PATCH 018/126] utf8proc: 1.1.6 -> 1.2 --- .../libraries/utf8proc/default.nix | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index 8c715fbd928..63de08b46dd 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -1,25 +1,25 @@ -{ fetchurl, stdenv }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "v1.1.6"; - name = "utf8proc-${version}"; + version = "v1.2"; - src = fetchurl { - url = "http://www.public-software-group.org/pub/projects/utf8proc/${version}/utf8proc-${version}.tar.gz"; - sha256 = "1rwr84pw92ajjlbcxq0da7yxgg3ijngmrj7vhh2qzsr2h2kqzp7y"; + src = fetchFromGitHub { + owner = "JuliaLang"; + repo = "utf8proc"; + rev = "${version}"; + sha256 = "1ryjlcnpfm7fpkq6444ybi576hbnh2l0w7kjhbqady5lxwjyg3pf"; }; installPhase = '' - mkdir -pv $out/lib $out/include - cp libutf8proc.so libutf8proc.a $out/lib - cp utf8proc.h $out/include + make install prefix=$out ''; - meta = { - description = "A library for processing UTF-8 encoded Unicode strings"; - homepage = http://www.public-software-group.org/utf8proc; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + meta = with stdenv.lib; { + description = "A clean C library for processing UTF-8 Unicode data"; + homepage = http://julialang.org/utf8proc; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.ftrvxmtrx ]; }; } From 24d2849dba5e868617b6d01e4b2a89a3d23daba6 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 30 May 2015 13:45:43 +0200 Subject: [PATCH 019/126] gtk-doc: update from 1.23 to 1.24 --- pkgs/development/tools/documentation/gtk-doc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index 58c8214bd46..6d93dc6def0 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gtk-doc-${version}"; - version = "1.23"; + version = "1.24"; src = fetchurl { url = "mirror://gnome/sources/gtk-doc/${version}/${name}.tar.xz"; - sha256 = "1i0q0zaj3f2xg478nxyfhaivkhi6mj0dn0s6qzshzhb625qj6p0b"; + sha256 = "12xmmcnq4138dlbhmqa45wqza8dky4lf856sp80h6xjwl2g7a85l"; }; # maybe there is a better way to pass the needed dtd and xsl files From 1d30557516d6287aaf49249ba70214bd794cc41d Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 30 May 2015 15:14:10 +0200 Subject: [PATCH 020/126] Fixed meta.license: s/licence/license --- pkgs/data/fonts/symbola/default.nix | 2 +- pkgs/development/libraries/libpfm/default.nix | 10 +++++----- pkgs/development/tools/toluapp/default.nix | 2 +- pkgs/games/scrolls/default.nix | 2 +- pkgs/misc/screensavers/rss-glx/default.nix | 2 +- pkgs/os-specific/linux/openvswitch/default.nix | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/data/fonts/symbola/default.nix b/pkgs/data/fonts/symbola/default.nix index d70fe3ca3f8..390bf9f523a 100644 --- a/pkgs/data/fonts/symbola/default.nix +++ b/pkgs/data/fonts/symbola/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode"; - # In lieu of a licence: + # In lieu of a license: # Fonts in this site are offered free for any use; # they may be installed, embedded, opened, edited, modified, regenerated, posted, packaged and redistributed. license = stdenv.lib.licenses.free; diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index cbb314a7bb7..c08ff265194 100644 --- a/pkgs/development/libraries/libpfm/default.nix +++ b/pkgs/development/libraries/libpfm/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { installFlags = "DESTDIR=\${out} PREFIX= LDCONFIG=true"; - meta = { + meta = with stdenv.lib; { description = "Helper library to program the performance monitoring events"; longDescription = '' This package provides a library, called libpfm4 which is used to @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { events such as those provided by the Performance Monitoring Unit (PMU) of modern processors. ''; - licence = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.pierron ]; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl2; + maintainers = [ maintainers.pierron ]; + platforms = platforms.all; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/development/tools/toluapp/default.nix index 5edc57e2f81..73a8b64ed22 100644 --- a/pkgs/development/tools/toluapp/default.nix +++ b/pkgs/development/tools/toluapp/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { installPhase = ''scons install''; meta = { - licence = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/games/scrolls/default.nix b/pkgs/games/scrolls/default.nix index 899c851c667..da4a34cfec8 100644 --- a/pkgs/games/scrolls/default.nix +++ b/pkgs/games/scrolls/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { platforms = [ "x86_64-linux" ]; - licence = stdenv.lib.licenses.unfree; + license = stdenv.lib.licenses.unfree; }; src = fetchurl { diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index 48d88ed40ce..56d176a710c 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { This package currently contains all of the screensavers from the original collection, plus a few others. ''; - licence = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index 67cbbd13826..0e5dbeebf92 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { --replace "self.cert_dir" "root_prefix + self.cert_dir" ''; - meta = { + meta = with stdenv.lib; { platforms = platforms.linux; description = "A multilayer virtual switch"; longDescription = @@ -60,6 +60,6 @@ in stdenv.mkDerivation rec { to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V. ''; homepage = "http://openvswitch.org/"; - licence = "Apache 2.0"; + license = licenses.asl20; }; } From 6732b3b8adbe376c4ecad10193b845286e607f8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 30 May 2015 15:41:34 +0200 Subject: [PATCH 021/126] clang-3.4: fix build by adding zlib I didn't care enough to search for cause of the regression. --- pkgs/development/compilers/llvm/3.4/clang.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix index cd060e3a65d..51e871f2ca4 100644 --- a/pkgs/development/compilers/llvm/3.4/clang.nix +++ b/pkgs/development/compilers/llvm/3.4/clang.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }: +{ stdenv, fetch, cmake, libxml2, libedit, llvm, zlib, version, clang-tools-extra_src }: stdenv.mkDerivation { name = "clang-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { patches = [ ./clang-separate-build.patch ./clang-purity.patch ]; - buildInputs = [ cmake libedit libxml2 ]; + buildInputs = [ cmake libedit libxml2 zlib ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" From 45d859192b8f25fca6a1436bb5b4ad0a7391c2bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 30 May 2015 17:19:32 +0200 Subject: [PATCH 022/126] clutter-gst_3_0: fix build by using newer clutter --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c0e785846a..778d011af6e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5813,7 +5813,9 @@ let clutter-gst = callPackage ../development/libraries/clutter-gst { }; - clutter-gst_3_0 = callPackage ../development/libraries/clutter-gst/3.0.nix { }; + clutter-gst_3_0 = callPackage ../development/libraries/clutter-gst/3.0.nix { + clutter = clutter_1_22; + }; clutter_gtk = callPackage ../development/libraries/clutter-gtk { }; clutter_gtk_0_10 = callPackage ../development/libraries/clutter-gtk/0.10.8.nix { }; From 643c5154891032ec66555a43e205f671b84f40b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 30 May 2015 17:34:25 +0200 Subject: [PATCH 023/126] dillo: minor update to fix build (after fltk bump) --- pkgs/applications/networking/browsers/dillo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix index c6c86263888..6760e123ccb 100644 --- a/pkgs/applications/networking/browsers/dillo/default.nix +++ b/pkgs/applications/networking/browsers/dillo/default.nix @@ -6,12 +6,12 @@ , libXcursor, libXi, libXinerama }: stdenv.mkDerivation rec { - version = "3.0.4"; + version = "3.0.4.1"; name = "dillo-${version}"; src = fetchurl { url = "http://www.dillo.org/download/${name}.tar.bz2"; - sha256 = "0ffz481vgl7f12f575pmbagm8swgxgv9s9c0p8c7plhd04jsnazf"; + sha256 = "0iw617nnrz3541jkw5blfdlk4x8jxb382pshi8nfc7xd560c95zd"; }; buildInputs = with stdenv.lib; From 080dc99df72072e146e0bbcf6e370cbb18dc2eb5 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 30 May 2015 18:06:26 +0200 Subject: [PATCH 024/126] torque: update from 4.2.8 to 4.2.10, fixes CVE-2014-3684 --- pkgs/servers/computing/torque/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/computing/torque/default.nix b/pkgs/servers/computing/torque/default.nix index d95e929ff82..6d0037f74bd 100644 --- a/pkgs/servers/computing/torque/default.nix +++ b/pkgs/servers/computing/torque/default.nix @@ -1,19 +1,27 @@ -{ stdenv, fetchurl, openssl, flex, bison, pkgconfig, groff, libxml2, utillinux }: +{ stdenv, fetchurl, openssl, flex, bison, pkgconfig, groff, libxml2, utillinux +, file, libtool, which }: stdenv.mkDerivation rec { - name = "torque-4.2.8"; + name = "torque-4.2.10"; src = fetchurl { name = "${name}.tar.gz"; - url = "http://www.adaptivecomputing.com/index.php?wpfb_dl=2730"; - sha256 = "1sjpvndzm9ccdmfwdf9887ppmapawfsh5qdkzr92kadg5jxp796j"; + url = "http://www.adaptivecomputing.com/index.php?wpfb_dl=2880"; + sha256 = "1qpsk3bla6b6m7m0i1xpr183yj79liy3p34xhnz1grgq0776wg5l"; }; - buildInputs = [ openssl flex bison pkgconfig groff libxml2 utillinux ]; + buildInputs = [ openssl flex bison pkgconfig groff libxml2 utillinux libtool + which ]; enableParallelBuilding = true; preConfigure = '' + substituteInPlace ./configure \ + --replace '/usr/bin/file' '${file}/bin/file' + + # fix broken libxml2 detection + sed -i '/xmlLib\=/c\xmlLib=xml2' ./configure + for s in fifo cray_t3e dec_cluster msic_cluster sgi_origin umn_cluster; do substituteInPlace src/scheduler.cc/samples/$s/Makefile.in \ --replace "schedprivdir = " "schedprivdir = $out/" From 5d8981ee4d4c0e7a549c4578a5b8d58b92bad0c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 30 May 2015 19:16:38 +0200 Subject: [PATCH 025/126] opencascade-6.5: work around a build problem --- pkgs/development/libraries/opencascade/6.5.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/opencascade/6.5.nix b/pkgs/development/libraries/opencascade/6.5.nix index b0ef9e83242..4228c285dfd 100644 --- a/pkgs/development/libraries/opencascade/6.5.nix +++ b/pkgs/development/libraries/opencascade/6.5.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { # -fpermissive helps building opencascade, although gcc detects a flaw in the code # and reports an error otherwise. Further versions may fix that. NIX_CFLAGS_COMPILE = "-fpermissive" + # https://bugzilla.redhat.com/show_bug.cgi?id=902561 + + " -DUSE_INTERP_RESULT" # https://bugs.freedesktop.org/show_bug.cgi?id=83631 + " -DGLX_GLXEXT_LEGACY"; From 593892a761371f3c7bb28d6118793811ff042ceb Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Sat, 30 May 2015 10:18:54 -0700 Subject: [PATCH 026/126] capnproto: bump to 0.5.1.2 --- pkgs/development/libraries/capnproto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix index c6bd7e4f4d4..8a67206d5b4 100644 --- a/pkgs/development/libraries/capnproto/default.nix +++ b/pkgs/development/libraries/capnproto/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "capnproto-${version}"; - version = "0.5.0"; + version = "0.5.1.2"; src = fetchurl { url = "https://capnproto.org/capnproto-c++-${version}.tar.gz"; - sha256 = "01fsf60zlyc6rlhnrh8gd9jj5gs52ancb50ml3w7gwq55zgx2rf7"; + sha256 = "0a89v6sigsyj9vii0d5kqs2fdv73r71f8czzhdvqdvk3p0mlcgx2"; }; meta = with stdenv.lib; { From f498d0110e45aef9ce7f2a9b6a4ee6bc67a67a59 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 30 May 2015 16:08:09 +0200 Subject: [PATCH 027/126] getdata: update from 0.8.6 to 0.8.8 --- pkgs/development/libraries/getdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/development/libraries/getdata/default.nix index 6b53e07acdb..464d2f66e45 100644 --- a/pkgs/development/libraries/getdata/default.nix +++ b/pkgs/development/libraries/getdata/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "getdata-0.8.6"; + name = "getdata-0.8.8"; src = fetchurl { url = "mirror://sourceforge/getdata/${name}.tar.bz2"; - sha256 = "1cxmyqg6m7346q37wrr05zmyip1qcgi4vpy3xki20nxwkaw37lz8"; + sha256 = "1p5sncbr0bjrx1ki57di0j9rl5ksv0hbfy7bkcb4vaz9z9mrn8xj"; }; meta = with stdenv.lib; { From 20a36e412077cf652d17ee7f44f88bb6165e60db Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 30 May 2015 16:08:36 +0200 Subject: [PATCH 028/126] netcdf: update from 4.3.2 to 4.3.3.1 --- pkgs/development/libraries/netcdf/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index 505c9b5c0d9..9659ae5273d 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, - zlib, hdf5, + zlib, hdf5, m4, curl # for DAP }: stdenv.mkDerivation rec { - name = "netcdf-4.3.2"; + name = "netcdf-4.3.3.1"; src = fetchurl { url = "http://www.unidata.ucar.edu/downloads/netcdf/ftp/${name}.tar.gz"; - sha256 = "57086b4383ce9232f05aad70761c2a6034b1a0c040260577d369b3bbfe6d248e"; + sha256 = "06ds8zm4qvjlqvv4qb637cqr0xgvbhnghrddisad5vj81s5kvpmx"; }; buildInputs = [ - zlib hdf5 curl + zlib hdf5 m4 curl ]; configureFlags = [ From 3c09ff6d1544ddbf6db51977f48f55c4fe75edcb Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sat, 30 May 2015 19:26:53 +0200 Subject: [PATCH 029/126] prevent accidentally installing unwrapped steam --- pkgs/games/steam/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 0478e208da2..2f2ce921176 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, traceDeps ? false}: stdenv.mkDerivation rec { - name = "${program}-${version}"; + name = "${program}-original-${version}"; program = "steam"; version = "1.0.0.49"; From 6bc372af6900073b077e6fb34f12f60fa0011e78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 30 May 2015 19:34:55 +0200 Subject: [PATCH 030/126] inadyn: fix build and typo in name /cc maintainer @viric. --- pkgs/tools/networking/inadyn/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index f95bc49580d..0d9ac7f6475 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, gnutls33 }: +{ stdenv, fetchFromGitHub, gnutls33, autoreconfHook }: let version = "1.99.13"; in stdenv.mkDerivation { - name = "inadny-${version}"; + name = "inadyn-${version}"; src = fetchFromGitHub { repo = "inadyn"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { export makeFlags=prefix=$out ''; - buildInputs = [ gnutls33 ]; + buildInputs = [ gnutls33 autoreconfHook ]; NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; From 223cfb82f4063d93bea34076952d8fd335a10ca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 30 May 2015 19:40:31 +0200 Subject: [PATCH 031/126] kde4.libkvkontakte: fix build by using pkgconfig --- pkgs/development/libraries/libkvkontakte/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libkvkontakte/default.nix b/pkgs/development/libraries/libkvkontakte/default.nix index a56f5784b4d..2a346abed74 100644 --- a/pkgs/development/libraries/libkvkontakte/default.nix +++ b/pkgs/development/libraries/libkvkontakte/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, qjson, kdelibs }: +{ stdenv, fetchgit, pkgconfig, qjson, kdelibs }: stdenv.mkDerivation { name = "libkvkonatkte-1.0-pre20120103"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0ryvjfrsws845k9s76715xid48y01h0ynb5wdx6ln8cm5z5wqj61"; }; - buildInputs = [ qjson kdelibs ]; + buildInputs = [ pkgconfig qjson kdelibs ]; meta = { homepage = https://projects.kde.org/projects/extragear/libs/libkvkontakte; From 35b2be0d24342632bb351d1970770efec88741f3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 27 May 2015 10:26:48 +0200 Subject: [PATCH 032/126] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-files/commit/19c8675e5d744065c03f60469d8ea2be0ba83bb8 with hackage2nix revision 66f6b1336269ffa8e106822407e09e3dbadffcd1 --- .../haskell-modules/hackage-packages.nix | 1163 ++++++++++------- 1 file changed, 705 insertions(+), 458 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7ca94fe0499..ae94120305b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -720,13 +720,12 @@ self: { ({ mkDerivation, base, containers, mtl, pretty }: mkDerivation { pname = "AlgorithmW"; - version = "0.1.0.1"; - sha256 = "0qqdd8220h6h1j7i121h84wysjrmv633md3c7sk01i1p774d67k4"; + version = "0.1.1.0"; + sha256 = "0avkxhw5hp00znhmqw3kqxx165ba5y5kgq8b9ahp679p0qf84a3c"; isLibrary = false; isExecutable = true; buildDepends = [ base containers mtl pretty ]; - jailbreak = true; - homepage = "http://hackage.haskell.org/package/AlgorithmW"; + homepage = "https://github.com/mgrabmueller/AlgorithmW"; description = "Example implementation of Algorithm W for Hindley-Milner type inference"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -1440,6 +1439,7 @@ self: { PrimitiveArray split text tuple vector vector-binary-instances vector-th-unbox ]; + jailbreak = true; homepage = "http://www.bioinf.uni-leipzig.de/~choener/"; description = "Efficient RNA/DNA representations"; license = stdenv.lib.licenses.gpl3; @@ -1537,8 +1537,8 @@ self: { }: mkDerivation { pname = "BlogLiterately"; - version = "0.7.1.10"; - sha256 = "142m20523jd65s53w2myqc24sj6mi3kff8ziqqja3q0whh79n79w"; + version = "0.8"; + sha256 = "0sii2m3ha5z5di1flswd6c0xih652y73xdrzi3m662vhm9q94slv"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -1547,7 +1547,6 @@ self: { hscolour lens mtl pandoc pandoc-citeproc pandoc-types parsec process split strict temporary transformers ]; - jailbreak = true; homepage = "http://byorgey.wordpress.com/blogliterately/"; description = "A tool for posting Haskelly articles to blogs"; license = "GPL"; @@ -2195,7 +2194,6 @@ self: { homepage = "http://www.haskell.org/cabal/"; description = "A framework for packaging Haskell software"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "CabalSearch" = callPackage @@ -3424,19 +3422,18 @@ self: { }) {}; "DefendTheKing" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, GLUT - , haskell98, HTTP, MaybeT, mtl, network, peakachu, random, time - , utility-ht, zlib + ({ mkDerivation, base, binary, bytestring, containers, GLUT, HTTP + , MaybeT, mtl, network, peakachu, random, time, utility-ht, zlib }: mkDerivation { pname = "DefendTheKing"; - version = "0.3"; - sha256 = "1qnf62c91q94galndi0f7pfyzvk0qwi3gzhwcazkwinildjy8zw6"; + version = "0.3.1"; + sha256 = "09wzab0343m55xq4dxfv0f9lwpd5v97mymd6408s6p82xa2vqlzw"; isLibrary = false; isExecutable = true; buildDepends = [ - base binary bytestring containers GLUT haskell98 HTTP MaybeT mtl - network peakachu random time utility-ht zlib + base binary bytestring containers GLUT HTTP MaybeT mtl network + peakachu random time utility-ht zlib ]; homepage = "http://github.com/yairchu/defend/tree"; description = "A simple RTS game"; @@ -7414,10 +7411,9 @@ self: { ({ mkDerivation, base, template-haskell, th-lift }: mkDerivation { pname = "HaPy"; - version = "0.1.1.0"; - sha256 = "1gxxhyidcn3lcvmbjby364cypk6xmmsv5qdd0m16d06688cl9mq7"; + version = "0.1.1.1"; + sha256 = "0li04k27pkq7ci1dfx4sl022ivl4gjqy5ny25jszifwrx4n4pmwz"; buildDepends = [ base template-haskell th-lift ]; - jailbreak = true; homepage = "https://github.com/sakana/HaPy"; description = "Haskell bindings for Python"; license = stdenv.lib.licenses.mit; @@ -8482,6 +8478,7 @@ self: { buildDepends = [ aeson base containers lens lens-aeson mtl time transformers wreq ]; + jailbreak = true; homepage = "https://github.com/sjoerdvisscher/HueAPI"; description = "API for controlling Philips Hue lights"; license = stdenv.lib.licenses.bsd3; @@ -8931,6 +8928,7 @@ self: { aeson base HUnit language-typescript stack-prism test-framework test-framework-hunit text ]; + jailbreak = true; homepage = "https://github.com/MedeaMelana/JsonGrammar2"; description = "Combinators for bidirectional JSON parsing"; license = stdenv.lib.licenses.bsd3; @@ -11961,6 +11959,7 @@ self: { base QuickCheck test-framework test-framework-quickcheck2 test-framework-th ]; + jailbreak = true; homepage = "http://www.bioinf.uni-leipzig.de/Software/gADP/"; description = "Efficient multidimensional arrays"; license = stdenv.lib.licenses.bsd3; @@ -14327,6 +14326,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Tainted" = callPackage + ({ mkDerivation, base, mtl }: + mkDerivation { + pname = "Tainted"; + version = "0.1.0.2"; + sha256 = "1mjr81z42qhwa6njlvlsslpzbbpiab88ns8g8amskwv159gk6mlb"; + buildDepends = [ base mtl ]; + homepage = "https://github.com/RossMeikleham/Tainted"; + description = "Tainted type, and associated operations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Takusen" = callPackage ({ mkDerivation, base, mtl, old-time, time }: mkDerivation { @@ -14585,14 +14596,13 @@ self: { ({ mkDerivation, base, containers, mtl }: mkDerivation { pname = "TransformersStepByStep"; - version = "0.1.0.1"; - sha256 = "0dxxgwcn4in3rpfn77c4g8h6l7326m8ikcsrl7pm6gifw667qpmv"; + version = "0.1.1.0"; + sha256 = "1cd8sh6gi9zmvd70kzw1x9ycanfsyphjdy3r65xrph54ilwy511p"; isLibrary = false; isExecutable = true; buildDepends = [ base containers mtl ]; - jailbreak = true; - homepage = "http://hackage.haskell.org/package/TransformersStepByStep"; - description = "Tutorial to monad transformers"; + homepage = "https://github.com/mgrabmueller/TransformersStepByStep"; + description = "Tutorial on monad transformers"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -15427,12 +15437,12 @@ self: { }) {}; "Win32-services" = callPackage - ({ mkDerivation, Advapi32, base, Win32 }: + ({ mkDerivation, Advapi32, base, Win32, Win32-errors }: mkDerivation { pname = "Win32-services"; - version = "0.2.5.1"; - sha256 = "1biirmn4fmw9zdhvbwzj5lrw2ac5wn6zz2zvzqi4b0gz8hlywzr7"; - buildDepends = [ base Win32 ]; + version = "0.3"; + sha256 = "07vby574s528g259zq8jby1327b6jqn4zlzs406ml99w1p02d9js"; + buildDepends = [ base Win32 Win32-errors ]; extraLibraries = [ Advapi32 ]; homepage = "http://github.com/mikesteele81/win32-services"; description = "Windows service applications"; @@ -15441,14 +15451,16 @@ self: { }) { Advapi32 = null;}; "Win32-services-wrapper" = callPackage - ({ mkDerivation, base, directory, filepath, Win32, Win32-services + ({ mkDerivation, base, directory, filepath, Win32, Win32-errors + , Win32-services }: mkDerivation { pname = "Win32-services-wrapper"; - version = "0.1.2.0"; - sha256 = "01fvb9sraqw1ar5pvs8s23y8syix50wh6yifsm65fs4vy1nk3xfb"; - buildDepends = [ base directory filepath Win32 Win32-services ]; - jailbreak = true; + version = "0.1.3.0"; + sha256 = "1nihf12bcgahs5220pdny1kf54973qxh7llhzv5d9s9lxias2jyd"; + buildDepends = [ + base directory filepath Win32 Win32-errors Win32-services + ]; description = "Wrapper code for making a Win32 service"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -16129,6 +16141,7 @@ self: { aeson base base64-bytestring bson bytestring data-default-class scientific text time unordered-containers uuid vector ]; + jailbreak = true; homepage = "https://github.com/philopon/abeson"; description = "interconversion between aeson and bson"; license = stdenv.lib.licenses.mit; @@ -16896,8 +16909,8 @@ self: { ({ mkDerivation, base, ghc-prim, mtl, transformers }: mkDerivation { pname = "acme-timemachine"; - version = "0.0.0.0"; - sha256 = "0sn20lz4bdrn7jz2ik4dr05h59qdjavnsp1z8656nbymndgi54iz"; + version = "0.0.0.1"; + sha256 = "06zhslaa7kp75gvnvh2ln15bqbdqgbgya6i4r2jkqxycnk8sczzl"; buildDepends = [ base ghc-prim mtl transformers ]; description = "An easy way to perform and unperform IO actions"; license = stdenv.lib.licenses.bsd3; @@ -16933,15 +16946,14 @@ self: { }: mkDerivation { pname = "active"; - version = "0.2.0.2"; - sha256 = "1xmm0xa4npdsbib5vmgzzqyq8b1abqx2j142zfal3b3nprfjpngk"; + version = "0.2.0.3"; + sha256 = "18z6gki5bjr4847r90aw89j8gkfs0w9dv1w2na4msd36i3jym3sc"; buildDepends = [ base lens linear semigroupoids semigroups vector ]; testDepends = [ base lens linear QuickCheck semigroupoids semigroups vector ]; - jailbreak = true; description = "Abstractions for animation"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -17264,8 +17276,8 @@ self: { }: mkDerivation { pname = "aeson"; - version = "0.8.1.1"; - sha256 = "15fdicmgkcadgqiqql3f4iv2s01aiclny8hjz3d6ryivjsch7cyh"; + version = "0.9.0.1"; + sha256 = "1g7qdq7zpyvqwmh4sfhizqpb51cg24lrcj9vq5msz8k896y7vfcj"; buildDepends = [ attoparsec base blaze-builder bytestring containers deepseq dlist ghc-prim hashable mtl scientific syb template-haskell text time @@ -17461,6 +17473,7 @@ self: { template-haskell temporary test-framework test-framework-hunit test-framework-quickcheck2 text unordered-containers vector ]; + jailbreak = true; homepage = "https://github.com/timjb/aeson-schema"; description = "Haskell JSON schema validator and parser generator"; license = stdenv.lib.licenses.mit; @@ -17529,6 +17542,7 @@ self: { aeson aeson-qq base bytestring hspec text unordered-containers vector ]; + jailbreak = true; homepage = "https://github.com/begriffs/aeson-t"; description = "Transform JSON"; license = stdenv.lib.licenses.mit; @@ -17552,8 +17566,8 @@ self: { }: mkDerivation { pname = "aeson-utils"; - version = "0.3.0.1"; - sha256 = "1y6nm841y3bvd7kixhwqk7h0pf7ipvfwj2hdq15ij08nlr48dzyl"; + version = "0.3.0.2"; + sha256 = "07sbvmm158yqmw4hri9l66ag4r6l59x230gbjm9r97w4x0dlp0bi"; buildDepends = [ aeson attoparsec base bytestring scientific text ]; @@ -17764,23 +17778,26 @@ self: { }) {}; "airship" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, bytestring - , case-insensitive, either, http-date, http-media, http-types - , lifted-base, monad-control, mtl, network, old-locale, random - , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers - , transformers-base, unordered-containers, wai, warp + ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder + , bytestring, bytestring-trie, case-insensitive, cryptohash + , directory, either, filepath, http-date, http-media, http-types + , lifted-base, mime-types, monad-control, mtl, network, old-locale + , random, tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers, transformers-base, unix, unordered-containers, wai + , warp }: mkDerivation { pname = "airship"; - version = "0.1.0.0"; - sha256 = "0x99mwyhnhs89hcwi23pjcd6qwihr4ldli68f701ilqp7cxxyk16"; + version = "0.3.0.0"; + sha256 = "118valfn96mwdl8pfrvpqgp1rg9armcwlw2r4lvvzb6ci0nyp9n8"; isLibrary = true; isExecutable = true; buildDepends = [ - attoparsec base blaze-builder bytestring case-insensitive either - http-date http-media http-types lifted-base monad-control mtl - network old-locale random text time transformers transformers-base - unordered-containers wai warp + attoparsec base base64-bytestring blaze-builder bytestring + bytestring-trie case-insensitive cryptohash directory either + filepath http-date http-media http-types lifted-base mime-types + monad-control mtl network old-locale random text time transformers + transformers-base unix unordered-containers wai warp ]; testDepends = [ base bytestring tasty tasty-hunit tasty-quickcheck text @@ -20158,24 +20175,22 @@ self: { "approximate" = callPackage ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq - , directory, distributive, doctest, filepath, generic-deriving - , ghc-prim, hashable, hashable-extras, lens, log-domain, pointed - , safecopy, semigroupoids, semigroups, simple-reflect, vector + , directory, doctest, filepath, ghc-prim, hashable, hashable-extras + , lens, log-domain, pointed, safecopy, semigroupoids, semigroups + , simple-reflect, vector }: mkDerivation { pname = "approximate"; - version = "0.2.1.1"; - sha256 = "18ac2z1yqqksqmq9ch36ja3qjn9v6cgyzxs64lnnp98mgcwsmhwr"; + version = "0.2.2"; + sha256 = "1ym9f9vr83ks9lrdl54jaxw3ds2n943m6kqafwnzyypigcj3psxq"; buildDepends = [ - base binary bytes cereal comonad deepseq distributive - generic-deriving ghc-prim hashable hashable-extras lens log-domain - pointed safecopy semigroupoids semigroups vector + base binary bytes cereal comonad deepseq ghc-prim hashable + hashable-extras lens log-domain pointed safecopy semigroupoids + semigroups vector ]; testDepends = [ - base directory doctest filepath generic-deriving semigroups - simple-reflect + base directory doctest filepath semigroups simple-reflect ]; - jailbreak = true; homepage = "http://github.com/analytics/approximate/"; description = "Approximate discrete values and numbers"; license = stdenv.lib.licenses.bsd3; @@ -20253,27 +20268,28 @@ self: { "arbtt" = callPackage ({ mkDerivation, aeson, array, base, binary, bytestring , bytestring-progress, containers, deepseq, directory, filepath - , HUnit, libXScrnSaver, old-locale, parsec, pcre-light - , process-extras, strict, tasty, tasty-golden, tasty-hunit - , terminal-progress-bar, time, transformers, unix, utf8-string, X11 + , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty + , tasty-golden, tasty-hunit, terminal-progress-bar, time + , transformers, unix, utf8-string, X11 }: mkDerivation { pname = "arbtt"; - version = "0.9.0.2"; - sha256 = "0ab5qrsrp6fcc2p1a4idbqazs7yrh957bfagdmw6b7rrydpig1lc"; + version = "0.9.0.3"; + sha256 = "1zki720s444qq22hxsbqmanpv379894l7xhql8p1fq8cdwmfj541"; isLibrary = false; isExecutable = true; buildDepends = [ aeson array base binary bytestring bytestring-progress containers - deepseq directory filepath old-locale parsec pcre-light strict + deepseq directory filepath parsec pcre-light strict terminal-progress-bar time transformers unix utf8-string X11 ]; testDepends = [ - base binary bytestring containers deepseq directory HUnit - old-locale parsec pcre-light process-extras tasty tasty-golden - tasty-hunit time transformers unix utf8-string + base binary bytestring containers deepseq directory parsec + pcre-light process-extras tasty tasty-golden tasty-hunit time + transformers unix utf8-string ]; extraLibraries = [ libXScrnSaver ]; + jailbreak = true; homepage = "http://arbtt.nomeata.de/"; description = "Automatic Rule-Based Time Tracker"; license = "GPL"; @@ -21225,6 +21241,7 @@ self: { http-types jwt mtl network network-api-support network-uri snap snap-core split text time time-units transformers ]; + jailbreak = true; homepage = "https://bitbucket.org/ajknoll/atlassian-connect-core"; description = "Atlassian Connect snaplet for the Snap Framework and helper code"; license = stdenv.lib.licenses.asl20; @@ -21248,6 +21265,7 @@ self: { aeson base bytestring Cabal cases HUnit network network-uri scientific text time-units unordered-containers vector ]; + jailbreak = true; description = "Code that helps you create a valid Atlassian Connect Descriptor"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -22563,8 +22581,8 @@ self: { }: mkDerivation { pname = "b9"; - version = "0.5.4"; - sha256 = "1a7329c39m63knb5071ln2bpgb79q5gd3mpix6pm18dim20gciqj"; + version = "0.5.7"; + sha256 = "1ffj3ql27826dv20pz98xg3wsaylfsrwgggwxwipw6l2jypk3z7i"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -23091,6 +23109,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "base32string" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, hspec, text }: + mkDerivation { + pname = "base32string"; + version = "0.9.1"; + sha256 = "0cpa6bvam4zd2l2hb3sdngj0dx482c9rkz4jj87n6pxsmq9id4wy"; + buildDepends = [ aeson base binary bytestring text ]; + testDepends = [ base binary bytestring hspec text ]; + homepage = "http://www.leonmergen.com/opensource.html"; + description = "Fast and safe representation of a Base-32 string"; + license = stdenv.lib.licenses.mit; + }) {}; + "base58-bytestring" = callPackage ({ mkDerivation, base, bytestring, quickcheck-assertions , quickcheck-instances, tasty, tasty-quickcheck @@ -23226,8 +23257,8 @@ self: { }: mkDerivation { pname = "basic-prelude"; - version = "0.4.0"; - sha256 = "10zr3fb12fis33q74988fipljcjlcr1c94cf9kg0rfby2dc1z6v4"; + version = "0.4.1"; + sha256 = "041wnym7b8p70kcbkxxbgszmi2y88xs0ww357jrn0v6cc21h60j9"; buildDepends = [ base bytestring containers filepath hashable lifted-base ReadArgs safe text transformers unordered-containers vector @@ -23962,6 +23993,7 @@ self: { QuickCheck storable-tuple unordered-containers vector vector-binary-instances vector-th-unbox ]; + jailbreak = true; homepage = "http://www.bioinf.uni-leipzig.de/~choener/"; description = "bijections with multiple implementations"; license = stdenv.lib.licenses.bsd3; @@ -26057,6 +26089,7 @@ self: { aeson base doctest QuickCheck scientific tasty tasty-quickcheck text unordered-containers vector ]; + jailbreak = true; homepage = "https://github.com/philopon/blaze-json"; description = "tiny library for encoding json"; license = stdenv.lib.licenses.mit; @@ -26338,6 +26371,7 @@ self: { pointful text wai wai-extra wai-websockets warp websockets wl-pprint-text ]; + jailbreak = true; homepage = "https://blunt.herokuapp.com"; description = "Convert between pointfree and pointful expressions"; license = stdenv.lib.licenses.mit; @@ -27773,30 +27807,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "c2hs_0_20_1" = callPackage - ({ mkDerivation, array, base, containers, directory, dlist - , filepath, HUnit, language-c, pretty, process, shelly - , test-framework, test-framework-hunit, text, transformers - }: - mkDerivation { - pname = "c2hs"; - version = "0.20.1"; - sha256 = "1w2w9zxirzjd5lniwqakq59glgsh4mw3565x2l9qrin0bfjxkn3h"; - isLibrary = false; - isExecutable = true; - buildDepends = [ - array base containers directory dlist filepath language-c pretty - process - ]; - testDepends = [ - base filepath HUnit shelly test-framework test-framework-hunit text - transformers - ]; - homepage = "https://github.com/haskell/c2hs"; - description = "C->Haskell FFI tool that gives some cross-language type safety"; - license = stdenv.lib.licenses.gpl2; - }) {}; - "c2hs" = callPackage ({ mkDerivation, array, base, containers, directory, dlist , filepath, HUnit, language-c, pretty, process, shelly @@ -30521,15 +30531,14 @@ self: { }: mkDerivation { pname = "cheapskate"; - version = "0.1.0.3"; - sha256 = "0my7dkaicdl95289s6li4qzjv9qvgddp51m8nh8lk7qmwx2x5kc6"; + version = "0.1.0.4"; + sha256 = "0drx1hlqvdcrij4097q6bxhbfcqm73jsqv1wwhd3hsnjdmr46ch2"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base blaze-html bytestring containers data-default http-types mtl syb text uniplate wai wai-extra xss-sanitize ]; - jailbreak = true; homepage = "http://github.com/jgm/cheapskate"; description = "Experimental markdown processor"; license = stdenv.lib.licenses.bsd3; @@ -31690,6 +31699,7 @@ self: { web-plugins web-routes web-routes-happstack web-routes-th ]; buildTools = [ hsx2hs ]; + jailbreak = true; homepage = "http://www.clckwrks.com/"; description = "support for CMS/Blogging in clckwrks"; license = stdenv.lib.licenses.bsd3; @@ -32239,8 +32249,8 @@ self: { ({ mkDerivation, base, bytestring, HUnit, text }: mkDerivation { pname = "cmark"; - version = "0.3.2"; - sha256 = "0xf34i09m9a3mf6mzn48v6pdbkagsv5c0wmr64ih8d43n2figazk"; + version = "0.3.3.1"; + sha256 = "0l42l8bpn69zqz3s2jby1blqg7sx7cxmpnpwr8spkmh5vy8c8m5g"; buildDepends = [ base bytestring text ]; testDepends = [ base HUnit text ]; homepage = "https://github.com/jgm/commonmark-hs"; @@ -32340,8 +32350,8 @@ self: { ({ mkDerivation, base, mtl, split, syb, transformers }: mkDerivation { pname = "cmdlib"; - version = "0.3.5"; - sha256 = "0218f4rl64wvvka95m969hg5y9vc29dqaawfcnk7d1qsv3hx9ydl"; + version = "0.3.6"; + sha256 = "0mxk7yy3sglxc97my5lnphisg6fawifrbdbpz31h7ybiqccx4hsn"; isLibrary = true; isExecutable = true; buildDepends = [ base mtl split syb transformers ]; @@ -33389,8 +33399,8 @@ self: { ({ mkDerivation, base, contravariant }: mkDerivation { pname = "composition-extra"; - version = "0.0.0.2"; - sha256 = "1vicnzxamxhvw824y5dyxf4b303h2jqxs3djc1y33l5ppik8w6fh"; + version = "1.0.0.1"; + sha256 = "0i7jzn3grc23nhnp1i4ppbh30nq8pvfn35vz2vdfsivmaa5fnp5v"; buildDepends = [ base contravariant ]; description = "Combinators for unorthodox structure composition"; license = stdenv.lib.licenses.bsd3; @@ -33599,6 +33609,7 @@ self: { aeson base binary bytestring cmdargs concraft containers lazy-io mtl network process sgd split tagset-positional text transformers ]; + jailbreak = true; homepage = "http://zil.ipipan.waw.pl/Concraft"; description = "Morphological tagger for Polish"; license = stdenv.lib.licenses.bsd3; @@ -34029,8 +34040,8 @@ self: { }: mkDerivation { pname = "conduit-extra"; - version = "1.1.8"; - sha256 = "15ndbid0272izjd4mdhg0k5yaabwphav6m1amkndb7jjqls499zl"; + version = "1.1.9"; + sha256 = "1bs28gs0xfsqywhm8bchap9zr10wxfrlpdphflhzkm8am2bgz55i"; buildDepends = [ attoparsec base blaze-builder bytestring conduit directory filepath monad-control network primitive process resourcet stm @@ -35462,6 +35473,7 @@ self: { isExecutable = true; buildDepends = [ aeson base shakespeare tagsoup text ]; testDepends = [ aeson base HTF HUnit ]; + jailbreak = true; homepage = "https://github.com/prowdsponsor/country-codes"; description = "ISO 3166 country codes and i18n names"; license = stdenv.lib.licenses.bsd3; @@ -35958,26 +35970,25 @@ self: { "creatur" = callPackage ({ mkDerivation, array, base, binary, bytestring, cereal, cond - , directory, filepath, gray-extended, hdaemonize, HUnit + , directory, filepath, gray-extended, hdaemonize, hsyslog, HUnit , MonadRandom, mtl, old-locale, process, QuickCheck, random, split , temporary, test-framework, test-framework-hunit , test-framework-quickcheck2, time, transformers, unix, zlib }: mkDerivation { pname = "creatur"; - version = "5.9.5"; - sha256 = "0wzdggsgrxpifk8z8y4mqq029dmylvg16x19r28f688rgpz62y0j"; + version = "5.9.6"; + sha256 = "0lxmsd59sa37j8bc7y6v29s8wlscqa4xz15p60jiy5ks7am61wa5"; buildDepends = [ array base bytestring cereal cond directory filepath gray-extended - hdaemonize MonadRandom mtl old-locale process random split time - transformers unix zlib + hdaemonize hsyslog MonadRandom mtl old-locale process random split + time transformers unix zlib ]; testDepends = [ - array base binary cereal directory filepath HUnit MonadRandom mtl - QuickCheck temporary test-framework test-framework-hunit - test-framework-quickcheck2 + array base binary cereal directory filepath hsyslog HUnit + MonadRandom mtl QuickCheck temporary test-framework + test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; homepage = "https://github.com/mhwombat/creatur"; description = "Framework for artificial life experiments"; license = stdenv.lib.licenses.bsd3; @@ -37606,8 +37617,8 @@ self: { }) {}; "darcs-cabalized" = callPackage - ({ mkDerivation, array, base, bytestring, containers, curl, curses - , directory, html, HUnit, mtl, old-time, parsec, process + ({ mkDerivation, array, base, bytestring, containers, curl + , directory, html, HUnit, mtl, ncurses, old-time, parsec, process , QuickCheck, regex-compat, unix, zlib }: mkDerivation { @@ -37620,12 +37631,13 @@ self: { array base bytestring containers directory html HUnit mtl old-time parsec process QuickCheck regex-compat unix ]; - extraLibraries = [ curl curses zlib ]; + extraLibraries = [ curl ncurses zlib ]; homepage = "http://darcs.net/"; description = "David's Advanced Version Control System"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) curl; curses = null; inherit (pkgs) zlib;}; + }) { inherit (pkgs) curl; inherit (pkgs) ncurses; + inherit (pkgs) zlib;}; "darcs-fastconvert" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cmdlib, containers @@ -38971,8 +38983,8 @@ self: { }: mkDerivation { pname = "datadog"; - version = "0.1.0.0"; - sha256 = "19f1lcd73rj2v23cpxjnhby80p3gzlvb92fizw884km26az8y684"; + version = "0.1.0.1"; + sha256 = "05hfpkaizbgqi998wa0l0hb8qph8y7gwyx05690ljr0883m5a663"; buildDepends = [ aeson auto-update base buffer-builder bytestring lens lifted-base monad-control network old-locale text time transformers-base @@ -39096,12 +39108,19 @@ self: { }) {}; "datetime-sb" = callPackage - ({ mkDerivation, base, old-locale, old-time, QuickCheck, time }: + ({ mkDerivation, base, HUnit, old-locale, old-time, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , time + }: mkDerivation { pname = "datetime-sb"; - version = "0.2.2"; - sha256 = "10c9anhlgzy7s0yvws7v0mf2ckxvwip74jl8izia76smhq9hf3sw"; - buildDepends = [ base old-locale old-time QuickCheck time ]; + version = "0.2.4"; + sha256 = "1p2pn0jdidqcvmmi80njqm9z4amn1qp05nlxbnz1svpp6nc7amjf"; + buildDepends = [ base old-locale old-time time ]; + testDepends = [ + base HUnit old-locale old-time QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 time + ]; homepage = "http://github.com/stackbuilders/datetime"; description = "Utilities to make Data.Time.* easier to use."; license = "GPL"; @@ -40335,6 +40354,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "derive-enumerable" = callPackage + ({ mkDerivation, base, data-default }: + mkDerivation { + pname = "derive-enumerable"; + version = "0.1.1.0"; + sha256 = "08zhyn9xcmhrrnh7y2a1r7v4nmgm2af0d41ns0wjqais67rzsxsp"; + buildDepends = [ base data-default ]; + jailbreak = true; + homepage = "https://github.com/mgoszcz2/derive-enumerable"; + description = "Generic instances for enumerating complex data types"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "derive-gadt" = callPackage ({ mkDerivation, base, containers, haskell-src-exts , haskell-src-meta, pretty, template-haskell @@ -40643,8 +40675,8 @@ self: { }: mkDerivation { pname = "diagrams-builder"; - version = "0.7.0.1"; - sha256 = "1a4qzrakvis560azbwx234i7882kax1qs212g5ckkr9yvnyanp76"; + version = "0.7.0.2"; + sha256 = "0gkfnanrim060f1g4brp6qxdiq81fni1kml7n9x79pfqdmfhlhgq"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -40654,7 +40686,6 @@ self: { lucid-svg mtl split transformers ]; configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ]; - jailbreak = true; homepage = "http://projects.haskell.org/diagrams"; description = "hint-based build service for the diagrams graphics EDSL"; license = stdenv.lib.licenses.bsd3; @@ -40669,15 +40700,14 @@ self: { }: mkDerivation { pname = "diagrams-cairo"; - version = "1.3.0.1"; - sha256 = "04zcyvirlwzg4zrdrassxhfpfmp0hg263pzdi904nv2qp1idayqi"; + version = "1.3.0.2"; + sha256 = "1ja089hnq24fx5sd5r3r2z76pmwk5w6j93b7hha7m4jylcdjcnpp"; buildDepends = [ base bytestring cairo colour containers data-default-class diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl optparse-applicative pango split statestack transformers unix vector ]; - jailbreak = true; homepage = "http://projects.haskell.org/diagrams"; description = "Cairo backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; @@ -40690,14 +40720,13 @@ self: { }: mkDerivation { pname = "diagrams-canvas"; - version = "1.3"; - sha256 = "1zqq77ka3p7y9szqvlazwwaamz1b7lg2l8dp2wz5wycignchl26b"; + version = "1.3.0.1"; + sha256 = "0ik2kfgs5fi1a51hn9g5sii0n4j9lb0xd9paydz342b7zizy0w70"; buildDepends = [ base blank-canvas cmdargs containers data-default-class diagrams-core diagrams-lib lens mtl NumInstances optparse-applicative statestack text ]; - jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "HTML5 canvas backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; @@ -40713,8 +40742,8 @@ self: { }: mkDerivation { pname = "diagrams-contrib"; - version = "1.3.0.2"; - sha256 = "0zpga8x10xfbvicv26lwdcj5fcnsd5wifap7nsrw4dnvhmsmgsyc"; + version = "1.3.0.3"; + sha256 = "0sl99ikghfmiwa51iyacgrma844dqn44iw7c9ahx70r4l8j8is2q"; buildDepends = [ base circle-packing colour containers data-default data-default-class diagrams-core diagrams-lib diagrams-solve @@ -40725,7 +40754,6 @@ self: { base containers diagrams-lib HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "Collection of user contributions to diagrams EDSL"; license = stdenv.lib.licenses.bsd3; @@ -40738,13 +40766,12 @@ self: { }: mkDerivation { pname = "diagrams-core"; - version = "1.3"; - sha256 = "1abf2pxs659bqhl6d803ny11gacfa1wy5c1g47k0h8q9nq6jg3q9"; + version = "1.3.0.1"; + sha256 = "1whig632hx03ysiqidaxf29r67xl2skw0pkx454s036gdwl7sqj2"; buildDepends = [ adjunctions base containers distributive dual-tree lens linear monoid-extras mtl semigroups unordered-containers ]; - jailbreak = true; homepage = "http://projects.haskell.org/diagrams"; description = "Core libraries for diagrams EDSL"; license = stdenv.lib.licenses.bsd3; @@ -40772,8 +40799,8 @@ self: { }: mkDerivation { pname = "diagrams-haddock"; - version = "0.3.0.3"; - sha256 = "0cjl78swzsx7yx3ry2yv94gbn5mwc7gbrlldgqxxiw0ip3mbzk7r"; + version = "0.3.0.4"; + sha256 = "19dv368clrpjv2s0wd2ha61v80hlx4bkmy7qr9bgasaj3xxx3yqn"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -40786,7 +40813,6 @@ self: { base containers haskell-src-exts lens parsec QuickCheck tasty tasty-quickcheck ]; - jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "Preprocessor for embedding diagrams in Haddock documentation"; license = stdenv.lib.licenses.bsd3; @@ -40821,14 +40847,13 @@ self: { }: mkDerivation { pname = "diagrams-html5"; - version = "1.3"; - sha256 = "1g9a7wg7rdzqz0bl476gq7hbmsn369jdi67k9ikbjw7z9w060l5f"; + version = "1.3.0.1"; + sha256 = "1b6qrhqangdd2j3hzgslkq2sgk9wgk9ll9znfcmxpzc9k04aanqc"; buildDepends = [ base cmdargs containers data-default-class diagrams-core diagrams-lib lens mtl NumInstances optparse-applicative split statestack static-canvas text ]; - jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "HTML5 canvas backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; @@ -40845,8 +40870,8 @@ self: { }: mkDerivation { pname = "diagrams-lib"; - version = "1.3"; - sha256 = "0ap92ya3m74dq4x9zv1jx7cbb0cpzssgy8r7xqmzyq54grdxv01r"; + version = "1.3.0.1"; + sha256 = "04s21ms9w521fhm7hralq155lwisjv1pszz4cvpl3hc1jm1vwfa3"; buildDepends = [ active adjunctions array base colour containers data-default-class diagrams-core diagrams-solve directory distributive dual-tree @@ -40855,7 +40880,6 @@ self: { process semigroups system-filepath tagged text transformers unordered-containers ]; - jailbreak = true; homepage = "http://projects.haskell.org/diagrams"; description = "Embedded domain-specific language for declarative graphics"; license = stdenv.lib.licenses.bsd3; @@ -40909,14 +40933,13 @@ self: { }: mkDerivation { pname = "diagrams-postscript"; - version = "1.3.0.0"; - sha256 = "1dbnmlwm6blkh8x5rvsvlm6is84bvy9aymayf5k7nhvz9qb82n8v"; + version = "1.3.0.1"; + sha256 = "0w6ck71hjjx0rl930v2wapznjvrg5jq538gnyidp2yshik8xh2rp"; buildDepends = [ base containers data-default-class diagrams-core diagrams-lib dlist filepath hashable lens monoid-extras mtl semigroups split statestack ]; - jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "Postscript backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; @@ -40945,14 +40968,13 @@ self: { }: mkDerivation { pname = "diagrams-rasterific"; - version = "1.3.1.0"; - sha256 = "0as845zjd3wwixzgiy9vv68ginscsn5194966nhch9mbwxm32ljb"; + version = "1.3.1.2"; + sha256 = "1shkwhi7yv8cmv8697z7qqax0z7brcmjqlc17hldfflzwniiyk81"; buildDepends = [ base bytestring containers data-default-class diagrams-core diagrams-lib filepath FontyFruity hashable JuicyPixels lens mtl optparse-applicative Rasterific split unix ]; - jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "Rasterific backend for diagrams"; license = stdenv.lib.licenses.bsd3; @@ -40990,15 +41012,14 @@ self: { }: mkDerivation { pname = "diagrams-svg"; - version = "1.3.1.1"; - sha256 = "1agfyxv98j14pz6lhk8v5fvm534j7d0923260mrnd5ma6dvpshsw"; + version = "1.3.1.2"; + sha256 = "1kz70v0nccswd4df3240gy6liln4hi165zn8rm6f3palkxcfw3m3"; buildDepends = [ base base64-bytestring bytestring colour containers diagrams-core diagrams-lib directory filepath hashable JuicyPixels lens lucid-svg monoid-extras mtl old-time optparse-applicative process split text time ]; - jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "SVG backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; @@ -41741,9 +41762,10 @@ self: { ({ mkDerivation, array, base, containers, mtl, parsec }: mkDerivation { pname = "disassembler"; - version = "0.2.0.0"; - sha256 = "125191kzflzdj2wnghfc3dzpdxqc44iir5ypvhsz5xb773cdxwxv"; + version = "0.2.0.1"; + sha256 = "1yg1mb9w679m1iml0rx2i6gq1ps8s56da4dvn2knvkgg7m1cr39c"; buildDepends = [ array base containers mtl parsec ]; + homepage = "https://github.com/mgrabmueller/disassembler"; description = "Disassembler for X86 & AMD64 machine code"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -43696,6 +43718,7 @@ self: { base cairo colour either GLFW-b GLUtil OpenGL pango pipes transformers ]; + jailbreak = true; homepage = "https://github.com/adamwalker/dynamic-graph"; description = "Draw and update graphs in real time with OpenGL"; license = stdenv.lib.licenses.bsd3; @@ -44066,14 +44089,18 @@ self: { }) {}; "eddie" = callPackage - ({ mkDerivation, base, cmdargs, hint }: + ({ mkDerivation, base, bifunctors, classy-prelude, hint + , optparse-applicative, safe + }: mkDerivation { pname = "eddie"; - version = "0.5.1"; - sha256 = "1kqrxv195r1dhrnizaml9v20jpwgxq66xdr7jfmri4ai0pvjpzmk"; + version = "1.0.0"; + sha256 = "1zq2xadpl33mxdn99aim5rscwqgpy5w0lk7pa3k3h9x3d3c3qzxx"; isLibrary = false; isExecutable = true; - buildDepends = [ base cmdargs hint ]; + buildDepends = [ + base bifunctors classy-prelude hint optparse-applicative safe + ]; homepage = "http://chiselapp.com/user/mwm/repository/eddie/"; description = "Command line file filtering with haskell"; license = stdenv.lib.licenses.bsd3; @@ -44513,17 +44540,18 @@ self: { }) {}; "either" = callPackage - ({ mkDerivation, base, bifunctors, exceptions, free, monad-control - , MonadRandom, mtl, profunctors, semigroupoids, semigroups - , transformers, transformers-base + ({ mkDerivation, base, bifunctors, exceptions, free, mmorph + , monad-control, MonadRandom, mtl, profunctors, semigroupoids + , semigroups, transformers, transformers-base }: mkDerivation { pname = "either"; - version = "4.3.4"; - sha256 = "03gc4kl7cgww7y2qyg4y35zb43mamxnm41y4fi156yjgy1x0n7w8"; + version = "4.4"; + sha256 = "06519qw6y8ah168p2i03q1hmmrbmbai39fm6bna8rkp8zwlbkxww"; buildDepends = [ - base bifunctors exceptions free monad-control MonadRandom mtl - profunctors semigroupoids semigroups transformers transformers-base + base bifunctors exceptions free mmorph monad-control MonadRandom + mtl profunctors semigroupoids semigroups transformers + transformers-base ]; jailbreak = true; homepage = "http://github.com/ekmett/either/"; @@ -44567,6 +44595,7 @@ self: { aeson base bytestring ekg-core filepath network snap-core snap-server text time transformers unordered-containers ]; + jailbreak = true; homepage = "https://github.com/tibbe/ekg"; description = "Remote monitoring of processes"; license = stdenv.lib.licenses.bsd3; @@ -45031,18 +45060,19 @@ self: { }) {}; "elocrypt" = callPackage - ({ mkDerivation, base, MonadRandom, QuickCheck, random, tasty - , tasty-quickcheck, tasty-th + ({ mkDerivation, base, MonadRandom, proctest, QuickCheck, random + , tasty, tasty-quickcheck, tasty-th }: mkDerivation { pname = "elocrypt"; - version = "0.3.2"; - sha256 = "0dz7xgg41gia57hism3dldd7w2xbnkj9kjs9kr2vkfkg5igrwvcx"; + version = "0.4.0"; + sha256 = "0n19364jzifnb08pxzlsb05hpqz327zsfz138g0py3zy38wibszx"; isLibrary = true; isExecutable = true; buildDepends = [ base MonadRandom random ]; testDepends = [ - base MonadRandom QuickCheck random tasty tasty-quickcheck tasty-th + base MonadRandom proctest QuickCheck random tasty tasty-quickcheck + tasty-th ]; homepage = "https://www.github.com/sgillespie/elocrypt"; description = "Generate easy-to-remember, hard-to-guess passwords"; @@ -45115,10 +45145,8 @@ self: { }: mkDerivation { pname = "email-validate"; - version = "2.1.2"; - revision = "1"; - sha256 = "13r67kk5rjl54mwk4shap1rf8jdp1hsd6wpg4hgkf10vzk5vara5"; - editedCabalFile = "0add2fe9264e4307cb7d464ddaf54c8147396f36740228d124224f5a27689582"; + version = "2.1.3"; + sha256 = "1jw15hyj6p1155i3h5n4f728x33ym21ibpirkdiid0ksf6cpk5jv"; buildDepends = [ attoparsec base bytestring ghc-prim ]; testDepends = [ base bytestring HUnit QuickCheck test-framework @@ -45284,8 +45312,8 @@ self: { }: mkDerivation { pname = "engine-io"; - version = "1.2.5"; - sha256 = "09hndfmgvganfj2y53zj5dpy1dn8rain3fyxknr14ln8c75jprah"; + version = "1.2.6"; + sha256 = "1vxbpfldnqrw42vm8c0rqy4b56yig38mca5b83pl79f2z722l3v4"; buildDepends = [ aeson async attoparsec base base64-bytestring bytestring either free monad-loops mwc-random stm stm-delay text transformers @@ -45639,8 +45667,8 @@ self: { }: mkDerivation { pname = "epub-metadata"; - version = "4.2"; - sha256 = "1pj0z6avdwvqrnjgwn7x5ajc7nagr575cilxmvzj22zlzhz4if3p"; + version = "4.3"; + sha256 = "0gw5mfysvfqk9daa4807qq4xh190a1pzxmwwi2xbnpz7m4kyffyk"; buildDepends = [ base bytestring containers directory filepath hxt mtl regex-compat zip-archive @@ -45649,7 +45677,7 @@ self: { base bytestring directory filepath HUnit hxt mtl regex-compat zip-archive ]; - homepage = "http://ui3.info/d/proj/epub-metadata.html"; + homepage = "http://hub.darcs.net/dino/epub-metadata"; description = "Library for parsing epub document metadata"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -45660,8 +45688,8 @@ self: { }: mkDerivation { pname = "epub-tools"; - version = "2.5"; - sha256 = "0ksnzh2j1xa5jvql7b37dnld3pv1lqf62rfww6wv58hh3d1zmzwj"; + version = "2.6"; + sha256 = "0ncyam72y5jvad73mbrcsv8y1hl5yybrx59vc8gxsyiy9mbrvs6v"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -45671,7 +45699,7 @@ self: { testDepends = [ base directory epub-metadata filepath HUnit mtl parsec regex-compat ]; - homepage = "http://ui3.info/d/proj/epub-tools.html"; + homepage = "http://hub.darcs.net/dino/epub-tools"; description = "Command line utilities for working with epub files"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -46399,6 +46427,7 @@ self: { aeson async attoparsec base bytestring cereal containers network protobuf random sodium stm text time unordered-containers uuid ]; + jailbreak = true; homepage = "http://github.com/YoEight/eventstore"; description = "EventStore TCP Client"; license = stdenv.lib.licenses.bsd3; @@ -47009,8 +47038,8 @@ self: { }: mkDerivation { pname = "extensible-effects"; - version = "1.10.0.1"; - sha256 = "0zj72lnwncy9diagicp1xkvryakal17p5fslv1pl731z8janal1s"; + version = "1.11.0.0"; + sha256 = "14f8x6gyq28n3lpap4f5bn290llj57my1k28km9r1nh14kxl1lp9"; buildDepends = [ base transformers transformers-base type-aligned void ]; @@ -47474,8 +47503,8 @@ self: { }: mkDerivation { pname = "fay"; - version = "0.23.1.4"; - sha256 = "1l8r7d4iwwkq0m9cskwfv38i89cr8sqxidrc59z62yp05ilcs5r6"; + version = "0.23.1.5"; + sha256 = "07x4v8nq9mg0ydir708mv1bhpg3n5f449vv9ihgpyfdvm4w1bm4r"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -48619,8 +48648,8 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "first-class-patterns"; - version = "0.3.2.1"; - sha256 = "07ak85jkxli1yhj75mpvam0av8iz5qpbx6m5kzw04fqg3vcfrj8j"; + version = "0.3.2.2"; + sha256 = "0da7mayn8lcizwjv06rafkgrsj257fhkj5xsxk7nx00n3aazzr68"; buildDepends = [ base transformers ]; homepage = "https://github.com/reinerp/first-class-patterns"; description = "First class patterns and pattern matching, using type families"; @@ -49295,6 +49324,7 @@ self: { lens lens-action mtl network pipes pipes-aeson pipes-http pipes-parse template-haskell text unordered-containers uuid ]; + jailbreak = true; homepage = "https://github.com/brewtown/hs-flowdock"; description = "Flowdock client library for Haskell"; license = stdenv.lib.licenses.mit; @@ -49680,10 +49710,9 @@ self: { }: mkDerivation { pname = "force-layout"; - version = "0.4.0.0"; - sha256 = "0rmspkl8j1z2n8r6d3dcd573z73yzn6c9r49f57syfvalq0xrzdk"; + version = "0.4.0.1"; + sha256 = "1qchmhn6hp91gzds6yqjn4kssp7n3g7vqhl919wf8d3nn4ykz3av"; buildDepends = [ base containers data-default-class lens linear ]; - jailbreak = true; description = "Simple force-directed layout"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -51476,8 +51505,8 @@ self: { ({ mkDerivation, base, List, transformers }: mkDerivation { pname = "generator"; - version = "0.5.4"; - sha256 = "1yphw9ira01c0989gq1hrh53xcd3qvq8fib5k1bpsmb313j7x8b8"; + version = "0.5.5"; + sha256 = "1rwz2ribijj5hb2isg0yz6hb2mwyjhzfg0ys041yb43qlcbhkhdd"; buildDepends = [ base List transformers ]; homepage = "http://github.com/yairchu/generator/tree"; description = "Python-generators notation for creation of monadic lists"; @@ -51520,10 +51549,8 @@ self: { }: mkDerivation { pname = "generic-aeson"; - version = "0.2.0.5"; - revision = "1"; - sha256 = "109jxrny3r1wsf2kr23vvgdid4rmq5lpqjlfbk4n7yxb9bvdbhy5"; - editedCabalFile = "9b825c5d437c1a3a47dfb27781100229b7c535982ad42721414083cab309e461"; + version = "0.2.0.6"; + sha256 = "13jlr9dq3d0v9f7hjxq5qxs8llhj8mbnja14xjkxc28vdbnzv62l"; buildDepends = [ aeson attoparsec base generic-deriving mtl tagged text unordered-containers vector @@ -52891,6 +52918,7 @@ self: { aeson base bytestring cassava containers directory filepath shake split text unordered-containers vector yaml ]; + jailbreak = true; homepage = "https://github.com/nomeata/gipeda"; description = "Git Performance Dashboard"; license = stdenv.lib.licenses.mit; @@ -52940,7 +52968,7 @@ self: { , clientsession, conduit, conduit-extra, containers, crypto-api , cryptohash, curl, data-default, DAV, dbus, directory, dlist, dns , edit-distance, esqueleto, exceptions, fdo-notify, feed, filepath - , git, gnupg1, gnutls, hinotify, hslogger, http-client + , git, gnupg1, gnutls, hamlet, hinotify, hslogger, http-client , http-conduit, http-types, IfElse, json, lsof, MissingH , monad-control, monad-logger, mtl, network, network-info , network-multicast, network-protocol-xmpp, network-uri, openssh @@ -52955,8 +52983,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "5.20150522"; - sha256 = "0spczrg1rrg4qgyxpjqlcfpkcdph6d2m6dv1lbf77nbfc6cqh83p"; + version = "5.20150528"; + sha256 = "1d7760c3wq0zq9q1zs1y9hjlzjjqcdg88wfi0k5hsmwgiysn2pr2"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -52964,8 +52992,8 @@ self: { case-insensitive clientsession conduit conduit-extra containers crypto-api cryptohash data-default DAV dbus directory dlist dns edit-distance esqueleto exceptions fdo-notify feed filepath gnutls - hinotify hslogger http-client http-conduit http-types IfElse json - MissingH monad-control monad-logger mtl network network-info + hamlet hinotify hslogger http-client http-conduit http-types IfElse + json MissingH monad-control monad-logger mtl network network-info network-multicast network-protocol-xmpp network-uri optparse-applicative path-pieces persistent persistent-sqlite persistent-template process QuickCheck random regex-tdfa resourcet @@ -53352,6 +53380,7 @@ self: { aeson base base64-bytestring bytestring http-conduit network safe text ]; + jailbreak = true; homepage = "https://github.com/relrod/gitignore"; description = "Apply GitHub .gitignore templates to already existing repositories."; license = stdenv.lib.licenses.bsd3; @@ -54339,6 +54368,7 @@ self: { testDepends = [ base bytestring hspec http-conduit http-types load-env ]; + jailbreak = true; description = "Google OAuth2 token negotiation"; license = stdenv.lib.licenses.mit; }) {}; @@ -55177,14 +55207,13 @@ self: { }: mkDerivation { pname = "grid"; - version = "7.8.2"; - sha256 = "0bb9cykr47sbkccnfcxaq3fx2q0m4c3cvfjhdg2jqwvn0jsp98ik"; + version = "7.8.4"; + sha256 = "1jci2191l6k1qlch54id7z05zn9lp5lzyh7g6hm9s522z97lgb2k"; buildDepends = [ base cereal containers ]; testDepends = [ base containers QuickCheck test-framework test-framework-quickcheck2 ]; - jailbreak = true; homepage = "https://github.com/mhwombat/grid"; description = "Tools for working with regular grids (graphs, lattices)"; license = stdenv.lib.licenses.bsd3; @@ -55229,7 +55258,9 @@ self: { mkDerivation { pname = "groundhog"; version = "0.7.0.3"; + revision = "1"; sha256 = "0n5c501wfyqcl1iy4017yyxp95kz7mb4lgc0mjjk9si36ixkww9r"; + editedCabalFile = "dcf9bbeaf0fd7e7ac0809902a54779097e8935a07b1e7e43c404bc683c17e7f0"; buildDepends = [ aeson attoparsec base base64-bytestring blaze-builder bytestring containers monad-control monad-logger mtl scientific text time @@ -57475,6 +57506,7 @@ self: { http-client http-client-tls http-types tagsoup text time transformers ]; + jailbreak = true; description = "Mailgun REST api interface for Haskell"; license = stdenv.lib.licenses.mit; }) {}; @@ -57667,8 +57699,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.6.9.0"; - sha256 = "0z0gfs7czqwrkgd43pcx6rjdsgwpkhan5pmgfbkiixih993f9s2l"; + version = "4.7.0.0"; + sha256 = "1c2awifpsplfr3x5aj7v9pymfmfj74i4j3djgggxr9vj5d372njq"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -57885,6 +57917,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "halive" = callPackage + ({ mkDerivation, base, bin-package-db, directory, filepath + , foreign-store, fsnotify, ghc, ghc-paths, system-filepath + , transformers + }: + mkDerivation { + pname = "halive"; + version = "0.1.0.1"; + revision = "1"; + sha256 = "0wzajzh7lihj5l906ia5ni12dih0ar7f8apnq4ncypkw4ym1d4j6"; + editedCabalFile = "60b322e7402b0dc957944334003fdf00ae5cdf0233663904dc397409aa153598"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base bin-package-db directory filepath foreign-store fsnotify ghc + ghc-paths system-filepath transformers + ]; + homepage = "https://github.com/lukexi/halive"; + description = "A live recompiler"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "halma" = callPackage ({ mkDerivation, async, base, containers, data-default , diagrams-cairo, diagrams-gtk, diagrams-lib, grid, gtk, HUnit, mtl @@ -59023,12 +59077,13 @@ self: { }: mkDerivation { pname = "harpy"; - version = "0.6.0.0"; - sha256 = "0vc6p72imiss9zwzbmkxl42lm21kzc33j4l6f5x8a6r95m85iwq8"; + version = "0.6.0.2"; + sha256 = "1rlbakwqfjfr3d71jc6d5nyw5ms0y9wmb79p8jax45rxk1a8cfry"; buildDepends = [ array base containers disassembler mtl parsec pretty template-haskell ]; + homepage = "https://github.com/mgrabmueller/harpy"; description = "Runtime code generation for x86 machine code"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -59281,10 +59336,8 @@ self: { ({ mkDerivation, base, bytestring, containers, split }: mkDerivation { pname = "hashids"; - version = "1.0.2"; - revision = "3"; - sha256 = "07qrsabhb825jhdbc4ka35ss7ci07avgvi8jsr69r17bnp87wnma"; - editedCabalFile = "58394f52df9a7e4427962fe1e59eb21cb751b3af58f997453f2b2f34cb9271dc"; + version = "1.0.2.1"; + sha256 = "03q0fcxiw4yncmbdirnh6kaz9jhyxqy348dnrvgkbn4mzkh8fi2z"; buildDepends = [ base bytestring containers split ]; homepage = "http://hashids.org/"; description = "Hashids generates short, unique, non-sequential ids from numbers"; @@ -59927,8 +59980,8 @@ self: { }: mkDerivation { pname = "haskell-neo4j-client"; - version = "0.3.1.1"; - sha256 = "1l5dpaa97h6qxlhq0rzk24p3l943zf3c948jvng4ajl3gmhniy1w"; + version = "0.3.1.2"; + sha256 = "1qb2m6bxpw24ll1r0hyicmddn9plm55ipdgbykd6yrw1cfrm9qz7"; buildDepends = [ aeson base bytestring containers data-default hashable HTTP http-conduit http-types lifted-base mtl network-uri resourcet @@ -60781,8 +60834,8 @@ self: { }: mkDerivation { pname = "haskellscript"; - version = "0.1.2"; - sha256 = "0d3h2pz8f1mi19il9p03dxrb5f973wr2zl7f6mjn3c565rs3nzgs"; + version = "0.2.3"; + sha256 = "0jrvvbpx35dhrwvknrxcwg1j1yi0mwzrnzrr2hsxja21drrqklf3"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -61332,6 +61385,7 @@ self: { buildDepends = [ base-prelude bytestring either free list-t text transformers vector ]; + jailbreak = true; homepage = "https://github.com/nikita-volkov/hasql-backend"; description = "API for backends of \"hasql\""; license = stdenv.lib.licenses.mit; @@ -61615,6 +61669,7 @@ self: { aeson base bytestring containers hashable HUnit text unordered-containers ]; + jailbreak = true; homepage = "https://github.com/facebook/Haxl"; description = "A Haskell library for efficient, concurrent, and concise data access"; license = stdenv.lib.licenses.bsd3; @@ -62704,6 +62759,7 @@ self: { map-syntax MonadCatchIO-transformers mtl process random text time transformers unordered-containers vector xmlhtml ]; + jailbreak = true; homepage = "http://snapframework.com/"; description = "An Haskell template system supporting both HTML5 and XML"; license = stdenv.lib.licenses.bsd3; @@ -63269,7 +63325,8 @@ self: { }) {}; "hetris" = callPackage - ({ mkDerivation, array, base, curses, hscurses, old-time, random }: + ({ mkDerivation, array, base, hscurses, ncurses, old-time, random + }: mkDerivation { pname = "hetris"; version = "0.2"; @@ -63277,12 +63334,12 @@ self: { isLibrary = false; isExecutable = true; buildDepends = [ array base hscurses old-time random ]; - extraLibraries = [ curses ]; + extraLibraries = [ ncurses ]; homepage = "http://web.comlab.ox.ac.uk/oucl/work/ian.lynagh/Hetris/"; description = "Text Tetris"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { curses = null;}; + }) { inherit (pkgs) ncurses;}; "heukarya" = callPackage ({ mkDerivation, base, containers, deepseq, parallel, random, text @@ -64121,8 +64178,8 @@ self: { }: mkDerivation { pname = "highlighting-kate"; - version = "0.5.15"; - sha256 = "0ig9yz7cd08wkvhbfw8rlg4flclsk2lqqx0zkl8721zgviqj9rg4"; + version = "0.6"; + sha256 = "16334fbiyq6017zbgc59qc00h0bk24xh4dcrbqx63dvf72ac37dk"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -64229,8 +64286,8 @@ self: { }: mkDerivation { pname = "hindent"; - version = "4.4.2"; - sha256 = "14g3sqkps2bg8fc8vp5f632hj7msbl4kj0baasykxvf0iylgj7ii"; + version = "4.5.3"; + sha256 = "0fnkqdxqnfmh4mg844vbgbp4s31pq4jkc00n7dkg81xq0983nsxc"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -64651,6 +64708,7 @@ self: { version = "0.1.0"; sha256 = "0i13aj1xcwap0k3w48vyiiganbvj93zydawmw3gw7m0kr6nl5l9v"; buildDepends = [ base binary text text-binary ]; + jailbreak = true; homepage = "https://github.com/kawu/hist-pl/tree/master/types"; description = "Types in the historical dictionary of Polish"; license = stdenv.lib.licenses.bsd3; @@ -64849,6 +64907,7 @@ self: { aeson base http-types HUnit test-framework test-framework-hunit text unordered-containers vector ]; + jailbreak = true; homepage = "https://github.com/seagreen/hjsonpointer"; description = "JSON Pointer library"; license = stdenv.lib.licenses.mit; @@ -65195,8 +65254,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "1.9.20"; - sha256 = "1nm6z0v040ma5wkzfv8nhplpq7dnaf645bax2r3q5fj6j4cv1hzh"; + version = "1.9.21"; + sha256 = "14v3rdjjlml9nimdk7d5dvir2bw78ai49yylvms9lnzmw29s3546"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -65383,20 +65442,18 @@ self: { }) { inherit (pkgs) gsl;}; "hmatrix-gsl-stats" = callPackage - ({ mkDerivation, base, binary, blas, hmatrix, lapack - , storable-complex - }: + ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex }: mkDerivation { pname = "hmatrix-gsl-stats"; - version = "0.3.0.1"; - sha256 = "0q5l82m6692isl9499q9szgmkxarkjkmwsdvg6frf7izkzrxx5l5"; + version = "0.3.0.2"; + sha256 = "1n0p7pg9rsdckcysczg7l8rqfm3xw1rc2jzp0khb1i33nhbr7bzn"; buildDepends = [ base binary hmatrix storable-complex ]; - extraLibraries = [ blas lapack ]; + pkgconfigDepends = [ gsl ]; homepage = "http://code.haskell.org/hmatrix-gsl-stats"; description = "GSL Statistics interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) blas; lapack = null;}; + }) { inherit (pkgs) gsl;}; "hmatrix-mmap" = callPackage ({ mkDerivation, base, hmatrix, mmap }: @@ -65653,8 +65710,8 @@ self: { "hmp3" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers - , curses, directory, mersenne-random, old-time, pcre-light, process - , unix, zlib + , directory, mersenne-random, ncurses, old-time, pcre-light + , process, unix, zlib }: mkDerivation { pname = "hmp3"; @@ -65666,12 +65723,12 @@ self: { array base binary bytestring containers directory mersenne-random old-time pcre-light process unix zlib ]; - extraLibraries = [ curses ]; + extraLibraries = [ ncurses ]; homepage = "http://www.cse.unsw.edu.au/~dons/hmp3.html"; description = "An ncurses mp3 player written in Haskell"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { curses = null;}; + }) { inherit (pkgs) ncurses;}; "hmpfr" = callPackage ({ mkDerivation, base, integer-gmp, mpfr }: @@ -65834,6 +65891,7 @@ self: { buildDepends = [ aeson base bytestring http-conduit http-types text ]; + jailbreak = true; homepage = "https://github.com/freizl/hoauth2"; description = "hoauth2"; license = stdenv.lib.licenses.bsd3; @@ -67460,6 +67518,7 @@ self: { ]; testDepends = [ aeson attoparsec base QuickCheck text vector ]; extraLibraries = [ ruby ]; + jailbreak = true; description = "Embed a Ruby intepreter in your Haskell program !"; license = stdenv.lib.licenses.bsd3; }) { inherit (pkgs) ruby;}; @@ -68075,8 +68134,8 @@ self: { }: mkDerivation { pname = "hsb2hs"; - version = "0.2"; - sha256 = "013n3l80449wxmbfmcidg8mdjk4nkxv7s3jcbfy5g4jps6gsg1fx"; + version = "0.3"; + sha256 = "16awid7ybqbnja77swphq3csg476pk8l6ygjl5r5ndprahzkdrh5"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -68966,24 +69025,25 @@ self: { }) {}; "hsignal" = callPackage - ({ mkDerivation, array, base, binary, blas, bytestring, hmatrix - , hmatrix-gsl, hmatrix-gsl-stats, hstatistics, lapack, mtl + ({ mkDerivation, array, base, binary, blas, bytestring, gsl + , hmatrix, hmatrix-gsl, hmatrix-gsl-stats, hstatistics, lapack, mtl , storable-complex }: mkDerivation { pname = "hsignal"; - version = "0.2.7"; - sha256 = "1a75n22rk5lpzf1fnwdpw61azibavy9x45wz1cp0l1c49477fxs0"; + version = "0.2.7.1"; + sha256 = "1dzga1cgxrk7i65zrmpg22521islp4xzfc95ph7kla2acxzr6q0x"; buildDepends = [ array base binary bytestring hmatrix hmatrix-gsl hmatrix-gsl-stats hstatistics mtl storable-complex ]; extraLibraries = [ blas lapack ]; + pkgconfigDepends = [ gsl ]; homepage = "http://code.haskell.org/hsignal"; description = "Signal processing and EEG data analysis"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) blas; lapack = null;}; + }) { inherit (pkgs) blas; inherit (pkgs) gsl; lapack = null;}; "hsilop" = callPackage ({ mkDerivation, base, haskeline }: @@ -71945,8 +72005,8 @@ self: { ({ mkDerivation, base, parsec, parsec-numbers }: mkDerivation { pname = "huttons-razor"; - version = "0.1.0.1"; - sha256 = "0iq377pbz3rpxj8zibavnjjck9f3xkl2ar2hy8jpj265rzm6lr7m"; + version = "0.1.1.0"; + sha256 = "1wwphyg2fm34gxn7s7a4q7p8fyab3c7am4fmw1x50gkrmkwgd72s"; isLibrary = false; isExecutable = true; buildDepends = [ base parsec parsec-numbers ]; @@ -72964,6 +73024,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "iap-verifier" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , conduit, http-conduit, monads-tf, text, transformers + }: + mkDerivation { + pname = "iap-verifier"; + version = "0.1.0.1"; + sha256 = "0mf55kx2y5q8qldgqcq805r3565nxngjm7nwq4q2xy54s7m2fsha"; + buildDepends = [ + aeson base base64-bytestring bytestring conduit http-conduit + monads-tf text transformers + ]; + jailbreak = true; + homepage = "http://github.com/tattsun/iap-verifier"; + description = "A simple wrapper of In-App-Purchase receipt validate APIs"; + license = stdenv.lib.licenses.mit; + }) {}; + "iban" = callPackage ({ mkDerivation, base, containers, HUnit, iso3166-country-codes , tasty, tasty-hunit, text, unordered-containers @@ -73026,9 +73104,9 @@ self: { template-haskell temporary test-framework test-framework-hunit text unix utf8-string ]; + jailbreak = true; description = "An IDE backend library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ide-backend-common" = callPackage @@ -73047,9 +73125,9 @@ self: { mtl pretty-show pureMD5 tagged template-haskell temporary text transformers unix ]; + jailbreak = true; description = "Shared library used be ide-backend and ide-backend-server"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ide-backend-rts" = callPackage @@ -73083,7 +73161,6 @@ self: { ]; description = "An IDE backend server"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ideas" = callPackage @@ -74352,6 +74429,7 @@ self: { base http-client HUnit mtl tasty tasty-hunit tasty-quickcheck tasty-th text vector ]; + jailbreak = true; homepage = "https://github.com/maoe/influxdb-haskell"; description = "Haskell client library for InfluxDB"; license = stdenv.lib.licenses.bsd3; @@ -74374,6 +74452,7 @@ self: { persistent persistent-postgresql shakespeare text time time-locale-compat yesod yesod-auth yesod-core yesod-form ]; + jailbreak = true; homepage = "http://doomanddarkness.eu/pub/informative"; description = "A yesod subsite serving a wiki"; license = stdenv.lib.licenses.agpl3; @@ -74429,8 +74508,8 @@ self: { }: mkDerivation { pname = "inline-c"; - version = "0.5.2.0"; - sha256 = "1i0x80g8sy7lb7wln22n4hbh3i553v1ky9gz7x72xf0gifszlr4y"; + version = "0.5.3.1"; + sha256 = "1n4w1lr3jwx4dwcks0c7rc79hdf4jwsgl3famivrdls01fqv9dhi"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -75265,6 +75344,7 @@ self: { aeson base bytestring cereal containers directory filepath mtl parsec SHA tar text transformers uuid zeromq4-haskell ]; + jailbreak = true; homepage = "http://github.com/gibiansky/IHaskell"; description = "A library for creating kernels for IPython frontends"; license = stdenv.lib.licenses.mit; @@ -76437,8 +76517,8 @@ self: { }: mkDerivation { pname = "jmacro"; - version = "0.6.12"; - sha256 = "08n00mmfixr6s3pgh6mccq1sk7932md8b36wdds3zb1p5icrrdpr"; + version = "0.6.13"; + sha256 = "0b7l4h3apkj41w69wg3ympflh2l53vbmyvs6xf20xn57d6p8lhn4"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -76998,8 +77078,8 @@ self: { }: mkDerivation { pname = "json-rpc-client"; - version = "0.1.3.0"; - sha256 = "10wb9nv9ijqjn4w6mp306k58s2pqzc91529rgw29h72ww6q70ylq"; + version = "0.1.4.0"; + sha256 = "1lcjwf6j6j3azrrmbdhffm8a27d6gn48zrgp3w89x9ckgflyby22"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -77011,7 +77091,6 @@ self: { scientific test-framework test-framework-hunit test-framework-quickcheck2 text unordered-containers vector ]; - jailbreak = true; description = "JSON-RPC 2.0 on the client side."; license = stdenv.lib.licenses.mit; }) {}; @@ -77023,8 +77102,8 @@ self: { }: mkDerivation { pname = "json-rpc-server"; - version = "0.1.5.0"; - sha256 = "1328366gdcsgfwqjzqgz07nnxn2j8gpbrcr6888wq1br0bxyczj5"; + version = "0.1.6.0"; + sha256 = "0qlmv4l0p70rij18m380myw2p1mhdq432kc0yky3n8rx8n29dlfq"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -77046,8 +77125,8 @@ self: { }: mkDerivation { pname = "json-schema"; - version = "0.7.3.5"; - sha256 = "1x7bm83745nsf947kb4m3h8zh4li1548dpbcm2yz16ppg5db182h"; + version = "0.7.3.6"; + sha256 = "0x1aj5scd0k0qapivn784y5np82fhr982sqvb64jw619aql5s6bv"; buildDepends = [ aeson base containers generic-aeson generic-deriving mtl scientific text time unordered-containers vector @@ -77072,6 +77151,7 @@ self: { aeson base generics-sop lens-sop tagged text time transformers unordered-containers vector ]; + jailbreak = true; description = "Generics JSON (de)serialization using generics-sop"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -77237,6 +77317,7 @@ self: { testDepends = [ aeson base bytestring containers process tagged text ]; + jailbreak = true; homepage = "https://github.com/yuga/jsonschema-gen"; description = "JSON Schema generator from Algebraic data type"; license = stdenv.lib.licenses.bsd3; @@ -80278,7 +80359,9 @@ self: { mkDerivation { pname = "lens-aeson"; version = "1.0.0.4"; + revision = "1"; sha256 = "0zjl645y4bwg3pvld8z4vj9rdpdy6fja2cx63d85k37zp5n98y7v"; + editedCabalFile = "252661ca9f157ea5cb0aa6684c50fa1b84a2a3ed300c2eaec9ffb82eb18e7ddd"; buildDepends = [ aeson attoparsec base bytestring lens scientific text unordered-containers vector @@ -80997,6 +81080,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "libpafe" = callPackage + ({ mkDerivation, base, bytestring, iconv, pafe }: + mkDerivation { + pname = "libpafe"; + version = "0.1.0.0"; + sha256 = "1qb67zb7fh582ws1j1hi704dkzp7am0jjxjnab29kpm6i3xmzprk"; + buildDepends = [ base ]; + testDepends = [ base bytestring iconv ]; + extraLibraries = [ pafe ]; + jailbreak = true; + description = "Wrapper for libpafe"; + license = stdenv.lib.licenses.gpl2; + }) { pafe = null;}; + "libpq" = callPackage ({ mkDerivation, base, bytestring, postgresql, unix }: mkDerivation { @@ -81602,8 +81699,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim, mtl, transformers }: mkDerivation { pname = "linearscan"; - version = "0.5.1.0"; - sha256 = "123gs28vfb1lx9izzjran79caqj92p1l0v051pd0pf2nfm6iymgb"; + version = "0.6.0.0"; + sha256 = "0lprqpdrimrkdd2jmvbp9lpjnknr7a9bpiwh0rcx1jp5f777xfys"; buildDepends = [ base containers ghc-prim mtl transformers ]; homepage = "http://github.com/jwiegley/linearscan"; description = "Linear scan register allocator, formally verified in Coq"; @@ -81612,19 +81709,21 @@ self: { }) {}; "linearscan-hoopl" = callPackage - ({ mkDerivation, base, containers, deepseq, free, hoopl, hspec - , hspec-expectations, lens-family-core, linearscan, transformers + ({ mkDerivation, base, containers, deepseq, free, fuzzcheck, hoopl + , hspec, hspec-expectations, lens-family-core, linearscan + , QuickCheck, tardis, transformers }: mkDerivation { pname = "linearscan-hoopl"; - version = "0.5.1.0"; - sha256 = "147ryhliilbpmzy87bda7aapfpfhw4r6rcy6jla2ampy7qvvvbyk"; + version = "0.6.0.0"; + sha256 = "0sag9590df05fs46fv846hqwwiab85i9dsx4xn4y9w4islxi8hkb"; buildDepends = [ - base containers free hoopl linearscan transformers + base containers free hoopl linearscan QuickCheck tardis + transformers ]; testDepends = [ - base containers deepseq hoopl hspec hspec-expectations - lens-family-core linearscan transformers + base containers deepseq fuzzcheck hoopl hspec hspec-expectations + lens-family-core linearscan QuickCheck tardis transformers ]; homepage = "http://github.com/jwiegley/linearscan-hoopl"; description = "Makes it easy to use the linearscan register allocator with Hoopl"; @@ -82214,8 +82313,8 @@ self: { }: mkDerivation { pname = "list-t-libcurl"; - version = "0.2.0.2"; - sha256 = "1scvspy8kdyqyv2iv0alnh9qal5dlxy3pbcz5k7ib0v02acj9jhz"; + version = "0.3.0.0"; + sha256 = "1hcgxr87q7k6ixisj4p4gghm7nqb1l7bg361rcnqxf1145xmyyr5"; buildDepends = [ base base-prelude bytestring curlhs either list-t mtl-prelude resource-pool stm @@ -82911,8 +83010,8 @@ self: { }: mkDerivation { pname = "log-domain"; - version = "0.10.0.1"; - sha256 = "04k7k8p1p8fgzyms21ry4qf1l987k3pvs673sq9rh1h6hmk9bsg2"; + version = "0.10.1"; + sha256 = "0gbs902l5fh5pqhcj31g0a5d2irjx11sw3jhk69c9hcfssclnd8h"; buildDepends = [ base binary bytes cereal comonad deepseq distributive generic-deriving hashable hashable-extras safecopy semigroupoids @@ -82922,7 +83021,6 @@ self: { base directory doctest filepath generic-deriving semigroups simple-reflect ]; - jailbreak = true; homepage = "http://github.com/analytics/log-domain/"; description = "Log-domain arithmetic"; license = stdenv.lib.licenses.bsd3; @@ -83479,6 +83577,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ltext" = callPackage + ({ mkDerivation, aeson, base, composition, composition-extra + , containers, data-default, directory, hspec, mtl + , optparse-applicative, parsec, pretty, text, transformers, yaml + }: + mkDerivation { + pname = "ltext"; + version = "0.0.0.1"; + sha256 = "1qz4gpdfjqrq6rgbf3zqcmwkf0x0kphnpr4y7q47wb12wq7xaqa1"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson base composition composition-extra containers data-default + directory mtl optparse-applicative parsec pretty text transformers + yaml + ]; + testDepends = [ base hspec ]; + description = "Higher-order file applicator"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ltk" = callPackage ({ mkDerivation, base, Cabal, containers, filepath, ghc, glib, gtk3 , mtl, parsec, pretty, text, transformers @@ -84045,7 +84164,7 @@ self: { }) {}; "mage" = callPackage - ({ mkDerivation, array, base, containers, curses, mtl, random }: + ({ mkDerivation, array, base, containers, mtl, ncurses, random }: mkDerivation { pname = "mage"; version = "1.1.0"; @@ -84053,12 +84172,12 @@ self: { isLibrary = false; isExecutable = true; buildDepends = [ array base containers mtl random ]; - extraLibraries = [ curses ]; + extraLibraries = [ ncurses ]; homepage = "http://www.scannedinavian.com/~shae/mage-1.0pre35.tar.gz"; description = "Rogue-like"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { curses = null;}; + }) { inherit (pkgs) ncurses;}; "magic" = callPackage ({ mkDerivation, base, magic }: @@ -84167,6 +84286,7 @@ self: { aeson base http-client http-client-tls http-types reflection scotty text transformers wai-extra ]; + jailbreak = true; homepage = "https://github.com/mietek/mailchimp-subscribe/"; description = "MailChimp subscription request handler"; license = stdenv.lib.licenses.mit; @@ -84704,6 +84824,7 @@ self: { aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit tasty-quickcheck text ]; + jailbreak = true; description = "Library for interfacing with the Mandrill JSON API"; license = stdenv.lib.licenses.mit; }) {}; @@ -84758,6 +84879,7 @@ self: { template-haskell text time tls transformers transformers-base unordered-containers utf8-string vector wai warp x509-system ]; + jailbreak = true; homepage = "https://github.com/prowdsponsor/mangopay"; description = "Bindings to the MangoPay API"; license = stdenv.lib.licenses.bsd3; @@ -85499,6 +85621,7 @@ self: { isLibrary = true; isExecutable = true; buildDepends = [ ansi-terminal base directory pandoc terminfo ]; + jailbreak = true; homepage = "https://github.com/dorafmon/mdcat"; description = "Markdown viewer in your terminal"; license = stdenv.lib.licenses.mit; @@ -85590,21 +85713,20 @@ self: { "meep" = callPackage ({ mkDerivation, base, bifunctors, doctest, hspec - , hspec-expectations-lens, lens, QuickCheck, semigroups + , hspec-expectations-lens, lens, QuickCheck, semigroupoids + , semigroups }: mkDerivation { pname = "meep"; - version = "0.1.1.0"; - sha256 = "1rk5mrvmk07m5zdayfvxirak58d1bxwb04sgg0gcx07w8q8k4yyq"; - buildDepends = [ base bifunctors lens semigroups ]; + version = "0.1.2.0"; + sha256 = "1jr3zgja3m40ajygi1jqsxfwhsf7yf0lwblffd8z096w67pn4idr"; + buildDepends = [ base bifunctors lens semigroupoids semigroups ]; testDepends = [ base bifunctors doctest hspec hspec-expectations-lens lens - QuickCheck semigroups + QuickCheck semigroupoids semigroups ]; - jailbreak = true; description = "A silly container"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mega-sdist" = callPackage @@ -85809,8 +85931,8 @@ self: { }: mkDerivation { pname = "memory"; - version = "0.3"; - sha256 = "17dry2yfnj7vldrdh0kynyaa4pfyy88k3035w3hxggh7n325dfir"; + version = "0.4"; + sha256 = "1n7w11w3c9qag17nx6ssp2ni2kym980dwrwdrpdf7668n1jkcjvr"; buildDepends = [ base bytestring deepseq ghc-prim ]; testDepends = [ base tasty tasty-hunit tasty-quickcheck ]; homepage = "https://github.com/vincenthz/hs-memory"; @@ -86718,6 +86840,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "minst-idx" = callPackage + ({ mkDerivation, base, binary, bytestring, directory, hspec, vector + }: + mkDerivation { + pname = "minst-idx"; + version = "0.1.2.1"; + sha256 = "149128cags685m463p92vzri9cr501dby2vs0aqmrka8sg0py7j9"; + buildDepends = [ base binary bytestring vector ]; + testDepends = [ base binary directory hspec vector ]; + homepage = "https://github.com/kryoxide/minst-idx/"; + description = "Read and write IDX data that is used in e.g. the MINST database."; + license = stdenv.lib.licenses.gpl3; + }) {}; + "mirror-tweet" = callPackage ({ mkDerivation, authenticate-oauth, base, bytestring, conduit , lens, monad-logger, text, transformers, twitter-conduit @@ -87358,6 +87494,7 @@ self: { buildDepends = [ base either monad-control mtl transformers transformers-base ]; + jailbreak = true; homepage = "http://github.com/phaazon/monad-journal"; description = "Pure logger typeclass and monad transformer"; license = stdenv.lib.licenses.bsd3; @@ -87689,8 +87826,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim }: mkDerivation { pname = "monad-skeleton"; - version = "0.1.1"; - sha256 = "14rwxhjkp3msycrpxna0sdyfyy6r8v7rqrz476p07gsmd6avpsrx"; + version = "0.1.2"; + sha256 = "13lkbbvajfl4lr6r5plmxvqk6bxn7mp6acsyfxwh2yr6krzdlb82"; buildDepends = [ base containers ghc-prim ]; homepage = "https://github.com/fumieval/monad-skeleton"; description = "An undead monad"; @@ -88237,10 +88374,9 @@ self: { ({ mkDerivation, base, groups, semigroupoids, semigroups }: mkDerivation { pname = "monoid-extras"; - version = "0.4.0.0"; - sha256 = "0j8lc03zamxplyw5k8kv8qa78j5xkmf581rz4iw2v9qhbx66cfpx"; + version = "0.4.0.1"; + sha256 = "0jcyjqmk4s64j05qisvibmy87m5xi5n837wsivq7lml8lfyrj7yf"; buildDepends = [ base groups semigroupoids semigroups ]; - jailbreak = true; description = "Various extra monoid-related definitions and utilities"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -89063,6 +89199,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "muesli" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, directory + , filepath, hashable, mtl, psqueues, time + }: + mkDerivation { + pname = "muesli"; + version = "0.1.0.1"; + sha256 = "10dyk5yz911lfdf11iizmpinha7h09gd7yrg67wjsb6myyvwbdg5"; + buildDepends = [ + base bytestring cereal containers directory filepath hashable mtl + psqueues time + ]; + homepage = "https://github.com/clnx/muesli"; + description = "A simple document-oriented database"; + license = stdenv.lib.licenses.mit; + }) {}; + "mueval" = callPackage ({ mkDerivation, base, Cabal, containers, directory , extensible-exceptions, filepath, hint, mtl, process, show @@ -90070,8 +90223,8 @@ self: { }: mkDerivation { pname = "nagios-check"; - version = "0.2.1"; - sha256 = "0qnzdljrdwzrsfapm2d6ykz2xzdhq5hzxy51gixsbmlvknglx5bh"; + version = "0.3.1"; + sha256 = "17ww3n2y6cmjc3n05cra43csk60sm5s07q2mn3zq1sjiiq2cw82c"; buildDepends = [ base bifunctors exceptions mtl nagios-perfdata text ]; @@ -90224,18 +90377,18 @@ self: { }) {}; "nanocurses" = callPackage - ({ mkDerivation, base, bytestring, curses, unix }: + ({ mkDerivation, base, bytestring, ncurses, unix }: mkDerivation { pname = "nanocurses"; version = "1.5.2"; sha256 = "04kgf3vvjdx6d1fmfzp0xy5x42zlg0ij59ayi1zhz8hkwsfn5g1m"; buildDepends = [ base bytestring unix ]; - extraLibraries = [ curses ]; + extraLibraries = [ ncurses ]; homepage = "http://www.cse.unsw.edu.au/~dons/hmp3.html"; description = "Simple Curses binding"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { curses = null;}; + }) { inherit (pkgs) ncurses;}; "nanomsg" = callPackage ({ mkDerivation, base, bytestring, nanomsg }: @@ -90487,7 +90640,6 @@ self: { homepage = "https://john-millikin.com/software/haskell-ncurses/"; description = "Modernised bindings to GNU ncurses"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) ncurses;}; "neat" = callPackage @@ -91354,8 +91506,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "network-info"; - version = "0.2.0.5"; - sha256 = "0ggxnkjkbspynma0wjrc1wwwb9ygx2dhl0n9lfaq7l8r69z7pqwf"; + version = "0.2.0.6"; + sha256 = "1ymi2cw3914wvinw0wssmq8m2j4g92q1sd5vi9dxfyb7lrj1gga7"; buildDepends = [ base ]; homepage = "http://github.com/jystic/network-info"; description = "Access the local computer's basic network configuration"; @@ -93003,12 +93155,13 @@ self: { }) {}; "observable-sharing" = callPackage - ({ mkDerivation, base, unordered-containers }: + ({ mkDerivation, base, containers }: mkDerivation { pname = "observable-sharing"; - version = "0.2.0.0"; - sha256 = "01lri324xygda17nzc7bg6s3f52nivi8qjigbx9ack7zxhm9jyd7"; - buildDepends = [ base unordered-containers ]; + version = "0.2.1.0"; + sha256 = "11k6wzk3k39d87zbxminz1ga7nw6r96lf5kki40y673n500i4vdc"; + buildDepends = [ base containers ]; + homepage = "https://github.com/atzeus/observable-sharing"; description = "Simple observable sharing"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -93745,10 +93898,11 @@ self: { ({ mkDerivation, base, opentheory-primitive, QuickCheck }: mkDerivation { pname = "opentheory"; - version = "1.197"; - sha256 = "0z21swy53yd7lwdwkqr5ypp9sz3whq04fl7rdyqln914c554hxw5"; + version = "1.199"; + sha256 = "1il1lyjmv7ij7clnbc57ajpfwlg5a5ld3m619hxylpafyrbr4v5y"; buildDepends = [ base opentheory-primitive QuickCheck ]; testDepends = [ base opentheory-primitive QuickCheck ]; + homepage = "http://opentheory.gilith.com/?pkg=base"; description = "The standard theory library"; license = stdenv.lib.licenses.mit; }) {}; @@ -93759,12 +93913,13 @@ self: { }: mkDerivation { pname = "opentheory-bits"; - version = "1.65"; - sha256 = "0qinq1i4pip8dqq2h5x9xs6bgrv29yngg0xywl03bsymccqvsd8d"; + version = "1.66"; + sha256 = "1qjgrmi05ay4qss6w5ld4pmksb3lsscqpw0x2dcdkja1i5hfpwfj"; buildDepends = [ base opentheory opentheory-primitive opentheory-probability QuickCheck ]; + homepage = "http://opentheory.gilith.com/?pkg=natural-bits"; description = "Natural number to bit-list conversions"; license = stdenv.lib.licenses.mit; }) {}; @@ -93775,12 +93930,13 @@ self: { }: mkDerivation { pname = "opentheory-byte"; - version = "1.125"; - sha256 = "1lbfd231cznz7sxg1bgkzcp389bg1lyzlnqyw9q1s1c5yxd6a026"; + version = "1.126"; + sha256 = "0zlfik0irikrwk706fdjqb10z5jck3ldlsw269mfwlz6s1d5j2qz"; buildDepends = [ base opentheory opentheory-bits opentheory-primitive opentheory-probability QuickCheck ]; + homepage = "http://opentheory.gilith.com/?pkg=byte"; description = "Bytes"; license = stdenv.lib.licenses.mit; }) {}; @@ -93810,10 +93966,11 @@ self: { }: mkDerivation { pname = "opentheory-divides"; - version = "1.57"; - sha256 = "0g9p7y7s6ggs6sslv3bcjb4b7l0hnkx2z2xm23pp19piangpi1m8"; + version = "1.62"; + sha256 = "182c14c1j9m82pnx6crxgrry02yvixziap9ikhavx7krr52vdwbv"; buildDepends = [ base opentheory opentheory-primitive QuickCheck ]; testDepends = [ base opentheory opentheory-primitive QuickCheck ]; + homepage = "http://opentheory.gilith.com/?pkg=natural-divides"; description = "The divides relation on natural numbers"; license = stdenv.lib.licenses.mit; }) {}; @@ -93823,10 +93980,11 @@ self: { }: mkDerivation { pname = "opentheory-parser"; - version = "1.157"; - sha256 = "1ng772jinni54if2070rqqgvg67bijzvrpyb9y85nqs2r76mhhq2"; + version = "1.158"; + sha256 = "0325g7m5z64dg8sihmcgi9rmkms6r76hf1d7927v08dl5xh4dlhi"; buildDepends = [ base opentheory opentheory-primitive QuickCheck ]; testDepends = [ base opentheory opentheory-primitive QuickCheck ]; + homepage = "http://opentheory.gilith.com/?pkg=parser"; description = "Stream parsers"; license = stdenv.lib.licenses.mit; }) {}; @@ -93837,8 +93995,8 @@ self: { }: mkDerivation { pname = "opentheory-prime"; - version = "1.81"; - sha256 = "14br1cn9kifm1hm2ak1ydn8pvnr1pwhzgvy25xk41ysan613ix4g"; + version = "1.82"; + sha256 = "1x6sir4abr34cghmhbyv5qfd847xbbxg88qaw1vs3sa5lhb5dm8s"; buildDepends = [ base opentheory opentheory-divides opentheory-primitive opentheory-stream QuickCheck @@ -93847,6 +94005,7 @@ self: { base opentheory opentheory-divides opentheory-primitive opentheory-stream QuickCheck ]; + homepage = "http://opentheory.gilith.com/?pkg=natural-prime"; description = "Prime natural numbers"; license = stdenv.lib.licenses.mit; }) {}; @@ -93855,10 +94014,11 @@ self: { ({ mkDerivation, base, QuickCheck, random }: mkDerivation { pname = "opentheory-primitive"; - version = "1.5"; - sha256 = "065xbgdw7c7bfvsns722ri6dxirxlnhxid0vj4628syn64frdgsw"; + version = "1.7"; + sha256 = "02lg02w4sds1489bfz4hwgnhd9l6a1l7r9pwjd3s16yj2hbmr6jn"; buildDepends = [ base QuickCheck random ]; testDepends = [ base QuickCheck random ]; + homepage = "http://www.gilith.com/research/opentheory/"; description = "Haskell primitives used by OpenTheory packages"; license = stdenv.lib.licenses.mit; }) {}; @@ -93868,9 +94028,10 @@ self: { }: mkDerivation { pname = "opentheory-probability"; - version = "1.48"; - sha256 = "05hzdm5f96a4zr16hi5gg6nj9qiglsx66p9f2jss5j5rnw6n4i88"; + version = "1.49"; + sha256 = "0dszjszjdabgafpvxiailpgzm7y96f4a8zhjfhin3m36f3lb0dmy"; buildDepends = [ base opentheory opentheory-primitive QuickCheck ]; + homepage = "http://opentheory.gilith.com/?pkg=probability"; description = "Probability"; license = stdenv.lib.licenses.mit; }) {}; @@ -93880,9 +94041,10 @@ self: { }: mkDerivation { pname = "opentheory-stream"; - version = "1.44"; - sha256 = "0j7vz4y15mv643rcclxmf68a2hlkfrjjk1lwj25fmwsi92l08l3z"; + version = "1.45"; + sha256 = "0gl7svhyrvi6bznfmc3jfar6hzlrywni6f7pvaykjzkf80xzljbr"; buildDepends = [ base opentheory opentheory-primitive QuickCheck ]; + homepage = "http://opentheory.gilith.com/?pkg=stream"; description = "Infinite stream types"; license = stdenv.lib.licenses.mit; }) {}; @@ -93894,8 +94056,8 @@ self: { }: mkDerivation { pname = "opentheory-unicode"; - version = "1.139"; - sha256 = "0dmd0a1gfw4f1jifgb6vb3n69gsl23m0wsxz68lh5q1pb18byk8d"; + version = "1.140"; + sha256 = "1w916hc6qn8bf5z95b43aqm25mbivlg7b4q91g5s6gy3q1f4iqna"; buildDepends = [ base opentheory opentheory-bits opentheory-byte opentheory-parser opentheory-primitive opentheory-probability QuickCheck @@ -93904,6 +94066,7 @@ self: { base opentheory opentheory-bits opentheory-byte opentheory-parser opentheory-primitive opentheory-probability QuickCheck ]; + homepage = "http://opentheory.gilith.com/?pkg=char"; description = "Unicode characters"; license = stdenv.lib.licenses.mit; }) {}; @@ -94708,6 +94871,7 @@ self: { time-locale-compat transformers transformers-base transformers-compat unordered-containers ]; + jailbreak = true; homepage = "http://github.com/brendanhay/pagerduty"; description = "Client library for PagerDuty Integration and REST APIs"; license = "unknown"; @@ -94776,31 +94940,31 @@ self: { "pandoc" = callPackage ({ mkDerivation, aeson, alex, ansi-terminal, array, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring - , containers, data-default, deepseq-generics, Diff, directory - , executable-path, extensible-exceptions, filepath, haddock-library - , happy, highlighting-kate, hslua, HTTP, http-client - , http-client-tls, http-types, HUnit, JuicyPixels, mtl, network - , network-uri, old-locale, old-time, pandoc-types, parsec, process - , QuickCheck, random, scientific, SHA, syb, tagsoup, temporary - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , texmath, text, time, unordered-containers, vector, xml, yaml - , zip-archive, zlib + , cmark, containers, css-text, data-default, deepseq-generics, Diff + , directory, executable-path, extensible-exceptions, filemanip + , filepath, haddock-library, happy, highlighting-kate, hslua, HTTP + , http-client, http-client-tls, http-types, HUnit, JuicyPixels, mtl + , network, network-uri, old-locale, old-time, pandoc-types, parsec + , process, QuickCheck, random, scientific, SHA, syb, tagsoup + , temporary, test-framework, test-framework-hunit + , test-framework-quickcheck2, texmath, text, time + , unordered-containers, vector, xml, yaml, zip-archive, zlib }: mkDerivation { pname = "pandoc"; - version = "1.13.2.1"; - sha256 = "0pvqi52sh3ldnszrvxlcq1s4v19haqb0wqh5rzn43pmqj2v6xnk6"; + version = "1.14"; + sha256 = "0n4l3jzvd8jzbsi6n4wli2dhijgywbpbss4syjmfnds9pbk6mhz1"; isLibrary = true; isExecutable = true; buildDepends = [ aeson alex array base base64-bytestring binary blaze-html - blaze-markup bytestring containers data-default deepseq-generics - directory extensible-exceptions filepath haddock-library happy - highlighting-kate hslua HTTP http-client http-client-tls http-types - JuicyPixels mtl network network-uri old-locale old-time - pandoc-types parsec process random scientific SHA syb tagsoup - temporary texmath text time unordered-containers vector xml yaml - zip-archive zlib + blaze-markup bytestring cmark containers css-text data-default + deepseq-generics directory extensible-exceptions filemanip filepath + haddock-library happy highlighting-kate hslua HTTP http-client + http-client-tls http-types JuicyPixels mtl network network-uri + old-locale old-time pandoc-types parsec process random scientific + SHA syb tagsoup temporary texmath text time unordered-containers + vector xml yaml zip-archive zlib ]; testDepends = [ ansi-terminal base bytestring containers Diff directory @@ -94838,6 +95002,7 @@ self: { aeson base bytestring directory filepath pandoc pandoc-types process temporary text yaml ]; + jailbreak = true; description = "Supports using pandoc with citeproc"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -94899,14 +95064,14 @@ self: { }: mkDerivation { pname = "pandoc-types"; - version = "1.12.4.2"; - sha256 = "0j9zzlpwjyy8fqr91fsnzy507ylwrwk7hhl9nkxzk19iva2c42n9"; + version = "1.12.4.3"; + sha256 = "1aj741y28ci039gy9j16jc7v3vfrj0rc11jliahx4202dz6fdyb5"; buildDepends = [ aeson base bytestring containers deepseq-generics ghc-prim syb ]; homepage = "http://johnmacfarlane.net/pandoc"; description = "Types for representing a structured document"; - license = stdenv.lib.licenses.bsd3; + license = "GPL"; }) {}; "pandoc-unlit" = callPackage @@ -95691,8 +95856,8 @@ self: { }: mkDerivation { pname = "path"; - version = "0.4.0"; - sha256 = "1576dlzrachkrxspsx4rnssmhmicja1pfd8z63g3zmz0m450dkpj"; + version = "0.5.0"; + sha256 = "1fk1fpyrmdxym2qnjmlhkgn2kyn5j728hiqw94i8kg47c1xnihkk"; buildDepends = [ base exceptions filepath template-haskell ]; testDepends = [ base hspec HUnit mtl ]; description = "Path"; @@ -96210,12 +96375,11 @@ self: { }: mkDerivation { pname = "peakachu"; - version = "0.3.0"; - sha256 = "0awj571rgcn69vl907b26j68azy7kyd3kki014lsfsngql9cp1pq"; + version = "0.3.1"; + sha256 = "1wmlainnbrzpwrsr4qhw7m39s4crhc67xg1mxam0rfj9c1cnimxp"; buildDepends = [ base derive GLUT List template-haskell time TypeCompose ]; - jailbreak = true; description = "Experiemental library for composable interactive programs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -96559,8 +96723,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.1.5"; - sha256 = "10ln7x3i16a3mxi7j4489rbl50xi3zpjbr49y25hgk0zz7pngnkz"; + version = "2.1.6"; + sha256 = "17jcj5xvxnck93dk01ac31mbh1b5pk1266x1zqap40glqs247myl"; buildDepends = [ aeson attoparsec base base64-bytestring blaze-html blaze-markup bytestring conduit containers exceptions fast-logger lifted-base @@ -96570,8 +96734,9 @@ self: { ]; testDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring - conduit containers hspec monad-control monad-logger old-locale - path-pieces resourcet scientific text time transformers + conduit containers fast-logger hspec lifted-base monad-control + monad-logger mtl old-locale path-pieces resource-pool resourcet + scientific tagged template-haskell text time transformers unordered-containers vector ]; extraLibraries = [ sqlite ]; @@ -96709,8 +96874,8 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.1.5.3"; - sha256 = "1ir23x7b2hagpiiva45fmcyfdmi2cw7m0qf2zqdp22lpa41vlyvl"; + version = "2.1.6"; + sha256 = "1s3dzwxv1rzfg7f5l9qsypzvm7pk2jiqjzdfksiq0ji37f73v7l6"; buildDepends = [ aeson base blaze-builder bytestring conduit containers monad-control monad-logger persistent postgresql-libpq @@ -96821,8 +96986,8 @@ self: { }: mkDerivation { pname = "persistent-template"; - version = "2.1.3.1"; - sha256 = "09qzl0wjf5h8xgs8imq9q25ik8xkn7jgpy9wpmwvsr5wichdfgk5"; + version = "2.1.3.3"; + sha256 = "1p9vndchcd06ajqmqmf3pw5ql9r6jqbs9xl5jxv1x0pjvbq6yjy5"; buildDepends = [ aeson base bytestring containers ghc-prim monad-control monad-logger path-pieces persistent tagged template-haskell text @@ -96831,6 +96996,7 @@ self: { testDepends = [ aeson base bytestring hspec persistent QuickCheck text transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, non-relational, multi-backend persistence"; license = stdenv.lib.licenses.mit; @@ -97334,6 +97500,7 @@ self: { http-client-tls network-info process random text text-format time xdg-basedir ]; + jailbreak = true; homepage = "https://github.com/enolan/pia-forward"; description = "Set up port forwarding with the Private Internet Access VPN service"; license = stdenv.lib.licenses.gpl3; @@ -97509,6 +97676,7 @@ self: { aeson attoparsec base bytestring pipes pipes-attoparsec pipes-bytestring pipes-parse transformers ]; + jailbreak = true; homepage = "https://github.com/k0001/pipes-aeson"; description = "Encode and decode JSON streams using Aeson and Pipes"; license = stdenv.lib.licenses.bsd3; @@ -97704,18 +97872,6 @@ self: { }) {}; "pipes-errors" = callPackage - ({ mkDerivation, base, errors, pipes }: - mkDerivation { - pname = "pipes-errors"; - version = "0.2.1"; - sha256 = "08i3rzqz7r5vkjfry0bdw3gpxjzhni8xmwwa6p8hdkixznjq7539"; - buildDepends = [ base errors pipes ]; - homepage = "https://github.com/jdnavarro/pipes-errors"; - description = "Integration between pipes and errors"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pipes-errors_0_3" = callPackage ({ mkDerivation, base, errors, pipes }: mkDerivation { pname = "pipes-errors"; @@ -98691,6 +98847,7 @@ self: { version = "0.7.3"; sha256 = "0vv7j1l0wnjwpd3hpxswq0k33izl0ck2njspcga885bkrd45lzdr"; buildDepends = [ base binary containers text text-binary ]; + jailbreak = true; homepage = "https://github.com/kawu/polimorf"; description = "Working with the PoliMorf dictionary"; license = stdenv.lib.licenses.bsd3; @@ -99657,8 +99814,11 @@ self: { mkDerivation { pname = "pqueue"; version = "1.2.1"; + revision = "1"; sha256 = "1fily60f4njby7zknmik7a2wxsm3y77ckr69w9bb3fgq22gbzky6"; + editedCabalFile = "ea1de2ab89c2b8b16eb189910b568409e2a5b4af283cf19e179a6fd95fe15fa3"; buildDepends = [ base deepseq ]; + jailbreak = true; description = "Reliable, persistent, fast priority queues"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -99952,7 +100112,9 @@ self: { mkDerivation { pname = "presburger"; version = "1.3.1"; + revision = "1"; sha256 = "15yhqc6gk14dsqr4b0x87i1xw0sc3iscw28grg4vmcspsjxil0l6"; + editedCabalFile = "7c88061e13bab0e63240c05dad36b9518ad50d7ad4ade0f8911efa7826eb4b5d"; buildDepends = [ base containers pretty ]; testDepends = [ base QuickCheck ]; homepage = "http://github.com/yav/presburger"; @@ -101216,8 +101378,8 @@ self: { }: mkDerivation { pname = "pseudo-boolean"; - version = "0.1.0.0"; - sha256 = "1dqy8zpf7016rm3wyvgwipllm95wmrr9na04v4x402k1f8pvkdvc"; + version = "0.1.0.1"; + sha256 = "1a46dx6xxnzhf66kym9xbxxcbqkmqbadg7gxhd2clsahbwlm4w4d"; buildDepends = [ attoparsec base bytestring bytestring-builder containers deepseq dlist hashable parsec @@ -101227,7 +101389,7 @@ self: { tasty-th temporary ]; homepage = "https://github.com/msakai/pseudo-boolean"; - description = "Reading\/Writing OPB\/WBO files used in pseudo boolean competition"; + description = "Reading/Writing OPB/WBO files used in pseudo boolean competition"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -103327,10 +103489,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "rdtsc"; - version = "1.3.0.0"; - sha256 = "1j421cfyz35mkh78idw89b0gl7c810n04pfh0lvdprghlfk90adk"; + version = "1.3.0.1"; + sha256 = "0l6r5v6bgqf7lq9j6bf7w362bz7bv4xrsbz90ns60v4dyqjskjal"; buildDepends = [ base ]; - homepage = "http://code.haskell.org/rdtsc"; + homepage = "https://github.com/mgrabmueller/rdtsc"; description = "Binding for the rdtsc machine instruction"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -103751,6 +103913,7 @@ self: { sha256 = "023g63y478k7mq8kk5xcxa3civs3hdhlvdb0qh3amvvybpj3g4av"; buildDepends = [ aeson base base-prelude record template-haskell ]; testDepends = [ aeson base-prelude hspec record ]; + jailbreak = true; homepage = "https://github.com/nikita-volkov/record-aeson"; description = "Instances of \"aeson\" classes for the \"record\" types"; license = stdenv.lib.licenses.mit; @@ -105842,20 +106005,20 @@ self: { "rest-core" = callPackage ({ mkDerivation, aeson, aeson-utils, base, bytestring - , case-insensitive, either, errors, fclabels, HUnit, hxt - , hxt-pickle-utils, json-schema, mtl, mtl-compat, multipart, random - , rest-stringmap, rest-types, safe, split, test-framework - , test-framework-hunit, text, transformers, transformers-compat - , unordered-containers, uri-encode, utf8-string, uuid + , case-insensitive, errors, fclabels, HUnit, hxt, hxt-pickle-utils + , json-schema, mtl, mtl-compat, multipart, random, rest-stringmap + , rest-types, safe, split, test-framework, test-framework-hunit + , text, transformers, transformers-compat, unordered-containers + , uri-encode, utf8-string, uuid }: mkDerivation { pname = "rest-core"; - version = "0.36.0.1"; - sha256 = "0a4l1ll2a16ma1lzq7cdhrcf4ld8p40hysfkz2l4m80gf5khzmby"; + version = "0.36.0.4"; + sha256 = "07ypxsf15ghcnlb706cnl3jw275jlwa158dxb0gkr6ab8sq5f2zk"; buildDepends = [ - aeson aeson-utils base bytestring case-insensitive either errors - fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat multipart - random rest-stringmap rest-types safe split text transformers + aeson aeson-utils base bytestring case-insensitive errors fclabels + hxt hxt-pickle-utils json-schema mtl mtl-compat multipart random + rest-stringmap rest-types safe split text transformers transformers-compat unordered-containers uri-encode utf8-string uuid ]; @@ -105884,6 +106047,7 @@ self: { json-schema mtl rest-core rest-gen safe stm text time transformers transformers-base transformers-compat unordered-containers ]; + jailbreak = true; homepage = "http://www.github.com/silkapp/rest"; description = "Example project for rest"; license = stdenv.lib.licenses.bsd3; @@ -105893,21 +106057,19 @@ self: { ({ mkDerivation, aeson, base, blaze-html, Cabal, code-builder , directory, fclabels, filepath, hashable, haskell-src-exts , HStringTemplate, HUnit, hxt, json-schema, pretty, process - , rest-core, safe, scientific, semigroups, split, tagged - , test-framework, test-framework-hunit, text, uniplate - , unordered-containers, vector + , rest-core, safe, scientific, semigroups, split, test-framework + , test-framework-hunit, text, uniplate, unordered-containers + , vector }: mkDerivation { pname = "rest-gen"; - version = "0.17.0.4"; - revision = "1"; - sha256 = "1ycdpqscdc8rxpj1fv6bjj7bvi6jww010c2rvcs6b155jxwdg5l2"; - editedCabalFile = "b218da6eb2fd339d0d16ac67e441379824aaba7ef2b8b2cc3f9acbb88d7be778"; + version = "0.17.0.5"; + sha256 = "1pwn1ws6dcwa00y8dblaj7wnr51mv9hjrc05fiv7mzvl0j0v0iz7"; buildDepends = [ aeson base blaze-html Cabal code-builder directory fclabels filepath hashable haskell-src-exts HStringTemplate hxt json-schema - pretty process rest-core safe scientific semigroups split tagged - text uniplate unordered-containers vector + pretty process rest-core safe scientific semigroups split text + uniplate unordered-containers vector ]; testDepends = [ base fclabels haskell-src-exts HUnit rest-core test-framework @@ -105950,14 +106112,14 @@ self: { "rest-stringmap" = callPackage ({ mkDerivation, aeson, base, containers, hashable, hxt - , json-schema, tagged, text, tostring, unordered-containers + , json-schema, tostring, unordered-containers }: mkDerivation { pname = "rest-stringmap"; - version = "0.2.0.4"; - sha256 = "0r9wmy5myysnw83000qlw547ny9lpshm09fi8hmfr14kd3mr9fb1"; + version = "0.2.0.5"; + sha256 = "0xnvzwwaxfl2iphpicprn0wvlfk3cg6vz53kl2gv1fi322jcjv3b"; buildDepends = [ - aeson base containers hashable hxt json-schema tagged text tostring + aeson base containers hashable hxt json-schema tostring unordered-containers ]; description = "Maps with stringy keys that can be transcoded to JSON and XML"; @@ -105966,17 +106128,15 @@ self: { "rest-types" = callPackage ({ mkDerivation, aeson, base, case-insensitive, generic-aeson - , generic-xmlpickler, hxt, json-schema, mtl, rest-stringmap, text - , transformers, transformers-compat, uuid + , generic-xmlpickler, hxt, json-schema, rest-stringmap, text, uuid }: mkDerivation { pname = "rest-types"; - version = "1.14"; - sha256 = "02pixhkym28c9jc5w4bf3fjvpcid9vha3f5qd2v4kny4hfq47ybq"; + version = "1.14.0.1"; + sha256 = "0chb91gb3xvfp7k4sbsp07ri2m5x26qj4q2bq0ldkxpk06jicmb4"; buildDepends = [ aeson base case-insensitive generic-aeson generic-xmlpickler hxt - json-schema mtl rest-stringmap text transformers - transformers-compat uuid + json-schema rest-stringmap text uuid ]; description = "Silk Rest Framework Types"; license = stdenv.lib.licenses.bsd3; @@ -108313,8 +108473,8 @@ self: { }: mkDerivation { pname = "scalpel"; - version = "0.2.0.1"; - sha256 = "13fg89klhw9lwirhglbn1cvky0gwaf0idanrvcrd9wv875kxisd4"; + version = "0.2.1"; + sha256 = "0lva7pi78ksbxcjd19dycn4ayxcma28wrjmx3x31hn01nvhsnqg0"; buildDepends = [ base bytestring curl regex-base regex-tdfa tagsoup text ]; @@ -108592,6 +108752,7 @@ self: { buildDepends = [ aeson base bytestring containers deepseq-generics ghc-prim syb ]; + jailbreak = true; homepage = "http://scholdoc.scholarlymarkdown.com"; description = "Scholdoc fork of pandoc-types"; license = "GPL"; @@ -108799,9 +108960,9 @@ self: { mkDerivation { pname = "scotty"; version = "0.9.1"; - revision = "1"; + revision = "2"; sha256 = "0w07ghnd7l8ibfbl8p74lwn8gxy3z28mp0rlv5crma3yh42irsqm"; - editedCabalFile = "5a0fefbeb7107a096658d4f0743084bd26e9b0c84853fd560715b0aa46c5802a"; + editedCabalFile = "e37bd4bbb4da4e6d20bd8a29a5c3ca13476643e796a3463a20cbcbd2437bfde7"; buildDepends = [ aeson base blaze-builder bytestring case-insensitive data-default http-types monad-control mtl regex-compat text transformers @@ -109195,6 +109356,7 @@ self: { base primitive QuickCheck storable-complex test-framework test-framework-quickcheck2 vector ]; + jailbreak = true; homepage = "https://github.com/adamwalker/sdr"; description = "A software defined radio library"; license = stdenv.lib.licenses.bsd3; @@ -112614,6 +112776,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "smallcheck-lens" = callPackage + ({ mkDerivation, base, lens, smallcheck, smallcheck-series, tasty + , tasty-smallcheck, transformers + }: + mkDerivation { + pname = "smallcheck-lens"; + version = "0.1"; + sha256 = "19awz3gphvkmb54j3mqqmqjzdjywdrrvsb9lp46gbhjazn94sxdl"; + buildDepends = [ + base lens smallcheck smallcheck-series tasty tasty-smallcheck + transformers + ]; + testDepends = [ base lens smallcheck tasty tasty-smallcheck ]; + homepage = "https://github.com/jdnavarro/smallcheck-lens"; + description = "SmallCheck lens laws"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "smallcheck-series" = callPackage ({ mkDerivation, base, bytestring, containers, doctest, Glob , logict, smallcheck, text, transformers @@ -112915,6 +113095,7 @@ self: { stm syb template-haskell text time transformers unordered-containers vector vector-algorithms xmlhtml ]; + jailbreak = true; homepage = "http://snapframework.com/"; description = "Top-level package for the Snap Web Framework"; license = stdenv.lib.licenses.bsd3; @@ -113111,6 +113292,7 @@ self: { base bytestring containers QuickCheck snap-core tasty tasty-hunit tasty-quickcheck ]; + jailbreak = true; description = "A collection of useful helpers and utilities for Snap web applications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -113406,6 +113588,7 @@ self: { aeson base bytestring configurator directory fay filepath mtl snap snap-core transformers ]; + jailbreak = true; homepage = "https://github.com/faylang/snaplet-fay"; description = "Fay integration for Snap with request- and pre-compilation"; license = stdenv.lib.licenses.bsd3; @@ -114271,6 +114454,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "socket" = callPackage + ({ mkDerivation, async, base, bytestring }: + mkDerivation { + pname = "socket"; + version = "0.1.0.1"; + revision = "1"; + sha256 = "06c5vrpwrlp1ab8axvbmrar382d780a8m6zqvvjb6zjahgd5cl32"; + editedCabalFile = "ef4027263ba8c3069f127839a7bace4b09d6d78714183b3faab935919c57e09c"; + buildDepends = [ base bytestring ]; + testDepends = [ async base bytestring ]; + homepage = "https://github.com/lpeterse/haskell-socket"; + description = "A binding to the POSIX sockets interface"; + license = stdenv.lib.licenses.mit; + }) {}; + "socket-activation" = callPackage ({ mkDerivation, base, network, transformers, unix }: mkDerivation { @@ -114289,13 +114487,12 @@ self: { }: mkDerivation { pname = "socket-io"; - version = "1.3.1"; - sha256 = "0ylb05lcgprvfdvhc71dqhh9azsp12vwx8zihdvcim0ax0ylrb20"; + version = "1.3.2"; + sha256 = "0bqrglnp54hd777lq92ia7z9vwmj1dq24m7lbiqhzvvb63p9mv4i"; buildDepends = [ aeson attoparsec base bytestring engine-io mtl stm text transformers unordered-containers vector ]; - jailbreak = true; homepage = "http://github.com/ocharles/engine.io"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -114372,14 +114569,13 @@ self: { }: mkDerivation { pname = "som"; - version = "8.0.4"; - sha256 = "0jax009wbqlkkdhli5g0d01cgl7lvc8j2a86lp6p1msdk8rb6nls"; + version = "8.0.5"; + sha256 = "1cprlv1mbs722ap3cicgi0haph9xlz2xvcm374857d11ly31wav0"; buildDepends = [ base containers grid MonadRandom ]; testDepends = [ base containers grid MonadRandom QuickCheck random test-framework test-framework-quickcheck2 ]; - jailbreak = true; homepage = "https://github.com/mhwombat/som"; description = "Self-Organising Maps"; license = stdenv.lib.licenses.bsd3; @@ -114675,6 +114871,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "spaceprobe" = callPackage + ({ mkDerivation, base, clock, containers, erf, mtl, QuickCheck + , test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "spaceprobe"; + version = "0.3.0"; + sha256 = "09vpnq5mfdzr132cqm5i4xkxmpg2035pbs64a56lgq0asdzlhfmy"; + buildDepends = [ base clock containers erf mtl ]; + testDepends = [ + base clock containers erf mtl QuickCheck test-framework + test-framework-quickcheck2 + ]; + homepage = "https://github.com/SeanRBurton/spaceprobe"; + description = "Optimization over arbitrary search spaces"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "sparse" = callPackage ({ mkDerivation, base, bytestring, containers, contravariant , deepseq, directory, doctest, filepath, hlint, hybrid-vectors @@ -117636,6 +117850,7 @@ self: { http-types template-haskell text time transformers ]; testDepends = [ base bytestring hlint markdown-unlit time ]; + jailbreak = true; homepage = "http://taylor.fausak.me/strive/"; description = "A Haskell client for the Strava V3 API"; license = stdenv.lib.licenses.mit; @@ -117810,6 +118025,7 @@ self: { haskell-src-exts HUnit mtl syb test-framework test-framework-hunit yaml ]; + jailbreak = true; homepage = "https://github.com/jaspervdj/stylish-haskell"; description = "Haskell code prettifier"; license = stdenv.lib.licenses.bsd3; @@ -119596,6 +119812,7 @@ self: { version = "0.3.0"; sha256 = "0x1mwwlwhka12bzshy0j0w7iq9ka6kn1jgsifi26jmg7zf79zydf"; buildDepends = [ base binary containers parsec text text-binary ]; + jailbreak = true; homepage = "https://github.com/kawu/tagset-positional"; description = "Positional tags and tagsets"; license = stdenv.lib.licenses.bsd3; @@ -120706,8 +120923,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "terminal-size"; - version = "0.3.0"; - sha256 = "0g8v08d20hlfsah9dlgv2v2pzj0m4dva0zp6zi4jrkxjhg6vi7bw"; + version = "0.3.2"; + sha256 = "0vm6xrm5j60h01lgn7srhsx2698aq6k5jkbc84bi5zh5w63fsdyp"; buildDepends = [ base ]; description = "Get terminal window height and width"; license = stdenv.lib.licenses.bsd3; @@ -121305,8 +121522,8 @@ self: { }: mkDerivation { pname = "text"; - version = "1.2.1.0"; - sha256 = "0mpv82v853jimshff8xg2429hr23lp81vlrps76ypndz5ilxzipi"; + version = "1.2.1.1"; + sha256 = "0l4lrpa216dblm1qk0qpykmx56a28h0hjgccq18sn1mr7n3wyhl8"; buildDepends = [ array base binary bytestring deepseq ghc-prim integer-gmp ]; @@ -121341,12 +121558,9 @@ self: { ({ mkDerivation, base, binary, text }: mkDerivation { pname = "text-binary"; - version = "0.1.0"; - revision = "1"; - sha256 = "0wc501j8hqspnhf4d1hyb18f1wgc4kl2qx1b5s4bkxv0dfbwrk6z"; - editedCabalFile = "73815941abe470b6d0e2287c054995c5ec59524bed9d2f6bfef2411a4397c48d"; + version = "0.2.0"; + sha256 = "09njl6afnj2yjqn3mg3ry4qsd5jjjh51malk6kn2zzihldb9z5b2"; buildDepends = [ base binary text ]; - jailbreak = true; homepage = "https://github.com/kawu/text-binary"; description = "Binary instances for text types"; license = stdenv.lib.licenses.bsd3; @@ -122137,8 +122351,8 @@ self: { }: mkDerivation { pname = "th-typegraph"; - version = "0.17"; - sha256 = "0k6bjf3r6g64h5al7gxcrkwb5b67kjpx8y4ib6f3a6l00p620297"; + version = "0.17.1"; + sha256 = "06hyyb1rjm8rvkllvjsgh56fwly99hv33brb4xycc1sc4452cslm"; buildDepends = [ base containers data-default haskell-src-exts lens mtl syb template-haskell th-desugar th-orphans @@ -122170,6 +122384,7 @@ self: { transformers ]; testDepends = [ base bytestring tasty tasty-hunit text time ]; + jailbreak = true; homepage = "http://github.com/pjones/themoviedb"; description = "Haskell API bindings for http://themoviedb.org"; license = stdenv.lib.licenses.mit; @@ -122463,6 +122678,7 @@ self: { template-haskell text transformers unordered-containers vault vector websockets websockets-snap ]; + jailbreak = true; homepage = "http://wiki.haskell.org/Threepenny-gui"; description = "GUI framework that uses the web browser as a display"; license = stdenv.lib.licenses.bsd3; @@ -124550,8 +124766,8 @@ self: { }: mkDerivation { pname = "ttrie"; - version = "0.1.1"; - sha256 = "1di4h0vqj0hyxy0zgxkr1zwfy901hfglh9da21kv7li88c2d51sp"; + version = "0.1.2"; + sha256 = "09nbba623nxnlg1957sgcrrva3ycwb31asxnxihwjh0wxrqhh1k0"; buildDepends = [ atomic-primops base hashable primitive stm ]; testDepends = [ base containers hashable QuickCheck stm test-framework @@ -124566,19 +124782,19 @@ self: { "tttool" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , directory, executable-path, filepath, hashable, haskeline - , JuicyPixels, mtl, parsec, process, process-extras, random - , template-haskell, time, vector, yaml + , JuicyPixels, mtl, parsec, process, random, template-haskell, time + , vector, yaml }: mkDerivation { pname = "tttool"; - version = "1.4.0.1"; - sha256 = "1adk3ngh88bm2mwycvpw3fsvzcrprkd34wyam6pan8yvw1jaz0lg"; + version = "1.4.0.2"; + sha256 = "0avn7011868nqibmdz07s27d8g46v9hwps5h04dg57vk9305j70g"; isLibrary = false; isExecutable = true; buildDepends = [ aeson base binary bytestring containers directory executable-path - filepath hashable haskeline JuicyPixels mtl parsec process - process-extras random template-haskell time vector yaml + filepath hashable haskeline JuicyPixels mtl parsec process random + template-haskell time vector yaml ]; homepage = "https://github.com/entropia/tip-toi-reveng"; description = "Working with files for the Tiptoi® pen"; @@ -125155,6 +125371,7 @@ self: { testDepends = [ base containers HUnit test-framework test-framework-hunit ]; + jailbreak = true; homepage = "https://github.com/stackbuilders/twitter-feed"; description = "Client for fetching Twitter timeline via Oauth"; license = stdenv.lib.licenses.mit; @@ -127549,7 +127766,9 @@ self: { mkDerivation { pname = "urlpath"; version = "2.1.0"; + revision = "1"; sha256 = "1q8zj228ln9xmr3r0ggv6pi074l8ixchn81mw8664jikf2pjcqq9"; + editedCabalFile = "a342b25d9ea3984cf20025d421f59629d7abdf4bd2b42a4e9ef53ba5729f13e1"; buildDepends = [ base monoid-subclasses mtl transformers ]; testDepends = [ base hspec monoid-subclasses mtl QuickCheck quickcheck-instances @@ -127711,6 +127930,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "users-persistent" = callPackage + ({ mkDerivation, aeson, base, bytestring, hspec, monad-logger, mtl + , persistent, persistent-sqlite, persistent-template, temporary + , text, time, users, users-test, uuid + }: + mkDerivation { + pname = "users-persistent"; + version = "0.3.0.0"; + sha256 = "0hdvsnjciw3a6gsz5lv5q6m5fs3hd60gmgfbzgx5n7md2ya5jimr"; + buildDepends = [ + aeson base bytestring mtl persistent persistent-template text time + users uuid + ]; + testDepends = [ + base hspec monad-logger persistent-sqlite temporary text users-test + ]; + homepage = "https://github.com/agrafix/users"; + description = "A persistent backend for the users package"; + license = stdenv.lib.licenses.mit; + }) {}; + "users-postgresql-simple" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, mtl , postgresql-simple, text, time, users, users-test, uuid @@ -129550,18 +129790,20 @@ self: { "waddle" = callPackage ({ mkDerivation, base, binary, bytestring, case-insensitive - , containers + , containers, directory, JuicyPixels }: mkDerivation { pname = "waddle"; - version = "0.1.0.3"; - sha256 = "1jvijw4bsg206cy8y49g1vz0y7j3p3xzq6jxz70w1gicrw5ja01c"; + version = "0.1.0.5"; + sha256 = "0v4qhr01bqz7hb5q8hf2rdk8fxrbbmvsighi5wv2gv5b3cwh28cv"; isLibrary = true; isExecutable = true; buildDepends = [ - base binary bytestring case-insensitive containers + base binary bytestring case-insensitive containers directory + JuicyPixels ]; jailbreak = true; + homepage = "https://github.com/mgrabmueller/waddle"; description = "DOOM WAD file utilities"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -130306,8 +130548,8 @@ self: { }: mkDerivation { pname = "wai-request-spec"; - version = "0.8.5.2"; - sha256 = "1r51ib85krin61ggqgrir0igma80qryblqqrf38j01af1qnvvlxv"; + version = "0.9.1.0"; + sha256 = "1niszz8v8x4qkzssc5pmhpqsq3v9ad4gscx0dxxxpfz76fcs4f1k"; buildDepends = [ base bytestring case-insensitive containers http-types text wai ]; @@ -130362,16 +130604,16 @@ self: { }) {}; "wai-routes" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, http-types - , mtl, template-haskell, text, wai, yesod-routes + ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers + , http-types, mtl, path-pieces, random, template-haskell, text, wai }: mkDerivation { pname = "wai-routes"; - version = "0.5.1"; - sha256 = "0xd4abccgnj793vbrf1a0m1ddcq8i4p8f7sxk6mz4d1lzb4y0sf0"; + version = "0.6.1"; + sha256 = "15j37h3a56fsgmznmw8b1ksp0pkrrqz3kyrwj69hba2bnjcq5n7q"; buildDepends = [ - aeson base blaze-builder bytestring http-types mtl template-haskell - text wai yesod-routes + aeson base blaze-builder bytestring containers http-types mtl + path-pieces random template-haskell text wai ]; jailbreak = true; homepage = "https://github.com/ajnsit/wai-routes"; @@ -130677,8 +130919,8 @@ self: { }: mkDerivation { pname = "warp-tls"; - version = "3.0.3"; - sha256 = "1ngprhmf58i80fkw2z750pxavyv05g3sr8j7hd24h47msmghq9mm"; + version = "3.0.4"; + sha256 = "03k8iynz586cdjjh4nyrlbs8c864d305swrf4xkf55r9l3klsbg4"; buildDepends = [ base bytestring cprng-aes data-default-class network streaming-commons tls wai warp @@ -134978,6 +135220,7 @@ self: { lifted-base network-uri random text transformers yesod-auth yesod-core yesod-form ]; + jailbreak = true; homepage = "http://github.com/thoughtbot/yesod-auth-oauth2"; description = "OAuth 2.0 authentication plugins"; license = stdenv.lib.licenses.bsd3; @@ -135452,6 +135695,7 @@ self: { wai-logger warp yaml yesod yesod-auth yesod-core yesod-form yesod-persistent yesod-static ]; + jailbreak = true; homepage = "https://github.com/prowdsponsor/mangopay"; description = "Yesod library for MangoPay API access"; license = stdenv.lib.licenses.bsd3; @@ -135471,6 +135715,7 @@ self: { base blaze-html blaze-markup bytestring directory pandoc persistent shakespeare texmath text xss-sanitize yesod-core yesod-form ]; + jailbreak = true; homepage = "http://github.com/pbrisbin/yesod-markdown"; description = "Tools for using markdown in a yesod application"; license = stdenv.lib.licenses.gpl2; @@ -135984,6 +136229,7 @@ self: { aeson base markdown persistent shakespeare text yesod-core yesod-form yesod-persistent ]; + jailbreak = true; description = "Yesod support for Text.Markdown."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -136539,6 +136785,7 @@ self: { HStringTemplate lucid old-locale old-time pandoc parsec scientific split text time unordered-containers yaml ]; + jailbreak = true; homepage = "http://github.com/jgm/yst"; description = "Builds a static website from templates and data in YAML or CSV files"; license = "GPL"; From 9cc46aaa4a6493e464324bb8bb0eda0068e3c071 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 26 May 2015 13:09:01 +0200 Subject: [PATCH 033/126] git-annex: switch to the version built with GHC 7.10.1 Also, this change renames the "gitAnnex" attribute to "git-annex". This seems more in-line with recent additions to the git package family, which all used dashed names instead of camel-caps. --- pkgs/applications/version-management/git-and-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 56a6618e531..669fe6dc890 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -46,7 +46,7 @@ rec { sendEmailSupport = !stdenv.isDarwin; }; - gitAnnex = pkgs.haskell-ng.packages.ghc784.git-annex; + inherit (pkgs.haskellPackages) git-annex; qgit = import ./qgit { inherit fetchurl stdenv; From 2e24bef56f2e811026c7412acca6a0115da0c7a7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 27 May 2015 15:05:25 +0200 Subject: [PATCH 034/126] ghc-6.x: enable builds again now that 5a89a87cc575f0d8 is in master Resolves https://github.com/NixOS/nixpkgs/issues/7810. --- pkgs/development/compilers/ghc/6.10.2-binary.nix | 1 - pkgs/development/compilers/ghc/6.10.4.nix | 1 - pkgs/development/compilers/ghc/6.12.3.nix | 1 - 3 files changed, 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix index 3a649c2420a..4e660853f20 100644 --- a/pkgs/development/compilers/ghc/6.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix @@ -102,7 +102,6 @@ stdenv.mkDerivation rec { description = "The Glasgow Haskell Compiler"; license = stdenv.lib.licenses.bsd3; platforms = ["x86_64-linux" "i686-linux"]; - broken = true; # https://github.com/NixOS/nixpkgs/issues/7810 }; } diff --git a/pkgs/development/compilers/ghc/6.10.4.nix b/pkgs/development/compilers/ghc/6.10.4.nix index 0df0ef27ca0..d8157673fbc 100644 --- a/pkgs/development/compilers/ghc/6.10.4.nix +++ b/pkgs/development/compilers/ghc/6.10.4.nix @@ -25,6 +25,5 @@ stdenv.mkDerivation rec { description = "The Glasgow Haskell Compiler"; platforms = ["x86_64-linux" "i686-linux"]; # Darwin is unsupported. inherit (ghc.meta) license; - broken = true; # https://github.com/NixOS/nixpkgs/issues/7810 }; } diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix index 499f1db79ba..f6beaf3a006 100644 --- a/pkgs/development/compilers/ghc/6.12.3.nix +++ b/pkgs/development/compilers/ghc/6.12.3.nix @@ -39,6 +39,5 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ]; platforms = ["x86_64-linux" "i686-linux"]; # Darwin is unsupported. inherit (ghc.meta) license; - broken = true; # https://github.com/NixOS/nixpkgs/issues/7810 }; } From 8c03484b3b7d03fe9d2971070526acb79e27077b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 28 May 2015 09:51:05 +0200 Subject: [PATCH 035/126] haskell-ncurses: remove obsolete override --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ce7b8b27d32..85d261c0c78 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -457,9 +457,6 @@ self: super: { # https://bitbucket.org/wuzzeb/webdriver-utils/issue/1/hspec-webdriver-101-cant-compile-its-test hspec-webdriver = markBroken super.hspec-webdriver; - # The build fails with the most recent version of c2hs. - ncurses = super.ncurses.override { c2hs = self.c2hs_0_20_1; }; - # Needs access to locale data, but looks for it in the wrong place. scholdoc-citeproc = dontCheck super.scholdoc-citeproc; From 8b800621855027ff48221a415a77da7d53bda397 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 28 May 2015 09:52:05 +0200 Subject: [PATCH 036/126] haskell-configuration-ghc-7.10.x: remove obsolete override for old c2hs version --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 678faa1c54c..1329ad24f8f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -238,7 +238,6 @@ self: super: { # Broken with GHC 7.10.x. aeson_0_7_0_6 = markBroken super.aeson_0_7_0_6; - c2hs_0_20_1 = markBroken super.c2hs_0_20_1; Cabal_1_20_0_3 = markBroken super.Cabal_1_20_0_3; cabal-install_1_18_1_0 = markBroken super.cabal-install_1_18_1_0; containers_0_4_2_1 = markBroken super.containers_0_4_2_1; From e5a1818745ec6e299d425282258301b1415090f7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 28 May 2015 10:03:02 +0200 Subject: [PATCH 037/126] haskell-mueval is broken (and has been for a while) --- .../development/haskell-modules/configuration-common.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 85d261c0c78..86af3d220ad 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -747,13 +747,8 @@ self: super: { # Patch to consider NIX_GHC just like xmonad does dyre = appendPatch super.dyre ./dyre-nix.patch; - # Fix problems with GHC >=7.8 (in compatible way) - mueval = let pkg = appendPatch super.mueval (pkgs.fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/gwern/mueval/pull/4.patch"; - sha256 = "1l0jn2lbzbhx9ifbpb5g617qa0fc8fwa6kyr87pjqfxpqminsgp5"; - }); - # Nix-specific workaround - in appendPatch pkg ./mueval-nix.patch; + # https://github.com/gwern/mueval/issues/9 + mueval = markBrokenVersion "0.9.1.1" super.mueval; # Test suite won't compile against tasty-hunit 0.9.x. zlib = dontCheck super.zlib; From ef0d959fe9d2439a453863fdd0d58dea06895ade Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 28 May 2015 10:03:36 +0200 Subject: [PATCH 038/126] haskell-BNFC: build has been fixed, but the test suite still won't compile --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 86af3d220ad..48f5dedce36 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -827,4 +827,7 @@ self: super: { # https://github.com/alphaHeavy/lzma-enumerator/issues/3 lzma-enumerator = dontCheck super.lzma-enumerator; + # https://github.com/BNFC/bnfc/issues/140 + BNFC = dontCheck super.BNFC; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 1329ad24f8f..470a944fa93 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -183,10 +183,6 @@ self: super: { in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3 self.webkitgtk3-javascriptcore ]; - # https://github.com/BNFC/bnfc/issues/137 - BNFC = markBrokenVersion "2.7.1" super.BNFC; - cubical = dontDistribute super.cubical; - # contacted maintainer by e-mail cmdlib = markBrokenVersion "0.3.5" super.cmdlib; darcs-fastconvert = dontDistribute super.darcs-fastconvert; From c139b0593c05204e9346d0c334742dc2f050db5d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 28 May 2015 10:34:13 +0200 Subject: [PATCH 039/126] Fix haskell-spaceprobe and llvm-general. --- pkgs/development/haskell-modules/configuration-common.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 48f5dedce36..9241ce0908d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -739,7 +739,9 @@ self: super: { # Uses OpenGL in testing caramia = dontCheck super.caramia; - llvm-general = super.llvm-general.override { llvm-config = pkgs.llvmPackages_34.llvm; }; + # Needs help finding LLVM. + llvm-general = super.llvm-general.override { llvm-config = self.llvmPackages.llvm; }; + spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm; # Tries to run GUI in tests leksah = dontCheck super.leksah; From a1c0a00dace883ca42bc66a53bd1e70303fc3c18 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 28 May 2015 13:07:36 +0200 Subject: [PATCH 040/126] haskell-text-binary: remove patch that's contained in version 0.2.x --- pkgs/development/haskell-modules/configuration-common.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9241ce0908d..31093a46340 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -820,12 +820,6 @@ self: super: { # https://github.com/hvr/token-bucket/issues/3 token-bucket = dontCheck super.token-bucket; - # https://github.com/kawu/text-binary/issues/2 - text-binary = appendPatch super.text-binary (pkgs.fetchpatch { - url = "https://github.com/RyanGlScott/text-binary/commit/608e0ce86a9a7591dbfe83f7cbb36b8d8ebd07b8.patch"; - sha256 = "1rk5rgb5lsykpvylz77hzxyflxzlmi3fi06rf0yqg2vvrnri83f1"; - }); - # https://github.com/alphaHeavy/lzma-enumerator/issues/3 lzma-enumerator = dontCheck super.lzma-enumerator; From 62d691b4cabe0837099af0bbbaa4fe4f6ca7d8f5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 29 May 2015 10:27:35 +0200 Subject: [PATCH 041/126] haskell-pandoc: don't use shared linking for executables The build contains special magic surrounding the build of make-pandoc-man-pages, and that magic fails in case we link binaries dynamically. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 31093a46340..b22d3f736ce 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -675,8 +675,8 @@ self: super: { # https://github.com/junjihashimoto/test-sandbox-compose/issues/2 test-sandbox-compose = dontCheck super.test-sandbox-compose; - # https://github.com/jgm/pandoc/issues/2036 - pandoc = dontCheck super.pandoc; + # https://github.com/jgm/pandoc/issues/2190 + pandoc = disableSharedExecutables super.pandoc; # Broken by GLUT update. Monadius = markBroken super.Monadius; From d2496ba1429023189dd441596c7db2d1fe1907b5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 29 May 2015 11:06:58 +0200 Subject: [PATCH 042/126] haskell-pandoc: install man pages --- pkgs/development/haskell-modules/configuration-common.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b22d3f736ce..ffee4900904 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -676,7 +676,13 @@ self: super: { test-sandbox-compose = dontCheck super.test-sandbox-compose; # https://github.com/jgm/pandoc/issues/2190 - pandoc = disableSharedExecutables super.pandoc; + pandoc = overrideCabal super.pandoc (drv: { + enableSharedExecutables = false; + postInstall = '' # install man pages + mv man $out/ + find $out/man -type f ! -name "*.[0-9]" -exec rm {} + + ''; + }); # Broken by GLUT update. Monadius = markBroken super.Monadius; From 2814e5ce1198b40cbc4eebfc3740d336e41f0379 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 29 May 2015 11:15:24 +0200 Subject: [PATCH 043/126] haskell-Cabal-ide-backend: like all Cabals, this fork can't run its test suite in Nix --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ffee4900904..c59a846583a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -832,4 +832,7 @@ self: super: { # https://github.com/BNFC/bnfc/issues/140 BNFC = dontCheck super.BNFC; + # FPCO's fork of Cabal won't succeed its test suite. + Cabal-ide-backend = dontCheck super.Cabal-ide-backend; + } From 8732feab5a70115d118a7ca72f62ed32bc572cc3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 29 May 2015 11:20:12 +0200 Subject: [PATCH 044/126] haskell-llvm-general is broken with recent versions of LLVM. --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 3 +++ pkgs/development/haskell-modules/configuration-ghc-head.nix | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 470a944fa93..8165f1129d2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -283,4 +283,7 @@ self: super: { HLearn-distributions = dontDistribute super.HLearn-distributions; HLearn-classification = dontDistribute super.HLearn-classification; + # Won't work with LLVM 3.5. + llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index 291f050e174..73da57d7350 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -81,4 +81,7 @@ self: super: { # The compat library is empty in the presence of mtl 2.2.x. mtl-compat = dontHaddock super.mtl-compat; + # Won't work with LLVM 3.5. + llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general; + } From d55272a535fc1328c689768e0df21339109d0af3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 29 May 2015 14:00:07 +0200 Subject: [PATCH 045/126] haskell-pipes-errors: fix evaluation of override for latest 'errors' --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c59a846583a..fee992c72a7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -821,7 +821,7 @@ self: super: { language-puppet = dontDistribute super.language-puppet; # This needs the latest version of errors to compile. - pipes-errors_0_3 = super.pipes-errors_0_3.override { errors = self.errors_2_0_0; }; + pipes-errors = super.pipes-errors.override { errors = self.errors_2_0_0; }; # https://github.com/hvr/token-bucket/issues/3 token-bucket = dontCheck super.token-bucket; From 83f6a29266cc622b31ce68097ee7bce78649d09b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 30 May 2015 00:10:28 +0200 Subject: [PATCH 046/126] haskell-hslua: version 0.4.x still doesn't work with lua 5.2 --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fee992c72a7..8696a9ab839 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -27,6 +27,7 @@ self: super: { # Doesn't compile with lua 5.2. hslua = super.hslua.override { lua = pkgs.lua5_1; }; + hslua_0_4_0 = super.hslua_0_4_0.override { lua = pkgs.lua5_1; }; # Use the default version of mysql to build this package (which is actually mariadb). mysql = super.mysql.override { mysql = pkgs.mysql.lib; }; From 413985fa345243257a7f0505dd479fb60e7601ec Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 30 May 2015 18:13:52 +0200 Subject: [PATCH 047/126] haskell-servant has been fixed upstream. --- pkgs/development/haskell-modules/configuration-common.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8696a9ab839..5b7fc1b5415 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -815,12 +815,6 @@ self: super: { # https://github.com/kkardzis/curlhs/issues/6 curlhs = dontCheck super.curlhs; - # https://github.com/haskell-servant/servant-server/issues/45 - servant-server = markBroken super.servant-server; - servant-client = dontDistribute super.servant-client; - servant-jquery = dontDistribute super.servant-jquery; - language-puppet = dontDistribute super.language-puppet; - # This needs the latest version of errors to compile. pipes-errors = super.pipes-errors.override { errors = self.errors_2_0_0; }; From b73c3c7d9ffd80384ccfd3907cee423e8a518fb9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 30 May 2015 18:16:20 +0200 Subject: [PATCH 048/126] haskell-cipher-aes fails its test suite. --- 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 5b7fc1b5415..eb2c1e7c9c0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -830,4 +830,6 @@ self: super: { # FPCO's fork of Cabal won't succeed its test suite. Cabal-ide-backend = dontCheck super.Cabal-ide-backend; + # https://github.com/vincenthz/hs-cipher-aes/issues/35 + cipher-aes = dontCheck super.cipher-aes; } From 7c9cf6d6c254902f5e7e4cd7d8f870a09dbc6e3b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 30 May 2015 18:22:50 +0200 Subject: [PATCH 049/126] haskell-syb-with-class: remove obsolete patches --- .../development/haskell-modules/configuration-ghc-7.10.x.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 8165f1129d2..61cccad75ba 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -116,11 +116,6 @@ self: super: { # support a moving target". Go figure. barecheck = doJailbreak super.barecheck; - syb-with-class = appendPatch super.syb-with-class (pkgs.fetchpatch { - url = "https://github.com/seereason/syb-with-class/compare/adc86a9...719e567.patch"; - sha256 = "1lwwvxyhxcmppdapbgpfhwi7xc2z78qir03xjrpzab79p2qyq7br"; - }); - # https://github.com/kazu-yamamoto/unix-time/issues/30 unix-time = dontCheck super.unix-time; From 1cc014fdae64e7149c386161781ba4dc11c60836 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 29 May 2015 13:39:20 +0200 Subject: [PATCH 050/126] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-files/commit/a0ad41c6f533938fb8250c39a18d1d3949ce2e52 with hackage2nix revision 4d6361f0199d51068066c62bb0ca5c18530161f4 --- .../configuration-ghc-7.10.x.nix | 3 + .../haskell-modules/hackage-packages.nix | 578 +++++++++++++----- 2 files changed, 415 insertions(+), 166 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 61cccad75ba..ac24848b8fe 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -281,4 +281,7 @@ self: super: { # Won't work with LLVM 3.5. llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general; + # Ugly hack to trigger a rebuild to fix the broken package on Hydra. + crypto-api = appendConfigureFlag super.crypto-api "-fignore-me-1"; + } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ae94120305b..1eb15af14ee 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3191,26 +3191,24 @@ self: { }) {}; "DSH" = callPackage - ({ mkDerivation, aeson, algebra-dag, algebra-sql, ansi-wl-pprint - , base, bytestring, containers, dlist, either, HDBC - , HDBC-postgresql, HUnit, kure, mtl, pretty, QuickCheck, semigroups - , set-monad, template-haskell, test-framework, test-framework-hunit - , test-framework-quickcheck2, text + ({ mkDerivation, aeson, algebra-dag, ansi-wl-pprint, base + , bytestring, containers, Decimal, dlist, either, hashable, HUnit + , kure, mtl, process, QuickCheck, random, semigroups + , template-haskell, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, unordered-containers + , vector }: mkDerivation { pname = "DSH"; - version = "0.10.0.2"; - sha256 = "02a8gfn5ji2n606ak1gs4syk0c97zvyi4146w5zy6gn21g4d3fa7"; + version = "0.12.0.0"; + sha256 = "0rv7jn6h5w2naz7h4psz258684rc2p2wyaqp1f6kqvk294mlmvrv"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson algebra-dag algebra-sql ansi-wl-pprint base bytestring - containers dlist either HDBC HDBC-postgresql kure mtl pretty - semigroups set-monad template-haskell text - ]; - testDepends = [ - base containers HDBC HDBC-postgresql HUnit QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 text + aeson algebra-dag ansi-wl-pprint base bytestring containers Decimal + dlist either hashable HUnit kure mtl process QuickCheck random + semigroups template-haskell test-framework test-framework-hunit + test-framework-quickcheck2 text time unordered-containers vector ]; description = "Database Supported Haskell"; license = stdenv.lib.licenses.bsd3; @@ -7178,26 +7176,27 @@ self: { "HTF" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, bytestring, containers, cpphs, Diff, directory - , filepath, haskell-lexer, haskell-src, HUnit, lifted-base - , monad-control, mtl, old-time, pretty, process, QuickCheck, random - , regex-compat, temporary, text, time, unix, unordered-containers - , vector, xmlgen + , filepath, haskell-src, HUnit, lifted-base, monad-control, mtl + , old-time, pretty, process, QuickCheck, random, regex-compat + , template-haskell, temporary, text, time, unix + , unordered-containers, vector, xmlgen }: mkDerivation { pname = "HTF"; - version = "0.12.2.4"; - sha256 = "0f538wqihj8i1ys3aciz7n1asxvg73bm9zg0p8qazzx9ghpcgy6m"; + version = "0.13.0.0"; + sha256 = "0lrc60ydqsizz3rdyijqywncr1bcj3b95mgn99bz5q4yb3l6dc54"; isLibrary = true; isExecutable = true; buildDepends = [ aeson array base base64-bytestring bytestring containers cpphs Diff - directory haskell-lexer haskell-src HUnit lifted-base monad-control - mtl old-time pretty process QuickCheck random regex-compat text - time unix vector xmlgen + directory haskell-src HUnit lifted-base monad-control mtl old-time + pretty process QuickCheck random regex-compat text time unix vector + xmlgen ]; testDepends = [ aeson aeson-pretty base bytestring directory filepath HUnit mtl - process random regex-compat temporary text unordered-containers + process random regex-compat template-haskell temporary text + unordered-containers ]; homepage = "https://github.com/skogsbaer/HTF/"; description = "The Haskell Test Framework"; @@ -8227,7 +8226,9 @@ self: { mkDerivation { pname = "HostAndPort"; version = "0.1.0"; + revision = "1"; sha256 = "0rykpzp3vvc81ra917vicwsh8x1mr1ykw9a597ks959nmjy06mz8"; + editedCabalFile = "5ad1783e80502877a1de17cb92308dd9e0cc003a1302c5d4c09103b1c98bd627"; buildDepends = [ base parsec ]; testDepends = [ base doctest hspec ]; homepage = "https://github.com/bacher09/hostandport"; @@ -18049,8 +18050,8 @@ self: { }: mkDerivation { pname = "algebra-dag"; - version = "0.1.0.0"; - sha256 = "0sl3lsbjhnmnq49zf1irnijp7wfxixsv21vfknshi5hkl9757i89"; + version = "0.1.1.1"; + sha256 = "1pr6bbj67n13bw120l82zn5bj7bj0x00b754w852pbpij03fjay9"; buildDepends = [ aeson base containers fgl mtl parsec template-haskell transformers ]; @@ -18061,20 +18062,20 @@ self: { "algebra-sql" = callPackage ({ mkDerivation, aeson, algebra-dag, ansi-wl-pprint, base - , bytestring, containers, dlist, errors, fgl, filepath, ghc-prim - , mtl, multiset, parsec, pretty, process, template-haskell - , transformers + , bytestring, containers, Decimal, dlist, errors, fgl, filepath + , ghc-prim, mtl, multiset, parsec, pretty, process + , template-haskell, text, time, transformers }: mkDerivation { pname = "algebra-sql"; - version = "0.1.0.1"; - sha256 = "0das62ykwgyvj8qhk44i93b0w66wshdrdaylhvks03232pgpf8yp"; + version = "0.3.0.0"; + sha256 = "1wvm9qkixmyawwjd6ypshsmby7y7229zwidj3qhzkbmyi7p5sgzj"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson algebra-dag ansi-wl-pprint base bytestring containers dlist - errors fgl filepath ghc-prim mtl multiset parsec pretty process - template-haskell transformers + aeson algebra-dag ansi-wl-pprint base bytestring containers Decimal + dlist errors fgl filepath ghc-prim mtl multiset parsec pretty + process template-haskell text time transformers ]; description = "Relational Algebra and SQL Code Generation"; license = stdenv.lib.licenses.bsd3; @@ -20274,8 +20275,8 @@ self: { }: mkDerivation { pname = "arbtt"; - version = "0.9.0.3"; - sha256 = "1zki720s444qq22hxsbqmanpv379894l7xhql8p1fq8cdwmfj541"; + version = "0.9.0.4"; + sha256 = "02qz7qsk1kjavsdl8mq56blxzzjnnjlnyjvjnyfamq7j0rqzdq5v"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -20289,7 +20290,6 @@ self: { transformers unix utf8-string ]; extraLibraries = [ libXScrnSaver ]; - jailbreak = true; homepage = "http://arbtt.nomeata.de/"; description = "Automatic Rule-Based Time Tracker"; license = "GPL"; @@ -23045,6 +23045,18 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "base-noprelude" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "base-noprelude"; + version = "4.8.0.0"; + sha256 = "0kxpkahlwvmy86g94rawhv6x3kl761xf4s78jv1cjzglsb28q0zl"; + buildDepends = [ base ]; + homepage = "https://github.com/hvr/base-noprelude"; + description = "\"base\" package sans \"Prelude\" module"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "base-orphans" = callPackage ({ mkDerivation, base, ghc-prim, hspec }: mkDerivation { @@ -25723,6 +25735,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bitx-bitcoin" = callPackage + ({ mkDerivation, aeson, base, bytestring, Decimal, hspec + , http-conduit, network, record, split, text, time + }: + mkDerivation { + pname = "bitx-bitcoin"; + version = "0.1.0.0"; + sha256 = "05k2cwkd9y327c75fhjqwyxhwrwxhalsx724xa0ng5dw3d30icc2"; + buildDepends = [ + aeson base bytestring Decimal http-conduit network record split + text time + ]; + testDepends = [ aeson base bytestring hspec record time ]; + description = "A Haskell library for working with the BitX bitcoin exchange"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "bk-tree" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -27533,8 +27562,8 @@ self: { ({ mkDerivation, alex, array, base, bytestring }: mkDerivation { pname = "bytestring-lexing"; - version = "0.4.3.2"; - sha256 = "09ymg1n21668wn4harxg0cqlz98fz990bangpy99w2z7d6cwbc05"; + version = "0.4.3.3"; + sha256 = "1gfbmxr91glzxmbl57f3ij9mapdfxal8pql0s7g3v4qxf7km2pq0"; buildDepends = [ array base bytestring ]; buildTools = [ alex ]; homepage = "http://code.haskell.org/~wren/"; @@ -28119,7 +28148,6 @@ self: { testDepends = [ base ]; description = "Simple interface to Cabal's configuration state used by ghc-mod"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-install_1_18_1_0" = callPackage @@ -29501,6 +29529,7 @@ self: { testDepends = [ base HTF HUnit loch-th placeholders QuickCheck text ]; + jailbreak = true; homepage = "https://github.com/nikita-volkov/cases"; description = "A converter for spinal, snake and camel cases"; license = stdenv.lib.licenses.mit; @@ -30167,6 +30196,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cg" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, deepseq + , directory, filepath, hashable, mtl, parallel, parsec, process + , split, text, unordered-containers, utf8-string, void + }: + mkDerivation { + pname = "cg"; + version = "0.0.9.0"; + sha256 = "0slsckr1xyn1b3vb2xhd2diqhr9cdbkn9g5hfsy0q6sjiy979vpl"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base bytestring cereal containers deepseq directory filepath + hashable mtl parallel parsec process split text + unordered-containers utf8-string void + ]; + description = "Parser for categorial grammars"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "cgen" = callPackage ({ mkDerivation, base, containers, directory, filepath, mtl, parsec , regex-posix, safe, template-haskell @@ -32568,8 +32617,8 @@ self: { }: mkDerivation { pname = "codex"; - version = "0.3.0.4"; - sha256 = "1fk3cw37ng80mw6nxv089sadzyf2s0m90c5rz936qpda06rqng08"; + version = "0.3.0.6"; + sha256 = "1slgh54kvf01y991pqi51kj6lfq05l5gp8dkhwcya1l9gilfazr4"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -38626,8 +38675,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "data-or"; - version = "1.0.0.4"; - sha256 = "17plwr0ayll8na73vhdsfxk86dnds4rpj8v6nww7shb6vk5v3hf5"; + version = "1.0.0.5"; + sha256 = "0wp6qqq6k1zbdw9bv9gkzdiz6y8wp8r7zsqbjh54c43j3i7vdvwx"; buildDepends = [ base ]; homepage = "http://code.haskell.org/~wren/"; description = "A data type for non-exclusive disjunction"; @@ -41880,8 +41929,8 @@ self: { }: mkDerivation { pname = "distributed-process"; - version = "0.5.3"; - sha256 = "1jp85dd7scizs03cslrbgmaly735l2rv9yl5hq573xj3mjwmv5nz"; + version = "0.5.4"; + sha256 = "1yx2vspnpa478bn7n82ii6m6x0z43xwbr5995l3mm64sd0nmxp2s"; buildDepends = [ base binary bytestring containers data-accessor deepseq distributed-static ghc-prim hashable mtl network-transport @@ -43296,6 +43345,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "dsh-sql" = callPackage + ({ mkDerivation, aeson, algebra-dag, algebra-sql, base, bytestring + , bytestring-lexing, containers, Decimal, DSH, either, HDBC + , HDBC-odbc, HUnit, mtl, process, QuickCheck, random, semigroups + , set-monad, template-haskell, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, vector + }: + mkDerivation { + pname = "dsh-sql"; + version = "0.2.0.0"; + sha256 = "0f7r844d0jwn4vyfnj8nvksss16rwva63hsy22m2viv98nyyfyi2"; + buildDepends = [ + aeson algebra-dag algebra-sql base bytestring bytestring-lexing + containers Decimal DSH either HDBC HDBC-odbc mtl process random + semigroups set-monad template-haskell text vector + ]; + testDepends = [ + base bytestring bytestring-lexing containers DSH HDBC HDBC-odbc + HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 text vector + ]; + description = "SQL backend for Database Supported Haskell (DSH)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dsmc" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, entropy , hslogger, mwc-random, parallel, primitive, repa, strict @@ -43809,6 +43883,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "dynamic-pp" = callPackage + ({ mkDerivation, ansi-terminal, base, blaze-builder, bytestring + , Cabal, hashable, HUnit-Plus, unordered-containers, utf8-string + }: + mkDerivation { + pname = "dynamic-pp"; + version = "0.1.0"; + sha256 = "1i01k8c75yxdmxz3db4kajpqbgl8lcbfsp9rb9q2kzbk44fc2zpc"; + buildDepends = [ + ansi-terminal base blaze-builder bytestring Cabal hashable + unordered-containers utf8-string + ]; + testDepends = [ + ansi-terminal base blaze-builder bytestring Cabal hashable + HUnit-Plus unordered-containers utf8-string + ]; + homepage = "https://github.com/emc2/dynamic-pp"; + description = "A pretty-print library that employs a dynamic programming algorithm for optimal rendering"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dynamic-state" = callPackage ({ mkDerivation, base, binary, bytestring, hashable , unordered-containers @@ -44546,14 +44641,13 @@ self: { }: mkDerivation { pname = "either"; - version = "4.4"; - sha256 = "06519qw6y8ah168p2i03q1hmmrbmbai39fm6bna8rkp8zwlbkxww"; + version = "4.4.1"; + sha256 = "1jq9b7mwljyqxmcs09bnqzza6710sfk2x444p3aagjlvq3mpvrci"; buildDepends = [ base bifunctors exceptions free mmorph monad-control MonadRandom mtl profunctors semigroupoids semigroups transformers transformers-base ]; - jailbreak = true; homepage = "http://github.com/ekmett/either/"; description = "An either monad transformer"; license = stdenv.lib.licenses.bsd3; @@ -45688,8 +45782,8 @@ self: { }: mkDerivation { pname = "epub-tools"; - version = "2.6"; - sha256 = "0ncyam72y5jvad73mbrcsv8y1hl5yybrx59vc8gxsyiy9mbrvs6v"; + version = "2.7"; + sha256 = "17r7p68mdrc7mla65xwb5g8inh94hncqkg09igha9fyhnax4m3dk"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -46485,8 +46579,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "exact-combinatorics"; - version = "0.2.0.7"; - sha256 = "05q31mh5x6i90n3ddxyqnhhjga7vbsbi947iywyqi53h2z2iw8f7"; + version = "0.2.0.8"; + sha256 = "0pj7sh6s1kawk39hb42q1sx20g2rmzanpmr3zri9yvmb16qj5a1j"; buildDepends = [ base ]; homepage = "http://code.haskell.org/~wren/"; description = "Efficient exact computation of combinatoric functions"; @@ -47402,13 +47496,12 @@ self: { }: mkDerivation { pname = "fasta"; - version = "0.7.1.0"; - sha256 = "0dh0vqcwapia5kdcyr7j2qnz28bxnyxb8zmfz32zj5cgyf4635wc"; + version = "0.7.2.0"; + sha256 = "1zsghi7883y4ygl0iammfh1dmnsnh3x4ly77jhxg8xz8saw7dbir"; buildDepends = [ base bytestring containers foldl lens parsec pipes pipes-bytestring pipes-group pipes-text split text ]; - jailbreak = true; homepage = "https://github.com/GregorySchwartz/fasta"; description = "A simple, mindless parser for fasta files"; license = stdenv.lib.licenses.gpl2; @@ -52303,13 +52396,12 @@ self: { }: mkDerivation { pname = "ghc-heap-view"; - version = "0.5.3"; - sha256 = "1jcqi4gahxmhd61hl75wgb9dp99kxld68860jnd9x4hnp5cd33q0"; + version = "0.5.4"; + sha256 = "02n414m1lb6lilrkmjss2pd1s7hd4lf2sga7ql2ahib69kygzhx1"; buildDepends = [ base binary bytestring containers ghc template-haskell transformers ]; testDepends = [ base deepseq ]; - jailbreak = true; postInstall = '' ensureDir "$out/share/ghci" ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname" @@ -55604,8 +55696,8 @@ self: { }: mkDerivation { pname = "gtk"; - version = "0.13.6"; - sha256 = "1xj3vafk6rhy5nifixsp72n88i0idlknggcq1w626jfszx5anx2c"; + version = "0.13.7"; + sha256 = "1mrrd8hkpyhk40x9yg2b62i1d5d72p8g561wrhp80cd8f654cfij"; buildDepends = [ array base bytestring cairo containers gio glib mtl pango text ]; @@ -55881,8 +55973,8 @@ self: { }: mkDerivation { pname = "gtk3"; - version = "0.13.6"; - sha256 = "12fsbl56gf8inxvg7jqad2j689gpwp4bwznyz153y6xzgqs7vaq0"; + version = "0.13.7"; + sha256 = "15jgv5ci79r36jy6h5hq04zffryx5bbv2sknxnydn0cxng6kvgr9"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -62740,6 +62832,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hein" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath + , http-conduit, process, transformers + }: + mkDerivation { + pname = "hein"; + version = "0.1.0.2"; + sha256 = "10g07m73iaq9v17hv2wx0mmza8vmlakyjjqfhb4rgf73pikfhvsf"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base bytestring directory filepath http-conduit process + transformers + ]; + jailbreak = true; + homepage = "https://github.com/khanage/heineken"; + description = "An extensible build helper for haskell, in the vein of leiningen"; + license = stdenv.lib.licenses.asl20; + }) {}; + "heist" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html , bytestring, containers, directory, directory-tree, dlist, errors @@ -68688,6 +68800,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hscuid" = callPackage + ({ mkDerivation, base, containers, formatting, hostname, random + , text, time, transformers, unix + }: + mkDerivation { + pname = "hscuid"; + version = "1.0.0"; + sha256 = "19py373zmfmfr52grvv4gimm4i0gnsiy6xxp60m8b6bb4cbiyj75"; + buildDepends = [ + base formatting hostname random text time transformers unix + ]; + testDepends = [ base containers ]; + homepage = "https://github.com/eightyeight/hscuid"; + description = "Collision-resistant IDs"; + license = stdenv.lib.licenses.mit; + }) {}; + "hscurses" = callPackage ({ mkDerivation, base, exceptions, mtl, old-locale, old-time, unix }: @@ -69237,6 +69366,22 @@ self: { license = stdenv.lib.licenses.mit; }) { inherit (pkgs) lua;}; + "hslua_0_4_0" = callPackage + ({ mkDerivation, base, bytestring, hspec, hspec-contrib, HUnit, lua + , text + }: + mkDerivation { + pname = "hslua"; + version = "0.4.0"; + sha256 = "0l50ppvnavs3lc1vmrpxhlb3ffl772n1hk8mdi9w4ml64ninba3p"; + buildDepends = [ base bytestring ]; + testDepends = [ base bytestring hspec hspec-contrib HUnit text ]; + extraLibraries = [ lua ]; + configureFlags = [ "-fsystem-lua" ]; + description = "A Lua language interpreter embedding in Haskell"; + license = stdenv.lib.licenses.mit; + }) { inherit (pkgs) lua;}; + "hsmagick" = callPackage ({ mkDerivation, base, bytestring, bzip2, directory, filepath , freetype2, GraphicsMagick, jasper, lcms, libjpeg, libpng, libxml2 @@ -73066,8 +73211,11 @@ self: { mkDerivation { pname = "iconv"; version = "0.4.1.2"; + revision = "1"; sha256 = "0sd7by7idcnw368mdc1rs3j4xwbzdvgvkd5p1bwgw7wcd272c142"; + editedCabalFile = "dec449ecde9679a092fc8513cec0bfe72031aa309b9b9795db572a726a976451"; buildDepends = [ base bytestring ]; + jailbreak = true; description = "String encoding conversion"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -77308,8 +77456,8 @@ self: { }: mkDerivation { pname = "jsonschema-gen"; - version = "0.3.0.0"; - sha256 = "0jjqn5y5rxgm92y26p00kd5rkh4z1kyavj0v5axpbs9a9a08aplx"; + version = "0.3.0.1"; + sha256 = "18hc6a7ihjpnnnjsx4r403w2zx2nzxa4qvj4picdw83r4sgjvv2d"; buildDepends = [ aeson base bytestring containers scientific tagged text time unordered-containers vector @@ -77317,7 +77465,6 @@ self: { testDepends = [ aeson base bytestring containers process tagged text ]; - jailbreak = true; homepage = "https://github.com/yuga/jsonschema-gen"; description = "JSON Schema generator from Algebraic data type"; license = stdenv.lib.licenses.bsd3; @@ -80429,10 +80576,9 @@ self: { ({ mkDerivation, base, lens, QuickCheck, transformers }: mkDerivation { pname = "lens-properties"; - version = "4.7"; - sha256 = "07acd6a9qp0z06nxb33ml8fa470i04v8bxyrhf7i30lvyy40gfik"; + version = "4.11"; + sha256 = "0cg0n75ss5ayy31igwyz9yz2sh0smcaiidbbm1wkrk1krzbws31w"; buildDepends = [ base lens QuickCheck transformers ]; - jailbreak = true; homepage = "http://github.com/ekmett/lens/"; description = "QuickCheck properties for lens"; license = stdenv.lib.licenses.bsd3; @@ -80598,8 +80744,8 @@ self: { }: mkDerivation { pname = "lexer-applicative"; - version = "1.1"; - sha256 = "1yl4404w5pmmpa1l7j4zlm5lg24jglxff04qdc757bd1r0bklbw1"; + version = "2.1"; + sha256 = "1xryc4nnfs7vzvmdszksmzjmz0pi1gpip0qr3gf2lv0baayma7zj"; buildDepends = [ base regex-applicative srcloc ]; testDepends = [ base deepseq regex-applicative srcloc tasty tasty-hunit @@ -82156,8 +82302,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "list-extras"; - version = "0.4.1.3"; - sha256 = "16w10xgh2y76q8aj5pgw4zq5p2phjzf5g1bmkacrm8gbwkp4v71s"; + version = "0.4.1.4"; + sha256 = "15vjk6y3zwiffm1x8wlzv6203ykzm2phalqlq4zhmhcj2wd70viw"; buildDepends = [ base ]; homepage = "http://code.haskell.org/~wren/"; description = "Common not-so-common functions for lists"; @@ -82240,6 +82386,7 @@ self: { transformers-base ]; testDepends = [ base-prelude HTF mmorph mtl-prelude ]; + jailbreak = true; homepage = "https://github.com/nikita-volkov/list-t"; description = "ListT done right"; license = stdenv.lib.licenses.mit; @@ -83064,8 +83211,8 @@ self: { ({ mkDerivation, array, base }: mkDerivation { pname = "logfloat"; - version = "0.13.3"; - sha256 = "0m1d0g14p6yb4g4irhisfchx3241b2vlm4g527rhwpr8lxd3fqzp"; + version = "0.13.3.1"; + sha256 = "0rqnp2zkp247sb3parn3ywsk9clasy4l906a1wyrrybc3p72126s"; buildDepends = [ array base ]; homepage = "http://code.haskell.org/~wren/"; description = "Log-domain floating point numbers"; @@ -85377,7 +85524,9 @@ self: { mkDerivation { pname = "matrix"; version = "0.3.4.3"; + revision = "1"; sha256 = "1nshgxiza384xh7h22qgbwa75bylc1l3gh6dsm51axapr1ldi8gg"; + editedCabalFile = "f586a9d89c7279218a0436d0b8a6adaabc22414caca30774904821bd40cc5ace"; buildDepends = [ base deepseq loop primitive vector ]; testDepends = [ base QuickCheck tasty tasty-quickcheck ]; description = "A native implementation of matrix operations"; @@ -85931,8 +86080,8 @@ self: { }: mkDerivation { pname = "memory"; - version = "0.4"; - sha256 = "1n7w11w3c9qag17nx6ssp2ni2kym980dwrwdrpdf7668n1jkcjvr"; + version = "0.5"; + sha256 = "0lz3w1faxlgyx0sc7nk5wg83zfks5595mxmlrspmbd4d85jk4nvh"; buildDepends = [ base bytestring deepseq ghc-prim ]; testDepends = [ base tasty tasty-hunit tasty-quickcheck ]; homepage = "https://github.com/vincenthz/hs-memory"; @@ -86138,8 +86287,8 @@ self: { }: mkDerivation { pname = "metrics"; - version = "0.2.1.0"; - sha256 = "1q3j4ssij3v688yhn0zzs1bvyp21p0vnp2760qbvha1a7g0m8gif"; + version = "0.3.0.0"; + sha256 = "1g1nxb7q834nslrmgmqarbbq3ah60k2fqj71k55z9dj4waqgx2sg"; buildDepends = [ ansi-terminal base bytestring containers lens mtl mwc-random primitive text time unix unordered-containers vector @@ -86845,8 +86994,8 @@ self: { }: mkDerivation { pname = "minst-idx"; - version = "0.1.2.1"; - sha256 = "149128cags685m463p92vzri9cr501dby2vs0aqmrka8sg0py7j9"; + version = "0.1.2.2"; + sha256 = "06ixg6bm55h1mjym3qp667gddy7f32inaxgyfbrh918zl283briv"; buildDepends = [ base binary bytestring vector ]; testDepends = [ base binary directory hspec vector ]; homepage = "https://github.com/kryoxide/minst-idx/"; @@ -87489,12 +87638,11 @@ self: { }: mkDerivation { pname = "monad-journal"; - version = "0.7"; - sha256 = "1bfm5p027vf8dz92m6s47z06h05j2jv4pbwkl31svrz5pi5a9lz2"; + version = "0.7.1"; + sha256 = "1bfj9yy7hkixii31fbxdydjwx9ln6snm40w6l5vph2skcrms9bvr"; buildDepends = [ base either monad-control mtl transformers transformers-base ]; - jailbreak = true; homepage = "http://github.com/phaazon/monad-journal"; description = "Pure logger typeclass and monad transformer"; license = stdenv.lib.licenses.bsd3; @@ -89205,8 +89353,8 @@ self: { }: mkDerivation { pname = "muesli"; - version = "0.1.0.1"; - sha256 = "10dyk5yz911lfdf11iizmpinha7h09gd7yrg67wjsb6myyvwbdg5"; + version = "0.1.1.0"; + sha256 = "0cysqy3g9zgvbzj9gnwlpqk63inkm26dvhhqx8qlzp1lan6f125w"; buildDepends = [ base bytestring cereal containers directory filepath hashable mtl psqueues time @@ -90666,6 +90814,7 @@ self: { sha256 = "00xkhc25s675pcg5s3fiq3l57zsslc0vps44gmwwas4gnz27wdfy"; buildDepends = [ base base-prelude parsec template-haskell ]; testDepends = [ base-prelude HTF ]; + jailbreak = true; homepage = "https://github.com/nikita-volkov/neat-interpolation"; description = "A quasiquoter for neat and simple multiline text interpolation"; license = stdenv.lib.licenses.mit; @@ -91203,8 +91352,8 @@ self: { }: mkDerivation { pname = "network"; - version = "2.6.1.0"; - sha256 = "0nx85kvrzjm258qr5blphli44gipc7nvxgvbyq8ifv42ll6w6jdj"; + version = "2.6.2.0"; + sha256 = "0szkzllpc6vs72fz7nykf5y7vc8mvqfv6h4sshfwmdazl2zv03n5"; buildDepends = [ base bytestring unix ]; testDepends = [ base bytestring HUnit test-framework test-framework-hunit @@ -91258,6 +91407,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "network-anonymous-tor" = callPackage + ({ mkDerivation, attoparsec, base, base32string, bytestring + , exceptions, hexstring, hspec, hspec-attoparsec + , hspec-expectations, network, network-attoparsec, network-simple + , socks, text, transformers + }: + mkDerivation { + pname = "network-anonymous-tor"; + version = "0.9.0"; + sha256 = "02ywcdjrrjivzmzj22nxx81xkcxplhcaxpz21196r3kni8qhi0h0"; + buildDepends = [ + attoparsec base base32string bytestring exceptions hexstring + network network-attoparsec network-simple socks text transformers + ]; + testDepends = [ + attoparsec base base32string bytestring exceptions hspec + hspec-attoparsec hspec-expectations network network-simple socks + text transformers + ]; + homepage = "http://www.leonmergen.com/opensource.html"; + description = "Haskell API for Tor anonymous networking"; + license = stdenv.lib.licenses.mit; + }) {}; + "network-api-support" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , case-insensitive, http-client, http-client-tls, http-types, text @@ -95013,8 +95186,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.1.1.0"; - sha256 = "1z6q9sb5h0bbvkdlv6abvhgz0cgw4vixs3pv531l9jpkmvfri8r4"; + version = "0.1.2.0"; + sha256 = "0q9ia1nzmzv1q8hplrmxszwk49mlp4v8skbfv4ggsl8s0vxc1c6f"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -98136,8 +98309,8 @@ self: { }: mkDerivation { pname = "pipes-vector"; - version = "0.6.1"; - sha256 = "12a50i6fhvri76sr0h3fz9ds5yvnapdyx4n3rcxz2rk543mdvhsp"; + version = "0.6.2"; + sha256 = "11nibsshxgnr2jw8lh8q9aygbmpfsq7mf7kdvaqzyggmrdsns2wn"; buildDepends = [ base monad-primitive pipes primitive transformers vector ]; @@ -98722,8 +98895,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "pointless-fun"; - version = "1.1.0.5"; - sha256 = "17gzh3w5j05l6ig1sdjqrl7br17zzpy9yh5k2lck0gjl5prcjclw"; + version = "1.1.0.6"; + sha256 = "0m5hwd0mr7bmb2sbs1qa7l65xrr5h2wjznknsrk1ga08qkd5jp6h"; buildDepends = [ base ]; homepage = "http://code.haskell.org/~wren/"; description = "Some common point-free combinators"; @@ -99453,6 +99626,7 @@ self: { base-prelude bytestring HTF postgresql-libpq QuickCheck quickcheck-instances scientific text time uuid ]; + jailbreak = true; homepage = "https://github.com/nikita-volkov/postgresql-binary"; description = "Encoders and decoders for the PostgreSQL's binary format"; license = stdenv.lib.licenses.mit; @@ -100066,8 +100240,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "prelude-safeenum"; - version = "0.1.1.1"; - sha256 = "0cff77nbhy3dsamrwm2wxhbi1mf2bzkdd1pdzqv3klpbzjwkdszv"; + version = "0.1.1.2"; + sha256 = "09wp6b7bvnp2wz0kigwm4vfca74phh3bbpqybqdgm60isfaz3yfl"; buildDepends = [ base ]; homepage = "http://code.haskell.org/~wren/"; description = "A redefinition of the Prelude's Enum class in order to render it safe"; @@ -101456,6 +101630,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "publicsuffix" = callPackage + ({ mkDerivation, base, bytestring, filepath, hspec + , template-haskell, text + }: + mkDerivation { + pname = "publicsuffix"; + version = "0.20150507"; + sha256 = "1n1wns0n48rqva5zz4kyj84rw0lf7ih612cp0dhsdk9jgc1kapsj"; + buildDepends = [ base bytestring filepath template-haskell text ]; + testDepends = [ base hspec text ]; + homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; + description = "The publicsuffix list exposed as proper Haskell types"; + license = stdenv.lib.licenses.mit; + }) {}; + "publicsuffixlist" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, data-default , HUnit, idna, text, utf8-string @@ -103400,8 +103589,8 @@ self: { }: mkDerivation { pname = "razom-text-util"; - version = "0.1.0.0"; - sha256 = "08f7cvipcdcn6s2rgf0n65g67fhkx36841dihzzsfalglfr9gn6m"; + version = "0.1.1.0"; + sha256 = "1zmqfjbhvszf2ky6556q1311x23y1h0v90yqaa1mynn8lqhplgkv"; buildDepends = [ base regex-applicative smaoin text-position ]; testDepends = [ base QuickCheck regex-applicative smaoin ]; homepage = "http://rel4tion.org/projects/razom-text-util/"; @@ -104030,8 +104219,8 @@ self: { }: mkDerivation { pname = "redis"; - version = "0.14"; - sha256 = "0mnjx62q3nlgzspk75xg4zsyq5w8jxgh8gd32mc26xvyr0r02094"; + version = "0.14.1"; + sha256 = "02r97k08n9gyrfmbm6qgb8dddivaiprp50hs79a5bnxvvl6vmq9b"; buildDepends = [ base bytestring concurrent-extra containers exceptions mtl network old-time utf8-string @@ -105112,8 +105301,8 @@ self: { }: mkDerivation { pname = "relational-query"; - version = "0.4.0.1"; - sha256 = "00ysy5lg0mpv5b1vcjlfi6nx72df3iqz5nmrfsrr0k7i65xp1fzi"; + version = "0.5.0.0"; + sha256 = "00q0z4bnic5phhm7xxv059380q23d0fhd8vh32aggjlggzlq01sx"; buildDepends = [ array base bytestring containers dlist names-th persistable-record sql-words template-haskell text time time-locale-compat @@ -106116,8 +106305,8 @@ self: { }: mkDerivation { pname = "rest-stringmap"; - version = "0.2.0.5"; - sha256 = "0xnvzwwaxfl2iphpicprn0wvlfk3cg6vz53kl2gv1fi322jcjv3b"; + version = "0.2.0.6"; + sha256 = "0jjj0yam4d4w36lnxk0ci7ylb9ya48y0ag3b54k9ikyg0hps7rb6"; buildDepends = [ aeson base containers hashable hxt json-schema tostring unordered-containers @@ -107415,10 +107604,9 @@ self: { }: mkDerivation { pname = "rss"; - version = "3000.2.0.4"; - sha256 = "1kq7bk3kl48699n2ri15im5ds8cd2pmcjglh06br1knxkli80kbq"; + version = "3000.2.0.5"; + sha256 = "0ydr6wqmac6bk3bn69fgay66rc2xap99jgz1gg5z09mhhv3bjmb1"; buildDepends = [ base HaXml network network-uri old-locale time ]; - jailbreak = true; homepage = "https://github.com/basvandijk/rss"; description = "A library for generating RSS 2.0 feeds."; license = stdenv.lib.licenses.publicDomain; @@ -108976,6 +109164,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "scotty_0_10_0" = callPackage + ({ mkDerivation, aeson, async, base, blaze-builder, bytestring + , case-insensitive, data-default-class, directory, hspec, hspec-wai + , http-types, lifted-base, monad-control, mtl, network + , regex-compat, text, transformers, transformers-base + , transformers-compat, wai, wai-extra, warp + }: + mkDerivation { + pname = "scotty"; + version = "0.10.0"; + sha256 = "0r1k96cf5nykgg987hfqfayyix23rjfn73njqqsfxjiai1dgrnzn"; + buildDepends = [ + aeson base blaze-builder bytestring case-insensitive + data-default-class http-types monad-control mtl network + regex-compat text transformers transformers-base + transformers-compat wai wai-extra warp + ]; + testDepends = [ + async base data-default-class directory hspec hspec-wai http-types + lifted-base network text wai + ]; + homepage = "https://github.com/scotty-web/scotty"; + description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "scotty-binding-play" = callPackage ({ mkDerivation, base, bytestring, hspec, http-client, HUnit, mtl , scotty, template-haskell, text, transformers @@ -109556,12 +109770,12 @@ self: { }) {}; "securemem" = callPackage - ({ mkDerivation, base, byteable, bytestring, ghc-prim }: + ({ mkDerivation, base, byteable, bytestring, ghc-prim, memory }: mkDerivation { pname = "securemem"; - version = "0.1.7"; - sha256 = "14mmis2y9xf3jzmf6s6g7g8ixgbrx99x0b422zv4ix3vpx2lj57r"; - buildDepends = [ base byteable bytestring ghc-prim ]; + version = "0.1.8"; + sha256 = "14q5p464vks942k4q5dl4gyi9asg3d8rl8kd84qgbrvvr3ymhxb2"; + buildDepends = [ base byteable bytestring ghc-prim memory ]; homepage = "http://github.com/vincenthz/hs-securemem"; description = "abstraction to an auto scrubbing and const time eq, memory chunk"; license = stdenv.lib.licenses.bsd3; @@ -110176,24 +110390,24 @@ self: { "servant" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring - , bytestring-conversion, case-insensitive, doctest, filemanip - , hspec, http-media, http-types, network-uri, parsec, QuickCheck - , quickcheck-instances, string-conversions, text, url + , bytestring-conversion, case-insensitive, directory, doctest + , filemanip, filepath, hspec, http-media, http-types, network-uri + , parsec, QuickCheck, quickcheck-instances, string-conversions + , text, url }: mkDerivation { pname = "servant"; - version = "0.4.0"; - revision = "1"; - sha256 = "17954b85wj965wkhzr1jd34sia32px4qhnqjl2wn4rymj9lv25f5"; - editedCabalFile = "b9f6399d21ba876a4e30cb8e48cb040a972fe82dbac93c62691dc6eae530c25b"; + version = "0.4.1"; + sha256 = "0rbbijy1y40msy0ficssfg0krylrma55z500anymjkmpyp3ymnls"; buildDepends = [ aeson attoparsec base bytestring bytestring-conversion case-insensitive http-media http-types network-uri string-conversions text ]; testDepends = [ - aeson attoparsec base bytestring doctest filemanip hspec parsec - QuickCheck quickcheck-instances string-conversions text url + aeson attoparsec base bytestring directory doctest filemanip + filepath hspec parsec QuickCheck quickcheck-instances + string-conversions text url ]; homepage = "http://haskell-servant.github.io/"; description = "A family of combinators for defining webservices APIs"; @@ -110204,8 +110418,8 @@ self: { ({ mkDerivation, base, blaze-html, http-media, servant }: mkDerivation { pname = "servant-blaze"; - version = "0.4.0.0"; - sha256 = "17l0fm296zg5nwfc6srnjl82qckabyac5yxm1dhqxwxq45kj42an"; + version = "0.4.1"; + sha256 = "0an5lb3p61i8iahs5rgfy97s3ivqa3q0034iz8zxa4rvhy7k56hp"; buildDepends = [ base blaze-html http-media servant ]; homepage = "http://haskell-servant.github.io/"; description = "Blaze-html support for servant"; @@ -110221,10 +110435,8 @@ self: { }: mkDerivation { pname = "servant-client"; - version = "0.4.0"; - revision = "1"; - sha256 = "0nvbhiakxfjkb9v5ijv6zapjfbppc6ygd3g8rv5i9paj59ifwxmm"; - editedCabalFile = "9a7ca5856ef66a4345f4732e7ca5680f55502b899bbe1e2f1397b0e55d33ad37"; + version = "0.4.1"; + sha256 = "1h0w9dkngrz9pimz66bc2ij9ik316x0sliyyqf16mmkpn66wcl6r"; buildDepends = [ aeson attoparsec base bytestring either exceptions http-client http-client-tls http-media http-types network-uri safe servant @@ -110247,8 +110459,8 @@ self: { }: mkDerivation { pname = "servant-docs"; - version = "0.4.0"; - sha256 = "0fbbs4w0yz0kj3gvms0xbikzfqjdqbbi19z26z3zdmc06crkhn4m"; + version = "0.4.1"; + sha256 = "0xhj75nbsnlbzp3sf6qkfwh0x6a64lfzzq9m07wfg02nqzn22y92"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -110262,6 +110474,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-ede" = callPackage + ({ mkDerivation, aeson, base, bytestring, ede, either, filepath + , http-media, http-types, semigroups, servant, servant-server, text + , transformers, unordered-containers, wai, warp + }: + mkDerivation { + pname = "servant-ede"; + version = "0.4"; + sha256 = "0h1kvgp0hzn5zmvc5gys3n3w20gmjmsgdw4lmpk7qwg16x2kriwd"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson base bytestring ede either filepath http-media http-types + semigroups servant servant-server text transformers + unordered-containers wai warp + ]; + homepage = "http://github.com/alpmestan/servant-ede"; + description = "Combinators for rendering EDE templates in servant web applications"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-jquery" = callPackage ({ mkDerivation, aeson, base, charset, filepath, hspec , hspec-expectations, language-ecmascript, lens, servant @@ -110269,8 +110502,8 @@ self: { }: mkDerivation { pname = "servant-jquery"; - version = "0.4.0"; - sha256 = "1p8pdrqyj1pyrwghv3k26s4y4aprlkasbzcba9j5n528xvfg0zw5"; + version = "0.4.1"; + sha256 = "10w4fll46355w21l2jq3kd9lfsncdajc8s40j181s29kw6bq6r6n"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -110289,8 +110522,8 @@ self: { ({ mkDerivation, base, http-media, lucid, servant }: mkDerivation { pname = "servant-lucid"; - version = "0.4.0.0"; - sha256 = "05jadyh3msl2jlrq1d8bmazxb356qdv0gzwpj9gkvrsp4i6ldgcl"; + version = "0.4.1"; + sha256 = "02bggqwmpqznfnprfyfq6ia04byi23zgwvzigymaw1bykfi7z6h0"; buildDepends = [ base http-media lucid servant ]; homepage = "http://haskell-servant.github.io/"; description = "Servant support for lucid"; @@ -110379,28 +110612,26 @@ self: { "servant-server" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , bytestring-conversion, directory, doctest, either, exceptions - , filemanip, hspec, hspec-wai, http-types, mmorph, mtl, network - , network-uri, parsec, QuickCheck, safe, servant, split + , filemanip, filepath, hspec, hspec-wai, http-types, mmorph, mtl + , network, network-uri, parsec, QuickCheck, safe, servant, split , string-conversions, system-filepath, temporary, text , transformers, wai, wai-app-static, wai-extra, warp }: mkDerivation { pname = "servant-server"; - version = "0.4.0"; - revision = "1"; - sha256 = "0wr1rn1gvbph07ycx97qcm4j4jp15xnhvrk5y49bsiv6w6d9xxgx"; - editedCabalFile = "2e024f79e857aa5ad15cf171c1883b99eb45e901ec888eb68d9c6099c88bbbe8"; + version = "0.4.1"; + sha256 = "0bc82pn82ymv5wy1plmcgxb0ljkqj48rn9x8gdjdki06yvph63ga"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson attoparsec base bytestring either http-types mmorph mtl - network-uri safe servant split string-conversions system-filepath - text transformers wai wai-app-static warp + aeson attoparsec base bytestring either filepath http-types mmorph + mtl network-uri safe servant split string-conversions + system-filepath text transformers wai wai-app-static warp ]; testDepends = [ aeson base bytestring bytestring-conversion directory doctest - either exceptions filemanip hspec hspec-wai http-types mtl network - parsec QuickCheck servant string-conversions temporary text + either exceptions filemanip filepath hspec hspec-wai http-types mtl + network parsec QuickCheck servant string-conversions temporary text transformers wai wai-extra warp ]; jailbreak = true; @@ -114458,10 +114689,8 @@ self: { ({ mkDerivation, async, base, bytestring }: mkDerivation { pname = "socket"; - version = "0.1.0.1"; - revision = "1"; - sha256 = "06c5vrpwrlp1ab8axvbmrar382d780a8m6zqvvjb6zjahgd5cl32"; - editedCabalFile = "ef4027263ba8c3069f127839a7bace4b09d6d78714183b3faab935919c57e09c"; + version = "0.2.0.0"; + sha256 = "0z9hcbvsalmn7zmmks18v8pq3gnvf868kw44a9s6kp5h6npp05dw"; buildDepends = [ base bytestring ]; testDepends = [ async base bytestring ]; homepage = "https://github.com/lpeterse/haskell-socket"; @@ -116905,8 +117134,8 @@ self: { ({ mkDerivation, base, stm }: mkDerivation { pname = "stm-chans"; - version = "3.0.0.3"; - sha256 = "058miz12xm21lghc4bi06grsddd8hf2x9x5qdh0dva6lk0h9y7mk"; + version = "3.0.0.4"; + sha256 = "0f27sp09yha43xk9q55sc185jyjs5h7gq2dhsyx6bm9kz9dzqi13"; buildDepends = [ base stm ]; homepage = "http://code.haskell.org/~wren/"; description = "Additional types of channels for STM"; @@ -118632,12 +118861,13 @@ self: { }: mkDerivation { pname = "syb-with-class"; - version = "0.6.1.5"; - sha256 = "1gn4p92jabgvbk7bg1nzjimyfzznl800bi9hw4ssvc7jqqnyw5zn"; + version = "0.6.1.6"; + revision = "1"; + sha256 = "1c61hig293lxyr2kdri3rp6wkns921fiwwmml9zhrhrrryfr0p2n"; + editedCabalFile = "e894d322dfc9c36c33058bfcbecbe6d36e620556a9713108b008120f7981cd7c"; buildDepends = [ array base bytestring containers template-haskell ]; - jailbreak = true; description = "Scrap Your Boilerplate With Class"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -122186,6 +122416,7 @@ self: { base containers HTF list-extras loch-th placeholders template-haskell th-expand-syns ]; + jailbreak = true; homepage = "https://github.com/nikita-volkov/th-instance-reification"; description = "Fixed versions of instances reification functions"; license = stdenv.lib.licenses.mit; @@ -123158,6 +123389,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "time-qq" = callPackage + ({ mkDerivation, base, hspec, old-locale, template-haskell, time }: + mkDerivation { + pname = "time-qq"; + version = "0.0.0.1"; + sha256 = "11ib2i7693jvszbgzd2673953pklxphd0mhwkf67q47d6b5spdpq"; + buildDepends = [ base old-locale template-haskell time ]; + testDepends = [ base hspec ]; + homepage = "https://github.com/christian-marie/time-qq"; + description = "Quasi-quoter for UTCTime times"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "time-recurrence" = callPackage ({ mkDerivation, base, data-ordlist, HUnit, mtl, old-locale , test-framework, test-framework-hunit, time @@ -124767,7 +125011,9 @@ self: { mkDerivation { pname = "ttrie"; version = "0.1.2"; + revision = "1"; sha256 = "09nbba623nxnlg1957sgcrrva3ycwb31asxnxihwjh0wxrqhh1k0"; + editedCabalFile = "60673b32699d1b010c285811c892a1aa7b8890733083c82148ecd033b4db1222"; buildDepends = [ atomic-primops base hashable primitive stm ]; testDepends = [ base containers hashable QuickCheck stm test-framework @@ -126782,8 +127028,8 @@ self: { ({ mkDerivation, base, containers, logict, mtl }: mkDerivation { pname = "unification-fd"; - version = "0.10.0"; - sha256 = "1jin4w4csy6vhjrqk4lwn6aa6ic3xqnk86fsasznp2x9jv3rzw2b"; + version = "0.10.0.1"; + sha256 = "15hrnmgr0pqq43fwgxc168r08xjgfhr2nchmz5blq46vwrh6gx2v"; buildDepends = [ base containers logict mtl ]; homepage = "http://code.haskell.org/~wren/"; description = "Simple generic unification algorithms"; @@ -127113,8 +127359,8 @@ self: { ({ mkDerivation, base, bytestring }: mkDerivation { pname = "unix-bytestring"; - version = "0.3.7.2"; - sha256 = "0n1i7pcdwhs0wz6spf3pndr8i74qn0cdzr3p46w4r4mvvwr76i2s"; + version = "0.3.7.3"; + sha256 = "1340zxy9w8nmmhhwgg9rznvz8iyfhinpycdpkryqp60ilhyjgv53"; buildDepends = [ base bytestring ]; homepage = "http://code.haskell.org/~wren/"; description = "Unix/Posix-specific functions for ByteStrings"; @@ -127554,8 +127800,8 @@ self: { }: mkDerivation { pname = "uri-bytestring"; - version = "0.1.1"; - sha256 = "19nqdv61bsp470m94vq9cdpcyw1q9rwfplmpj09dd5pkmp7f6m8s"; + version = "0.1.2"; + sha256 = "1rd166dsc5cl6bwvd43z08d6j6djnmskg1ddnv1js0z4xxpbs2qf"; buildDepends = [ attoparsec base blaze-builder bytestring ]; testDepends = [ attoparsec base bytestring derive HUnit lens QuickCheck @@ -130548,8 +130794,8 @@ self: { }: mkDerivation { pname = "wai-request-spec"; - version = "0.9.1.0"; - sha256 = "1niszz8v8x4qkzssc5pmhpqsq3v9ad4gscx0dxxxpfz76fcs4f1k"; + version = "0.10.0.0"; + sha256 = "1sjlajp79j9mj0xaz9srzvai86il95vzq7668ydzj9hllllf04bk"; buildDepends = [ base bytestring case-insensitive containers http-types text wai ]; @@ -131554,8 +131800,8 @@ self: { }: mkDerivation { pname = "webkit"; - version = "0.13.1.2"; - sha256 = "090gp3700dafb30jdf1bw1vcn7rj7cs4h0glbi5rqp2ssg5f78kc"; + version = "0.13.1.3"; + sha256 = "00h9465xl6rfnd72cmn68z3mpany63dxl6fm2gqjbdzbrssj7306"; buildDepends = [ base bytestring cairo glib gtk mtl pango text ]; buildTools = [ gtk2hs-buildtools ]; pkgconfigDepends = [ webkit ]; @@ -131584,8 +131830,8 @@ self: { }: mkDerivation { pname = "webkitgtk3"; - version = "0.13.1.2"; - sha256 = "11b9n7q5xljjfnpfbh91kzs568y7nqdys5rm518cr4an20mbi47l"; + version = "0.13.1.3"; + sha256 = "0gfznb6n46576im72m6k9wrwc2n9f48nk4dsaz2llvzlzlzx4zfk"; buildDepends = [ base bytestring cairo glib gtk3 mtl pango text ]; buildTools = [ gtk2hs-buildtools ]; pkgconfigDepends = [ webkit ]; @@ -132900,8 +133146,8 @@ self: { }: mkDerivation { pname = "x509"; - version = "1.5.0.1"; - sha256 = "03gj4190f0ql1ghn2mri8901xdydhhnwijyfn8lmpjyn7pgpl3ba"; + version = "1.5.1"; + sha256 = "1mxg3bill1zqxdn6x0ayf8dja7y3xqikjaj9dhwf22y24vsj6v2n"; buildDepends = [ asn1-encoding asn1-parse asn1-types base bytestring containers crypto-pubkey-types cryptohash directory filepath hourglass mtl pem From c40c1be7987e0609fac5308e58cb672104418110 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Sat, 30 May 2015 11:50:59 -0700 Subject: [PATCH 051/126] prometheus-mesos-exporter: Fix misplaced dependencies goPackages.mesos-stats doesn't actually have any dependencies of its own; the mesos_exporter app does. --- .../monitoring/prometheus/mesos_exporter/default.nix | 6 +++++- pkgs/top-level/go-packages.nix | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix b/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix index 5a62a46823b..fec66af2469 100644 --- a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix @@ -12,7 +12,11 @@ goPackages.buildGoPackage rec { sha256 = "059az73j717gd960g4jigrxnvqrjh9jw1c324xpwaafa0bf10llm"; }; - buildInputs = [ goPackages.mesos-stats ]; + buildInputs = [ + goPackages.mesos-stats + goPackages.prometheus.client_golang + goPackages.glog + ]; meta = with lib; { description = "Export Mesos metrics to Prometheus"; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 63df1012afd..9af04081000 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1674,8 +1674,6 @@ let repo = "mesos_stats"; sha256 = "18ggyjf4nyn77gkn16wg9krp4dsphgzdgcr3mdflv6mvbr482ar4"; }; - - propagatedBuildInputs = [ prometheus.client_golang glog ]; }; mgo = buildGoPackage rec { From dd649df4e4d167a22c5641c956eda499873ae692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 30 May 2015 20:58:03 +0200 Subject: [PATCH 052/126] luaPackages: stabilize src hashes by using fetchzip I was getting hash errors in some packages. --- pkgs/top-level/lua-packages.nix | 42 ++++++++++++++++----------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 773ddd29521..273a0e7ecc1 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -5,7 +5,7 @@ for each package in a separate file: the call to the function would be almost as must code as the function itself. */ -{ fetchurl, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool +{ fetchurl, fetchzip, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo , perl, gtk, python, glib, gobjectIntrospection, libevent, zlib }: @@ -55,9 +55,9 @@ let name = "luaevent-${version}"; disabled = isLua52; - src = fetchurl { + src = fetchzip { url = "https://github.com/harningt/luaevent/archive/v${version}.tar.gz"; - sha256 = "1ifr949j9xaas0jk0nxpilb44dqvk4c5h4m7ccksz5da3iksfgls"; + sha256 = "1c1n2zqx5rwfwkqaq1jj8gvx1vswvbihj2sy445w28icz1xfhpik"; }; preBuild = '' @@ -107,9 +107,9 @@ let luafilesystem = buildLuaPackage rec { name = "filesystem-1.6.2"; - src = fetchurl { + src = fetchzip { url = "https://github.com/keplerproject/luafilesystem/archive/v1_6_2.tar.gz"; - sha256 = "1n8qdwa20ypbrny99vhkmx8q04zd2jjycdb5196xdhgvqzk10abz"; + sha256 = "134azkxw84xp9g5qmzjsmcva629jm7plwcmjxkdzdg05vyd7kig1"; }; meta = { homepage = "https://github.com/keplerproject/luafilesystem"; @@ -144,9 +144,9 @@ let luasec = buildLuaPackage rec { version = "0.5"; name = "sec-${version}"; - src = fetchurl { + src = fetchzip { url = "https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"; - sha256 = "08rm12cr1gjdnbv2jpk7xykby9l292qmz2v0dfdlgb4jfj7mk034"; + sha256 = "1zl6wwcyd4dfcw01qan7dkcw0rgzm69w819qbaddcr2ik147ccmq"; }; buildInputs = [ openssl ]; @@ -190,9 +190,9 @@ let luazip = buildLuaPackage rec { name = "zip-${version}"; version = "1.2.3"; - src = fetchurl { + src = fetchzip { url = "https://github.com/luaforge/luazip/archive/0b8f5c958e170b1b49f05bc267bc0351ad4dfc44.zip"; - sha256 = "beb9260d606fdd5304aa958d95f0d3c20be7ca0a2cff44e7b75281c138a76a50"; + sha256 = "0zrrwhmzny5zbpx91bjbl77gzkvvdi3qhhviliggp0aj8w3faxsr"; }; buildInputs = [ unzip zziplib ]; patches = [ ../development/lua-modules/zip.patch ]; @@ -209,9 +209,9 @@ let name = "zlib-${version}"; version = "0.4"; - src = fetchurl { + src = fetchzip { url = "https://github.com/brimworks/lua-zlib/archive/v${version}.tar.gz"; - sha256 = "1l32nwyh8b4vicxvlhbv9qhkhklbhvjfn8wd72bjk7ac9kz172rd"; + sha256 = "1pgxnjc0gvk25wsr69nsm60y5ad86z1nlq7mzj3ckygzkgi782dd"; }; buildInputs = [ zlib ]; @@ -238,9 +238,9 @@ let luastdlib = buildLuaPackage { name = "stdlib"; - src = fetchurl { + src = fetchzip { url = "https://github.com/lua-stdlib/lua-stdlib/archive/release.zip"; - sha256 = "1v3158g5050sdqfrqi6d2bjh0lmi1v01a6m2nwqpr527a2dqcf0c"; + sha256 = "0636absdfjx8ybglwydmqxwfwmqz1c4b9s5mhxlgm4ci18lw3hms"; }; buildInputs = [ unzip ]; meta = { @@ -253,9 +253,9 @@ let lrexlib = buildLuaPackage rec { name = "lrexlib-${version}"; version = "2.7.2"; - src = fetchurl { + src = fetchzip { url = "https://github.com/rrthomas/lrexlib/archive/150c251be57c4e569da0f48bf6b01fbca97179fe.zip"; - sha256 = "0i5brqbykc2nalp8snlq1r0wmf8y2wqp6drzr2xmq5phvj8913xh"; + sha256 = "0acb3258681bjq61piz331r99bdff6cnkjaigq5phg3699iz5h75"; }; buildInputs = [ unzip luastdlib pcre luarocks oniguruma gnulib tre glibc ]; @@ -288,9 +288,9 @@ let luasqlite3 = buildLuaPackage rec { name = "sqlite3-${version}"; version = "2.1.1"; - src = fetchurl { + src = fetchzip { url = "https://github.com/LuaDist/luasql-sqlite3/archive/2acdb6cb256e63e5b5a0ddd72c4639d8c0feb52d.zip"; - sha256 = "1yy1n1l1801j48rlf3bhxpxqfgx46ixrs8jxhhbf7x1hn1j4axlv"; + sha256 = "17zsa0jzciildil9k4lb0rjn9s1nj80dy16pzx9bxqyi75pjf2d4"; }; buildInputs = [ unzip sqlite ]; @@ -356,9 +356,9 @@ let luaMessagePack = buildLuaPackage rec { name = "lua-MessagePack-${version}"; version = "0.3.1"; - src = fetchurl { + src = fetchzip { url = "https://github.com/fperrad/lua-MessagePack/archive/${version}.tar.gz"; - sha256 = "185mrd6bagwwm94jxzanq01l72ama3x4hf160a7yw7hgim2y5h9c"; + sha256 = "1xlif8fkwd8bb78wrvf2z309p7apms350lbg6qavylsvz57lkjm6"; }; buildInputs = [ unzip ]; @@ -373,9 +373,9 @@ let name = "lgi-${version}"; version = "0.7.2"; - src = fetchurl { + src = fetchzip { url = "https://github.com/pavouk/lgi/archive/${version}.tar.gz"; - sha256 = "0ihl7gg77b042vsfh0k7l53b7sl3d7mmrq8ns5lrsf71dzrr19bn"; + sha256 = "10i2ssfs01d49fdmmriqzxc8pshys4rixhx30wzd9p1m1q47a5pn"; }; meta = with stdenv.lib; { From b462c7908ff25cb0a9cc972ad376335fcb0f8811 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 30 May 2015 21:02:03 +0200 Subject: [PATCH 053/126] git-annex: on second thought, let's not break backwards compatibility for no apparent reason --- pkgs/applications/version-management/git-and-tools/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 669fe6dc890..a73d1637417 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -47,6 +47,7 @@ rec { }; inherit (pkgs.haskellPackages) git-annex; + gitAnnex = git-annex; qgit = import ./qgit { inherit fetchurl stdenv; From cbbd7230ac5252d52053d0b898321c7069da59f0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2015 22:34:55 +0200 Subject: [PATCH 054/126] lz4 129 -> 130 Hotfix, solving issues with lz4cat. - Fixed: incompatibility sparse mode vs console (#105) - Fixed: LZ4IO exits too early when frame crc not present (#106) - Fixed: incompatibility sparse mode vs append mode (#110) - Performance fix: big compression speed boost for clang (+30%) - New: cross-version test --- pkgs/tools/compression/lz4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index 46b3b2fd7d7..8cf8677b377 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub, valgrind }: -let version = "129"; in +let version = "130"; in stdenv.mkDerivation rec { name = "lz4-${version}"; src = fetchFromGitHub { - sha256 = "0liq5gvnikchgvalpi52hq0npwlh84w94bj79dcbrcw19may5dwi"; + sha256 = "1050hwnbqyz2m26vayv942dh92689qp73chrbnqlg8awhlb5kyi5"; rev = "r${version}"; repo = "lz4"; owner = "Cyan4973"; From 1d4bfeacc58f9568f09ddcfaf3afe370b08e0126 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2015 14:18:29 +0200 Subject: [PATCH 055/126] simple-scan 3.16.0.1 -> 3.17.2 --- pkgs/applications/graphics/simple-scan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix index 43d717c58e5..ad825eceec2 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, cairo, colord, glib, gtk3, intltool, itstool, libxml2 , makeWrapper, pkgconfig, saneBackends, systemd, vala }: -let version = "3.16.0.1"; in +let version = "3.17.2"; in stdenv.mkDerivation rec { name = "simple-scan-${version}"; src = fetchurl { - sha256 = "0p1knmbrdwrnjjk5x0szh3ja2lfamaaynj2ai92zgci2ma5xh2ma"; - url = "https://launchpad.net/simple-scan/3.16/${version}/+download/${name}.tar.xz"; + sha256 = "07r32hsafb8is2fs0flk7dvi5agyzf9jqs96sbgia2pizmyl1s1m"; + url = "https://launchpad.net/simple-scan/3.17/${version}/+download/${name}.tar.xz"; }; meta = with stdenv.lib; { From 3c6d34a5d9ef20f51fbf6fdbda38224321387aae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2015 14:35:14 +0200 Subject: [PATCH 056/126] dpkg 1.17.25 -> 1.18.0 --- pkgs/tools/package-management/dpkg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index beb0e7d8678..d3a08f044d5 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper }: -let version = "1.17.25"; in +let version = "1.18.0"; in stdenv.mkDerivation { name = "dpkg-${version}"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "1akblsdfblih7879gi5qagqpgy6zz866kcyvg5y11ywqmqw9s087"; + sha256 = "0ni25w0cxfz3szccqxq7l1gvcwg48vdvl63aajmbigsvxnz6y5bv"; }; postPatch = '' From d904b54c0edb4666a38a478438652a0d7c38832d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 30 May 2015 12:56:04 +0200 Subject: [PATCH 057/126] lz4: fix `make test` I'll assume this is an oversight due to hasty releasing and can be reverted in version 131. --- pkgs/tools/compression/lz4/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index 8cf8677b377..fc3eca6ab10 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; - checkFlags = "-j1"; # required since version 128 + checkFlags = "-j1 -C programs"; # -j1 required since version 128, -C should be temporary meta = with stdenv.lib; { description = "Extremely fast compression algorithm"; From 21015ea82f11cd4d42395a12016ad4add77655d7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2015 21:10:36 +0200 Subject: [PATCH 058/126] Add bin_replace_string: edit precompiled binaries --- .../tools/misc/bin_replace_string/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/tools/misc/bin_replace_string/default.nix diff --git a/pkgs/development/tools/misc/bin_replace_string/default.nix b/pkgs/development/tools/misc/bin_replace_string/default.nix new file mode 100644 index 00000000000..7d33d8ee3c3 --- /dev/null +++ b/pkgs/development/tools/misc/bin_replace_string/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, libelf, txt2man }: + +let version = "0.2"; in +stdenv.mkDerivation rec { + name = "bin_replace_string-${version}"; + + src = fetchurl { + sha256 = "1gnpddxwpsfrg4l76x5yplsvbcdbviybciqpn22yq3g3qgnr5c2a"; + url = "ftp://ohnopub.net/mirror/bin_replace_string-0.2.tar.bz2"; + }; + + meta = with stdenv.lib; { + inherit version; + description = "Edit precompiled binaries"; + longDescription = '' + bin_replace_string edits C-style strings in precompiled binaries. This is + intended to be useful to replace arbitrary strings in binaries whose + source code is not available. However, because of the nature of compiled + binaries, bin_replace_string may only replace a given C-string with a + shorter C-string. + ''; + homepage = http://ohnopub.net/~ohnobinki/bin_replace_string/; + downloadPage = ftp://ohnopub.net/mirror/; + license = licenses.gpl3Plus; + platforms = with platforms; linux; + maintainers = with maintainers; [ nckx ]; + }; + + buildInputs = [ libelf ]; + nativeBuildInputs = [ txt2man ]; + + enableParallelBuilding = true; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9639087d67..4e1ac82c7d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5109,6 +5109,8 @@ let bazel = callPackage ../development/tools/build-managers/bazel { jdk = oraclejdk8; }; + bin_replace_string = callPackage ../development/tools/misc/bin_replace_string { }; + binutils = if stdenv.isDarwin then import ../build-support/native-darwin-cctools-wrapper {inherit stdenv;} else callPackage ../development/tools/misc/binutils { From 3ca2bb3c039d19c047879e2af92b7b4b0a958666 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 30 May 2015 02:15:23 +0200 Subject: [PATCH 059/126] radeontop v0.8-8-g2499679 -> 2015-05-28 (new format) --- pkgs/os-specific/linux/radeontop/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix index 7ec74c895c6..99100b85cb6 100644 --- a/pkgs/os-specific/linux/radeontop/default.nix +++ b/pkgs/os-specific/linux/radeontop/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, pkgconfig, gettext, ncurses, libdrm, libpciaccess }: -let version = "v0.8-8-g2499679"; in +let version = "2015-05-28"; in stdenv.mkDerivation { name = "radeontop-${version}"; src = fetchFromGitHub { - sha256 = "112zf6ms0qpmr9h3l4lg5wik5j206mgij0nypba5lnqzksxh2f88"; - rev = "2499679fda60c3f6239886296fd2a74155f45f77"; + sha256 = "0s281fblqbvl7vgaqiwh3s16y0bah3z0i1ssf4mbwl2iayj1cliq"; + rev = "b9428f18ea4631fdd5f9ccee81570aa7ac472c07"; repo = "radeontop"; owner = "clbr"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; patchPhase = '' - substituteInPlace getver.sh --replace ver=unknown ver=${version} + substituteInPlace getver.sh --replace ver=unknown ver=${version}-git ''; makeFlags = "PREFIX=$(out)"; From 99626a6ba4d06603b77681d132664b1c2795a119 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 30 May 2015 01:27:35 +0200 Subject: [PATCH 060/126] accounts-qt 1.11 -> 1.13 Development has moved from Google Code to Gitlab. --- .../libraries/accounts-qt/default.nix | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index 9194339b3a4..c0e40472902 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -1,23 +1,27 @@ -{ stdenv, fetchurl, doxygen, glib, libaccounts-glib, pkgconfig, qt5 }: +{ stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qt5 }: +let version = "1.13"; in stdenv.mkDerivation rec { - name = "accounts-qt-1.11"; - src = fetchurl { - url = "https://accounts-sso.googlecode.com/files/${name}.tar.bz2"; - sha256 = "07drh4s7zaz4bzg2xhwm50ig1g8vlphfv02nrzz1yi085az1fmch"; + name = "accounts-qt-${version}"; + + src = fetchFromGitLab { + sha256 = "1gpkgw05dwsf2wk5cy3skgss3kw6mqh7iv3fadrxqxfc1za1xmyl"; + rev = "${version}"; + repo = "libaccounts-qt"; + owner = "accounts-sso"; + }; + + meta = with stdenv.lib; { + description = "Qt library for accessing the online accounts database"; + homepage = "http://code.google.com/p/accounts-sso/"; + license = licenses.lgpl21; + maintainers = with maintainers; [ nckx ]; }; buildInputs = [ glib libaccounts-glib qt5.base ]; nativeBuildInputs = [ doxygen pkgconfig ]; configurePhase = '' - qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake/AccountsQt5 - ''; - - postInstall = '' - mv $out/lib/cmake/AccountsQt5/AccountsQtConfig.cmake \ - $out/lib/cmake/AccountsQt5/AccountsQt5Config.cmake - mv $out/lib/cmake/AccountsQt5/AccountsQtConfigVersion.cmake \ - $out/lib/cmake/AccountsQt5/AccountsQt5ConfigVersion.cmake + qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake ''; } From ff2ccb2721d0487b976f16cf574af440d3e7f4ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 30 May 2015 22:07:40 +0200 Subject: [PATCH 061/126] linssid: fix build by using qt53 --- pkgs/applications/networking/linssid/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix index de5dc849148..2b4c5f564be 100644 --- a/pkgs/applications/networking/linssid/default.nix +++ b/pkgs/applications/networking/linssid/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl"; }; - buildInputs = [ qt5.base pkgconfig boost ]; + buildInputs = [ qt5 pkgconfig boost ]; postPatch = '' sed -e "s|/usr/include/|/nonexistent/|g" -i linssid-app/*.pro diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e1ac82c7d6..86a985d260a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11260,7 +11260,9 @@ let libquvi = callPackage ../applications/video/quvi/library.nix { }; - linssid = callPackage ../applications/networking/linssid { }; + linssid = callPackage ../applications/networking/linssid { + qt5 = qt53; + }; mi2ly = callPackage ../applications/audio/mi2ly {}; From 3a1345189cdeaa5676585fd8aa139f06f1ea1a85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 30 May 2015 22:29:04 +0200 Subject: [PATCH 062/126] pantheon-terminal: fix build, schemas, icons /cc maintainer @ollieh. BTW, it would be nice if the attribute names under maintainers were the same as the github usernames. --- pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix index 7506ece43dc..b0958d232fc 100644 --- a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix @@ -16,11 +16,14 @@ stdenv.mkDerivation rec { preFixup = '' for f in $out/bin/*; do wrapProgram $f \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$XDG_ICON_DIRS:$out/share" done ''; - buildInputs = [perl cmake vala pkgconfig glib gtk3 granite gnome3.vte gnome3.libgee libnotify gettext makeWrapper]; + buildInputs = with gnome3; [ + perl cmake vala pkgconfig glib gtk3 granite libnotify gettext makeWrapper + vte_290 libgee gsettings_desktop_schemas defaultIconTheme + ]; meta = { description = "elementary OS's terminal"; longDescription = "A super lightweight, beautiful, and simple terminal. It's designed to be setup with sane defaults and little to no configuration. It's just a terminal, nothing more, nothing less. Designed for elementary OS."; From 1ea42506d1c66cee165f16ca8c256b0f06f80ab5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 30 May 2015 22:35:04 +0200 Subject: [PATCH 063/126] sakura: fix build after gnome-3.16 bump /cc maintainers: @astsmtl, @codyopel. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86a985d260a..b71a070af80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12254,7 +12254,7 @@ let rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; sakura = callPackage ../applications/misc/sakura { - inherit (gnome3) vte; + vte = gnome3.vte_290; }; sbagen = callPackage ../applications/misc/sbagen { }; From 1f18764f473104da9d70f011f2ebe11463b1a8dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 30 May 2015 22:47:20 +0200 Subject: [PATCH 064/126] telepathy-salut: fix build - use openssl instead of gnutls --- .../networking/instant-messengers/telepathy/salut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index b1341af7a9d..5e4ad860687 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libxslt, glib, libxml2, telepathy_glib, avahi, libsoup -, libuuid, gnutls, sqlite, pkgconfigUpstream }: +, libuuid, openssl, sqlite, pkgconfigUpstream }: stdenv.mkDerivation rec { pname = "telepathy-salut"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "13k112vrr3zghzr03pnbqc1id65qvpj0sn0virlbf4dmr2511fbh"; }; - buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid gnutls + buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid openssl sqlite ]; nativeBuildInputs = [ libxslt pkgconfigUpstream ]; From 84cd11d54e3afaad443cb09aceea2016ed6a183a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 30 May 2015 22:50:09 +0200 Subject: [PATCH 065/126] tilda: fix build after gnome-3.16 bump --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b71a070af80..a47e7acd2c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12535,7 +12535,7 @@ let tig = gitAndTools.tig; tilda = callPackage ../applications/misc/tilda { - vte = gnome3.vte; + vte = gnome3.vte_290; gtk = gtk3; }; From 022f3067f0715b5be1ad4ec1b54523a2b518e3ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 30 May 2015 23:06:25 +0200 Subject: [PATCH 066/126] yoshimi: fix build, same as octave --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a47e7acd2c6..2ad327c6b55 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13096,7 +13096,7 @@ let ykpers = callPackage ../applications/misc/ykpers {}; yoshimi = callPackage ../applications/audio/yoshimi { - fltk = fltk13; + fltk = fltk13.override { cfg.xftSupport = true; }; }; zam-plugins = callPackage ../applications/audio/zam-plugins { inherit (xlibs) libX11; }; From 098277c2cb3649db463e794e72889fa101d02941 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 30 May 2015 23:53:33 +0200 Subject: [PATCH 067/126] tulip: fix build by using older cmake /cc maintainer @cillianderoiste. --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ad327c6b55..2b94739b852 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14203,7 +14203,9 @@ let stellarium = callPackage ../applications/science/astronomy/stellarium { }; - tulip = callPackage ../applications/science/misc/tulip { }; + tulip = callPackage ../applications/science/misc/tulip { + cmake = cmake-2_8; + }; vite = enableDebugging (callPackage ../applications/science/misc/vite { }); From 4c898aad5115b8e2967003b9b78cb9f4ff8f3843 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 31 May 2015 00:05:33 +0200 Subject: [PATCH 068/126] spring: fix build by using older cmake --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b94739b852..915a07ffca5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13381,6 +13381,7 @@ let spring = callPackage ../games/spring { boost = boost155; + cmake = cmake-2_8; }; springLobby = callPackage ../games/spring/springlobby.nix { }; From 82bd3a558088f0abc7cf5af27b5fd9024fbc341a Mon Sep 17 00:00:00 2001 From: Ryan Trinkle Date: Sun, 31 May 2015 03:18:13 -0400 Subject: [PATCH 069/126] Do not use install_name_tool on "executables" built by GHCJS These executables are really .jsexe directories, and install_name_tool will fail --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index d441b824842..edff84a0403 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -244,7 +244,7 @@ stdenv.mkDerivation ({ mv $packageConfFile $packageConfDir/$pkgId.conf ''} - ${optionalString (enableSharedExecutables && isExecutable && stdenv.isDarwin && stdenv.lib.versionOlder ghc.version "7.10") '' + ${optionalString (enableSharedExecutables && isExecutable && !isGhcjs && stdenv.isDarwin && stdenv.lib.versionOlder ghc.version "7.10") '' for exe in "$out/bin/"* ; do install_name_tool -add_rpath "$out/lib/ghc-${ghc.version}/${pname}-${version}" "$exe" done From c84a9d2d17975470908959eba32702c2eb94416b Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 May 2015 11:01:51 +0300 Subject: [PATCH 070/126] Update Octave to 4.0.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 a0906a09a78..9ad8c2790da 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - version = "3.8.2"; + version = "4.0.0"; name = "octave-${version}"; src = fetchurl { - url = "mirror://gnu/octave/${name}.tar.bz2"; - sha256 = "83bbd701aab04e7e57d0d5b8373dd54719bebb64ce0a850e69bf3d7454f33bae"; + url = "mirror://gnu/octave/${name}.tar.xz"; + sha256 = "0x64b2lna4vrlm4wwx6h1qdlmki6s2b9q90yjxldlvvrqvxf4syg"; }; buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11 From 608482f6130690db7b1ce17a5621d270490acefc Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 May 2015 11:46:47 +0300 Subject: [PATCH 071/126] Update SBCL --- pkgs/development/compilers/sbcl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index b9e3011194d..80f7ea8cc3c 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.2.11"; + version = "1.2.12"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "0w1ymazyck5a8bjmsbnq1hps1n4824h3ajh849f1y09dwzd09al8"; + sha256 = "1bf98wi3gz8n09prwmxa38b2mhq69rqq11s9h9swi3avy5wchnxn"; }; buildInputs = [ which ] From 555ee2f7ba0d2dbe83db433ac21396106bbc42e0 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 31 May 2015 11:29:56 +0200 Subject: [PATCH 072/126] Add patch for haskell-iconv to support GHC 7.10. --- .../configuration-ghc-7.10.x.nix | 3 ++ .../haskell-modules/iconv-fix-ghc710.patch | 41 +++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/haskell-modules/iconv-fix-ghc710.patch diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index ac24848b8fe..2262819a779 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -284,4 +284,7 @@ self: super: { # Ugly hack to trigger a rebuild to fix the broken package on Hydra. crypto-api = appendConfigureFlag super.crypto-api "-fignore-me-1"; + # Fix compilation under GHC 7.10, patch has been sent upstream. + iconv = appendPatch super.iconv ./iconv-fix-ghc710.patch; + } diff --git a/pkgs/development/haskell-modules/iconv-fix-ghc710.patch b/pkgs/development/haskell-modules/iconv-fix-ghc710.patch new file mode 100644 index 00000000000..a7c35647a29 --- /dev/null +++ b/pkgs/development/haskell-modules/iconv-fix-ghc710.patch @@ -0,0 +1,41 @@ +Running command 'diff -urN old-iconv new-iconv' +Fri May 29 00:42:30 CEST 2015 Robert Helgesson + * Add Functor and Applicative instances for IConv + + This makes iconv successfully build under GHC 7.10. +diff -urN old-iconv/Codec/Text/IConv/Internal.hs new-iconv/Codec/Text/IConv/Internal.hs +--- old-iconv/Codec/Text/IConv/Internal.hs 2015-05-31 11:26:06.410968449 +0200 ++++ new-iconv/Codec/Text/IConv/Internal.hs 2015-05-31 11:26:06.410968449 +0200 +@@ -49,6 +49,7 @@ + import System.IO.Unsafe (unsafeInterleaveIO, unsafePerformIO) + import System.IO (hPutStrLn, stderr) + import Control.Exception (assert) ++import Control.Monad (ap, liftM) + + import Prelude hiding (length) + +@@ -192,8 +193,8 @@ + -} + + +----------------------------- +--- IConv monad ++---------------------------------------- ++-- IConv functor, applicative, and monad + -- + + newtype IConv a = I { +@@ -202,6 +203,13 @@ + -> IO (Buffers, a) + } + ++instance Functor IConv where ++ fmap = liftM ++ ++instance Applicative IConv where ++ pure = return ++ (<*>) = ap ++ + instance Monad IConv where + (>>=) = bindI + -- m >>= f = (m `bindI` \a -> consistencyCheck `thenI` returnI a) `bindI` f From 289e8716b2871d535e1b61162890766e78518150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 31 May 2015 12:15:12 +0200 Subject: [PATCH 073/126] xfce4-power-manager: 1.4.3 -> 1.4.4 --- pkgs/desktops/xfce/core/xfce4-power-manager.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/pkgs/desktops/xfce/core/xfce4-power-manager.nix index c75eb787757..9a3116463c6 100644 --- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix +++ b/pkgs/desktops/xfce/core/xfce4-power-manager.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { p_name = "xfce4-power-manager"; ver_maj = "1.4"; - ver_min = "3"; + ver_min = "4"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "04909sfc2nrj2wg9cw6y9y2r9yrp3l3vc201sy1gaiap67fi33h1"; + sha256 = "01rvqy1cif4s8lkidb7hhmsz7d9f2fwcwvc51xycaj3qgsmch3n5"; }; name = "${p_name}-${ver_maj}.${ver_min}"; From fe2d66ff655874e2990969ac8f7f939afe601c7b Mon Sep 17 00:00:00 2001 From: Christian Theune Date: Sun, 31 May 2015 12:42:59 +0200 Subject: [PATCH 074/126] Update syncthing to 0.11.7 --- pkgs/applications/networking/syncthing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 0837659983e..1e26e61161c 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,12 +4,12 @@ with goPackages; buildGoPackage rec { name = "syncthing-${version}"; - version = "0.11.6"; + version = "0.11.7"; goPackagePath = "github.com/syncthing/syncthing"; src = fetchgit { url = "git://github.com/syncthing/syncthing.git"; rev = "refs/tags/v${version}"; - sha256 = "7fe7d7034c0e502036e2a0bb1b94b1701bd194cc82f07495da8a41c4b097c6a3"; + sha256 = "7d928a255c61c7b89d460cc70c79bd8e85bef3e919c157f59d5709fef4153c8d"; }; subPackages = [ "cmd/syncthing" ]; From 36985e8b5af575805b7fb1d54e522c52b4be306f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 31 May 2015 13:08:41 +0200 Subject: [PATCH 075/126] aespipe: update from 2.4c to 2.4d --- pkgs/tools/security/aespipe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/tools/security/aespipe/default.nix index 2fad2fe29e6..aefd6b7500c 100644 --- a/pkgs/tools/security/aespipe/default.nix +++ b/pkgs/tools/security/aespipe/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "aespipe-${version}"; - version = "2.4c"; + version = "2.4d"; src = fetchurl { url = "mirror://sourceforge/loop-aes/aespipe/aespipe-v${version}.tar.bz2"; - sha256 = "0pl49jnjczjvfxwm9lw576qsjm1lxh8gc4g776l904cixaz90096"; + sha256 = "03z5i41xv6p3m79lm04d7msda8878lsppv3324zbjjfy19p6bkn5"; }; meta = { From 72b259f61edf5c0391d16adf5d27355eb48161ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 31 May 2015 13:09:03 +0200 Subject: [PATCH 076/126] darktable: update from 1.6.4 to 1.6.6 --- pkgs/applications/graphics/darktable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 0589de8726a..3398fed6595 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -9,12 +9,12 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "1.6.4"; + version = "1.6.6"; name = "darktable-${version}"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "0ald6qqg7abgr8hj2qk45260cqh3fddzqbxc1p7ll0ac2vl0bxy5"; + sha256 = "1991zm0ly2j69vq9jsijfrjw0vnchh3il7m4ylsblzk73614nppq"; }; buildInputs = From 8d6b8be952b18605603a5db5043e7e386c083a02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 31 May 2015 13:09:19 +0200 Subject: [PATCH 077/126] drumkv1: update from 0.6.1 to 0.6.3 --- pkgs/applications/audio/drumkv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index d71845ead37..b3a496c26a1 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "drumkv1-${version}"; - version = "0.6.1"; + version = "0.6.3"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; - sha256 = "082ml6g63n6s3w704fjkma8085g2l10az3f6r78y9hpgpw3042jw"; + sha256 = "1f0vpwq7vydldrq9fdfipbkzqqndyxlx0n81ch1i9kw81xj3sxjq"; }; buildInputs = [ jack2 libsndfile lv2 qt4 ]; From b140effd2b2cd755d125cc41aaad870b4007ed49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 31 May 2015 13:09:51 +0200 Subject: [PATCH 078/126] qtractor: update from 0.6.6 to 0.6.7 --- pkgs/applications/audio/qtractor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index 763501a7465..d3d3a71febc 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -4,12 +4,12 @@ , sord, sratom, stdenv, suil }: stdenv.mkDerivation rec { - version = "0.6.6"; + version = "0.6.7"; name = "qtractor-${version}"; src = fetchurl { url = "mirror://sourceforge/qtractor/${name}.tar.gz"; - sha256 = "1n70hs4bx4hq3cp2p35jq5vlcans4fk2c35w72244vlqlajx05c0"; + sha256 = "0h5nblfkl4s412c9f02b40nb8c8jq8ypz67z2qn3hkvhx6i9yxsg"; }; buildInputs = From 11526b23abc2cab1da563b12c6880afb9f2c4124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 31 May 2015 13:10:05 +0200 Subject: [PATCH 079/126] samplv1: update from 0.6.1 to 0.6.3 --- pkgs/applications/audio/samplv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index 10f0a4cec41..15bb1e0a17d 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "samplv1-${version}"; - version = "0.6.1"; + version = "0.6.3"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "18jh953a0480fnsflbm4j04xz02h7fqwk77v8hnv54vwwp5a1h08"; + sha256 = "1c62fpfl9xv93m04hfh72vzbljr0c5p409vzf3xxmvj9x610yx1w"; }; buildInputs = [ jack2 libsndfile lv2 qt4 ]; From fe05de0a8e7293e8cd040319dd4f1a87f0ef5842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 31 May 2015 13:10:22 +0200 Subject: [PATCH 080/126] synthv1: update from 0.6.1 to 0.6.3 --- pkgs/applications/audio/synthv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index 37fc45983d9..7b00e8ac060 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "synthv1-${version}"; - version = "0.6.1"; + version = "0.6.3"; src = fetchurl { url = "mirror://sourceforge/synthv1/${name}.tar.gz"; - sha256 = "0v9zpa49cdj8ixpppgxz95dbn62v8mamxz6fpl7sdnzfn2l8jr4g"; + sha256 = "19zyvrvnmi7ahwg121vl2q17j9y8ln6lvpj5wxxcwif5538q75iw"; }; buildInputs = [ qt4 jack2 lv2 ]; From 7df338675393fba7691aa2f272d0195a7ca4cb1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 31 May 2015 13:12:01 +0200 Subject: [PATCH 081/126] movit: update from 1.1.2 to 1.1.3 --- pkgs/development/libraries/movit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix index 88f18003977..df084f0cc20 100644 --- a/pkgs/development/libraries/movit/default.nix +++ b/pkgs/development/libraries/movit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "movit-${version}"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { url = "http://movit.sesse.net/${name}.tar.gz"; - sha256 = "0jka9l3cx7q09rpz5x6rv6ii8kbgm2vc419gx2rb9rc8sl81hzj1"; + sha256 = "0q33h3gfw16gd9k6s3isd7ili2mifw7j1723xpdlc516gggsazw9"; }; GTEST_DIR = "${gtest}"; From 7c09d9d2915317580e14733cde839f88b08a5718 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Sun, 31 May 2015 13:18:39 +0100 Subject: [PATCH 082/126] agda-stdlib: update to 2.4.2.3 branch Required to work with the new Agda we have --- pkgs/development/libraries/agda/agda-stdlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix index 8f3d298306b..2a75b1fb700 100644 --- a/pkgs/development/libraries/agda/agda-stdlib/default.nix +++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix @@ -6,8 +6,8 @@ agda.mkDerivation (self: rec { src = fetchgit { url = "git://github.com/agda/agda-stdlib"; - rev = "451446c5d849b8c5d6d34363e3551169eb126cfb"; - sha256 = "40a55d3c22fb3462b110859f4cd63e79e086b25f23964b465768397b93c57701"; + rev = "9c9b3cb28f9a7d39a256890a1469c1a3f7fc4faf"; + sha256 = "521899b820e70abbae7cb30008b87a2f8676bc6265b78865e42982fc2e5c972f"; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; From 5d53b9d278b89c5e0a97bff92fc78023561ed9c8 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 30 May 2015 17:18:54 +0200 Subject: [PATCH 083/126] init VoiceOfFaust at v0.7 --- .../audio/VoiceOfFaust/default.nix | 65 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/applications/audio/VoiceOfFaust/default.nix diff --git a/pkgs/applications/audio/VoiceOfFaust/default.nix b/pkgs/applications/audio/VoiceOfFaust/default.nix new file mode 100644 index 00000000000..17cb680c58c --- /dev/null +++ b/pkgs/applications/audio/VoiceOfFaust/default.nix @@ -0,0 +1,65 @@ + +{ stdenv, pkgs, callPackage, fetchFromGitHub, faust2jack, helmholtz, mrpeach, puredata-with-plugins }: +stdenv.mkDerivation rec { + name = "VoiceOfFaust-${version}"; + version = "0.7"; + + src = fetchFromGitHub { + owner = "magnetophon"; + repo = "VoiceOfFaust"; + rev = "v${version}"; + sha256 = "14jjs7cnhg20pzijgblr7caspcpx8p8lpkbvjzc656s9lqn6m9sn"; + }; + + plugins = [ helmholtz mrpeach ]; + + pitchTracker = puredata-with-plugins plugins; + + buildInputs = [ faust2jack ]; + + runtimeInputs = [ pitchTracker ]; + + patchPhase = '' + sed -i "s@pd -nodac@${pitchTracker}/bin/pd -nodac@g" launchers/synthWrapper + sed -i "s@../PureData/OscSendVoc.pd@$out/PureData/OscSendVoc.pd@g" launchers/synthWrapper + ''; + + buildPhase = '' + faust2jack -osc classicVocoder.dsp + faust2jack -osc CZringmod.dsp + faust2jack -osc FMsinger.dsp + faust2jack -osc FOFvocoder.dsp + faust2jack -osc Karplus-StrongSinger.dsp + faust2jack -osc -sch -t 99999 Karplus-StrongSingerMaxi.dsp + faust2jack -osc PAFvocoder.dsp + faust2jack -osc -sch -t 99999 stringSinger.dsp + faust2jack -osc subSinger.dsp + # doesn't compile on most systems, too big: + #faust2jack -osc -sch -t 99999 VocSynthFull.dsp + ''; + + installPhase = '' + mkdir -p $out/bin + cp launchers/* $out/bin/ + cp classicVocoder $out/bin/ + cp CZringmod $out/bin/ + cp FMsinger $out/bin/ + cp FOFvocoder $out/bin/ + cp Karplus-StrongSinger $out/bin/ + cp Karplus-StrongSingerMaxi $out/bin/ + cp PAFvocoder $out/bin/ + cp stringSinger $out/bin/ + cp subSinger $out/bin/ + #cp VocSynthFull $out/bin/ + mkdir $out/PureData/ + cp PureData/OscSendVoc.pd $out/PureData/OscSendVoc.pd + ''; + + meta = { + description = "Turn your voice into a synthesizer"; + homepage = https://github.com/magnetophon/VoiceOfFaust; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 915a07ffca5..d67eff7004e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12742,6 +12742,8 @@ let vnstat = callPackage ../applications/networking/vnstat { }; + VoiceOfFaust = callPackage ../applications/audio/VoiceOfFaust { }; + vorbisTools = callPackage ../applications/audio/vorbis-tools { }; vue = callPackage ../applications/misc/vue { }; From 39a9f10ccdc429b828032cc67b3cb3efdd226c9a Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 30 May 2015 14:56:23 +0200 Subject: [PATCH 084/126] init LazyLimiter at v0.3.01 --- .../audio/LazyLimiter/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/audio/LazyLimiter/default.nix diff --git a/pkgs/applications/audio/LazyLimiter/default.nix b/pkgs/applications/audio/LazyLimiter/default.nix new file mode 100644 index 00000000000..d400bea3379 --- /dev/null +++ b/pkgs/applications/audio/LazyLimiter/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, faust2jack, faust2lv2 }: +stdenv.mkDerivation rec { + name = "LazyLimiter-${version}"; + version = "0.3.01"; + + src = fetchFromGitHub { + owner = "magnetophon"; + repo = "LazyLimiter"; + rev = "v${version}"; + sha256 = "1yx9d5cakmqbiwb1j9v2af9h5lqzahl3kaamnyk71cf4i8g7zp3l"; + }; + + buildInputs = [ faust2jack faust2lv2 ]; + + buildPhase = '' + faust2jack -t 99999 LazyLimiter.dsp + faust2lv2 -t 99999 LazyLimiter.dsp + ''; + + installPhase = '' + mkdir -p $out/bin + cp LazyLimiter $out/bin/ + mkdir -p $out/lib/lv2 + cp -r LazyLimiter.lv2/ $out/lib/lv2 + ''; + + meta = { + description = "A fast yet clean lookahead limiter for jack and lv2"; + homepage = https://magnetophon.github.io/LazyLimiter/; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 915a07ffca5..739204310fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11601,6 +11601,8 @@ let caps = callPackage ../applications/audio/caps { }; + LazyLimiter = callPackage ../applications/audio/LazyLimiter { }; + lastwatch = callPackage ../applications/audio/lastwatch { }; lastfmsubmitd = callPackage ../applications/audio/lastfmsubmitd { }; From 5725d6ae7d0e197f02238f871ebbd66252bbd0a9 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 30 May 2015 17:44:33 +0200 Subject: [PATCH 085/126] init MBdistortion at v1.1 --- .../audio/MBdistortion/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/audio/MBdistortion/default.nix diff --git a/pkgs/applications/audio/MBdistortion/default.nix b/pkgs/applications/audio/MBdistortion/default.nix new file mode 100644 index 00000000000..c70ab578259 --- /dev/null +++ b/pkgs/applications/audio/MBdistortion/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, faust2jack, faust2lv2 }: +stdenv.mkDerivation rec { + name = "MBdistortion-${version}"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "magnetophon"; + repo = "MBdistortion"; + rev = "v${version}"; + sha256 = "1rmvfi48hg8ybfw517zgj3fjj2xzckrmv8x131i26vj0fv7svjsp"; + }; + + buildInputs = [ faust2jack faust2lv2 ]; + + buildPhase = '' + faust2jack -t 99999 MBdistortion.dsp + faust2lv2 -t 99999 MBdistortion.dsp + ''; + + installPhase = '' + mkdir -p $out/bin + cp MBdistortion $out/bin/ + mkdir -p $out/lib/lv2 + cp -r MBdistortion.lv2/ $out/lib/lv2 + ''; + + meta = { + description = "Mid-side multiband distortion for jack and lv2"; + homepage = https://github.com/magnetophon/MBdistortion; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 915a07ffca5..6f4fe3c33f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11703,6 +11703,8 @@ let matchbox = callPackage ../applications/window-managers/matchbox { }; + MBdistortion = callPackage ../applications/audio/MBdistortion { }; + mcpp = callPackage ../development/compilers/mcpp { }; mda_lv2 = callPackage ../applications/audio/mda-lv2 { }; From 8d924455c1ae81d35cdb3ed885984a96c31e9637 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 31 May 2015 15:51:01 +0200 Subject: [PATCH 086/126] idris-mode: update from 0.9.15 to 0.9.18 --- pkgs/applications/editors/emacs-modes/idris/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/idris/default.nix b/pkgs/applications/editors/emacs-modes/idris/default.nix index a631939b55c..2e168b3abf7 100644 --- a/pkgs/applications/editors/emacs-modes/idris/default.nix +++ b/pkgs/applications/editors/emacs-modes/idris/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "idris-mode"; - version = "0.9.15"; + version = "0.9.18"; src = fetchurl { url = "https://github.com/idris-hackers/${pname}/archive/${version}.tar.gz"; - sha256 = "0ag7qqsv64rifk9ncdxv4gyylfbw6c8y2wq610l4pabqv2qrlh9r"; + sha256 = "06rw5lrxqqnw0kni3x9jm73x352d1vb683d41v8x3yzqfa2sxmwg"; }; buildInputs = [ emacs ]; From a35161177ecccb8676caa55f3e15395925caa581 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 31 May 2015 15:54:28 +0200 Subject: [PATCH 087/126] fbida: update from 2.09 to 2.10 add meta info and adpot it --- pkgs/applications/graphics/fbida/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index 927ca2ab679..bacfa500ede 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "fbida-2.09"; + name = "fbida-2.10"; src = fetchurl { url = "http://dl.bytesex.org/releases/fbida/${name}.tar.gz"; - sha256 = "1riia87v5nsx858xnlvc7sspr1p36adjqrdch1255ikr5xbv6h6x"; + sha256 = "1dkc1d6qlfa1gn94wcbyr7ayiy728q52fvbipwmnl2mlc6n3lnks"; }; nativeBuildInputs = [ pkgconfig which ]; @@ -29,7 +29,10 @@ stdenv.mkDerivation rec { makeFlags = makeFlags ++ [ "CC=${stdenv.cross.config}-gcc" "STRIP="]; }; - meta = { + meta = with stdenv.lib; { description = "Image viewing and manipulation programs"; + homepage = https://www.kraxel.org/blog/linux/fbida/; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub ]; }; } From e0cc3efca250100bb7d821c4c564ec13f8a82921 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 31 May 2015 16:07:06 +0200 Subject: [PATCH 088/126] hevea: update from 1.07 to 2.23 add meta-information and adopt it --- pkgs/tools/typesetting/hevea/builder.sh | 14 ------------- pkgs/tools/typesetting/hevea/default.nix | 26 ++++++++++++++++++------ 2 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 pkgs/tools/typesetting/hevea/builder.sh diff --git a/pkgs/tools/typesetting/hevea/builder.sh b/pkgs/tools/typesetting/hevea/builder.sh deleted file mode 100644 index 05c93fe7da7..00000000000 --- a/pkgs/tools/typesetting/hevea/builder.sh +++ /dev/null @@ -1,14 +0,0 @@ -set -e - -source $stdenv/setup - -mkdir -p $out/bin $out/lib - -tar xvfz $src -cd hevea-* - -sed s+/usr/local+$out+ Makefile > Makefile.new -mv Makefile.new Makefile - -make -make install diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix index dfa8a43974a..1acc395dc06 100644 --- a/pkgs/tools/typesetting/hevea/default.nix +++ b/pkgs/tools/typesetting/hevea/default.nix @@ -1,9 +1,23 @@ -{stdenv, fetchurl, ocaml}: stdenv.mkDerivation { - name = "hevea-1.07"; - builder = ./builder.sh; +{ stdenv, fetchurl, ocaml }: + +stdenv.mkDerivation rec { + name = "hevea-2.23"; + src = fetchurl { - url = http://pauillac.inria.fr/~maranget/hevea/distri/hevea-1.07.tar.gz; - md5 = "561d7a2c10ea9e6a5b352c24d9b65998"; + url = "http://pauillac.inria.fr/~maranget/hevea/distri/${name}.tar.gz"; + sha256 = "1f9pj48518ixhjxbviv2zx27v4anp92zgg3x704g1s5cki2w33nv"; + }; + + buildInputs = [ ocaml ]; + + configurePhase = '' + export makeFlags="PREFIX=$out"; + ''; + + meta = with stdenv.lib; { + description = "A quite complete and fast LATEX to HTML translator"; + homepage = http://pauillac.inria.fr/~maranget/hevea/; + license = licenses.qpl; + maintainers = with maintainers; [ pSub ]; }; - buildInputs = [ocaml]; } From 59943d69f990b177c4bf47bad564e001456ce7a9 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 31 May 2015 16:13:18 +0200 Subject: [PATCH 089/126] joe: update from 3.7 to 4.0, add meta-information --- pkgs/applications/editors/joe/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/joe/default.nix b/pkgs/applications/editors/joe/default.nix index 0e97a036905..9f4d56bf8ad 100644 --- a/pkgs/applications/editors/joe/default.nix +++ b/pkgs/applications/editors/joe/default.nix @@ -1,14 +1,16 @@ -{stdenv, fetchurl} : +{ stdenv, fetchurl } : stdenv.mkDerivation rec { - name = "joe-3.7"; + name = "joe-4.0"; src = fetchurl { url = "mirror://sourceforge/joe-editor/${name}.tar.gz"; - sha256 = "0vqhffdjn3xwsfa383i6kdrpfwilq8b382ljjhy1v32smphmdr6a"; + sha256 = "0599xp90idl3dkplz72p33d2rfg0hb5yd38rhqdvz5zxfzzssmn5"; }; - meta = { + meta = with stdenv.lib; { + description = "A full featured terminal-based screen editor"; homepage = http://joe-editor.sourceforge.net; + license = licenses.gpl2; }; } From 66433822d3294e11dbe1735df151eaffa0b75684 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 31 May 2015 16:44:16 +0200 Subject: [PATCH 090/126] supertux: remove obsolete patch --- pkgs/games/super-tux/g++4.patch | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 pkgs/games/super-tux/g++4.patch diff --git a/pkgs/games/super-tux/g++4.patch b/pkgs/games/super-tux/g++4.patch deleted file mode 100644 index a7378c80a29..00000000000 --- a/pkgs/games/super-tux/g++4.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/menu.h b/src/menu.h -index 3c67c45..7c7ab8e 100644 ---- a/src/menu.h -+++ b/src/menu.h -@@ -207,7 +207,7 @@ public: - - bool isToggled(int id); - -- void Menu::get_controlfield_key_into_input(MenuItem *item); -+ void get_controlfield_key_into_input(MenuItem *item); - - void draw (); - void draw_item(int index, int menu_width, int menu_height); From bd62b7cd006e5cea4f442d341dd3236afa338df1 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 31 May 2015 16:55:26 +0200 Subject: [PATCH 091/126] tomcat: update from 6.0.39 to 6.0.44 potentially fixes CVE-2014-0227, CVE-2014-0119, CVE-2014-0099, CVE-2014-0096, CVE-2014-0075 --- pkgs/servers/http/tomcat/6.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tomcat/6.0.nix b/pkgs/servers/http/tomcat/6.0.nix index 19f20cc8823..71f1d62f4d8 100644 --- a/pkgs/servers/http/tomcat/6.0.nix +++ b/pkgs/servers/http/tomcat/6.0.nix @@ -1,6 +1,6 @@ import ./recent.nix { versionMajor = "6"; - versionMinor = "0.39"; - sha256 = "19qix6affhc252n03smjf482drg3nxd27shni1gvhphgj3zfmgfy"; + versionMinor = "0.44"; + sha256 = "0942f0ss6w9k23xg94nir2dbbkqrqp5k628jflk51ikm5qr95dxa"; } From bba6880aa67123f18b22fccce366c6864c4b8e7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 31 May 2015 17:09:42 +0200 Subject: [PATCH 092/126] snort.org: switch downloads to SourceForge On snort.org they only seem to keep the latest release, which is annoying. Fixes #8065. /cc maintainer @aycanirican. --- pkgs/applications/networking/ids/daq/default.nix | 2 +- pkgs/applications/networking/ids/snort/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix index 81a94ec540d..c4a82966238 100644 --- a/pkgs/applications/networking/ids/daq/default.nix +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { name = "${name}.tar.gz"; - url = "http://www.snort.org/downloads/snort/${name}.tar.gz"; + url = "mirror://sourceforge/snort/${name}.tar.gz"; sha256 = "0vdwb0r9kdlgj4g0i0swafbc7qik0zmks17mhqji8cl7hpdva13p"; }; diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 257b676686b..ea7e0962699 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { name = "${name}.tar.gz"; - url = "http://www.snort.org/downloads/snort/${name}.tar.gz"; + url = "mirror://sourceforge/snort/${name}.tar.gz"; sha256 = "1gmlrh9ygpd5h6nnrr4090wk5n2yq2yrvwi7q6xbm6lxj4rcamyv"; }; From e75b6ac4683a6b1b874e7d0822932c7b51d26137 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 May 2015 18:56:50 +0300 Subject: [PATCH 093/126] Add CLX-XKeayboard; fix downloads for darcs over https --- .../development/lisp-modules/lisp-packages.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 910a082b88a..6e4bf8d9624 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -40,7 +40,7 @@ let lispPackages = rec { url = "https://common-lisp.net/project/iterate/darcs/iterate"; sha256 = "0gm05s3laiivsqgqjfj1rkz83c2c0jyn4msfgbv6sz42znjpam25"; context = ./iterate.darcs-context; - }) (x: {SSL_CERT_FILE=pkgs.cacert + "/ca-bundle.crt";})); + }) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ca-bundle.crt";})); overrides = x: { configurePhase="buildPhase(){ true; }"; }; @@ -314,7 +314,7 @@ let lispPackages = rec { src = (pkgs.lib.overrideDerivation (pkgs.fetchdarcs { url = ''http://common-lisp.net/project/trivial-utf-8/darcs/trivial-utf-8/''; sha256 = "1jz27gz8gvqdmvp3k9bxschs6d5b3qgk94qp2bj6nv1d0jc3m1l1"; - }) (x: {SSL_CERT_FILE=pkgs.cacert + "/ca-bundle.crt";})); + }) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ca-bundle.crt";})); }; cl-fuse-meta-fs = buildLispPackage rec { @@ -563,5 +563,19 @@ let lispPackages = rec { rev = ''9d6f82f7121c87fb7e3b314987ba93900d300dc6''; }; }; + + clx-xkeyboard = buildLispPackage rec { + baseName = "clx-xkeyboard"; + version = "git-20150523"; + description = "CLX support for X Keyboard extensions"; + deps = [clx]; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/filonenko-mikhail/clx-xkeyboard''; + sha256 = "11b34da7d354a709a24774032e85a8947be023594f8a333eaff6d4aa79f2b3db"; + rev = ''11455d36283ef31c498bd58ffebf48c0f6b86ea6''; + }; + }; + }; in lispPackages From 81a79f9d033fbd64f3868bf350ac2b0733c9e7ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 31 May 2015 17:52:41 +0200 Subject: [PATCH 094/126] ocropus: fix chrooted check phase by patchShebangs --- pkgs/applications/misc/ocropus/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix index 821b362b365..b76852b035a 100644 --- a/pkgs/applications/misc/ocropus/default.nix +++ b/pkgs/applications/misc/ocropus/default.nix @@ -41,7 +41,7 @@ pythonPackages.buildPythonPackage { ''; checkPhase = '' - patchShebangs ./run-test + patchShebangs . substituteInPlace ./run-test \ --replace 'ocropus-rpred' 'ocropus-rpred -Q $NIX_BUILD_CORES' PATH=".:$PATH" ./run-test From d780e48b3104cd5585a87665854803e42a664941 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 31 May 2015 18:01:23 +0200 Subject: [PATCH 095/126] openjdk8: fix build by applying the patch from debian see https://www.mail-archive.com/debian-bugs-rc@lists.debian.org/msg389555.html closes #8090 --- .../compilers/openjdk/JDK-8074312-hotspot.patch | 11 +++++++++++ pkgs/development/compilers/openjdk/openjdk8.nix | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/development/compilers/openjdk/JDK-8074312-hotspot.patch diff --git a/pkgs/development/compilers/openjdk/JDK-8074312-hotspot.patch b/pkgs/development/compilers/openjdk/JDK-8074312-hotspot.patch new file mode 100644 index 00000000000..85722a1d365 --- /dev/null +++ b/pkgs/development/compilers/openjdk/JDK-8074312-hotspot.patch @@ -0,0 +1,11 @@ +diff -r 61edd5c7412e make/linux/Makefile +--- a/hotspot/make/linux/Makefile Mon Mar 02 18:12:06 2015 +0000 ++++ b/hotspot/make/linux/Makefile Tue Mar 03 15:58:13 2015 +0100 +@@ -233,7 +233,7 @@ + # Solaris 2.5.1, 2.6). + # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok. + +-SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% ++SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% 4% + OS_VERSION := $(shell uname -r) + EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION)) diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix index b0dae2512a5..c2780866161 100644 --- a/pkgs/development/compilers/openjdk/openjdk8.nix +++ b/pkgs/development/compilers/openjdk/openjdk8.nix @@ -65,6 +65,8 @@ let ./fix-java-home-jdk8.patch ./read-truststore-from-env-jdk8.patch ./currency-date-range-jdk8.patch + ./JDK-8074312-hotspot.patch + ]; preConfigure = '' chmod +x configure From c55ca3fd0b376fc4892e8a6b24691878b22a5a75 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 May 2015 18:29:46 +0200 Subject: [PATCH 096/126] cabal2nix: update to version 20150531 This update adds support for bash completion. --- pkgs/development/tools/haskell/cabal2nix/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index d14e2272614..7c36390b91e 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -2,16 +2,17 @@ , deepseq, deepseq-generics, directory, doctest, filepath, gitMinimal , hackage-db, hspec, lens, monad-par, monad-par-extras, mtl, pretty , process, QuickCheck, regex-posix, SHA, split, stdenv, transformers -, utf8-string, cartel, nix-prefetch-scripts, makeWrapper +, utf8-string, cartel, nix-prefetch-scripts, optparse-applicative +, makeWrapper }: mkDerivation rec { pname = "cabal2nix"; - version = "20150525"; + version = "20150531"; src = fetchgit { url = "http://github.com/NixOS/cabal2nix.git"; - rev = "a7998916868af0d09882468b3e43f5854082860f"; - sha256 = "07bz2z4ramrs2dmvvf6a82fliq51m61c11vmhkkz31nr09l25k6y"; + rev = "513a5fce6cfabe0b062424f6deb191a12f7e2187"; + sha256 = "1j4x85cqj823d9swi473b4i9rz9wlm9m7c1il73h02dq5i67wida"; deepClone = true; }; isExecutable = true; @@ -21,6 +22,7 @@ mkDerivation rec { aeson base bytestring Cabal containers deepseq-generics directory filepath hackage-db lens monad-par monad-par-extras mtl pretty process regex-posix SHA split transformers utf8-string cartel + optparse-applicative ]; testDepends = [ aeson base bytestring Cabal containers deepseq deepseq-generics @@ -35,6 +37,8 @@ mkDerivation rec { install -D $out/bin/cabal2nix $exe rm -rf $out/{bin,lib,share} makeWrapper $exe $out/bin/cabal2nix --prefix PATH ":" "${nix-prefetch-scripts}/bin" + mkdir -p $out/share/bash-completion/completions + $exe --bash-completion-script $out/bin/cabal2nix >$out/share/bash-completion/completions/cabal2nix ''; homepage = "http://github.com/NixOS/cabal2nix/"; description = "Convert Cabal files into Nix build instructions"; From 5a993f8d0d175537ee341c720dfa433de39f0f0e Mon Sep 17 00:00:00 2001 From: Tanner Doshier Date: Sun, 31 May 2015 11:36:56 -0500 Subject: [PATCH 097/126] minetest: LuaJIT, in-app mod store, better fonts and enable translations cURL was already a dependency, but the build was having some trouble finding the headers. Just give it a little help and the in-app mod store store actually works. The rest of the configuration brings us closer to other distros, like Fedora (LuaJIT)[1] and Debian (LuaJIT, LevelDB, FreeType, gettext)[2][3] [1] http://pkgs.fedoraproject.org/cgit/minetest.git/tree/minetest.spec#n28 [2] https://anonscm.debian.org/cgit/pkg-games/minetest-v04x.git/tree/debian/control#n9 [3] https://anonscm.debian.org/cgit/pkg-games/minetest-v04x.git/tree/debian/rules#n56 --- pkgs/games/minetest/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 79d75011ff0..72673ea010c 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchgit, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp -, libjpeg, libXxf86vm, mesa, openal, libvorbis, x11, sqlite }: +, libjpeg, libXxf86vm, mesa, openal, libvorbis, x11, sqlite, luajit, freetype +, gettext +}: let version = "0.4.12"; @@ -21,12 +23,15 @@ in stdenv.mkDerivation { src = sources.src; cmakeFlags = [ + "-DENABLE_FREETYPE=1" + "-DENABLE_GETTEXT=1" + "-DCURL_INCLUDE_DIR=${curl}/include/curl" "-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht" ]; buildInputs = [ - cmake irrlicht libpng bzip2 libjpeg curl libogg jsoncpp - libXxf86vm mesa openal libvorbis x11 sqlite + cmake irrlicht libpng bzip2 libjpeg curl libogg jsoncpp libXxf86vm mesa + openal libvorbis x11 sqlite luajit freetype gettext ]; postInstall = '' From 7d2b98370f23461d5444a664af69ac3b8eb00c65 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 May 2015 19:37:23 +0300 Subject: [PATCH 098/126] ca-bundle.crt is now in the root irectory of the cacert package --- pkgs/development/lisp-modules/lisp-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 6e4bf8d9624..32f5928cccd 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -40,7 +40,7 @@ let lispPackages = rec { url = "https://common-lisp.net/project/iterate/darcs/iterate"; sha256 = "0gm05s3laiivsqgqjfj1rkz83c2c0jyn4msfgbv6sz42znjpam25"; context = ./iterate.darcs-context; - }) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ca-bundle.crt";})); + }) (x: {SSL_CERT_FILE=pkgs.cacert + "/ca-bundle.crt";})); overrides = x: { configurePhase="buildPhase(){ true; }"; }; @@ -314,7 +314,7 @@ let lispPackages = rec { src = (pkgs.lib.overrideDerivation (pkgs.fetchdarcs { url = ''http://common-lisp.net/project/trivial-utf-8/darcs/trivial-utf-8/''; sha256 = "1jz27gz8gvqdmvp3k9bxschs6d5b3qgk94qp2bj6nv1d0jc3m1l1"; - }) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ca-bundle.crt";})); + }) (x: {SSL_CERT_FILE=pkgs.cacert + "/ca-bundle.crt";})); }; cl-fuse-meta-fs = buildLispPackage rec { From 53b5d946e15b7865d5aefb1bd566bca475727e7c Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 31 May 2015 18:41:34 +0200 Subject: [PATCH 099/126] doc: add section ids This commit also use enforces consistent use of the prefixes "sec" for section and "ssec" for subsection. --- doc/coding-conventions.xml | 6 +++--- doc/language-support.xml | 28 ++++++++++++++-------------- doc/meta.xml | 3 ++- doc/package-notes.xml | 2 +- doc/packageconfig.xml | 3 ++- doc/stdenv.xml | 30 +++++++++++++++++------------- 6 files changed, 39 insertions(+), 33 deletions(-) diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml index 68b075959c9..b041a73d818 100644 --- a/doc/coding-conventions.xml +++ b/doc/coding-conventions.xml @@ -5,7 +5,7 @@ Coding conventions -
Syntax +
Syntax @@ -207,7 +207,7 @@ args.stdenv.mkDerivation (args // {
-
Package naming +
Package naming In Nixpkgs, there are generally three different names associated with a package: @@ -292,7 +292,7 @@ dashes between words — not in camel case. For instance, it should be allPackages.nix or AllPackages.nix. -
Hierarchy +
Hierarchy Each package should be stored in its own directory somewhere in the pkgs/ tree, i.e. in diff --git a/doc/language-support.xml b/doc/language-support.xml index 1e1bdf75eda..14e8aa7a7ba 100644 --- a/doc/language-support.xml +++ b/doc/language-support.xml @@ -13,7 +13,7 @@ in Nixpkgs to easily build packages for other programming languages, such as Perl or Haskell. These are described in this chapter. -
Perl +
Perl Nixpkgs provides a function buildPerlPackage, a generic package builder function for any Perl package that has a @@ -151,7 +151,7 @@ ClassC3Componentised = buildPerlPackage rec { -
Generation from CPAN +
Generation from CPAN Nix expressions for Perl packages can be generated (almost) automatically from CPAN. This is done by the program @@ -191,7 +191,7 @@ you need it.
-
Python +
Python Currently supported interpreters are python26, python27, @@ -276,7 +276,7 @@ are provided with all modules included. -
<varname>buildPythonPackage</varname> function +
<varname>buildPythonPackage</varname> function The function is implemented in @@ -438,7 +438,7 @@ twisted = buildPythonPackage {
-
<function>python.buildEnv</function> function +
<function>python.buildEnv</function> function Create Python environments using low-level pkgs.buildEnv function. Example default.nix: @@ -484,7 +484,7 @@ python.buildEnv.override {
-
Tools +
Tools Packages inside nixpkgs are written by hand. However many tools exist in community to help save time. No tool is preferred at the moment. @@ -511,7 +511,7 @@ exist in community to help save time. No tool is preferred at the moment.
-
Development +
Development To develop Python packages buildPythonPackage has @@ -555,7 +555,7 @@ buildPythonPackage {
-
FAQ +
FAQ @@ -597,7 +597,7 @@ sed -i '/ = data_files/d' setup.py
-
Contributing guidelines +
Contributing guidelines Following rules are desired to be respected: @@ -625,7 +625,7 @@ sed -i '/ = data_files/d' setup.py
-
Ruby +
Ruby There currently is support to bundle applications that are packaged as Ruby gems. The utility "bundix" allows you to write a Gemfile, let bundler create a Gemfile.lock, and then convert this into a nix expression that contains all Gem dependencies automatically. @@ -666,7 +666,7 @@ and scalable.";
-
Go +
Go The function buildGoPackage builds standard Go packages. @@ -787,7 +787,7 @@ done
-
Java +
Java Ant-based Java packages are typically built from source as follows: @@ -868,7 +868,7 @@ Runtime) instead of the OpenJRE.
-
Lua +
Lua Lua packages are built by the buildLuaPackage function. This function is @@ -915,7 +915,7 @@ fileSystem = buildLuaPackage {
-
Coq +
Coq Coq libraries should be installed in $(out)/lib/coq/${coq.coq-version}/user-contrib/. diff --git a/doc/meta.xml b/doc/meta.xml index a0ed3069b68..14a01ccb3c0 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -82,7 +82,8 @@ hello-2.3 A program that produces a familiar, friendly greeting -
Standard meta-attributes +
Standard +meta-attributes It is expected that each meta-attribute is one of the following: diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 8a35e640324..ecaf619472d 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -141,7 +141,7 @@ $ make menuconfig ARCH=arch -
+
X.org diff --git a/doc/packageconfig.xml b/doc/packageconfig.xml index 44ce1974c6c..4e0fcc3b6a4 100644 --- a/doc/packageconfig.xml +++ b/doc/packageconfig.xml @@ -67,7 +67,8 @@ lib/licenses.nix of the nix package tree. -
Modify packages via <literal>packageOverrides</literal> +
Modify +packages via <literal>packageOverrides</literal> diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 6fdebda09f9..58310834fd2 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -15,7 +15,8 @@ environment does everything automatically. If can easily customise or override the various build phases. -
Using <literal>stdenv</literal> +
Using +<literal>stdenv</literal> To build a package with the standard environment, you use the function stdenv.mkDerivation, instead of the @@ -124,7 +125,8 @@ genericBuild
-
Tools provided by <literal>stdenv</literal> +
Tools provided by +<literal>stdenv</literal> The standard environment provides the following packages: @@ -225,7 +227,7 @@ genericBuild
-
Phases +
Phases The generic builder has a number of phases. Package builds are split into phases to make it easier to override @@ -243,7 +245,8 @@ is convenient to override a phase from the derivation, while the latter is convenient from a build script. -
Controlling phases +
Controlling +phases There are a number of variables that control what phases are executed and in what order: @@ -327,7 +330,7 @@ executed and in what order:
-
The unpack phase +
The unpack phase The unpack phase is responsible for unpacking the source code of the package. The default implementation of @@ -434,7 +437,7 @@ Additional file types can be supported by setting the
-
The patch phase +
The patch phase The patch phase applies the list of patches defined in the patches variable. @@ -477,7 +480,7 @@ Additional file types can be supported by setting the
-
The configure phase +
The configure phase The configure phase prepares the source tree for building. The default configurePhase runs @@ -573,7 +576,7 @@ script) if it exists.
-
The build phase +
The build phase The build phase is responsible for actually building the package (e.g. compiling it). The default buildPhase @@ -657,7 +660,7 @@ called, respectively.
-
The check phase +
The check phase The check phase checks whether the package was built correctly by running its test suite. The default @@ -717,7 +720,7 @@ doCheck = true;
-
The install phase +
The install phase The install phase is responsible for installing the package in the Nix store under out. The default @@ -772,7 +775,7 @@ installTargets = "install-bin install-doc";
-
The fixup phase +
The fixup phase The fixup phase performs some (Nix-specific) post-processing actions on the files installed under $out by the @@ -895,7 +898,8 @@ following:
-
The distribution phase +
The distribution +phase The distribution phase is intended to produce a source distribution of the package. The default @@ -1199,7 +1203,7 @@ echo @foo@
-
Purity in Nixpkgs +
Purity in Nixpkgs [measures taken to prevent dependencies on packages outside the store, and what you can do to prevent them] From 3296b5e6b12b15d5bd298d684329cfdd7642e10a Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 31 May 2015 18:59:38 +0200 Subject: [PATCH 100/126] luastdlib: fix build by adding autoreconfHook --- pkgs/top-level/lua-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 273a0e7ecc1..84befe7f652 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -7,7 +7,7 @@ { fetchurl, fetchzip, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo -, perl, gtk, python, glib, gobjectIntrospection, libevent, zlib +, perl, gtk, python, glib, gobjectIntrospection, libevent, zlib, autoreconfHook }: let @@ -242,7 +242,7 @@ let url = "https://github.com/lua-stdlib/lua-stdlib/archive/release.zip"; sha256 = "0636absdfjx8ybglwydmqxwfwmqz1c4b9s5mhxlgm4ci18lw3hms"; }; - buildInputs = [ unzip ]; + buildInputs = [ autoreconfHook unzip ]; meta = { homepage = "https://github.com/lua-stdlib/lua-stdlib/"; hydraPlatforms = stdenv.lib.platforms.linux; From 9e68371f510fa87007b0c51ad3c58f12d7484030 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 30 May 2015 16:38:09 +0200 Subject: [PATCH 101/126] smtube: update from 15.5.10 to 15.5.17 --- pkgs/applications/video/smtube/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix index 37cae1cd0ed..3180a9e632a 100644 --- a/pkgs/applications/video/smtube/default.nix +++ b/pkgs/applications/video/smtube/default.nix @@ -1,11 +1,14 @@ { stdenv, fetchurl, qt4 }: stdenv.mkDerivation rec { - name = "smtube-15.5.10"; + versionMajor = "15.5"; + versionMinor = "17"; + version = "${versionMajor}.${versionMinor}"; + name = "smtube-${version}"; src = fetchurl { - url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "1if2b0h6snfmj5hnx4cs55zjbdvwagx95jv62f2jgh3m5gis0cbz"; + url = "mirror://sourceforge/smtube/SMTube/${versionMajor}/${name}.tar.bz2"; + sha256 = "0jbik41nb1b7381ybzblmmsl8b7ljl6a2zpn1dcg0cccjw5mnbyg"; }; makeFlags = [ From 2af5c8d75f3c905fdba59bc7a9970d586009ebfe Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 30 May 2015 16:54:43 +0200 Subject: [PATCH 102/126] qarte: minor update to rev. 147 --- pkgs/applications/video/qarte/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix index a7e8cd8c1b9..c8056512c79 100644 --- a/pkgs/applications/video/qarte/default.nix +++ b/pkgs/applications/video/qarte/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchbzr, python, pyqt4, sip, rtmpdump, makeWrapper }: stdenv.mkDerivation { - name = "qarte-2.2.0"; + name = "qarte-2.2.0-147"; src = fetchbzr { url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/trunk; - rev = "146"; - sha256 = "0vqhxrzb3d7id81sr02h78hn0m7k2x0yxk9cl36pr5vx3vjnsyi9"; + rev = "147"; + sha256 = "0cl3k3vr3kmp5dls0lbv5pka4zrlyh5816pwl5rkgqmycl11pk51"; }; buildInputs = [ makeWrapper ]; From 3838f1d490d759f013072abe8bc1673b5c3c4907 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 31 May 2015 19:10:36 +0200 Subject: [PATCH 103/126] firestr: fix build (qt5.multimedia was missing) --- .../networking/p2p/firestr/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/p2p/firestr/default.nix b/pkgs/applications/networking/p2p/firestr/default.nix index 65ec54cf0f7..e7be81def61 100644 --- a/pkgs/applications/networking/p2p/firestr/default.nix +++ b/pkgs/applications/networking/p2p/firestr/default.nix @@ -4,8 +4,6 @@ stdenv.mkDerivation { name = "firestr-0.8"; - buildInputs = [ cmake boost botan snappy libopus libuuid qt5.base libXScrnSaver openssl ]; - src = fetchFromGitHub { owner = "mempko"; repo = "firestr"; @@ -13,23 +11,25 @@ stdenv.mkDerivation { sha256 = "0s2kdi8rw3i3f8gbiy0ykyi6xj5n8p80m0d1i86mhh8jpagvbfzb"; }; + buildInputs = [ cmake boost botan snappy libopus libuuid qt5.base qt5.multimedia + libXScrnSaver openssl ]; + patches = ./return.patch; - postPatch = - '' + postPatch = '' substituteInPlace CMakeLists.txt \ --replace "set(Boost_USE_STATIC_LIBS on)" "" \ --replace "/usr/include/botan" "${botan}/include/botan" \ --replace "libopus.a" "libopus.so" \ --replace "libsnappy.a" "libsnappy.so" \ --replace "libbotan-1.10.a" "libbotan-1.10.so.0" - ''; + ''; - meta = with stdenv.lib; - { description = "Grass computing platform"; - homepage = http://firestr.com/; - license = licenses.gpl3; - maintainers = [ maintainers.emery ]; - platforms = platforms.linux; - }; + meta = with stdenv.lib; { + description = "Grass computing platform"; + homepage = http://firestr.com/; + license = licenses.gpl3; + maintainers = [ maintainers.emery ]; + platforms = platforms.linux; + }; } From ed9455838cff55b6b6cc118b38666bc28fb4d5b8 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 31 May 2015 20:25:11 +0200 Subject: [PATCH 104/126] checkstyle: update from 6.6 to 6.7 --- pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index f757d0e9619..3addd0f5a25 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "6.6"; + version = "6.7"; name = "checkstyle-${version}"; src = fetchurl { url = "mirror://sourceforge/checkstyle/${version}/${name}-bin.tar.gz"; - sha256 = "1pniql23f8fsr7yhcxvrc65rdynrwpwl6vxl2jdsj4a37br8mr0d"; + sha256 = "0na3gfkxzgnnbjvr4sys4x3mb1s1hn9xy9krmvnxqq0wmm4lysjd"; }; installPhase = '' From 27eeeb9acb434707eae4f39bda23ab8e33b93166 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 31 May 2015 22:01:11 +0200 Subject: [PATCH 105/126] libaccounts-glib 1.16 -> 1.18 Development has moved from Google Code to Gitlab. --- .../libraries/libaccounts-glib/default.nix | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix index b3217e66275..aa029ede953 100644 --- a/pkgs/development/libraries/libaccounts-glib/default.nix +++ b/pkgs/development/libraries/libaccounts-glib/default.nix @@ -1,15 +1,25 @@ -{ stdenv, fetchurl, glib, libxml2, libxslt, pkgconfig, sqlite }: +{ stdenv, fetchFromGitLab, autoconf, automake, glib +, gtk_doc, libtool, libxml2, libxslt, pkgconfig, sqlite }: +let version = "1.18"; in stdenv.mkDerivation rec { - name = "libaccounts-glib-1.16"; - src = fetchurl { - url = "https://accounts-sso.googlecode.com/files/${name}.tar.gz"; - sha256 = "0hgvk9rdfvk47c54rvcp3hq74yy7v6w1ql71q2mik8lmsx22354a"; + name = "libaccounts-glib-${version}"; + + src = fetchFromGitLab { + sha256 = "02p23vrqhw2l2w6nrwlk4bqxf7z9kplkc2d43716x9xakxr291km"; + rev = version; + repo = "libaccounts-glib"; + owner = "accounts-sso"; }; buildInputs = [ glib libxml2 libxslt sqlite ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoconf automake gtk_doc libtool pkgconfig ]; - configurePhase = ''HAVE_GCOV_FALSE='#' ./configure $configureFlags --prefix=$out''; + postPatch = '' + NOCONFIGURE=1 ./autogen.sh + ''; + configurePhase = '' + HAVE_GCOV_FALSE="#" ./configure $configureFlags --prefix=$out + ''; } From b43f5d388118e55d4b1090b41682c74ec16c4db1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 31 May 2015 22:01:52 +0200 Subject: [PATCH 106/126] accounts-qt: don't cast to string for no reason --- pkgs/development/libraries/accounts-qt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index c0e40472902..824a2949492 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { sha256 = "1gpkgw05dwsf2wk5cy3skgss3kw6mqh7iv3fadrxqxfc1za1xmyl"; - rev = "${version}"; + rev = version; repo = "libaccounts-qt"; owner = "accounts-sso"; }; From e9f9d1c0293aaad0d3ef777eef9d38b3bf622f4c Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 31 May 2015 22:38:44 +0200 Subject: [PATCH 107/126] Bump 'svtplay-dl' to version 0.10.2015.05.24. Also switch to `fetchFromGitHub` from plain `fetchurl`. --- pkgs/tools/misc/svtplay-dl/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index a30f0277ec0..d84d00e2ba2 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchurl, makeWrapper, python, perl, zip +{ stdenv, fetchFromGitHub, makeWrapper, python, perl, zip , rtmpdump, nose, mock, pycrypto, substituteAll }: stdenv.mkDerivation rec { name = "svtplay-dl-${version}"; - version = "0.10.2015.03.25"; + version = "0.10.2015.05.24"; - src = fetchurl { - url = "https://github.com/spaam/svtplay-dl/archive/${version}.tar.gz"; - sha256 = "0j0fg3qrldpaf880v488rr2snw6ghpdln4l9mbvmi70rjzzxv4ap"; + src = fetchFromGitHub { + owner = "spaam"; + repo = "svtplay-dl"; + rev = version; + sha256 = "0dzd5n4zvrplvm3sx017ym7jlngp4pn8nra9qx9n4wq6h4c6n6a5"; }; pythonPaths = [ pycrypto ]; From bd3e1623116e8f23e70f85388905a14b04ae196b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lengyel=20Bal=C3=A1zs?= Date: Sun, 31 May 2015 22:49:15 +0200 Subject: [PATCH 108/126] Inital Commit for Gnu Talk Filters --- pkgs/misc/talkfilters/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/misc/talkfilters/default.nix diff --git a/pkgs/misc/talkfilters/default.nix b/pkgs/misc/talkfilters/default.nix new file mode 100644 index 00000000000..f2fda02f9ae --- /dev/null +++ b/pkgs/misc/talkfilters/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +let + name = "talkfilters"; + version = "2.3.8"; +in + +stdenv.mkDerivation { + name = "${name}"; + + src = fetchurl { + url = "http://www.hyperrealm.com/${name}/${name}-${version}.tar.gz"; + sha256 = "19nc5vq4bnkjvhk8srqddzhcs93jyvpm9r6lzjzwc1mgf08yg0a6"; + }; + + meta = { + description = "Converts English text into text that mimics a stereotyped or humorous dialect"; + homepage = "http://http://www.hyperrealm.com/${name}"; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ ikervagyok ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 915a07ffca5..357a318e433 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2935,6 +2935,8 @@ let t1utils = callPackage ../tools/misc/t1utils { }; + talkfilters = callPackage ../misc/talkfilters {}; + tarsnap = callPackage ../tools/backup/tarsnap { }; tcpcrypt = callPackage ../tools/security/tcpcrypt { }; From abecf4aca1e77cfcceb7f439ff7428f1146d8522 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 30 May 2015 21:25:03 -0700 Subject: [PATCH 109/126] bitlbee: 3.2.2 -> 3.4.0 --- .../networking/instant-messengers/bitlbee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index 805a47fc058..43d11f0a8ff 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -2,11 +2,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "bitlbee-3.2.2"; + name = "bitlbee-3.4"; src = fetchurl { url = "mirror://bitlbee/src/${name}.tar.gz"; - sha256 = "13jmcxxgli82wb2n4hs091159xk8rgh7nb02f478lgpjh6996f5s"; + sha256 = "0plx4dryf8i6hz7vghg84z5f6w6rkw1l8ckl4c4wh5zxpd3ddfnf"; }; buildInputs = [ gnutls glib pkgconfig libotr ] From 98fb54a6dc908705ef4cb4f8228640a512848e8f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 30 May 2015 21:25:13 -0700 Subject: [PATCH 110/126] gss: 1.0.2 -> 1.0.3 --- pkgs/development/libraries/gss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix index 71652e3cae3..a748d958269 100644 --- a/pkgs/development/libraries/gss/default.nix +++ b/pkgs/development/libraries/gss/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "gss-1.0.2"; + name = "gss-1.0.3"; src = fetchurl { url = "mirror://gnu/gss/${name}.tar.gz"; - sha256 = "1qa8lbkzi6ilfggx7mchfzjnchvhwi68rck3jf9j4425ncz7zsd9"; + sha256 = "1syyvh3k659xf1hdv9pilnnhbbhs6vfapayp4xgdcc8mfgf9v4gz"; }; buildInputs = [ shishi ]; From f99ec984d797b47f5a836e1bdf3ef344b5546072 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 30 May 2015 22:55:17 -0700 Subject: [PATCH 111/126] gnupg21: 2.1.3 -> 2.1.4 --- pkgs/tools/security/gnupg/21.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index 71e5282e85b..31a6bd2c460 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -13,11 +13,11 @@ with stdenv.lib; assert x11Support -> pinentry != null; stdenv.mkDerivation rec { - name = "gnupg-2.1.3"; + name = "gnupg-2.1.4"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1vf8fmwcq81abzw2mypz5j7m4xy0vl4z6lri5lxfbd2bsyq7ygi1"; + sha256 = "1c3c89b7ziknz6h1dnwmfjhgyy28g982rcncrhmhylb8v3npw4k4"; }; patches = [ ./socket-activate-2.1.1.patch ]; From 18237ff377156cad03c77cc954c746a242653dd3 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 31 May 2015 14:17:09 -0700 Subject: [PATCH 112/126] musl: 1.1.8 -> 1.1.9 --- pkgs/os-specific/linux/musl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 1dae1d215ec..392a3c4049a 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "musl-${version}"; - version = "1.1.8"; + version = "1.1.9"; src = fetchurl { url = "http://www.musl-libc.org/releases/${name}.tar.gz"; - sha256 = "04vq4a1hm81kbxfcqa30s6xpzbqf3568gbysfxcmb72v8438b4ps"; + sha256 = "0gi8638c5gh9i4gsihfczigg78l2q0hd9c3ws26chwprr9rp3gq0"; }; enableParallelBuilding = true; From f47d22a6f1e969b93868583af448e4cb1a1665c8 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 31 May 2015 17:07:44 -0500 Subject: [PATCH 113/126] nixpkgs: verilator 3.872 Signed-off-by: Austin Seipp --- .../science/electronics/verilator/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/science/electronics/verilator/default.nix diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix new file mode 100644 index 00000000000..635e89dadc8 --- /dev/null +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, perl, flex, bison }: + +stdenv.mkDerivation rec { + name = "verilator-${version}"; + version = "3.872"; + + src = fetchurl { + url = "http://www.veripool.org/ftp/${name}.tgz"; + sha256 = "113ha7vy6lsi9zygiy3rnsd3dhi5y8lkfsfrh0nwzady7147l2yh"; + }; + + enableParallelBuilding = true; + buildInputs = [ perl flex bison ]; + + meta = { + description = "Fast and robust (System)Verilog simulator/compiler"; + homepage = "http://www.veripool.org/wiki/verilator"; + license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9a2f989113..36350480fb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3079,6 +3079,8 @@ let vcsh = callPackage ../applications/version-management/vcsh { }; + verilator = callPackage ../applications/science/electronics/verilator {}; + verilog = callPackage ../applications/science/electronics/verilog {}; vfdecrypt = callPackage ../tools/misc/vfdecrypt { }; From ec7f3fb516e7af55704f63c950c4c4aa256b0e0d Mon Sep 17 00:00:00 2001 From: codyopel Date: Sun, 31 May 2015 19:47:59 -0400 Subject: [PATCH 114/126] libass: 0.12.1 -> 0.12.2 --- pkgs/development/libraries/libass/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 77742c3d625..502f95dca9a 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, pkgconfig, yasm -, freetype ? null -, fribidi ? null +, freetype, fribidi , encaSupport ? true, enca ? null # enca support , fontconfigSupport ? true, fontconfig ? null # fontconfig support , harfbuzzSupport ? true, harfbuzz ? null # harfbuzz support @@ -8,19 +7,18 @@ , largeTilesSupport ? false # Use larger tiles in the rasterizer }: -assert ((freetype != null) && (fribidi != null)); -assert encaSupport -> (enca != null); -assert fontconfigSupport -> (fontconfig != null); -assert harfbuzzSupport -> (harfbuzz != null); +assert encaSupport -> enca != null; +assert fontconfigSupport -> fontconfig != null; +assert harfbuzzSupport -> harfbuzz != null; with stdenv.lib; stdenv.mkDerivation rec { name = "libass-${version}"; - version = "0.12.1"; + version = "0.12.2"; src = fetchurl { url = "https://github.com/libass/libass/releases/download/${version}/${name}.tar.xz"; - sha256 = "1mwj2nk9g6cq6f8m1hf0ijg1299rghhy9naahqq43sc2whblb1l7"; + sha256 = "1qzibgqmnnqk2r116lpk1br764g0v74f2zp12y5id0p1plaing37"; }; configureFlags = [ From a9af62f38b39f3d88d5fb5514ab67d2c4ead5d7e Mon Sep 17 00:00:00 2001 From: codyopel Date: Sun, 31 May 2015 19:54:03 -0400 Subject: [PATCH 115/126] v4l-utils: 1.6.2 -> 1.6.3 --- pkgs/os-specific/linux/v4l-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 1a27ae8f571..17b21f92c17 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -16,11 +16,11 @@ let in stdenv.mkDerivation rec { - name = "v4l-utils-1.6.2"; + name = "v4l-utils-1.6.3"; src = fetchurl { url = "http://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2"; - sha256 = "0zdyjrja2mkqlijpdb4gz1vw0g7pslswmgqqsgri3yq408gypmnk"; + sha256 = "0k46z5gqjzg702m2vs4sv6sxynq1sj14m0pgwvl2gkgg3dfbyjhn"; }; configureFlags = [ From 75f64a8bc4c112bb7a71409aea84c0bd05114356 Mon Sep 17 00:00:00 2001 From: codyopel Date: Sun, 31 May 2015 20:28:31 -0400 Subject: [PATCH 116/126] tcpdump: 4.7.3 -> 4.7.4 --- pkgs/tools/networking/tcpdump/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 231d7e293b8..4edfdf6af1e 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpcap, enableStatic ? false }: stdenv.mkDerivation rec { - name = "tcpdump-4.7.3"; + name = "tcpdump-4.7.4"; src = fetchurl { url = "http://www.tcpdump.org/release/${name}.tar.gz"; - sha256 = "1kla3l7lja8cfwimp512x7z176x2dsy03ih6g8gd95p95ijzp1qz"; + sha256 = "1byr8w6grk08fsq0444jmcz9ar89lq9nf4mjq2cny0w9k8k21rbb"; }; buildInputs = [ libpcap ]; From 7d42461e5d6d76d56b5de997d4e425c648f0cfc7 Mon Sep 17 00:00:00 2001 From: codyopel Date: Sun, 31 May 2015 20:35:10 -0400 Subject: [PATCH 117/126] ncmpcpp: 0.6.3 -> 0.6.4 --- pkgs/applications/audio/ncmpcpp/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index bf437584559..5069795cafe 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -15,11 +15,11 @@ assert taglibSupport -> (taglib != null); with stdenv.lib; stdenv.mkDerivation rec { name = "ncmpcpp-${version}"; - version = "0.6.3"; + version = "0.6.4"; src = fetchurl { url = "http://ncmpcpp.rybczak.net/stable/${name}.tar.bz2"; - sha256 = "00r2f7psd2jym2lxf3q3lz2lskz7091pz9glnxqam2bznwnlyxyp"; + sha256 = "1w85r23s0b30vh03xybnjikslqcf02gsciib9v10jw71nw32wzkm"; }; configureFlags = [ "BOOST_LIB_SUFFIX=" ] @@ -30,7 +30,9 @@ stdenv.mkDerivation rec { ++ optional curlSupport "--with-curl" ++ optional taglibSupport "--with-taglib"; - buildInputs = [ boost mpd_clientlib ncurses pkgconfig readline libiconv ] + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ boost mpd_clientlib ncurses readline libiconv ] ++ optional curlSupport curl ++ optional visualizerSupport fftw ++ optional taglibSupport taglib; From 987fb76dc1f991c6a7ffb12950884ead74895249 Mon Sep 17 00:00:00 2001 From: codyopel Date: Sun, 31 May 2015 20:45:42 -0400 Subject: [PATCH 118/126] youtube-dl: 2015.05.20 -> 2015.05.29 --- 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 5171d5cec5a..1a513cdaece 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "youtube-dl-${version}"; - version = "2015.05.20"; + version = "2015.05.29"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "1crfada7vq3d24062wr06sfam66cf14j06wnhg7w5ljzrbynvpll"; + sha256 = "0lgxir2i5ipplg57wk8gnbbsdrk7szqnyb1bxr97f3h0rbm4dfij"; }; nativeBuildInputs = [ pandoc ]; From fbf7ff8b7f4f98ec758b35dc170e42fc23200159 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Jun 2015 02:14:59 +0200 Subject: [PATCH 119/126] stress-ng 0.04.03 -> 0.04.03 --- pkgs/tools/system/stress-ng/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index e624991dc42..ebe6306120e 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, attr }: -let version = "0.04.03"; in +let version = "0.04.04"; in stdenv.mkDerivation rec { name = "stress-ng-${version}"; src = fetchurl { - sha256 = "0slr7mk8yq9h8xsrmp6ysjhng0an30pj6p56q9ygabwymbp1a33l"; + sha256 = "1rq78s4xrylm63xygakrvjg5g774qmm968p0v69x2c795dv3s8di"; url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - installFlags = [ "DESTDIR=$(out)" ]; + installFlags = "DESTDIR=$(out)"; meta = with stdenv.lib; { inherit version; From 484e903da31e47d4db068419f418b1389a389f2e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Jun 2015 04:00:43 +0200 Subject: [PATCH 120/126] vim-plugins: vim-wakatime -> 4.0.1 - upgrade wakatime cli to v4.0.14 - make sure config file has api_key - only display setup complete message first time setting up cfg file - don't log time towards git temporary files - prevent slowness in quickfix window to fix #24 - reuse SSL connection across multiple processes for improved performance - correctly display caller and lineno in log file when debug is true - project passed with --project argument will always be used - new --alternate-project argument - fix bug with auto detecting project name - correctly log message from py.warnings module - handle plugin_directory containing spaces --- pkgs/misc/vim-plugins/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 0ff38209867..a1a78e9fb64 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -527,12 +527,12 @@ rec { ''; }; - wakatime = buildVimPlugin { - name = "wakatime-4.0.0"; + vim-wakatime = buildVimPlugin { + name = "vim-wakatime-4.0.1"; src = fetchFromGitHub { - sha256 = "0yfqcln1ah7a9hs6vl8llfyg5rzg1zbsf3y431wdgb0zvp9dlk25"; - rev = "a7d48d3507499b8667bfca0b12f8865c01b26678"; + sha256 = "0vhnfjl9qv6qwfvf106cw4mg4xss2nsafz5k2jadkryss6f3ga10"; + rev = "1e2ba90f708965719ed52c4ea2728bc3cfa32f6d"; repo = "vim-wakatime"; owner = "wakatime"; }; From cf8ea81fe4bd933abc8226e771dea44f2b533b90 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Jun 2015 02:21:42 +0200 Subject: [PATCH 121/126] dpkg 1.18.0 -> 1.18.1 --- pkgs/tools/package-management/dpkg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index d3a08f044d5..e5be41ed7f6 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper }: -let version = "1.18.0"; in +let version = "1.18.1"; in stdenv.mkDerivation { name = "dpkg-${version}"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "0ni25w0cxfz3szccqxq7l1gvcwg48vdvl63aajmbigsvxnz6y5bv"; + sha256 = "1nlr0djn5zl9cmlcxxmd7dk3fx0zw9gi4qm7cfz0r5qwl9yaj9nb"; }; postPatch = '' From 8c4bf0f93184e5d836ef806e7d967f66e89c3168 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Jun 2015 02:19:11 +0200 Subject: [PATCH 122/126] python-packages: prompt_toolkit 0.37 -> 0.38 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c284839fb37..ab452a562d9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8722,11 +8722,11 @@ let prompt_toolkit = buildPythonPackage rec { name = "prompt_toolkit-${version}"; - version = "0.37"; + version = "0.38"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz"; - sha256 = "0nb87j4dgv16wf998ga8ia4fwd3p9wizrx3m7h0rwqcpn2x0l3v8"; + sha256 = "0rjy5n79h8sc6wpw6nwys52rin7i4qlfy51y7vws303mficjkvkc"; }; buildInputs = with self; [ jedi ipython pygments ]; From 13cc88f273f0cb6d13e39ecf61775c29dde6d21c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Jun 2015 04:09:30 +0200 Subject: [PATCH 123/126] netsniff-ng -> 0.5.9-5-g107456c Provides more detailed rtnl dumps. --- pkgs/tools/networking/netsniff-ng/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index c391bb9ecb0..44c8bb45b72 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -2,7 +2,7 @@ , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl , pkgconfig, zlib }: -let version = "0.5.9"; in +let version = "0.5.9-5-g107456c"; in stdenv.mkDerivation { name = "netsniff-ng-${version}"; @@ -10,8 +10,8 @@ stdenv.mkDerivation { src = fetchFromGitHub rec { repo = "netsniff-ng"; owner = repo; - rev = "9118e9e8673eb88ebf4f7af33d8ed9856f3ed554"; - sha256 = "0zxwkpaad0mjgkhgnii4bj8sfji3inqqf1zqbv7807nk34bqr6qp"; + rev = "107456c646ab38e5ccb6ee788389faced59c16ff"; + sha256 = "0i0b2595x4cprf9d4crwjn3qvswz2qxr905zpcwxa3qan6hrmnsp"; }; buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl From 8bea2bc5bb66dc1d9b916a6b41e9e3aa18a9247e Mon Sep 17 00:00:00 2001 From: Pavan Rikhi Date: Fri, 29 May 2015 04:41:30 -0400 Subject: [PATCH 124/126] pencil: v2.0.10 -> v2.0.11 --- pkgs/applications/graphics/pencil/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix index fc1b5795d40..e6e72cfd6e6 100644 --- a/pkgs/applications/graphics/pencil/default.nix +++ b/pkgs/applications/graphics/pencil/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, xulrunner }: stdenv.mkDerivation rec { - version = "2.0.10"; + version = "2.0.11"; name = "pencil-${version}"; src = fetchurl { url = "https://github.com/prikhi/pencil/releases/download/v${version}/Pencil-${version}-linux-pkg.tar.gz"; - sha256 = "b5dcb12986108bf3eb13cdd1ee1fc1f8d1a88c7fadf2a5c44e7a59a254f2b0dd"; + sha256 = "a35d1353de6665cbd4a5bd821dcdf7439f2a3c1fcbccee0f01ec8dd1bb67c4f3"; + }; buildPhase = ""; From 7edb27b7af6ebff7e35207f7fcf16e0e2bd8884a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 21 May 2015 14:47:08 +0200 Subject: [PATCH 125/126] Hide the option fonts.enableCoreFonts We shouldn't have options that simply enable a package. --- nixos/modules/config/fonts/corefonts.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/config/fonts/corefonts.nix b/nixos/modules/config/fonts/corefonts.nix index ad797087932..b9f69879a10 100644 --- a/nixos/modules/config/fonts/corefonts.nix +++ b/nixos/modules/config/fonts/corefonts.nix @@ -1,3 +1,6 @@ +# This module is deprecated, since you can just say ‘fonts.fonts = [ +# pkgs.corefonts ];’ instead. + { config, lib, pkgs, ... }: with lib; @@ -9,6 +12,7 @@ with lib; fonts = { enableCoreFonts = mkOption { + visible = false; default = false; description = '' Whether to include Microsoft's proprietary Core Fonts. These fonts From 5afa4f18d6173725d593e59f1c4a8f54b575f9fe Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 1 Jun 2015 01:49:57 -0700 Subject: [PATCH 126/126] qemu-nix: Build statically --- pkgs/applications/virtualization/qemu/default.nix | 10 +++++++--- pkgs/development/libraries/glib/default.nix | 7 +++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 0d57a8d9f57..f04ff311930 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -41,7 +41,7 @@ let optLibuuid = if isNix then null else shouldUsePkg libuuid; optVde2 = if isNix then null else shouldUsePkg vde2; optLibaio = shouldUsePkg libaio; - optLibcap_ng = shouldUsePkg libcap_ng; + optLibcap_ng = if isNix then null else shouldUsePkg libcap_ng; optSpice = if isNix then null else shouldUsePkg spice; optSpice_protocol = if isNix then null else shouldUsePkg spice_protocol; optLibceph = if isNix then null else shouldUsePkg libceph; @@ -95,6 +95,8 @@ let targetList = if stdenv.system == "x86_64-linux" then "x86_64-softmmu,i386-softmmu" else if stdenv.system == "i686-linux" then "i386-softmmu" else null; + + hasModules = if isNix then null else true; in stdenv.mkDerivation rec { @@ -138,7 +140,7 @@ stdenv.mkDerivation rec { (mkOther "smbd" "smbd") (mkOther "sysconfdir" "/etc") (mkOther "localstatedir" "/var") - (mkEnable true "modules" null) + (mkEnable hasModules "modules" null) (mkEnable false "debug-tcg" null) (mkEnable false "debug-info" null) (mkEnable false "sparse" null) @@ -167,7 +169,7 @@ stdenv.mkDerivation rec { (mkEnable (!isNix) "system" null) (mkEnable (!isKvmOnly) "user" null) (mkEnable (!isKvmOnly) "guest-base" null) - (mkEnable true "pie" null) + (mkEnable (!isNix) "pie" null) (mkEnable (optLibuuid != null) "uuid" null) (mkEnable (optVde2 != null) "vde" null) (mkEnable false "netmap" null) # TODO(wkennington): Add Support @@ -199,6 +201,8 @@ stdenv.mkDerivation rec { (mkEnable (optNumactl != null) "numa" null) ] ++ optionals isKvmOnly [ (mkOther "target-list" targetList) + ] ++ optionals isNix [ + "--static" ]; installFlags = [ diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 7d61bea64e1..518d713026a 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -63,8 +63,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ pcre zlib libffi libiconv ] ++ libintlOrEmpty; - configureFlags = - optional stdenv.isDarwin "--disable-compile-warnings" + # Static is necessary for qemu-nix to support static userspace translators + configureFlags = [ "--enable-static" ] + ++ optional stdenv.isDarwin "--disable-compile-warnings" ++ optional stdenv.isSunOS "--disable-modular-tests"; NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl" @@ -75,6 +76,8 @@ stdenv.mkDerivation rec { export MACOSX_DEPLOYMENT_TARGET= ''; + dontDisableStatic = true; + enableParallelBuilding = true; DETERMINISTIC_BUILD = 1;