From cf07760a2cfc92b347be9159661bd104a034c7cc Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Tue, 21 Apr 2015 04:21:41 +0200 Subject: [PATCH 01/98] geoip: add geoipWithDatabase for shell use This installs (by default) geolite-legacy as the default database for geoiplookup --- pkgs/development/libraries/geoip/default.nix | 13 +++++++++++-- pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix index 99a566cf195..77ea6b6a016 100644 --- a/pkgs/development/libraries/geoip/default.nix +++ b/pkgs/development/libraries/geoip/default.nix @@ -1,15 +1,24 @@ -{ stdenv, fetchurl }: +# in geoipDatabase, you can insert a package defining ${geoipDatabase}/share/GeoIP +# e.g. geolite-legacy +{ stdenv, fetchurl, pkgs, drvName ? "geoip", geoipDatabase ? null }: let version = "1.6.2"; in stdenv.mkDerivation { - name = "geoip-${version}"; + name = "${drvName}-${version}"; src = fetchurl { url = "http://geolite.maxmind.com/download/geoip/api/c/GeoIP-${version}.tar.gz"; sha256 = "0dd6si4cvip73kxdn43apg6yygvaf7dnk5awqfg9w2fd2ll0qnh7"; }; + postInstall = '' + DB=${toString geoipDatabase} + if [ -n "$DB" ]; then + ln -s $DB/share/GeoIP $out/share/GeoIP + fi + ''; + meta = { description = "Geolocation API"; maintainers = [ stdenv.lib.maintainers.raskin ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94b6d67908b..8fb89a81ce2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5767,6 +5767,11 @@ let geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {}; + geoipWithDatabase = makeOverridable (callPackage ../development/libraries/geoip) { + drvName = "geoip-tools"; + geoipDatabase = geolite-legacy; + }; + geoip = callPackage ../development/libraries/geoip { }; geoipjava = callPackage ../development/libraries/java/geoipjava { }; From 086e801d5132bcf9a4e4cac56c361651b7b22ac0 Mon Sep 17 00:00:00 2001 From: Dario Bertini Date: Wed, 6 May 2015 07:50:52 +0100 Subject: [PATCH 02/98] Enable old pythons' wide builds --- pkgs/development/interpreters/python/2.6/default.nix | 2 +- pkgs/development/interpreters/python/2.7/default.nix | 2 +- pkgs/development/interpreters/python/3.2/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 9bf161ffc1a..ffc4c5d2e1f 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -63,7 +63,7 @@ let C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs); - configureFlags = "--enable-shared --with-threads --enable-unicode"; + configureFlags = "--enable-shared --with-threads --enable-unicode=ucs4"; NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2"; diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 8b24fe00463..b8b25c576c5 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -79,7 +79,7 @@ let C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs); - configureFlags = "--enable-shared --with-threads --enable-unicode"; + configureFlags = "--enable-shared --with-threads --enable-unicode=ucs4"; NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2"; DETERMINISTIC_BUILD = 1; diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix index 2645b503344..f4103662316 100644 --- a/pkgs/development/interpreters/python/3.2/default.nix +++ b/pkgs/development/interpreters/python/3.2/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { done ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''} - configureFlagsArray=( --enable-shared --with-threads + configureFlagsArray=( --enable-shared --with-threads --with-wide-unicode CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}" LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}" LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}" From ff075758d74b76b1fc633fc6934cc5981e0096f6 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Thu, 7 May 2015 08:05:22 -0400 Subject: [PATCH 03/98] Fix calibre PDF handling In c0d5cd0ff90cac2e04f6b436991baa4c4471150f, the binaries for poppler were carved off into a separate package, and calibre has had broken pdf support since. This changes all dependencies on poppler to poppler_utils, which fixes this support, much as was done for cups_filter in 394562655ff09ef490eca8b14fe02c393e9ac70e. --- pkgs/applications/misc/calibre/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 13738cdafe5..670d7667e1b 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, pyqt5, sip_4_16, poppler, pkgconfig, libpng +{ stdenv, fetchurl, python, pyqt5, sip_4_16, poppler_utils, pkgconfig, libpng , imagemagick, libjpeg, fontconfig, podofo, qt5, icu, sqlite , pil, makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp , xdg_utils @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = - [ python pyqt5 sip_4_16 poppler libpng imagemagick libjpeg + [ python pyqt5 sip_4_16 poppler_utils libpng imagemagick libjpeg fontconfig podofo qt5 pil chmlib icu sqlite libusb1 libmtp xdg_utils pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { installPhase = '' export HOME=$TMPDIR/fakehome - export POPPLER_INC_DIR=${poppler}/include/poppler - export POPPLER_LIB_DIR=${poppler}/lib + export POPPLER_INC_DIR=${poppler_utils}/include/poppler + export POPPLER_LIB_DIR=${poppler_utils}/lib export MAGICK_INC=${imagemagick}/include/ImageMagick export MAGICK_LIB=${imagemagick}/lib export FC_INC_DIR=${fontconfig}/include/fontconfig @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { for a in $out/bin/*; do wrapProgram $a --prefix PYTHONPATH : $PYTHONPATH \ --prefix LD_LIBRARY_PATH : ${unrar}/lib \ - --prefix PATH : ${poppler}/bin + --prefix PATH : ${poppler_utils}/bin done ''; From d3ceff38d494506fce9356d18e3731fce3f7eb14 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 8 May 2015 13:07:31 +0200 Subject: [PATCH 04/98] add x42-plugins: a collection of LV2 plugins by Robin Gareus --- .../audio/x42-plugins/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/audio/x42-plugins/default.nix diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix new file mode 100644 index 00000000000..aabb6308c14 --- /dev/null +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, fetchgit, ftgl, freefont_ttf, jack2, mesa_glu, pkgconfig +, libltc, libsndfile, libsamplerate +, lv2, mesa, gtk2, cairo, pango, fftwFloat, zita-convolver }: + +stdenv.mkDerivation rec { + version = "2014-11-01"; + name = "x42-plugins-${version}"; + + src = fetchurl { + url = "http://gareus.org/misc/x42-plugins/x42-plugins-20141101.tar.xz"; + sha256 = "0pjdhj58hb4n2053v92l7v7097fjm4xzrl8ks4g1hc7miy98ymdk"; + }; + + buildInputs = [ mesa_glu ftgl freefont_ttf jack2 libltc libsndfile libsamplerate lv2 mesa gtk2 cairo pango fftwFloat pkgconfig zita-convolver]; + + makeFlags = [ "PREFIX=$(out)" "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" ]; + + # remove check for zita-convolver in /usr/ + patchPhase = '' + sed -i "38,42d" convoLV2/Makefile + ''; + + meta = with stdenv.lib; + { description = "Collection of LV2 plugins by Robin Gareus"; + homepage = https://github.com/x42/x42-plugins; + maintainers = with maintainers; [ magnetophon ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c38feccb510..c1e25fcf416 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12595,6 +12595,8 @@ let x2vnc = callPackage ../tools/X11/x2vnc { }; + x42-plugins = callPackage ../applications/audio/x42-plugins { }; + xaos = builderDefsPackage (import ../applications/graphics/xaos) { inherit (xlibs) libXt libX11 libXext xextproto xproto; inherit gsl aalib zlib intltool gettext perl; From f5ea3fe58993ef99ac4d35369076c398f771656a Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 8 May 2015 06:08:46 -0700 Subject: [PATCH 05/98] gnutls: Remove potentially insecure 3.2 --- pkgs/development/libraries/gnutls/3.2.nix | 10 ---------- pkgs/top-level/all-packages.nix | 7 ------- 2 files changed, 17 deletions(-) delete mode 100644 pkgs/development/libraries/gnutls/3.2.nix diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix deleted file mode 100644 index e46b1dfd8e6..00000000000 --- a/pkgs/development/libraries/gnutls/3.2.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage, fetchurl, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "3.2.21"; - - src = fetchurl { - url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/gnutls-${version}.tar.lz"; - sha256 = "1xydzlwmf0frxvr26yw0ily5vwkdvf90m53fix61bi5gx4xd2m7m"; - }; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79b50719bf6..fc8bb30aaab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6032,18 +6032,11 @@ let gnutls = gnutls33; - gnutls32 = callPackage ../development/libraries/gnutls/3.2.nix { - guileBindings = config.gnutls.guile or false; - nettle = nettle27; - }; - gnutls33 = callPackage ../development/libraries/gnutls/3.3.nix { guileBindings = config.gnutls.guile or false; nettle = nettle27; }; - gnutls32_with_guile = lowPrio (gnutls32.override { guileBindings = true; }); - gnutls33_with_guile = lowPrio (gnutls33.override { guileBindings = true; }); gpac = callPackage ../applications/video/gpac { }; From 9f337e8cc79b40ed06bad6eafad37ab88515ad69 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 8 May 2015 06:14:35 -0700 Subject: [PATCH 06/98] nss: 3.18.1 -> 3.19 --- 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 d91a905f7ba..5b167558486 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.18.1"; + version = "3.19"; src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_18_1_RTM/src/${name}.tar.gz"; - sha256 = "10d005ca1b143a8b77032a169c595d06cf42d16d54809558ea30f1ffe73fef70"; + url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_19_RTM/src/${name}.tar.gz"; + sha256 = "989ebdf79374f24181f060d332445b1a4baf3df39d08514c4349ba8573cefa9b"; }; buildInputs = [ nspr perl zlib sqlite ]; From d3e0850989cbff07143fc0a237c610a74e079555 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Fri, 8 May 2015 11:02:01 -0400 Subject: [PATCH 07/98] Add wpa_supplicant p2p patch. wpa_supplicant 2.4 appears to have a serious bug that makes impossible to use wifi for some number of people. (See https://bbs.archlinux.org/viewtopic.php?id=196584 for an example) It was resolved in a patch for the to-be-released 2.5 which it seemed worth it to cherry-pick here. --- pkgs/os-specific/linux/wpa_supplicant/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index f6142bd630f..c709880af2d 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, openssl, pkgconfig, libnl +{ stdenv, fetchpatch, fetchurl, lib, openssl, pkgconfig, libnl , dbus_libs ? null, readline ? null, pcsclite ? null }: @@ -79,6 +79,11 @@ stdenv.mkDerivation rec { patches = [ ./0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch ./build-fix.patch + (fetchpatch { + name = "p2p-fix.patch"; + url = "http://w1.fi/cgit/hostap/patch/?id=8a78e227df1ead19be8e12a4108e448887e64d6f"; + sha256 = "1k2mcq1jv8xzi8061ixcz6j56n4i8wbq0vxcvml204q1syy2ika0"; + }) ]; postInstall = '' From 929dc4199a57b5d21eb72077f735eb33c4c7b09b Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Wed, 6 May 2015 15:56:02 -0400 Subject: [PATCH 08/98] ghcjs: properly wrap binaries in environment This also: 1 Builds Setup.hs with ghcjs, which (among other things) defines __GHCJS__ and ghcjs_HOST_OS during pre-processing. 2 Fixes ghc-paths to point at ghcjs and use NIX_GHCJS_* env-vars. 3 Boots ghcjs into $prefix/lib/$compiler. --- pkgs/development/compilers/ghcjs/default.nix | 17 ++--- pkgs/development/compilers/ghcjs/ghcjs.patch | 20 ++++-- .../haskell-modules/configuration-ghcjs.nix | 4 ++ .../haskell-modules/generic-builder.nix | 18 ++--- .../haskell-modules/ghc-paths-nix-ghcjs.patch | 65 +++++++++++++++++++ .../haskell-modules/with-packages-wrapper.nix | 47 +++++++------- 6 files changed, 125 insertions(+), 46 deletions(-) create mode 100644 pkgs/development/haskell-modules/ghc-paths-nix-ghcjs.patch diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index 19308218788..24a361724ae 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -39,10 +39,6 @@ }: let version = "0.1.0"; - ghcArch = if pkgs.stdenv.system == "i686-linux" - then "i386-linux" - else pkgs.stdenv.system; - libDir = "share/ghcjs/${ghcArch}-${version}-${ghc.version}/ghcjs"; ghcjsBoot = fetchgit { url = git://github.com/ghcjs/ghcjs-boot.git; rev = "ab8765edcb507b8b810e3c324fd5bd5af2b69d8f"; # 7.10 branch @@ -84,14 +80,19 @@ in mkDerivation (rec { ]; patches = [ ./ghcjs.patch ]; postPatch = '' - substituteInPlace Setup.hs --replace "/usr/bin/env" "${coreutils}/bin/env" - substituteInPlace src/Compiler/Info.hs --replace "@PREFIX@" "$out" + substituteInPlace Setup.hs \ + --replace "/usr/bin/env" "${coreutils}/bin/env" + + substituteInPlace src/Compiler/Info.hs \ + --replace "@PREFIX@" "$out" \ + --replace "@VERSION@" "${version}" + substituteInPlace src-bin/Boot.hs \ --replace "@PREFIX@" "$out" \ --replace "@CC@" "${stdenv.cc}/bin/cc" ''; preBuild = '' - local topDir=$out/${libDir} + local topDir=$out/lib/ghcjs-${version} mkdir -p $topDir cp -r ${ghcjsBoot} $topDir/ghcjs-boot @@ -116,9 +117,9 @@ in mkDerivation (rec { --with-gmp-libraries ${gmp}/lib ''; passthru = { - inherit libDir; isGhcjs = true; nativeGhc = ghc; + inherit nodejs; }; homepage = "https://github.com/ghcjs/ghcjs"; diff --git a/pkgs/development/compilers/ghcjs/ghcjs.patch b/pkgs/development/compilers/ghcjs/ghcjs.patch index 618656f787c..751f114ba43 100644 --- a/pkgs/development/compilers/ghcjs/ghcjs.patch +++ b/pkgs/development/compilers/ghcjs/ghcjs.patch @@ -60,15 +60,21 @@ index 3c68dcf..64f3cf7 100644 , "--haddock-html" -- workaround for hoogle support being broken in haddock for GHC 7.10RC1 diff --git a/src/Compiler/Info.hs b/src/Compiler/Info.hs -index 33a401f..5d09c86 100644 +index 33a401f..79833c5 100644 --- a/src/Compiler/Info.hs +++ b/src/Compiler/Info.hs -@@ -49,7 +49,7 @@ compilerInfo nativeToo dflags = do +@@ -48,13 +48,7 @@ compilerInfo nativeToo dflags = do + -- | the directory to use if started without -B flag getDefaultTopDir :: IO FilePath - getDefaultTopDir = do +-getDefaultTopDir = do - appdir <- getAppUserDataDirectory "ghcjs" -+ let appdir = "@PREFIX@/share/ghcjs" - return (appdir subdir "ghcjs") - where - targetARCH = arch +- return (appdir subdir "ghcjs") +- where +- targetARCH = arch +- targetOS = os +- subdir = targetARCH ++ '-':targetOS ++ '-':getFullCompilerVersion ++getDefaultTopDir = return "@PREFIX@/lib/ghcjs-@VERSION@" + + getDefaultLibDir :: IO FilePath + getDefaultLibDir = getDefaultTopDir diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index e880f7e713e..aef6e6c9190 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -99,4 +99,8 @@ self: super: { buildDepends = [ self.base self.mtl self.text self.ghcjs-base ]; }); + ghc-paths = overrideCabal super.ghc-paths (drv: { + patches = [ ./ghc-paths-nix-ghcjs.patch ]; + }); + } diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 15894034819..28fcf45bfa2 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -114,7 +114,7 @@ let ghcEnv = ghc.withPackages (p: haskellBuildInputs); - setupBuilder = if isGhcjs then "${ghc.nativeGhc}/bin/ghc" else "ghc"; + setupCommand = if isGhcjs then "${ghc.nodejs}/bin/node ./Setup.jsexe/all.js" else "./Setup"; ghcCommand = if isGhcjs then "ghcjs" else "ghc"; in @@ -186,7 +186,7 @@ stdenv.mkDerivation ({ done echo setupCompileFlags: $setupCompileFlags - ${setupBuilder} $setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i + ${ghcCommand} $setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i runHook postCompileBuildDriver ''; @@ -197,7 +197,7 @@ stdenv.mkDerivation ({ unset GHC_PACKAGE_PATH # Cabal complains if this variable is set during configure. echo configureFlags: $configureFlags - ./Setup configure $configureFlags 2>&1 | ${coreutils}/bin/tee "$NIX_BUILD_TOP/cabal-configure.log" + ${setupCommand} configure $configureFlags 2>&1 | ${coreutils}/bin/tee "$NIX_BUILD_TOP/cabal-configure.log" if ${gnugrep}/bin/egrep -q '^Warning:.*depends on multiple versions' "$NIX_BUILD_TOP/cabal-configure.log"; then echo >&2 "*** abort because of serious configure-time warning from Cabal" exit 1 @@ -210,20 +210,20 @@ stdenv.mkDerivation ({ buildPhase = '' runHook preBuild - ./Setup build ${buildTarget} + ${setupCommand} build ${buildTarget} runHook postBuild ''; checkPhase = '' runHook preCheck - ./Setup test ${testTarget} + ${setupCommand} test ${testTarget} runHook postCheck ''; haddockPhase = '' runHook preHaddock ${optionalString (doHaddock && hasActiveLibrary) '' - ./Setup haddock --html \ + ${setupCommand} haddock --html \ ${optionalString doHoogle "--hoogle"} \ ${optionalString (hasActiveLibrary && hyperlinkSource) "--hyperlink-source"} ''} @@ -233,12 +233,12 @@ stdenv.mkDerivation ({ installPhase = '' runHook preInstall - ${if !hasActiveLibrary then "./Setup install" else '' - ./Setup copy + ${if !hasActiveLibrary then "${setupCommand} install" else '' + ${setupCommand} copy local packageConfDir="$out/lib/${ghc.name}/package.conf.d" local packageConfFile="$packageConfDir/${pname}-${version}.conf" mkdir -p "$packageConfDir" - ./Setup register --gen-pkg-config=$packageConfFile + ${setupCommand} register --gen-pkg-config=$packageConfFile local pkgId=$( ${gnused}/bin/sed -n -e 's|^id: ||p' $packageConfFile ) mv $packageConfFile $packageConfDir/$pkgId.conf ''} diff --git a/pkgs/development/haskell-modules/ghc-paths-nix-ghcjs.patch b/pkgs/development/haskell-modules/ghc-paths-nix-ghcjs.patch new file mode 100644 index 00000000000..26ea0eaa5a8 --- /dev/null +++ b/pkgs/development/haskell-modules/ghc-paths-nix-ghcjs.patch @@ -0,0 +1,65 @@ +diff --git a/GHC/Paths.hs b/GHC/Paths.hs +index c87565d..88b3db4 100644 +--- a/GHC/Paths.hs ++++ b/GHC/Paths.hs +@@ -1,13 +1,35 @@ + {-# LANGUAGE CPP #-} ++{-# LANGUAGE ScopedTypeVariables #-} + + module GHC.Paths ( + ghc, ghc_pkg, libdir, docdir + ) where + ++import Control.Exception as E ++import Data.Maybe ++import System.Environment ++import System.IO.Unsafe ++ ++-- Yes, there's lookupEnv now, but we want to be compatible ++-- with older GHCs. ++checkEnv :: String -> IO (Maybe String) ++checkEnv var = E.catch (fmap Just (getEnv var)) ++ (\ (e :: IOException) -> return Nothing) ++ ++nixLibdir, nixDocdir, nixGhc, nixGhcPkg :: Maybe FilePath ++nixLibdir = unsafePerformIO (checkEnv "NIX_GHCJS_LIBDIR") ++nixDocdir = unsafePerformIO (checkEnv "NIX_GHCJS_DOCDIR") ++nixGhc = unsafePerformIO (checkEnv "NIX_GHCJS") ++nixGhcPkg = unsafePerformIO (checkEnv "NIX_GHCJSPKG") ++{-# NOINLINE nixLibdir #-} ++{-# NOINLINE nixDocdir #-} ++{-# NOINLINE nixGhc #-} ++{-# NOINLINE nixGhcPkg #-} ++ + libdir, docdir, ghc, ghc_pkg :: FilePath + +-libdir = GHC_PATHS_LIBDIR +-docdir = GHC_PATHS_DOCDIR ++libdir = fromMaybe GHC_PATHS_LIBDIR nixLibdir ++docdir = fromMaybe GHC_PATHS_DOCDIR nixDocdir + +-ghc = GHC_PATHS_GHC +-ghc_pkg = GHC_PATHS_GHC_PKG ++ghc = fromMaybe GHC_PATHS_GHC nixGhc ++ghc_pkg = fromMaybe GHC_PATHS_GHC_PKG nixGhcPkg +diff --git a/Setup.hs b/Setup.hs +index fad5026..1651650 100644 +--- a/Setup.hs ++++ b/Setup.hs +@@ -27,13 +27,13 @@ main = defaultMainWithHooks simpleUserHooks { + defaultPostConf :: Args -> ConfigFlags -> PackageDescription -> LocalBuildInfo -> IO () + defaultPostConf args flags pkgdescr lbi = do + libdir_ <- rawSystemProgramStdoutConf (fromFlag (configVerbosity flags)) +- ghcProgram (withPrograms lbi) ["--print-libdir"] ++ ghcjsProgram (withPrograms lbi) ["--print-libdir"] + let libdir = reverse $ dropWhile isSpace $ reverse libdir_ + +- ghc_pkg = case lookupProgram ghcPkgProgram (withPrograms lbi) of ++ ghc_pkg = case lookupProgram ghcjsPkgProgram (withPrograms lbi) of + Just p -> programPath p + Nothing -> error "ghc-pkg was not found" +- ghc = case lookupProgram ghcProgram (withPrograms lbi) of ++ ghc = case lookupProgram ghcjsProgram (withPrograms lbi) of + Just p -> programPath p + Nothing -> error "ghc was not found" + diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 136566f65f0..4362bacb9ee 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -32,6 +32,7 @@ let ghc761OrLater = isGhcjs || lib.versionOlder "7.6.1" ghc.version; packageDBFlag = if ghc761OrLater then "--global-package-db" else "--global-conf"; ghcCommand = if isGhcjs then "ghcjs" else "ghc"; + ghcCommandCaps= lib.toUpper ghcCommand; libDir = "$out/lib/${ghcCommand}-${ghc.version}"; docDir = "$out/share/doc/ghc/html"; packageCfgDir = "${libDir}/package.conf.d"; @@ -51,10 +52,6 @@ buildEnv { postBuild = '' . ${makeWrapper}/nix-support/setup-hook - ${lib.optionalString isGhcjs '' - cp -r "${ghc}/${ghc.libDir}/"* ${libDir}/ - ''} - if test -L "$out/bin"; then binTarget="$(readlink -f "$out/bin")" rm "$out/bin" @@ -62,30 +59,36 @@ buildEnv { chmod u+w "$out/bin" fi - for prg in ghc ghci ghc-${ghc.version} ghci-${ghc.version}; do - rm -f $out/bin/$prg - makeWrapper ${ghc}/bin/$prg $out/bin/$prg \ - --add-flags '"-B$NIX_GHC_LIBDIR"' \ - --set "NIX_GHC" "$out/bin/${ghcCommand}" \ - --set "NIX_GHCPKG" "$out/bin/${ghcCommand}-pkg" \ - --set "NIX_GHC_DOCDIR" "${docDir}" \ - --set "NIX_GHC_LIBDIR" "${libDir}" \ - ${lib.optionalString withLLVM ''--prefix "PATH" ":" "${llvm}"''} + for prg in ${ghcCommand} ${ghcCommand}i ${ghcCommand}-${ghc.version} ${ghcCommand}i-${ghc.version}; do + if [[ -x "${ghc}/bin/$prg" ]]; then + rm -f $out/bin/$prg + makeWrapper ${ghc}/bin/$prg $out/bin/$prg \ + --add-flags '"-B$NIX_${ghcCommandCaps}_LIBDIR"' \ + --set "NIX_${ghcCommandCaps}" "$out/bin/${ghcCommand}" \ + --set "NIX_${ghcCommandCaps}PKG" "$out/bin/${ghcCommand}-pkg" \ + --set "NIX_${ghcCommandCaps}_DOCDIR" "${docDir}" \ + --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}" \ + ${lib.optionalString withLLVM ''--prefix "PATH" ":" "${llvm}"''} + fi done for prg in runghc runhaskell; do - rm -f $out/bin/$prg - makeWrapper ${ghc}/bin/$prg $out/bin/$prg \ - --add-flags "-f $out/bin/ghc" \ - --set "NIX_GHC" "$out/bin/${ghcCommand}" \ - --set "NIX_GHCPKG" "$out/bin/${ghcCommand}-pkg" \ - --set "NIX_GHC_DOCDIR" "${docDir}" \ - --set "NIX_GHC_LIBDIR" "${libDir}" + if [[ -x "${ghc}/bin/$prg" ]]; then + rm -f $out/bin/$prg + makeWrapper ${ghc}/bin/$prg $out/bin/$prg \ + --add-flags "-f $out/bin/${ghcCommand}" \ + --set "NIX_${ghcCommandCaps}" "$out/bin/${ghcCommand}" \ + --set "NIX_${ghcCommandCaps}PKG" "$out/bin/${ghcCommand}-pkg" \ + --set "NIX_${ghcCommandCaps}_DOCDIR" "${docDir}" \ + --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}" + fi done for prg in ${ghcCommand}-pkg ${ghcCommand}-pkg-${ghc.version}; do - rm -f $out/bin/$prg - makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag}=${packageCfgDir}" + if [[ -x "${ghc}/bin/$prg" ]]; then + rm -f $out/bin/$prg + makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag}=${packageCfgDir}" + fi done ${lib.optionalString hasLibraries "$out/bin/${ghcCommand}-pkg recache"} From 816cca89b6ac4afa8efde593f71f357a39e3981a Mon Sep 17 00:00:00 2001 From: Stewart Mackenzie Date: Fri, 8 May 2015 23:31:26 +0800 Subject: [PATCH 09/98] hackrf: new package --- pkgs/applications/misc/hackrf/default.nix | 28 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/misc/hackrf/default.nix diff --git a/pkgs/applications/misc/hackrf/default.nix b/pkgs/applications/misc/hackrf/default.nix new file mode 100644 index 00000000000..806392f717f --- /dev/null +++ b/pkgs/applications/misc/hackrf/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchgit, cmake, pkgconfig, libusb }: + +stdenv.mkDerivation rec { + name = "hackrf-${version}"; + version = "2014.08.1"; + + src = fetchgit { + url = "git://github.com/mossmann/hackrf"; + rev = "refs/tags/v${version}"; + sha256 = "1f3mmzyn6qqbl02h6dkz0zybppihqgpdxjgqmkb1pn3i0d98ydb3"; + }; + + buildInputs = [ + cmake pkgconfig libusb + ]; + + preConfigure = '' + cd host + ''; + + meta = with stdenv.lib; { + description = "An open source SDR platform"; + homepage = http://greatscottgadgets.com/hackrf/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.sjmackenzie ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc8bb30aaab..d1b2b61fdd0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11078,6 +11078,8 @@ let guvcview = callPackage ../os-specific/linux/guvcview { }; + hackrf = callPackage ../applications/misc/hackrf { }; + hello = callPackage ../applications/misc/hello/ex-2 { }; helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { }; From 31dde168810c7dbb241c4be9502aa22eefe03f8a Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Fri, 8 May 2015 11:53:28 -0400 Subject: [PATCH 10/98] ghcjs: set NIX_GHCJS_* variables in env. --- pkgs/development/haskell-modules/generic-builder.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 28fcf45bfa2..d441b824842 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -51,7 +51,7 @@ assert editedCabalFile != null -> revision != null; let inherit (stdenv.lib) optional optionals optionalString versionOlder - concatStringsSep enableFeature optionalAttrs; + concatStringsSep enableFeature optionalAttrs toUpper; isGhcjs = ghc.isGhcjs or false; @@ -116,6 +116,7 @@ let setupCommand = if isGhcjs then "${ghc.nodejs}/bin/node ./Setup.jsexe/all.js" else "./Setup"; ghcCommand = if isGhcjs then "ghcjs" else "ghc"; + ghcCommandCaps = toUpper ghcCommand; in stdenv.mkDerivation ({ @@ -264,10 +265,10 @@ stdenv.mkDerivation ({ LANG = "en_US.UTF-8"; LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive"; shellHook = '' - export NIX_GHC="${ghcEnv}/bin/${ghcCommand}" - export NIX_GHCPKG="${ghcEnv}/bin/${ghcCommand}-pkg" - export NIX_GHC_DOCDIR="${ghcEnv}/share/doc/ghc/html" - export NIX_GHC_LIBDIR="${ghcEnv}/lib/${ghcEnv.name}" + export NIX_${ghcCommandCaps}="${ghcEnv}/bin/${ghcCommand}" + export NIX_${ghcCommandCaps}PKG="${ghcEnv}/bin/${ghcCommand}-pkg" + export NIX_${ghcCommandCaps}_DOCDIR="${ghcEnv}/share/doc/ghc/html" + export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/${ghcEnv.name}" ''; }; From 1da4d8b5c927413238531c166c64a966997873d5 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Fri, 8 May 2015 11:35:00 -0500 Subject: [PATCH 11/98] coqPackages.QuickChick: New expression --- .../coq-modules/QuickChick/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/coq-modules/QuickChick/default.nix diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix new file mode 100644 index 00000000000..9141bfd24d1 --- /dev/null +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -0,0 +1,28 @@ +{stdenv, fetchgit, coq, coqPackages}: + +stdenv.mkDerivation rec { + + name = "coq-QuickChick-${coq.coq-version}-${version}"; + version = "21f50a02"; + + src = fetchgit { + url = git://github.com/QuickChick/QuickChick.git; + rev = "21f50a02e752f6d99d5bfefefcd2ad45df5e778a"; + sha256 = "15hsirm443cr098hksfcg3nbjm9mdnmxzpz61qq7ap7lglabl7pw"; + }; + + buildInputs = [ coq.ocaml coq.camlp5 coqPackages.ssreflect ]; + propagatedBuildInputs = [ coq ]; + + enableParallelBuilding = true; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = with stdenv.lib; { + homepage = git://github.com/QuickChick/QuickChick.git; + description = "Randomized property-based testing plugin for Coq; a clone of Haskell QuickCheck"; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc8bb30aaab..4cde5956f77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13650,6 +13650,8 @@ let paco = callPackage ../development/coq-modules/paco {}; + QuickChick = callPackage ../development/coq-modules/QuickChick {}; + ssreflect = callPackage ../development/coq-modules/ssreflect {}; tlc = callPackage ../development/coq-modules/tlc {}; From 9d03afa429c88601004cfa987d94aac5dad2676c Mon Sep 17 00:00:00 2001 From: Renzo Carbonara Date: Fri, 8 May 2015 16:50:48 -0300 Subject: [PATCH 12/98] Haskell: explicit reflex-dom dependencies for GHCJS When building `reflex-dom` for GHCJS, the following dependencies are not needed and will fail to build: glib, gtk3, webkitgtk3, webkitgtk3-javascriptcore. Now we explicitely need the dependencies needed for building for GHCJS. --- pkgs/development/haskell-modules/configuration-ghcjs.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index aef6e6c9190..e2a3739a496 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -103,4 +103,12 @@ self: super: { patches = [ ./ghc-paths-nix-ghcjs.patch ]; }); + reflex-dom = overrideCabal super.reflex-dom (drv: { + buildDepends = [ + self.aeson self.base self.bytestring self.containers self.data-default + self.dependent-map self.dependent-sum self.ghcjs-dom self.lens self.mtl + self.ref-tf self.reflex self.safe self.semigroups self.text self.these + self.time self.transformers + ]; + }); } From daa5938c6a2792993fc49c52bf510809ce13b843 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Fri, 8 May 2015 14:15:49 -0700 Subject: [PATCH 13/98] emacs-packages: add swiper --- pkgs/top-level/emacs-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index bc557a67597..2e8d68414a4 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -1091,6 +1091,19 @@ let self = _self // overrides; }; }; + swiper = melpaBuild rec { + pname = "swiper"; + version = "0.4.0"; + src = fetchFromGitHub { + owner = "abo-abo"; + repo = pname; + rev = version; + sha256 = "1skgw84j5a59ds86bpdcaf3c8iq2m0fz720chjh91ixhkavvdd87"; + }; + fileSpecs = [ "swiper.el" "ivy.el" "colir.el" ]; + meta = { license = gpl3Plus; }; + }; + switch-window = melpaBuild rec { pname = "switch-window"; version = "20140919"; From 1f6c2a97efe8dd2fac692c287f6ae31d4c74519c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 9 May 2015 00:11:20 +0200 Subject: [PATCH 14/98] Add phc-intel: undervolt Intel CPUs under Linux --- pkgs/os-specific/linux/phc-intel/default.nix | 47 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/os-specific/linux/phc-intel/default.nix diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix new file mode 100644 index 00000000000..1b4ee3218eb --- /dev/null +++ b/pkgs/os-specific/linux/phc-intel/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, kernel, which }: + +assert stdenv.isLinux; +# don't bother with older versions, though some would probably work: +assert stdenv.lib.versionAtLeast kernel.version "4.0"; + +let version = "0.4.0-rev17"; in +stdenv.mkDerivation rec { + name = "linux-phc-intel-${version}-${kernel.version}"; + + src = fetchurl { + sha256 = "1fdfpghnsa5s98lisd2sn0vplrq0n54l0pkyyzkyb77z4fa6bs4p"; + url = "http://www.linux-phc.org/forum/download/file.php?id=166"; + name = "phc-intel-pack-rev17.tar.bz2"; + }; + + meta = with stdenv.lib; { + inherit version; + description = "Undervolting kernel driver for Intel processors"; + longDescription = '' + PHC is a Linux kernel patch to undervolt processors. This can divide the + power consumption of the CPU by two or more, increasing battery life + while noticably reducing fan noise. This driver works only on supported + Intel architectures. + ''; + homepage = http://www.linux-phc.org/; + downloadPage = "http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267"; + license = with licenses; gpl2; + platforms = with platforms; linux; + maintainers = with maintainers; [ nckx ]; + }; + + buildInputs = [ which ]; + + makeFlags = "KERNELSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build DESTDIR=$(out)"; + + configurePhase = '' + echo make $makeFlags brave + ''; + + enableParallelBuilding = false; + + installPhase = '' + install -m 755 -d $out/lib/modules/${kernel.version}/extra/ + install -m 644 *.ko $out/lib/modules/${kernel.version}/extra/ + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9987f8d9141..50f714e71c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9374,6 +9374,8 @@ let perf = callPackage ../os-specific/linux/kernel/perf.nix { }; + phc-intel = callPackage ../os-specific/linux/phc-intel { }; + prl-tools = callPackage ../os-specific/linux/prl-tools { }; psmouse_alps = callPackage ../os-specific/linux/psmouse-alps { }; From 4c5d3f5a717354f1cf1a3352eccb35d3cb0c611f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 9 May 2015 01:23:30 +0200 Subject: [PATCH 15/98] Add alloy 4.2_2015-02-22: relational modeller --- pkgs/development/tools/alloy/builder.sh | 16 ++++++++ pkgs/development/tools/alloy/default.nix | 48 +++++++++++++++++++++++ pkgs/development/tools/alloy/icon.png | Bin 0 -> 17154 bytes pkgs/top-level/all-packages.nix | 2 + 4 files changed, 66 insertions(+) create mode 100644 pkgs/development/tools/alloy/builder.sh create mode 100644 pkgs/development/tools/alloy/default.nix create mode 100644 pkgs/development/tools/alloy/icon.png diff --git a/pkgs/development/tools/alloy/builder.sh b/pkgs/development/tools/alloy/builder.sh new file mode 100644 index 00000000000..e737fc5eec7 --- /dev/null +++ b/pkgs/development/tools/alloy/builder.sh @@ -0,0 +1,16 @@ +source $stdenv/setup + +jar=${src##*/} +jar=$out/share/alloy/${jar#*-} + +install -Dm644 $src $jar + +cat << EOF > alloy +#! $SHELL +exec $jre/bin/java -jar $jar +EOF + +install -Dm755 alloy $out/bin/alloy + +install -Dm644 $icon $out/share/pixmaps/alloy.png +cp -r ${desktopItem}/share/applications $out/share diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix new file mode 100644 index 00000000000..d25ccc1a7a5 --- /dev/null +++ b/pkgs/development/tools/alloy/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, jre, makeDesktopItem }: + +let version = "4.2_2015-02-22"; in +stdenv.mkDerivation rec { + name = "alloy-${version}"; + + src = fetchurl { + sha256 = "0p93v8jwx9prijpikkgmfdzb9qn8ljmvga5d9wvrkxddccjx9k28"; + url = "http://alloy.mit.edu/alloy/downloads/alloy${version}.jar"; + }; + + meta = with stdenv.lib; { + inherit version; + description = "Language & tool for relational models"; + longDescription = '' + Alloy is a language for describing structures and a tool for exploring + them. An Alloy model is a collection of constraints that describes a set + of structures, e.g. all the possible security configurations of a web + application, or all the possible topologies of a switching network. The + Alloy Analyzer is a solver that takes the constraints of a model and + finds structures that satisfy them. Structures are displayed graphically, + and their appearance can be customized for the domain at hand. + ''; + homepage = http://alloy.mit.edu/; + downloadPage = http://alloy.mit.edu/alloy/download.html; + license = with licenses; mit; + platforms = with platforms; linux; + maintainers = with maintainers; [ nckx ]; + }; + + desktopItem = makeDesktopItem rec { + name = "alloy"; + exec = name; + icon = name; + desktopName = "Alloy"; + genericName = "Relational modelling tool"; + comment = meta.description; + categories = "Development;IDE;Education;"; + }; + + + buildInputs = [ jre ]; + inherit jre; + + icon = ./icon.png; + + builder = ./builder.sh; +} diff --git a/pkgs/development/tools/alloy/icon.png b/pkgs/development/tools/alloy/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a76bd94804749d7ffaedac3db83850ff1a78d546 GIT binary patch literal 17154 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

+vsY|ww>_6b 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 literal 0 HcmV?d00001 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 50f714e71c4..c92d49fea1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4912,6 +4912,8 @@ let ### DEVELOPMENT / TOOLS + alloy = callPackage ../development/tools/alloy { }; + augeas = callPackage ../tools/system/augeas { }; ansible = callPackage ../tools/system/ansible { }; From 8c39547fc258068e13e9dd14f6e7f290ed840428 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 9 May 2015 02:49:36 +0200 Subject: [PATCH 16/98] phc-intel: don't try to build on _grsec kernels It will fail. --- pkgs/os-specific/linux/phc-intel/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix index 1b4ee3218eb..ac60501929a 100644 --- a/pkgs/os-specific/linux/phc-intel/default.nix +++ b/pkgs/os-specific/linux/phc-intel/default.nix @@ -1,8 +1,10 @@ { stdenv, fetchurl, kernel, which }: assert stdenv.isLinux; -# don't bother with older versions, though some would probably work: +# Don't bother with older versions, though some would probably work: assert stdenv.lib.versionAtLeast kernel.version "4.0"; +# Disable on grsecurity kernels, which break module building: +assert !kernel.features ? grsecurity; let version = "0.4.0-rev17"; in stdenv.mkDerivation rec { From e50afd12b7647921a18336add9fd81e8798b3d6d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 9 May 2015 03:17:33 +0200 Subject: [PATCH 17/98] alloy: use installPhase instead of ./builder.sh Also pass on any arguments from the shell wrapper to the .jar. And be less clever with shell strings. --- pkgs/development/tools/alloy/builder.sh | 16 ---------------- pkgs/development/tools/alloy/default.nix | 21 +++++++++++++++++---- 2 files changed, 17 insertions(+), 20 deletions(-) delete mode 100644 pkgs/development/tools/alloy/builder.sh diff --git a/pkgs/development/tools/alloy/builder.sh b/pkgs/development/tools/alloy/builder.sh deleted file mode 100644 index e737fc5eec7..00000000000 --- a/pkgs/development/tools/alloy/builder.sh +++ /dev/null @@ -1,16 +0,0 @@ -source $stdenv/setup - -jar=${src##*/} -jar=$out/share/alloy/${jar#*-} - -install -Dm644 $src $jar - -cat << EOF > alloy -#! $SHELL -exec $jre/bin/java -jar $jar -EOF - -install -Dm755 alloy $out/bin/alloy - -install -Dm644 $icon $out/share/pixmaps/alloy.png -cp -r ${desktopItem}/share/applications $out/share diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix index d25ccc1a7a5..da247072b07 100644 --- a/pkgs/development/tools/alloy/default.nix +++ b/pkgs/development/tools/alloy/default.nix @@ -38,11 +38,24 @@ stdenv.mkDerivation rec { categories = "Development;IDE;Education;"; }; - buildInputs = [ jre ]; - inherit jre; - icon = ./icon.png; + phases = [ "installPhase" ]; - builder = ./builder.sh; + installPhase = '' + jar=`basename ${src}` + jar=$out/share/alloy/alloy${version}.jar + + install -Dm644 ${src} $jar + + cat << EOF > alloy + #!${stdenv.shell} + exec ${jre}/bin/java -jar $jar "\''${@}" + EOF + + install -Dm755 alloy $out/bin/alloy + + install -Dm644 ${./icon.png} $out/share/pixmaps/alloy.png + cp -r ${desktopItem}/share/applications $out/share + ''; } From b5f2fd72205cdf8a20b1535736fea1ad75585526 Mon Sep 17 00:00:00 2001 From: Richard Wallace Date: Fri, 8 May 2015 23:17:47 -0700 Subject: [PATCH 18/98] no longer need to patch reactive-banana, latest version has all the necessary instances --- .../haskell-modules/configuration-ghcjs.nix | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index e2a3739a496..6fbb28d026e 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -66,19 +66,6 @@ self: super: { ''; }); - reactive-banana = overrideCabal super.reactive-banana (drv: { - patchPhase = '' - cat >> src/Reactive/Banana/Switch.hs <) = ap - EOF - ''; - }); - transformers-compat = overrideCabal super.transformers-compat (drv: { configureFlags = []; }); From a5a740a17a4cf554a8eb237a3670f3aef0d3d8f3 Mon Sep 17 00:00:00 2001 From: Aistis Raulinaitis Date: Fri, 8 May 2015 23:45:07 -0700 Subject: [PATCH 19/98] z3 opt --- lib/maintainers.nix | 1 + .../science/logic/z3_opt/default.nix | 44 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 46 insertions(+) create mode 100644 pkgs/applications/science/logic/z3_opt/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 6f4a7be21f6..6906abd2c78 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -184,6 +184,7 @@ schmitthenner = "Fabian Schmitthenner "; schristo = "Scott Christopher "; sepi = "Raffael Mancini "; + sheganinans = "Aistis Raulinaitis "; shell = "Shell Turner "; shlevy = "Shea Levy "; simons = "Peter Simons "; diff --git a/pkgs/applications/science/logic/z3_opt/default.nix b/pkgs/applications/science/logic/z3_opt/default.nix new file mode 100644 index 00000000000..b4d8fbc9529 --- /dev/null +++ b/pkgs/applications/science/logic/z3_opt/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchFromGitHub, python }: + +# Copied shamelessly from the normal z3 .nix + +stdenv.mkDerivation rec { + name = "z3_opt-${version}"; + version = "4.3.2"; + + src = fetchFromGitHub { + owner = "Z3Prover"; + repo = "z3"; + rev = "9377779e5818b2ca15c4f39921b2ba3a42f948e7"; + sha256 = "15d6hsb61hrm5vy3l2gnkrfnqr68lvspnznm17vyhm61ld33yaff"; + }; + + buildInputs = [ python ]; + enableParallelBuilding = true; + + configurePhase = "python scripts/mk_make.py --prefix=$out && cd build"; + + # z3's install phase is stupid because it tries to calculate the + # python package store location itself, meaning it'll attempt to + # write files into the nix store, and fail. + soext = if stdenv.system == "x86_64-darwin" then ".dylib" else ".so"; + installPhase = '' + mkdir -p $out/bin $out/lib/${python.libPrefix}/site-packages $out/include + cp ../src/api/z3*.h $out/include + cp ../src/api/c++/z3*.h $out/include + cp z3 $out/bin + cp libz3${soext} $out/lib + cp libz3${soext} $out/lib/${python.libPrefix}/site-packages + cp z3*.pyc $out/lib/${python.libPrefix}/site-packages + cp ../src/api/python/*.py $out/lib/${python.libPrefix}/site-packages + ''; + + meta = { + description = "A high-performance theorem prover and SMT solver, optimization edition"; + homepage = "http://github.com/Z3Prover/z3"; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice sheganinans ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4cde5956f77..bed6b47501c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13768,6 +13768,7 @@ let yices = callPackage ../applications/science/logic/yices {}; z3 = callPackage ../applications/science/logic/z3 {}; + z3_opt = callPackage ../applications/science/logic/z3_opt {}; boolector = boolector15; boolector15 = callPackage ../applications/science/logic/boolector {}; From ea9969b0e45dc494e80095f4c4c0a469ec032312 Mon Sep 17 00:00:00 2001 From: koral Date: Sat, 9 May 2015 09:10:47 +0000 Subject: [PATCH 20/98] Added jellyfish python package. --- pkgs/top-level/python-packages.nix | 39 ++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 73fa69b4cb0..3e8164ff9b8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6188,6 +6188,24 @@ let }; }); + jellyfish = buildPythonPackage rec { + version = "0.5.0"; + name = "jellyfish-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/j/jellyfish/${name}.tar.gz"; + sha256 = "04p80gwwlhxjp8zpjf70a62x69l9rlvnz1pwi5ar52gyajn8z6z1"; + }; + + buildInputs = with self; [ pytest unicodecsv ]; + + meta = with stdenv.lib; { + homepage = http://github.com/sunlightlabs/jellyfish; + description = "Approximate and phonetic matching of strings"; + maintainers = [ maintainers.koral ]; + }; + }; + jinja2 = buildPythonPackage rec { name = "Jinja2-2.7.3"; @@ -12670,6 +12688,27 @@ let }; }; + unicodecsv = buildPythonPackage rec { + version = "0.12.0"; + name = "unicodecsv-${version}"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/u/unicodecsv/${name}.tar.gz"; + sha256 = "012yvwza38bq84z9p8xzlxn7bkz0gf5y2nm5js7cyn766cy53dxh"; + }; + + # ImportError: No module named runtests + #buildInputs = with self; [ unittest2 ]; + doCheck = false; + + meta = with stdenv.lib; { + description = "Drop-in replacement for Python2's stdlib csv module, with unicode support"; + homepage = https://github.com/jdunck/python-unicodecsv; + maintainers = [ maintainers.koral ]; + }; + }; + unittest2 = buildPythonPackage rec { version = "0.5.1"; name = "unittest2-${version}"; From d9411d53e9eaae5d1cae16fe478a56e326e52550 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 8 May 2015 14:38:34 +0200 Subject: [PATCH 21/98] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-files/commit/533fd30acc55cb1db3f3a8339b66e99c934566c9 with hackage2nix revision f8474108eabeb513175d845709f749070ffdd8ba --- .../haskell-modules/hackage-packages.nix | 260 +++++++++++++----- 1 file changed, 191 insertions(+), 69 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 74b79921291..93c7bbbf43a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1434,8 +1434,8 @@ self: { }: mkDerivation { pname = "BiobaseXNA"; - version = "0.9.1.0"; - sha256 = "0mwfzfhsywrv70gz8fc7s84v5hra0qidckjv4y0ps80ha7qv4kci"; + version = "0.9.1.1"; + sha256 = "1r9axc6g4fqc3sb47km3pfadx193s68ign8ac4va9wj8a5hilbgq"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -1551,6 +1551,7 @@ 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"; @@ -10492,17 +10493,17 @@ self: { "MusicBrainz" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra - , HTTP, http-conduit, http-types, monad-control, old-locale - , resourcet, text, time, transformers, vector, xml-conduit + , HTTP, http-conduit, http-types, monad-control, resourcet, text + , time, time-locale-compat, transformers, vector, xml-conduit , xml-types }: mkDerivation { pname = "MusicBrainz"; - version = "0.2.3"; - sha256 = "0xwyrjxrff38ijyppfbxsr2nbhg6zd7k0i2avch10dn15xfxapk8"; + version = "0.2.4"; + sha256 = "1f1x3iivxkn5d7w3xyh2q8mpn1mg24c1n6v8dvdsph745xszh8fj"; buildDepends = [ aeson base bytestring conduit conduit-extra HTTP http-conduit - http-types monad-control old-locale resourcet text time + http-types monad-control resourcet text time time-locale-compat transformers vector xml-conduit xml-types ]; homepage = "http://floss.scru.org/hMusicBrainz"; @@ -12290,9 +12291,9 @@ self: { mkDerivation { pname = "QuickCheck-safe"; version = "0.1.0.1"; - revision = "1"; + revision = "3"; sha256 = "0rxqd1n814b9mf6zg1i0g9d96ym9xqdgky7w7qf5bnnnpkk1ckc7"; - editedCabalFile = "7609c326853799a0cd519bd258c03f89664ee37795ff3099aa3d5004d1f2dee8"; + editedCabalFile = "4e791ac9fa2f2e73029ab92d17e3ab93571ec5b1d5acda0ea1f340c5ee1346f6"; buildDepends = [ base QuickCheck ]; description = "Safe reimplementation of QuickCheck's core"; license = stdenv.lib.licenses.mit; @@ -19632,8 +19633,8 @@ self: { }: mkDerivation { pname = "api-builder"; - version = "0.7.0.1"; - sha256 = "12wkny82bn843zbvq6vcwmd7lxzdg9g978bhyy9r9gc81mgmwf8s"; + version = "0.7.1.0"; + sha256 = "1kvn725ac7d8mx6r3wak046i706v8m7b7wlaxkkm8lc9b7hr5s9z"; buildDepends = [ aeson attoparsec base bifunctors bytestring either HTTP http-client http-conduit http-types text transformers @@ -19642,7 +19643,6 @@ self: { aeson base bytestring Cabal containers hspec http-conduit text transformers ]; - jailbreak = true; homepage = "https://github.com/intolerable/api-builder"; description = "Library for easily building REST API wrappers in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -32011,8 +32011,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "clock"; - version = "0.4.5.0"; - sha256 = "0qa59yj4qr9hah1mljfmjv511p0nh7m67dgdz1zh9lnwwgky7biw"; + version = "0.4.6.0"; + sha256 = "0xrkw13dixj5pv79l10bl0z51kmplbkg30rhbykzx2imvv9rxixr"; buildDepends = [ base ]; homepage = "https://github.com/corsis/clock"; description = "High-resolution clock functions: monotonic, realtime, cputime"; @@ -43654,16 +43654,15 @@ self: { }) {}; "dynamic-state" = callPackage - ({ mkDerivation, base, binary, bytestring, concrete-typerep - , hashable, unordered-containers + ({ mkDerivation, base, binary, bytestring, hashable + , unordered-containers }: mkDerivation { pname = "dynamic-state"; - version = "0.1.1.0"; - sha256 = "18dc6fbnyk3q7n7gvqrgy98qc2grq0algr2jnc1ai3vm9bqh2x8n"; + version = "0.2.0.0"; + sha256 = "1dp0sp5cjk7rga9jkjdhl1alpj9g6g51zm57g58b64h070b9r82k"; buildDepends = [ - base binary bytestring concrete-typerep hashable - unordered-containers + base binary bytestring hashable unordered-containers ]; description = "Optionally serializable dynamic state keyed by type"; license = stdenv.lib.licenses.gpl2; @@ -44940,7 +44939,9 @@ self: { mkDerivation { pname = "email-validate"; version = "2.1.1"; + revision = "1"; sha256 = "1wka2zd6s8zf99d33z6mzprxq3aaxmm9z9rnfjs4j83930h61qdq"; + editedCabalFile = "ec98fb65657fbd6705b80a2fbad8836246515f7ed84f3f382d88e0ee2d92645f"; buildDepends = [ attoparsec base bytestring ghc-prim ]; testDepends = [ base bytestring HUnit QuickCheck test-framework @@ -46278,8 +46279,8 @@ self: { ({ mkDerivation, base, groups }: mkDerivation { pname = "exact-pi"; - version = "0.1.0.0"; - sha256 = "01vljbgsqwiv6chlp1nfvmfc4wd3nq89mvn7x8s68dhfd8f8m2g6"; + version = "0.1.1.0"; + sha256 = "1n62886wjnnmdi1bjvw51ka21v882m1yc0m87kzq7kx7knvh1xxx"; buildDepends = [ base groups ]; homepage = "https://github.com/dmcclean/exact-pi"; description = "Exact rational multiples of pi (and integer powers of pi)"; @@ -47148,8 +47149,8 @@ self: { }: mkDerivation { pname = "fasta"; - version = "0.6.1.0"; - sha256 = "1hxp7r08cca8yyfgkgv2vrk8i989bxw6pd211zy65xsfd6gmf7nr"; + version = "0.6.1.1"; + sha256 = "1jwsf0mrr98wn5m4aavdqclv667kkgfqlgjn3dvrgnw8jrywzzd2"; buildDepends = [ base containers foldl lens parsec pipes pipes-group pipes-text split text @@ -52665,16 +52666,16 @@ self: { ({ mkDerivation, aeson, async, aws, base, blaze-builder , bloomfilter, bup, byteable, bytestring, case-insensitive , clientsession, conduit, conduit-extra, containers, crypto-api - , cryptohash, curl, data-default, dataenc, DAV, dbus, directory - , dlist, dns, edit-distance, esqueleto, exceptions, fdo-notify - , feed, filepath, git, gnupg1, gnutls, hamlet, hinotify, hslogger - , http-client, http-conduit, http-types, IfElse, json, lsof - , MissingH, monad-control, monad-logger, mtl, network, network-info + , cryptohash, curl, data-default, DAV, dbus, directory, dlist, dns + , edit-distance, esqueleto, exceptions, fdo-notify, feed, filepath + , 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, old-locale , openssh, optparse-applicative, path-pieces, perl, persistent , persistent-sqlite, persistent-template, process, QuickCheck - , random, regex-tdfa, resourcet, rsync, SafeSemaphore, securemem - , shakespeare, stm, tasty, tasty-hunit, tasty-quickcheck + , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi + , securemem, shakespeare, stm, tasty, tasty-hunit, tasty-quickcheck , tasty-rerun, template-haskell, text, time, torrent, transformers , unix, unix-compat, utf8-string, uuid, wai, wai-extra, warp , warp-tls, wget, which, xml-types, yesod, yesod-core @@ -52682,25 +52683,25 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "5.20150420"; - sha256 = "0jigzf550qzphzcc3wma03kdzq478s6azd992hkcxv9ymxhg2l7x"; + version = "5.20150508"; + sha256 = "07p9ifk1h0i9gmg36vdrn6nkp0m46g4pkv1jkjm7ip5bgc76382c"; isLibrary = false; isExecutable = true; buildDepends = [ aeson async aws base blaze-builder bloomfilter byteable bytestring case-insensitive clientsession conduit conduit-extra containers - crypto-api cryptohash data-default dataenc DAV dbus directory dlist - dns edit-distance esqueleto exceptions fdo-notify feed filepath - gnutls 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 - old-locale optparse-applicative path-pieces persistent - persistent-sqlite persistent-template process QuickCheck random - regex-tdfa resourcet SafeSemaphore securemem shakespeare stm tasty - tasty-hunit tasty-quickcheck tasty-rerun template-haskell text time - torrent transformers unix unix-compat utf8-string uuid wai - wai-extra warp warp-tls xml-types yesod yesod-core yesod-default - yesod-form yesod-static + crypto-api cryptohash data-default DAV dbus directory dlist dns + edit-distance esqueleto exceptions fdo-notify feed filepath gnutls + 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 old-locale + optparse-applicative path-pieces persistent persistent-sqlite + persistent-template process QuickCheck random regex-tdfa resourcet + SafeSemaphore sandi securemem shakespeare stm tasty tasty-hunit + tasty-quickcheck tasty-rerun template-haskell text time torrent + transformers unix unix-compat utf8-string uuid wai wai-extra warp + warp-tls xml-types yesod yesod-core yesod-default yesod-form + yesod-static ]; buildTools = [ bup curl git gnupg1 lsof openssh perl rsync wget which @@ -57398,6 +57399,7 @@ self: { system-filepath tagsoup test-framework test-framework-hunit test-framework-quickcheck2 text time time-locale-compat ]; + jailbreak = true; homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; license = stdenv.lib.licenses.bsd3; @@ -82502,8 +82504,8 @@ self: { }: mkDerivation { pname = "log"; - version = "0.1.0"; - sha256 = "1smki1bp50vnmq6i2gxafj271sqwbizfdyqx0ggar6zbxv436gzm"; + version = "0.1.1"; + sha256 = "0kzziark5y41ig6z3qaa66x5avibwp6k74qcs9jf38hnl9z74pfr"; buildDepends = [ aeson aeson-pretty base bytestring deepseq exceptions hpqtypes monad-control monad-time mtl old-locale split stm text time @@ -93770,6 +93772,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "osc" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring + , data-binary-ieee754, network + }: + mkDerivation { + pname = "osc"; + version = "1.0.0.2"; + sha256 = "0f7diw6nna7mq5rsn63jk9n230pnrr5ppi5dp8rcpniqry2gs1q3"; + buildDepends = [ + attoparsec base binary bytestring data-binary-ieee754 network + ]; + homepage = "https://github.com/peacememories/haskell-osc"; + description = "A library to handle messages in the OSC protocol"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "osdkeys" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra , containers, libnotify, process, resourcet, time, transformers @@ -94186,20 +94204,21 @@ self: { "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , containers, data-default, directory, filepath, hs-bibutils, mtl - , old-locale, pandoc, pandoc-types, parsec, process, rfc5051, split - , syb, tagsoup, temporary, text, time, vector, xml-conduit, yaml + , old-locale, pandoc, pandoc-types, parsec, process, rfc5051 + , setenv, split, syb, tagsoup, temporary, text, time, vector + , xml-conduit, yaml }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.6.0.1"; - sha256 = "05w6djrgpgf68shhbiv42gl0lvjiv8n9rrn0cd959dl3zdznssdg"; + version = "0.7"; + sha256 = "1ayh9gpkj128rsxiqjbgwr62fipc5a5h5vkkjnicjxgpwshnrcb8"; isLibrary = true; isExecutable = true; buildDepends = [ aeson aeson-pretty attoparsec base bytestring containers data-default directory filepath hs-bibutils mtl old-locale pandoc - pandoc-types parsec process rfc5051 split syb tagsoup temporary - text time vector xml-conduit yaml + pandoc-types parsec process rfc5051 setenv split syb tagsoup + temporary text time vector xml-conduit yaml ]; testDepends = [ aeson base bytestring directory filepath pandoc pandoc-types @@ -95033,6 +95052,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "path" = callPackage + ({ mkDerivation, base, exceptions, filepath, hspec, HUnit, mtl + , template-haskell + }: + mkDerivation { + pname = "path"; + version = "0.0.0"; + sha256 = "1gk9z25d7swhg7zi6nxd076wcqfw2hxvq29hxqzc3drdaas2sc0b"; + buildDepends = [ base exceptions filepath template-haskell ]; + testDepends = [ base hspec HUnit mtl ]; + description = "Path"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "path-pieces" = callPackage ({ mkDerivation, base, hspec, HUnit, QuickCheck, text, time }: mkDerivation { @@ -96327,19 +96360,52 @@ self: { }) {}; "pg-harness" = callPackage + ({ mkDerivation, async, base, bytestring, HTTP, ini + , postgresql-simple, random, scotty, text, transformers + }: + mkDerivation { + pname = "pg-harness"; + version = "0.2.1"; + sha256 = "0ax6ch87jqbcy5il17n0kppy8pn44rj6ljksamh61sg438vcdhqf"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + async base bytestring HTTP ini postgresql-simple random scotty text + transformers + ]; + jailbreak = true; + homepage = "https://github.com/BardurArantsson/pg-harness"; + description = "REST service and library for creating/consuming temporary PostgreSQL databases"; + license = stdenv.lib.licenses.agpl3; + }) {}; + + "pg-harness-client" = callPackage + ({ mkDerivation, base, bytestring, HTTP }: + mkDerivation { + pname = "pg-harness-client"; + version = "0.3.1"; + sha256 = "12z5354in4zswn219cvxhqbva76p2jsccmzdn5iyw5g401546lr2"; + buildDepends = [ base bytestring HTTP ]; + homepage = "https://github.com/BardurArantsson/pg-harness"; + description = "Client library for pg-harness-server"; + license = stdenv.lib.licenses.bsd2; + }) {}; + + "pg-harness-server" = callPackage ({ mkDerivation, async, base, ini, postgresql-simple, random , scotty, text, transformers }: mkDerivation { - pname = "pg-harness"; - version = "0.1.0"; - sha256 = "0ds161h0pcazq1lnbf5m89vm36mwjnhxakglyb2ixg39sd5a03g1"; + pname = "pg-harness-server"; + version = "0.3.1"; + sha256 = "0459i1x5hsxkihyb5a8ca947ngs0gg8866s77bcdsifjw6b3cb4a"; isLibrary = false; isExecutable = true; buildDepends = [ async base ini postgresql-simple random scotty text transformers ]; jailbreak = true; + homepage = "https://github.com/BardurArantsson/pg-harness"; description = "REST service for creating temporary PostgreSQL databases"; license = stdenv.lib.licenses.agpl3; }) {}; @@ -113496,6 +113562,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "sorted-list" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "sorted-list"; + version = "0.1.2.1"; + sha256 = "0jjzhi2wj4ca8bvwbv5nnljyli7c9ravigkndk85wdyzz74n0qbh"; + buildDepends = [ base ]; + homepage = "https://github.com/Daniel-Diaz/sorted-list/blob/master/README.md"; + description = "Type-enforced sorted lists and related functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "sorting" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -119650,14 +119728,14 @@ self: { ({ mkDerivation, base, c2hs, termbox }: mkDerivation { pname = "termbox-bindings"; - version = "0.1.0.0"; - sha256 = "050m1yl6x619pnkmfmg0zkr4rw5l93vgb1pjg9xizrdrqfh5dxhi"; + version = "0.1.0.3"; + sha256 = "00s3j6ccc63ycbj2lxzl2200ffwzslaxdny7d0b9dyzgn6n1pal7"; isLibrary = true; isExecutable = true; buildDepends = [ base ]; buildTools = [ c2hs ]; extraLibraries = [ termbox ]; - homepage = "github.com/luciferous/termbox-bindings"; + homepage = "https://github.com/luciferous/termbox-bindings"; description = "Bindings to the termbox library"; license = stdenv.lib.licenses.bsd3; }) { termbox = null;}; @@ -121062,6 +121140,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-typegraph" = callPackage + ({ mkDerivation, array, base, bytestring, containers, data-default + , deepseq, ghc-prim, haskell-src-exts, hspec, hspec-core, lens, mtl + , syb, template-haskell, text, th-desugar, th-orphans + , th-reify-many + }: + mkDerivation { + pname = "th-typegraph"; + version = "0.14"; + sha256 = "1f2wgr429hkv687mk9qgaqnr1n9nznl90cy7w74w4jzp6fd6rskp"; + buildDepends = [ + base containers data-default haskell-src-exts lens mtl syb + template-haskell th-desugar th-orphans + ]; + testDepends = [ + array base bytestring containers deepseq ghc-prim hspec hspec-core + lens mtl syb template-haskell text th-desugar th-orphans + th-reify-many + ]; + homepage = "https://github.com/seereason/th-typegraph"; + description = "Graph of the subtype relation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "themoviedb" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, either , http-client, http-client-tls, http-types, mtl, network @@ -124044,15 +124146,14 @@ self: { }: mkDerivation { pname = "twitter-feed"; - version = "0.1.1.4"; - sha256 = "006qdp9imdnaprpaf4yk0zks0p3ry4ngag4i533wyik2xrz3q8ir"; + version = "0.1.1.5"; + sha256 = "1205s5a7x8vnv09717x6a2dv7y8rvzcxmmh6hm4cyph6b5p485vz"; buildDepends = [ aeson authenticate-oauth base bytestring http-conduit ]; 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; @@ -125165,22 +125266,23 @@ self: { }) {}; "unbound-generics" = callPackage - ({ mkDerivation, base, containers, contravariant, mtl, QuickCheck - , tasty, tasty-hunit, tasty-quickcheck, transformers - , transformers-compat + ({ mkDerivation, base, containers, contravariant, mtl, profunctors + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, transformers, transformers-compat }: mkDerivation { pname = "unbound-generics"; - version = "0.1"; - sha256 = "10flwmkmpnkxib1v9f5qv11wnvjmnn3aiag4f2qgpdc3hadq6j0q"; + version = "0.1.2"; + sha256 = "14mcv61ci6azzykx287b9cpcwyzbzr66i5s43vdd9wnzrg4mia03"; buildDepends = [ - base containers contravariant mtl transformers transformers-compat + base containers contravariant mtl profunctors template-haskell + transformers transformers-compat ]; testDepends = [ base mtl QuickCheck tasty tasty-hunit tasty-quickcheck ]; homepage = "http://github.com/lambdageek/unbound-generics"; - description = "Reimplementation of Unbound using GHC Generics"; + description = "Support for programming with names and binders using GHC Generics"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -134039,6 +134141,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-crud" = callPackage + ({ mkDerivation, base, classy-prelude, containers, monad-control + , persistent, random, stm, uuid, yesod-core, yesod-form + , yesod-persistent + }: + mkDerivation { + pname = "yesod-crud"; + version = "0.1.1"; + sha256 = "06m24i27842pc599zrmj5nv0afx8ci07961gjagdsc02zhpx7896"; + buildDepends = [ + base classy-prelude containers monad-control persistent random stm + uuid yesod-core yesod-form yesod-persistent + ]; + homepage = "https://github.com/league/yesod-crud"; + description = "Generic administrative CRUD operations as a Yesod subsite"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "yesod-datatables" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, data-default , HUnit, monad-control, persistent, persistent-sqlite @@ -135785,7 +135905,9 @@ self: { mkDerivation { pname = "zlib"; version = "0.6.1.0"; + revision = "1"; sha256 = "1yc4zfysbj28px064bfwz9n3b3i57c1dsfvkzgfxxmgj1mq65q7n"; + editedCabalFile = "4efd1cd219decf6e6a97795a52344922c36aace77dc4b6834502c218d48b9f13"; buildDepends = [ base bytestring ]; testDepends = [ base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck From 387eaf74ef0a61debe45764cdd185aaa03db1ae4 Mon Sep 17 00:00:00 2001 From: koral Date: Sat, 9 May 2015 09:37:34 +0000 Subject: [PATCH 22/98] mpv: 0.8.3 -> 0.9.1 --- pkgs/applications/video/mpv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 464f5130b67..8e516fd91e3 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -59,11 +59,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "mpv-${version}"; - version = "0.8.3"; + version = "0.9.1"; src = fetchurl { url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz"; - sha256 = "1kw9hr957cxqgm2i94bgqc6sskm6bwhm0akzckilhs460b43h409"; + sha256 = "17hpx8wb4b6hjhc208jn71p02s0gd6665vzyyy249k6jfn2nh8sx"; }; buildInputs = From e11306a366473f6cbbe7dc50e9043b8ec8ce42db Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 May 2015 11:39:38 +0200 Subject: [PATCH 23/98] haskell-smaoin has been fixed upstream. --- 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 baec3bd6f80..7609fca6286 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -811,7 +811,4 @@ self: super: { # https://github.com/adamwalker/sdr/issues/1 sdr = dontCheck super.sdr; - # Reported upstream by e-mail. - smaoin = dontCheck super.smaoin; - } From e047ac86d62aa6dd5e8f29919e95076772b9d0ed Mon Sep 17 00:00:00 2001 From: koral Date: Sat, 9 May 2015 10:45:14 +0000 Subject: [PATCH 24/98] rmlint: 2.0.0 -> 2.1.0 --- pkgs/tools/misc/rmlint/default.nix | 6 ++---- pkgs/tools/misc/rmlint/fix-scons.patch | 22 ---------------------- 2 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 pkgs/tools/misc/rmlint/fix-scons.patch diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index aed93775ce9..9e61a5c195e 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -4,15 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "rmlint-${version}"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { url = "https://github.com/sahib/rmlint/archive/v${version}.tar.gz"; - sha256 = "14jiswagipsmzxclcskn672ws4126p65l6hlzkkvanyv8gmpv90f"; + sha256 = "17hqkx1ji6rbvliji18my16b23ig9d6v4azgypwl0fam2ar4rm4g"; }; - patches = [ ./fix-scons.patch ]; - configurePhase = "scons config"; buildInputs = [ gettext glib json_glib libelf pkgconfig scons sphinx utillinux ]; diff --git a/pkgs/tools/misc/rmlint/fix-scons.patch b/pkgs/tools/misc/rmlint/fix-scons.patch deleted file mode 100644 index 4d7d832f13d..00000000000 --- a/pkgs/tools/misc/rmlint/fix-scons.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git b/SConstruct a/SConstruct -old mode 100644 -new mode 100755 -index a7fca2e..561007e ---- b/SConstruct -+++ a/SConstruct -@@ -404,11 +404,10 @@ options = dict( - SHLINKCOMSTR=link_shared_library_message, - LINKCOMSTR=link_program_message, - PREFIX=GetOption('prefix'), -- ENV={ -- 'PATH': os.environ['PATH'], -- 'TERM': os.environ['TERM'], -- 'HOME': os.environ['HOME'] -- } -+ ENV = dict([ (key, os.environ[key]) -+ for key in os.environ -+ if key in ['PATH', 'TERM', 'HOME', 'PKG_CONFIG_PATH'] -+ ]) - ) - - if ARGUMENTS.get('VERBOSE') == "1": From 1c371606cedccf1f13f86af88822f1412c6eea93 Mon Sep 17 00:00:00 2001 From: koral Date: Sat, 9 May 2015 10:52:25 +0000 Subject: [PATCH 25/98] ranger: 1.7.0 -> 1.7.1 --- pkgs/applications/misc/ranger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index cc8bd42ec39..7c08bf9d2e7 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPythonPackage, python, fetchurl }: buildPythonPackage rec { - name = "ranger-1.7.0"; + name = "ranger-1.7.1"; meta = { description = "File manager with minimalistic curses interface"; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchurl { url = "http://ranger.nongnu.org/${name}.tar.gz"; - sha256 = "066lp1k2zcz2lnww2aj0m3fgn9g5ms67kxgclhgq66pxkjwgc4kx"; + sha256 = "11nznx2lqv884q9d2if63101prgnjlnan8pcwy550hji2qsn3c7q"; }; propagatedBuildInputs = with python.modules; [ curses ]; From 073d4102b384cf86dd59fcfd200be2e0bbdb5784 Mon Sep 17 00:00:00 2001 From: koral Date: Sat, 9 May 2015 11:02:19 +0000 Subject: [PATCH 26/98] slock: 1.1 -> 1.2 --- pkgs/misc/screensavers/slock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix index c88be58abb2..5c731ff20d7 100644 --- a/pkgs/misc/screensavers/slock/default.nix +++ b/pkgs/misc/screensavers/slock/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, xproto, libX11, libXext }: stdenv.mkDerivation rec { - name = "slock-1.1"; + name = "slock-1.2"; src = fetchurl { url = "http://dl.suckless.org/tools/${name}.tar.gz"; - sha256 = "1r70s3npmp0nyrfdsxz8cw1i1z8n9phqdlw02wjphv341h3yajp0"; + sha256 = "1crkyr4vblhciy6vnbjwwjnlkm9yg2hzq16v6hzxm20ai67na0il"; }; buildInputs = [ xproto libX11 libXext ]; installFlags = "DESTDIR=\${out} PREFIX="; From d40cf483cc1ccb70c2d665e4c80e78ed065ce4a8 Mon Sep 17 00:00:00 2001 From: koral Date: Sat, 9 May 2015 11:46:31 +0000 Subject: [PATCH 27/98] git: 2.3.6 -> 2.4.0 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 474d509297f..620d3264be8 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -9,7 +9,7 @@ }: let - version = "2.3.6"; + version = "2.4.0"; svn = subversionClient.override { perlBindings = true; }; in @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1z30gj5a9n0sylqlwd35vvpi49051ql44xzmarkkcirbx5a1rq1w"; + sha256 = "095v8n0b0c314sfg5mrnxjx2d9mklbjcmajh92kmi6b5jkfkhd5k"; }; patches = [ From 31b330828c37eb6bea307ae41a25809eb10cc46e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 May 2015 11:40:02 +0200 Subject: [PATCH 28/98] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-files/commit/7424fa13dba1209a3dccbd01c99675ea44e41b05 with hackage2nix revision 5e6df99a29c3e80bb071af288038312b19baf022 --- .../haskell-modules/hackage-packages.nix | 51 +++++++++++++------ 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 93c7bbbf43a..56c6418afc6 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -12497,6 +12497,7 @@ self: { homepage = "http://www.tbi.univie.ac.at/~choener/"; description = "Draw RNA secondary structures"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "RNAwolf" = callPackage @@ -14777,6 +14778,7 @@ self: { homepage = "https://github.com/avieth/TypeNat"; description = "Some Nat-indexed types for GHC"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "TypingTester" = callPackage @@ -29306,8 +29308,8 @@ self: { }: mkDerivation { pname = "caramia"; - version = "0.7.2.1"; - sha256 = "01l6i8cb2q73vc4w6fbn90mkx7sxxsnwzhj0jg4yjhnrg4js0hlh"; + version = "0.7.2.2"; + sha256 = "1cvpyad7kmkndan1bfpfaav6lara8g78x02pgascrq8n73b2jcgs"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -29318,7 +29320,6 @@ self: { base containers HUnit linear sdl2 test-framework test-framework-hunit test-framework-quickcheck2 transformers ]; - jailbreak = true; homepage = "https://github.com/Noeda/caramia/"; description = "High-level OpenGL bindings"; license = stdenv.lib.licenses.mit; @@ -32480,10 +32481,13 @@ self: { mkDerivation { pname = "cndict"; version = "0.6.1"; + revision = "1"; sha256 = "0pi0n1chwv6y3ch7dw2smrllwsdiy6r295lmmsnfnbprc8w6gksq"; + editedCabalFile = "6371863e768d5b9d01f80b10783bb7ab4530e8e168d0c0bcc0fcee2a4f1aa468"; buildDepends = [ base binary bytestring cassava containers file-embed text vector ]; + jailbreak = true; homepage = "https://github.com/Lemmih/cndict"; description = "Chinese/Mandarin <-> English dictionary, Chinese lexer"; license = stdenv.lib.licenses.publicDomain; @@ -93346,26 +93350,26 @@ self: { "opml-conduit" = callPackage ({ mkDerivation, base, case-insensitive, conduit - , conduit-combinators, containers, data-default, exceptions, lens - , mono-traversable, monoid-subclasses, mtl, network-uri, QuickCheck + , conduit-combinators, containers, data-default, exceptions + , hashable, hashable-time, hlint, lens, mono-traversable + , monoid-subclasses, mtl, network-uri, QuickCheck , quickcheck-instances, resourcet, semigroups, tasty, tasty-hunit - , tasty-quickcheck, text, time, timerep, xml-conduit, xml-types + , tasty-quickcheck, text, time, timerep, unordered-containers + , xml-conduit, xml-types }: mkDerivation { pname = "opml-conduit"; - version = "0.1.0.0"; - revision = "2"; - sha256 = "055ngv2ibb7bk99y67ag9y7xxhyzag08mgb6zf1aqfjgpna6dkcf"; - editedCabalFile = "74ca928e036892a1db09b1309addb87cba9dd7332fc5c9aab8413e6635e357c9"; + version = "0.2.0.0"; + sha256 = "0dpsxssr8h3ph9c5plrmpxv9mv1mg5zb3wrwfbkyb5g7ja91qs4b"; buildDepends = [ base case-insensitive conduit containers data-default exceptions - lens mono-traversable monoid-subclasses network-uri QuickCheck - quickcheck-instances semigroups text time timerep xml-conduit - xml-types + hashable hashable-time lens mono-traversable monoid-subclasses + network-uri QuickCheck quickcheck-instances semigroups text time + timerep unordered-containers xml-conduit xml-types ]; testDepends = [ - base conduit conduit-combinators containers exceptions lens mtl - network-uri resourcet tasty tasty-hunit tasty-quickcheck + base conduit conduit-combinators containers exceptions hlint lens + mtl network-uri resourcet tasty tasty-hunit tasty-quickcheck xml-conduit ]; homepage = "https://github.com/k0ral/opml-conduit"; @@ -99414,6 +99418,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "prettyFunctionComposing" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "prettyFunctionComposing"; + version = "1.0.1"; + sha256 = "0c39dyjlcrah1aq2rkk7zqysmzxqym6chv8x9zmifclvn5a4j98b"; + buildDepends = [ base ]; + description = "prettier function composition by (°)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "prettyclass" = callPackage ({ mkDerivation, base, pretty }: mkDerivation { @@ -99755,8 +99770,11 @@ self: { mkDerivation { pname = "process-listlike"; version = "1.0"; + revision = "1"; sha256 = "0yaz90pfpx9kahwbvbvl2ir62imxxsq7v72i67ac2zv3585c427r"; + editedCabalFile = "72b239b889868394c365985197588cda0ec8aac03d4796a9e212b4044c966f16"; buildDepends = [ base bytestring deepseq ListLike process text ]; + jailbreak = true; homepage = "https://github.com/ddssff/process-listlike"; description = "Process extras"; license = stdenv.lib.licenses.mit; @@ -113494,6 +113512,7 @@ self: { homepage = "https://github.com/mhwombat/som"; description = "Self-Organising Maps"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sonic-visualiser" = callPackage @@ -119738,6 +119757,7 @@ self: { homepage = "https://github.com/luciferous/termbox-bindings"; description = "Bindings to the termbox library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) { termbox = null;}; "terminal-progress-bar" = callPackage @@ -125284,6 +125304,7 @@ self: { homepage = "http://github.com/lambdageek/unbound-generics"; description = "Support for programming with names and binders using GHC Generics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unbounded-delays" = callPackage From 1d119271e7914c75835ef354d784d5a813fea70d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 May 2015 11:49:54 +0200 Subject: [PATCH 29/98] haskell-sandi: jailbreak restriction on "base == 4.8.*" so that we can build git-annex and hledger Reported in https://github.com/magthe/sandi/issues/7. --- pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix | 5 +++++ pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index 1adccd36dca..8be816b0c9b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -80,4 +80,9 @@ self: super: { # and are virtually impossible to compile on Hydra. conduit = super.conduit_1_2_4_1; + # https://github.com/magthe/sandi/issues/7 + sandi = overrideCabal super.sandi (drv: { + patchPhase = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal"; } + ); + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index f481f75c2f8..21fdc86d89a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -136,4 +136,9 @@ self: super: { # and are virtually impossible to compile on Hydra. conduit = super.conduit_1_2_4_1; + # https://github.com/magthe/sandi/issues/7 + sandi = overrideCabal super.sandi (drv: { + patchPhase = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal"; } + ); + } From c4bc6fc243e4995badfdb6f81443b80b8500a3ce Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 May 2015 12:18:04 +0200 Subject: [PATCH 30/98] haskell-email-validate: disable test suite to fix the build Reported in https://github.com/Porges/email-validate-hs/issues/12. --- 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 7609fca6286..b9c80eab34d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -811,4 +811,7 @@ self: super: { # https://github.com/adamwalker/sdr/issues/1 sdr = dontCheck super.sdr; + # https://github.com/Porges/email-validate-hs/issues/12 + email-validate = dontCheck super.email-validate; + } From 75ebc3cf1dc1365be5a05018fc8e5409c66025cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 9 May 2015 14:58:40 +0200 Subject: [PATCH 31/98] doc/stdenv: fix manual build after #7711 --- doc/stdenv.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/stdenv.xml b/doc/stdenv.xml index a03b3716a87..6fdebda09f9 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -545,13 +545,13 @@ script) if it exists. such.. If this is undesirable, set this variable to true. - + dontDisableStatic By default, when the configure script has , the option is added to the configure flags. - If this is undesirable, set this variable to + If this is undesirable, set this variable to true. From cd11803aa1142606e0df7a3546138c924d765c63 Mon Sep 17 00:00:00 2001 From: rushmorem Date: Fri, 8 May 2015 12:10:40 +0200 Subject: [PATCH 32/98] Add s3ql package S3QL is a file system that stores all its data online using storage services like Google Storage, Amazon S3, or OpenStack. S3QL effectively provides a hard disk of dynamic, infinite capacity that can be accessed from any computer with internet access running Linux, FreeBSD or OS-X. --- pkgs/tools/backup/s3ql/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 22 ++++++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 pkgs/tools/backup/s3ql/default.nix diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix new file mode 100644 index 00000000000..b455c672b10 --- /dev/null +++ b/pkgs/tools/backup/s3ql/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, python3Packages, sqlite }: + +python3Packages.buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "s3ql"; + version = "2.13"; + + src = fetchurl { + url = "https://bitbucket.org/nikratio/${pname}/downloads/${name}.tar.bz2"; + sha256 = "0bxps1iq0rv7bg2b8mys6zyjp912knm6zmafhid1jhsv3xyby4my"; + }; + + propagatedBuildInputs = with python3Packages; + [ sqlite apsw pycrypto requests defusedxml dugong llfuse ]; + + meta = with stdenv.lib; { + description = "A full-featured file system for online data storage"; + homepage = "https://bitbucket.org/nikratio/s3ql"; + license = licenses.gpl3; + maintainers = with maintainers; [ rushmorem ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c38feccb510..0222aa18212 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9629,6 +9629,8 @@ let rtkit = callPackage ../os-specific/linux/rtkit { }; + s3ql = callPackage ../tools/backup/s3ql { }; + sassc = callPackage ../development/tools/sassc { }; schedtool = callPackage ../os-specific/linux/schedtool { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 73fa69b4cb0..d29a8410a34 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1004,6 +1004,28 @@ let }; }; + defusedxml = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "defusedxml"; + version = "0.4.1"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/${pname}/${name}.tar.gz"; + sha256 = "0y147zy3jqmk6ly7fbhqmzn1hf41xcb53f2vcc3m8x4ba5d1smfd"; + }; + }; + + dugong = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "dugong"; + version = "3.5"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/${pname}/${name}.tar.bz2"; + sha256 = "0y0rdxbiwm03zv6vpvapqilrird3h8ijz7xmb0j7ds5j4p6q3g24"; + }; + + disabled = pythonOlder "3.3"; # Library does not support versions older than 3.3 + }; + iowait = buildPythonPackage rec { name = "iowait-0.2"; From 41ad1f947b5226f658bcd74e5300c9c67d0e702a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 9 May 2015 03:43:40 +0200 Subject: [PATCH 33/98] Add cfr 0_100: another Java decompiler --- pkgs/development/tools/java/cfr/default.nix | 41 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/tools/java/cfr/default.nix diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix new file mode 100644 index 00000000000..6025a59f44c --- /dev/null +++ b/pkgs/development/tools/java/cfr/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, jre }: + +let version = "0_100"; in +stdenv.mkDerivation rec { + name = "cfr-${version}"; + + src = fetchurl { + sha256 = "0q5kh5qdksykz339p55jz0q5cjqvxdzv3a7r4kkijgbfjm1ldr5f"; + url = "http://www.benf.org/other/cfr/cfr_${version}.jar"; + }; + + meta = with stdenv.lib; { + inherit version; + description = "Another java decompiler"; + longDescription = '' + CFR will decompile modern Java features - Java 8 lambdas (pre and post + Java beta 103 changes), Java 7 String switches etc, but is written + entirely in Java 6. + ''; + homepage = http://www.benf.org/other/cfr/; + license = with licenses; mit; + platforms = with platforms; linux; + maintainers = with maintainers; [ nckx ]; + }; + + buildInputs = [ jre ]; + + phases = [ "installPhase" ]; + + installPhase = '' + jar=$out/share/cfr/cfr_${version}.jar + + install -Dm644 ${src} $jar + + cat << EOF > cfr + #!${stdenv.shell} + exec ${jre}/bin/java -jar $jar "\''${@}" + EOF + install -Dm755 cfr $out/bin/cfr + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ac1f36d5c5..3269737a3b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5043,6 +5043,8 @@ let ruby = ruby_2_0_0; }; + cfr = callPackage ../development/tools/java/cfr { }; + chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome.GConf; }; chrpath = callPackage ../development/tools/misc/chrpath { }; From 4c05e484116b97d3e24ff0ca3fcd550f3a67b1b5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 9 May 2015 05:25:01 +0200 Subject: [PATCH 34/98] man-pages 3.83 -> 4.00 --- pkgs/data/documentation/man-pages/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 5c93ecc9469..14cd41adbec 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: -let version = "3.83"; in +let version = "4.00"; in stdenv.mkDerivation rec { name = "man-pages-${version}"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz"; - sha256 = "1wksxxfvn8avfl01qk0i61zzgkkay29lpmbfal26a542yahydz3j"; + sha256 = "18zb1g12s15sanffh0sykmmyx0j176pp7q1xxs0gk0imgvmn8hj4"; }; makeFlags = "MANDIR=$(out)/share/man"; From 8f74b653d22e22b47d8e5e5724397ec9d12bda22 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 9 May 2015 17:40:51 +0200 Subject: [PATCH 35/98] alloy: remove left-over no-op --- pkgs/development/tools/alloy/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix index da247072b07..2c16f1f6f6c 100644 --- a/pkgs/development/tools/alloy/default.nix +++ b/pkgs/development/tools/alloy/default.nix @@ -43,7 +43,6 @@ stdenv.mkDerivation rec { phases = [ "installPhase" ]; installPhase = '' - jar=`basename ${src}` jar=$out/share/alloy/alloy${version}.jar install -Dm644 ${src} $jar From 1ad2fa452a0d96be96dbe812c182cd1753992c14 Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Thu, 7 May 2015 13:00:01 -0600 Subject: [PATCH 36/98] Add EventStore package This turns the V8 expression into a generic build, so that we can build with the required version. --- pkgs/development/libraries/v8/3.24.10.nix | 6 ++ pkgs/development/libraries/v8/default.nix | 71 ++-------------------- pkgs/development/libraries/v8/generic.nix | 73 +++++++++++++++++++++++ pkgs/servers/nosql/eventstore/default.nix | 54 +++++++++++++++++ pkgs/top-level/all-packages.nix | 8 +++ 5 files changed, 145 insertions(+), 67 deletions(-) create mode 100644 pkgs/development/libraries/v8/3.24.10.nix create mode 100644 pkgs/development/libraries/v8/generic.nix create mode 100644 pkgs/servers/nosql/eventstore/default.nix diff --git a/pkgs/development/libraries/v8/3.24.10.nix b/pkgs/development/libraries/v8/3.24.10.nix new file mode 100644 index 00000000000..e7b10f23ac8 --- /dev/null +++ b/pkgs/development/libraries/v8/3.24.10.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // { + version = "3.24.10"; + sha256 = "1blz5h9syk93bb4x3shcai3s2jhh6ai4bpymr9rz0f1ysvg60x75"; +}) diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index dbf2f376d0f..6ae5c896efa 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -1,69 +1,6 @@ -{ stdenv, fetchurl, gyp, readline, python, which, icu }: +{ callPackage, ... } @ args: -assert readline != null; - -let - arch = if stdenv.is64bit then "x64" else "ia32"; -in - -stdenv.mkDerivation rec { - name = "v8-${version}"; +callPackage ./generic.nix (args // { version = "3.30.33.16"; - - src = fetchurl { - url = "https://commondatastorage.googleapis.com/chromium-browser-official/" - + "${name}.tar.bz2"; - sha256 = "1azf1b36gqj4z5x0k9wq2dkp99zfyhwb0d6i2cl5fjm3k6js7l45"; - }; - - patchPhase = '' - sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' build/gyp_v8 - ''; - - configurePhase = '' - PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \ - PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \ - build/gyp_v8 \ - -f make \ - --generator-output="out" \ - -Dflock_index=0 \ - -Dv8_enable_i18n_support=1 \ - -Duse_system_icu=1 \ - -Dconsole=readline \ - -Dcomponent=shared_library \ - -Dv8_target_arch=${arch} - ''; - - nativeBuildInputs = [ which ]; - buildInputs = [ readline python icu ]; - - buildFlags = [ - "LINK=g++" - "-C out" - "builddir=$(CURDIR)/Release" - "BUILDTYPE=Release" - ]; - - enableParallelBuilding = true; - - installPhase = '' - install -vD out/Release/d8 "$out/bin/d8" - ${if stdenv.system == "x86_64-darwin" then '' - install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib" - '' else '' - install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so" - ''} - cp -vr include "$out/" - ''; - - postFixup = if stdenv.isDarwin then '' - install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc}/lib/libgcc_s.1.dylib $out/bin/d8 - install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib - '' else null; - - meta = with stdenv.lib; { - description = "Google's open source JavaScript engine"; - platforms = with platforms; linux; - license = licenses.bsd3; - }; -} + sha256 = "1azf1b36gqj4z5x0k9wq2dkp99zfyhwb0d6i2cl5fjm3k6js7l45"; +}) diff --git a/pkgs/development/libraries/v8/generic.nix b/pkgs/development/libraries/v8/generic.nix new file mode 100644 index 00000000000..b056ba640d2 --- /dev/null +++ b/pkgs/development/libraries/v8/generic.nix @@ -0,0 +1,73 @@ +{ stdenv, fetchurl, gyp, readline, python, which, icu +, version +, sha256 +, ... +}: + +assert readline != null; + +let + arch = if stdenv.is64bit then "x64" else "ia32"; +in + +stdenv.mkDerivation rec { + name = "v8-${version}"; + inherit version; + + src = fetchurl { + url = "https://commondatastorage.googleapis.com/chromium-browser-official/" + + "${name}.tar.bz2"; + inherit sha256; + }; + + patchPhase = '' + sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' build/gyp_v8 + ''; + + configurePhase = '' + PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \ + PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \ + build/gyp_v8 \ + -f make \ + --generator-output="out" \ + -Dflock_index=0 \ + -Dv8_enable_i18n_support=1 \ + -Duse_system_icu=1 \ + -Dconsole=readline \ + -Dcomponent=shared_library \ + -Dv8_target_arch=${arch} + ''; + + nativeBuildInputs = [ which ]; + buildInputs = [ readline python icu ]; + + buildFlags = [ + "LINK=g++" + "-C out" + "builddir=$(CURDIR)/Release" + "BUILDTYPE=Release" + ]; + + enableParallelBuilding = true; + + installPhase = '' + install -vD out/Release/d8 "$out/bin/d8" + ${if stdenv.system == "x86_64-darwin" then '' + install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib" + '' else '' + install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so" + ''} + cp -vr include "$out/" + ''; + + postFixup = if stdenv.isDarwin then '' + install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc}/lib/libgcc_s.1.dylib $out/bin/d8 + install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib + '' else null; + + meta = with stdenv.lib; { + description = "Google's open source JavaScript engine"; + platforms = with platforms; linux; + license = licenses.bsd3; + }; +} diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix new file mode 100644 index 00000000000..e13d99c104d --- /dev/null +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchgit, fetchpatch, git, mono, v8, icu }: + +# There are some similarities with the pinta derivation. We should +# have a helper to make it easy to package these Mono apps. + +stdenv.mkDerivation rec { + name = "EventStore-${version}"; + version = "3.0.3"; + src = fetchgit { + url = "https://github.com/EventStore/EventStore.git"; + rev = "a1382252dd1ed0554ddb04015cdb2cbc1b0a65c1"; + sha256 = "07ir6jlli2q1yvsnyw8r8dfril6h1wmfj98yf7a6k81585v2mc6g"; + leaveDotGit = true; + }; + + patches = [ + # see: https://github.com/EventStore/EventStore/issues/461 + (fetchpatch { + url = https://github.com/EventStore/EventStore/commit/9a0987f19935178df143a3cf876becaa1b11ffae.patch; + sha256 = "04qw0rb1pypa8dqvj94j2mwkc1y6b40zrpkn1d3zfci3k8cam79y"; + }) + ]; + + buildPhase = '' + ln -s ${v8}/lib/libv8.so src/libs/libv8.so + ln -s ${icu}/lib/libicui18n.so src/libs/libicui18n.so + ln -s ${icu}/lib/libicuuc.so src/libs/libicuuc.so + + ./build.sh js1 + ./build.sh quick ${version} + ''; + + installPhase = '' + mkdir -p $out/{bin,lib/eventstore/clusternode} + cp -r bin/clusternode/* $out/lib/eventstore/clusternode/ + cat > $out/bin/clusternode << EOF + #!/bin/sh + exec ${mono}/bin/mono $out/lib/eventstore/clusternode/EventStore.ClusterNode.exe "\$@" + EOF + chmod +x $out/bin/clusternode + ''; + + buildInputs = [ git v8 mono ]; + + dontStrip = true; + + meta = { + homepage = https://geteventstore.com/; + description = "Event sourcing database with processing logic in JavaScript."; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3269737a3b3..2d480da5954 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7832,6 +7832,10 @@ let inherit (pythonPackages) gyp; }; + v8_3_24_10 = callPackage ../development/libraries/v8/3.24.10.nix { + inherit (pythonPackages) gyp; + }; + v8 = callPackage ../development/libraries/v8 { inherit (pythonPackages) gyp; }; @@ -8425,6 +8429,10 @@ let elasticmq = callPackage ../servers/elasticmq { }; + eventstore = callPackage ../servers/nosql/eventstore { + v8 = v8_3_24_10; + }; + etcdctl = callPackage ../development/tools/etcdctl { }; exim = callPackage ../servers/mail/exim { }; From 44cdda7afb433c2cf9b48da982b013bdc694a1ae Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 9 May 2015 20:40:42 +0200 Subject: [PATCH 37/98] libsodium: 1.0.2 -> 1.0.3 --- pkgs/development/libraries/libsodium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index fc554122c08..dfe462c301a 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libsodium-1.0.2"; + name = "libsodium-1.0.3"; src = fetchurl { url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz"; - sha256 = "06dabf77cz6qg7aqv5j5r4m32b5zn253pixwb3k5lm3z0h88y7cn"; + sha256 = "120jkda2q58p0n68banh64vsfm3hgqnacagj425d218cr4ycdkyb"; }; NIX_LDFLAGS = stdenv.lib.optionalString (stdenv.cc.cc.isGNU or false) "-lssp"; From b884826d15536ff4f0b39378276854d4572f4aaf Mon Sep 17 00:00:00 2001 From: Erik Timan Date: Sat, 9 May 2015 19:32:32 +0000 Subject: [PATCH 38/98] python-packages: azure 0.10.0 -> 0.10.2 --- 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 cfc0c80f64f..7020b17f273 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -732,12 +732,12 @@ let })); azure = buildPythonPackage rec { - version = "0.10.0"; + version = "0.10.2"; name = "azure-${version}"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/a/azure/${name}.zip"; - md5 = "305b0036df5696d68369807835f554ae"; + md5 = "8eaa0f8e649b21b6527a5ee801cef33a"; }; propagatedBuildInputs = with self; [ dateutil futures pyopenssl requests ]; From 8d8c7c36007b2de269d99d91987980cfa4a8ff5e Mon Sep 17 00:00:00 2001 From: Erik Timan Date: Sat, 9 May 2015 20:02:40 +0000 Subject: [PATCH 39/98] python-packages: disable older than 2.7 for azure --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7020b17f273..0831412365b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -734,6 +734,7 @@ let azure = buildPythonPackage rec { version = "0.10.2"; name = "azure-${version}"; + disabled = pythonOlder "2.7"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/a/azure/${name}.zip"; From f541c61e220a70e77df18a02c20608160bbae7d2 Mon Sep 17 00:00:00 2001 From: Erik Timan Date: Sat, 9 May 2015 19:45:09 +0000 Subject: [PATCH 40/98] python-packages: icalendar 3.8.4 -> 3.9.0 dateutil is a new depencency for icalendar 3.9.0. --- pkgs/top-level/python-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cfc0c80f64f..37b3c93c133 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6061,16 +6061,16 @@ let }; icalendar = buildPythonPackage rec { - version = "3.8.4"; + version = "3.9.0"; name = "icalendar-${version}"; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/i/icalendar/${name}.zip"; - md5 = "d700e6e75613fd1ee882c4b11c58940c"; + url = "https://pypi.python.org/packages/source/i/icalendar/${name}.tar.gz"; + md5 = "072c67a4c461864abd604631d7cf67e7"; }; buildInputs = with self; [ setuptools ]; - propagatedBuildInputs = with self; [ pytz ]; + propagatedBuildInputs = with self; [ dateutil pytz ]; meta = with stdenv.lib; { description = "A parser/generator of iCalendar files"; From b807d8daebf240a101b6b906161d9ae29fef6b14 Mon Sep 17 00:00:00 2001 From: codyopel Date: Sat, 9 May 2015 18:13:52 -0400 Subject: [PATCH 41/98] avxsynth: refactor & 2013-05-10 -> 2015-04-07 --- pkgs/applications/video/avxsynth/default.nix | 50 +++++++++++++------- 1 file changed, 33 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix index a9a2ec46397..d8ec715a38c 100644 --- a/pkgs/applications/video/avxsynth/default.nix +++ b/pkgs/applications/video/avxsynth/default.nix @@ -1,26 +1,42 @@ -{ stdenv, fetchurl, ffmpeg, autoconf, automake, libtool, pkgconfig, log4cpp -, pango, cairo, python, libjpeg, ffms -, enableQt ? true, qt4}: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +, cairo, ffmpeg, ffms, libjpeg, log4cpp, pango +, avxeditSupport ? false, qt4 ? null +}: + +let + inherit (stdenv.lib) enableFeature optional; +in stdenv.mkDerivation rec { - name = "avxsynth-4.0-e153e672bf"; + name = "avxsynth-${version}"; + version = "2015-04-07"; - src = fetchurl { - url = https://github.com/avxsynth/avxsynth/tarball/e153e672bf; - name = "${name}.tar.gz"; - sha256 = "16l2ld8k1nfsms6jd9d9r4l247xxbncsak66w87icr20yzyhs14s"; + src = fetchFromGitHub { + owner = "avxsynth"; + repo = "avxsynth"; + rev = "80dcb7ec8d314bc158130c92803308aa8e5e9242"; + sha256 = "0kckggvgv68b0qjdi7ms8vi97b46dl63n60qr96d2w67lf2nk87z"; }; - buildInputs = [ ffmpeg autoconf automake libtool pkgconfig log4cpp pango cairo python - libjpeg ffms ] - ++ stdenv.lib.optional enableQt qt4; + configureFlags = [ + "--enable-autocrop" + "--enable-framecapture" + "--enable-subtitle" + "--enable-ffms2" + (enableFeature avxeditSupport "avxedit") + "--with-jpeg=${libjpeg}/lib" + ]; - preConfigure = "autoreconf -vfi"; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; - meta = { - homepage = https://github.com/avxsynth/avxsynth/wiki; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + buildInputs = [ cairo ffmpeg ffms libjpeg log4cpp pango ] + ++ optional avxeditSupport qt4; + + meta = with stdenv.lib; { + description = "A script system that allows advanced non-linear editing"; + homepage = https://github.com/avxsynth/avxsynth; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ codyopel viric ]; + platforms = platforms.linux; }; } From 7a794e17978d110bde3e9dec96e9e5de50e7831b Mon Sep 17 00:00:00 2001 From: codyopel Date: Sat, 9 May 2015 18:20:02 -0400 Subject: [PATCH 42/98] libsodium: refactor & remove duplicate --- .../haskell-modules/hackage-packages.nix | 6 ++-- .../libraries/libsodium/default.nix | 11 ++++---- pkgs/development/libraries/sodium/default.nix | 28 ------------------- .../libraries/sodium/default.upstream | 1 - pkgs/servers/nosql/hyperdex/default.nix | 2 +- pkgs/servers/nosql/hyperdex/libmacaroons.nix | 4 +-- pkgs/top-level/all-packages.nix | 2 -- 7 files changed, 12 insertions(+), 42 deletions(-) delete mode 100644 pkgs/development/libraries/sodium/default.nix delete mode 100644 pkgs/development/libraries/sodium/default.upstream diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 56c6418afc6..7c724523c5d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -107016,7 +107016,7 @@ self: { "saltine-quickcheck" = callPackage ({ mkDerivation, base, bytestring, bytestring-arbitrary, hex - , QuickCheck, saltine, sodium, tasty, tasty-quickcheck + , QuickCheck, saltine, libsodium, tasty, tasty-quickcheck }: mkDerivation { pname = "saltine-quickcheck"; @@ -107028,12 +107028,12 @@ self: { testDepends = [ base bytestring-arbitrary QuickCheck saltine tasty tasty-quickcheck ]; - extraLibraries = [ sodium ]; + extraLibraries = [ libsodium ]; jailbreak = true; homepage = "https://github.com/tsuraan/saltine-quickcheck"; description = "Quickcheck implementations for some NaCl data"; license = stdenv.lib.licenses.mit; - }) { inherit (pkgs) sodium;}; + }) { inherit (pkgs) libsodium;}; "salvia" = callPackage ({ mkDerivation, base, bytestring, containers, directory, fclabels diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index dfe462c301a..ea3bbbede2a 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -12,10 +12,11 @@ stdenv.mkDerivation rec { doCheck = true; - meta = { - description = "Version of NaCl with hardware tests at runtime, not build time"; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ viric ]; - platforms = stdenv.lib.platforms.all; + meta = with stdenv.lib; { + description = "A modern and easy-to-use crypto library"; + homepage = http://doc.libsodium.org/; + license = licenses.isc; + maintainers = with maintainers; [ raskin viric ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/sodium/default.nix b/pkgs/development/libraries/sodium/default.nix deleted file mode 100644 index 7bdec155813..00000000000 --- a/pkgs/development/libraries/sodium/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{stdenv, fetchurl}: -let - s = # Generated upstream information - rec { - baseName="sodium"; - version="1.0.2"; - name="${baseName}-${version}"; - hash="06dabf77cz6qg7aqv5j5r4m32b5zn253pixwb3k5lm3z0h88y7cn"; - url="http://download.dnscrypt.org/libsodium/releases/libsodium-1.0.2.tar.gz"; - sha256="06dabf77cz6qg7aqv5j5r4m32b5zn253pixwb3k5lm3z0h88y7cn"; - }; - buildInputs = [ - ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; - src = fetchurl { - inherit (s) url sha256; - }; - meta = { - inherit (s) version; - description = ''A cryptography library with simple API''; - license = stdenv.lib.licenses.mit ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/sodium/default.upstream b/pkgs/development/libraries/sodium/default.upstream deleted file mode 100644 index ccc02cd8978..00000000000 --- a/pkgs/development/libraries/sodium/default.upstream +++ /dev/null @@ -1 +0,0 @@ -url http://download.dnscrypt.org/libsodium/releases/ diff --git a/pkgs/servers/nosql/hyperdex/default.nix b/pkgs/servers/nosql/hyperdex/default.nix index 7ed3661b87f..659081281ef 100644 --- a/pkgs/servers/nosql/hyperdex/default.nix +++ b/pkgs/servers/nosql/hyperdex/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, unzip, autoconf, automake, libtool, - python, sodium, pkgconfig, popt, glog, xz, json_c, gperf, yacc, + python, libsodium, pkgconfig, popt, glog, xz, json_c, gperf, yacc, flex, pandoc, help2man, autoconf-archive, callPackage }: assert stdenv.isLinux; diff --git a/pkgs/servers/nosql/hyperdex/libmacaroons.nix b/pkgs/servers/nosql/hyperdex/libmacaroons.nix index 2d709c5bbd1..5d91a82a8ec 100644 --- a/pkgs/servers/nosql/hyperdex/libmacaroons.nix +++ b/pkgs/servers/nosql/hyperdex/libmacaroons.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, unzip, autoconf, automake, libtool, - pkgconfig, sodium, python }: + pkgconfig, libsodium, python }: stdenv.mkDerivation rec { name = "libmacaroons-${version}"; version = "HEAD"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { url = "https://github.com/rescrv/libmacaroons/archive/6febf3ce6c4c77a46d24b40ed29b03ffbfb175a7.zip"; sha256 = "0b4qgim87398chvc3qhxfqv2l1cyl65rhyknln8lk0gq9y00p1ik"; }; - buildInputs = [ unzip autoconf automake libtool python sodium pkgconfig ]; + buildInputs = [ unzip autoconf automake libtool python libsodium pkgconfig ]; preConfigure = "autoreconf -i"; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3269737a3b3..085477d2ed6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7649,8 +7649,6 @@ let socket_wrapper = callPackage ../development/libraries/socket_wrapper { }; - sodium = callPackage ../development/libraries/sodium {}; - sofia_sip = callPackage ../development/libraries/sofia-sip { }; soprano = callPackage ../development/libraries/soprano { }; From 72d3d6fbfc3d62064f2f70e9d40716e0a82b1e18 Mon Sep 17 00:00:00 2001 From: Sebastian Jordan Date: Sun, 10 May 2015 01:49:09 +0200 Subject: [PATCH 43/98] Update emulationstation 2.0.0.rc1 -> 2.0.1a --- pkgs/misc/emulators/emulationstation/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix index 6ff0a21135a..529e5d3d0a2 100644 --- a/pkgs/misc/emulators/emulationstation/default.nix +++ b/pkgs/misc/emulators/emulationstation/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "emulationstation-${version}"; - version = "2.0.0-rc1"; + version = "2.0.1a"; src = fetchFromGitHub { owner = "Aloshi"; repo = "EmulationStation"; - rev = "8739519e1591819cab85e1d2056804d20c197dac"; - sha256 = "1psq5cqyq2yy1lqxrcj7pfp8szfmzhamxf3111l97w2h2zzcgvq9"; + rev = "646bede3d9ec0acf0ae378415edac136774a66c5"; + sha256 = "0cm0sq2wri2l9cvab1l0g02za59q7klj0h3p028vr96n6njj4w9v"; }; buildInputs = [ pkgconfig cmake alsaLib boost curl eigen freeimage freetype libarchive mesa SDL2 ]; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.edwtjo ]; license = stdenv.lib.licenses.mit; }; -} \ No newline at end of file +} From eb1b8183bc4541b988ac647a5df8a6196f255dab Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 9 May 2015 17:41:40 -0700 Subject: [PATCH 44/98] screenfetch: 3.6.2 -> 2015-04-20 --- pkgs/tools/misc/screenfetch/default.nix | 32 +++++++++++++++++-------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix index 442922b7805..418afee8135 100644 --- a/pkgs/tools/misc/screenfetch/default.nix +++ b/pkgs/tools/misc/screenfetch/default.nix @@ -1,21 +1,33 @@ -{ stdenv, fetchgit, xdpyinfo, xprop }: +{ stdenv, fetchgit, makeWrapper +, coreutils, gawk, procps, gnused, findutils, xdpyinfo, xprop +}: -let - version = "3.6.2"; -in stdenv.mkDerivation { - name = "screenFetch-${version}"; - pname = "screenfetch"; + name = "screenFetch-2015-04-20"; src = fetchgit { url = git://github.com/KittyKatt/screenFetch.git; - rev = "dec1cd6c2471defe4459967fbc8ae15b55714338"; - sha256 = "138a7g0za5dq27jx7x8gqg7gjkgyq0017v0nbcg68ys7dqlxsdl3"; + rev = "53e1c0cccacf648e846057938a68dda914f532a1"; + sha256 = "1wyvy1sn7vnclwrzd32jqlq6iirjkhp2ak55brhkpp9rj1qxk3q6"; }; + nativeBuildInputs = [ makeWrapper ]; + installPhase = '' - install -Dm 0755 $pname-dev $out/bin/$pname - install -Dm 0644 $pname.1 $out/man/man1/$pname.1 + install -Dm 0755 screenfetch-dev $out/bin/screenfetch + install -Dm 0644 screenfetch.1 $out/man/man1/screenfetch.1 + + # Fix all of the depedencies of screenfetch + patchShebangs $out/bin/screenfetch + wrapProgram "$out/bin/screenfetch" \ + --set PATH : "" \ + --prefix PATH : "${coreutils}/bin" \ + --prefix PATH : "${gawk}/bin" \ + --prefix PATH : "${procps}/bin" \ + --prefix PATH : "${gnused}/bin" \ + --prefix PATH : "${findutils}/bin" \ + --prefix PATH : "${xdpyinfo}/bin" \ + --prefix PATH : "${xprop}/bin" \ ''; meta = { From 7142d479910c794eb4c44a2d0e3c47e1af851def Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 10 May 2015 10:11:29 +0200 Subject: [PATCH 45/98] pythonPackages: a bunch of build fixes --- pkgs/top-level/python-packages.nix | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 31a1050e553..404b4e2a593 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2001,11 +2001,11 @@ let }; coverage = buildPythonPackage rec { - name = "coverage-3.7"; + name = "coverage-3.7.1"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/c/coverage/${name}.tar.gz"; - md5 = "055d82e6849d882ec6cf2ae1faca8e56"; + sha256 = "0knlbq79g2ww6xzsyknj9rirrgrgc983dpa2d9nkdf31mb2a3bni"; }; meta = { @@ -2087,7 +2087,7 @@ let buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors self.iso8601 self.pyasn1 self.pytest ]; - propagatedBuildInputs = [ self.six self.cffi ]; + propagatedBuildInputs = [ self.six ] ++ optional (!isPyPy) self.cffi; }; cryptography_vectors = buildPythonPackage rec { @@ -3153,7 +3153,7 @@ let sha256 = "00jaf7x1ji9y46fbkww2sg6r6almrqfsprydz3q2swr4jrnrsx9x"; }; - patchPhase = '' + prePatch = '' substituteInPlace setup.py \ --replace "httplib2==0.8" "httplib2" \ --replace "iso8601==0.1.4" "iso8601" @@ -6663,6 +6663,8 @@ let buildInputs = with self; [ markupsafe nose mock ]; propagatedBuildInputs = with self; [ markupsafe ]; + doCheck = !isPyPy; # https://bitbucket.org/zzzeek/mako/issue/238/2-tests-failed-on-pypy-24-25 + meta = { description = "Super-fast templating language"; homepage = http://www.makotemplates.org; @@ -7277,8 +7279,8 @@ let }; }; - MySQL_python = buildPythonPackage { - name = "MySQL-python-1.2.3"; + MySQL_python = buildPythonPackage rec { + name = "MySQL-python-1.2.5"; disabled = isPy3k; @@ -7286,13 +7288,13 @@ let doCheck = false; src = pkgs.fetchurl { - url = mirror://sourceforge/mysql-python/MySQL-python-1.2.3.tar.gz; - sha256 = "0vkyg9dmj29hzk7fy77f42p7bfj28skyzsjsjry4wqr3z6xnzrkx"; + url = "http://pypi.python.org/packages/source/M/MySQL-python/${name}.zip"; + sha256 = "0x0c2jg0bb3pp84njaqiic050qkyd7ymwhfvhipnimg58yv40441"; }; buildInputs = with self; [ nose pkgs.openssl ]; - propagatedBuildInputs = with self; [ pkgs.mysql pkgs.zlib ]; + propagatedBuildInputs = with self; [ pkgs.mysql.lib pkgs.zlib ]; meta = { description = "MySQL database binding for Python"; @@ -11072,11 +11074,11 @@ let scikitlearn = buildPythonPackage { - name = "scikit-learn-0.15.2"; + name = "scikit-learn-0.16.1"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/scikit-learn/scikit-learn-0.15.2.tar.gz"; - md5 = "d9822ad0238e17b382a3c756ea94fe0d"; + sha256 = "19jzmbi3j4ix8418i80ayl595dwyi4gy474kb2nc1v8kdwgqi2hs"; }; buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ]; From 90ee28091313d684177fae15f2ca18c83b84f3ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 10 May 2015 11:39:42 +0200 Subject: [PATCH 46/98] subunit: split package into everything and python lib --- .../development/libraries/subunit/default.nix | 26 +++++++++++++++++++ pkgs/servers/samba/4.x.nix | 4 +-- pkgs/top-level/all-packages.nix | 3 ++- pkgs/top-level/python-packages.nix | 21 +++------------ 4 files changed, 34 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/libraries/subunit/default.nix diff --git a/pkgs/development/libraries/subunit/default.nix b/pkgs/development/libraries/subunit/default.nix new file mode 100644 index 00000000000..fa007da7d9c --- /dev/null +++ b/pkgs/development/libraries/subunit/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, pkgconfig, check, cppunit, perl, pythonPackages }: + +# NOTE: for subunit python library see pkgs/top-level/python-packages.nix + +stdenv.mkDerivation rec { + name = "subunit-${version}"; + version = "1.0.0"; + + src = fetchurl { + url = "https://launchpad.net/subunit/trunk/${version}/+download/${name}.tar.gz"; + sha256 = "1fnhrrwww90746an2nz2kn9qdf9pklmaf5lm22gssl6648f2rp2m"; + }; + + buildInputs = [ pkgconfig check cppunit perl pythonPackages.wrapPython ]; + + propagatedBuildInputs = with pythonPackages; [ testtools testscenarios ]; + + postFixup = "wrapPythonPrograms"; + + meta = with stdenv.lib; { + description = "A streaming protocol for test results"; + homepage = https://launchpad.net/subunit; + license = licenses.asl20; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 49b81794f04..c785d76ddce 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl , docbook_xml_dtd_42, docbook_xml_dtd_45, readline, talloc, ntdb, tdb, tevent -, ldb, popt, iniparser, pythonPackages, libbsd, nss_wrapper, socket_wrapper +, ldb, popt, iniparser, subunit, libbsd, nss_wrapper, socket_wrapper , uid_wrapper, libarchive # source3/wscript optionals @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { buildInputs = [ python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45 readline talloc ntdb tdb tevent ldb popt iniparser - pythonPackages.subunit libbsd nss_wrapper socket_wrapper uid_wrapper + subunit libbsd nss_wrapper socket_wrapper uid_wrapper libarchive kerberos zlib openldap cups pam avahi acl libaio fam libceph glusterfs diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f92344f60d..004420ddfb7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8724,7 +8724,6 @@ let samba4 = callPackage ../servers/samba/4.x.nix { python = python2; - pythonPackages = python2Packages; kerberos = heimdal; libgcrypt = libgcrypt_1_6; cups = if stdenv.isDarwin then null else cups; @@ -12147,6 +12146,8 @@ let pythonBindings = true; }); + subunit = callPackage ../development/libraries/subunit { }; + surf = callPackage ../applications/misc/surf { webkit = webkitgtk2; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 404b4e2a593..6a475fe3061 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12084,26 +12084,13 @@ let }; }; - subunit = stdenv.mkDerivation rec { - name = "subunit-${version}"; - version = "1.0.0"; - - src = pkgs.fetchurl { - url = "https://launchpad.net/subunit/trunk/${version}/+download/${name}.tar.gz"; - sha256 = "1fnhrrwww90746an2nz2kn9qdf9pklmaf5lm22gssl6648f2rp2m"; - }; - - buildInputs = (with pkgs; [ pkgconfig check cppunit perl ]) ++ [ self.wrapPython ]; + subunit = buildPythonPackage rec { + name = pkgs.subunit.name; + src = pkgs.subunit.src; propagatedBuildInputs = with self; [ testtools testscenarios ]; - postFixup = "wrapPythonPrograms"; - - meta = { - description = "A streaming protocol for test results"; - homepage = https://launchpad.net/subunit; - license = licenses.asl20; - }; + meta = pkgs.subunit.meta; }; From 2a5679aeaa5cca9da182190f21414a42848136c2 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 10 May 2015 11:55:21 +0300 Subject: [PATCH 47/98] Update ZPAQ --- pkgs/tools/archivers/zpaq/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 5f8a03e2d67..c8f3a890487 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="zpaq"; - version="704"; + version="705"; name="${baseName}-${version}"; - hash="0ffs2br5sjsd5pvy2x476fakbpvcf7yf0agzys0cfcib8pw9bd91"; - url="http://mattmahoney.net/dc/zpaq704.zip"; - sha256="0ffs2br5sjsd5pvy2x476fakbpvcf7yf0agzys0cfcib8pw9bd91"; + hash="0d1knq4f6693nvbwjx4wznb45hm4zyn4k88xvhynyk0dcbiy7ayq"; + url="http://mattmahoney.net/dc/zpaq705.zip"; + sha256="0d1knq4f6693nvbwjx4wznb45hm4zyn4k88xvhynyk0dcbiy7ayq"; }; buildInputs = [ unzip From f6e852554c6a9ed4e8ac58fd3bfe19c22a0ec259 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 10 May 2015 11:57:13 +0300 Subject: [PATCH 48/98] Update Nginx --- pkgs/servers/http/nginx/unstable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix index b47b67792b8..d9d9857e33b 100644 --- a/pkgs/servers/http/nginx/unstable.nix +++ b/pkgs/servers/http/nginx/unstable.nix @@ -10,10 +10,10 @@ with stdenv.lib; let - version = "1.7.11"; + version = "1.9.0"; mainSrc = fetchurl { url = "http://nginx.org/download/nginx-${version}.tar.gz"; - sha256 = "15cnlrhiqklqfzwfspkp0i6g04zdhc092dh593yqnqqf450dgnfs"; + sha256 = "0j7j4yfz39jl433ci9wgxnz3y70pr93vxixw1s4dxv81nzas2ap1"; }; rtmp-ext = fetchFromGitHub { From 1a407e931118d1ac44b4f0f52a40241e3f7a5890 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 10 May 2015 11:59:01 +0300 Subject: [PATCH 49/98] Update SQLite --- pkgs/development/libraries/sqlite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index d161fab31b6..ee8aec79af1 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,11 +3,11 @@ assert interactive -> readline != null && ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.8.9"; + name = "sqlite-3.8.10.1"; src = fetchurl { - url = "http://sqlite.org/2015/sqlite-autoconf-3080900.tar.gz"; - sha1 = "p6vwiqalhk7ybcx5p8n322vhd3idww6v"; + url = "http://sqlite.org/2015/sqlite-autoconf-3081001.tar.gz"; + sha1 = "86bfed5752783fb24c051f3efac5972ce11023f0"; }; buildInputs = lib.optionals interactive [ readline ncurses ]; From 47011aa614829cfafa546bb9ccb83ff263c67d8b Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 10 May 2015 12:02:09 +0300 Subject: [PATCH 50/98] Update allegro5-unstable --- pkgs/development/libraries/allegro/5-unstable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/allegro/5-unstable.nix b/pkgs/development/libraries/allegro/5-unstable.nix index 72589ad1065..71a521e2309 100644 --- a/pkgs/development/libraries/allegro/5-unstable.nix +++ b/pkgs/development/libraries/allegro/5-unstable.nix @@ -16,7 +16,7 @@ let sourceInfo = rec { baseName="allegro"; folderSuffix = "-unstable"; - version = "5.1.9"; + version = "5.1.10"; name="${baseName}-${version}"; project="alleg"; url="mirror://sourceforge/project/${project}/${baseName}${folderSuffix}/${version}/${name}.tar.gz"; @@ -26,7 +26,7 @@ in rec { src = a.fetchurl { url = sourceInfo.url; - sha256 = "0jn1x2l1kz0vi2fvabpk5sbn1cx4k6hwncmf2j8wnrhk8pm5af5h"; + sha256 = "13dfs007pyh908bm1hg7hz71y8fr9fj51byh5w149h8dsq2dds78"; }; inherit (sourceInfo) name version; From 9ebdf9f8a99a0a6a801cdf3c74946703cc13df8b Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 10 May 2015 12:03:28 +0300 Subject: [PATCH 51/98] Update Regina/REXX --- pkgs/development/interpreters/regina/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/regina/default.nix b/pkgs/development/interpreters/regina/default.nix index e6c84edacaf..596b748a4f6 100644 --- a/pkgs/development/interpreters/regina/default.nix +++ b/pkgs/development/interpreters/regina/default.nix @@ -12,7 +12,7 @@ let sourceInfo = rec { baseName="Regina-REXX"; pname="regina-rexx"; - version = "3.9.0"; + version = "3.9.1"; name="${baseName}-${version}"; url="mirror://sourceforge/${pname}/${pname}/${version}/${name}.tar.gz"; }; @@ -20,7 +20,7 @@ in rec { src = a.fetchurl { url = sourceInfo.url; - sha256 = "051w6i5xyjq7j9yrhw4r14kw105gpylby6z5x9v31f5g824n4mfr"; + sha256 = "1vpksnjmg6y5zag9li6sxqxj2xapgalfz8krfxgg49vyk0kdy4sx"; }; inherit (sourceInfo) name version; From c25495bcffcbdfe3514acb083311395e08be6f69 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 10 May 2015 12:07:06 +0300 Subject: [PATCH 52/98] Update firejail --- pkgs/os-specific/linux/firejail/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 91c039c875b..99c99cd3662 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="firejail"; - version="0.9.24"; + version="0.9.26"; name="${baseName}-${version}"; - hash="15fz6hjxakjnsn505w3wlc6bqvf5pjwn8zfhp5aw9zq6vxr7f317"; - url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.24-rc1.tar.bz2"; - sha256="15fz6hjxakjnsn505w3wlc6bqvf5pjwn8zfhp5aw9zq6vxr7f317"; + hash="12n0kj95hfkzv4jir7j9x0mdpg20bq0fgifjsz1dbsmqi2cspdlq"; + url="http://softlayer-ams.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.26-rc2.tar.bz2"; + sha256="12n0kj95hfkzv4jir7j9x0mdpg20bq0fgifjsz1dbsmqi2cspdlq"; }; buildInputs = [ ]; From b766d9697a769170539d6d6d3ebb52607450fb49 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 10 May 2015 12:08:15 +0300 Subject: [PATCH 53/98] Update XDaliClock --- pkgs/tools/misc/xdaliclock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix index 7d731650288..16a54c81946 100644 --- a/pkgs/tools/misc/xdaliclock/default.nix +++ b/pkgs/tools/misc/xdaliclock/default.nix @@ -12,7 +12,7 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="xdaliclock"; - version = "2.41"; + version = "2.43"; name="${baseName}-${version}"; project="${baseName}"; url="http://www.jwz.org/${project}/${name}.tar.gz"; @@ -21,7 +21,7 @@ in rec { src = a.fetchurl { url = sourceInfo.url; - sha256 = "1crkjvza692irkqm9vwgn58m8ps93n0rxigm6pasgl5dnx3p6d1d"; + sha256 = "194zzp1a989k2v8qzfr81gdknr8xiz16d6fdl63jx9r3mj5klmvb"; }; inherit (sourceInfo) name version; From f7c5343c65206dd89a2a094dcfc4c51d5538d038 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 10 May 2015 12:09:40 +0300 Subject: [PATCH 54/98] Update atanks --- pkgs/games/atanks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/atanks/default.nix b/pkgs/games/atanks/default.nix index edad4b4b456..9ebfb724779 100644 --- a/pkgs/games/atanks/default.nix +++ b/pkgs/games/atanks/default.nix @@ -11,11 +11,11 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="atanks"; - version = "6.1"; + version = "6.2"; name="${baseName}-${version}"; project="${baseName}"; url="mirror://sourceforge/project/${project}/${baseName}/${name}/${name}.tar.gz"; - sha256 = "1azs9amqkgs7qglx0vk9bg2fhn73lq89372scnfp45hinrh52vqi"; + sha256 = "1s1lb87ind0y9d6hmfaf1b9wks8q3hd6w5n9dibq75rxqmcfvlpy"; }; in rec { From d3160f6f44de12091e23f0071d7807fcf59db20c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 10 May 2015 12:11:53 +0300 Subject: [PATCH 55/98] Update IPMIutil --- pkgs/tools/system/ipmiutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix index c19b6007f01..4fd3cb0f4a4 100644 --- a/pkgs/tools/system/ipmiutil/default.nix +++ b/pkgs/tools/system/ipmiutil/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { baseName = "ipmiutil"; - version = "2.9.5"; + version = "2.9.6"; name = "${baseName}-${version}"; src = fetchurl { url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz"; - sha256 = "1rnv72qfrijcm0kiy2lsbdckjxnxdma8sf8y6y6iypp75rcg007b"; + sha256 = "068mfxaay91m5qqs0lb4jwvsbxb665n2hgcp0g1k62zvicyiyk48"; }; buildInputs = [ openssl ]; From d1d2a9856cc3b071f9397a5273fca9242562caf8 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 10 May 2015 12:13:16 +0300 Subject: [PATCH 56/98] Update luarocks --- pkgs/development/tools/misc/luarocks/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index dfd5c2994fd..2296bc3a989 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="luarocks"; - version="2.2.1"; + version="2.2.2"; name="${baseName}-${version}"; - hash="0mbwbx1qsarwab2apq424gw28px9h2d89v1fp9vxrrpi6dz8lgvi"; - url="http://luarocks.org/releases/luarocks-2.2.1.tar.gz"; - sha256="0mbwbx1qsarwab2apq424gw28px9h2d89v1fp9vxrrpi6dz8lgvi"; + hash="08phl5syc7q6bh0rs9558s74g8xq05hgn7gbia4hvwvkd1q2f12g"; + url="http://luarocks.org/releases/luarocks-2.2.2.tar.gz"; + sha256="08phl5syc7q6bh0rs9558s74g8xq05hgn7gbia4hvwvkd1q2f12g"; }; buildInputs = [ lua curl makeWrapper which From fdd0a1f7f85ac0fa2d1d83e4d6ad417c697657d5 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 10 May 2015 12:15:56 +0300 Subject: [PATCH 57/98] Update CL-Launch --- pkgs/development/tools/misc/cl-launch/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix index a6ea7ed766e..755e8001e88 100644 --- a/pkgs/development/tools/misc/cl-launch/default.nix +++ b/pkgs/development/tools/misc/cl-launch/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="cl-launch"; - version="4.1.2"; + version="4.1.3.1"; name="${baseName}-${version}"; - hash="13fgcvg71s1yp3r7jf1cs3kkpfw0pwykgmj7zryh24mw2269rx90"; - url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.2.tar.gz"; - sha256="13fgcvg71s1yp3r7jf1cs3kkpfw0pwykgmj7zryh24mw2269rx90"; + hash="0l5iwffrzmaxbpfh2h5y8lz6yap3q8xi14z080lhl193p8f3rk0z"; + url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.3.1.tar.gz"; + sha256="0l5iwffrzmaxbpfh2h5y8lz6yap3q8xi14z080lhl193p8f3rk0z"; }; buildInputs = [ ]; @@ -24,6 +24,10 @@ stdenv.mkDerivation { mkdir -p "$out/bin" ''; + preBuild = '' + sed -e 's/\t\t@/\t\t/g' -i Makefile + ''; + meta = { inherit (s) version; description = ''Common Lisp launcher script''; From 2fe8b040100f92fef9b5d014537ce7a072a7b253 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 10 May 2015 12:16:33 +0300 Subject: [PATCH 58/98] Update badvpn --- pkgs/tools/networking/badvpn/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/badvpn/default.nix b/pkgs/tools/networking/badvpn/default.nix index e11d454154b..22da8486a80 100644 --- a/pkgs/tools/networking/badvpn/default.nix +++ b/pkgs/tools/networking/badvpn/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="badvpn"; - version="1.999.129"; + version="1.999.130"; name="${baseName}-${version}"; - hash="078gax6yifkf9y9g01wn1p0dypvgiwcsdmzp1bhwwfi0fbpnzzgl"; - url="https://github.com/ambrop72/badvpn/archive/1.999.129.tar.gz"; - sha256="078gax6yifkf9y9g01wn1p0dypvgiwcsdmzp1bhwwfi0fbpnzzgl"; + hash="02b1fra43l75mljkhrq45vcrrqv0znicjn15g7nbqx3jppzbpm5z"; + url="https://github.com/ambrop72/badvpn/archive/1.999.130.tar.gz"; + sha256="02b1fra43l75mljkhrq45vcrrqv0znicjn15g7nbqx3jppzbpm5z"; }; buildInputs = [ cmake openssl nss pkgconfig nspr From 193f2c0e2167d1af3f9b6ecbf970eefe9409ca37 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 10 May 2015 12:17:33 +0300 Subject: [PATCH 59/98] Update GlusterFS --- pkgs/tools/filesystems/glusterfs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 76861467348..bfab9454d6d 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -4,11 +4,11 @@ let s = # Generated upstream information rec { baseName="glusterfs"; - version="3.6.2"; + version="3.6.3"; name="${baseName}-${version}"; - hash="1kz0kmj0apkhkmw1zy72bsx06b1ii6z8y3fq365cy5l3xnjibdaa"; - url="http://download.gluster.org/pub/gluster/glusterfs/3.6/3.6.2/glusterfs-3.6.2.tar.gz"; - sha256="1kz0kmj0apkhkmw1zy72bsx06b1ii6z8y3fq365cy5l3xnjibdaa"; + hash="084zkc1jd5ggkfl0f5d4s7lra5xgildnphyf6ywzxrb7g44vk0d4"; + url="http://download.gluster.org/pub/gluster/glusterfs/3.6/3.6.3/glusterfs-3.6.3.tar.gz"; + sha256="084zkc1jd5ggkfl0f5d4s7lra5xgildnphyf6ywzxrb7g44vk0d4"; }; buildInputs = [ fuse bison flex_2_5_35 openssl python ncurses readline From ede1211cbca746efb943fc58219d1fda6b6d713c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 10 May 2015 12:27:07 +0300 Subject: [PATCH 60/98] Update Wine unstable --- pkgs/misc/emulators/wine/unstable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix index a7a1e02da3b..aac97fe05b8 100644 --- a/pkgs/misc/emulators/wine/unstable.nix +++ b/pkgs/misc/emulators/wine/unstable.nix @@ -7,12 +7,12 @@ assert stdenv.isLinux; assert stdenv.cc.cc.isGNU or false; let - version = "1.7.40"; + version = "1.7.42"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "1dnasmw1rnlz7wk1bn0x1zmy3r78hgrn9y53z4vm8xjkllwyd0hd"; + sha256 = "18iv4dsx2p7bk5qhiqqc6fpnnzny9rx8vgbjlpnf3gr0n615qzss"; }; gecko = fetchurl { From 666a5c5eb69791c2d5c78e22a2220d3b263742ce Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 10 May 2015 12:31:53 +0300 Subject: [PATCH 61/98] Update LiquidWar --- pkgs/games/liquidwar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix index cd7478d99c8..3a3774bc1dd 100644 --- a/pkgs/games/liquidwar/default.nix +++ b/pkgs/games/liquidwar/default.nix @@ -15,7 +15,7 @@ rec { src = a.fetchurl { url = "mirror://gnu/liquidwar6/${name}.tar.gz"; - sha256 = "1q58liqm5cgp494yjj6rfc2xj5b4gm8r8yvi46jzwqll353mabwl"; + sha256 = "1976nnl83d8wspjhb5d5ivdvdxgb8lp34wp54jal60z4zad581fn"; }; inherit buildInputs; @@ -36,7 +36,7 @@ rec { platforms = with a.lib.platforms; linux; homepage = "http://www.gnu.org/software/liquidwar6/"; - version = "0.4.3681"; + version = "0.6.3902"; updateWalker=true; }; } From 47c2726363ea670773616c06fecd17c2b490e3aa Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 10 May 2015 12:45:23 +0300 Subject: [PATCH 62/98] 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 d76a59c8dec..b9e3011194d 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.10"; + version = "1.2.11"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "11gn25knjk0zdyi3s6w0blcnrxjgyj4iifg5h07pv2r7hm83s92m"; + sha256 = "0w1ymazyck5a8bjmsbnq1hps1n4824h3ajh849f1y09dwzd09al8"; }; buildInputs = [ which ] From a54e796cffbf26214a5c7f1fa3f3204952f28b74 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 10 May 2015 12:46:21 +0300 Subject: [PATCH 63/98] Explicitly pass -pthread flag to fix the build after some updates --- pkgs/development/libraries/kerberos/heimdal.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index aeea290bdb2..320e161d3da 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { "--without-x" ]; + preConfigure = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -pthread" + ''; + # We need to build hcrypt for applications like samba postBuild = '' (cd lib/hcrypto; make) From 90453cc5ca4f09447f570bb3f8cf7b48bdd39546 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 10 May 2015 13:25:07 +0300 Subject: [PATCH 64/98] Update Wine staging to match Wine unstable --- pkgs/misc/emulators/wine/staging.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix index 2aa588592ac..a6ff309b08e 100644 --- a/pkgs/misc/emulators/wine/staging.nix +++ b/pkgs/misc/emulators/wine/staging.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, wine, perl, autoconf, utillinux , pulseaudio, libtxc_dxtn }: -let version = "1.7.40"; +let version = "1.7.42"; patch = fetchFromGitHub { owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; - sha256 = "0l14yy6wbvbs2xrnn9z3a35lbnpl8ibkmc0vh983fimf9nxckpan"; + sha256 = "1qi1hf1w97n17vmj137p7da75g01ky84a3xvs50xrmxb7f62sm17"; }; in assert (builtins.parseDrvName wine.name).version == version; From bbcc0c0f07d931713091bed74ca5c496f8e20acd Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 10 May 2015 13:32:35 +0300 Subject: [PATCH 65/98] Update Pipelight to use wine-staging --- pkgs/tools/misc/pipelight/default.nix | 39 ++------------------------- 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index aa0be62ed64..cb130c8e917 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -1,44 +1,9 @@ -{ stdenv, fetchurl, fetchgit, autoconf, automake, wineUnstable, perl, xlibs +{ stdenv, fetchurl, fetchgit, autoconf, automake, wineStaging, perl, xlibs , gnupg, gcc48_multi, mesa, curl, bash, cacert, cabextract, utillinux, attr }: let - wine_patches_version = "1.7.38"; - wine_hash = "1h3bsga9qzqkavf9wlv62ldl3a8mz7grr68nxv8vicmnglzfj7lq"; - - wine_patches = fetchgit { - url = "git://github.com/compholio/wine-compholio.git"; - rev = "refs/tags/v${wine_patches_version}"; - sha256 = "0lcagswy1lgqz6qlpf0ng7ksl2sbaqldrgnhf0n1278jj82rq80n"; - }; - - wine_custom = - stdenv.lib.overrideDerivation wineUnstable (args: rec { - name = "wine-${wine_patches_version}"; - version = "${wine_patches_version}"; - src = null; - srcs = [ - (fetchurl { - url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = wine_hash; - }) - wine_patches ]; - sourceRoot = "./${name}"; - buildInputs = args.buildInputs ++ [ - autoconf perl utillinux automake attr - ]; - nativeBuildInputs = args.nativeBuildInputs ++ [ - autoconf perl utillinux automake attr - ]; - postPatch = '' - export wineDir=$(pwd) - patchShebangs $wineDir/tools/ - chmod u+w $wineDir/../${wine_patches.name}/debian/tools/ - patchShebangs $wineDir/../${wine_patches.name}/debian/tools/ - chmod -R +rwx ../${wine_patches.name}/ - make -C ../${wine_patches.name}/patches DESTDIR=$wineDir install - ''; - }); + wine_custom = wineStaging; mozillaPluginPath = "/lib/mozilla/plugins"; From d6edaea4f76b7602dfd90449d7edf0b7f05bffb6 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 13:30:45 -0700 Subject: [PATCH 66/98] cups: 1.7.5 -> 2.0.2 --- pkgs/misc/cups/default.nix | 25 ++++++++++++++++++++----- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index e62cfcff832..d2170cfc332 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,8 +1,11 @@ { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl -, dbus, libusb, acl, gmp }: +, dbus, acl, gmp +, libusb ? null, gnutls ? null, avahi ? null, libpaper ? null +}: -let version = "1.7.5"; in +let version = "2.0.2"; in +with stdenv.lib; stdenv.mkDerivation { name = "cups-${version}"; @@ -10,15 +13,27 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.cups.org/software/${version}/cups-${version}-source.tar.bz2"; - sha256 = "00mx4rpiqw9cwx46bd3hd5lcgmcxy63zfnmkr02smanv8xl4rjqq"; + sha256 = "12xild9nrhqnrzx8zqh78v3chm4mpp5gf5iamr0h9zb6dgvj11w5"; }; - buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb ] + buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ] ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus.libs acl ] ; propagatedBuildInputs = [ openssl gmp ]; - configureFlags = "--localstatedir=/var --sysconfdir=/etc --enable-dbus"; # --with-dbusdir + configureFlags = [ + "--localstatedir=/var" + "--sysconfdir=/etc" + "--with-systemd=\${out}/lib/systemd/system" + "--enable-raw-printing" + "--enable-threads" + ] ++ optionals stdenv.isLinux [ + "--enable-dbus" + "--enable-pam" + ] ++ optional (libusb != null) "--enable-libusb" + ++ optional (gnutls != null) "--enable-ssl" + ++ optional (avahi != null) "--enable-avahi" + ++ optional (libpaper != null) "--enable-libpaper"; installFlags = [ # Don't try to write in /var at build time. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 004420ddfb7..4ba211f9e59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13942,7 +13942,9 @@ let beep = callPackage ../misc/beep { }; - cups = callPackage ../misc/cups { libusb = libusb1; }; + cups = callPackage ../misc/cups { + libusb = libusb1; + }; cups_filters = callPackage ../misc/cups/filters.nix { }; From 0a090d80ac78ffac8c8992238f258c1c310d117d Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Tue, 28 Apr 2015 12:11:41 +0200 Subject: [PATCH 67/98] cups: Refactor meta attributes --- pkgs/misc/cups/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index d2170cfc332..cd6b6b4d12d 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { }; buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ] - ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus.libs acl ] ; + ++ optionals stdenv.isLinux [ pam dbus.libs acl ] ; propagatedBuildInputs = [ openssl gmp ]; @@ -61,10 +61,10 @@ stdenv.mkDerivation { ''; meta = { - homepage = "http://www.cups.org/"; + homepage = https://cups.org/; description = "A standards-based printing system for UNIX"; - license = stdenv.lib.licenses.gpl2; # actually LGPL for the library and GPL for the rest - maintainers = [ stdenv.lib.maintainers.urkud stdenv.lib.maintainers.simons ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; # actually LGPL for the library and GPL for the rest + maintainers = with maintainers; [ urkud simons jgeerds ]; + platforms = platforms.linux; }; } From 5f5ba7dda06c6fc4024f362665a650c742d55e42 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Tue, 28 Apr 2015 12:42:53 +0200 Subject: [PATCH 68/98] cups: Add xdg_utils to build inputs --- pkgs/misc/cups/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index cd6b6b4d12d..45b042960d2 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl -, dbus, acl, gmp +, dbus, acl, gmp, xdg_utils , libusb ? null, gnutls ? null, avahi ? null, libpaper ? null }: @@ -17,7 +17,7 @@ stdenv.mkDerivation { }; buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ] - ++ optionals stdenv.isLinux [ pam dbus.libs acl ] ; + ++ optionals stdenv.isLinux [ pam dbus.libs acl xdg_utils ] ; propagatedBuildInputs = [ openssl gmp ]; From 4ac95ab3282a5aa364c8c1e51b9637b38729a3a7 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Tue, 28 Apr 2015 20:37:34 +0200 Subject: [PATCH 69/98] cups: Use systemd files provided by CUPS --- nixos/modules/services/printing/cupsd.nix | 9 +++------ pkgs/misc/cups/default.nix | 13 +++++++++++++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index b573a356b35..a69a8aab86a 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -183,10 +183,10 @@ in # gets loaded, and then cups cannot access the printers. boot.blacklistedKernelModules = [ "usblp" ]; - systemd.services.cups = - { description = "CUPS Printing Daemon"; + systemd.packages = [ cups ]; - wantedBy = [ "multi-user.target" ]; + systemd.services.cups = + { wantedBy = [ "multi-user.target" ]; wants = [ "network.target" ]; after = [ "network.target" ]; @@ -200,9 +200,6 @@ in mkdir -m 0755 -p ${cfg.tempDir} ''; - serviceConfig.Type = "forking"; - serviceConfig.ExecStart = "@${cups}/sbin/cupsd cupsd"; - restartTriggers = [ config.environment.etc."cups/cups-files.conf".source config.environment.etc."cups/cupsd.conf".source diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 45b042960d2..10fd71a0754 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -58,6 +58,19 @@ stdenv.mkDerivation { '' # Delete obsolete stuff that conflicts with cups-filters. rm -rf $out/share/cups/banners $out/share/cups/data/testprint + + # Rename systemd files provided by CUPS + for f in $out/lib/systemd/system/*; do + substituteInPlace "$f" \ + --replace "org.cups.cupsd" "cups" \ + --replace "org.cups." "" + + if [[ "$f" =~ .*cupsd\..* ]]; then + mv "$f" "''${f/org\.cups\.cupsd/cups}" + else + mv "$f" "''${f/org\.cups\./}" + fi + done ''; meta = { From 3710dbec0556b407915f133e480600e9882c1c3a Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Tue, 28 Apr 2015 20:40:03 +0200 Subject: [PATCH 70/98] cups: Remove deprecated config options from cupsd.conf --- nixos/modules/services/printing/cupsd.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index a69a8aab86a..2515c1c1668 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -260,8 +260,6 @@ in SetEnv PATH ${bindir}/lib/cups/filter:${bindir}/bin:${bindir}/sbin Browsing On - BrowseOrder allow,deny - BrowseAllow @LOCAL DefaultAuthType Basic From 55a6469ba36e840e2388673318b51bc77cb3f7ba Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Sat, 2 May 2015 15:33:22 +0200 Subject: [PATCH 71/98] cups: Fix printing tests It seems like there's an upstream bug in the "lpstat" command. We need to specify the server's port. Further information: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=711327 [root@client:~]# lpstat -H /var/run/cups/cups.sock [root@client:~]# lpstat -h server -H /var/run/cups/cups.sock:631 [root@client:~]# CUPS_SERVER=server lpstat -H server:631 [root@client:~]# lpstat -h server:631 -H server:631 --- nixos/tests/printing.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index ba10f23582d..65d573e690b 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -48,7 +48,7 @@ import ./make-test.nix ({pkgs, ... }: { # Do some status checks. $client->succeed("lpstat -a") =~ /DeskjetRemote accepting requests/ or die; - $client->succeed("lpstat -h server -a") =~ /DeskjetLocal accepting requests/ or die; + $client->succeed("lpstat -h server:631 -a") =~ /DeskjetLocal accepting requests/ or die; $client->succeed("cupsdisable DeskjetRemote"); $client->succeed("lpq") =~ /DeskjetRemote is not ready.*no entries/s or die; $client->succeed("cupsenable DeskjetRemote"); From 2cc8d156532aa776c53307375acafb80a4a3cfd3 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Mon, 4 May 2015 22:32:35 +0200 Subject: [PATCH 72/98] cups: Add defaultShared, browsing and webInterace config option --- nixos/modules/services/printing/cupsd.nix | 30 ++++++++++++++++++++++- nixos/tests/printing.nix | 1 + 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 2515c1c1668..fd9589883ed 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -72,6 +72,30 @@ in ''; }; + defaultShared = mkOption { + type = types.bool; + default = false; + description = '' + Specifies whether local printers are shared by default. + ''; + }; + + browsing = mkOption { + type = types.bool; + default = false; + description = '' + Specifies whether shared printers are advertised. + ''; + }; + + webInterface = mkOption { + type = types.bool; + default = true; + description = '' + Specifies whether the web interface is enabled. + ''; + }; + cupsdConf = mkOption { type = types.lines; default = ""; @@ -259,7 +283,11 @@ in SetEnv PATH ${bindir}/lib/cups/filter:${bindir}/bin:${bindir}/sbin - Browsing On + DefaultShared ${if cfg.defaultShared then "Yes" else "No"} + + Browsing ${if cfg.browsing then "Yes" else "No"} + + WebInterface ${if cfg.webInterface then "Yes" else "No"} DefaultAuthType Basic diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index 65d573e690b..708ff539157 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -9,6 +9,7 @@ import ./make-test.nix ({pkgs, ... }: { { config, pkgs, ... }: { services.printing.enable = true; services.printing.listenAddresses = [ "*:631" ]; + services.printing.defaultShared = true; services.printing.extraConf = '' From 116006702bac0b79d8804817f798415a38cd7f53 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Mon, 4 May 2015 22:51:24 +0200 Subject: [PATCH 73/98] cups: Add changelog for the upcoming NixOS release --- nixos/doc/manual/release-notes/rl-unstable.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index 6b2cf55bb8d..c4691aa663f 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -49,6 +49,19 @@ was accordingly renamed to bomi + + + The CUPS printing service has been updated to version 2.0.2. + Furthermore its systemd service has been renamed to cups.service. + + + Local printers are no longer shared or advertised by default. This behavior + can be changed by enabling services.printing.defaultShared + or services.printing.browsing respectively. + + + + From 48e65cec4ecd6bef08233460cf5ffedb023cc7c6 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Sun, 10 May 2015 00:04:59 +0200 Subject: [PATCH 74/98] cups: Rename "browsing" config option to "advertise" --- nixos/doc/manual/release-notes/rl-unstable.xml | 2 +- nixos/modules/services/printing/cupsd.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index c4691aa663f..f1e652a53bb 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -57,7 +57,7 @@ was accordingly renamed to bomi Local printers are no longer shared or advertised by default. This behavior can be changed by enabling services.printing.defaultShared - or services.printing.browsing respectively. + or services.printing.advertise respectively. diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index fd9589883ed..d7f87413e6c 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -80,7 +80,7 @@ in ''; }; - browsing = mkOption { + advertise = mkOption { type = types.bool; default = false; description = '' @@ -285,7 +285,7 @@ in DefaultShared ${if cfg.defaultShared then "Yes" else "No"} - Browsing ${if cfg.browsing then "Yes" else "No"} + Browsing ${if cfg.advertise then "Yes" else "No"} WebInterface ${if cfg.webInterface then "Yes" else "No"} From f550eb7fdea5dd4e3183ce92c4ae993a3352ac48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 10 May 2015 12:26:53 +0200 Subject: [PATCH 75/98] docker: fix build --- pkgs/applications/virtualization/docker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 240973044d1..90583038145 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { dontStrip = true; buildPhase = '' - patchShebangs ./project + patchShebangs . export AUTO_GOPATH=1 export DOCKER_GITCOMMIT="03nzhikx" ./hack/make.sh dynbinary From ae6d2796bc1d1a0ebc729f8826ae6ff5b97256e2 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Tue, 21 Apr 2015 18:00:59 +0200 Subject: [PATCH 76/98] wine: add 64 bit build and nixpkgs configuration The default release channel (stable/unstable) and the default build (wine32/wine64/wineWow) can be customized via the "wine" key in config --- pkgs/misc/emulators/wine/base.nix | 61 +++++++++++++++++++ pkgs/misc/emulators/wine/builder-wow.sh | 29 +++++++++ pkgs/misc/emulators/wine/default.nix | 15 +++++ pkgs/misc/emulators/wine/packages.nix | 60 ++++++++++++++++++ pkgs/misc/emulators/wine/stable.nix | 81 ------------------------- pkgs/misc/emulators/wine/unstable.nix | 78 ------------------------ pkgs/misc/emulators/wine/versions.nix | 25 ++++++++ pkgs/top-level/all-packages.nix | 24 ++++---- 8 files changed, 201 insertions(+), 172 deletions(-) create mode 100644 pkgs/misc/emulators/wine/base.nix create mode 100644 pkgs/misc/emulators/wine/builder-wow.sh create mode 100644 pkgs/misc/emulators/wine/default.nix create mode 100644 pkgs/misc/emulators/wine/packages.nix delete mode 100644 pkgs/misc/emulators/wine/stable.nix delete mode 100644 pkgs/misc/emulators/wine/unstable.nix create mode 100644 pkgs/misc/emulators/wine/versions.nix diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix new file mode 100644 index 00000000000..ce39740f113 --- /dev/null +++ b/pkgs/misc/emulators/wine/base.nix @@ -0,0 +1,61 @@ +{ stdenv, lib, pkgArches, + name, version, src, monos, geckos, platforms, + buildScript ? null, configureFlags ? "" +}: + +assert stdenv.isLinux; +assert stdenv.cc.cc.isGNU or false; + +stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { + builder = buildScript; +}) // { + inherit name src configureFlags; + + buildInputs = lib.concatLists (map (pkgs: (with pkgs; [ + pkgconfig alsaLib ncurses libpng libjpeg lcms2 fontforge libxml2 libxslt + openssl gnutls cups makeWrapper flex bison mesa mesa_noglu.osmesa + ]) ++ (with pkgs.xlibs; [ + xlibs libXi libXcursor libXinerama libXrandr libXrender libXxf86vm libXcomposite + ])) pkgArches); + + # Wine locates a lot of libraries dynamically through dlopen(). Add + # them to the RPATH so that the user doesn't have to set them in + # LD_LIBRARY_PATH. + NIX_LDFLAGS = map (path: "-rpath ${path}/lib") ([ + stdenv.cc.cc + ] ++ (lib.concatLists (map (pkgs: + (with pkgs; [ + freetype fontconfig mesa mesa_noglu.osmesa libdrm + libpng libjpeg openssl gnutls cups ncurses + ]) ++ (with pkgs.xlibs; [ + libXinerama libXrender libXrandr libXcursor libXcomposite + ])) pkgArches))); + + # Don't shrink the ELF RPATHs in order to keep the extra RPATH + # elements specified above. + dontPatchELF = true; + + ## FIXME + # Add capability to ignore known failing tests + # and enable doCheck + doCheck = false; + + postInstall = let + links = prefix: pkg: "ln -s ${pkg} $out/${prefix}/${pkg.name}"; + in '' + mkdir -p $out/share/wine/gecko $out/share/wine/mono/ + ${lib.strings.concatStringsSep "\n" + ((map (links "share/wine/gecko") geckos) + ++ (map (links "share/wine/mono") monos))} + ''; + + enableParallelBuilding = true; + + meta = { + inherit version platforms; + homepage = "http://www.winehq.org/"; + license = "LGPL"; + description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; + maintainers = [stdenv.lib.maintainers.raskin]; + }; +}) diff --git a/pkgs/misc/emulators/wine/builder-wow.sh b/pkgs/misc/emulators/wine/builder-wow.sh new file mode 100644 index 00000000000..9f946f3b71f --- /dev/null +++ b/pkgs/misc/emulators/wine/builder-wow.sh @@ -0,0 +1,29 @@ +#!/bin/sh + +source $stdenv/setup + +unpackPhase +patchPhase + +configureScript=$TMP/$sourceRoot/configure +mkdir -p $TMP/wine-wow $TMP/wine64 + +cd $TMP/wine64 +sourceRoot=`pwd` +configureFlags="--enable-win64" +configurePhase +buildPhase +# checkPhase + +cd $TMP/wine-wow +sourceRoot=`pwd` +configureFlags="--with-wine64=../wine64" +configurePhase +buildPhase +# checkPhase + +eval "$preInstall" +cd $TMP/wine64 && make install +cd $TMP/wine-wow && make install +eval "$postInstall" +fixupPhase diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix new file mode 100644 index 00000000000..962aee9fb5d --- /dev/null +++ b/pkgs/misc/emulators/wine/default.nix @@ -0,0 +1,15 @@ +## Configuration: +# Control you default wine config in nixpkgs-config: +# wine = { +# release = "stable"; # "stable", "unstable" +# build = "wineWow"; # "wine32", "wine64", "wineWow" +# }; +# Make additional configurations on demand: +# wine.overrideConfig { build = "wine32"; }; +{ lib, system, callPackage, + wineRelease ? "stable", + wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32") }: + +lib.getAttr wineBuild (callPackage ./packages.nix { + inherit wineRelease; +}) diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/misc/emulators/wine/packages.nix new file mode 100644 index 00000000000..4d95dc911dc --- /dev/null +++ b/pkgs/misc/emulators/wine/packages.nix @@ -0,0 +1,60 @@ +{ system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, fetchurl, + wineRelease ? "stable" +}: + +let sources = with lib.getAttr wineRelease (import ./versions.nix); { + version = wineVersion; + src = fetchurl { + url = "mirror://sourceforge/wine/wine-${wineVersion}.tar.bz2"; + sha256 = wineSha256; + }; + + wineGecko32 = fetchurl { + url = "mirror://sourceforge/wine/wine_gecko-${geckoVersion}-x86.msi"; + sha256 = geckoSha256; + }; + + wineGecko64 = fetchurl { + url = "mirror://sourceforge/wine/wine_gecko-${gecko64Version}-x86_64.msi"; + sha256 = gecko64Sha256; + }; + + wineMono = fetchurl { + url = "mirror://sourceforge/wine/wine-mono-${monoVersion}.msi"; + sha256 = monoSha256; + }; + }; + inherit (sources) version; +in { + wine32 = import ./base.nix { + name = "wine32-${version}"; + inherit (sources) version src; + inherit (pkgsi686Linux) lib stdenv; + pkgArches = [ pkgsi686Linux ]; + geckos = with sources; [ wineGecko32 ]; + monos = with sources; [ wineMono ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; + wine64 = import ./base.nix { + name = "wine64-${version}"; + inherit (sources) version src; + inherit lib stdenv; + pkgArches = [ pkgs ]; + geckos = with sources; [ wineGecko64 ]; + monos = with sources; [ wineMono ]; + configureFlags = "--enable-win64"; + platforms = [ "x86_64-linux" ]; + }; + wineWow = import ./base.nix { + name = "wineWow-${version}"; + inherit (sources) version src; + inherit lib; + stdenv = stdenv_32bit; + pkgArches = [ pkgs pkgsi686Linux ]; + geckos = with sources; [ wineGecko32 wineGecko64 ]; + monos = with sources; [ wineMono ]; + buildScript = ./builder-wow.sh; + platforms = [ "x86_64-linux" ]; + }; +} + diff --git a/pkgs/misc/emulators/wine/stable.nix b/pkgs/misc/emulators/wine/stable.nix deleted file mode 100644 index bdf696f541f..00000000000 --- a/pkgs/misc/emulators/wine/stable.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, xlibs, flex, bison, mesa, mesa_noglu, alsaLib -, ncurses, libpng, libjpeg, lcms2, freetype, fontconfig, fontforge -, libxml2, libxslt, openssl, gnutls, cups, libdrm, makeWrapper -}: - -assert stdenv.isLinux; -assert stdenv.cc.cc.isGNU or false; - -let - version = "1.6.2"; - name = "wine-${version}"; - - src = fetchurl { - url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "1gmc0ljgfz3qy50mdxcwwjcr2yrpz54jcs2hdszsrk50wpnrxazh"; - }; - - gecko = fetchurl { - url = "mirror://sourceforge/wine/wine_gecko-2.21-x86.msi"; - sha256 = "1n0zccnvchkg0m896sjx5psk4bxw9if32xyxib1rbfdasykay7zh"; - }; - - gecko64 = fetchurl { - url = "mirror://sourceforge/wine/wine_gecko-2.21-x86_64.msi"; - sha256 = "0grc86dkq90i59zw43hakh62ra1ajnk11m64667xjrlzi7f0ndxw"; - }; - - mono = fetchurl { - url = "mirror://sourceforge/wine/wine-mono-0.0.8.msi"; - sha256 = "00jl24qp7vh3hlqv7wsw1s529lr5p0ybif6s73jy85chqaxj7z1x"; - }; - -in stdenv.mkDerivation rec { - inherit version name src; - - buildInputs = [ - pkgconfig - xlibs.xlibs flex bison xlibs.libXi mesa mesa_noglu.osmesa - xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr - xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite - alsaLib ncurses libpng libjpeg lcms2 fontforge - libxml2 libxslt openssl gnutls cups makeWrapper - ]; - - # Wine locates a lot of libraries dynamically through dlopen(). Add - # them to the RPATH so that the user doesn't have to set them in - # LD_LIBRARY_PATH. - NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [ - freetype fontconfig stdenv.cc.cc mesa mesa_noglu.osmesa libdrm - xlibs.libXinerama xlibs.libXrender xlibs.libXrandr - xlibs.libXcursor xlibs.libXcomposite libpng libjpeg - openssl gnutls cups - ]; - - # Don't shrink the ELF RPATHs in order to keep the extra RPATH - # elements specified above. - dontPatchELF = true; - - postInstall = '' - install -D ${gecko} $out/share/wine/gecko/${gecko.name} - '' + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") '' - install -D ${gecko} $out/share/wine/gecko/${gecko64.name} - '' + '' - install -D ${mono} $out/share/wine/mono/${mono.name} - - paxmark psmr $out/bin/wine{,-preloader} - - wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.cc.cc}/lib - ''; - - enableParallelBuilding = true; - - meta = { - homepage = "http://www.winehq.org/"; - license = "LGPL"; - inherit version; - description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix deleted file mode 100644 index aac97fe05b8..00000000000 --- a/pkgs/misc/emulators/wine/unstable.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, xlibs, flex, bison, mesa, mesa_noglu, alsaLib -, ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge -, libxml2, libxslt, openssl, gnutls, cups, libdrm, makeWrapper -}: - -assert stdenv.isLinux; -assert stdenv.cc.cc.isGNU or false; - -let - version = "1.7.42"; - name = "wine-${version}"; - - src = fetchurl { - url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "18iv4dsx2p7bk5qhiqqc6fpnnzny9rx8vgbjlpnf3gr0n615qzss"; - }; - - gecko = fetchurl { - url = "mirror://sourceforge/wine/wine_gecko-2.36-x86.msi"; - sha256 = "12hjks32yz9jq4w3xhk3y1dy2g3iakqxd7aldrdj51cqiz75g95g"; - }; - - gecko64 = fetchurl { - url = "mirror://sourceforge/wine/wine_gecko-2.36-x86_64.msi"; - sha256 = "0i7dchrzsda4nqbkhp3rrchk74rc2whn2af1wzda517m9c0886vh"; - }; - - mono = fetchurl { - url = "mirror://sourceforge/wine/wine-mono-4.5.4.msi"; - sha256 = "1wnn273f232141x9x0sahg4w499x0g2p0xphxmwm5wh1xrzyvg10"; - }; - -in stdenv.mkDerivation rec { - inherit version name src; - - buildInputs = [ - pkgconfig - xlibs.xlibs flex bison xlibs.libXi mesa mesa_noglu.osmesa - xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr - xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite - alsaLib ncurses libpng libjpeg lcms fontforge - libxml2 libxslt openssl gnutls cups makeWrapper - ]; - - # Wine locates a lot of libraries dynamically through dlopen(). Add - # them to the RPATH so that the user doesn't have to set them in - # LD_LIBRARY_PATH. - NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [ - freetype fontconfig stdenv.cc.cc mesa mesa_noglu.osmesa libdrm - xlibs.libXinerama xlibs.libXrender xlibs.libXrandr - xlibs.libXcursor xlibs.libXcomposite libpng libjpeg - openssl gnutls cups ncurses - ]; - - # Don't shrink the ELF RPATHs in order to keep the extra RPATH - # elements specified above. - dontPatchELF = true; - - postInstall = '' - install -D ${gecko} $out/share/wine/gecko/${gecko.name} - '' + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") '' - install -D ${gecko} $out/share/wine/gecko/${gecko64.name} - '' + '' - install -D ${mono} $out/share/wine/mono/${mono.name} - wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.cc.cc}/lib - ''; - - enableParallelBuilding = true; - - meta = { - homepage = "http://www.winehq.org/"; - license = "LGPL"; - inherit version; - description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/misc/emulators/wine/versions.nix b/pkgs/misc/emulators/wine/versions.nix new file mode 100644 index 00000000000..e599f04f857 --- /dev/null +++ b/pkgs/misc/emulators/wine/versions.nix @@ -0,0 +1,25 @@ +{ + unstable = { + wineVersion = "1.7.42"; + wineSha256 = "18iv4dsx2p7bk5qhiqqc6fpnnzny9rx8vgbjlpnf3gr0n615qzss"; + geckoVersion = "2.36"; + geckoSha256 = "12hjks32yz9jq4w3xhk3y1dy2g3iakqxd7aldrdj51cqiz75g95g"; + gecko64Version = "2.36"; + gecko64Sha256 = "0i7dchrzsda4nqbkhp3rrchk74rc2whn2af1wzda517m9c0886vh"; + monoVersion = "4.5.6"; + monoSha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c"; + }; + stable = { + wineVersion = "1.6.2"; + wineSha256 = "1gmc0ljgfz3qy50mdxcwwjcr2yrpz54jcs2hdszsrk50wpnrxazh"; + geckoVersion = "2.21"; + geckoSha256 = "1n0zccnvchkg0m896sjx5psk4bxw9if32xyxib1rbfdasykay7zh"; + gecko64Version = "2.21"; + gecko64Sha256 = "0grc86dkq90i59zw43hakh62ra1ajnk11m64667xjrlzi7f0ndxw"; + monoVersion = "4.5.6"; + monoSha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c"; + ## TESTME wine stable should work with most recent mono + #monoVersion = "0.0.8"; + #monoSha256 = "00jl24qp7vh3hlqv7wsw1s529lr5p0ybif6s73jy85chqaxj7z1x"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ba211f9e59..716349d6074 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14345,27 +14345,25 @@ let VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { }; - # Wine cannot be built in 64-bit; use a 32-bit build instead. - wineStable = callPackage_i686 ../misc/emulators/wine/stable.nix { - bison = bison2; + # Wine defaults to a mixed 64 / 32 build on x86_64 and to pure 32 on x86 + wine = callPackage ../misc/emulators/wine { + wineRelease = config.wine.release or "stable"; + wineBuild = config.wine.build or (if system == "x86_64-linux" then "wineWow" else "wine32"); + }; + wineStable = wine.override { wineRelease = "stable"; }; + wineUnstable = wine.override { wineRelease = "unstable"; }; + + winetricks = callPackage ../misc/emulators/wine/winetricks.nix { + inherit (gnome2) zenity; }; - wineUnstable = lowPrio (callPackage_i686 ../misc/emulators/wine/unstable.nix { - bison = bison2; - }); - - wine = wineStable; - + ### FIXME integrate wineStaging into 64bit wineStaging = callPackage_i686 ../misc/emulators/wine/staging.nix { wine = pkgsi686Linux.wineUnstable; # Patent issues libtxc_dxtn = pkgsi686Linux.libtxc_dxtn_s2tc; }; - winetricks = callPackage ../misc/emulators/wine/winetricks.nix { - inherit (gnome2) zenity; - }; - wmutils-core = callPackage ../tools/X11/wmutils-core { }; wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { }; From 8a82935d46850b51aed5e9ceb864c330990771da Mon Sep 17 00:00:00 2001 From: Stewart Mackenzie Date: Sun, 10 May 2015 23:43:17 +0800 Subject: [PATCH 77/98] gnuradio-osmosdr: add hackrf support --- pkgs/applications/misc/gnuradio-osmosdr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gnuradio-osmosdr/default.nix b/pkgs/applications/misc/gnuradio-osmosdr/default.nix index ec48a9da92f..360d98537cc 100644 --- a/pkgs/applications/misc/gnuradio-osmosdr/default.nix +++ b/pkgs/applications/misc/gnuradio-osmosdr/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, cmake, pkgconfig, boost, gnuradio, rtl-sdr, uhd -, makeWrapper +, makeWrapper, hackrf , pythonSupport ? true, python, swig }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cmake pkgconfig boost gnuradio rtl-sdr uhd makeWrapper + cmake pkgconfig boost gnuradio rtl-sdr uhd makeWrapper hackrf ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' From d8b93eb1cde070cf740fe3c6150c3acfdd259fe8 Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Sun, 10 May 2015 18:50:07 +0200 Subject: [PATCH 78/98] Fix compilation of language-glsl. The issue / patch https://github.com/noteed/language-glsl/pull/10 fixes a compilation problem with language-glsl. The packages pretty and prettyclass conflicted when compiled with GHC 7.10. --- .../development/haskell-modules/configuration-ghc-7.10.x.nix | 5 +++++ 1 file changed, 5 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 65281a758b8..a05f70e5d44 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -55,6 +55,11 @@ self: super: { sha256 = "193i1xmq6z0jalwmq0mhqk1khz6zz0i1hs6lgfd7ybd6qyaqnf5f"; }); + language-glsl = appendPatch super.language-glsl (pkgs.fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/noteed/language-glsl/pull/10.patch"; + sha256 = "1d8dmfqw9y7v7dlszb7l3wp0vj77j950z2r3r0ar9mcvyrmfm4in"; + }); + # haddock: No input file(s). nats = dontHaddock super.nats; bytestring-builder = dontHaddock super.bytestring-builder; From 19dbe42aeb762ec6ddae9e6af20959424857703a Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Sun, 10 May 2015 20:47:50 +0200 Subject: [PATCH 79/98] Revert "cups: Rename "browsing" config option to "advertise"" This reverts commit 48e65cec4ecd6bef08233460cf5ffedb023cc7c6. --- nixos/doc/manual/release-notes/rl-unstable.xml | 2 +- nixos/modules/services/printing/cupsd.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index f1e652a53bb..c4691aa663f 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -57,7 +57,7 @@ was accordingly renamed to bomi Local printers are no longer shared or advertised by default. This behavior can be changed by enabling services.printing.defaultShared - or services.printing.advertise respectively. + or services.printing.browsing respectively. diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index d7f87413e6c..fd9589883ed 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -80,7 +80,7 @@ in ''; }; - advertise = mkOption { + browsing = mkOption { type = types.bool; default = false; description = '' @@ -285,7 +285,7 @@ in DefaultShared ${if cfg.defaultShared then "Yes" else "No"} - Browsing ${if cfg.advertise then "Yes" else "No"} + Browsing ${if cfg.browsing then "Yes" else "No"} WebInterface ${if cfg.webInterface then "Yes" else "No"} From 7b49289c7435573a6585b51f38bead8472998e25 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 May 2015 14:40:11 +0200 Subject: [PATCH 80/98] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-files/commit/4f492cbdcc631f75bee47cc7659b573a8bf4ab6f with hackage2nix revision 4c63d4ad559c7c9569df1ea07557f92a1cfb5a3e --- .../haskell-modules/hackage-packages.nix | 477 +++++++++++------- 1 file changed, 296 insertions(+), 181 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7c724523c5d..ccf42a3fc0d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2468,6 +2468,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "CirruParser" = callPackage + ({ mkDerivation, aeson, base, text, vector }: + mkDerivation { + pname = "CirruParser"; + version = "0.0.1"; + sha256 = "111ccwiszrjy54y5hincyvjj97kmar9n26bbn902qa9jd9y9k3g9"; + buildDepends = [ aeson base text vector ]; + homepage = "https://github.com/Cirru/parser.hs"; + description = "Cirru Parser in Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "ClassLaws" = callPackage ({ mkDerivation, base, ChasingBottoms, mtl, QuickCheck }: mkDerivation { @@ -17013,8 +17025,8 @@ self: { }: mkDerivation { pname = "ad"; - version = "4.2.1.1"; - sha256 = "1zdpfh4k93ygrm91m7lw1la6n4yvaq3k2sqswgia04naf2wcmjka"; + version = "4.2.2"; + sha256 = "032ch6gjg88zfiwid4f1f7rms86z4x7jfmq496cgr50ycx9gsjxf"; buildDepends = [ array base comonad containers data-reify erf free nats reflection transformers @@ -21799,16 +21811,17 @@ self: { }) {}; "auto" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, deepseq - , MonadRandom, profunctors, random, semigroups, transformers + ({ mkDerivation, base, base-orphans, bytestring, cereal, containers + , deepseq, MonadRandom, profunctors, random, semigroups + , transformers }: mkDerivation { pname = "auto"; - version = "0.4.2.1"; - sha256 = "0q5zz6q0dcc9chypbd2kci7kkn69ib0vdv48186jqzb3f50l59zw"; + version = "0.4.2.2"; + sha256 = "1n2kknp7b8agkvn3nk6w6cabzh3n89jakzx8pi46ig2ghcxz90wf"; buildDepends = [ - base bytestring cereal containers deepseq MonadRandom profunctors - random semigroups transformers + base base-orphans bytestring cereal containers deepseq MonadRandom + profunctors random semigroups transformers ]; homepage = "https://github.com/mstksg/auto"; description = "Denotative, locally stateful programming DSL & platform"; @@ -23119,8 +23132,8 @@ self: { ({ mkDerivation, aeson, base, binary, bytestring, hspec, text }: mkDerivation { pname = "base58string"; - version = "0.9.1"; - sha256 = "1j7vk3par9z2svq8mwwxm73yd5yks25412l3n9mr081ybvywkckd"; + version = "0.10.0"; + sha256 = "1260x4bkrizvnmylm237gpi92wazh31md9nf982sac3fsxyn0wiv"; buildDepends = [ aeson base binary bytestring text ]; testDepends = [ base binary bytestring hspec text ]; homepage = "http://www.leonmergen.com/opensource.html"; @@ -23502,12 +23515,11 @@ self: { ({ mkDerivation, base, binary, bytestring, containers, parsec }: mkDerivation { pname = "bencode"; - version = "0.5.0.1"; - sha256 = "1zr2sa76s761qhrmh1aymjr6drp8vxads5xf42r63rfdrzm6l3yj"; + version = "0.6.0.0"; + sha256 = "12pnh598k30ggs54f0pic19j7ji8f4xn7fydkdnlig79rvzgv3iv"; buildDepends = [ base binary bytestring containers parsec ]; description = "Parser and printer for bencoded data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bencoding" = callPackage @@ -23575,8 +23587,8 @@ self: { }: mkDerivation { pname = "bert"; - version = "1.2.2.3"; - sha256 = "1waq40hd9wqavzhnvfk1i6wjqkmfb4pl17h4acfzzyz8bj76alkq"; + version = "1.2.2.4"; + sha256 = "1vcbylvci91rqq5dxsa2gxc709klr0xkcflpdhcng69s6pihgsg4"; buildDepends = [ base binary binary-conduit bytestring conduit conduit-extra containers mtl network parsec time unix void @@ -25341,15 +25353,15 @@ self: { "bitcoin-block" = callPackage ({ mkDerivation, base, binary, bitcoin-tx, bitcoin-types - , bytestring, cryptohash, hexstring, hspec, largeword + , bytestring, cryptohash, hexstring, hspec, largeword, lens }: mkDerivation { pname = "bitcoin-block"; - version = "0.9.0"; - sha256 = "0xqdf7hqcgrzmafh3lp3sq3jm6nblqbhfwvfihmjm4srdj1x77m2"; + version = "0.13.0"; + sha256 = "0xiljk9dfd4g2kqphj8xf03kx8d7jd296s8i5rgflc4140npaz20"; buildDepends = [ base binary bitcoin-tx bitcoin-types bytestring cryptohash - hexstring largeword + hexstring largeword lens ]; testDepends = [ base bitcoin-tx bitcoin-types bytestring hexstring hspec @@ -25401,15 +25413,15 @@ self: { "bitcoin-tx" = callPackage ({ mkDerivation, base, binary, bitcoin-script, bitcoin-types - , bytestring, cryptohash, hexstring, hspec + , bytestring, cryptohash, hexstring, hspec, lens }: mkDerivation { pname = "bitcoin-tx"; - version = "0.12.1"; - sha256 = "130ci02j4zcpzmysg0ij54jvzh4j510jb37aa753fm3hpbgczzm5"; + version = "0.13.0"; + sha256 = "13iv72l8b2scz6l8319r1yshwn7h67l3dn1z8fl181njkiz5xk0w"; buildDepends = [ base binary bitcoin-script bitcoin-types bytestring cryptohash - hexstring + hexstring lens ]; testDepends = [ base bitcoin-script bytestring hexstring hspec ]; homepage = "http://www.leonmergen.com/opensource.html"; @@ -25423,8 +25435,8 @@ self: { }: mkDerivation { pname = "bitcoin-types"; - version = "0.9.1"; - sha256 = "0hk03crwl8xh9gm3b53fgf76qd0jn4wbvvxjm1035lrbi028cm4y"; + version = "0.9.2"; + sha256 = "02y4svhcsml37p78g4cm97kyigcakgf4hds4bxnp0r4ba1498bxp"; buildDepends = [ base base58string binary bytestring hexstring text ]; @@ -26821,20 +26833,21 @@ self: { }) {}; "breve" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, configurator - , cryptohash, directory, hashtables, mtl, random, simple - , transformers, wai, wai-extra, warp, xdg-basedir + ({ mkDerivation, aeson, base, binary, blaze-html, bytestring + , configurator, cryptohash, directory, hashtables, http-types, mtl + , random, Spock, text, transformers, wai, wai-extra + , wai-middleware-static, warp, xdg-basedir }: mkDerivation { pname = "breve"; - version = "0.2.0.0"; - sha256 = "0dndy14lxj18l0kr7ay1dclp3c960lmd6vqhnz8lkdz1p6cdq9hd"; + version = "0.3.0.0"; + sha256 = "14vhwicdi1cln594bfhhj65kwaxmimpzg4jh35mrycw0fpbfk6rp"; isLibrary = false; isExecutable = true; buildDepends = [ - aeson base binary bytestring configurator cryptohash directory - hashtables mtl random simple transformers wai wai-extra warp - xdg-basedir + aeson base binary blaze-html bytestring configurator cryptohash + directory hashtables http-types mtl random Spock text transformers + wai wai-extra wai-middleware-static warp xdg-basedir ]; homepage = "https://github.com/rnhmjoj/breve"; description = "a url shortener"; @@ -28170,6 +28183,7 @@ 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 @@ -31095,6 +31109,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cirru-parser" = callPackage + ({ mkDerivation, aeson, base, text, vector }: + mkDerivation { + pname = "cirru-parser"; + version = "0.0.2"; + sha256 = "11qnc8rbw9zxrsaa49x5wmkrnr0vi6pgb1j18nrn40sbbww95xrz"; + buildDepends = [ aeson base text vector ]; + homepage = "https://github.com/Cirru/parser.hs"; + description = "Cirru Parser in Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "citation-resolve" = callPackage ({ mkDerivation, aeson, base, bytestring, citeproc-hs, containers , curl, data-default, directory, doctest, download-curl, either @@ -31363,8 +31389,8 @@ self: { }: mkDerivation { pname = "clash-lib"; - version = "0.5.3"; - sha256 = "0x5qza2xv26m27inr0cm59vlizlbimb3gfdc1amal6nznjgrsflc"; + version = "0.5.4"; + sha256 = "08is6gr5z2i478lmah6liqinbp8r72zjqfcbfmrxa4vjr3ajrpw7"; buildDepends = [ aeson attoparsec base bytestring clash-prelude concurrent-supply containers deepseq directory errors fgl filepath hashable lens mtl @@ -31397,15 +31423,12 @@ self: { }) {}; "clash-prelude-quickcheck" = callPackage - ({ mkDerivation, base, clash-prelude, containers, mtl, QuickCheck - }: + ({ mkDerivation, base, clash-prelude, QuickCheck }: mkDerivation { pname = "clash-prelude-quickcheck"; - version = "0.1.2.0"; - revision = "1"; - sha256 = "1vnw7gaaj1ixz6j96dg6lqcafjbijkzxww0pij8hy4z3sm2370w0"; - editedCabalFile = "f746784b2f0ed039d21e46d8b3adabb39ab6eb002d1c83fd8091619863be7f28"; - buildDepends = [ base clash-prelude containers mtl QuickCheck ]; + version = "0.1.2.1"; + sha256 = "1fn5wlg2lmxl6rs2ygnf0m88bgcjf62jpprbp425pqbq6lvhw70w"; + buildDepends = [ base clash-prelude QuickCheck ]; description = "QuickCheck instances for various types in the CλaSH Prelude"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -31417,8 +31440,8 @@ self: { }: mkDerivation { pname = "clash-systemverilog"; - version = "0.5.3"; - sha256 = "06b224qjvj1yqywzs2cz8pzb37n1p8y9zpw4jjb9q76qvr0x68q3"; + version = "0.5.4"; + sha256 = "1n35k6mmwf8ky99kc22nw5zwkp75pasjs1yx175h46ln3cqlm289"; buildDepends = [ base clash-lib clash-prelude fgl lens mtl text unordered-containers wl-pprint-text @@ -31435,8 +31458,8 @@ self: { }: mkDerivation { pname = "clash-vhdl"; - version = "0.5.3"; - sha256 = "1x43w6sjscvkikrczjdq94wq24k0q92fwifk4561kp6qm2brlw1q"; + version = "0.5.4"; + sha256 = "1zmbgsvqa6mgz3aj6xpv3daiic57rccbav1c5dnsfjbsp8x2jgnc"; buildDepends = [ base clash-lib clash-prelude fgl lens mtl text unordered-containers wl-pprint-text @@ -33391,9 +33414,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "composition"; - version = "1.0.1.0"; - sha256 = "1gx27vz2djiiwygcjaygjmiwjnls084b5v9km3jpimlz312qh5hc"; - homepage = "http://patch-tag.com/r/DanBurton/composition/home"; + version = "1.0.1.1"; + sha256 = "112ypxszskri2skj0qbf2a13j2kqnz2pbsrkyja32gs37ln7ca1p"; description = "Combinators for unorthodox function composition"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -33515,8 +33537,8 @@ self: { }: mkDerivation { pname = "conceit"; - version = "0.3.0.0"; - sha256 = "1sy8qz7lf4a09b4i7nnzn2bl4lbmkmc613l9pjs7y2xf1qniawhg"; + version = "0.3.1.0"; + sha256 = "1nllcnwjzf7brsmgrrqfil0fppqinysmwcpr1k5ralrhaabwk64l"; buildDepends = [ base bifunctors exceptions mtl semigroupoids transformers void ]; @@ -33904,9 +33926,10 @@ self: { mkDerivation { pname = "conduit-audio"; version = "0.1"; + revision = "1"; sha256 = "1xmxnr7w8s3kmdv5h0y08rnp3sx5wvxqmkg1j7yjycp9z7hbmylb"; + editedCabalFile = "bf853ba8300deda982d278245bd268e91f444ca42185bd0d57eb9feae5ab066c"; buildDepends = [ base conduit vector ]; - jailbreak = true; homepage = "http://github.com/mtolly/conduit-audio"; description = "Combinators to efficiently slice and dice audio streams"; license = "LGPL"; @@ -33919,12 +33942,13 @@ self: { mkDerivation { pname = "conduit-audio-lame"; version = "0.1"; + revision = "1"; sha256 = "0i4nmb4yf2wlkl5da215ysj25gyaikfd292nc9gzmnxjgg1fx19w"; + editedCabalFile = "34e31416cde87ad1d75570612f3e95d8f54cbeac0539a6f85b93aebaf3979c1a"; buildDepends = [ base bytestring conduit conduit-audio resourcet transformers vector ]; extraLibraries = [ mp3lame ]; - jailbreak = true; homepage = "http://github.com/mtolly/conduit-audio"; description = "conduit-audio interface to the LAME MP3 library"; license = "LGPL"; @@ -33938,12 +33962,13 @@ self: { mkDerivation { pname = "conduit-audio-samplerate"; version = "0.1"; + revision = "1"; sha256 = "04s5ld0nsgbjlgkj3f32xnwyah26m6j5qmjxycwgvxjp1siq2xsg"; + editedCabalFile = "c3601c344d95841d594827a61b1a7ad05042dec6f62ce9952e88b3d0fe814a63"; buildDepends = [ base conduit conduit-audio resourcet transformers vector ]; extraLibraries = [ samplerate ]; - jailbreak = true; homepage = "http://github.com/mtolly/conduit-audio"; description = "conduit-audio interface to the libsamplerate resampling library"; license = "LGPL"; @@ -33957,12 +33982,13 @@ self: { mkDerivation { pname = "conduit-audio-sndfile"; version = "0.1"; + revision = "1"; sha256 = "0v0vzc23c9wfc594pc91d3dw2sda26z1lrkdjjvf572771xysdbd"; + editedCabalFile = "f753b66e55fc5332463bc54a7077b9c503439cd03c7c1c799cd60751ab954a87"; buildDepends = [ base conduit conduit-audio hsndfile hsndfile-vector resourcet transformers ]; - jailbreak = true; homepage = "http://github.com/mtolly/conduit-audio"; description = "conduit-audio interface to the libsndfile audio file library"; license = "LGPL"; @@ -34026,7 +34052,9 @@ self: { mkDerivation { pname = "conduit-extra"; version = "1.1.7.3"; + revision = "1"; sha256 = "1pnk8lbblys8wf4a40acxr9p61lhwg2bhf7809fm1y23gf18ll9l"; + editedCabalFile = "d90996b02f7aeb417e54658bab2ecba414221de6cde817d2b18186d09e605091"; buildDepends = [ attoparsec base blaze-builder bytestring conduit directory filepath monad-control network primitive process resourcet stm @@ -34827,7 +34855,9 @@ self: { mkDerivation { pname = "control-monad-free"; version = "0.6.1"; + revision = "1"; sha256 = "11i297ngwb5ck23vsr84fh5qx4hn7fzm9ml90y79lwi97hyigagy"; + editedCabalFile = "d08dceee154098bee492a1c00ef699a2a3a0e8a3851c5d49ccd49d5645a501a4"; buildDepends = [ base prelude-extras transformers ]; homepage = "http://github.com/pepeiborra/control-monad-free"; description = "Free monads and monad transformers"; @@ -37786,8 +37816,8 @@ self: { }: mkDerivation { pname = "dash-haskell"; - version = "1.0.0.4"; - sha256 = "12nggfrc10i4kmjjqgiqjw9lz2mapqxxvs9d6cba43x43pb8z893"; + version = "1.0.0.5"; + sha256 = "1asfcifmvyrkw0nfb7g7djwzqlgw7l021a5q9i66wj598fgxqn1j"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -43248,16 +43278,15 @@ self: { mkDerivation { pname = "dtab"; version = "1.0"; - revision = "1"; + revision = "2"; sha256 = "1zx5kpljjxyzbsg0hg8ml8mig1s9hggm2nlqmbfbxmldxh3pq1j3"; - editedCabalFile = "2a7a20cc1b621e5a04b3ca28b3d03d11792731256fb39e94882e5e735d52ac15"; + editedCabalFile = "50fe31cffb6f7eab4428bf547fd0c7e7804a0f20c604692a18b213d4a54a0a7a"; isLibrary = true; isExecutable = true; buildDepends = [ array base binary bytestring containers data-binary-ieee754 pretty transformers ]; - jailbreak = true; description = "Harmonix (Guitar Hero, Rock Band) DTA/DTB metadata library"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -44124,15 +44153,20 @@ self: { }) { inherit (pkgs) libedit;}; "editor-open" = callPackage - ({ mkDerivation, base, bytestring, process, temporary, unix }: + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , directory, process, resourcet, temporary, transformers, unix + }: mkDerivation { pname = "editor-open"; - version = "0.2.0.0"; - sha256 = "0lv7rkapyvhsrri1094ls4biv7s5p5a30zm20ghqaky3nka2n18p"; + version = "0.3.0.0"; + sha256 = "1yfwwd3z3w6yadqqv96n65795gsg418iid35cwgxyf9l1jgk79f1"; isLibrary = true; isExecutable = true; - buildDepends = [ base bytestring process temporary unix ]; - homepage = "https://notabug.org/pharpend/editor-open"; + buildDepends = [ + base bytestring conduit conduit-extra directory process resourcet + temporary transformers unix + ]; + homepage = "https://github.com/pharpend/editor-open"; description = "Open the user's $EDITOR for text input"; license = stdenv.lib.licenses.asl20; }) {}; @@ -46208,8 +46242,8 @@ self: { }: mkDerivation { pname = "eventstore"; - version = "0.7.0.1"; - sha256 = "1k94kh1wgskhh51by522sz58lzxpgv8qddfalwjmy845dfivbswg"; + version = "0.7.1.0"; + sha256 = "058r7csqf2lzcqskc9fv9lwr1h1glpirblyc51kn0qb16szigpwv"; buildDepends = [ aeson async base bytestring cereal containers network protobuf random sodium text time uuid @@ -48531,8 +48565,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "fixed-list"; - version = "0.1.5"; - sha256 = "07b1kzysf96jckx7yghb2a93l884x8fvxxd0g2ja3hwb5y403911"; + version = "0.1.6"; + sha256 = "1gpv0p7xyzmrrq20irf0mpggnc0vm5hpq36j4vd1xlq6bplq1xmb"; buildDepends = [ base ]; homepage = "http://github.com/jvranish/FixedList/tree/master"; description = "A fixed length list type"; @@ -50192,8 +50226,8 @@ self: { }: mkDerivation { pname = "friday"; - version = "0.2.1.1"; - sha256 = "1snbmr1q60lg94zzfxfc0pfzyi695m7dc79vpi66c8kb5anwahw8"; + version = "0.2.1.2"; + sha256 = "08w97jbcg5641brd0pf1bnj6mk0lf7xa57v88y686mx6lsl80i3q"; buildDepends = [ base convertible deepseq primitive ratio-int transformers vector ]; @@ -51316,7 +51350,9 @@ self: { mkDerivation { pname = "generic-deepseq"; version = "2.0.1.1"; + revision = "1"; sha256 = "1yajkzp79ri5i7n5ynv0i6spxyg6kyi6qvqj46brlgjag98526iv"; + editedCabalFile = "58ed9aeb48cc2a00e3122780fcbf2732c4d6fc46198434926a8b1bcc91d4a29b"; buildDepends = [ base ghc-prim ]; description = "Generic deep evaluation of data structures"; license = stdenv.lib.licenses.bsd3; @@ -57017,7 +57053,9 @@ self: { mkDerivation { pname = "haddock-library"; version = "1.2.0"; + revision = "1"; sha256 = "0kf8qihkxv86phaznb3liq6qhjs53g3iq0zkvz5wkvliqas4ha56"; + editedCabalFile = "39bebb4a575c547378a245ee6028135602cbb73e5adbb4f7743449e5717517da"; buildDepends = [ base bytestring deepseq transformers ]; testDepends = [ base base-compat bytestring deepseq hspec QuickCheck transformers @@ -58429,7 +58467,9 @@ self: { mkDerivation { pname = "happstack-server"; version = "7.4.3"; + revision = "1"; sha256 = "0ij359i1lmxs1gpzl6spli94s0mpp6mbbhjcf4jrbxkpavdg8g73"; + editedCabalFile = "3da7c2f6d5add9d58bc1013cdb0f64bb07aec1ebc88bac40372c4533ed932cf6"; buildDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html @@ -64436,8 +64476,8 @@ self: { }: mkDerivation { pname = "hjcase"; - version = "0.1.0.0"; - sha256 = "0n2wy39i3v2asifk3n9mlz1dwgyv9fr2mkqp9dbdbawnk2g96y4l"; + version = "0.2.0.0"; + sha256 = "0d1pb24jqk2dj635hy1way9axr9719g1ppxmxr4jpbb0sj6xphjk"; buildDepends = [ aeson base bytestring HUnit test-framework test-framework-hunit text unordered-containers vector @@ -75855,8 +75895,8 @@ self: { }: mkDerivation { pname = "jammittools"; - version = "0.4.1"; - sha256 = "0dmnv20nqv72wm42m5widcq0b63rnrslg8ylabc6hqp7xdqa7vil"; + version = "0.4.1.1"; + sha256 = "0caqvq7pl0jbka915xqy3sljjmwc2adk1hkm2775vnsvswh9nysg"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -75864,7 +75904,6 @@ self: { filepath HPDF JuicyPixels process property-list resourcet temporary transformers vector ]; - jailbreak = true; homepage = "https://github.com/mtolly/jammittools"; description = "Export sheet music and audio from Windows/Mac app Jammit"; license = "GPL"; @@ -79090,6 +79129,7 @@ self: { ansi-wl-pprint base either Glob hspec HUnit lens parsec parsers strict-base-types temporary text unix unordered-containers vector ]; + jailbreak = true; homepage = "http://lpuppet.banquise.net/"; description = "Tools to parse and evaluate the Puppet DSL"; license = stdenv.lib.licenses.bsd3; @@ -85827,9 +85867,10 @@ self: { mkDerivation { pname = "midi-util"; version = "0.1.1.1"; + revision = "1"; sha256 = "1g8rhx1n6rhyi49x6rkim1bnv7rg6wc0x89dzkrbzyxm28hkvjfk"; + editedCabalFile = "2c42b8e0940125f6354a9174ad5cb19da6fc0122b4947576e28abb753a7cff14"; buildDepends = [ base containers event-list midi non-negative ]; - jailbreak = true; homepage = "http://github.com/mtolly/midi-util"; description = "Utility functions for processing MIDI files"; license = "GPL"; @@ -90268,18 +90309,20 @@ self: { "nested-routes" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring - , constraints, containers, hspec, http-media, http-types, lucid - , mtl, poly-arity, pred-trie, QuickCheck, quickcheck-instances - , regex-compat, semigroups, text, transformers, wai, wai-extra + , clay, composition, constraints, containers, hspec, http-media + , http-types, lucid, mtl, poly-arity, pred-trie, QuickCheck + , quickcheck-instances, regex-compat, semigroups, shakespeare, text + , transformers, wai, wai-extra, wai-util, witherable }: mkDerivation { pname = "nested-routes"; - version = "0.3.2.1"; - sha256 = "1mj6l01pfyjasa4zaff41vixbbcwdwwwhqv925bq3n1wkznwkzic"; + version = "1.0.0.1"; + sha256 = "04j11mamfpmc0isnxpss6b8qf21mlfs3ndpb8xbdcbcs9hp0xrrq"; buildDepends = [ - aeson attoparsec base blaze-html bytestring constraints containers - http-media http-types lucid mtl poly-arity pred-trie regex-compat - semigroups text transformers wai wai-extra + aeson attoparsec base blaze-html bytestring clay composition + constraints containers http-media http-types lucid mtl poly-arity + pred-trie regex-compat semigroups shakespeare text transformers wai + wai-extra wai-util witherable ]; testDepends = [ base hspec QuickCheck quickcheck-instances ]; description = "Declarative, compositional Wai responses"; @@ -93359,8 +93402,8 @@ self: { }: mkDerivation { pname = "opml-conduit"; - version = "0.2.0.0"; - sha256 = "0dpsxssr8h3ph9c5plrmpxv9mv1mg5zb3wrwfbkyb5g7ja91qs4b"; + version = "0.2.0.1"; + sha256 = "1c787c8hq68g2zl1jji6bh2p8hm9fmpdcs898kr8n7b8xbw9jxfk"; buildDepends = [ base case-insensitive conduit containers data-default exceptions hashable hashable-time lens mono-traversable monoid-subclasses @@ -94214,8 +94257,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.7"; - sha256 = "1ayh9gpkj128rsxiqjbgwr62fipc5a5h5vkkjnicjxgpwshnrcb8"; + version = "0.7.0.1"; + sha256 = "09ihb3pxw6rk456a0kmgc51fvykz0f499fjd8idns5q1335l18q4"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -95207,6 +95250,7 @@ self: { aeson base bytestring HUnit test-framework test-framework-hunit text unordered-containers ]; + jailbreak = true; homepage = "https://github.com/fanjam/paypal-adaptive-hoops"; description = "Client for a limited part of PayPal's Adaptive Payments API"; license = stdenv.lib.licenses.mit; @@ -96421,15 +96465,15 @@ self: { }: mkDerivation { pname = "pgdl"; - version = "8.1"; - sha256 = "1zzxgap0ipr4l63fc2rf7wxda03ss0f3wxpz6mlh066p7h9wfhyj"; + version = "8.2"; + sha256 = "04yydjvwnjilyxwqwrbwg5c2mph58728bacz2q8pbd0084lp77nd"; isLibrary = false; isExecutable = true; buildDepends = [ array base bytestring Cabal configurator directory filepath HTTP network-uri process tagsoup text vty vty-ui ]; - description = "pgdownloader"; + description = "simply download a video from webpage and play it"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -106773,10 +106817,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "safe"; - version = "0.3.8"; - sha256 = "0k5lk85z2y8kgk7dx7km32g8vi55vnwln8ys2gs174ljd136cjdf"; + version = "0.3.9"; + sha256 = "1jdnp5zhvalf1xy8i872n29nljfjz6lnl9ghj80ffisrnnkrwcfh"; buildDepends = [ base ]; - homepage = "http://community.haskell.org/~ndm/safe/"; + homepage = "https://github.com/ndmitchell/safe#readme"; description = "Library of safe (exception free) functions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -107016,7 +107060,7 @@ self: { "saltine-quickcheck" = callPackage ({ mkDerivation, base, bytestring, bytestring-arbitrary, hex - , QuickCheck, saltine, libsodium, tasty, tasty-quickcheck + , QuickCheck, saltine, sodium, tasty, tasty-quickcheck }: mkDerivation { pname = "saltine-quickcheck"; @@ -107028,12 +107072,12 @@ self: { testDepends = [ base bytestring-arbitrary QuickCheck saltine tasty tasty-quickcheck ]; - extraLibraries = [ libsodium ]; + extraLibraries = [ sodium ]; jailbreak = true; homepage = "https://github.com/tsuraan/saltine-quickcheck"; description = "Quickcheck implementations for some NaCl data"; license = stdenv.lib.licenses.mit; - }) { inherit (pkgs) libsodium;}; + }) { inherit (pkgs) sodium;}; "salvia" = callPackage ({ mkDerivation, base, bytestring, containers, directory, fclabels @@ -107258,8 +107302,8 @@ self: { }: mkDerivation { pname = "sandi"; - version = "0.3.4"; - sha256 = "1f2id34ga5d7cfas9z3n9b28yxpga44rkn5qvkma41cpf4djg72r"; + version = "0.3.5"; + sha256 = "19dfiph5rrxs4shpw286r4agcz739f6afw2wyrlkl66lpaaxjvl5"; buildDepends = [ base bytestring conduit exceptions ]; testDepends = [ base bytestring HUnit tasty tasty-hunit tasty-quickcheck tasty-th @@ -108391,8 +108435,8 @@ self: { }: mkDerivation { pname = "sdr"; - version = "0.1.0.1"; - sha256 = "1sy5sn401bdsnip99jc8qxp81j2ladrw9yvzmf3xf5hljyq7sxif"; + version = "0.1.0.2"; + sha256 = "17i16f9pgd8a2l9ywl516zh29mmk5z08j964blajl46wr38g320j"; buildDepends = [ array base bytestring cairo cereal Chart Chart-cairo colour containers Decimal dynamic-graph either fftwRaw GLFW-b OpenGL @@ -109224,42 +109268,61 @@ self: { }) {}; "servant" = callPackage - ({ mkDerivation, base, hspec, parsec, QuickCheck - , string-conversions, template-haskell, text + ({ 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 }: mkDerivation { pname = "servant"; - version = "0.2.2"; - sha256 = "1pblmnarq1939d2krwbmd9ssm68ar9ip54dl28zjv2j51vhhhzhc"; + version = "0.4.0"; + sha256 = "17954b85wj965wkhzr1jd34sia32px4qhnqjl2wn4rymj9lv25f5"; buildDepends = [ - base parsec string-conversions template-haskell text + aeson attoparsec base bytestring bytestring-conversion + case-insensitive http-media http-types network-uri + string-conversions text ]; testDepends = [ - base hspec parsec QuickCheck string-conversions text + aeson attoparsec base bytestring doctest filemanip hspec parsec + QuickCheck quickcheck-instances string-conversions text url ]; homepage = "http://haskell-servant.github.io/"; description = "A family of combinators for defining webservices APIs"; license = stdenv.lib.licenses.bsd3; }) {}; + "servant-blaze" = callPackage + ({ mkDerivation, base, blaze-html, http-media, servant }: + mkDerivation { + pname = "servant-blaze"; + version = "0.4.0.0"; + sha256 = "17l0fm296zg5nwfc6srnjl82qckabyac5yxm1dhqxwxq45kj42an"; + buildDepends = [ base blaze-html http-media servant ]; + homepage = "http://haskell-servant.github.io/"; + description = "Blaze-html support for servant"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-client" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq , either, exceptions, hspec, http-client, http-client-tls - , http-types, network, network-uri, QuickCheck, safe, servant - , servant-server, string-conversions, text, transformers, wai, warp + , http-media, http-types, HUnit, network, network-uri, QuickCheck + , safe, servant, servant-server, string-conversions, text + , transformers, wai, warp }: mkDerivation { pname = "servant-client"; - version = "0.2.2"; - sha256 = "0b96aglic4aawdcpaxyv9k807kjfrr0a9kniqgj5nfcpgwglnp5r"; + version = "0.4.0"; + sha256 = "0nvbhiakxfjkb9v5ijv6zapjfbppc6ygd3g8rv5i9paj59ifwxmm"; buildDepends = [ aeson attoparsec base bytestring either exceptions http-client - http-client-tls http-types network-uri safe servant + http-client-tls http-media http-types network-uri safe servant string-conversions text transformers ]; testDepends = [ - aeson base bytestring deepseq either hspec http-types network - QuickCheck servant servant-server wai warp + aeson base bytestring deepseq either hspec http-client http-media + http-types HUnit network QuickCheck servant servant-server text wai + warp ]; homepage = "http://haskell-servant.github.io/"; description = "automatical derivation of querying functions for servant webservices"; @@ -109267,45 +109330,62 @@ self: { }) {}; "servant-docs" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hashable - , lens, servant, string-conversions, system-filepath, text - , unordered-containers + ({ mkDerivation, aeson, base, bytestring, bytestring-conversion + , case-insensitive, hashable, hspec, http-media, http-types, lens + , servant, string-conversions, text, unordered-containers }: mkDerivation { pname = "servant-docs"; - version = "0.3.1"; - sha256 = "1xbwi5ix5yanrcldc97dwim7s358g7hbr5pwk3r6azknwjzf5fd4"; + version = "0.4.0"; + sha256 = "0fbbs4w0yz0kj3gvms0xbikzfqjdqbbi19z26z3zdmc06crkhn4m"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson aeson-pretty base bytestring hashable lens servant - string-conversions system-filepath text unordered-containers + aeson base bytestring bytestring-conversion case-insensitive + hashable http-media http-types lens servant string-conversions text + unordered-containers ]; + testDepends = [ aeson base hspec servant string-conversions ]; homepage = "http://haskell-servant.github.io/"; description = "generate API docs for your servant webservice"; license = stdenv.lib.licenses.bsd3; }) {}; "servant-jquery" = callPackage - ({ mkDerivation, aeson, base, filepath, hspec, language-ecmascript - , lens, servant, servant-server, stm, transformers, warp + ({ mkDerivation, aeson, base, charset, filepath, hspec + , hspec-expectations, language-ecmascript, lens, servant + , servant-server, stm, text, transformers, warp }: mkDerivation { pname = "servant-jquery"; - version = "0.2.2.1"; - sha256 = "0s3c85jpy630bfnzq0wlzv38bkr18cpw5lffn6wh8pjwshd5y8zi"; + version = "0.4.0"; + sha256 = "1p8pdrqyj1pyrwghv3k26s4y4aprlkasbzcba9j5n528xvfg0zw5"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson base filepath lens servant servant-server stm transformers - warp + aeson base charset filepath lens servant servant-server stm text + transformers warp + ]; + testDepends = [ + base hspec hspec-expectations language-ecmascript lens servant ]; - testDepends = [ base hspec language-ecmascript servant ]; homepage = "http://haskell-servant.github.io/"; description = "Automatically derive (jquery) javascript functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; }) {}; + "servant-lucid" = callPackage + ({ mkDerivation, base, http-media, lucid, servant }: + mkDerivation { + pname = "servant-lucid"; + version = "0.4.0.0"; + sha256 = "05jadyh3msl2jlrq1d8bmazxb356qdv0gzwpj9gkvrsp4i6ldgcl"; + buildDepends = [ base http-media lucid servant ]; + homepage = "http://haskell-servant.github.io/"; + description = "Servant support for lucid"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-pandoc" = callPackage ({ mkDerivation, base, bytestring, pandoc-types, servant-docs, text , unordered-containers @@ -109384,27 +109464,29 @@ self: { }) {}; "servant-server" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, directory - , either, exceptions, hspec, hspec-wai, http-types, network + ({ 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 , string-conversions, system-filepath, temporary, text , transformers, wai, wai-app-static, wai-extra, warp }: mkDerivation { pname = "servant-server"; - version = "0.2.4"; - sha256 = "11bds7zhkvqg9w27kb0dd792qvz8gjgkmkpbnijvwwzah5gmipi0"; + version = "0.4.0"; + sha256 = "0wr1rn1gvbph07ycx97qcm4j4jp15xnhvrk5y49bsiv6w6d9xxgx"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson attoparsec base bytestring either http-types network-uri safe - servant split string-conversions system-filepath text transformers - wai wai-app-static warp + 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 ]; testDepends = [ - aeson base bytestring directory either exceptions hspec hspec-wai - http-types network parsec QuickCheck servant string-conversions - temporary text transformers wai wai-extra warp + aeson base bytestring bytestring-conversion directory doctest + either exceptions filemanip hspec hspec-wai http-types mtl network + parsec QuickCheck servant string-conversions temporary text + transformers wai wai-extra warp ]; homepage = "http://haskell-servant.github.io/"; description = "A family of combinators for defining webservices APIs and serving them"; @@ -113582,12 +113664,12 @@ self: { }) {}; "sorted-list" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, deepseq }: mkDerivation { pname = "sorted-list"; - version = "0.1.2.1"; - sha256 = "0jjzhi2wj4ca8bvwbv5nnljyli7c9ravigkndk85wdyzz74n0qbh"; - buildDepends = [ base ]; + version = "0.1.4.1"; + sha256 = "119h4dz8bkwgpl0w9x5q7q7s50jf5zsr7bikh1l446xqzyax2wi4"; + buildDepends = [ base deepseq ]; homepage = "https://github.com/Daniel-Diaz/sorted-list/blob/master/README.md"; description = "Type-enforced sorted lists and related functions"; license = stdenv.lib.licenses.bsd3; @@ -114983,8 +115065,8 @@ self: { }: mkDerivation { pname = "stackage-build-plan"; - version = "0.1.0.0"; - sha256 = "01vnfmsxx6m6x9wip5pqbg5yffprlc94cdj5ahqs2fyqvzs4j8rb"; + version = "0.1.1.0"; + sha256 = "1slqkcmvnrbbg50qdf368q5h7svngw77b984mpg39p44mc7ghwyg"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -119744,21 +119826,20 @@ self: { }) {}; "termbox-bindings" = callPackage - ({ mkDerivation, base, c2hs, termbox }: + ({ mkDerivation, base, c2hs }: mkDerivation { pname = "termbox-bindings"; - version = "0.1.0.3"; - sha256 = "00s3j6ccc63ycbj2lxzl2200ffwzslaxdny7d0b9dyzgn6n1pal7"; + version = "0.1.0.5"; + sha256 = "0hv72kkpx6narykfbf6m59gq4l8gym6fm52n1zzazac1802zw0dv"; isLibrary = true; isExecutable = true; buildDepends = [ base ]; buildTools = [ c2hs ]; - extraLibraries = [ termbox ]; homepage = "https://github.com/luciferous/termbox-bindings"; - description = "Bindings to the termbox library"; + description = "Bindings to the Termbox library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { termbox = null;}; + }) {}; "terminal-progress-bar" = callPackage ({ mkDerivation, base, base-unicode-symbols, HUnit, stm, stm-chans @@ -122784,7 +122865,6 @@ self: { ]; description = "BitTorrent file parser and generater"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tostring" = callPackage @@ -125292,8 +125372,8 @@ self: { }: mkDerivation { pname = "unbound-generics"; - version = "0.1.2"; - sha256 = "14mcv61ci6azzykx287b9cpcwyzbzr66i5s43vdd9wnzrg4mia03"; + version = "0.1.2.1"; + sha256 = "0vwqbq3xmacc9fa95wvy2l6r4h831a8g6w1pbxbip2bgqmybsfvk"; buildDepends = [ base containers contravariant mtl profunctors template-haskell transformers transformers-compat @@ -130998,15 +131078,13 @@ self: { }) {}; "word-trie" = callPackage - ({ mkDerivation, base, binary, containers, derive, hspec - , QuickCheck - }: + ({ mkDerivation, base, binary, containers, hspec, QuickCheck }: mkDerivation { pname = "word-trie"; - version = "0.2.0.4"; - sha256 = "0qgljhl2pj54mhsan9w6gchf3l94rs2c5bi9f93q1nz55va1027f"; - buildDepends = [ base binary containers derive ]; - testDepends = [ base binary containers derive hspec QuickCheck ]; + version = "0.3.0"; + sha256 = "10ljyb1hl4awg2c3wq5shdqj2s53q5fklf7p6np1jhn6i30c5wx3"; + buildDepends = [ base binary containers ]; + testDepends = [ base binary containers hspec QuickCheck ]; homepage = "https://github.com/yi-editor/word-trie"; description = "Implementation of a finite trie over words"; license = stdenv.lib.licenses.gpl2; @@ -131203,35 +131281,35 @@ self: { }) {}; "wreq" = callPackage - ({ mkDerivation, aeson, aeson-pretty, aeson-qq, attoparsec, base + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base , base16-bytestring, base64-bytestring, byteable, bytestring , case-insensitive, containers, cryptohash, directory, doctest , exceptions, filepath, ghc-prim, hashable, http-client , http-client-tls, http-types, HUnit, lens, lens-aeson, mime-types - , network-info, old-locale, PSQueue, QuickCheck, snap-core + , network-info, old-locale, psqueues, QuickCheck, snap-core , snap-server, template-haskell, temporary, test-framework , test-framework-hunit, test-framework-quickcheck2, text, time - , transformers, unix-compat, unordered-containers, uuid + , transformers, unix-compat, unordered-containers, uuid, vector }: mkDerivation { pname = "wreq"; - version = "0.3.0.1"; - sha256 = "13apqr8sfx2vi794ldqprmgqch79sqli9scgyk3k41v7wcwqaal4"; + version = "0.4.0.0"; + sha256 = "15vjamr3sain8cdgqhg0jfy0rz3bbb6chrivyzvki5rs2g6pzrja"; isLibrary = true; isExecutable = true; buildDepends = [ aeson attoparsec base base16-bytestring byteable bytestring case-insensitive containers cryptohash exceptions ghc-prim hashable http-client http-client-tls http-types lens lens-aeson mime-types - old-locale PSQueue template-haskell text time unordered-containers + old-locale psqueues template-haskell text time unordered-containers ]; testDepends = [ - aeson aeson-pretty aeson-qq base base64-bytestring bytestring + aeson aeson-pretty base base64-bytestring bytestring case-insensitive containers directory doctest filepath hashable http-client http-types HUnit lens lens-aeson network-info QuickCheck snap-core snap-server temporary test-framework - test-framework-hunit test-framework-quickcheck2 text transformers - unix-compat uuid + test-framework-hunit test-framework-quickcheck2 text time + transformers unix-compat uuid vector ]; homepage = "http://www.serpentine.com/wreq"; description = "An easy-to-use HTTP client library"; @@ -132260,8 +132338,8 @@ self: { }: mkDerivation { pname = "xml-conduit"; - version = "1.2.5.1"; - sha256 = "1p3rhmp0j8yayylx936asq7ggn9z50fg3vmd108bfrab2wzqrs4f"; + version = "1.2.6"; + sha256 = "1ybl0maakz4arqbblipafwggh0m2n8ljyp91iiihb4674kynrciz"; buildDepends = [ attoparsec base blaze-builder blaze-html blaze-markup bytestring conduit conduit-extra containers data-default deepseq monad-control @@ -135234,23 +135312,23 @@ self: { "yi-language" = callPackage ({ mkDerivation, alex, array, base, binary, containers - , data-default, derive, filepath, hashable, hspec, lens - , oo-prototypes, pointedlist, QuickCheck, regex-base, regex-tdfa - , template-haskell, transformers-base, unordered-containers + , data-default, filepath, hashable, hspec, lens, oo-prototypes + , pointedlist, QuickCheck, regex-base, regex-tdfa, template-haskell + , transformers-base, unordered-containers }: mkDerivation { pname = "yi-language"; - version = "0.1.1.0"; - sha256 = "1gsh0njslncfh0r5wg1rq9w4f03ixkk5grd9zigkspsndhij7379"; + version = "0.2.0"; + sha256 = "1a0lvddn35q9jqr0w7g2m268dy8s9dwsss7sf4460rvkg1xvkvvh"; buildDepends = [ - array base binary containers data-default derive hashable lens + array base binary containers data-default hashable lens oo-prototypes pointedlist regex-base regex-tdfa template-haskell transformers-base unordered-containers ]; testDepends = [ - array base binary containers data-default derive filepath hashable - hspec lens pointedlist QuickCheck regex-base regex-tdfa - template-haskell transformers-base unordered-containers + array base binary containers data-default filepath hashable hspec + lens pointedlist QuickCheck regex-base regex-tdfa template-haskell + transformers-base unordered-containers ]; buildTools = [ alex ]; homepage = "https://github.com/yi-editor/yi-language"; @@ -135570,6 +135648,43 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yxdb-utils" = callPackage + ({ mkDerivation, array, attoparsec, base, bimap, binary + , binary-conduit, bytestring, Codec-Compression-LZF, conduit + , conduit-combinators, conduit-extra, containers, csv-conduit + , Decimal, directory, exceptions, ghc-prim, HUnit, lens + , monad-loops, mtl, newtype, old-locale, parsec, primitive + , QuickCheck, quickcheck-instances, reinterpret-cast, resourcet + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, text-binary, time, transformers, vector, xml-conduit + }: + mkDerivation { + pname = "yxdb-utils"; + version = "0.1.0.1"; + sha256 = "05aba4fdpqx7sar7yrw4gg341wzfhhlbvx7453ns8mccqhx9dag8"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + array attoparsec base bimap binary binary-conduit bytestring + Codec-Compression-LZF conduit conduit-combinators conduit-extra + containers csv-conduit Decimal directory exceptions ghc-prim lens + monad-loops mtl newtype old-locale parsec primitive + reinterpret-cast resourcet text text-binary time transformers + vector xml-conduit + ]; + testDepends = [ + array attoparsec base bimap binary binary-conduit bytestring + Codec-Compression-LZF conduit conduit-combinators conduit-extra + containers csv-conduit Decimal directory exceptions ghc-prim HUnit + lens monad-loops mtl newtype old-locale parsec primitive QuickCheck + quickcheck-instances reinterpret-cast resourcet test-framework + test-framework-hunit test-framework-quickcheck2 text text-binary + time transformers vector xml-conduit + ]; + description = "Utilities for reading and writing Alteryx .yxdb files"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "z3" = callPackage ({ mkDerivation, base, containers, gomp, hspec, mtl, QuickCheck, z3 }: From 7f761506628b515e62fd9da69fec62d03f0bf34f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 10 May 2015 13:17:43 +0200 Subject: [PATCH 81/98] haskell-call: build should be fixed, but the dependency audiovisual is still broken --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b9c80eab34d..a60bfd8507c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -517,10 +517,6 @@ self: super: { # https://github.com/cgaebel/stm-conduit/issues/33 stm-conduit = dontCheck super.stm-conduit; - # https://github.com/fumieval/call/issues/3 - call = markBrokenVersion "0.1.2" super.call; - rhythm-game-tutorial = dontDistribute super.rhythm-game-tutorial; # depends on call - # The install target tries to run lots of commands as "root". WTF??? hannahci = markBroken super.hannahci; @@ -724,6 +720,8 @@ self: super: { # https://github.com/fumieval/audiovisual/issues/1 audiovisual = markBroken super.audiovisual; + call = dontDistribute super.call; + rhythm-game-tutorial = dontDistribute super.rhythm-game-tutorial; # https://github.com/alephcloud/hs-stm-queue-extras/issues/2 stm-queue-extras = overrideCabal super.stm-queue-extras (drv: { editedCabalFile = null; }); From c2c724bcafb8a7e7ebe877c06849cf58433dc244 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 10 May 2015 13:20:16 +0200 Subject: [PATCH 82/98] haskell-stm-queue-extras: override is no longer necessary --- 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 a60bfd8507c..4f8f2f6875d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -723,9 +723,6 @@ self: super: { call = dontDistribute super.call; rhythm-game-tutorial = dontDistribute super.rhythm-game-tutorial; - # https://github.com/alephcloud/hs-stm-queue-extras/issues/2 - stm-queue-extras = overrideCabal super.stm-queue-extras (drv: { editedCabalFile = null; }); - # https://github.com/GaloisInc/cryptol/issues/197 cryptol = overrideCabal super.cryptol (drv: { postUnpack = "rm -v ${drv.pname}-${drv.version}/Setup.hs"; From e9e07667b224bb440475d2777d9980dac3c4e180 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 10 May 2015 13:21:06 +0200 Subject: [PATCH 83/98] haskell-cryptol: override is no longer necessary --- pkgs/development/haskell-modules/configuration-common.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4f8f2f6875d..f32cf9b42f8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -723,11 +723,6 @@ self: super: { call = dontDistribute super.call; rhythm-game-tutorial = dontDistribute super.rhythm-game-tutorial; - # https://github.com/GaloisInc/cryptol/issues/197 - cryptol = overrideCabal super.cryptol (drv: { - postUnpack = "rm -v ${drv.pname}-${drv.version}/Setup.hs"; - }); - # https://github.com/haskell/haddock/issues/378 haddock-library = dontCheck super.haddock-library; From eafd67b45eb5cdbe2bb03f0778f3219816ab94be Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 10 May 2015 21:58:01 +0200 Subject: [PATCH 84/98] haskell-wreq has been fixed upstream --- .../haskell-modules/configuration-ghc-7.10.x.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 a05f70e5d44..eebc80a44ea 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -323,11 +323,11 @@ self: super: { seqid-streams_0_1_0 = markBroken super.seqid-streams_0_1_0; vector_0_10_9_3 = markBroken super.vector_0_10_9_3; - # https://github.com/bos/wreq/issues/61 - wreq = markBrokenVersion "0.3.0.1" (dontCheck super.wreq); - wreq-sb = dontDistribute (dontCheck super.wreq-sb); + # https://github.com/purefn/hipbot/issues/1 hipbot = dontDistribute super.hipbot; - bitcoin-api = dontDistribute super.bitcoin-api; + + # https://github.com/solatis/haskell-bitcoin-api/issues/1 + bitcoin-api = markBroken super.bitcoin-api; bitcoin-api-extra = dontDistribute super.bitcoin-api-extra; # https://github.com/HugoDaniel/RFC3339/issues/14 From 9d9e21c7fd7e898b51438a1900dc18366a1fb229 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Tue, 5 May 2015 23:55:14 -0400 Subject: [PATCH 85/98] mesos: 0.21.0 -> 0.22.0 This also enables the network isolation feature that was introduced in Mesos 0.20.0. --- .../networking/cluster/mesos/default.nix | 68 +++++++++++++------ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 49 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index b298fb55901..9458ffc3925 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -1,35 +1,38 @@ { stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh, autoconf , automake, libtool, unzip, gnutar, jdk, maven, python, wrapPython , setuptools, distutils-cfg, boto, pythonProtobuf, apr, subversion -, leveldb, glog +, leveldb, glog, perf, utillinux, libnl, iproute }: -let version = "0.21.0"; -in stdenv.mkDerivation { - dontDisableStatic = true; +let + mavenRepo = import ./mesos-deps.nix { inherit stdenv curl; }; + soext = if stdenv.system == "x86_64-darwin" then "dylib" else "so"; +in stdenv.mkDerivation rec { + version = "0.22.0"; name = "mesos-${version}"; + dontDisableStatic = true; + src = fetchurl { url = "http://www.apache.org/dist/mesos/${version}/mesos-${version}.tar.gz"; - sha256 = "01ap8blrb046w26zf3i4r7vvnnhjsbfi20vz5yinmncqbzjjyx6i"; + sha256 = "0z8c1vr7b06l3nqgbxq8ydcz79ayw75y2szipfqkw17c7gv6d7v8"; }; buildInputs = [ makeWrapper autoconf automake libtool curl sasl jdk maven python wrapPython boto distutils-cfg setuptools leveldb subversion apr glog + ] ++ lib.optionals stdenv.isLinux [ + libnl ]; propagatedBuildInputs = [ pythonProtobuf ]; - mavenRepo = import ./mesos-deps.nix { inherit stdenv curl; }; - preConfigure = '' - export MAVEN_OPTS="-Dmaven.repo.local=$(pwd)/.m2" - ln -s $mavenRepo .m2 + export MAVEN_OPTS="-Dmaven.repo.local=${mavenRepo}" substituteInPlace src/launcher/fetcher.cpp \ --replace '"tar' '"${gnutar}/bin/tar' \ @@ -37,6 +40,29 @@ in stdenv.mkDerivation { substituteInPlace src/cli/mesos-scp \ --replace "'scp " "'${openssh}/bin/scp " + + substituteInPlace src/cli/python/mesos/cli.py \ + --replace "['mesos-resolve'" "['$out/bin/mesos-resolve'" + + '' + lib.optionalString (stdenv.isLinux) '' + + substituteInPlace configure.ac \ + --replace /usr/include/libnl3 ${libnl}/include/libnl3 + + substituteInPlace src/linux/perf.cpp \ + --replace '"perf ' '"${perf}/bin/perf ' + + substituteInPlace src/slave/containerizer/isolators/filesystem/shared.cpp \ + --replace '"mount ' '"${utillinux}/bin/mount ' \ + + substituteInPlace src/slave/containerizer/isolators/namespaces/pid.cpp \ + --replace '"mount ' '"${utillinux}/bin/mount ' \ + + substituteInPlace src/slave/containerizer/isolators/network/port_mapping.cpp \ + --replace '"tc ' '"${iproute}/bin/tc ' \ + --replace '"ip ' '"${iproute}/bin/ip ' \ + --replace '"mount ' '"${utillinux}/bin/mount ' \ + --replace '/bin/sh' "${stdenv.shell}" ''; configureFlags = [ @@ -45,27 +71,29 @@ in stdenv.mkDerivation { "--with-svn=${subversion}" "--with-leveldb=${leveldb}" "--with-glog=${glog}" + "--with-glog=${glog}" + "--enable-optimize" "--disable-python-dependency-install" + ] ++ lib.optionals stdenv.isLinux [ + "--with-network-isolator" ]; postInstall = '' rm -rf $out/var rm $out/bin/*.sh - ensureDir $out/share/java + mkdir -p $out/share/java cp src/java/target/mesos-*.jar $out/share/java - shopt -s extglob - MESOS_NATIVE_JAVA_LIBRARY=$(echo $out/lib/libmesos.*(so|dylib)) - shopt -u extglob + MESOS_NATIVE_JAVA_LIBRARY=$out/lib/libmesos.${soext} - ensureDir $out/nix-support + mkdir -p $out/nix-support touch $out/nix-support/setup-hook echo "export MESOS_NATIVE_JAVA_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook echo "export MESOS_NATIVE_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook # Inspired by: pkgs/development/python-modules/generic/default.nix - ensureDir "$out/lib/${python.libPrefix}"/site-packages + mkdir -p $out/lib/${python.libPrefix}/site-packages export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" ${python}/bin/${python.executable} src/python/setup.py install \ --install-lib=$out/lib/${python.libPrefix}/site-packages \ @@ -85,14 +113,14 @@ in stdenv.mkDerivation { fi done + for f in $out/libexec/mesos/python/mesos/*.py; do + ${python}/bin/${python.executable} -c "import py_compile; py_compile.compile('$f')" + done + # wrap the python programs - declare -A pythonPathsSeen=() - program_PYTHONPATH="$out/libexec/mesos/python" - program_PATH="" - _addToPythonPath "$out" for prog in mesos-cat mesos-ps mesos-scp mesos-tail; do wrapProgram "$out/bin/$prog" \ - --prefix PYTHONPATH ":" $program_PYTHONPATH + --prefix PYTHONPATH ":" "$out/libexec/mesos/python" true done ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53cb16b95c0..cc81eec8a20 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4640,6 +4640,7 @@ let sasl = cyrus_sasl; inherit (pythonPackages) python boto setuptools distutils-cfg wrapPython; pythonProtobuf = pythonPackages.protobuf2_5; + perf = linuxPackages.perf; }; mesos-dns = callPackage ../servers/dns/mesos-dns { }; From 760169663e9d96db9a3917067fa982ac044107e4 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Sun, 10 May 2015 16:38:19 -0400 Subject: [PATCH 86/98] mesos: fix indentation in service definition --- nixos/modules/services/misc/mesos-master.nix | 30 ++++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/nixos/modules/services/misc/mesos-master.nix b/nixos/modules/services/misc/mesos-master.nix index 5609cf75bb5..11e21c33447 100644 --- a/nixos/modules/services/misc/mesos-master.nix +++ b/nixos/modules/services/misc/mesos-master.nix @@ -40,10 +40,10 @@ in { extraCmdLineOptions = mkOption { description = '' - Extra command line options for Mesos Master. + Extra command line options for Mesos Master. - See https://mesos.apache.org/documentation/latest/configuration/ - ''; + See https://mesos.apache.org/documentation/latest/configuration/ + ''; default = [ "" ]; type = types.listOf types.string; example = [ "--credentials=VALUE" ]; @@ -82,20 +82,20 @@ in { wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" ]; serviceConfig = { - ExecStart = '' - ${pkgs.mesos}/bin/mesos-master \ - --port=${toString cfg.port} \ - --zk=${cfg.zk} \ - ${if cfg.quorum == 0 then "--registry=in_memory" else "--registry=replicated_log --quorum=${toString cfg.quorum}"} \ - --work_dir=${cfg.workDir} \ - --logging_level=${cfg.logLevel} \ - ${toString cfg.extraCmdLineOptions} - ''; - Restart = "on-failure"; - PermissionsStartOnly = true; + ExecStart = '' + ${pkgs.mesos}/bin/mesos-master \ + --port=${toString cfg.port} \ + --zk=${cfg.zk} \ + ${if cfg.quorum == 0 then "--registry=in_memory" else "--registry=replicated_log --quorum=${toString cfg.quorum}"} \ + --work_dir=${cfg.workDir} \ + --logging_level=${cfg.logLevel} \ + ${toString cfg.extraCmdLineOptions} + ''; + Restart = "on-failure"; + PermissionsStartOnly = true; }; preStart = '' - mkdir -m 0700 -p ${cfg.workDir} + mkdir -m 0700 -p ${cfg.workDir} ''; }; }; From 62ad22b8aed863aa261f26a017b07db04f669069 Mon Sep 17 00:00:00 2001 From: Linus Arver Date: Sun, 10 May 2015 15:28:56 -0700 Subject: [PATCH 87/98] doc: language-support: fix typo --- doc/language-support.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/language-support.xml b/doc/language-support.xml index 4fd70431950..87f500a491b 100644 --- a/doc/language-support.xml +++ b/doc/language-support.xml @@ -624,7 +624,7 @@ $ cat > Gemfile source 'https://rubygems.org' gem 'sensu' $ bundler package --path /tmp/vendor/bundle -$ $(nix-build '&nixpkgs>' -A bundix)/bin/bundix +$ $(nix-build '' -A bundix)/bin/bundix $ cat > default.nix { lib, bundlerEnv, ruby }: From ba186ec4b9a8fc8e86f8e6851f5f3a21cf5f183f Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Sun, 10 May 2015 18:13:00 -0400 Subject: [PATCH 88/98] mesos service: only pass --zk if quorum > 0 The ZooKeeper URL is not necessary when using in-memory slave registration. --- nixos/modules/services/misc/mesos-master.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/mesos-master.nix b/nixos/modules/services/misc/mesos-master.nix index 11e21c33447..52f08c53b1d 100644 --- a/nixos/modules/services/misc/mesos-master.nix +++ b/nixos/modules/services/misc/mesos-master.nix @@ -85,8 +85,9 @@ in { ExecStart = '' ${pkgs.mesos}/bin/mesos-master \ --port=${toString cfg.port} \ - --zk=${cfg.zk} \ - ${if cfg.quorum == 0 then "--registry=in_memory" else "--registry=replicated_log --quorum=${toString cfg.quorum}"} \ + ${if cfg.quorum == 0 + then "--registry=in_memory" + else "--zk=${cfg.zk} --registry=replicated_log --quorum=${toString cfg.quorum}"} \ --work_dir=${cfg.workDir} \ --logging_level=${cfg.logLevel} \ ${toString cfg.extraCmdLineOptions} From 7493d6f1f6ca132aa392b88f4dd54cf82f2f22bb Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Sun, 10 May 2015 19:56:46 -0400 Subject: [PATCH 89/98] marathon: 0.8.0 -> 0.8.1 --- pkgs/applications/networking/cluster/marathon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix index 1714aa274f0..3eebc6de3cf 100644 --- a/pkgs/applications/networking/cluster/marathon/default.nix +++ b/pkgs/applications/networking/cluster/marathon/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "marathon-v${version}"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { - url = "https://downloads.mesosphere.com/marathon/v${version}/marathon-${version}.tgz"; - sha256 = "794c915e205aebd8273f2b40c6faea1517fc683cdc0169194c4a67ce8779fa41"; + url = "https://downloads.mesosphere.io/marathon/v${version}/marathon-${version}.tgz"; + sha256 = "1g2z2c8p47rryyappwv0k3najb6bypvwgg7z9z8prvph2x6rafp6"; }; buildInputs = [ makeWrapper jdk mesos ]; From aa75bb25d8a681d971aefe9bcd263c9dbf8acf50 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Mon, 11 May 2015 02:45:26 +0200 Subject: [PATCH 90/98] grsecurity: Update stable and test patches stable: 3.1-3.14.41-201505072056 -> 3.1-3.14.41-201505101121 test: 3.1-4.0.2-201505072057 -> 3.1-4.0.2-201505101122 --- nixos/modules/security/grsecurity.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index b116d8bfef2..40942644868 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -38,7 +38,7 @@ in type = types.bool; default = false; description = '' - Enable the testing grsecurity patch, based on Linux 3.19. + Enable the testing grsecurity patch, based on Linux 4.0. ''; }; @@ -223,7 +223,7 @@ in message = '' If grsecurity is enabled, you must select either the stable patch (with kernel 3.14), or the testing patch (with - kernel 3.19) to continue. + kernel 4.0) to continue. ''; } { assertion = !(cfg.stable && cfg.testing); diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 628dda0ac4b..4e5facc4483 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -66,16 +66,16 @@ rec { grsecurity_stable = grsecPatch { kversion = "3.14.41"; - revision = "201505072056"; + revision = "201505101121"; branch = "stable"; - sha256 = "1fgi63y61mjmxj0mq2a24lwq0i0186kyvcdsjflw48adwjm6v0kg"; + sha256 = "1jiwc6qvimccmlm62sfp2ch173h7ki1h11facywpnb4wms7izk6g"; }; grsecurity_unstable = grsecPatch { kversion = "4.0.2"; - revision = "201505072057"; + revision = "201505101122"; branch = "test"; - sha256 = "0njvgd6n9z35hyxnligb8aq9shxzbwrkrdvpbxc0qxmwya0midv2"; + sha256 = "14fi31xwlgirbwk7f1xh8vanjxk8b473rz7z38savl4nx2wr5r24"; }; grsec_fix_path = From d9838753622a230ff6a0957993deba1e7ffecfc5 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 10 May 2015 18:06:29 -0700 Subject: [PATCH 91/98] gcc-5: Fix build on darwin --- pkgs/development/compilers/gcc/5/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 1c61d57729d..7096467854c 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -33,6 +33,7 @@ , libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , stripped ? true , gnused ? null +, binutils ? null }: assert langJava -> zip != null && unzip != null @@ -47,6 +48,9 @@ assert libelf != null -> zlib != null; # Make sure we get GNU sed. assert stdenv.isDarwin -> gnused != null; +# Need c++filt on darwin +assert stdenv.isDarwin -> binutils != null; + # The go frontend is written in c++ assert langGo -> langCC; @@ -285,6 +289,7 @@ stdenv.mkDerivation ({ # The builder relies on GNU sed (for instance, Darwin's `sed' fails with # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. ++ (optional stdenv.isDarwin gnused) + ++ (optional stdenv.isDarwin binutils) ; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isSunOS "-lm -ldl"; From 142b48688c257022d2a697fb1c3a4986cacac447 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 10 May 2015 18:18:23 -0700 Subject: [PATCH 92/98] edac-utils: Add derivation --- pkgs/os-specific/linux/edac-utils/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/os-specific/linux/edac-utils/default.nix diff --git a/pkgs/os-specific/linux/edac-utils/default.nix b/pkgs/os-specific/linux/edac-utils/default.nix new file mode 100644 index 00000000000..0a2f38ffd8a --- /dev/null +++ b/pkgs/os-specific/linux/edac-utils/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, perl, makeWrapper +, sysfsutils, dmidecode, kmod }: + +stdenv.mkDerivation { + name = "edac-utils-2015-01-07"; + + src = fetchFromGitHub { + owner = "grondo"; + repo = "edac-utils"; + rev = "f9aa96205f610de39a79ff43c7478b7ef02e3138"; + sha256 = "1dmfqb15ffldl5zirbmwiqzpxbcc2ny9rpfvxcfvpmh5b69knvdg"; + }; + + nativeBuildInputs = [ perl makeWrapper ]; + buildInputs = [ sysfsutils ]; + + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + ]; + + installFlags = [ + "sysconfdir=\${out}/etc" + ]; + + postInstall = '' + wrapProgram "$out/sbin/edac-ctl" \ + --set PATH : "" \ + --prefix PATH : "${dmidecode}/bin" \ + --prefix PATH : "${kmod}/bin" + ''; + + meta = with stdenv.lib; { + homepage = http://github.com/grondo/edac-utils; + description = "handles the reporting of hardware-related memory errors."; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc81eec8a20..739878d1a74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -808,6 +808,8 @@ let linuxHeaders = linuxHeaders_3_14; }; + edac-utils = callPackage ../os-specific/linux/edac-utils { }; + eggdrop = callPackage ../tools/networking/eggdrop { }; enca = callPackage ../tools/text/enca { }; From e3696ed37fc18f7395d4e0a23a299977173dac09 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Mon, 11 May 2015 00:46:24 -0400 Subject: [PATCH 93/98] ghcjs: bump ghcjs-prim closes #7768 --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 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 eebc80a44ea..fe3207ada24 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -145,8 +145,8 @@ self: super: { version = "0.1.0.0"; src = fetchgit { url = git://github.com/ghcjs/ghcjs-prim.git; - rev = "ca08e46257dc276e01d08fb47a693024bae001fa"; # ghc-7.10 branch - sha256 = "0w7sqzp5p70yhmdhqasgkqbf3b61wb24djlavwil2j8ry9y472w3"; + rev = "dfeaab2aafdfefe46bf12960d069f28d2e5f1454"; # ghc-7.10 branch + sha256 = "19kyb26nv1hdpp0kc2gaxkq5drw5ib4za0641py5i4bbf1g58yvy"; }; buildDepends = [ primitive ]; license = pkgs.stdenv.lib.licenses.bsd3; From 54de18c4aa487098eda1bb40caff1a767f367790 Mon Sep 17 00:00:00 2001 From: codyopel Date: Mon, 11 May 2015 01:19:24 -0400 Subject: [PATCH 94/98] smtube: 15.1.0 -> 15.5.10 --- pkgs/applications/video/smtube/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix index 128227d8765..37cae1cd0ed 100644 --- a/pkgs/applications/video/smtube/default.nix +++ b/pkgs/applications/video/smtube/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchurl, qt4 }: stdenv.mkDerivation rec { - name = "smtube-15.1.0"; + name = "smtube-15.5.10"; + src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "0l87afj1fwhq8lnhv0djqdc8fy0kvs4q4jrvyiz46ifq7q10qyaf"; + sha256 = "1if2b0h6snfmj5hnx4cs55zjbdvwagx95jv62f2jgh3m5gis0cbz"; }; - buildInputs = [ qt4 ]; + makeFlags = [ + "PREFIX=$(out)" + ]; - preConfigure = '' - makeFlags="PREFIX=$out" - ''; + buildInputs = [ qt4 ]; meta = with stdenv.lib; { description = "Play and download Youtube videos"; From f8caa8f9400a7d0243ec57d3741851bc5beb7848 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 10 May 2015 22:34:53 -0700 Subject: [PATCH 95/98] vlc: 2.2.0 -> 2.2.1 --- pkgs/applications/video/vlc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index e25f833eabc..6a1e9552d3c 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -18,11 +18,11 @@ assert (!withQt5 -> qt4 != null); stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { url = "http://download.videolan.org/vlc/${version}/${name}.tar.xz"; - sha256 = "05smn9hqdp7iscc1dj4cxp1mrlad7b50lhlnlqisfzf493i2f2jy"; + sha256 = "1jqzrzrpw6932lbkf863xk8cfmn4z2ngbxz7w8ggmh4f6xz9sgal"; }; buildInputs = From df3d2010aeed12f007acee02e23b10dcf4c5ac84 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 10 May 2015 22:35:05 -0700 Subject: [PATCH 96/98] libinput: 0.14.1 -> 0.15.0 --- pkgs/development/libraries/libinput/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 0c55353c30c..87d8154e5aa 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -15,11 +15,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { - name = "libinput-0.14.1"; + name = "libinput-0.15.0"; src = fetchurl { url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "0r0v5jqbnwgndq6ns3ss3kv1438ny302m7bg1najcl1dpqp21v9b"; + sha256 = "07gw2bhjikiix6bgln03n0zqnbqw18svlf2dfpsv893xjwcdnmhn"; }; configureFlags = [ From 5a117814b8b223bebf3a07243020720167939bd2 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 10 May 2015 22:39:31 -0700 Subject: [PATCH 97/98] pam: 1.1.8 -> 1.2.0 --- .../os-specific/linux/pam/CVE-2014-2583.patch | 49 ------------------- pkgs/os-specific/linux/pam/default.nix | 9 ++-- 2 files changed, 4 insertions(+), 54 deletions(-) delete mode 100644 pkgs/os-specific/linux/pam/CVE-2014-2583.patch diff --git a/pkgs/os-specific/linux/pam/CVE-2014-2583.patch b/pkgs/os-specific/linux/pam/CVE-2014-2583.patch deleted file mode 100644 index 25b1f7549fa..00000000000 --- a/pkgs/os-specific/linux/pam/CVE-2014-2583.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 9dcead87e6d7f66d34e7a56d11a30daca367dffb Mon Sep 17 00:00:00 2001 -From: "Dmitry V. Levin" -Date: Wed, 26 Mar 2014 22:17:23 +0000 -Subject: pam_timestamp: fix potential directory traversal issue (ticket #27) - -pam_timestamp uses values of PAM_RUSER and PAM_TTY as components of -the timestamp pathname it creates, so extra care should be taken to -avoid potential directory traversal issues. - -* modules/pam_timestamp/pam_timestamp.c (check_tty): Treat -"." and ".." tty values as invalid. -(get_ruser): Treat "." and ".." ruser values, as well as any ruser -value containing '/', as invalid. - -Fixes CVE-2014-2583. - -Reported-by: Sebastian Krahmer - -diff --git a/modules/pam_timestamp/pam_timestamp.c b/modules/pam_timestamp/pam_timestamp.c -index 5193733..b3f08b1 100644 ---- a/modules/pam_timestamp/pam_timestamp.c -+++ b/modules/pam_timestamp/pam_timestamp.c -@@ -158,7 +158,7 @@ check_tty(const char *tty) - tty = strrchr(tty, '/') + 1; - } - /* Make sure the tty wasn't actually a directory (no basename). */ -- if (strlen(tty) == 0) { -+ if (!strlen(tty) || !strcmp(tty, ".") || !strcmp(tty, "..")) { - return NULL; - } - return tty; -@@ -243,6 +243,17 @@ get_ruser(pam_handle_t *pamh, char *ruserbuf, size_t ruserbuflen) - if (pwd != NULL) { - ruser = pwd->pw_name; - } -+ } else { -+ /* -+ * This ruser is used by format_timestamp_name as a component -+ * of constructed timestamp pathname, so ".", "..", and '/' -+ * are disallowed to avoid potential path traversal issues. -+ */ -+ if (!strcmp(ruser, ".") || -+ !strcmp(ruser, "..") || -+ strchr(ruser, '/')) { -+ ruser = NULL; -+ } - } - if (ruser == NULL || strlen(ruser) >= ruserbuflen) { - *ruserbuf = '\0'; diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 43b8204f50c..29cfa64b22d 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -1,15 +1,14 @@ { stdenv, fetchurl, flex, cracklib }: stdenv.mkDerivation rec { - name = "linux-pam-1.1.8"; + name = "linux-pam-${version}"; + version = "1.2.0"; src = fetchurl { - url = http://www.linux-pam.org/library/Linux-PAM-1.1.8.tar.bz2; - sha256 = "0m8ygb40l1c13nsd4hkj1yh4p1ldawhhg8pyjqj9w5kd4cxg5cf4"; + url = "http://www.linux-pam.org/library/Linux-PAM-${version}.tar.bz2"; + sha256 = "192y2fgf24a5qsg7rl1mzgw5axs5lg8kqamkfff2x50yjv2ym2yd"; }; - patches = [ ./CVE-2014-2583.patch ]; - nativeBuildInputs = [ flex ]; buildInputs = [ cracklib ]; From 4b07d1682754ba782b43611499f31cf9f750e569 Mon Sep 17 00:00:00 2001 From: codyopel Date: Mon, 11 May 2015 03:11:30 -0400 Subject: [PATCH 98/98] intltool: refactor --- .../tools/misc/intltool/default.nix | 40 +++++++------------ .../tools/misc/intltool/default.upstream | 2 - 2 files changed, 14 insertions(+), 28 deletions(-) delete mode 100644 pkgs/development/tools/misc/intltool/default.upstream diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix index 40b7ea3b578..761cd6edfc2 100644 --- a/pkgs/development/tools/misc/intltool/default.nix +++ b/pkgs/development/tools/misc/intltool/default.nix @@ -1,33 +1,21 @@ -{ stdenv, fetchurl, perl, perlXMLParser, gettext }: -let - s = # Generated upstream information - rec { - baseName="intltool"; - version="0.51.0"; - name="${baseName}-${version}"; - hash="1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7"; - url="https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz"; - sha256="1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7"; - }; - propagatedBuildInputs = [perl perlXMLParser]; - buildInputs = []; - in -stdenv.mkDerivation { - inherit (s) name version; +{ stdenv, fetchurl, gettext, perl, perlXMLParser }: + +stdenv.mkDerivation rec { + name = "intltool-${version}"; + version = "0.51.0"; + src = fetchurl { - inherit (s) url sha256; + url = "https://launchpad.net/intltool/trunk/${version}/+download/${name}.tar.gz"; + sha256 = "1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7"; }; - inherit buildInputs; - # not needed by intltool itself but (probably) needed for its usage - propagatedBuildInputs = propagatedBuildInputs ++ [ gettext ]; + propagatedBuildInputs = [ gettext perl perlXMLParser ]; - meta = { + meta = with stdenv.lib; { description = "Translation helper tool"; - homepage = "http://launchpad.net/intltool/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; - inherit (s) version; + homepage = http://launchpad.net/intltool/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/intltool/default.upstream b/pkgs/development/tools/misc/intltool/default.upstream deleted file mode 100644 index 323bf21f45a..00000000000 --- a/pkgs/development/tools/misc/intltool/default.upstream +++ /dev/null @@ -1,2 +0,0 @@ -attribute_name intltool -url https://launchpad.net/intltool/+download